From 1bf1084f2b10c3b47fd1a588d85d21ed0eb41d0c Mon Sep 17 00:00:00 2001 From: Lorry Tar Creator Date: Tue, 27 Jun 2017 06:07:23 +0000 Subject: webkitgtk-2.16.5 --- Source/WebCore/rendering/InlineElementBox.h | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) (limited to 'Source/WebCore/rendering/InlineElementBox.h') diff --git a/Source/WebCore/rendering/InlineElementBox.h b/Source/WebCore/rendering/InlineElementBox.h index 42e210358..535324ec3 100644 --- a/Source/WebCore/rendering/InlineElementBox.h +++ b/Source/WebCore/rendering/InlineElementBox.h @@ -23,8 +23,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef InlineElementBox_h -#define InlineElementBox_h +#pragma once #include "InlineBox.h" @@ -42,21 +41,19 @@ public: { } - RenderBoxModelObject& renderer() const { return toRenderBoxModelObject(InlineBox::renderer()); } + RenderBoxModelObject& renderer() const { return downcast(InlineBox::renderer()); } - virtual void deleteLine() override; - virtual void extractLine() override; - virtual void attachLine() override; + void deleteLine() final; + void extractLine() final; + void attachLine() final; - virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override; - virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) override; + void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override; + bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom, HitTestAction) override; private: - virtual bool isInlineElementBox() const override final { return true; } + bool isInlineElementBox() const final { return true; } }; -INLINE_BOX_OBJECT_TYPE_CASTS(InlineElementBox, isInlineElementBox()) +} // namespace WebCore -} - -#endif // InlineElementBox_h +SPECIALIZE_TYPE_TRAITS_INLINE_BOX(InlineElementBox, isInlineElementBox()) -- cgit v1.2.1