Imported WebKit commit 3a8c29f35d00659d2ce7a0ccdfa8304f14e82327 (http://svn.webkit.org/repository/webkit/trunk@120813)

New snapshot with Windows build fixes

1 files changed, 2 insertions, 20 deletions

diff --git a/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp b/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp
index de3f22789..b67798e74 100644
--- a/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp
+++ b/Source/WebKit/chromium/src/FrameLoaderClientImpl.cpp
@@ -239,24 +239,6 @@ bool FrameLoaderClientImpl::allowRunningInsecureContent(bool enabledPerSettings,
     return enabledPerSettings;
 }
 
-bool FrameLoaderClientImpl::allowShadowDOM(bool enabledAsRuntimeFeature)
-{
-    WebViewImpl* webview = m_webFrame->viewImpl();
-    if (webview && webview->permissionClient())
-        return webview->permissionClient()->allowWebComponents(m_webFrame, enabledAsRuntimeFeature);
-
-    return enabledAsRuntimeFeature;
-}
-
-bool FrameLoaderClientImpl::allowStyleScoped(bool enabledAsRuntimeFeature)
-{
-    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();
@@ -1401,8 +1383,8 @@ void FrameLoaderClientImpl::setTitle(const StringWithDirection& title, const KUR
 
 String FrameLoaderClientImpl::userAgent(const KURL& url)
 {
-    WebString override;
-    if (m_webFrame->client()->userAgent(WebURL(url), &override))
+    WebString override = m_webFrame->client()->userAgentOverride(m_webFrame, WebURL(url));
+    if (!override.isEmpty())
         return override;
 
     return WebKit::Platform::current()->userAgent(url);