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

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

Issue 183013005: Remove textDirection parameter from min/maxLogicalWidth (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 10 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/rendering/RenderRubyRun.cpp ('k') | Source/core/rendering/RenderText.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderText.h
diff --git a/Source/core/rendering/RenderText.h b/Source/core/rendering/RenderText.h
index 61ef1dde4ad19fbea670947e021badee7a904cd2..9f0bca69e7d99df11664fa30ebeb99390c155f0f 100644
--- a/Source/core/rendering/RenderText.h
+++ b/Source/core/rendering/RenderText.h
@@ -87,9 +87,8 @@ public:
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;
- // TextDirection required as these compute the preferred width if dirty.
- float minLogicalWidth(TextDirection) const;
- float maxLogicalWidth(TextDirection) const;
+ float minLogicalWidth() const;
+ float maxLogicalWidth() const;
void trimmedPrefWidths(float leadWidth,
float& firstLineMinWidth, bool& hasBreakableStart,
@@ -151,7 +150,7 @@ public:
PassRefPtr<AbstractInlineTextBox> firstAbstractInlineTextBox();
protected:
- virtual void computePreferredLogicalWidths(float leadWidth, TextDirection);
+ virtual void computePreferredLogicalWidths(float leadWidth);
virtual void willBeDestroyed() OVERRIDE;
virtual void styleWillChange(StyleDifference, const RenderStyle*) OVERRIDE FINAL { }
@@ -165,7 +164,7 @@ protected:
virtual InlineTextBox* createTextBox(); // Subclassed by SVG.
private:
- void computePreferredLogicalWidths(float leadWidth, HashSet<const SimpleFontData*>& fallbackFonts, GlyphOverflow&, TextDirection);
+ void computePreferredLogicalWidths(float leadWidth, HashSet<const SimpleFontData*>& fallbackFonts, GlyphOverflow&);
bool computeCanUseSimpleFontCodePath() const;
« no previous file with comments | « Source/core/rendering/RenderRubyRun.cpp ('k') | Source/core/rendering/RenderText.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698