Index: third_party/WebKit/Source/core/layout/line/InlineBox.h |
diff --git a/third_party/WebKit/Source/core/layout/line/InlineBox.h b/third_party/WebKit/Source/core/layout/line/InlineBox.h |
index 05a5c9a029ed415016a8755944df2662c9e4ead1..2e5adb6474bfa2e6a6b250f24f4f3593a5c721f0 100644 |
--- a/third_party/WebKit/Source/core/layout/line/InlineBox.h |
+++ b/third_party/WebKit/Source/core/layout/line/InlineBox.h |
@@ -39,7 +39,7 @@ enum MarkLineBoxes { MarkLineBoxesDirty, DontMarkLineBoxes }; |
// InlineBox represents a rectangle that occurs on a line. It corresponds to |
// some LayoutObject (i.e., it represents a portion of that LayoutObject). |
-class InlineBox { |
+class InlineBox : public DisplayItemClient { |
WTF_MAKE_NONCOPYABLE(InlineBox); |
public: |
InlineBox(LayoutObject& obj) |
@@ -103,7 +103,7 @@ public: |
#endif |
virtual const char* boxName() const; |
- virtual String debugName() const; |
+ String debugName() const override; |
bool isText() const { return m_bitfields.isText(); } |
void setIsText(bool isText) { m_bitfields.setIsText(isText); } |
@@ -299,8 +299,6 @@ public: |
bool dirOverride() const { return m_bitfields.dirOverride(); } |
void setDirOverride(bool dirOverride) { m_bitfields.setDirOverride(dirOverride); } |
- DisplayItemClient displayItemClient() const { return toDisplayItemClient(this); } |
- |
#define ADD_BOOLEAN_BITFIELD(name, Name) \ |
private:\ |
unsigned m_##name : 1;\ |