Separate ContentSettingsClient out from LocalFrameClient

third_party/WebKit/Source/web/WebLocalFrameImpl.cpp

 /*
  * Copyright (C) 2009 Google 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.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 100 matching lines @@
 #include "core/dom/shadow/ShadowRoot.h"
 #include "core/editing/EditingUtilities.h"
 #include "core/editing/Editor.h"
 #include "core/editing/FrameSelection.h"
 #include "core/editing/InputMethodController.h"
 #include "core/editing/PlainTextRange.h"
 #include "core/editing/TextAffinity.h"
 #include "core/editing/iterators/TextIterator.h"
 #include "core/editing/serializers/Serialization.h"
 #include "core/editing/spellcheck/SpellChecker.h"
+#include "core/frame/ContentSettingsClient.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/PageScaleConstraintsSet.h"
 #include "core/frame/RemoteFrame.h"
 #include "core/frame/ScreenOrientationController.h"
 #include "core/frame/Settings.h"
 #include "core/frame/SmartClip.h"
 #include "core/frame/UseCounter.h"
 #include "core/frame/VisualViewport.h"
 #include "core/html/HTMLAnchorElement.h"
@@ skipping 436 matching lines @@
 
 WebVector<WebIconURL> WebLocalFrameImpl::iconURLs(int iconTypesMask) const {
   // The URL to the icon may be in the header. As such, only
   // ask the loader for the icon if it's finished loading.
   if (frame()->document()->loadEventFinished())
     return frame()->document()->iconURLs(iconTypesMask);
   return WebVector<WebIconURL>();
 }
 
 void WebLocalFrameImpl::setContentSettingsClient(
-    WebContentSettingsClient* contentSettingsClient) {
-  m_contentSettingsClient = contentSettingsClient;
+    WebContentSettingsClient* client) {
+  m_contentSettingsClient->setClient(client);
 }
 
 void WebLocalFrameImpl::setSharedWorkerRepositoryClient(
     WebSharedWorkerRepositoryClient* client) {
   m_sharedWorkerRepositoryClient =
       SharedWorkerRepositoryClientImpl::create(client);
 }
 
 ScrollableArea* WebLocalFrameImpl::layoutViewportScrollableArea() const {
   if (FrameView* view = frameView())
@@ skipping 971 matching lines @@
 WebLocalFrameImpl::WebLocalFrameImpl(
     WebTreeScopeType scope,
     WebFrameClient* client,
     blink::InterfaceProvider* interfaceProvider,
     blink::InterfaceRegistry* interfaceRegistry)
     : WebLocalFrame(scope),
       m_localFrameClientImpl(LocalFrameClientImpl::create(this)),
       m_frameWidget(0),
       m_client(client),
       m_autofillClient(0),
-      m_contentSettingsClient(0),
+      m_contentSettingsClient(new ContentSettingsClient()),
       m_inputEventsScaleFactorForEmulation(1),
       m_interfaceProvider(interfaceProvider),
       m_interfaceRegistry(interfaceRegistry),
       m_webDevToolsFrontend(0),
       m_inputMethodController(new WebInputMethodControllerImpl(this)),
       m_selfKeepAlive(this) {
   DCHECK(m_client);
   frameCount++;
 }
 
@@ skipping 15 matching lines @@
   frameCount--;
 }
 
 DEFINE_TRACE(WebLocalFrameImpl) {
   visitor->trace(m_localFrameClientImpl);
   visitor->trace(m_frame);
   visitor->trace(m_devToolsAgent);
   visitor->trace(m_textFinder);
   visitor->trace(m_printContext);
   visitor->trace(m_contextMenuNode);
+  visitor->trace(m_contentSettingsClient);
   WebFrame::traceFrames(visitor, this);
   WebFrameImplBase::trace(visitor);
 }
 
 void WebLocalFrameImpl::setCoreFrame(LocalFrame* frame) {
   m_frame = frame;
 }
 
 void WebLocalFrameImpl::initializeCoreFrame(Page& page,
                                             FrameOwner* owner,
@@ skipping 899 matching lines @@
         createMarkup(startPosition, endPosition, AnnotateForInterchange,
                      ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
   } else {
     clipHtml =
         createMarkup(endPosition, startPosition, AnnotateForInterchange,
                      ConvertBlocksToInlines::NotConvert, ResolveNonLocalURLs);
   }
 }
 
 }  // namespace blink