Initial patch.

[vuplus_webkit] / Source / WebKit / chromium / src / FrameLoaderClientImpl.cpp

diff --git a/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp b/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp
index 6b17cf9..fa06d6a 100644 (file)
--- a/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp
+++ b/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp
@@ -202,11 +202,11 @@ bool FrameLoaderClientImpl::allowPlugins(bool enabledPerSettings)
     return enabledPerSettings;
 }
 
-bool FrameLoaderClientImpl::allowImages(bool enabledPerSettings)
+bool FrameLoaderClientImpl::allowImage(bool enabledPerSettings, const KURL& imageURL)
 {
     WebViewImpl* webview = m_webFrame->viewImpl();
     if (webview && webview->permissionClient())
-        return webview->permissionClient()->allowImages(m_webFrame, enabledPerSettings);
+        return webview->permissionClient()->allowImage(m_webFrame, enabledPerSettings, imageURL);
 
     return enabledPerSettings;
 }
@@ -1189,18 +1189,6 @@ bool FrameLoaderClientImpl::shouldStopLoadingForHistoryItem(HistoryItem* targetI
     return !url.protocolIs(backForwardNavigationScheme);
 }
 
-void FrameLoaderClientImpl::dispatchDidAddBackForwardItem(HistoryItem*) const
-{
-}
-
-void FrameLoaderClientImpl::dispatchDidRemoveBackForwardItem(HistoryItem*) const
-{
-}
-
-void FrameLoaderClientImpl::dispatchDidChangeBackForwardIndex() const
-{
-}
-
 void FrameLoaderClientImpl::didDisplayInsecureContent()
 {
     if (m_webFrame->client())
@@ -1486,8 +1474,6 @@ PassRefPtr<Widget> FrameLoaderClientImpl::createPlugin(
     if (!m_webFrame->client())
         return 0;
 
-    RefPtr<HTMLPlugInElement> protect(element);
-
     WebPluginParams params;
     params.url = url;
     params.mimeType = mimeType;