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

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

Issue 1261653002: Move SelectionState out of LayoutObject and into Line Layout API (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 2 legit 5ever Created 5 years, 5 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/api/SelectionState.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 0b8c253d4a9367f9f99e2779f63f7d88b799b4a5..7f3931ddd9e9f7147f17267e54eb1766926b4ea8 100644
--- a/Source/core/layout/line/EllipsisBox.h
+++ b/Source/core/layout/line/EllipsisBox.h
@@ -20,6 +20,7 @@
#ifndef EllipsisBox_h
#define EllipsisBox_h
+#include "core/layout/api/SelectionState.h"
#include "core/layout/line/InlineBox.h"
namespace blink {
@@ -34,18 +35,18 @@ public:
: InlineBox(obj, LayoutPoint(x, y), width, firstLine, true, false, false, isVertical, 0, 0, parent)
, m_height(height)
, m_str(ellipsisStr)
- , m_selectionState(LayoutObject::SelectionNone)
+ , m_selectionState(SelectionNone)
{
setHasVirtualLogicalHeight();
}
void paint(const PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override;
bool nodeAtPoint(HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, LayoutUnit lineTop, LayoutUnit lineBottom) override;
- void setSelectionState(LayoutObject::SelectionState s) { m_selectionState = s; }
+ void setSelectionState(SelectionState s) { m_selectionState = s; }
IntRect selectionRect();
LayoutUnit virtualLogicalHeight() const override { return m_height; }
- LayoutObject::SelectionState selectionState() const override { return m_selectionState; }
+ SelectionState selectionState() const override { return m_selectionState; }
const AtomicString& ellipsisStr() { return m_str; }
const char* boxName() const override;
@@ -54,7 +55,7 @@ private:
int m_height;
AtomicString m_str;
- LayoutObject::SelectionState m_selectionState;
+ SelectionState m_selectionState;
};
} // namespace blink
« no previous file with comments | « Source/core/layout/api/SelectionState.h ('k') | Source/core/layout/line/InlineBox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698