Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(506)

Unified Diff: Source/core/layout/line/EllipsisBox.h

Issue 899163003: Move rendering/RenderObject to layout/LayoutObject. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/layout/line/BreakingContextInlineHeaders.h ('k') | Source/core/layout/line/InlineBox.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/line/EllipsisBox.h
diff --git a/Source/core/layout/line/EllipsisBox.h b/Source/core/layout/line/EllipsisBox.h
index 5c0d164a74be9319ce2a740d416bbdb0b20c1a7b..0e819e990e43a3d1f0394e3bba6c4b44a9e6944c 100644
--- a/Source/core/layout/line/EllipsisBox.h
+++ b/Source/core/layout/line/EllipsisBox.h
@@ -30,24 +30,24 @@ class HitTestResult;
class EllipsisBox final : public InlineBox {
public:
- EllipsisBox(RenderObject& obj, const AtomicString& ellipsisStr, InlineFlowBox* parent,
+ EllipsisBox(LayoutObject& obj, const AtomicString& ellipsisStr, InlineFlowBox* parent,
int width, int height, int x, int y, bool firstLine, bool isVertical, InlineBox* markupBox)
: InlineBox(obj, FloatPointWillBeLayoutPoint(x, y), width, firstLine, true, false, false, isVertical, 0, 0, parent)
, m_shouldPaintMarkupBox(markupBox)
, m_height(height)
, m_str(ellipsisStr)
- , m_selectionState(RenderObject::SelectionNone)
+ , m_selectionState(LayoutObject::SelectionNone)
{
setHasVirtualLogicalHeight();
}
virtual void paint(const 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 setSelectionState(RenderObject::SelectionState s) { m_selectionState = s; }
+ void setSelectionState(LayoutObject::SelectionState s) { m_selectionState = s; }
IntRect selectionRect();
virtual FloatWillBeLayoutUnit virtualLogicalHeight() const override { return m_height; }
- virtual RenderObject::SelectionState selectionState() const override { return m_selectionState; }
+ virtual LayoutObject::SelectionState selectionState() const override { return m_selectionState; }
const AtomicString& ellipsisStr() { return m_str; }
InlineBox* markupBox() const;
@@ -56,7 +56,7 @@ private:
bool m_shouldPaintMarkupBox;
int m_height;
AtomicString m_str;
- RenderObject::SelectionState m_selectionState;
+ LayoutObject::SelectionState m_selectionState;
};
} // namespace blink
« no previous file with comments | « Source/core/layout/line/BreakingContextInlineHeaders.h ('k') | Source/core/layout/line/InlineBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698