Commit 4fc62a9e authored by abarth@webkit.org's avatar abarth@webkit.org
Browse files

2011-06-12 Adam Barth <abarth@webkit.org>

        Reviewed by Alexey Proskuryakov.

        Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
        https://bugs.webkit.org/show_bug.cgi?id=62516

        As requested by Alexey in https://bugs.webkit.org/show_bug.cgi?id=62510.

        * loader/EmptyClients.h:
        (WebCore::EmptyFrameLoaderClient::interruptedForPolicyChangeError):
        * loader/FrameLoaderClient.h:
        * loader/MainResourceLoader.cpp:
        (WebCore::MainResourceLoader::interruptedForPolicyChangeError):
        (WebCore::MainResourceLoader::stopLoadingForPolicyChange):
        (WebCore::MainResourceLoader::continueAfterContentPolicy):
        * loader/MainResourceLoader.h:
2011-06-12  Adam Barth  <abarth@webkit.org>

        Reviewed by Alexey Proskuryakov.

        Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
        https://bugs.webkit.org/show_bug.cgi?id=62516

        * src/FrameLoaderClientImpl.cpp:
        (WebKit::FrameLoaderClientImpl::interruptedForPolicyChangeError):
        * src/FrameLoaderClientImpl.h:
2011-06-12  Adam Barth  <abarth@webkit.org>

        Reviewed by Alexey Proskuryakov.

        Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
        https://bugs.webkit.org/show_bug.cgi?id=62516

        * WebCoreSupport/FrameLoaderClientEfl.cpp:
        (WebCore::FrameLoaderClientEfl::interruptedForPolicyChangeError):
        * WebCoreSupport/FrameLoaderClientEfl.h:
2011-06-12  Adam Barth  <abarth@webkit.org>

        Reviewed by Alexey Proskuryakov.

        Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
        https://bugs.webkit.org/show_bug.cgi?id=62516

        * WebCoreSupport/FrameLoaderClientGtk.cpp:
        (WebKit::FrameLoaderClient::interruptedForPolicyChangeError):
        * WebCoreSupport/FrameLoaderClientGtk.h:
2011-06-12  Adam Barth  <abarth@webkit.org>

        Reviewed by Alexey Proskuryakov.

        Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
        https://bugs.webkit.org/show_bug.cgi?id=62516

        * WebCoreSupport/FrameLoaderClientHaiku.cpp:
        (WebCore::FrameLoaderClientHaiku::interruptedForPolicyChangeError):
        * WebCoreSupport/FrameLoaderClientHaiku.h:
2011-06-12  Adam Barth  <abarth@webkit.org>

        Reviewed by Alexey Proskuryakov.

        Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
        https://bugs.webkit.org/show_bug.cgi?id=62516

        * WebCoreSupport/WebFrameLoaderClient.h:
        * WebCoreSupport/WebFrameLoaderClient.mm:
        (WebFrameLoaderClient::interruptedForPolicyChangeError):
2011-06-12  Adam Barth  <abarth@webkit.org>

        Reviewed by Alexey Proskuryakov.

        Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
        https://bugs.webkit.org/show_bug.cgi?id=62516

        * WebCoreSupport/FrameLoaderClientQt.cpp:
        (WebCore::FrameLoaderClientQt::interruptedForPolicyChangeError):
        * WebCoreSupport/FrameLoaderClientQt.h:
2011-06-12  Adam Barth  <abarth@webkit.org>

        Reviewed by Alexey Proskuryakov.

        Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
        https://bugs.webkit.org/show_bug.cgi?id=62516

        * WebFrame.cpp:
        (WebFrame::interruptedForPolicyChangeError):
        * WebFrame.h:
2011-06-12  Adam Barth  <abarth@webkit.org>

        Reviewed by Alexey Proskuryakov.

        Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
        https://bugs.webkit.org/show_bug.cgi?id=62516

        * WebCoreSupport/FrameLoaderClientWinCE.cpp:
        (WebKit::FrameLoaderClientWinCE::interruptedForPolicyChangeError):
        * WebCoreSupport/FrameLoaderClientWinCE.h:
