summaryrefslogtreecommitdiff
path: root/Source/WebCore/rendering/EllipsisBox.h
diff options
context:
space:
mode:
Diffstat (limited to 'Source/WebCore/rendering/EllipsisBox.h')
-rw-r--r--Source/WebCore/rendering/EllipsisBox.h21
1 files changed, 9 insertions, 12 deletions
diff --git a/Source/WebCore/rendering/EllipsisBox.h b/Source/WebCore/rendering/EllipsisBox.h
index cec0b9cc7..3f6974880 100644
--- a/Source/WebCore/rendering/EllipsisBox.h
+++ b/Source/WebCore/rendering/EllipsisBox.h
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2003, 2006 Apple Computer, Inc.
+ * Copyright (C) 2003, 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
@@ -17,8 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef EllipsisBox_h
-#define EllipsisBox_h
+#pragma once
#include "InlineElementBox.h"
#include "RenderBlockFlow.h"
@@ -30,19 +29,19 @@ class HitTestResult;
class EllipsisBox final : public InlineElementBox {
public:
- EllipsisBox(RenderBlockFlow&, const AtomicString& ellipsisStr, InlineFlowBox* parent, int width, int height, int y, bool firstLine, bool isVertical, InlineBox* markupBox);
- virtual void paint(PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom);
- virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) override;
+ EllipsisBox(RenderBlockFlow&, const AtomicString& ellipsisStr, InlineFlowBox* parent, int width, int height, int y, bool firstLine, bool isHorizontal, InlineBox* markupBox);
+ 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) final;
void setSelectionState(RenderObject::SelectionState s) { m_selectionState = s; }
IntRect selectionRect();
- RenderBlockFlow& blockFlow() const { return toRenderBlockFlow(InlineBox::renderer()); }
+ RenderBlockFlow& blockFlow() const { return downcast<RenderBlockFlow>(InlineBox::renderer()); }
private:
void paintMarkupBox(PaintInfo&, const LayoutPoint& paintOffset, LayoutUnit lineTop, LayoutUnit lineBottom, const RenderStyle&);
- virtual int height() const { return m_height; }
- virtual RenderObject::SelectionState selectionState() { return m_selectionState; }
- void paintSelection(GraphicsContext*, const LayoutPoint&, const RenderStyle&, const Font&);
+ int height() const { return m_height; }
+ RenderObject::SelectionState selectionState() override { return m_selectionState; }
+ void paintSelection(GraphicsContext&, const LayoutPoint&, const RenderStyle&, const FontCascade&);
InlineBox* markupBox() const;
bool m_shouldPaintMarkupBox;
@@ -52,5 +51,3 @@ private:
};
} // namespace WebCore
-
-#endif // EllipsisBox_h