Split ImageResourceClient into ResourceClient and ImageResourceObserver [1/2]

third_party/WebKit/Source/core/layout/LayoutObject.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  *           (C) 2004 Allan Sandfeld Jensen (kde@carewolf.com)
  * Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2012 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ skipping 13 matching lines @@
  */
 
 #ifndef LayoutObject_h
 #define LayoutObject_h
 
 #include "core/CoreExport.h"
 #include "core/dom/Document.h"
 #include "core/dom/DocumentLifecycle.h"
 #include "core/dom/Element.h"
 #include "core/editing/PositionWithAffinity.h"
-#include "core/fetch/ImageResourceClient.h"
+#include "core/fetch/ImageResourceObserver.h"
 #include "core/html/HTMLElement.h"
 #include "core/inspector/InspectorTraceEvents.h"
 #include "core/layout/HitTestRequest.h"
 #include "core/layout/LayoutObjectChildList.h"
 #include "core/layout/PaintInvalidationState.h"
 #include "core/layout/ScrollAlignment.h"
 #include "core/layout/SubtreeLayoutScope.h"
 #include "core/layout/api/HitTestAction.h"
 #include "core/layout/api/SelectionState.h"
 #include "core/layout/compositing/CompositingState.h"
@@ skipping 103 matching lines @@
 // the ancestors all the way to the enclosing relayout boundary in order to do a correct layout.
 //
 // Due to the high cost of layout, a lot of effort is done to avoid doing full layouts of nodes.
 // This is why there are several types of layout available to bypass the complex operations. See the
 // comments on the layout booleans in LayoutObjectBitfields below about the different layouts.
 //
 // To save memory, especially for the common child class LayoutText, LayoutObject doesn't provide
 // storage for children. Descendant classes that do allow children have to have a LayoutObjectChildList
 // member that stores the actual children and override virtualChildren().
 //
-// LayoutObject is an ImageResourceClient, which means that it gets notified when associated images
+// LayoutObject is an ImageResourceObserver, which means that it gets notified when associated images
 // are changed. This is used for 2 main use cases:
 // - reply to 'background-image' as we need to invalidate the background in this case.
 //   (See https://drafts.csswg.org/css-backgrounds-3/#the-background-image)
 // - image (LayoutImage, LayoutSVGImage) or video (LayoutVideo) objects that are placeholders for
 //   displaying them.
 //
 //
 // ***** LIFETIME *****
 //
 // LayoutObjects are fully owned by their associated DOM node. In other words,
@@ skipping 33 matching lines @@
 // because only boxes implementing the full box model have a need for them.
 // Because LayoutBlockFlow's intrinsic widths rely on the underlying text
 // content, LayoutBlockFlow may call LayoutText::computePreferredLogicalWidths.
 //
 // The 2 widths are computed lazily during layout when the getters are called.
 // The computation is done by calling computePreferredLogicalWidths() behind the
 // scene. The boolean used to control the lazy recomputation is
 // preferredLogicalWidthsDirty.
 //
 // See the individual getters below for more details about what each width is.
-class CORE_EXPORT LayoutObject : public ImageResourceClient, public DisplayItemClient {
+class CORE_EXPORT LayoutObject : public ImageResourceObserver, public DisplayItemClient {
     friend class LayoutObjectChildList;
     WTF_MAKE_NONCOPYABLE(LayoutObject);
 public:
     // Anonymous objects should pass the document as their node, and they will then automatically be
     // marked as anonymous in the constructor.
     explicit LayoutObject(Node*);
     ~LayoutObject() override;
 
     // Returns the name of the layout object.
     virtual const char* name() const = 0;
 
     // Returns the decorated name used by run-layout-tests. The name contains the name of the object
     // along with extra information about the layout object state (e.g. positioning).
     String decoratedName() const;
 
     // DisplayItemClient methods.
     LayoutRect visualRect() const override;
-    String debugName() const final;
+    String debugName() const override;
 
     LayoutObject* parent() const { return m_parent; }
     bool isDescendantOf(const LayoutObject*) const;
 
     LayoutObject* previousSibling() const { return m_previous; }
     LayoutObject* nextSibling() const { return m_next; }
 
     LayoutObject* slowFirstChild() const
     {
         if (const LayoutObjectChildList* children = virtualChildren())
@@ skipping 964 matching lines @@
 
     virtual bool isCombineText() const { return false; }
 
     virtual int caretMinOffset() const;
     virtual int caretMaxOffset() const;
 
     virtual int previousOffset(int current) const;
     virtual int previousOffsetForBackwardDeletion(int current) const;
     virtual int nextOffset(int current) const;
 
-    // ImageResourceClient override.
+    // ImageResourceObserver override.
     void imageChanged(ImageResource*, const IntRect* = nullptr) final;
-    bool willRenderImage(ImageResource*) final;
-    bool getImageAnimationPolicy(ImageResource*, ImageAnimationPolicy&) final;
+    bool willRenderImage() final;
+    bool getImageAnimationPolicy(ImageAnimationPolicy&) final;
 
     // Sub-classes that have an associated image need to override this function
     // to get notified of any image change.
     virtual void imageChanged(WrappedImagePtr, const IntRect* = nullptr) { }
 
     void selectionStartEnd(int& spos, int& epos) const;
 
     void remove()
     {
         if (parent())
@@ skipping 926 matching lines @@
 void showTree(const blink::LayoutObject*);
 void showLineTree(const blink::LayoutObject*);
 void showLayoutTree(const blink::LayoutObject* object1);
 // We don't make object2 an optional parameter so that showLayoutTree
 // can be called from gdb easily.
 void showLayoutTree(const blink::LayoutObject* object1, const blink::LayoutObject* object2);
 
 #endif
 
 #endif // LayoutObject_h