Modified: trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h (162672 => 162673)
--- trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2014-01-24 02:08:34 UTC (rev 162672)
+++ trunk/Source/WebKit2/UIProcess/API/APILoaderClient.h 2014-01-24 02:20:08 UTC (rev 162673)
@@ -53,51 +53,51 @@
public:
virtual ~LoaderClient() { }
- virtual void didStartProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;
- virtual void didReceiveServerRedirectForProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;
- virtual void didFailProvisionalLoadWithErrorForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceError&, API::Object*) = 0;
- virtual void didCommitLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;
- virtual void didFinishDocumentLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;
- virtual void didFinishLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;
- virtual void didFailLoadWithErrorForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceError&, API::Object*) = 0;
- virtual void didSameDocumentNavigationForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::SameDocumentNavigationType, API::Object*) = 0;
- virtual void didReceiveTitleForFrame(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, API::Object*) = 0;
- virtual void didFirstLayoutForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;
+ virtual void didStartProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
+ virtual void didReceiveServerRedirectForProvisionalLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
+ virtual void didFailProvisionalLoadWithErrorForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceError&, API::Object*) { }
+ virtual void didCommitLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
+ virtual void didFinishDocumentLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
+ virtual void didFinishLoadForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
+ virtual void didFailLoadWithErrorForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceError&, API::Object*) { }
+ virtual void didSameDocumentNavigationForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::SameDocumentNavigationType, API::Object*) { }
+ virtual void didReceiveTitleForFrame(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, API::Object*) { }
+ virtual void didFirstLayoutForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
// FIXME: We should consider removing didFirstVisuallyNonEmptyLayoutForFrame since it is replaced by didLayout.
- virtual void didFirstVisuallyNonEmptyLayoutForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;
+ virtual void didFirstVisuallyNonEmptyLayoutForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
- virtual void didRemoveFrameFromHierarchy(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;
- virtual void didDisplayInsecureContentForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;
- virtual void didRunInsecureContentForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;
- virtual void didDetectXSSForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) = 0;
+ virtual void didRemoveFrameFromHierarchy(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
+ virtual void didDisplayInsecureContentForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
+ virtual void didRunInsecureContentForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
+ virtual void didDetectXSSForFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, API::Object*) { }
- virtual void didLayout(WebKit::WebPageProxy*, WebCore::LayoutMilestones, API::Object*) = 0;
+ virtual void didLayout(WebKit::WebPageProxy*, WebCore::LayoutMilestones, API::Object*) { }
- virtual bool canAuthenticateAgainstProtectionSpaceInFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::WebProtectionSpace*) = 0;
- virtual void didReceiveAuthenticationChallengeInFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::AuthenticationChallengeProxy*) = 0;
+ virtual bool canAuthenticateAgainstProtectionSpaceInFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::WebProtectionSpace*) { return false; }
+ virtual void didReceiveAuthenticationChallengeInFrame(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, WebKit::AuthenticationChallengeProxy*) { }
- virtual void didStartProgress(WebKit::WebPageProxy*) = 0;
- virtual void didChangeProgress(WebKit::WebPageProxy*)= 0;
- virtual void didFinishProgress(WebKit::WebPageProxy*)= 0;
+ virtual void didStartProgress(WebKit::WebPageProxy*) { }
+ virtual void didChangeProgress(WebKit::WebPageProxy*) { }
+ virtual void didFinishProgress(WebKit::WebPageProxy*) { }
// FIXME: These three functions should not be part of this client.
- virtual void processDidBecomeUnresponsive(WebKit::WebPageProxy*) = 0;
- virtual void interactionOccurredWhileProcessUnresponsive(WebKit::WebPageProxy*) = 0;
- virtual void processDidBecomeResponsive(WebKit::WebPageProxy*) = 0;
- virtual void processDidCrash(WebKit::WebPageProxy*) = 0;
+ virtual void processDidBecomeUnresponsive(WebKit::WebPageProxy*) { }
+ virtual void interactionOccurredWhileProcessUnresponsive(WebKit::WebPageProxy*) { }
+ virtual void processDidBecomeResponsive(WebKit::WebPageProxy*) { }
+ virtual void processDidCrash(WebKit::WebPageProxy*) { }
- virtual void didChangeBackForwardList(WebKit::WebPageProxy*, WebKit::WebBackForwardListItem* addedItem, Vector<RefPtr<API::Object>>* removedItems) = 0;
- virtual void willGoToBackForwardListItem(WebKit::WebPageProxy*, WebKit::WebBackForwardListItem*, API::Object*) = 0;
+ virtual void didChangeBackForwardList(WebKit::WebPageProxy*, WebKit::WebBackForwardListItem* addedItem, Vector<RefPtr<API::Object>>* removedItems) { }
+ virtual void willGoToBackForwardListItem(WebKit::WebPageProxy*, WebKit::WebBackForwardListItem*, API::Object*) { }
#if ENABLE(NETSCAPE_PLUGIN_API)
- virtual WebKit::PluginModuleLoadPolicy pluginLoadPolicy(WebKit::WebPageProxy*, WebKit::PluginModuleLoadPolicy currentPluginLoadPolicy, WebKit::ImmutableDictionary*, WTF::String& unavailabilityDescription, WTF::String& useBlockedPluginTitle) = 0;
- virtual void didFailToInitializePlugin(WebKit::WebPageProxy*, WebKit::ImmutableDictionary*) = 0;
- virtual void didBlockInsecurePluginVersion(WebKit::WebPageProxy*, WebKit::ImmutableDictionary*) = 0;
+ virtual WebKit::PluginModuleLoadPolicy pluginLoadPolicy(WebKit::WebPageProxy*, WebKit::PluginModuleLoadPolicy currentPluginLoadPolicy, WebKit::ImmutableDictionary*, WTF::String& unavailabilityDescription, WTF::String& useBlockedPluginTitle) { return currentPluginLoadPolicy; }
+ virtual void didFailToInitializePlugin(WebKit::WebPageProxy*, WebKit::ImmutableDictionary*) { }
+ virtual void didBlockInsecurePluginVersion(WebKit::WebPageProxy*, WebKit::ImmutableDictionary*) { }
#endif // ENABLE(NETSCAPE_PLUGIN_API)
#if ENABLE(WEBGL)
- virtual WebCore::WebGLLoadPolicy webGLLoadPolicy(WebKit::WebPageProxy*, const WTF::String&) const = 0;
+ virtual WebCore::WebGLLoadPolicy webGLLoadPolicy(WebKit::WebPageProxy*, const WTF::String&) const { return WebCore::WebGLLoadPolicy::WebGLAllow; }
#endif // ENABLE(WEBGL)
};
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (162672 => 162673)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-24 02:08:34 UTC (rev 162672)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-01-24 02:20:08 UTC (rev 162673)
@@ -402,6 +402,11 @@
void WebPageProxy::setLoaderClient(std::unique_ptr<API::LoaderClient> loaderClient)
{
+ if (!loaderClient) {
+ m_loaderClient = std::make_unique<API::LoaderClient>();
+ return;
+ }
+
m_loaderClient = std::move(loaderClient);
}
@@ -822,8 +827,7 @@
void WebPageProxy::didChangeBackForwardList(WebBackForwardListItem* added, Vector<RefPtr<API::Object>>* removed)
{
- if (m_loaderClient)
- m_loaderClient->didChangeBackForwardList(this, added, removed);
+ m_loaderClient->didChangeBackForwardList(this, added, removed);
}
void WebPageProxy::willGoToBackForwardListItem(uint64_t itemID, IPC::MessageDecoder& decoder)
@@ -833,10 +837,8 @@
if (!decoder.decode(messageDecoder))
return;
- if (WebBackForwardListItem* item = m_process->webBackForwardItem(itemID)) {
- if (m_loaderClient)
- m_loaderClient->willGoToBackForwardListItem(this, item, userData.get());
- }
+ if (WebBackForwardListItem* item = m_process->webBackForwardItem(itemID))
+ m_loaderClient->willGoToBackForwardListItem(this, item, userData.get());
}
bool WebPageProxy::canShowMIMEType(const String& mimeType)
@@ -1331,8 +1333,7 @@
#if PLATFORM(MAC)
RefPtr<ImmutableDictionary> pluginInformation = createPluginInformationDictionary(plugin, frameURLString, String(), pageURLString, String(), String());
- if (m_loaderClient)
- pluginLoadPolicy = m_loaderClient->pluginLoadPolicy(this, static_cast<PluginModuleLoadPolicy>(pluginLoadPolicy), pluginInformation.get(), unavailabilityDescription, useBlockedPluginTitle);
+ pluginLoadPolicy = m_loaderClient->pluginLoadPolicy(this, static_cast<PluginModuleLoadPolicy>(pluginLoadPolicy), pluginInformation.get(), unavailabilityDescription, useBlockedPluginTitle);
#else
UNUSED_PARAM(frameURLString);
UNUSED_PARAM(pageURLString);
@@ -2068,8 +2069,7 @@
m_pageLoadState.didStartProgress(transaction);
m_pageLoadState.commitChanges();
- if (m_loaderClient)
- m_loaderClient->didStartProgress(this);
+ m_loaderClient->didStartProgress(this);
}
void WebPageProxy::didChangeProgress(double value)
@@ -2078,8 +2078,7 @@
m_pageLoadState.didChangeProgress(transaction, value);
m_pageLoadState.commitChanges();
- if (m_loaderClient)
- m_loaderClient->didChangeProgress(this);
+ m_loaderClient->didChangeProgress(this);
}
void WebPageProxy::didFinishProgress()
@@ -2088,8 +2087,7 @@
m_pageLoadState.didFinishProgress(transaction);
m_pageLoadState.commitChanges();
- if (m_loaderClient)
- m_loaderClient->didFinishProgress(this);
+ m_loaderClient->didFinishProgress(this);
}
void WebPageProxy::didStartProvisionalLoadForFrame(uint64_t frameID, const String& url, const String& unreachableURL, IPC::MessageDecoder& decoder)
@@ -2114,8 +2112,7 @@
frame->didStartProvisionalLoad(url);
m_pageLoadState.commitChanges();
- if (m_loaderClient)
- m_loaderClient->didStartProvisionalLoadForFrame(this, frame, userData.get());
+ m_loaderClient->didStartProvisionalLoadForFrame(this, frame, userData.get());
}
void WebPageProxy::didReceiveServerRedirectForProvisionalLoadForFrame(uint64_t frameID, const String& url, IPC::MessageDecoder& decoder)
@@ -2137,8 +2134,7 @@
frame->didReceiveServerRedirectForProvisionalLoad(url);
m_pageLoadState.commitChanges();
- if (m_loaderClient)
- m_loaderClient->didReceiveServerRedirectForProvisionalLoadForFrame(this, frame, userData.get());
+ m_loaderClient->didReceiveServerRedirectForProvisionalLoadForFrame(this, frame, userData.get());
}
void WebPageProxy::didFailProvisionalLoadForFrame(uint64_t frameID, const ResourceError& error, IPC::MessageDecoder& decoder)
@@ -2159,8 +2155,7 @@
frame->didFailProvisionalLoad();
m_pageLoadState.commitChanges();
- if (m_loaderClient)
- m_loaderClient->didFailProvisionalLoadWithErrorForFrame(this, frame, error, userData.get());
+ m_loaderClient->didFailProvisionalLoadWithErrorForFrame(this, frame, error, userData.get());
}
void WebPageProxy::clearLoadDependentCallbacks()
@@ -2213,8 +2208,7 @@
m_pageScaleFactor = 1;
m_pageLoadState.commitChanges();
- if (m_loaderClient)
- m_loaderClient->didCommitLoadForFrame(this, frame, userData.get());
+ m_loaderClient->didCommitLoadForFrame(this, frame, userData.get());
}
void WebPageProxy::didFinishDocumentLoadForFrame(uint64_t frameID, IPC::MessageDecoder& decoder)
@@ -2227,8 +2221,7 @@
WebFrameProxy* frame = m_process->webFrame(frameID);
MESSAGE_CHECK(frame);
- if (m_loaderClient)
- m_loaderClient->didFinishDocumentLoadForFrame(this, frame, userData.get());
+ m_loaderClient->didFinishDocumentLoadForFrame(this, frame, userData.get());
}
void WebPageProxy::didFinishLoadForFrame(uint64_t frameID, IPC::MessageDecoder& decoder)
@@ -2249,8 +2242,7 @@
frame->didFinishLoad();
m_pageLoadState.commitChanges();
- if (m_loaderClient)
- m_loaderClient->didFinishLoadForFrame(this, frame, userData.get());
+ m_loaderClient->didFinishLoadForFrame(this, frame, userData.get());
}
void WebPageProxy::didFailLoadForFrame(uint64_t frameID, const ResourceError& error, IPC::MessageDecoder& decoder)
@@ -2273,8 +2265,7 @@
frame->didFailLoad();
m_pageLoadState.commitChanges();
- if (m_loaderClient)
- m_loaderClient->didFailLoadWithErrorForFrame(this, frame, error, userData.get());
+ m_loaderClient->didFailLoadWithErrorForFrame(this, frame, error, userData.get());
}
void WebPageProxy::didSameDocumentNavigationForFrame(uint64_t frameID, uint32_t opaqueSameDocumentNavigationType, const String& url, IPC::MessageDecoder& decoder)
@@ -2297,8 +2288,7 @@
frame->didSameDocumentNavigation(url);
m_pageLoadState.commitChanges();
- if (m_loaderClient)
- m_loaderClient->didSameDocumentNavigationForFrame(this, frame, static_cast<SameDocumentNavigationType>(opaqueSameDocumentNavigationType), userData.get());
+ m_loaderClient->didSameDocumentNavigationForFrame(this, frame, static_cast<SameDocumentNavigationType>(opaqueSameDocumentNavigationType), userData.get());
}
void WebPageProxy::didReceiveTitleForFrame(uint64_t frameID, const String& title, IPC::MessageDecoder& decoder)
@@ -2319,8 +2309,7 @@
frame->didChangeTitle(title);
m_pageLoadState.commitChanges();
- if (m_loaderClient)
- m_loaderClient->didReceiveTitleForFrame(this, title, frame, userData.get());
+ m_loaderClient->didReceiveTitleForFrame(this, title, frame, userData.get());
}
void WebPageProxy::didFirstLayoutForFrame(uint64_t frameID, IPC::MessageDecoder& decoder)
@@ -2333,8 +2322,7 @@
WebFrameProxy* frame = m_process->webFrame(frameID);
MESSAGE_CHECK(frame);
- if (m_loaderClient)
- m_loaderClient->didFirstLayoutForFrame(this, frame, userData.get());
+ m_loaderClient->didFirstLayoutForFrame(this, frame, userData.get());
}
void WebPageProxy::didFirstVisuallyNonEmptyLayoutForFrame(uint64_t frameID, IPC::MessageDecoder& decoder)
@@ -2347,8 +2335,7 @@
WebFrameProxy* frame = m_process->webFrame(frameID);
MESSAGE_CHECK(frame);
- if (m_loaderClient)
- m_loaderClient->didFirstVisuallyNonEmptyLayoutForFrame(this, frame, userData.get());
+ m_loaderClient->didFirstVisuallyNonEmptyLayoutForFrame(this, frame, userData.get());
}
void WebPageProxy::didLayout(uint32_t layoutMilestones, IPC::MessageDecoder& decoder)
@@ -2358,8 +2345,7 @@
if (!decoder.decode(messageDecoder))
return;
- if (m_loaderClient)
- m_loaderClient->didLayout(this, static_cast<LayoutMilestones>(layoutMilestones), userData.get());
+ m_loaderClient->didLayout(this, static_cast<LayoutMilestones>(layoutMilestones), userData.get());
}
void WebPageProxy::didRemoveFrameFromHierarchy(uint64_t frameID, IPC::MessageDecoder& decoder)
@@ -2372,8 +2358,7 @@
WebFrameProxy* frame = m_process->webFrame(frameID);
MESSAGE_CHECK(frame);
- if (m_loaderClient)
- m_loaderClient->didRemoveFrameFromHierarchy(this, frame, userData.get());
+ m_loaderClient->didRemoveFrameFromHierarchy(this, frame, userData.get());
}
void WebPageProxy::didDisplayInsecureContentForFrame(uint64_t frameID, IPC::MessageDecoder& decoder)
@@ -2390,8 +2375,7 @@
m_pageLoadState.didDisplayOrRunInsecureContent(transaction);
m_pageLoadState.commitChanges();
- if (m_loaderClient)
- m_loaderClient->didDisplayInsecureContentForFrame(this, frame, userData.get());
+ m_loaderClient->didDisplayInsecureContentForFrame(this, frame, userData.get());
}
void WebPageProxy::didRunInsecureContentForFrame(uint64_t frameID, IPC::MessageDecoder& decoder)
@@ -2408,8 +2392,7 @@
m_pageLoadState.didDisplayOrRunInsecureContent(transaction);
m_pageLoadState.commitChanges();
- if (m_loaderClient)
- m_loaderClient->didRunInsecureContentForFrame(this, frame, userData.get());
+ m_loaderClient->didRunInsecureContentForFrame(this, frame, userData.get());
}
void WebPageProxy::didDetectXSSForFrame(uint64_t frameID, IPC::MessageDecoder& decoder)
@@ -2422,8 +2405,7 @@
WebFrameProxy* frame = m_process->webFrame(frameID);
MESSAGE_CHECK(frame);
- if (m_loaderClient)
- m_loaderClient->didDetectXSSForFrame(this, frame, userData.get());
+ m_loaderClient->didDetectXSSForFrame(this, frame, userData.get());
}
void WebPageProxy::frameDidBecomeFrameSet(uint64_t frameID, bool value)
@@ -2704,10 +2686,7 @@
#if ENABLE(WEBGL)
void WebPageProxy::webGLPolicyForURL(const String& url, uint32_t& loadPolicy)
{
- if (!m_loaderClient)
- loadPolicy = WebGLAllow;
- else
- loadPolicy = static_cast<uint32_t>(m_loaderClient->webGLLoadPolicy(this, url));
+ loadPolicy = static_cast<uint32_t>(m_loaderClient->webGLLoadPolicy(this, url));
}
#endif // ENABLE(WEBGL)
@@ -3737,8 +3716,7 @@
updateBackingStoreDiscardableState();
- if (m_loaderClient)
- m_loaderClient->processDidBecomeUnresponsive(this);
+ m_loaderClient->processDidBecomeUnresponsive(this);
}
void WebPageProxy::interactionOccurredWhileProcessUnresponsive()
@@ -3746,8 +3724,7 @@
if (!isValid())
return;
- if (m_loaderClient)
- m_loaderClient->interactionOccurredWhileProcessUnresponsive(this);
+ m_loaderClient->interactionOccurredWhileProcessUnresponsive(this);
}
void WebPageProxy::processDidBecomeResponsive()
@@ -3757,8 +3734,7 @@
updateBackingStoreDiscardableState();
- if (m_loaderClient)
- m_loaderClient->processDidBecomeResponsive(this);
+ m_loaderClient->processDidBecomeResponsive(this);
}
void WebPageProxy::processDidCrash()
@@ -3773,8 +3749,7 @@
m_pageClient.processDidCrash();
- if (m_loaderClient)
- m_loaderClient->processDidCrash(this);
+ m_loaderClient->processDidCrash(this);
}
void WebPageProxy::resetState()
@@ -3973,10 +3948,7 @@
RefPtr<WebProtectionSpace> protectionSpace = WebProtectionSpace::create(coreProtectionSpace);
- if (!m_loaderClient)
- canAuthenticate = false;
- else
- canAuthenticate = m_loaderClient->canAuthenticateAgainstProtectionSpaceInFrame(this, frame, protectionSpace.get());
+ canAuthenticate = m_loaderClient->canAuthenticateAgainstProtectionSpaceInFrame(this, frame, protectionSpace.get());
}
void WebPageProxy::didReceiveAuthenticationChallenge(uint64_t frameID, const AuthenticationChallenge& coreChallenge, uint64_t challengeID)
@@ -3992,8 +3964,7 @@
MESSAGE_CHECK(frame);
RefPtr<AuthenticationChallengeProxy> authenticationChallenge = prpAuthenticationChallenge;
- if (m_loaderClient)
- m_loaderClient->didReceiveAuthenticationChallengeInFrame(this, frame, authenticationChallenge.get());
+ m_loaderClient->didReceiveAuthenticationChallengeInFrame(this, frame, authenticationChallenge.get());
}
void WebPageProxy::exceededDatabaseQuota(uint64_t frameID, const String& originIdentifier, const String& databaseName, const String& displayName, uint64_t currentQuota, uint64_t currentOriginUsage, uint64_t currentDatabaseUsage, uint64_t expectedUsage, PassRefPtr<Messages::WebPageProxy::ExceededDatabaseQuota::DelayedReply> reply)
@@ -4151,8 +4122,7 @@
#if ENABLE(NETSCAPE_PLUGIN_API)
void WebPageProxy::didFailToInitializePlugin(const String& mimeType, const String& frameURLString, const String& pageURLString)
{
- if (m_loaderClient)
- m_loaderClient->didFailToInitializePlugin(this, createPluginInformationDictionary(mimeType, frameURLString, pageURLString).get());
+ m_loaderClient->didFailToInitializePlugin(this, createPluginInformationDictionary(mimeType, frameURLString, pageURLString).get());
}
void WebPageProxy::didBlockInsecurePluginVersion(const String& mimeType, const String& pluginURLString, const String& frameURLString, const String& pageURLString, bool replacementObscured)
@@ -4171,8 +4141,7 @@
UNUSED_PARAM(replacementObscured);
#endif
- if (m_loaderClient)
- m_loaderClient->didBlockInsecurePluginVersion(this, pluginInformation.get());
+ m_loaderClient->didBlockInsecurePluginVersion(this, pluginInformation.get());
}
#endif // ENABLE(NETSCAPE_PLUGIN_API)
