Changeset 66448 in webkit


Ignore:
Timestamp:
Aug 30, 2010 8:34:33 PM (14 years ago)
Author:
alice.liu@apple.com
Message:

Add missing parts of didFinishDocumentLoadForFrame
​https://bugs.webkit.org/show_bug.cgi?id=44913

Reviewed by Darin Adler.

WebKit2:

  • Shared/CoreIPCSupport/WebPageProxyMessageKinds.h: Added new kind
  • UIProcess/API/C/WKPage.h:
  • UIProcess/API/qt/qwkpage.cpp:

(QWKPage::QWKPage): Updated struct

  • UIProcess/WebLoaderClient.cpp:

(WebKit::WebLoaderClient::didFinishDocumentLoadForFrame): Added

  • UIProcess/WebLoaderClient.h:
  • UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::didReceiveMessage): Added case for WebPageProxyMessage::DidFinishDocumentLoadForFrame
(WebKit::WebPageProxy::didFinishDocumentLoadForFrame): Added

  • UIProcess/WebPageProxy.h:

Just rearranging existing code in these:

  • WebProcess/InjectedBundle/API/c/WKBundlePage.h:
  • WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:

(WebKit::InjectedBundlePageLoaderClient::didFinishDocumentLoadForFrame):

  • WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:

WebKitTools:

  • MiniBrowser/mac/BrowserWindowController.m:

(didFinishDocumentLoadForFrame): Added
(-[BrowserWindowController awakeFromNib]): Updated struct

  • WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:

(WTR::InjectedBundlePage::InjectedBundlePage): Rearranged function ptr

  • WebKitTestRunner/TestController.cpp:

(WTR::TestController::initialize): Updated struct

