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

Unified Diff: Source/core/layout/LayoutText.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/LayoutRubyText.cpp ('k') | Source/core/layout/LayoutText.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/LayoutText.h
diff --git a/Source/core/layout/LayoutText.h b/Source/core/layout/LayoutText.h
index 4c2ae7db3ab6b7a560524d0e701b3a3555abab73..8f2c2b256d3c628e823b567aaaffdab8c0356885 100644
--- a/Source/core/layout/LayoutText.h
+++ b/Source/core/layout/LayoutText.h
@@ -26,7 +26,6 @@
#include "core/CoreExport.h"
#include "core/dom/Text.h"
#include "core/layout/LayoutObject.h"
-#include "core/layout/line/FloatToLayoutUnit.h"
#include "platform/LengthFunctions.h"
#include "platform/text/TextPath.h"
#include "wtf/Forward.h"
@@ -87,18 +86,18 @@ public:
unsigned textLength() const { return m_text.length(); } // non virtual implementation of length()
void positionLineBox(InlineBox*);
- virtual float width(unsigned from, unsigned len, const Font&, float xPos, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const;
- virtual float width(unsigned from, unsigned len, float xPos, TextDirection, bool firstLine = false, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const;
+ virtual float width(unsigned from, unsigned len, const Font&, LayoutUnit xPos, TextDirection, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const;
+ virtual float width(unsigned from, unsigned len, LayoutUnit xPos, TextDirection, bool firstLine = false, HashSet<const SimpleFontData*>* fallbackFonts = 0, GlyphOverflow* = 0) const;
float minLogicalWidth() const;
float maxLogicalWidth() const;
- void trimmedPrefWidths(FloatWillBeLayoutUnit leadWidth,
- FloatWillBeLayoutUnit& firstLineMinWidth, bool& hasBreakableStart,
- FloatWillBeLayoutUnit& lastLineMinWidth, bool& hasBreakableEnd,
+ void trimmedPrefWidths(LayoutUnit leadWidth,
+ LayoutUnit& firstLineMinWidth, bool& hasBreakableStart,
+ LayoutUnit& lastLineMinWidth, bool& hasBreakableEnd,
bool& hasBreakableChar, bool& hasBreak,
- FloatWillBeLayoutUnit& firstLineMaxWidth, FloatWillBeLayoutUnit& lastLineMaxWidth,
- FloatWillBeLayoutUnit& minWidth, FloatWillBeLayoutUnit& maxWidth, bool& stripFrontSpaces,
+ LayoutUnit& firstLineMaxWidth, LayoutUnit& lastLineMaxWidth,
+ LayoutUnit& minWidth, LayoutUnit& maxWidth, bool& stripFrontSpaces,
TextDirection);
virtual IntRect linesBoundingBox() const;
« no previous file with comments | « Source/core/layout/LayoutRubyText.cpp ('k') | Source/core/layout/LayoutText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698