Separate ContentSettingsClient out from LocalFrameClient

third_party/WebKit/Source/core/loader/FrameFetchContext.cpp

 /*
  * Copyright (C) 2013 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 17 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "core/loader/FrameFetchContext.h"
 
 #include <algorithm>
 #include <memory>
 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/V8DOMActivityLogger.h"
 #include "core/dom/Document.h"
+#include "core/frame/ContentSettingsClient.h"
 #include "core/frame/Deprecation.h"
 #include "core/frame/FrameConsole.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/frame/LocalFrame.h"
 #include "core/frame/LocalFrameClient.h"
 #include "core/frame/Settings.h"
 #include "core/frame/UseCounter.h"
 #include "core/html/HTMLFrameOwnerElement.h"
 #include "core/html/imports/HTMLImportsController.h"
@@ skipping 279 matching lines @@
 
   LocalFrame* frame = m_documentLoader->frame();
   DCHECK(frame);
   return frame;
 }
 
 LocalFrameClient* FrameFetchContext::localFrameClient() const {
   return frame()->client();
 }
 
+ContentSettingsClient* FrameFetchContext::contentSettingsClient() const {
+  return frame() ? frame()->contentSettingsClient() : nullptr;

[haraken, 2017/04/04 11:25:32]

Can frame() be null? localFrameClient() assumes that it's never null.

I'd prefer removing FrameFetchContext::contentSettingsClient().

[kinuko, 2017/04/04 14:50:56]

I removed the null check.  I'd like to keep this method as I plan to refactor
this class further along the line.

+}
+
 void FrameFetchContext::addAdditionalRequestHeaders(ResourceRequest& request,
                                                     FetchResourceType type) {
   bool isMainResource = type == FetchMainResource;
   if (!isMainResource) {
     if (!request.didSetHTTPReferrer()) {
       DCHECK(m_document);
       request.setHTTPReferrer(SecurityPolicy::generateReferrer(
           m_document->getReferrerPolicy(), request.url(),
           m_document->outgoingReferrer()));
       request.addHTTPOriginIfNeeded(m_document->getSecurityOrigin());
@@ skipping 287 matching lines @@
   Document* initiatorDocument = m_document && info.isMainResource()
                                     ? m_document->parentDocument()
                                     : m_document.get();
   if (!initiatorDocument || !initiatorDocument->domWindow())
     return;
   DOMWindowPerformance::performance(*initiatorDocument->domWindow())
       ->addResourceTiming(info);
 }
 
 bool FrameFetchContext::allowImage(bool imagesEnabled, const KURL& url) const {
-  return localFrameClient()->allowImage(imagesEnabled, url);
+  return contentSettingsClient()->allowImage(imagesEnabled, url);
 }
 
 void FrameFetchContext::printAccessDeniedMessage(const KURL& url) const {
   if (url.isNull())
     return;
 
   String message;
   if (!m_document || m_document->url().isNull()) {
     message = "Unsafe attempt to load URL " + url.elidedString() + '.';
   } else if (url.isLocalFile() || m_document->url().isLocalFile()) {
@@ skipping 114 matching lines @@
     if (!shouldBypassMainWorldCSP &&
         !m_document->contentSecurityPolicy()->allowRequest(
             resourceRequest.requestContext(), url,
             options.contentSecurityPolicyNonce, options.integrityMetadata,
             options.parserDisposition, redirectStatus, reportingPolicy))
       return ResourceRequestBlockedReason::CSP;
   }
 
   if (type == Resource::Script || type == Resource::ImportResource) {
     DCHECK(frame());
-    if (!localFrameClient()->allowScriptFromSource(
+    if (!contentSettingsClient()->allowScriptFromSource(
             !frame()->settings() || frame()->settings()->getScriptEnabled(),
             url)) {
-      localFrameClient()->didNotAllowScript();
+      contentSettingsClient()->didNotAllowScript();
       // TODO(estark): Use a different ResourceRequestBlockedReason here, since
       // this check has nothing to do with CSP. https://crbug.com/600795
       return ResourceRequestBlockedReason::CSP;
     }
   }
 
   // SVG Images have unique security rules that prevent all subresource requests
   // except for data urls.
   if (type != Resource::MainResource &&
       frame()->chromeClient().isSVGImageChromeClient() && !url.protocolIsData())
@@ skipping 255 matching lines @@
   return frame()->frameScheduler()->loadingTaskRunner();
 }
 
 DEFINE_TRACE(FrameFetchContext) {
   visitor->trace(m_document);
   visitor->trace(m_documentLoader);
   FetchContext::trace(visitor);
 }
 
 }  // namespace blink