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

Unified Diff: third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.h

Issue 1883553004: Refactor the current text position update in SVGTextLayoutEngine (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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: third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.h
diff --git a/third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.h b/third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.h
index fc510dfec94e157245de711946e81e9649ba7a5b..a65073897de0f77567fca1ac9fb5983051ff192a 100644
--- a/third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.h
+++ b/third_party/WebKit/Source/core/layout/svg/SVGTextLayoutEngine.h
@@ -58,9 +58,9 @@ public:
void finishLayout();
private:
- void updateCharacterPositionIfNeeded(float& x, float& y);
- void updateCurrentTextPosition(float x, float y, float glyphAdvance);
- void updateRelativePositionAdjustmentsIfNeeded(float dx, float dy);
+ bool setCurrentTextPositionIfNeeded(const SVGCharacterData&);
pdr. 2016/04/14 01:05:52 Optional bikeshed: -isNeeded seems to have fallen
fs 2016/04/14 08:56:42 Dropped suffix.
+ void advanceCurrentTextPosition(float glyphAdvance);
+ bool applyRelativePositionAdjustmentsIfNeeded(const SVGCharacterData&);
void computeCurrentFragmentMetrics(SVGInlineTextBox*);
void recordTextFragment(SVGInlineTextBox*);
@@ -85,10 +85,7 @@ private:
unsigned m_logicalCharacterOffset;
unsigned m_logicalMetricsListOffset;
SVGInlineTextMetricsIterator m_visualMetricsIterator;
- float m_x;
- float m_y;
- float m_dx;
- float m_dy;
+ FloatPoint m_ctp;
pdr. 2016/04/14 01:05:52 +1 to merging these into a FloatPoint, but ctp isn
fs 2016/04/14 08:56:42 For me it's a very common acronym =D [1]. I guess
bool m_isVerticalText;
bool m_inPathLayout;
bool m_textLengthSpacingInEffect;
@@ -97,6 +94,7 @@ private:
OwnPtr<PathPositionMapper> m_textPath;
float m_textPathStartOffset;
float m_textPathCurrentOffset;
+ float m_textPathDisplacement;
float m_textPathSpacing;
float m_textPathScaling;
};

Powered by Google App Engine
This is Rietveld 408576698