Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(270)

Unified Diff: third_party/WebKit/Source/core/layout/LayoutImage.h

Issue 1728313003: Split ImageResourceClient into ResourceClient and ImageResourceObserver [2/2] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and reflect comment Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 8805df9709013519d6259be9406e2e20bad31b27..8b4aab1d4e58dc0026ba36d9088299d32eeb1ba3 100644
--- a/third_party/WebKit/Source/core/layout/LayoutImage.h
+++ b/third_party/WebKit/Source/core/layout/LayoutImage.h
@@ -44,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, public ResourceClient {
+class CORE_EXPORT LayoutImage : public LayoutReplaced {
public:
// These are the paddings to use when displaying either alt text or an image.
static const unsigned short paddingWidth = 4;
@@ -74,18 +74,17 @@ public:
void intrinsicSizeChanged() override
{
if (m_imageResource)
- imageChanged(m_imageResource->imagePtr());
+ imageChanged(false, m_imageResource->imagePtr());
}
const char* name() const override { return "LayoutImage"; }
- String debugName() const final { return LayoutObject::debugName(); }
protected:
bool needsPreferredWidthsRecalculation() const final;
LayoutBox* embeddedContentBox() const final;
void computeIntrinsicSizingInfo(IntrinsicSizingInfo&) const final;
- void imageChanged(WrappedImagePtr, const IntRect* = nullptr) override;
+ void imageChanged(bool isNotifyingFinish, WrappedImagePtr, const IntRect* = nullptr) override;
void paint(const PaintInfo&, const LayoutPoint&) const final;
@@ -107,7 +106,6 @@ private:
LayoutUnit minimumReplacedHeight() const override;
- void notifyFinished(Resource*) final;
bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) final;
bool boxShadowShouldBeAppliedToBackground(BackgroundBleedAvoidance, const InlineFlowBox*) const final;

Powered by Google App Engine
This is Rietveld 408576698