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

Unified Diff: Source/core/rendering/EllipsisBox.h

Issue 699683002: Continue with InlineBox float->LayoutUnit migration. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: nit Created 6 years, 1 month 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 | « no previous file | Source/core/rendering/EllipsisBox.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/EllipsisBox.h
diff --git a/Source/core/rendering/EllipsisBox.h b/Source/core/rendering/EllipsisBox.h
index c10c0db01457e86033325a595195087a2ab3a188..15fe593ea4b61d68c60788f4a860e0bfaa57da04 100644
--- a/Source/core/rendering/EllipsisBox.h
+++ b/Source/core/rendering/EllipsisBox.h
@@ -20,6 +20,7 @@
#ifndef EllipsisBox_h
#define EllipsisBox_h
+#include "core/rendering/FloatToLayoutUnit.h"
#include "core/rendering/InlineBox.h"
namespace blink {
@@ -31,7 +32,7 @@ class EllipsisBox final : public InlineBox {
public:
EllipsisBox(RenderObject& obj, const AtomicString& ellipsisStr, InlineFlowBox* parent,
int width, int height, int x, int y, bool firstLine, bool isVertical, InlineBox* markupBox)
- : InlineBox(obj, FloatPoint(x, y), width, firstLine, true, false, false, isVertical, 0, 0, parent)
+ : InlineBox(obj, FloatPointWillBeLayoutPoint(x, y), width, firstLine, true, false, false, isVertical, 0, 0, parent)
, m_shouldPaintMarkupBox(markupBox)
, m_height(height)
, m_str(ellipsisStr)
@@ -45,7 +46,7 @@ public:
void setSelectionState(RenderObject::SelectionState s) { m_selectionState = s; }
IntRect selectionRect();
- virtual float virtualLogicalHeight() const override { return m_height; }
+ virtual FloatWillBeLayoutUnit virtualLogicalHeight() const override { return m_height; }
virtual RenderObject::SelectionState selectionState() const override { return m_selectionState; }
const AtomicString& ellipsisStr() { return m_str; }
InlineBox* markupBox() const;
« no previous file with comments | « no previous file | Source/core/rendering/EllipsisBox.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698