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

Unified Diff: Source/core/layout/line/InlineFlowBox.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/line/InlineBox.cpp ('k') | Source/core/layout/line/InlineFlowBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/line/InlineFlowBox.h
diff --git a/Source/core/layout/line/InlineFlowBox.h b/Source/core/layout/line/InlineFlowBox.h
index 455508c57ae05941411c38f23f95eb34fa85ca25..9e5cc829c5b75bc05412e90f6534696174c99a98 100644
--- a/Source/core/layout/line/InlineFlowBox.h
+++ b/Source/core/layout/line/InlineFlowBox.h
@@ -23,6 +23,7 @@
#include "core/layout/LayoutObjectInlines.h"
#include "core/layout/OverflowModel.h"
+#include "core/layout/api/SelectionState.h"
#include "core/layout/line/InlineBox.h"
#include "core/style/ShadowData.h"
@@ -198,7 +199,7 @@ public:
void removeChild(InlineBox* child, MarkLineBoxes);
- LayoutObject::SelectionState selectionState() const override;
+ SelectionState selectionState() const override;
bool canAccommodateEllipsis(bool ltr, int blockEdge, int ellipsisWidth) const final;
LayoutUnit placeEllipsisBox(bool ltr, LayoutUnit blockLeftEdge, LayoutUnit blockRightEdge, LayoutUnit ellipsisWidth, LayoutUnit &truncatedWidth, bool&) override;
« no previous file with comments | « Source/core/layout/line/InlineBox.cpp ('k') | Source/core/layout/line/InlineFlowBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698