Changeset 162673 in webkit
- Timestamp:
- Jan 23, 2014 6:20:08 PM (10 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r162672 r162673 1 2014-01-23 Anders Carlsson <andersca@apple.com> 2 3 Simplify API::LoaderClient management 4 https://bugs.webkit.org/show_bug.cgi?id=127531 5 6 Reviewed by Tim Horton. 7 8 Add default implementations to API::LoaderClient and change WebPageProxy::setLoaderClient to 9 always create a policy client, even if the loader client set is null. That way we don't have to null 10 check the loader client everywhere. 11 12 * UIProcess/API/APILoaderClient.h: 13 (API::LoaderClient::didStartProvisionalLoadForFrame): 14 (API::LoaderClient::didReceiveServerRedirectForProvisionalLoadForFrame): 15 (API::LoaderClient::didFailProvisionalLoadWithErrorForFrame): 16 (API::LoaderClient::didCommitLoadForFrame): 17 (API::LoaderClient::didFinishDocumentLoadForFrame): 18 (API::LoaderClient::didFinishLoadForFrame): 19 (API::LoaderClient::didFailLoadWithErrorForFrame): 20 (API::LoaderClient::didSameDocumentNavigationForFrame): 21 (API::LoaderClient::didReceiveTitleForFrame): 22 (API::LoaderClient::didFirstLayoutForFrame): 23 (API::LoaderClient::didFirstVisuallyNonEmptyLayoutForFrame): 24 (API::LoaderClient::didRemoveFrameFromHierarchy): 25 (API::LoaderClient::didDisplayInsecureContentForFrame): 26 (API::LoaderClient::didRunInsecureContentForFrame): 27 (API::LoaderClient::didDetectXSSForFrame): 28 (API::LoaderClient::didLayout): 29 (API::LoaderClient::canAuthenticateAgainstProtectionSpaceInFrame): 30 (API::LoaderClient::didReceiveAuthenticationChallengeInFrame): 31 (API::LoaderClient::didStartProgress): 32 (API::LoaderClient::didChangeProgress): 33 (API::LoaderClient::didFinishProgress): 34 (API::LoaderClient::processDidBecomeUnresponsive): 35 (API::LoaderClient::interactionOccurredWhileProcessUnresponsive): 36 (API::LoaderClient::processDidBecomeResponsive): 37 (API::LoaderClient::processDidCrash): 38 (API::LoaderClient::didChangeBackForwardList): 39 (API::LoaderClient::willGoToBackForwardListItem): 40 (API::LoaderClient::pluginLoadPolicy): 41 (API::LoaderClient::didFailToInitializePlugin): 42 (API::LoaderClient::didBlockInsecurePluginVersion): 43 (API::LoaderClient::webGLLoadPolicy): 44 * UIProcess/WebPageProxy.cpp: 45 (WebKit::WebPageProxy::setLoaderClient): 46 (WebKit::WebPageProxy::didChangeBackForwardList): 47 (WebKit::WebPageProxy::willGoToBackForwardListItem): 48 (WebKit::WebPageProxy::findPlugin): 49 (WebKit::WebPageProxy::didStartProgress): 50 (WebKit::WebPageProxy::didChangeProgress): 51 (WebKit::WebPageProxy::didFinishProgress): 52 (WebKit::WebPageProxy::didStartProvisionalLoadForFrame): 53 (WebKit::WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrame): 54 (WebKit::WebPageProxy::didFailProvisionalLoadForFrame): 55 (WebKit::WebPageProxy::didCommitLoadForFrame): 56 (WebKit::WebPageProxy::didFinishDocumentLoadForFrame): 57 (WebKit::WebPageProxy::didFinishLoadForFrame): 58 (WebKit::WebPageProxy::didFailLoadForFrame): 59 (WebKit::WebPageProxy::didSameDocumentNavigationForFrame): 60 (WebKit::WebPageProxy::didReceiveTitleForFrame): 61 (WebKit::WebPageProxy::didFirstLayoutForFrame): 62 (WebKit::WebPageProxy::didFirstVisuallyNonEmptyLayoutForFrame): 63 (WebKit::WebPageProxy::didLayout): 64 (WebKit::WebPageProxy::didRemoveFrameFromHierarchy): 65 (WebKit::WebPageProxy::didDisplayInsecureContentForFrame): 66 (WebKit::WebPageProxy::didRunInsecureContentForFrame): 67 (WebKit::WebPageProxy::didDetectXSSForFrame): 68 (WebKit::WebPageProxy::webGLPolicyForURL): 69 (WebKit::WebPageProxy::processDidBecomeUnresponsive): 70 (WebKit::WebPageProxy::interactionOccurredWhileProcessUnresponsive): 71 (WebKit::WebPageProxy::processDidBecomeResponsive): 72 (WebKit::WebPageProxy::processDidCrash): 73 (WebKit::WebPageProxy::canAuthenticateAgainstProtectionSpaceInFrame): 74 (WebKit::WebPageProxy::didReceiveAuthenticationChallengeProxy): 75 (WebKit::WebPageProxy::didFailToInitializePlugin): 76 (WebKit::WebPageProxy::didBlockInsecurePluginVersion): 77 1 78 2014-01-23 Anders Carlsson <andersca@apple.com> 2 79 -
trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h
r162670 r162673 54 54 virtual ~LoaderClient() { } 55 55 56 virtual void didStartProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;57 virtual void didReceiveServerRedirectForProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;58 virtual void didFailProvisionalLoadWithErrorForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceError&, API::Object*) = 0;59 virtual void didCommitLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;60 virtual void didFinishDocumentLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;61 virtual void didFinishLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;62 virtual void didFailLoadWithErrorForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceError&, API::Object*) = 0;63 virtual void didSameDocumentNavigationForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::SameDocumentNavigationType, API::Object*) = 0;64 virtual void didReceiveTitleForFrame(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, API::Object*) = 0;65 virtual void didFirstLayoutForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;56 virtual void didStartProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { } 57 virtual void didReceiveServerRedirectForProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { } 58 virtual void didFailProvisionalLoadWithErrorForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceError&, API::Object*) { } 59 virtual void didCommitLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { } 60 virtual void didFinishDocumentLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { } 61 virtual void didFinishLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { } 62 virtual void didFailLoadWithErrorForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceError&, API::Object*) { } 63 virtual void didSameDocumentNavigationForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::SameDocumentNavigationType, API::Object*) { } 64 virtual void didReceiveTitleForFrame(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, API::Object*) { } 65 virtual void didFirstLayoutForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { } 66 66 67 67 // FIXME: We should consider removing didFirstVisuallyNonEmptyLayoutForFrame since it is replaced by didLayout. 68 virtual void didFirstVisuallyNonEmptyLayoutForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;68 virtual void didFirstVisuallyNonEmptyLayoutForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { } 69 69 70 virtual void didRemoveFrameFromHierarchy(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;71 virtual void didDisplayInsecureContentForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;72 virtual void didRunInsecureContentForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;73 virtual void didDetectXSSForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;70 virtual void didRemoveFrameFromHierarchy(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { } 71 virtual void didDisplayInsecureContentForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { } 72 virtual void didRunInsecureContentForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { } 73 virtual void didDetectXSSForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { } 74 74 75 virtual void didLayout(WebKit::WebPageProxy*, WebCore::LayoutMilestones, API::Object*) = 0;75 virtual void didLayout(WebKit::WebPageProxy*, WebCore::LayoutMilestones, API::Object*) { } 76 76 77 virtual bool canAuthenticateAgainstProtectionSpaceInFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::WebProtectionSpace*) = 0;78 virtual void didReceiveAuthenticationChallengeInFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::AuthenticationChallengeProxy*) = 0;77 virtual bool canAuthenticateAgainstProtectionSpaceInFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::WebProtectionSpace*) { return false; } 78 virtual void didReceiveAuthenticationChallengeInFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::AuthenticationChallengeProxy*) { } 79 79 80 virtual void didStartProgress(WebKit::WebPageProxy*) = 0;81 virtual void didChangeProgress(WebKit::WebPageProxy*) = 0;82 virtual void didFinishProgress(WebKit::WebPageProxy*) = 0;80 virtual void didStartProgress(WebKit::WebPageProxy*) { } 81 virtual void didChangeProgress(WebKit::WebPageProxy*) { } 82 virtual void didFinishProgress(WebKit::WebPageProxy*) { } 83 83 84 84 // FIXME: These three functions should not be part of this client. 85 virtual void processDidBecomeUnresponsive(WebKit::WebPageProxy*) = 0;86 virtual void interactionOccurredWhileProcessUnresponsive(WebKit::WebPageProxy*) = 0;87 virtual void processDidBecomeResponsive(WebKit::WebPageProxy*) = 0;88 virtual void processDidCrash(WebKit::WebPageProxy*) = 0;85 virtual void processDidBecomeUnresponsive(WebKit::WebPageProxy*) { } 86 virtual void interactionOccurredWhileProcessUnresponsive(WebKit::WebPageProxy*) { } 87 virtual void processDidBecomeResponsive(WebKit::WebPageProxy*) { } 88 virtual void processDidCrash(WebKit::WebPageProxy*) { } 89 89 90 virtual void didChangeBackForwardList(WebKit::WebPageProxy*, WebKit::WebBackForwardListItem* addedItem, Vector<RefPtr<API::Object>>* removedItems) = 0;91 virtual void willGoToBackForwardListItem(WebKit::WebPageProxy*, WebKit::WebBackForwardListItem*, API::Object*) = 0;90 virtual void didChangeBackForwardList(WebKit::WebPageProxy*, WebKit::WebBackForwardListItem* addedItem, Vector<RefPtr<API::Object>>* removedItems) { } 91 virtual void willGoToBackForwardListItem(WebKit::WebPageProxy*, WebKit::WebBackForwardListItem*, API::Object*) { } 92 92 93 93 #if ENABLE(NETSCAPE_PLUGIN_API) 94 virtual WebKit::PluginModuleLoadPolicy pluginLoadPolicy(WebKit::WebPageProxy*, WebKit::PluginModuleLoadPolicy currentPluginLoadPolicy, WebKit::ImmutableDictionary*, WTF::String& unavailabilityDescription, WTF::String& useBlockedPluginTitle) = 0;95 virtual void didFailToInitializePlugin(WebKit::WebPageProxy*, WebKit::ImmutableDictionary*) = 0;96 virtual void didBlockInsecurePluginVersion(WebKit::WebPageProxy*, WebKit::ImmutableDictionary*) = 0;94 virtual WebKit::PluginModuleLoadPolicy pluginLoadPolicy(WebKit::WebPageProxy*, WebKit::PluginModuleLoadPolicy currentPluginLoadPolicy, WebKit::ImmutableDictionary*, WTF::String& unavailabilityDescription, WTF::String& useBlockedPluginTitle) { return currentPluginLoadPolicy; } 95 virtual void didFailToInitializePlugin(WebKit::WebPageProxy*, WebKit::ImmutableDictionary*) { } 96 virtual void didBlockInsecurePluginVersion(WebKit::WebPageProxy*, WebKit::ImmutableDictionary*) { } 97 97 #endif // ENABLE(NETSCAPE_PLUGIN_API) 98 98 99 99 #if ENABLE(WEBGL) 100 virtual WebCore::WebGLLoadPolicy webGLLoadPolicy(WebKit::WebPageProxy*, const WTF::String&) const = 0;100 virtual WebCore::WebGLLoadPolicy webGLLoadPolicy(WebKit::WebPageProxy*, const WTF::String&) const { return WebCore::WebGLLoadPolicy::WebGLAllow; } 101 101 #endif // ENABLE(WEBGL) 102 102 }; -
trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp
r162672 r162673 403 403 void WebPageProxy::setLoaderClient(std::unique_ptr<API::LoaderClient> loaderClient) 404 404 { 405 if (!loaderClient) { 406 m_loaderClient = std::make_unique<API::LoaderClient>(); 407 return; 408 } 409 405 410 m_loaderClient = std::move(loaderClient); 406 411 } … … 823 828 void WebPageProxy::didChangeBackForwardList(WebBackForwardListItem* added, Vector<RefPtr<API::Object>>* removed) 824 829 { 825 if (m_loaderClient) 826 m_loaderClient->didChangeBackForwardList(this, added, removed); 830 m_loaderClient->didChangeBackForwardList(this, added, removed); 827 831 } 828 832 … … 834 838 return; 835 839 836 if (WebBackForwardListItem* item = m_process->webBackForwardItem(itemID)) { 837 if (m_loaderClient) 838 m_loaderClient->willGoToBackForwardListItem(this, item, userData.get()); 839 } 840 if (WebBackForwardListItem* item = m_process->webBackForwardItem(itemID)) 841 m_loaderClient->willGoToBackForwardListItem(this, item, userData.get()); 840 842 } 841 843 … … 1332 1334 #if PLATFORM(MAC) 1333 1335 RefPtr<ImmutableDictionary> pluginInformation = createPluginInformationDictionary(plugin, frameURLString, String(), pageURLString, String(), String()); 1334 if (m_loaderClient) 1335 pluginLoadPolicy = m_loaderClient->pluginLoadPolicy(this, static_cast<PluginModuleLoadPolicy>(pluginLoadPolicy), pluginInformation.get(), unavailabilityDescription, useBlockedPluginTitle); 1336 pluginLoadPolicy = m_loaderClient->pluginLoadPolicy(this, static_cast<PluginModuleLoadPolicy>(pluginLoadPolicy), pluginInformation.get(), unavailabilityDescription, useBlockedPluginTitle); 1336 1337 #else 1337 1338 UNUSED_PARAM(frameURLString); … … 2069 2070 2070 2071 m_pageLoadState.commitChanges(); 2071 if (m_loaderClient) 2072 m_loaderClient->didStartProgress(this); 2072 m_loaderClient->didStartProgress(this); 2073 2073 } 2074 2074 … … 2079 2079 2080 2080 m_pageLoadState.commitChanges(); 2081 if (m_loaderClient) 2082 m_loaderClient->didChangeProgress(this); 2081 m_loaderClient->didChangeProgress(this); 2083 2082 } 2084 2083 … … 2089 2088 2090 2089 m_pageLoadState.commitChanges(); 2091 if (m_loaderClient) 2092 m_loaderClient->didFinishProgress(this); 2090 m_loaderClient->didFinishProgress(this); 2093 2091 } 2094 2092 … … 2115 2113 2116 2114 m_pageLoadState.commitChanges(); 2117 if (m_loaderClient) 2118 m_loaderClient->didStartProvisionalLoadForFrame(this, frame, userData.get()); 2115 m_loaderClient->didStartProvisionalLoadForFrame(this, frame, userData.get()); 2119 2116 } 2120 2117 … … 2138 2135 2139 2136 m_pageLoadState.commitChanges(); 2140 if (m_loaderClient) 2141 m_loaderClient->didReceiveServerRedirectForProvisionalLoadForFrame(this, frame, userData.get()); 2137 m_loaderClient->didReceiveServerRedirectForProvisionalLoadForFrame(this, frame, userData.get()); 2142 2138 } 2143 2139 … … 2160 2156 2161 2157 m_pageLoadState.commitChanges(); 2162 if (m_loaderClient) 2163 m_loaderClient->didFailProvisionalLoadWithErrorForFrame(this, frame, error, userData.get()); 2158 m_loaderClient->didFailProvisionalLoadWithErrorForFrame(this, frame, error, userData.get()); 2164 2159 } 2165 2160 … … 2214 2209 2215 2210 m_pageLoadState.commitChanges(); 2216 if (m_loaderClient) 2217 m_loaderClient->didCommitLoadForFrame(this, frame, userData.get()); 2211 m_loaderClient->didCommitLoadForFrame(this, frame, userData.get()); 2218 2212 } 2219 2213 … … 2228 2222 MESSAGE_CHECK(frame); 2229 2223 2230 if (m_loaderClient) 2231 m_loaderClient->didFinishDocumentLoadForFrame(this, frame, userData.get()); 2224 m_loaderClient->didFinishDocumentLoadForFrame(this, frame, userData.get()); 2232 2225 } 2233 2226 … … 2250 2243 2251 2244 m_pageLoadState.commitChanges(); 2252 if (m_loaderClient) 2253 m_loaderClient->didFinishLoadForFrame(this, frame, userData.get()); 2245 m_loaderClient->didFinishLoadForFrame(this, frame, userData.get()); 2254 2246 } 2255 2247 … … 2274 2266 2275 2267 m_pageLoadState.commitChanges(); 2276 if (m_loaderClient) 2277 m_loaderClient->didFailLoadWithErrorForFrame(this, frame, error, userData.get()); 2268 m_loaderClient->didFailLoadWithErrorForFrame(this, frame, error, userData.get()); 2278 2269 } 2279 2270 … … 2298 2289 2299 2290 m_pageLoadState.commitChanges(); 2300 if (m_loaderClient) 2301 m_loaderClient->didSameDocumentNavigationForFrame(this, frame, static_cast<SameDocumentNavigationType>(opaqueSameDocumentNavigationType), userData.get()); 2291 m_loaderClient->didSameDocumentNavigationForFrame(this, frame, static_cast<SameDocumentNavigationType>(opaqueSameDocumentNavigationType), userData.get()); 2302 2292 } 2303 2293 … … 2320 2310 2321 2311 m_pageLoadState.commitChanges(); 2322 if (m_loaderClient) 2323 m_loaderClient->didReceiveTitleForFrame(this, title, frame, userData.get()); 2312 m_loaderClient->didReceiveTitleForFrame(this, title, frame, userData.get()); 2324 2313 } 2325 2314 … … 2334 2323 MESSAGE_CHECK(frame); 2335 2324 2336 if (m_loaderClient) 2337 m_loaderClient->didFirstLayoutForFrame(this, frame, userData.get()); 2325 m_loaderClient->didFirstLayoutForFrame(this, frame, userData.get()); 2338 2326 } 2339 2327 … … 2348 2336 MESSAGE_CHECK(frame); 2349 2337 2350 if (m_loaderClient) 2351 m_loaderClient->didFirstVisuallyNonEmptyLayoutForFrame(this, frame, userData.get()); 2338 m_loaderClient->didFirstVisuallyNonEmptyLayoutForFrame(this, frame, userData.get()); 2352 2339 } 2353 2340 … … 2359 2346 return; 2360 2347 2361 if (m_loaderClient) 2362 m_loaderClient->didLayout(this, static_cast<LayoutMilestones>(layoutMilestones), userData.get()); 2348 m_loaderClient->didLayout(this, static_cast<LayoutMilestones>(layoutMilestones), userData.get()); 2363 2349 } 2364 2350 … … 2373 2359 MESSAGE_CHECK(frame); 2374 2360 2375 if (m_loaderClient) 2376 m_loaderClient->didRemoveFrameFromHierarchy(this, frame, userData.get()); 2361 m_loaderClient->didRemoveFrameFromHierarchy(this, frame, userData.get()); 2377 2362 } 2378 2363 … … 2391 2376 2392 2377 m_pageLoadState.commitChanges(); 2393 if (m_loaderClient) 2394 m_loaderClient->didDisplayInsecureContentForFrame(this, frame, userData.get()); 2378 m_loaderClient->didDisplayInsecureContentForFrame(this, frame, userData.get()); 2395 2379 } 2396 2380 … … 2409 2393 2410 2394 m_pageLoadState.commitChanges(); 2411 if (m_loaderClient) 2412 m_loaderClient->didRunInsecureContentForFrame(this, frame, userData.get()); 2395 m_loaderClient->didRunInsecureContentForFrame(this, frame, userData.get()); 2413 2396 } 2414 2397 … … 2423 2406 MESSAGE_CHECK(frame); 2424 2407 2425 if (m_loaderClient) 2426 m_loaderClient->didDetectXSSForFrame(this, frame, userData.get()); 2408 m_loaderClient->didDetectXSSForFrame(this, frame, userData.get()); 2427 2409 } 2428 2410 … … 2705 2687 void WebPageProxy::webGLPolicyForURL(const String& url, uint32_t& loadPolicy) 2706 2688 { 2707 if (!m_loaderClient) 2708 loadPolicy = WebGLAllow; 2709 else 2710 loadPolicy = static_cast<uint32_t>(m_loaderClient->webGLLoadPolicy(this, url)); 2689 loadPolicy = static_cast<uint32_t>(m_loaderClient->webGLLoadPolicy(this, url)); 2711 2690 } 2712 2691 #endif // ENABLE(WEBGL) … … 3738 3717 updateBackingStoreDiscardableState(); 3739 3718 3740 if (m_loaderClient) 3741 m_loaderClient->processDidBecomeUnresponsive(this); 3719 m_loaderClient->processDidBecomeUnresponsive(this); 3742 3720 } 3743 3721 … … 3747 3725 return; 3748 3726 3749 if (m_loaderClient) 3750 m_loaderClient->interactionOccurredWhileProcessUnresponsive(this); 3727 m_loaderClient->interactionOccurredWhileProcessUnresponsive(this); 3751 3728 } 3752 3729 … … 3758 3735 updateBackingStoreDiscardableState(); 3759 3736 3760 if (m_loaderClient) 3761 m_loaderClient->processDidBecomeResponsive(this); 3737 m_loaderClient->processDidBecomeResponsive(this); 3762 3738 } 3763 3739 … … 3774 3750 m_pageClient.processDidCrash(); 3775 3751 3776 if (m_loaderClient) 3777 m_loaderClient->processDidCrash(this); 3752 m_loaderClient->processDidCrash(this); 3778 3753 } 3779 3754 … … 3974 3949 RefPtr<WebProtectionSpace> protectionSpace = WebProtectionSpace::create(coreProtectionSpace); 3975 3950 3976 if (!m_loaderClient) 3977 canAuthenticate = false; 3978 else 3979 canAuthenticate = m_loaderClient->canAuthenticateAgainstProtectionSpaceInFrame(this, frame, protectionSpace.get()); 3951 canAuthenticate = m_loaderClient->canAuthenticateAgainstProtectionSpaceInFrame(this, frame, protectionSpace.get()); 3980 3952 } 3981 3953 … … 3993 3965 3994 3966 RefPtr<AuthenticationChallengeProxy> authenticationChallenge = prpAuthenticationChallenge; 3995 if (m_loaderClient) 3996 m_loaderClient->didReceiveAuthenticationChallengeInFrame(this, frame, authenticationChallenge.get()); 3967 m_loaderClient->didReceiveAuthenticationChallengeInFrame(this, frame, authenticationChallenge.get()); 3997 3968 } 3998 3969 … … 4152 4123 void WebPageProxy::didFailToInitializePlugin(const String& mimeType, const String& frameURLString, const String& pageURLString) 4153 4124 { 4154 if (m_loaderClient) 4155 m_loaderClient->didFailToInitializePlugin(this, createPluginInformationDictionary(mimeType, frameURLString, pageURLString).get()); 4125 m_loaderClient->didFailToInitializePlugin(this, createPluginInformationDictionary(mimeType, frameURLString, pageURLString).get()); 4156 4126 } 4157 4127 … … 4172 4142 #endif 4173 4143 4174 if (m_loaderClient) 4175 m_loaderClient->didBlockInsecurePluginVersion(this, pluginInformation.get()); 4144 m_loaderClient->didBlockInsecurePluginVersion(this, pluginInformation.get()); 4176 4145 } 4177 4146 #endif // ENABLE(NETSCAPE_PLUGIN_API)
Note: See TracChangeset
for help on using the changeset viewer.