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

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

Issue 1937043002: Remove the LayoutSVGInlineText* context in SVGTextLayoutAttributes (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/LayoutSVGInlineText.h
diff --git a/third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.h b/third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.h
index 67f3aaf68626f0f5c4f96d965046c620a9a9459b..1c24427fd9b1065d72c4a4e4677d4ed323eae7f7 100644
--- a/third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.h
+++ b/third_party/WebKit/Source/core/layout/svg/LayoutSVGInlineText.h
@@ -23,7 +23,7 @@
#define LayoutSVGInlineText_h
#include "core/layout/LayoutText.h"
-#include "core/layout/svg/SVGTextLayoutAttributes.h"
+#include "core/layout/svg/SVGCharacterData.h"
#include "core/layout/svg/SVGTextMetrics.h"
#include "wtf/Vector.h"
@@ -34,8 +34,8 @@ public:
LayoutSVGInlineText(Node*, PassRefPtr<StringImpl>);
bool characterStartsNewTextChunk(int position) const;
- SVGTextLayoutAttributes* layoutAttributes() { return &m_layoutAttributes; }
- const SVGTextLayoutAttributes* layoutAttributes() const { return &m_layoutAttributes; }
+ SVGCharacterDataMap& characterDataMap() { return m_characterDataMap; }
+ const SVGCharacterDataMap& characterDataMap() const { return m_characterDataMap; }
const Vector<SVGTextMetrics>& metricsList() const { return m_metrics; }
@@ -72,7 +72,7 @@ private:
float m_scalingFactor;
Font m_scaledFont;
- SVGTextLayoutAttributes m_layoutAttributes;
+ SVGCharacterDataMap m_characterDataMap;
Vector<SVGTextMetrics> m_metrics;
};

Powered by Google App Engine
This is Rietveld 408576698