Separate ContentSettingsClient out from LocalFrameClient

third_party/WebKit/Source/core/html/ImageDocument.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2010 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 12 matching lines @@
  */
 
 #include "core/html/ImageDocument.h"
 
 #include <limits>
 #include "bindings/core/v8/ExceptionState.h"
 #include "core/HTMLNames.h"
 #include "core/dom/RawDataDocumentParser.h"
 #include "core/events/EventListener.h"
 #include "core/events/MouseEvent.h"
+#include "core/frame/ContentSettingsClient.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/frame/VisualViewport.h"
 #include "core/html/HTMLBodyElement.h"
 #include "core/html/HTMLContentElement.h"
 #include "core/html/HTMLDivElement.h"
@@ skipping 92 matching lines @@
       LayoutObject::shouldRespectImageOrientation(element->layoutObject()),
       1.0f);
 }
 
 void ImageDocumentParser::appendBytes(const char* data, size_t length) {
   if (!length)
     return;
 
   LocalFrame* frame = document()->frame();
   Settings* settings = frame->settings();
-  if (!frame->loader().client()->allowImage(
+  if (!frame->contentSettingsClient()->allowImage(
           !settings || settings->getImagesEnabled(), document()->url()))
     return;
 
   if (document()->cachedImageResourceDeprecated()) {
     CHECK_LE(length, std::numeric_limits<unsigned>::max());
     // If decoding has already failed, there's no point in sending additional
     // data to the ImageResource.
     if (document()->cachedImageResourceDeprecated()->getStatus() !=
         ResourceStatus::DecodeError)
       document()->cachedImageResourceDeprecated()->appendData(data, length);
@@ skipping 466 matching lines @@
 }
 
 bool ImageEventListener::operator==(const EventListener& listener) const {
   if (const ImageEventListener* imageEventListener =
           ImageEventListener::cast(&listener))
     return m_doc == imageEventListener->m_doc;
   return false;
 }
 
 }  // namespace blink