Changeset 178408 in webkit


Ignore:
Timestamp:
Jan 13, 2015 10:08:49 PM (9 years ago)
Author:
Chris Dumez
Message:

Unreviewed GTK build fix after r178375.

WebFrameProxy is now a reference instead of a pointer.

  • UIProcess/API/gtk/WebKitLoaderClient.cpp:
Location:
trunk/Source/WebKit2
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit2/ChangeLog

    r178395 r178408  
     12015-01-13  Chris Dumez  <cdumez@apple.com>
     2
     3        Unreviewed GTK build fix after r178375.
     4
     5        WebFrameProxy is now a reference instead of a pointer.
     6
     7        * UIProcess/API/gtk/WebKitLoaderClient.cpp:
     8
    192015-01-13  Chris Dumez  <cdumez@apple.com>
    210
  • trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp

    r178395 r178408  
    4242
    4343private:
    44     void didStartProvisionalLoadForFrame(WebPageProxy&, WebFrameProxy* frame, uint64_t /* navigationID */, API::Object* /* userData */) override
     44    void didStartProvisionalLoadForFrame(WebPageProxy&, WebFrameProxy& frame, uint64_t /* navigationID */, API::Object* /* userData */) override
    4545    {
    46         if (!frame->isMainFrame())
     46        if (!frame.isMainFrame())
    4747            return;
    4848        webkitWebViewLoadChanged(m_webView, WEBKIT_LOAD_STARTED);
    4949    }
    5050
    51     void didReceiveServerRedirectForProvisionalLoadForFrame(WebPageProxy&, WebFrameProxy* frame, uint64_t /* navigationID */, API::Object* /* userData */) override
     51    void didReceiveServerRedirectForProvisionalLoadForFrame(WebPageProxy&, WebFrameProxy& frame, uint64_t /* navigationID */, API::Object* /* userData */) override
    5252    {
    53         if (!frame->isMainFrame())
     53        if (!frame.isMainFrame())
    5454            return;
    5555        webkitWebViewLoadChanged(m_webView, WEBKIT_LOAD_REDIRECTED);
    5656    }
    5757
    58     void didFailProvisionalLoadWithErrorForFrame(WebPageProxy&, WebFrameProxy* frame, uint64_t /* navigationID */, const ResourceError& resourceError, API::Object* /* userData */) override
     58    void didFailProvisionalLoadWithErrorForFrame(WebPageProxy&, WebFrameProxy& frame, uint64_t /* navigationID */, const ResourceError& resourceError, API::Object* /* userData */) override
    5959    {
    60         if (!frame->isMainFrame())
     60        if (!frame.isMainFrame())
    6161            return;
    6262        GUniquePtr<GError> error(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
     
    6969    }
    7070
    71     void didCommitLoadForFrame(WebPageProxy&, WebFrameProxy* frame, uint64_t /* navigationID */, API::Object* /* userData */) override
     71    void didCommitLoadForFrame(WebPageProxy&, WebFrameProxy& frame, uint64_t /* navigationID */, API::Object* /* userData */) override
    7272    {
    73         if (!frame->isMainFrame())
     73        if (!frame.isMainFrame())
    7474            return;
    7575        webkitWebViewLoadChanged(m_webView, WEBKIT_LOAD_COMMITTED);
    7676    }
    7777
    78     void didFinishLoadForFrame(WebPageProxy&, WebFrameProxy* frame, uint64_t /* navigationID */, API::Object* /* userData */) override
     78    void didFinishLoadForFrame(WebPageProxy&, WebFrameProxy& frame, uint64_t /* navigationID */, API::Object* /* userData */) override
    7979    {
    80         if (!frame->isMainFrame())
     80        if (!frame.isMainFrame())
    8181            return;
    8282        webkitWebViewLoadChanged(m_webView, WEBKIT_LOAD_FINISHED);
    8383    }
    8484
    85     void didFailLoadWithErrorForFrame(WebPageProxy&, WebFrameProxy* frame, uint64_t /* navigationID */, const ResourceError& resourceError, API::Object* /* userData */) override
     85    void didFailLoadWithErrorForFrame(WebPageProxy&, WebFrameProxy& frame, uint64_t /* navigationID */, const ResourceError& resourceError, API::Object* /* userData */) override
    8686    {
    87         if (!frame->isMainFrame())
     87        if (!frame.isMainFrame())
    8888            return;
    8989        GUniquePtr<GError> error(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()),
     
    9292    }
    9393
    94     void didDisplayInsecureContentForFrame(WebPageProxy&, WebFrameProxy*, API::Object* /* userData */) override
     94    void didDisplayInsecureContentForFrame(WebPageProxy&, WebFrameProxy&, API::Object* /* userData */) override
    9595    {
    9696        webkitWebViewInsecureContentDetected(m_webView, WEBKIT_INSECURE_CONTENT_DISPLAYED);
    9797    }
    9898
    99     void didRunInsecureContentForFrame(WebPageProxy&, WebFrameProxy*, API::Object* /* userData */) override
     99    void didRunInsecureContentForFrame(WebPageProxy&, WebFrameProxy&, API::Object* /* userData */) override
    100100    {
    101101        webkitWebViewInsecureContentDetected(m_webView, WEBKIT_INSECURE_CONTENT_RUN);
     
    107107    }
    108108
    109     void didReceiveAuthenticationChallengeInFrame(WebPageProxy&, WebFrameProxy*, AuthenticationChallengeProxy* authenticationChallenge) override
     109    void didReceiveAuthenticationChallengeInFrame(WebPageProxy&, WebFrameProxy&, AuthenticationChallengeProxy* authenticationChallenge) override
    110110    {
    111111        webkitWebViewHandleAuthenticationChallenge(m_webView, authenticationChallenge);
Note: See TracChangeset for help on using the changeset viewer.