Separate ContentSettingsClient out from LocalFrameClient

third_party/WebKit/Source/core/dom/Document.cpp

 /*
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2001 Dirk Mueller (mueller@kde.org)
  *           (C) 2006 Alexey Proskuryakov (ap@webkit.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All
  * rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  * (http://www.torchmobile.com/)
  * Copyright (C) 2008, 2009, 2011, 2012 Google Inc. All rights reserved.
@@ skipping 117 matching lines @@
 #include "core/editing/spellcheck/SpellChecker.h"
 #include "core/events/BeforeUnloadEvent.h"
 #include "core/events/Event.h"
 #include "core/events/EventFactory.h"
 #include "core/events/EventListener.h"
 #include "core/events/HashChangeEvent.h"
 #include "core/events/PageTransitionEvent.h"
 #include "core/events/ScopedEventQueue.h"
 #include "core/events/VisualViewportResizeEvent.h"
 #include "core/events/VisualViewportScrollEvent.h"
+#include "core/frame/ContentSettingsClient.h"
 #include "core/frame/DOMTimer.h"
 #include "core/frame/DOMVisualViewport.h"
 #include "core/frame/EventHandlerRegistry.h"
 #include "core/frame/FrameConsole.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/History.h"
 #include "core/frame/HostsUsingFeatures.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/LocalFrameClient.h"
@@ skipping 5483 matching lines @@
           "Blocked script execution in '" + url().elidedString() +
               "' because the document's frame is sandboxed and the "
               "'allow-scripts' permission is not set."));
     }
     return false;
   }
 
   DCHECK(frame())
       << "you are querying canExecuteScripts on a non contextDocument.";
 
-  LocalFrameClient* client = frame()->loader().client();
-  if (!client)
+  ContentSettingsClient* settingsClient = frame()->contentSettingsClient();
+  if (!settingsClient)
     return false;
 
   Settings* settings = frame()->settings();
-  if (!client->allowScript(settings && settings->getScriptEnabled())) {
+  if (!settingsClient->allowScript(settings && settings->getScriptEnabled())) {
     if (reason == AboutToExecuteScript)
-      client->didNotAllowScript();
+      settingsClient->didNotAllowScript();
 
     return false;
   }
 
   return true;
 }
 
 bool Document::isRenderingReady() const {
   return m_styleEngine->ignoringPendingStylesheets() ||
          (haveImportsLoaded() && haveRenderBlockingStylesheetsLoaded());
@@ skipping 969 matching lines @@
 }
 
 void showLiveDocumentInstances() {
   WeakDocumentSet& set = liveDocumentSet();
   fprintf(stderr, "There are %u documents currently alive:\n", set.size());
   for (blink::Document* document : set)
     fprintf(stderr, "- Document %p URL: %s\n", document,
             document->url().getString().utf8().data());
 }
 #endif