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

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

Issue 1043643002: Switch line layout to LayoutUnit. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: More TestExpectations tweaks Created 5 years, 7 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/AbstractInlineTextBox.cpp ('k') | Source/core/layout/line/EllipsisBox.cpp » ('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 a2c0068ace4addd7d3d838b773cf09797ad73063..d1f612f981fe06d847c067f78518b8d49ac1a08f 100644
--- a/Source/core/layout/line/EllipsisBox.h
+++ b/Source/core/layout/line/EllipsisBox.h
@@ -20,7 +20,6 @@
#ifndef EllipsisBox_h
#define EllipsisBox_h
-#include "core/layout/line/FloatToLayoutUnit.h"
#include "core/layout/line/InlineBox.h"
namespace blink {
@@ -32,7 +31,7 @@ class EllipsisBox final : public InlineBox {
public:
EllipsisBox(LayoutObject& obj, const AtomicString& ellipsisStr, InlineFlowBox* parent,
int width, int height, int x, int y, bool firstLine, bool isVertical)
- : InlineBox(obj, FloatPointWillBeLayoutPoint(x, y), width, firstLine, true, false, false, isVertical, 0, 0, parent)
+ : InlineBox(obj, LayoutPoint(x, y), width, firstLine, true, false, false, isVertical, 0, 0, parent)
, m_height(height)
, m_str(ellipsisStr)
, m_selectionState(LayoutObject::SelectionNone)
@@ -45,7 +44,7 @@ public:
void setSelectionState(LayoutObject::SelectionState s) { m_selectionState = s; }
IntRect selectionRect();
- virtual FloatWillBeLayoutUnit virtualLogicalHeight() const override { return m_height; }
+ virtual LayoutUnit virtualLogicalHeight() const override { return m_height; }
virtual LayoutObject::SelectionState selectionState() const override { return m_selectionState; }
const AtomicString& ellipsisStr() { return m_str; }
« no previous file with comments | « Source/core/layout/line/AbstractInlineTextBox.cpp ('k') | Source/core/layout/line/EllipsisBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698