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/SVGInlineFlowBox.h | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'Source/WebCore/rendering/svg/SVGInlineFlowBox.h') diff --git a/Source/WebCore/rendering/svg/SVGInlineFlowBox.h b/Source/WebCore/rendering/svg/SVGInlineFlowBox.h index 88165dfda..58cc1fcaa 100644 --- a/Source/WebCore/rendering/svg/SVGInlineFlowBox.h +++ b/Source/WebCore/rendering/svg/SVGInlineFlowBox.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2006 Oliver Hunt - * Copyright (C) 2006 Apple Computer Inc. + * Copyright (C) 2006 Apple Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Library General Public @@ -18,10 +18,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef SVGInlineFlowBox_h -#define SVGInlineFlowBox_h +#pragma once -#if ENABLE(SVG) #include "InlineFlowBox.h" #include "RenderSVGInline.h" @@ -39,24 +37,19 @@ public: RenderSVGInline& renderer() { return static_cast(InlineFlowBox::renderer()); } - virtual FloatRect calculateBoundaries() const override; + FloatRect calculateBoundaries() const override; void setLogicalHeight(float h) { m_logicalHeight = h; } void paintSelectionBackground(PaintInfo&); - static void computeTextMatchMarkerRectForRenderer(RenderSVGInlineText*); private: - virtual bool isSVGInlineFlowBox() const override { return true; } - virtual float virtualLogicalHeight() const override { return m_logicalHeight; } - virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override; + bool isSVGInlineFlowBox() const override { return true; } + float virtualLogicalHeight() const override { return m_logicalHeight; } + void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override; float m_logicalHeight; }; -INLINE_BOX_OBJECT_TYPE_CASTS(SVGInlineFlowBox, isSVGInlineFlowBox()) - } // namespace WebCore -#endif // ENABLE(SVG) - -#endif // SVGInlineFlowBox_h +SPECIALIZE_TYPE_TRAITS_INLINE_BOX(SVGInlineFlowBox, isSVGInlineFlowBox()) -- cgit v1.2.1