Changeset 85287 in webkit

Timestamp:

Apr 28, 2011 7:19:58 PM (13 years ago)

Author:

jam@chromium.org

Message:

2011-04-28 John Abd-El-Malek <​jam@chromium.org>

Reviewed by Tony Chang.

[chromium] Fix silly bug with WebPermissionClient
​https://bugs.webkit.org/show_bug.cgi?id=59769

• src/FrameLoaderClientImpl.cpp: (WebKit::FrameLoaderClientImpl::allowJavaScript): (WebKit::FrameLoaderClientImpl::allowPlugins): (WebKit::FrameLoaderClientImpl::allowImages):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• src/FrameLoaderClientImpl.cpp (modified) (3 diffs)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-04-28  John Abd-El-Malek  <jam@chromium.org>
+
+        Reviewed by Tony Chang.
+
+        [chromium] Fix silly bug with WebPermissionClient
+        https://bugs.webkit.org/show_bug.cgi?id=59769
+
+        * src/FrameLoaderClientImpl.cpp:
+        (WebKit::FrameLoaderClientImpl::allowJavaScript):
+        (WebKit::FrameLoaderClientImpl::allowPlugins):
+        (WebKit::FrameLoaderClientImpl::allowImages):
+
 2011-04-28  Jay Civelli  <jcivelli@chromium.org>
 

trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp

@@ -184 +184 @@
     WebViewImpl* webview = m_webFrame->viewImpl();
     if (webview && webview->permissionClient())
-        webview->permissionClient()->allowScript(m_webFrame, enabledPerSettings);
+        return webview->permissionClient()->allowScript(m_webFrame, enabledPerSettings);
 
     // FIXME(jam): remove this.
@@ -197 +197 @@
     WebViewImpl* webview = m_webFrame->viewImpl();
     if (webview && webview->permissionClient())
-        webview->permissionClient()->allowPlugins(m_webFrame, enabledPerSettings);
+        return webview->permissionClient()->allowPlugins(m_webFrame, enabledPerSettings);
 
     // FIXME(jam): remove this.
@@ -210 +210 @@
     WebViewImpl* webview = m_webFrame->viewImpl();
     if (webview && webview->permissionClient())
-        webview->permissionClient()->allowImages(m_webFrame, enabledPerSettings);
+        return webview->permissionClient()->allowImages(m_webFrame, enabledPerSettings);
 
     // FIXME(jam): remove this.