Changeset 88628 in webkit


Ignore:
Timestamp:
Jun 12, 2011 10:15:19 PM (13 years ago)
Author:
abarth@webkit.org
Message:

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):
Location:
trunk/Source
Files:
41 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r88627 r88628  
     12011-06-12  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
     6        https://bugs.webkit.org/show_bug.cgi?id=62516
     7
     8        As requested by Alexey in https://bugs.webkit.org/show_bug.cgi?id=62510.
     9
     10        * loader/EmptyClients.h:
     11        (WebCore::EmptyFrameLoaderClient::interruptedForPolicyChangeError):
     12        * loader/FrameLoaderClient.h:
     13        * loader/MainResourceLoader.cpp:
     14        (WebCore::MainResourceLoader::interruptedForPolicyChangeError):
     15        (WebCore::MainResourceLoader::stopLoadingForPolicyChange):
     16        (WebCore::MainResourceLoader::continueAfterContentPolicy):
     17        * loader/MainResourceLoader.h:
     18
    1192011-06-12  Hironori Bono  <hbono@chromium.org>
    220

  • trunk/Source/WebCore/loader/EmptyClients.h

    r87117 r88628  
    321321    virtual ResourceError blockedError(const ResourceRequest&) { return ResourceError("", 0, "", ""); }
    322322    virtual ResourceError cannotShowURLError(const ResourceRequest&) { return ResourceError("", 0, "", ""); }
    323     virtual ResourceError interruptForPolicyChangeError(const ResourceRequest&) { return ResourceError("", 0, "", ""); }
     323    virtual ResourceError interruptedForPolicyChangeError(const ResourceRequest&) { return ResourceError("", 0, "", ""); }
    324324
    325325    virtual ResourceError cannotShowMIMETypeError(const ResourceResponse&) { return ResourceError("", 0, "", ""); }

  • trunk/Source/WebCore/loader/FrameLoaderClient.h

    r88377 r88628  
    210210        virtual ResourceError blockedError(const ResourceRequest&) = 0;
    211211        virtual ResourceError cannotShowURLError(const ResourceRequest&) = 0;
    212         virtual ResourceError interruptForPolicyChangeError(const ResourceRequest&) = 0;
     212        virtual ResourceError interruptedForPolicyChangeError(const ResourceRequest&) = 0;
    213213
    214214        virtual ResourceError cannotShowMIMETypeError(const ResourceResponse&) = 0;

  • trunk/Source/WebCore/loader/MainResourceLoader.cpp

    r88618 r88628  
    119119}
    120120
    121 ResourceError MainResourceLoader::interruptForPolicyChangeError() const
    122 {
    123     return frameLoader()->client()->interruptForPolicyChangeError(request());
     121ResourceError MainResourceLoader::interruptedForPolicyChangeError() const
     122{
     123    return frameLoader()->client()->interruptedForPolicyChangeError(request());
    124124}
    125125
    126126void MainResourceLoader::stopLoadingForPolicyChange()
    127127{
    128     ResourceError error = interruptForPolicyChangeError();
     128    ResourceError error = interruptedForPolicyChangeError();
    129129    error.setIsCancellation(true);
    130130    cancel(error);
    … …  
    279279        // It might have gone missing
    280280        if (frameLoader())
    281             receivedError(interruptForPolicyChangeError());
     281            receivedError(interruptedForPolicyChangeError());
    282282        return;
    283283

  • trunk/Source/WebCore/loader/MainResourceLoader.h

    r88618 r88628  
    8787
    8888        void receivedError(const ResourceError&);
    89         ResourceError interruptForPolicyChangeError() const;
     89        ResourceError interruptedForPolicyChangeError() const;
    9090        void stopLoadingForPolicyChange();
    9191        bool isPostOrRedirectAfterPost(const ResourceRequest& newRequest, const ResourceResponse& redirectResponse);

  • trunk/Source/WebKit/chromium/ChangeLog

    r88622 r88628  
     12011-06-12  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
     6        https://bugs.webkit.org/show_bug.cgi?id=62516
     7
     8        * src/FrameLoaderClientImpl.cpp:
     9        (WebKit::FrameLoaderClientImpl::interruptedForPolicyChangeError):
     10        * src/FrameLoaderClientImpl.h:
     11
    1122011-06-12  Adam Barth  <abarth@webkit.org>
    213

  • trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp

    r88377 r88628  
    12281228}
    12291229
    1230 ResourceError FrameLoaderClientImpl::interruptForPolicyChangeError(
     1230ResourceError FrameLoaderClientImpl::interruptedForPolicyChangeError(
    12311231    const ResourceRequest& request)
    12321232{

  • trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.h

    r88377 r88628  
    149149    virtual WebCore::ResourceError cancelledError(const WebCore::ResourceRequest&);
    150150    virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&);
    151     virtual WebCore::ResourceError interruptForPolicyChangeError(const WebCore::ResourceRequest&);
     151    virtual WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&);
    152152    virtual WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&);
    153153    virtual WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&);

  • trunk/Source/WebKit/efl/ChangeLog

    r88537 r88628  
     12011-06-12  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
     6        https://bugs.webkit.org/show_bug.cgi?id=62516
     7
     8        * WebCoreSupport/FrameLoaderClientEfl.cpp:
     9        (WebCore::FrameLoaderClientEfl::interruptedForPolicyChangeError):
     10        * WebCoreSupport/FrameLoaderClientEfl.h:
     11
    1122011-06-10  KwangHyuk Kim  <hyuki.kim@samsung.com>
    213

  • trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.cpp

    r88209 r88628  
    805805}
    806806
    807 ResourceError FrameLoaderClientEfl::interruptForPolicyChangeError(const ResourceRequest& request)
     807ResourceError FrameLoaderClientEfl::interruptedForPolicyChangeError(const ResourceRequest& request)
    808808{
    809809    return ResourceError("Error", WebKitErrorFrameLoadInterruptedByPolicyChange,

  • trunk/Source/WebKit/efl/WebCoreSupport/FrameLoaderClientEfl.h

    r85785 r88628  
    172172    virtual ResourceError blockedError(const ResourceRequest&);
    173173    virtual ResourceError cannotShowURLError(const ResourceRequest&);
    174     virtual ResourceError interruptForPolicyChangeError(const ResourceRequest&);
     174    virtual ResourceError interruptedForPolicyChangeError(const ResourceRequest&);
    175175
    176176    virtual ResourceError cannotShowMIMETypeError(const ResourceResponse&);

  • trunk/Source/WebKit/gtk/ChangeLog

    r88621 r88628  
     12011-06-12  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
     6        https://bugs.webkit.org/show_bug.cgi?id=62516
     7
     8        * WebCoreSupport/FrameLoaderClientGtk.cpp:
     9        (WebKit::FrameLoaderClient::interruptedForPolicyChangeError):
     10        * WebCoreSupport/FrameLoaderClientGtk.h:
     11
    1122011-06-12  Xan Lopez  <xlopez@igalia.com>
    213

  • trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.cpp

    r87623 r88628  
    12651265}
    12661266
    1267 ResourceError FrameLoaderClient::interruptForPolicyChangeError(const ResourceRequest& request)
     1267ResourceError FrameLoaderClient::interruptedForPolicyChangeError(const ResourceRequest& request)
    12681268{
    12691269    return ResourceError(g_quark_to_string(WEBKIT_POLICY_ERROR), WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE,

  • trunk/Source/WebKit/gtk/WebCoreSupport/FrameLoaderClientGtk.h

    r85785 r88628  
    153153        virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&);
    154154        virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&);
    155         virtual WebCore::ResourceError interruptForPolicyChangeError(const WebCore::ResourceRequest&);
     155        virtual WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&);
    156156
    157157        virtual WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&);

  • trunk/Source/WebKit/haiku/ChangeLog

    r86584 r88628  
     12011-06-12  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
     6        https://bugs.webkit.org/show_bug.cgi?id=62516
     7
     8        * WebCoreSupport/FrameLoaderClientHaiku.cpp:
     9        (WebCore::FrameLoaderClientHaiku::interruptedForPolicyChangeError):
     10        * WebCoreSupport/FrameLoaderClientHaiku.h:
     11
    1122011-05-13  Jon Lee  <jonlee@apple.com>
    213

  • trunk/Source/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.cpp

    r82580 r88628  
    538538}
    539539
    540 WebCore::ResourceError FrameLoaderClientHaiku::interruptForPolicyChangeError(const WebCore::ResourceRequest& request)
     540WebCore::ResourceError FrameLoaderClientHaiku::interruptedForPolicyChangeError(const WebCore::ResourceRequest& request)
    541541{
    542542    notImplemented();

  • trunk/Source/WebKit/haiku/WebCoreSupport/FrameLoaderClientHaiku.h

    r82580 r88628  
    172172        virtual ResourceError blockedError(const ResourceRequest&);
    173173        virtual ResourceError cannotShowURLError(const ResourceRequest&);
    174         virtual ResourceError interruptForPolicyChangeError(const ResourceRequest&);
     174        virtual ResourceError interruptedForPolicyChangeError(const ResourceRequest&);
    175175        virtual ResourceError cannotShowMIMETypeError(const ResourceResponse&);
    176176        virtual ResourceError fileDoesNotExistError(const ResourceResponse&);

  • trunk/Source/WebKit/mac/ChangeLog

    r88622 r88628  
     12011-06-12  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
     6        https://bugs.webkit.org/show_bug.cgi?id=62516
     7
     8        * WebCoreSupport/WebFrameLoaderClient.h:
     9        * WebCoreSupport/WebFrameLoaderClient.mm:
     10        (WebFrameLoaderClient::interruptedForPolicyChangeError):
     11
    1122011-06-12  Adam Barth  <abarth@webkit.org>
    213

  • trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.h

    r85785 r88628  
    164164    virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&);
    165165    virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&);
    166     virtual WebCore::ResourceError interruptForPolicyChangeError(const WebCore::ResourceRequest&);
     166    virtual WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&);
    167167
    168168    virtual WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&);

  • trunk/Source/WebKit/mac/WebCoreSupport/WebFrameLoaderClient.mm

    r86414 r88628  
    10161016}
    10171017
    1018 ResourceError WebFrameLoaderClient::interruptForPolicyChangeError(const ResourceRequest& request)
     1018ResourceError WebFrameLoaderClient::interruptedForPolicyChangeError(const ResourceRequest& request)
    10191019{
    10201020    return [NSError _webKitErrorWithDomain:WebKitErrorDomain code:WebKitErrorFrameLoadInterruptedByPolicyChange URL:request.url()];

  • trunk/Source/WebKit/qt/ChangeLog

    r88624 r88628  
     12011-06-12  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
     6        https://bugs.webkit.org/show_bug.cgi?id=62516
     7
     8        * WebCoreSupport/FrameLoaderClientQt.cpp:
     9        (WebCore::FrameLoaderClientQt::interruptedForPolicyChangeError):
     10        * WebCoreSupport/FrameLoaderClientQt.h:
     11
    1122011-06-12  Adam Barth  <abarth@webkit.org>
    213

  • trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp

    r88624 r88628  
    963963}
    964964
    965 WebCore::ResourceError FrameLoaderClientQt::interruptForPolicyChangeError(const WebCore::ResourceRequest& request)
     965WebCore::ResourceError FrameLoaderClientQt::interruptedForPolicyChangeError(const WebCore::ResourceRequest& request)
    966966{
    967967    return ResourceError("WebKitErrorDomain", WebKitErrorFrameLoadInterruptedByPolicyChange, request.url().string(),

  • trunk/Source/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.h

    r88045 r88628  
    171171    virtual ResourceError blockedError(const ResourceRequest&);
    172172    virtual ResourceError cannotShowURLError(const ResourceRequest&);
    173     virtual ResourceError interruptForPolicyChangeError(const ResourceRequest&);
     173    virtual ResourceError interruptedForPolicyChangeError(const ResourceRequest&);
    174174
    175175    virtual ResourceError cannotShowMIMETypeError(const ResourceResponse&);

  • trunk/Source/WebKit/win/ChangeLog

    r88625 r88628  
     12011-06-12  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
     6        https://bugs.webkit.org/show_bug.cgi?id=62516
     7
     8        * WebFrame.cpp:
     9        (WebFrame::interruptedForPolicyChangeError):
     10        * WebFrame.h:
     11
    1122011-06-12  Dominic Cooney  <dominicc@chromium.org>
    213

  • trunk/Source/WebKit/win/WebFrame.cpp

    r87000 r88628  
    17181718}
    17191719
    1720 ResourceError WebFrame::interruptForPolicyChangeError(const ResourceRequest& request)
     1720ResourceError WebFrame::interruptedForPolicyChangeError(const ResourceRequest& request)
    17211721{
    17221722    // FIXME: Need to implement the String descriptions for errors in the WebKitErrorDomain and have them localized

  • trunk/Source/WebKit/win/WebFrame.h

    r87000 r88628  
    327327    virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&);
    328328    virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&);
    329     virtual WebCore::ResourceError interruptForPolicyChangeError(const WebCore::ResourceRequest&);
     329    virtual WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&);
    330330    virtual WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&);
    331331    virtual WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&);

  • trunk/Source/WebKit/wince/ChangeLog

    r86584 r88628  
     12011-06-12  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
     6        https://bugs.webkit.org/show_bug.cgi?id=62516
     7
     8        * WebCoreSupport/FrameLoaderClientWinCE.cpp:
     9        (WebKit::FrameLoaderClientWinCE::interruptedForPolicyChangeError):
     10        * WebCoreSupport/FrameLoaderClientWinCE.h:
     11
    1122011-05-13  Jon Lee  <jonlee@apple.com>
    213

  • trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.cpp

    r85785 r88628  
    547547}
    548548
    549 ResourceError FrameLoaderClientWinCE::interruptForPolicyChangeError(const WebCore::ResourceRequest&)
     549ResourceError FrameLoaderClientWinCE::interruptedForPolicyChangeError(const WebCore::ResourceRequest&)
    550550{
    551551    return ResourceError();

  • trunk/Source/WebKit/wince/WebCoreSupport/FrameLoaderClientWinCE.h

    r85785 r88628  
    148148    virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&);
    149149    virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&);
    150     virtual WebCore::ResourceError interruptForPolicyChangeError(const WebCore::ResourceRequest&);
     150    virtual WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&);
    151151
    152152    virtual WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&);

  • trunk/Source/WebKit/wx/ChangeLog

    r87745 r88628  
     12011-06-12  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
     6        https://bugs.webkit.org/show_bug.cgi?id=62516
     7
     8        * WebKitSupport/FrameLoaderClientWx.cpp:
     9        (WebCore::FrameLoaderClientWx::interruptedForPolicyChangeError):
     10        * WebKitSupport/FrameLoaderClientWx.h:
     11
    1122011-05-31  Robin Dunn  <robin@alldunn.com>
    213

  • trunk/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.cpp

    r85785 r88628  
    665665}
    666666
    667 WebCore::ResourceError FrameLoaderClientWx::interruptForPolicyChangeError(const WebCore::ResourceRequest& request)
     667WebCore::ResourceError FrameLoaderClientWx::interruptedForPolicyChangeError(const WebCore::ResourceRequest& request)
    668668{
    669669    notImplemented();

  • trunk/Source/WebKit/wx/WebKitSupport/FrameLoaderClientWx.h

    r85785 r88628  
    177177        virtual ResourceError blockedError(const ResourceRequest&);
    178178        virtual ResourceError cannotShowURLError(const ResourceRequest&);
    179         virtual ResourceError interruptForPolicyChangeError(const ResourceRequest&);
     179        virtual ResourceError interruptedForPolicyChangeError(const ResourceRequest&);
    180180        virtual ResourceError cannotShowMIMETypeError(const ResourceResponse&);
    181181        virtual ResourceError fileDoesNotExistError(const ResourceResponse&);

  • trunk/Source/WebKit2/ChangeLog

    r88622 r88628  
     12011-06-12  Adam Barth  <abarth@webkit.org>
     2
     3        Reviewed by Alexey Proskuryakov.
     4
     5        Rename FrameLoaderClient::interruptForPolicyChangeError to use the past tense
     6        https://bugs.webkit.org/show_bug.cgi?id=62516
     7
     8        * WebProcess/WebCoreSupport/WebErrors.h:
     9        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
     10        (WebKit::WebFrameLoaderClient::interruptedForPolicyChangeError):
     11        * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
     12        * WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp:
     13        (WebKit::interruptedForPolicyChangeError):
     14        * WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp:
     15        (WebKit::interruptedForPolicyChangeError):
     16        * WebProcess/WebCoreSupport/mac/WebErrorsMac.mm:
     17        (WebKit::interruptedForPolicyChangeError):
     18        * WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp:
     19        (WebKit::interruptedForPolicyChangeError):
     20        * WebProcess/WebCoreSupport/win/WebErrorsWin.cpp:
     21        (WebKit::interruptedForPolicyChangeError):
     22
    1232011-06-12  Adam Barth  <abarth@webkit.org>
    224

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebErrors.h

    r71033 r88628  
    3636WebCore::ResourceError blockedError(const WebCore::ResourceRequest&);
    3737WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&);
    38 WebCore::ResourceError interruptForPolicyChangeError(const WebCore::ResourceRequest&);
     38WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&);
    3939WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&);
    4040WebCore::ResourceError fileDoesNotExistError(const WebCore::ResourceResponse&);

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

    r88284 r88628  
    976976}
    977977
    978 ResourceError WebFrameLoaderClient::interruptForPolicyChangeError(const ResourceRequest& request)
    979 {
    980     return WebKit::interruptForPolicyChangeError(request);
     978ResourceError WebFrameLoaderClient::interruptedForPolicyChangeError(const ResourceRequest& request)
     979{
     980    return WebKit::interruptedForPolicyChangeError(request);
    981981}
    982982

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.h

    r88284 r88628  
    146146    virtual WebCore::ResourceError blockedError(const WebCore::ResourceRequest&);
    147147    virtual WebCore::ResourceError cannotShowURLError(const WebCore::ResourceRequest&);
    148     virtual WebCore::ResourceError interruptForPolicyChangeError(const WebCore::ResourceRequest&);
     148    virtual WebCore::ResourceError interruptedForPolicyChangeError(const WebCore::ResourceRequest&);
    149149   
    150150    virtual WebCore::ResourceError cannotShowMIMETypeError(const WebCore::ResourceResponse&);

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/efl/WebErrorsEfl.cpp

    r88540 r88628  
    5353}
    5454
    55 ResourceError interruptForPolicyChangeError(const ResourceRequest& request)
     55ResourceError interruptedForPolicyChangeError(const ResourceRequest& request)
    5656{
    5757    notImplemented();

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/gtk/WebErrorsGtk.cpp

    r79581 r88628  
    5656}
    5757
    58 ResourceError interruptForPolicyChangeError(const ResourceRequest& request)
     58ResourceError interruptedForPolicyChangeError(const ResourceRequest& request)
    5959{
    6060    return ResourceError(g_quark_to_string(WEBKIT_POLICY_ERROR), WEBKIT_POLICY_ERROR_FRAME_LOAD_INTERRUPTED_BY_POLICY_CHANGE,

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/mac/WebErrorsMac.mm

    r82622 r88628  
    155155}
    156156
    157 ResourceError interruptForPolicyChangeError(const ResourceRequest& request)
     157ResourceError interruptedForPolicyChangeError(const ResourceRequest& request)
    158158{
    159159    return [NSError _webKitErrorWithDomain:WebError::webKitErrorDomain() code:kWKErrorCodeFrameLoadInterruptedByPolicyChange URL:request.url()];

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/qt/WebErrorsQt.cpp

    r87623 r88628  
    7070}
    7171
    72 ResourceError interruptForPolicyChangeError(const ResourceRequest& request)
     72ResourceError interruptedForPolicyChangeError(const ResourceRequest& request)
    7373{
    7474    return ResourceError("WebKit", WebKitErrorFrameLoadInterruptedByPolicyChange, request.url().string(),

  • trunk/Source/WebKit2/WebProcess/WebCoreSupport/win/WebErrorsWin.cpp

    r76916 r88628  
    5959}
    6060
    61 ResourceError interruptForPolicyChangeError(const ResourceRequest& request)
     61ResourceError interruptedForPolicyChangeError(const ResourceRequest& request)
    6262{
    6363    return ResourceError(WebError::webKitErrorDomain(), kWKErrorCodeFrameLoadInterruptedByPolicyChange, request.url().string(), String());
Note: See TracChangeset for help on using the changeset viewer.