Changeset 118653 in webkit

Timestamp:

May 28, 2012, 1:17:51 AM (14 years ago)

Author:

morrita@google.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=87609
[Chromium] FrameLoaderClient::allowStyleScoped() should be implemented interms of WebPermissionClient

Reviewed by Kent Tamura.

Added allowStyleScoped() implementation which is essentially same as shadowDOMAllowed().

• src/FrameLoaderClientImpl.cpp:
• src/FrameLoaderClientImpl.h:

(FrameLoaderClientImpl):

Location:

trunk/Source/WebKit/chromium

Files:

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

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2012-05-28  MORITA Hajime  <morrita@google.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=87609
+        [Chromium] FrameLoaderClient::allowStyleScoped() should be implemented interms of WebPermissionClient
+
+        Reviewed by Kent Tamura.
+
+        Added allowStyleScoped() implementation which is essentially same as shadowDOMAllowed().
+
+        * src/FrameLoaderClientImpl.cpp:
+        * src/FrameLoaderClientImpl.h:
+        (FrameLoaderClientImpl):
+
 2012-05-25  Ryosuke Niwa  <rniwa@webkit.org>
 

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

@@ -249 +249 @@
 }
 
+bool FrameLoaderClientImpl::allowStyleScoped(bool enabledAsRuntimeFeature) OVERRIDE
+{
+    WebViewImpl* webview = m_webFrame->viewImpl();
+    if (webview && webview->permissionClient())
+        return webview->permissionClient()->allowWebComponents(m_webFrame, enabledAsRuntimeFeature);
+
+    return enabledAsRuntimeFeature;
+}
+
 void FrameLoaderClientImpl::didNotAllowScript()
 {

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

@@ -201 +201 @@
     virtual bool allowRunningInsecureContent(bool enabledPerSettings, WebCore::SecurityOrigin*, const WebCore::KURL&);
     virtual bool shadowDOMAllowed(bool enabledAsRuntimeFeature) OVERRIDE;
+    virtual bool allowStyleScoped(bool enabledAsRuntimeFeature) OVERRIDE;
     virtual void didNotAllowScript();
     virtual void didNotAllowPlugins();