| Index: third_party/WebKit/Source/core/layout/LayoutObject.h
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.h b/third_party/WebKit/Source/core/layout/LayoutObject.h
|
| index 174751be601234679c327b3f870e41e44e35b724..e311980b12887c029961f72a9b7b58a6ffb6d234 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutObject.h
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutObject.h
|
| @@ -222,7 +222,7 @@ public:
|
|
|
| // DisplayItemClient methods.
|
| LayoutRect visualRect() const override;
|
| - String debugName() const override;
|
| + String debugName() const final;
|
|
|
| LayoutObject* parent() const { return m_parent; }
|
| bool isDescendantOf(const LayoutObject*) const;
|
| @@ -1202,13 +1202,13 @@ public:
|
| virtual int nextOffset(int current) const;
|
|
|
| // ImageResourceObserver override.
|
| - void imageChanged(ImageResource*, const IntRect* = nullptr) final;
|
| + void imageChanged(bool isNotifyingFinish, ImageResource*, const IntRect* = nullptr) 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) { }
|
| + virtual void imageChanged(bool isNotifyingFinish, WrappedImagePtr, const IntRect* = nullptr) { }
|
|
|
| void selectionStartEnd(int& spos, int& epos) const;
|
|
|
|
|