2011-06-12  Adam Barth  <abarth@webkit.org>

        Reviewed by Alexey Proskuryakov.

        Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
        https://bugs.webkit.org/show_bug.cgi?id=62516

        * WebKitSupport/FrameLoaderClientWx.cpp:
        (WebCore::FrameLoaderClientWx::interruptedForPolicyChangeError):
        * WebKitSupport/FrameLoaderClientWx.h:
2011-06-12  Adam Barth  <abarth@webkit.org>

        Reviewed by Alexey Proskuryakov.

        Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
        https://bugs.webkit.org/show_bug.cgi?id=62516

        * WebProcess/WebCoreSupport/WebErrors.h:
        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
        (WebKit::WebFrameLoaderClient::interruptedForPolicyChangeError):
        * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
        * WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp:
        (WebKit::interruptedForPolicyChangeError):
        * WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp:
        (WebKit::interruptedForPolicyChangeError):
        * WebProcess/WebCoreSupport/mac/WebErrorsMac.mm:
        (WebKit::interruptedForPolicyChangeError):
        * WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp:
        (WebKit::interruptedForPolicyChangeError):
        * WebProcess/WebCoreSupport/win/WebErrorsWin.cpp:
        (WebKit::interruptedForPolicyChangeError):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@88628 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 26d67129