Location:
trunk
Files:
15 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebKit2/ChangeLog

    r66439 r66448  
     12010-08-30  Alice Liu  <alice.liu@apple.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        Add missing parts of didFinishDocumentLoadForFrame
     6        https://bugs.webkit.org/show_bug.cgi?id=44913
     7
     8        * Shared/CoreIPCSupport/WebPageProxyMessageKinds.h: Added new kind
     9        * UIProcess/API/C/WKPage.h:
     10        * UIProcess/API/qt/qwkpage.cpp:
     11        (QWKPage::QWKPage): Updated struct
     12        * UIProcess/WebLoaderClient.cpp:
     13        (WebKit::WebLoaderClient::didFinishDocumentLoadForFrame): Added
     14        * UIProcess/WebLoaderClient.h:
     15        * UIProcess/WebPageProxy.cpp:
     16        (WebKit::WebPageProxy::didReceiveMessage): Added case for WebPageProxyMessage::DidFinishDocumentLoadForFrame
     17        (WebKit::WebPageProxy::didFinishDocumentLoadForFrame): Added
     18        * UIProcess/WebPageProxy.h:
     19
     20        Just rearranging existing code in these:
     21        * WebProcess/InjectedBundle/API/c/WKBundlePage.h:
     22        * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp:
     23        (WebKit::InjectedBundlePageLoaderClient::didFinishDocumentLoadForFrame):
     24        * WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h:
     25
    1262010-08-30  Sam Weinig  <sam@webkit.org>
    227

  • trunk/WebKit2/Shared/CoreIPCSupport/WebPageProxyMessageKinds.h

    r65422 r66448  
    5151    DidFailLoadForFrame,
    5252    DidFailProvisionalLoadForFrame,
     53    DidFinishDocumentLoadForFrame,
    5354    DidFinishLoadForFrame,
    5455    DidFinishProgress,

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

    r66436 r66448  
    6262typedef void (*WKPageDidFailProvisionalLoadWithErrorForFrameCallback)(WKPageRef page, WKFrameRef frame, const void *clientInfo); // FIXME: Add WKErrorRef.
    6363typedef void (*WKPageDidCommitLoadForFrameCallback)(WKPageRef page, WKFrameRef frame, const void *clientInfo);
     64typedef void (*WKPageDidFinishDocumentLoadForFrameCallback)(WKPageRef page, WKFrameRef frame, const void *clientInfo);
    6465typedef void (*WKPageDidFinishLoadForFrameCallback)(WKPageRef page, WKFrameRef frame, const void *clientInfo);
    6566typedef void (*WKPageDidFailLoadWithErrorForFrameCallback)(WKPageRef page, WKFrameRef frame, const void *clientInfo); // FIXME: Add WKErrorRef.
    … …  
    8889    WKPageDidFailProvisionalLoadWithErrorForFrameCallback               didFailProvisionalLoadWithErrorForFrame;
    8990    WKPageDidCommitLoadForFrameCallback                                 didCommitLoadForFrame;
     91    WKPageDidFinishDocumentLoadForFrameCallback                         didFinishDocumentLoadForFrame;
    9092    WKPageDidFinishLoadForFrameCallback                                 didFinishLoadForFrame;
    9193    WKPageDidFailLoadWithErrorForFrameCallback                          didFailLoadWithErrorForFrame;

  • trunk/WebKit2/UIProcess/API/qt/qwkpage.cpp

    r66165 r66448  
    226226        qt_wk_didFailProvisionalLoadWithErrorForFrame,
    227227        qt_wk_didCommitLoadForFrame,
     228        qt_wk_didFinishDocumentLoadForFrame,
    228229        qt_wk_didFinishLoadForFrame,
    229230        qt_wk_didFailLoadWithErrorForFrame,

  • trunk/WebKit2/UIProcess/WebLoaderClient.cpp

    r65021 r66448  
    6666    if (m_pageLoaderClient.didCommitLoadForFrame)
    6767        m_pageLoaderClient.didCommitLoadForFrame(toRef(page), toRef(frame), m_pageLoaderClient.clientInfo);
     68}
     69
     70void WebLoaderClient::didFinishDocumentLoadForFrame(WebPageProxy* page, WebFrameProxy* frame)
     71{
     72    if (m_pageLoaderClient.didFinishDocumentLoadForFrame)
     73        m_pageLoaderClient.didFinishDocumentLoadForFrame(toRef(page), toRef(frame), m_pageLoaderClient.clientInfo);
    6874}
    6975

  • trunk/WebKit2/UIProcess/WebLoaderClient.h

    r65021 r66448  
    4444    void didFailProvisionalLoadWithErrorForFrame(WebPageProxy*, WebFrameProxy*);
    4545    void didCommitLoadForFrame(WebPageProxy*, WebFrameProxy*);
     46    void didFinishDocumentLoadForFrame(WebPageProxy*, WebFrameProxy*);
    4647    void didFinishLoadForFrame(WebPageProxy*, WebFrameProxy*);
    4748    void didFailLoadWithErrorForFrame(WebPageProxy*, WebFrameProxy*);

  • trunk/WebKit2/UIProcess/WebPageProxy.cpp

    r66436 r66448  
    467467            break;
    468468        }
     469        case WebPageProxyMessage::DidFinishDocumentLoadForFrame: {
     470            uint64_t frameID;
     471            if (!arguments->decode(frameID))
     472                return;
     473            didFinishDocumentLoadForFrame(process()->webFrame(frameID));
     474            break;
     475        }
    469476        case WebPageProxyMessage::DidFinishLoadForFrame: {
    470477            uint64_t frameID;
    … …  
    807814}
    808815
     816void WebPageProxy::didFinishDocumentLoadForFrame(WebFrameProxy* frame)
     817{
     818    m_loaderClient.didFinishDocumentLoadForFrame(this, frame);
     819}
     820
    809821void WebPageProxy::didFinishLoadForFrame(WebFrameProxy* frame)
    810822{

  • trunk/WebKit2/UIProcess/WebPageProxy.h

    r66436 r66448  
    187187    void didFailProvisionalLoadForFrame(WebFrameProxy*);
    188188    void didCommitLoadForFrame(WebFrameProxy*);
     189    void didFinishDocumentLoadForFrame(WebFrameProxy*);
    189190    void didFinishLoadForFrame(WebFrameProxy*);
    190191    void didFailLoadForFrame(WebFrameProxy*);

  • trunk/WebKit2/WebProcess/InjectedBundle/API/c/WKBundlePage.h

    r64927 r66448  
    5454typedef void (*WKBundlePageDidFailProvisionalLoadWithErrorForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo); // FIXME: Add WKErrorRef.
    5555typedef void (*WKBundlePageDidCommitLoadForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo);
     56typedef void (*WKBundlePageDidDocumentFinishLoadForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo);
    5657typedef void (*WKBundlePageDidFinishLoadForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo);
    5758typedef void (*WKBundlePageDidFailLoadWithErrorForFrameCallback)(WKBundlePageRef page, WKBundleFrameRef frame, const void *clientInfo); // FIXME: Add WKErrorRef.
    … …  
    7475    WKBundlePageDidFailProvisionalLoadWithErrorForFrameCallback         didFailProvisionalLoadWithErrorForFrame;
    7576    WKBundlePageDidCommitLoadForFrameCallback                           didCommitLoadForFrame;
     77    WKBundlePageDidFinishDocumentLoadForFrameCallback                   didFinishDocumentLoadForFrame;
    7678    WKBundlePageDidFinishLoadForFrameCallback                           didFinishLoadForFrame;
    7779    WKBundlePageDidFailLoadWithErrorForFrameCallback                    didFailLoadWithErrorForFrame;
    … …  
    8183    WKBundlePageWillPerformClientRedirectForFrameCallback               willPerformClientRedirectForFrame;
    8284    WKBundlePageDidChangeLocationWithinPageForFrameCallback             didChangeLocationWithinPageForFrame;
    83     WKBundlePageDidFinishDocumentLoadForFrameCallback                   didFinishDocumentLoadForFrame;
    8485    WKBundlePageDidHandleOnloadEventsForFrameCallback                   didHandleOnloadEventsForFrame;
    8586    WKBundlePageDidDisplayInsecureContentForFrameCallback               didDisplayInsecureContentForFrame;

  • trunk/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.cpp

    r65465 r66448  
    7171}
    7272
     73void InjectedBundlePageLoaderClient::didFinishDocumentLoadForFrame(WebPage* page, WebFrame* frame)
     74{
     75    if (m_client.didFinishDocumentLoadForFrame)
     76        m_client.didFinishDocumentLoadForFrame(toRef(page), toRef(frame), m_client.clientInfo);
     77}
     78
    7379void InjectedBundlePageLoaderClient::didFinishLoadForFrame(WebPage* page, WebFrame* frame)
    7480{
    … …  
    113119}
    114120
    115 void InjectedBundlePageLoaderClient::didFinishDocumentLoadForFrame(WebPage* page, WebFrame* frame)
    116 {
    117     if (m_client.didFinishDocumentLoadForFrame)
    118         m_client.didFinishDocumentLoadForFrame(toRef(page), toRef(frame), m_client.clientInfo);
    119 }
    120 
    121121void InjectedBundlePageLoaderClient::didHandleOnloadEventsForFrame(WebPage* page, WebFrame* frame)
    122122{

  • trunk/WebKit2/WebProcess/InjectedBundle/InjectedBundlePageLoaderClient.h

    r65021 r66448  
    4545    void didFailProvisionalLoadWithErrorForFrame(WebPage*, WebFrame*);
    4646    void didCommitLoadForFrame(WebPage*, WebFrame*);
     47    void didFinishDocumentLoadForFrame(WebPage*, WebFrame*);
    4748    void didFinishLoadForFrame(WebPage*, WebFrame*);
    4849    void didFailLoadWithErrorForFrame(WebPage*, WebFrame*);
    … …  
    5253    void willPerformClientRedirectForFrame(WebPage*, WebFrame*, const WTF::String& url, double delay, double date);
    5354    void didChangeLocationWithinPageForFrame(WebPage*, WebFrame*);
    54     void didFinishDocumentLoadForFrame(WebPage*, WebFrame*);
    5555    void didHandleOnloadEventsForFrame(WebPage*, WebFrame*);
    5656    void didDisplayInsecureContentForFrame(WebPage*, WebFrame*);

  • trunk/WebKitTools/ChangeLog

    r66433 r66448  
     12010-08-30  Alice Liu  <alice.liu@apple.com>
     2
     3        Reviewed by Darin Adler.
     4
     5        Add missing parts of didFinishDocumentLoadForFrame
     6        https://bugs.webkit.org/show_bug.cgi?id=44913
     7
     8        * MiniBrowser/mac/BrowserWindowController.m:
     9        (didFinishDocumentLoadForFrame): Added
     10        (-[BrowserWindowController awakeFromNib]): Updated struct
     11        * WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp:
     12        (WTR::InjectedBundlePage::InjectedBundlePage): Rearranged function ptr
     13        * WebKitTestRunner/TestController.cpp:
     14        (WTR::TestController::initialize): Updated struct
     15
    1162010-08-30  Vangelis Kokkevis  <vangelis@chromium.org>
    217

  • trunk/WebKitTools/MiniBrowser/mac/BrowserWindowController.m

    r65781 r66448  
    173173}
    174174
     175static void didFinishDocumentLoadForFrame(WKPageRef page, WKFrameRef frame, const void *clientInfo)
     176{
     177    LOG(@"didFinishDocumentLoadForFrame");
     178}
     179
    175180static void didFinishLoadForFrame(WKPageRef page, WKFrameRef frame, const void *clientInfo)
    176181{
    … …  
    380385        didFailProvisionalLoadWithErrorForFrame,
    381386        didCommitLoadForFrame,
     387        didFinishDocumentLoadForFrame,
    382388        didFinishLoadForFrame,
    383389        didFailLoadWithErrorForFrame,

  • trunk/WebKitTools/WebKitTestRunner/InjectedBundle/InjectedBundlePage.cpp

    r65267 r66448  
    101101        didFailProvisionalLoadWithErrorForFrame,
    102102        didCommitLoadForFrame,
     103        didFinishDocumentLoadForFrame,
    103104        didFinishLoadForFrame,
    104105        didFailLoadWithErrorForFrame,
    … …  
    108109        willPerformClientRedirectForFrame,
    109110        didChangeLocationWithinPageForFrame,
    110         didFinishDocumentLoadForFrame,
    111111        didHandleOnloadEventsForFrame,
    112112        didDisplayInsecureContentForFrame,

  • trunk/WebKitTools/WebKitTestRunner/TestController.cpp

    r66140 r66448  
    172172        0,
    173173        0,
     174        0,
    174175        didFinishLoadForFrame,
    175176        0,
Note: See TracChangeset for help on using the changeset viewer.