Split ImageResourceClient into ResourceClient and ImageResourceObserver [1/2]

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

Index: third_party/WebKit/Source/core/layout/LayoutImage.h
diff --git a/third_party/WebKit/Source/core/layout/LayoutImage.h b/third_party/WebKit/Source/core/layout/LayoutImage.h
index 3727a10807f521928513369f4a725e58efe0d449..8805df9709013519d6259be9406e2e20bad31b27 100644
--- a/third_party/WebKit/Source/core/layout/LayoutImage.h
+++ b/third_party/WebKit/Source/core/layout/LayoutImage.h
@@ -26,6 +26,7 @@
 #define LayoutImage_h
 
 #include "core/CoreExport.h"
+#include "core/fetch/ResourceClient.h"
 #include "core/layout/LayoutImageResource.h"
 #include "core/layout/LayoutReplaced.h"
 
@@ -43,7 +44,7 @@ class HTMLMapElement;
 //
 // The class is image type agnostic as it only manipulates decoded images.
 // See LayoutImageResource that holds this image.
-class CORE_EXPORT LayoutImage : public LayoutReplaced {
+class CORE_EXPORT LayoutImage : public LayoutReplaced, public ResourceClient {
 public:
     // These are the paddings to use when displaying either alt text or an image.
     static const unsigned short paddingWidth = 4;
@@ -77,6 +78,7 @@ public:
     }
 
     const char* name() const override { return "LayoutImage"; }
+    String debugName() const final { return LayoutObject::debugName(); }

[yhirano, 2016/03/02 01:20:52]

Why are you using LayoutObject's name?

[hiroshige, 2016/03/12 01:03:36]

LayoutObject::debugName() is intended to be used for all subclasses of
LayoutObject and thus previously declared final.
So calls to debugName() for LayoutImage should use LayoutObject::debugName(),
but ResourceClient inheritance here in Line 47 requires LayoutImage::debugName()
to exist.

This debugName() is removed in [2/2] where LayoutImage is no longer
ResourceClient.

 
 protected:
     bool needsPreferredWidthsRecalculation() const final;