2011-06-12 Adam Barth <abarth@webkit.org>
Reviewed by Alexey Proskuryakov.
Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
https://bugs.webkit.org/show_bug.cgi?id=62516
As requested by Alexey in https://bugs.webkit.org/show_bug.cgi?id=62510.
* loader/EmptyClients.h:
(WebCore::EmptyFrameLoaderClient::interruptedForPolicyChangeError):
* loader/FrameLoaderClient.h:
* loader/MainResourceLoader.cpp:
(WebCore::MainResourceLoader::interruptedForPolicyChangeError):
(WebCore::MainResourceLoader::stopLoadingForPolicyChange):
(WebCore::MainResourceLoader::continueAfterContentPolicy):
* loader/MainResourceLoader.h:
2011-06-12 Hironori Bono <hbono@chromium.org>
Reviewed by Hajime Morita.
......
......@@ -320,7 +320,7 @@ public:
virtual ResourceError cancelledError(const ResourceRequest&) { ResourceError error("", 0, "", ""); error.setIsCancellation(true); return error; }
virtual ResourceError blockedError(const ResourceRequest&) { return ResourceError("", 0, "", ""); }
virtual ResourceError cannotShowURLError(const ResourceRequest&) { return ResourceError("", 0, "", ""); }
virtual ResourceError interruptForPolicyChangeError(const ResourceRequest&) { return ResourceError("", 0, "", ""); }
virtual ResourceError interruptedForPolicyChangeError(const ResourceRequest&) { return ResourceError("", 0, "", ""); }
virtual ResourceError cannotShowMIMETypeError(const ResourceResponse&) { return ResourceError("", 0, "", ""); }
virtual ResourceError fileDoesNotExistError(const ResourceResponse&) { return ResourceError("", 0, "", ""); }
......
......@@ -209,7 +209,7 @@ namespace WebCore {
virtual ResourceError cancelledError(const ResourceRequest&) = 0;
virtual ResourceError blockedError(const ResourceRequest&) = 0;
virtual ResourceError cannotShowURLError(const ResourceRequest&) = 0;
virtual ResourceError interruptForPolicyChangeError(const ResourceRequest&) = 0;
virtual ResourceError interruptedForPolicyChangeError(const ResourceRequest&) = 0;
virtual ResourceError cannotShowMIMETypeError(const ResourceResponse&) = 0;
virtual ResourceError fileDoesNotExistError(const ResourceResponse&) = 0;
......
......@@ -118,14 +118,14 @@ void MainResourceLoader::didCancel(const ResourceError& error)
frameLoader()->receivedMainResourceError(error, true);
}
ResourceError MainResourceLoader::interruptForPolicyChangeError() const
ResourceError MainResourceLoader::interruptedForPolicyChangeError() const
{
return frameLoader()->client()->interruptForPolicyChangeError(request());
return frameLoader()->client()->interruptedForPolicyChangeError(request());
}
void MainResourceLoader::stopLoadingForPolicyChange()
{
ResourceError error = interruptForPolicyChangeError();
ResourceError error = interruptedForPolicyChangeError();
error.setIsCancellation(true);
cancel(error);
}
......@@ -278,7 +278,7 @@ void MainResourceLoader::continueAfterContentPolicy(PolicyAction contentPolicy,
frameLoader()->client()->download(m_handle.get(), request(), m_handle.get()->firstRequest(), r);
// It might have gone missing
if (frameLoader())
receivedError(interruptForPolicyChangeError());
receivedError(interruptedForPolicyChangeError());
return;
case PolicyIgnore:
......
......@@ -86,7 +86,7 @@ namespace WebCore {
void handleDataLoad(ResourceRequest&);
void receivedError(const ResourceError&);
ResourceError interruptForPolicyChangeError() const;
ResourceError interruptedForPolicyChangeError() const;
void stopLoadingForPolicyChange();
bool isPostOrRedirectAfterPost(const ResourceRequest& newRequest, const ResourceResponse& redirectResponse);
......
2011-06-12 Adam Barth <abarth@webkit.org>
Reviewed by Alexey Proskuryakov.
Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
https://bugs.webkit.org/show_bug.cgi?id=62516
* src/FrameLoaderClientImpl.cpp:
(WebKit::FrameLoaderClientImpl::interruptedForPolicyChangeError):
* src/FrameLoaderClientImpl.h:
2011-06-12 Adam Barth <abarth@webkit.org>
Reviewed by Eric Seidel.
......
......@@ -1227,7 +1227,7 @@ ResourceError FrameLoaderClientImpl::cannotShowURLError(const ResourceRequest& r
m_webFrame, WrappedResourceRequest(request));
}
ResourceError FrameLoaderClientImpl::interruptForPolicyChangeError(
ResourceError FrameLoaderClientImpl::interruptedForPolicyChangeError(
const ResourceRequest& request)
{
return ResourceError(internalErrorDomain, PolicyChangeError,
......
......@@ -148,7 +148,7 @@ public:
virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&);
virtual WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&);
virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&);
virtual WebCore::ResourceError interruptForPolicyChangeError(const WebCore::ResourceRequest&);
virtual WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&);
virtual WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&);
virtual WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&);
virtual WebCore::ResourceError pluginWillHandleLoadError(const WebCore::ResourceResponse&);
......
2011-06-12 Adam Barth <abarth@webkit.org>
Reviewed by Alexey Proskuryakov.
Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
https://bugs.webkit.org/show_bug.cgi?id=62516
* WebCoreSupport/FrameLoaderClientEfl.cpp:
(WebCore::FrameLoaderClientEfl::interruptedForPolicyChangeError):
* WebCoreSupport/FrameLoaderClientEfl.h:
2011-06-10 KwangHyuk Kim <hyuki.kim@samsung.com>
Reviewed by Kenneth Rohde Christiansen.
......
......@@ -804,7 +804,7 @@ ResourceError FrameLoaderClientEfl::cannotShowURLError(const ResourceRequest& re
"Cannot show URL");
}
ResourceError FrameLoaderClientEfl::interruptForPolicyChangeError(const ResourceRequest& request)
ResourceError FrameLoaderClientEfl::interruptedForPolicyChangeError(const ResourceRequest& request)
{
return ResourceError("Error", WebKitErrorFrameLoadInterruptedByPolicyChange,
request.url().string(), "Frame load interrupted by policy change");
......
......@@ -171,7 +171,7 @@ class FrameLoaderClientEfl : public FrameLoaderClient {
virtual ResourceError cancelledError(const ResourceRequest&);
virtual ResourceError blockedError(const ResourceRequest&);
virtual ResourceError cannotShowURLError(const ResourceRequest&);
virtual ResourceError interruptForPolicyChangeError(const ResourceRequest&);
virtual ResourceError interruptedForPolicyChangeError(const ResourceRequest&);
virtual ResourceError cannotShowMIMETypeError(const ResourceResponse&);
virtual ResourceError fileDoesNotExistError(const ResourceResponse&);
......
2011-06-12 Adam Barth <abarth@webkit.org>
Reviewed by Alexey Proskuryakov.
Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
https://bugs.webkit.org/show_bug.cgi?id=62516
* WebCoreSupport/FrameLoaderClientGtk.cpp:
(WebKit::FrameLoaderClient::interruptedForPolicyChangeError):
* WebCoreSupport/FrameLoaderClientGtk.h:
2011-06-12 Xan Lopez <xlopez@igalia.com>
 
Reviewed by Martin Robinson.
......
......@@ -1264,7 +1264,7 @@ ResourceError FrameLoaderClient::cannotShowURLError(const ResourceRequest& reque
request.url().string(), _("URL cannot be shown"));
}
ResourceError FrameLoaderClient::interruptForPolicyChangeError(const ResourceRequest& request)
ResourceError FrameLoaderClient::interruptedForPolicyChangeError(const ResourceRequest& request)
{
return ResourceError(g_quark_to_string(WEBKIT_POLICY_ERROR), WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE,
request.url().string(), _("Frame load was interrupted"));
......
......@@ -152,7 +152,7 @@ namespace WebKit {
virtual WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&);
virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&);
virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&);
virtual WebCore::ResourceError interruptForPolicyChangeError(const WebCore::ResourceRequest&);
virtual WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&);
virtual WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&);
virtual WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&);
......
2011-06-12 Adam Barth <abarth@webkit.org>
Reviewed by Alexey Proskuryakov.
Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
https://bugs.webkit.org/show_bug.cgi?id=62516
* WebCoreSupport/FrameLoaderClientHaiku.cpp:
(WebCore::FrameLoaderClientHaiku::interruptedForPolicyChangeError):
* WebCoreSupport/FrameLoaderClientHaiku.h:
2011-05-13 Jon Lee <jonlee@apple.com>
Reviewed by Simon Fraser.
......
......@@ -537,7 +537,7 @@ WebCore::ResourceError FrameLoaderClientHaiku::cannotShowURLError(const WebCore:
return ResourceError(String(), WebKitErrorCannotShowURL, request.url().string(), String());
}
WebCore::ResourceError FrameLoaderClientHaiku::interruptForPolicyChangeError(const WebCore::ResourceRequest& request)
WebCore::ResourceError FrameLoaderClientHaiku::interruptedForPolicyChangeError(const WebCore::ResourceRequest& request)
{
notImplemented();
return ResourceError(String(), WebKitErrorFrameLoadInterruptedByPolicyChange, request.url().string(), String());
......
......@@ -171,7 +171,7 @@ namespace WebCore {
virtual ResourceError cancelledError(const ResourceRequest&);
virtual ResourceError blockedError(const ResourceRequest&);
virtual ResourceError cannotShowURLError(const ResourceRequest&);
virtual ResourceError interruptForPolicyChangeError(const ResourceRequest&);
virtual ResourceError interruptedForPolicyChangeError(const ResourceRequest&);
virtual ResourceError cannotShowMIMETypeError(const ResourceResponse&);
virtual ResourceError fileDoesNotExistError(const ResourceResponse&);
virtual bool shouldFallBack(const ResourceError&);
......
2011-06-12 Adam Barth <abarth@webkit.org>
Reviewed by Alexey Proskuryakov.
Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
https://bugs.webkit.org/show_bug.cgi?id=62516
* WebCoreSupport/WebFrameLoaderClient.h:
* WebCoreSupport/WebFrameLoaderClient.mm:
(WebFrameLoaderClient::interruptedForPolicyChangeError):
2011-06-12 Adam Barth <abarth@webkit.org>
Reviewed by Eric Seidel.
......
......@@ -163,7 +163,7 @@ private:
virtual WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&);
virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&);
virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&);
virtual WebCore::ResourceError interruptForPolicyChangeError(const WebCore::ResourceRequest&);
virtual WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&);
virtual WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&);
virtual WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&);
......
......@@ -1015,7 +1015,7 @@ ResourceError WebFrameLoaderClient::cannotShowURLError(const ResourceRequest& re
return [NSError _webKitErrorWithDomain:WebKitErrorDomain code:WebKitErrorCannotShowURL URL:request.url()];
}
ResourceError WebFrameLoaderClient::interruptForPolicyChangeError(const ResourceRequest& request)
ResourceError WebFrameLoaderClient::interruptedForPolicyChangeError(const ResourceRequest& request)
{
return [NSError _webKitErrorWithDomain:WebKitErrorDomain code:WebKitErrorFrameLoadInterruptedByPolicyChange URL:request.url()];
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment