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

Unified Diff: Source/core/layout/svg/line/SVGRootInlineBox.h

Issue 1043643002: Switch line layout to LayoutUnit. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Remove debugging code 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
Index: Source/core/layout/svg/line/SVGRootInlineBox.h
diff --git a/Source/core/layout/svg/line/SVGRootInlineBox.h b/Source/core/layout/svg/line/SVGRootInlineBox.h
index 8b7f1f5ef4e766b5318f701f512bfae5d9ae8416..a69a0c5c583c638281b9c08493309838839a8e31 100644
--- a/Source/core/layout/svg/line/SVGRootInlineBox.h
+++ b/Source/core/layout/svg/line/SVGRootInlineBox.h
@@ -23,7 +23,6 @@
#ifndef SVGRootInlineBox_h
#define SVGRootInlineBox_h
-#include "core/layout/line/FloatToLayoutUnit.h"
#include "core/layout/line/RootInlineBox.h"
#include "core/layout/svg/SVGTextLayoutEngine.h"
@@ -39,8 +38,8 @@ public:
virtual bool isSVGRootInlineBox() const override { return true; }
- virtual FloatWillBeLayoutUnit virtualLogicalHeight() const override { return m_logicalHeight; }
- void setLogicalHeight(FloatWillBeLayoutUnit height) { m_logicalHeight = height; }
+ virtual LayoutUnit virtualLogicalHeight() const override { return m_logicalHeight; }
+ void setLogicalHeight(LayoutUnit height) { m_logicalHeight = height; }
virtual void paint(const PaintInfo&, const LayoutPoint&, LayoutUnit lineTop, LayoutUnit lineBottom) override;
@@ -53,11 +52,11 @@ public:
private:
void reorderValueLists(Vector<SVGTextLayoutAttributes*>&);
void layoutCharactersInTextBoxes(InlineFlowBox*, SVGTextLayoutEngine&);
- void layoutChildBoxes(InlineFlowBox*, FloatRectWillBeLayoutRect* = 0);
- void layoutRootBox(const FloatRectWillBeLayoutRect&);
+ void layoutChildBoxes(InlineFlowBox*, LayoutRect* = 0);
+ void layoutRootBox(const LayoutRect&);
private:
- FloatWillBeLayoutUnit m_logicalHeight;
+ LayoutUnit m_logicalHeight;
};
DEFINE_INLINE_BOX_TYPE_CASTS(SVGRootInlineBox);

Powered by Google App Engine
This is Rietveld 408576698