Changeset 61776 in webkit


Ignore:
Timestamp:
Jun 24, 2010 11:11:25 AM (14 years ago)
Author:
weinig@apple.com
Message:

Fix for ​https://bugs.webkit.org/show_bug.cgi?id=41168
<rdar://problem/8124605>
Webkit2: Add WKPageReloadFromOrigin() to match old-WebKit functionality

Reviewed by Anders Carlsson.

  • UIProcess/API/C/WKPage.cpp:

(WKPageReload):
(WKPageReloadFromOrigin):

  • UIProcess/API/C/WKPage.h:
  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::reload):

  • UIProcess/WebPageProxy.h:
  • WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::reload):
(WebKit::WebPage::didReceiveMessage):

  • WebProcess/WebPage/WebPage.h:
Location:
trunk/WebKit2
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit2/ChangeLog

    r61762 r61776  
     12010-06-24  Sam Weinig  <sam@webkit.org>
     2
     3        Reviewed by Anders Carlsson.
     4
     5        Fix for https://bugs.webkit.org/show_bug.cgi?id=41168
     6        <rdar://problem/8124605>
     7        Webkit2: Add WKPageReloadFromOrigin() to match old-WebKit functionality
     8
     9        * UIProcess/API/C/WKPage.cpp:
     10        (WKPageReload):
     11        (WKPageReloadFromOrigin):
     12        * UIProcess/API/C/WKPage.h:
     13        * UIProcess/WebPageProxy.cpp:
     14        (WebKit::WebPageProxy::reload):
     15        * UIProcess/WebPageProxy.h:
     16        * WebProcess/WebPage/WebPage.cpp:
     17        (WebKit::WebPage::reload):
     18        (WebKit::WebPage::didReceiveMessage):
     19        * WebProcess/WebPage/WebPage.h:
     20
    1212010-06-24  Adam Roben  <aroben@apple.com>
    222

  • trunk/WebKit2/UIProcess/API/C/WKPage.cpp

    r60853 r61776  
    5353void WKPageReload(WKPageRef pageRef)
    5454{
    55     toWK(pageRef)->reload();
     55    toWK(pageRef)->reload(false);
     56}
     57
     58void WKPageReloadFromOrigin(WKPageRef pageRef)
     59{
     60    toWK(pageRef)->reload(true);
    5661}
    5762

  • trunk/WebKit2/UIProcess/API/C/WKPage.h

    r61048 r61776  
    134134WK_EXPORT void WKPageStopLoading(WKPageRef page);
    135135WK_EXPORT void WKPageReload(WKPageRef page);
     136WK_EXPORT void WKPageReloadFromOrigin(WKPageRef page);
    136137
    137138WK_EXPORT bool WKPageTryClose(WKPageRef page);

  • trunk/WebKit2/UIProcess/WebPageProxy.cpp

    r61719 r61776  
    221221}
    222222
    223 void WebPageProxy::reload()
    224 {
    225     if (!isValid())
    226         return;
    227     process()->connection()->send(WebPageMessage::Reload, m_pageID, CoreIPC::In());
     223void WebPageProxy::reload(bool reloadFromOrigin)
     224{
     225    if (!isValid())
     226        return;
     227    process()->connection()->send(WebPageMessage::Reload, m_pageID, CoreIPC::In(reloadFromOrigin));
    228228}
    229229

  • trunk/WebKit2/UIProcess/WebPageProxy.h

    r61563 r61776  
    100100    void loadURL(const WebCore::String&);
    101101    void stopLoading();
    102     void reload();
     102    void reload(bool reloadFromOrigin);
    103103
    104104    void goForward();

  • trunk/WebKit2/WebProcess/WebPage/WebPage.cpp

    r61719 r61776  
    177177}
    178178
    179 void WebPage::reload()
    180 {
    181     m_mainFrame->coreFrame()->loader()->reload(false);
     179void WebPage::reload(bool reloadFromOrigin)
     180{
     181    m_mainFrame->coreFrame()->loader()->reload(reloadFromOrigin);
    182182}
    183183
    … …  
    414414            break;
    415415        case WebPageMessage::Reload:
    416             reload();
     416            bool reloadFromOrigin;
     417            if (!arguments.decode(CoreIPC::Out(reloadFromOrigin)))
     418                return;
     419
     420            reload(reloadFromOrigin);
    417421            break;
    418422        case WebPageMessage::GoForward:

  • trunk/WebKit2/WebProcess/WebPage/WebPage.h

    r61563 r61776  
    107107    void loadURL(const WebCore::String&);
    108108    void stopLoading();
    109     void reload();
     109    void reload(bool reloadFromOrigin);
    110110    void goForward();
    111111    void goBack();
Note: See TracChangeset for help on using the changeset viewer.