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

Unified Diff: third_party/WebKit/Source/core/layout/svg/SVGCharacterData.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/SVGCharacterData.h
diff --git a/third_party/WebKit/Source/core/layout/svg/SVGTextLayoutAttributes.h b/third_party/WebKit/Source/core/layout/svg/SVGCharacterData.h
similarity index 69%
rename from third_party/WebKit/Source/core/layout/svg/SVGTextLayoutAttributes.h
rename to third_party/WebKit/Source/core/layout/svg/SVGCharacterData.h
index 27d81c7665cd95cf17f82f7cbc1b4bfbf53746e9..9427fe8a7951882d03cc4858085f0e8e7bbd06b0 100644
--- a/third_party/WebKit/Source/core/layout/svg/SVGTextLayoutAttributes.h
+++ b/third_party/WebKit/Source/core/layout/svg/SVGCharacterData.h
@@ -17,18 +17,15 @@
* Boston, MA 02110-1301, USA.
*/
-#ifndef SVGTextLayoutAttributes_h
-#define SVGTextLayoutAttributes_h
+#ifndef SVGCharacterData_h
+#define SVGCharacterData_h
#include "wtf/Allocator.h"
#include "wtf/HashMap.h"
#include "wtf/MathExtras.h"
-#include "wtf/Noncopyable.h"
namespace blink {
-class LayoutSVGInlineText;
-
struct SVGCharacterData {
DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
SVGCharacterData();
@@ -49,28 +46,6 @@ struct SVGCharacterData {
float rotate;
};
-typedef HashMap<unsigned, SVGCharacterData> SVGCharacterDataMap;
-
-class SVGTextLayoutAttributes {
- DISALLOW_NEW();
- WTF_MAKE_NONCOPYABLE(SVGTextLayoutAttributes);
-public:
- SVGTextLayoutAttributes(LayoutSVGInlineText*);
-
- void clear();
- static float emptyValue() { return std::numeric_limits<float>::quiet_NaN(); }
- static bool isEmptyValue(float value) { return std::isnan(value); }
-
- LayoutSVGInlineText* context() const { return m_context; }
-
- SVGCharacterDataMap& characterDataMap() { return m_characterDataMap; }
- const SVGCharacterDataMap& characterDataMap() const { return m_characterDataMap; }
-
-private:
- LayoutSVGInlineText* m_context;
- SVGCharacterDataMap m_characterDataMap;
-};
-
inline SVGCharacterData::SVGCharacterData()
: x(emptyValue())
, y(emptyValue())
@@ -80,6 +55,8 @@ inline SVGCharacterData::SVGCharacterData()
{
}
+typedef HashMap<unsigned, SVGCharacterData> SVGCharacterDataMap;
+
} // namespace blink
#endif

Powered by Google App Engine
This is Rietveld 408576698