Upstream version 11.39.266.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / platform / fonts / mac / ComplexTextController.h

diff --git a/src/third_party/WebKit/Source/platform/fonts/mac/ComplexTextController.h b/src/third_party/WebKit/Source/platform/fonts/mac/ComplexTextController.h
index 06bd70a..66b42d8 100644 (file)
--- a/src/third_party/WebKit/Source/platform/fonts/mac/ComplexTextController.h
+++ b/src/third_party/WebKit/Source/platform/fonts/mac/ComplexTextController.h
@@ -25,7 +25,6 @@
 #ifndef ComplexTextController_h
 #define ComplexTextController_h
 
-#include "platform/fonts/GlyphBuffer.h"
 #include "wtf/HashSet.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
@@ -33,15 +32,17 @@
 #include "wtf/text/WTFString.h"
 #include "wtf/unicode/Unicode.h"
 #include "wtf/Vector.h"
+#include <ApplicationServices/ApplicationServices.h>
 
 typedef unsigned short CGGlyph;
 
 typedef const struct __CTRun * CTRunRef;
 typedef const struct __CTLine * CTLineRef;
 
-namespace WebCore {
+namespace blink {
 
 class Font;
+class GlyphBuffer;
 class SimpleFontData;
 class TextRun;
 
@@ -64,8 +65,6 @@ public:
 
     float totalWidth() const { return m_totalWidth; }
 
-    float finalRoundingWidth() const { return m_finalRoundingWidth; }
-
     float minGlyphBoundingBoxX() const { return m_minGlyphBoundingBoxX; }
     float maxGlyphBoundingBoxX() const { return m_maxGlyphBoundingBoxX; }
     float minGlyphBoundingBoxY() const { return m_minGlyphBoundingBoxY; }
@@ -163,7 +162,6 @@ private:
     size_t m_currentRun;
     unsigned m_glyphInCurrentRun;
     unsigned m_characterInCurrentGlyph;
-    float m_finalRoundingWidth;
     float m_expansion;
     float m_expansionPerOpportunity;
     float m_leadingExpansion;
@@ -175,10 +173,8 @@ private:
     float m_maxGlyphBoundingBoxX;
     float m_minGlyphBoundingBoxY;
     float m_maxGlyphBoundingBoxY;
-
-    unsigned m_lastRoundingGlyph;
 };
 
-} // namespace WebCore
+} // namespace blink
 
 #endif // ComplexTextController_h