Title: [118653] trunk/Source/WebKit/chromium
- Revision
- 118653
- Author
- [email protected]
- Date
- 2012-05-28 01:17:51 -0700 (Mon, 28 May 2012)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (118652 => 118653)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-05-28 08:03:24 UTC (rev 118652)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-05-28 08:17:51 UTC (rev 118653)
@@ -1,3 +1,16 @@
+2012-05-28 MORITA Hajime <[email protected]>
+
+ 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 <[email protected]>
Roll chromium DEPS from r139156 to r139184.
Modified: trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp (118652 => 118653)
--- trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2012-05-28 08:03:24 UTC (rev 118652)
+++ trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp 2012-05-28 08:17:51 UTC (rev 118653)
@@ -248,6 +248,15 @@
return enabledAsRuntimeFeature;
}
+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()
{
WebViewImpl* webview = m_webFrame->viewImpl();
Modified: trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.h (118652 => 118653)
--- trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.h 2012-05-28 08:03:24 UTC (rev 118652)
+++ trunk/Source/WebKit/chromium/src/FrameLoaderClientImpl.h 2012-05-28 08:17:51 UTC (rev 118653)
@@ -200,6 +200,7 @@
virtual bool allowDisplayingInsecureContent(bool enabledPerSettings, WebCore::SecurityOrigin*, const WebCore::KURL&);
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();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
