Separate ContentSettingsClient out from LocalFrameClient

third_party/WebKit/Source/web/LocalFrameClientImpl.cpp

 /*
  * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
  * Copyright (C) 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 66 matching lines @@
 #include "public/platform/WebApplicationCacheHost.h"
 #include "public/platform/WebMediaPlayerSource.h"
 #include "public/platform/WebRTCPeerConnectionHandler.h"
 #include "public/platform/WebSecurityOrigin.h"
 #include "public/platform/WebURL.h"
 #include "public/platform/WebURLError.h"
 #include "public/platform/WebVector.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerProvider.h"
 #include "public/platform/modules/serviceworker/WebServiceWorkerProviderClient.h"
 #include "public/web/WebAutofillClient.h"
-#include "public/web/WebContentSettingsClient.h"
 #include "public/web/WebDOMEvent.h"
 #include "public/web/WebDocument.h"
 #include "public/web/WebFormElement.h"
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebNode.h"
 #include "public/web/WebPlugin.h"
 #include "public/web/WebPluginParams.h"
 #include "public/web/WebViewClient.h"
 #include "v8/include/v8.h"
 #include "web/DevToolsEmulator.h"
@@ skipping 120 matching lines @@
 void LocalFrameClientImpl::didChangeScrollOffset() {
   if (m_webFrame->client())
     m_webFrame->client()->didChangeScrollOffset(m_webFrame);
 }
 
 void LocalFrameClientImpl::didUpdateCurrentHistoryItem() {
   if (m_webFrame->client())
     m_webFrame->client()->didUpdateCurrentHistoryItem();
 }
 
-bool LocalFrameClientImpl::allowScript(bool enabledPerSettings) {
-  if (m_webFrame->contentSettingsClient())
-    return m_webFrame->contentSettingsClient()->allowScript(enabledPerSettings);
-
-  return enabledPerSettings;
-}
-
-bool LocalFrameClientImpl::allowScriptFromSource(bool enabledPerSettings,
-                                                 const KURL& scriptURL) {
-  if (m_webFrame->contentSettingsClient()) {
-    return m_webFrame->contentSettingsClient()->allowScriptFromSource(
-        enabledPerSettings, scriptURL);
-  }
-
-  return enabledPerSettings;
-}
-
-bool LocalFrameClientImpl::allowPlugins(bool enabledPerSettings) {
-  if (m_webFrame->contentSettingsClient()) {
-    return m_webFrame->contentSettingsClient()->allowPlugins(
-        enabledPerSettings);
-  }
-
-  return enabledPerSettings;
-}
-
-bool LocalFrameClientImpl::allowImage(bool enabledPerSettings,
-                                      const KURL& imageURL) {
-  if (m_webFrame->contentSettingsClient()) {
-    return m_webFrame->contentSettingsClient()->allowImage(enabledPerSettings,
-                                                           imageURL);
-  }
-
-  return enabledPerSettings;
-}
-
-bool LocalFrameClientImpl::allowRunningInsecureContent(bool enabledPerSettings,
-                                                       SecurityOrigin* context,
-                                                       const KURL& url) {
-  if (m_webFrame->contentSettingsClient()) {
-    return m_webFrame->contentSettingsClient()->allowRunningInsecureContent(
-        enabledPerSettings, WebSecurityOrigin(context), WebURL(url));
-  }
-
-  return enabledPerSettings;
-}
-
-bool LocalFrameClientImpl::allowAutoplay(bool defaultValue) {
-  if (m_webFrame->contentSettingsClient())
-    return m_webFrame->contentSettingsClient()->allowAutoplay(defaultValue);
-
-  return defaultValue;
-}
-
-void LocalFrameClientImpl::passiveInsecureContentFound(const KURL& url) {
-  if (m_webFrame->contentSettingsClient()) {
-    return m_webFrame->contentSettingsClient()->passiveInsecureContentFound(
-        WebURL(url));
-  }
-}
-
-void LocalFrameClientImpl::didNotAllowScript() {
-  if (m_webFrame->contentSettingsClient())
-    m_webFrame->contentSettingsClient()->didNotAllowScript();
-}
-
-void LocalFrameClientImpl::didNotAllowPlugins() {
-  if (m_webFrame->contentSettingsClient())
-    m_webFrame->contentSettingsClient()->didNotAllowPlugins();
-}
-
 bool LocalFrameClientImpl::hasWebView() const {
   return m_webFrame->viewImpl();
 }
 
 bool LocalFrameClientImpl::inShadowTree() const {
   return m_webFrame->inShadowTree();
 }
 
 Frame* LocalFrameClientImpl::opener() const {
   return toCoreFrame(m_webFrame->opener());
@@ skipping 647 matching lines @@
     m_webFrame->client()->willInsertBody(m_webFrame);
 }
 
 std::unique_ptr<WebServiceWorkerProvider>
 LocalFrameClientImpl::createServiceWorkerProvider() {
   if (!m_webFrame->client())
     return nullptr;
   return WTF::wrapUnique(m_webFrame->client()->createServiceWorkerProvider());
 }
 
+ContentSettingsClient& LocalFrameClientImpl::contentSettingsClient() {
+  return m_webFrame->contentSettingsClient();
+}
+
 SharedWorkerRepositoryClient*
 LocalFrameClientImpl::sharedWorkerRepositoryClient() {
   return m_webFrame->sharedWorkerRepositoryClient();
 }
 
 std::unique_ptr<WebApplicationCacheHost>
 LocalFrameClientImpl::createApplicationCacheHost(
     WebApplicationCacheHostClient* client) {
   if (!m_webFrame->client())
     return nullptr;
@@ skipping 58 matching lines @@
 void LocalFrameClientImpl::abortClientNavigation() {
   if (m_webFrame->client())
     m_webFrame->client()->abortClientNavigation();
 }
 
 TextCheckerClient& LocalFrameClientImpl::textCheckerClient() const {
   return m_webFrame->textCheckerClient();
 }
 
 }  // namespace blink