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/svg/SVGRootInlineBox.h | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) (limited to 'Source/WebCore/rendering/svg/SVGRootInlineBox.h') diff --git a/Source/WebCore/rendering/svg/SVGRootInlineBox.h b/Source/WebCore/rendering/svg/SVGRootInlineBox.h index 643af3108..bd4455203 100644 --- a/Source/WebCore/rendering/svg/SVGRootInlineBox.h +++ b/Source/WebCore/rendering/svg/SVGRootInlineBox.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2006 Oliver Hunt - * Copyright (C) 2006 Apple Computer Inc. + * Copyright (C) 2006 Apple Inc. * Copyright (C) 2007 Nikolas Zimmermann * Copyright (C) Research In Motion Limited 2010. All rights reserved. * @@ -20,10 +20,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef SVGRootInlineBox_h -#define SVGRootInlineBox_h +#pragma once -#if ENABLE(SVG) #include "RootInlineBox.h" #include "SVGRenderSupport.h" #include "SVGTextLayoutEngine.h" @@ -39,29 +37,27 @@ public: RenderSVGText& renderSVGText(); - virtual float virtualLogicalHeight() const override final { return m_logicalHeight; } + float virtualLogicalHeight() const override { return m_logicalHeight; } void setLogicalHeight(float height) { m_logicalHeight = height; } - virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override final; + void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override; void computePerCharacterLayoutInformation(); InlineBox* closestLeafChildForPosition(const LayoutPoint&); + bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom, HitTestAction) final; + private: - virtual bool isSVGRootInlineBox() const override final { return true; } + bool isSVGRootInlineBox() const override { return true; } void reorderValueLists(Vector&); void layoutCharactersInTextBoxes(InlineFlowBox*, SVGTextLayoutEngine&); - void layoutChildBoxes(InlineFlowBox*, FloatRect* = 0); + void layoutChildBoxes(InlineFlowBox*, FloatRect* = nullptr); void layoutRootBox(const FloatRect&); float m_logicalHeight; }; -INLINE_BOX_OBJECT_TYPE_CASTS(SVGRootInlineBox, isSVGRootInlineBox()) - } // namespace WebCore -#endif // ENABLE(SVG) - -#endif // SVGRootInlineBox_h +SPECIALIZE_TYPE_TRAITS_INLINE_BOX(SVGRootInlineBox, isSVGRootInlineBox()) -- cgit v1.2.1