Changeset 178408 in webkit
- Timestamp:
- Jan 13, 2015 10:08:49 PM (9 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r178395 r178408 1 2015-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 1 9 2015-01-13 Chris Dumez <cdumez@apple.com> 2 10 -
trunk/Source/WebKit2/UIProcess/API/gtk/WebKitLoaderClient.cpp
r178395 r178408 42 42 43 43 private: 44 void didStartProvisionalLoadForFrame(WebPageProxy&, WebFrameProxy *frame, uint64_t /* navigationID */, API::Object* /* userData */) override44 void didStartProvisionalLoadForFrame(WebPageProxy&, WebFrameProxy& frame, uint64_t /* navigationID */, API::Object* /* userData */) override 45 45 { 46 if (!frame ->isMainFrame())46 if (!frame.isMainFrame()) 47 47 return; 48 48 webkitWebViewLoadChanged(m_webView, WEBKIT_LOAD_STARTED); 49 49 } 50 50 51 void didReceiveServerRedirectForProvisionalLoadForFrame(WebPageProxy&, WebFrameProxy *frame, uint64_t /* navigationID */, API::Object* /* userData */) override51 void didReceiveServerRedirectForProvisionalLoadForFrame(WebPageProxy&, WebFrameProxy& frame, uint64_t /* navigationID */, API::Object* /* userData */) override 52 52 { 53 if (!frame ->isMainFrame())53 if (!frame.isMainFrame()) 54 54 return; 55 55 webkitWebViewLoadChanged(m_webView, WEBKIT_LOAD_REDIRECTED); 56 56 } 57 57 58 void didFailProvisionalLoadWithErrorForFrame(WebPageProxy&, WebFrameProxy *frame, uint64_t /* navigationID */, const ResourceError& resourceError, API::Object* /* userData */) override58 void didFailProvisionalLoadWithErrorForFrame(WebPageProxy&, WebFrameProxy& frame, uint64_t /* navigationID */, const ResourceError& resourceError, API::Object* /* userData */) override 59 59 { 60 if (!frame ->isMainFrame())60 if (!frame.isMainFrame()) 61 61 return; 62 62 GUniquePtr<GError> error(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()), … … 69 69 } 70 70 71 void didCommitLoadForFrame(WebPageProxy&, WebFrameProxy *frame, uint64_t /* navigationID */, API::Object* /* userData */) override71 void didCommitLoadForFrame(WebPageProxy&, WebFrameProxy& frame, uint64_t /* navigationID */, API::Object* /* userData */) override 72 72 { 73 if (!frame ->isMainFrame())73 if (!frame.isMainFrame()) 74 74 return; 75 75 webkitWebViewLoadChanged(m_webView, WEBKIT_LOAD_COMMITTED); 76 76 } 77 77 78 void didFinishLoadForFrame(WebPageProxy&, WebFrameProxy *frame, uint64_t /* navigationID */, API::Object* /* userData */) override78 void didFinishLoadForFrame(WebPageProxy&, WebFrameProxy& frame, uint64_t /* navigationID */, API::Object* /* userData */) override 79 79 { 80 if (!frame ->isMainFrame())80 if (!frame.isMainFrame()) 81 81 return; 82 82 webkitWebViewLoadChanged(m_webView, WEBKIT_LOAD_FINISHED); 83 83 } 84 84 85 void didFailLoadWithErrorForFrame(WebPageProxy&, WebFrameProxy *frame, uint64_t /* navigationID */, const ResourceError& resourceError, API::Object* /* userData */) override85 void didFailLoadWithErrorForFrame(WebPageProxy&, WebFrameProxy& frame, uint64_t /* navigationID */, const ResourceError& resourceError, API::Object* /* userData */) override 86 86 { 87 if (!frame ->isMainFrame())87 if (!frame.isMainFrame()) 88 88 return; 89 89 GUniquePtr<GError> error(g_error_new_literal(g_quark_from_string(resourceError.domain().utf8().data()), … … 92 92 } 93 93 94 void didDisplayInsecureContentForFrame(WebPageProxy&, WebFrameProxy *, API::Object* /* userData */) override94 void didDisplayInsecureContentForFrame(WebPageProxy&, WebFrameProxy&, API::Object* /* userData */) override 95 95 { 96 96 webkitWebViewInsecureContentDetected(m_webView, WEBKIT_INSECURE_CONTENT_DISPLAYED); 97 97 } 98 98 99 void didRunInsecureContentForFrame(WebPageProxy&, WebFrameProxy *, API::Object* /* userData */) override99 void didRunInsecureContentForFrame(WebPageProxy&, WebFrameProxy&, API::Object* /* userData */) override 100 100 { 101 101 webkitWebViewInsecureContentDetected(m_webView, WEBKIT_INSECURE_CONTENT_RUN); … … 107 107 } 108 108 109 void didReceiveAuthenticationChallengeInFrame(WebPageProxy&, WebFrameProxy *, AuthenticationChallengeProxy* authenticationChallenge) override109 void didReceiveAuthenticationChallengeInFrame(WebPageProxy&, WebFrameProxy&, AuthenticationChallengeProxy* authenticationChallenge) override 110 110 { 111 111 webkitWebViewHandleAuthenticationChallenge(m_webView, authenticationChallenge);
Note: See TracChangeset
for help on using the changeset viewer.