diff options
| author | Lorry Tar Creator <lorry-tar-importer@lorry> | 2016-05-24 08:28:08 +0000 |
|---|---|---|
| committer | Lorry Tar Creator <lorry-tar-importer@lorry> | 2016-05-24 08:28:08 +0000 |
| commit | a4e969f4965059196ca948db781e52f7cfebf19e (patch) | |
| tree | 6ca352808c8fdc52006a0f33f6ae3c593b23867d /Source/WebCore/rendering/RenderLineBreak.h | |
| parent | 41386e9cb918eed93b3f13648cbef387e371e451 (diff) | |
| download | WebKitGtk-tarball-a4e969f4965059196ca948db781e52f7cfebf19e.tar.gz | |
webkitgtk-2.12.3webkitgtk-2.12.3
Diffstat (limited to 'Source/WebCore/rendering/RenderLineBreak.h')
| -rw-r--r-- | Source/WebCore/rendering/RenderLineBreak.h | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/Source/WebCore/rendering/RenderLineBreak.h b/Source/WebCore/rendering/RenderLineBreak.h index 55f4f597b..0189d5f68 100644 --- a/Source/WebCore/rendering/RenderLineBreak.h +++ b/Source/WebCore/rendering/RenderLineBreak.h @@ -32,7 +32,7 @@ class Position; class RenderLineBreak final : public RenderBoxModelObject { public: - RenderLineBreak(HTMLElement&, PassRef<RenderStyle>); + RenderLineBreak(HTMLElement&, Ref<RenderStyle>&&); virtual ~RenderLineBreak(); // FIXME: The lies here keep render tree dump based test results unchanged. @@ -46,19 +46,23 @@ public: void deleteInlineBoxWrapper(); void replaceInlineBoxWrapper(InlineElementBox&); void dirtyLineBoxes(bool fullLayout); + void deleteLineBoxesBeforeSimpleLineLayout(); IntRect linesBoundingBox() const; virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const override; virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const override; +#if PLATFORM(IOS) +virtual void collectSelectionRects(Vector<SelectionRect>&, unsigned startOffset = 0, unsigned endOffset = std::numeric_limits<unsigned>::max()) override; +#endif private: void node() const = delete; virtual bool canHaveChildren() const override { return false; } - virtual void paint(PaintInfo&, const LayoutPoint&) override final { } + virtual void paint(PaintInfo&, const LayoutPoint&) override { } - virtual VisiblePosition positionForPoint(const LayoutPoint&) override; + virtual VisiblePosition positionForPoint(const LayoutPoint&, const RenderRegion*) override; virtual int caretMinOffset() const override; virtual int caretMaxOffset() const override; virtual bool canBeSelectionLeaf() const override; @@ -78,7 +82,7 @@ private: virtual LayoutUnit marginEnd(const RenderStyle*) const override { return 0; } virtual LayoutUnit offsetWidth() const override { return linesBoundingBox().width(); } virtual LayoutUnit offsetHeight() const override { return linesBoundingBox().height(); } - virtual IntRect borderBoundingBox() const override; + LayoutRect borderBoundingBox() const override { return LayoutRect(LayoutPoint(), linesBoundingBox().size()); } virtual LayoutRect frameRectForStickyPositioning() const override { ASSERT_NOT_REACHED(); return LayoutRect(); } virtual LayoutRect clippedOverflowRectForRepaint(const RenderLayerModelObject*) const override { return LayoutRect(); } @@ -90,8 +94,8 @@ private: bool m_isWBR; }; -RENDER_OBJECT_TYPE_CASTS(RenderLineBreak, isLineBreak()) - } // namespace WebCore +SPECIALIZE_TYPE_TRAITS_RENDER_OBJECT(RenderLineBreak, isLineBreak()) + #endif // RenderLineBreak_h |