Remove GlyphBufferAdvance abstraction.

Remove GlyphBufferAdvance abstraction.

BUG=383594
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=176048

[jbroman, 2014-06-11 22:17:43]

It looks like the reason the Mac-specific path existed has gone way, and we can
just change GlyphBufferAdvance to FloatSize everywhere.

[eae, 2014-06-12 16:01:05]

LGTM

[jbroman, 2014-06-12 16:27:33]

The CQ bit was checked by jbroman@chromium.org

[commit-bot: I haz the power, 2014-06-12 16:28:30]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/jbroman@chromium.org/327243005/40001

[commit-bot: I haz the power, 2014-06-12 17:43:35]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-06-12 17:43:37]

Failed to apply patch for Source/platform/fonts/GlyphBuffer.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file Source/platform/fonts/GlyphBuffer.h
  Hunk #1 FAILED at 34.
  Hunk #2 FAILED at 74.
  Hunk #3 succeeded at 85 (offset -2 lines).
  Hunk #4 succeeded at 109 (offset -2 lines).
  Hunk #5 FAILED at 126.
  3 out of 5 hunks FAILED -- saving rejects to file
Source/platform/fonts/GlyphBuffer.h.rej

Patch:       Source/platform/fonts/GlyphBuffer.h
Index: Source/platform/fonts/GlyphBuffer.h
diff --git a/Source/platform/fonts/GlyphBuffer.h
b/Source/platform/fonts/GlyphBuffer.h
index
a6be12c52a14904a74660694ed61c0b9b3d7d31c..da65763ef0fab3715070ff40e42e34a8498f3e9a
100644
--- a/Source/platform/fonts/GlyphBuffer.h
+++ b/Source/platform/fonts/GlyphBuffer.h
@@ -34,33 +34,12 @@
 #include "platform/geometry/FloatSize.h"
 #include "wtf/Vector.h"
 
-#if OS(MACOSX)
-#include <ApplicationServices/ApplicationServices.h>
-#endif
-
 namespace WebCore {
 
 class SimpleFontData;
 
 typedef Glyph GlyphBufferGlyph;
 
-// CG uses CGSize instead of FloatSize so that the result of advances()
-// can be passed directly to CGContextShowGlyphsWithAdvances in FontMac.mm
-#if OS(MACOSX)
-struct GlyphBufferAdvance : CGSize {
-public:
-    GlyphBufferAdvance(CGSize size) : CGSize(size)
-    {
-    }
-
-    void setWidth(CGFloat width) { this->CGSize::width = width; }
-    CGFloat width() const { return this->CGSize::width; }
-    CGFloat height() const { return this->CGSize::height; }
-};
-#else
-typedef FloatSize GlyphBufferAdvance;
-#endif
-
 class GlyphBuffer {
 public:
     bool isEmpty() const { return m_fontData.isEmpty(); }
@@ -74,9 +53,9 @@ public:
     }
 
     GlyphBufferGlyph* glyphs(unsigned from) { return m_glyphs.data() + from; }
-    GlyphBufferAdvance* advances(unsigned from) { return m_advances.data() +
from; }
+    FloatSize* advances(unsigned from) { return m_advances.data() + from; }
     const GlyphBufferGlyph* glyphs(unsigned from) const { return
m_glyphs.data() + from; }
-    const GlyphBufferAdvance* advances(unsigned from) const { return
m_advances.data() + from; }
+    const FloatSize* advances(unsigned from) const { return m_advances.data() +
from; }
 
     const SimpleFontData* fontDataAt(unsigned index) const { return
m_fontData[index]; }
 
@@ -87,27 +66,15 @@ public:
 
     FloatSize advanceAt(unsigned index) const
     {
-#if OS(MACOSX)
-    return FloatSize(m_advances[index]);
-#else
-    return m_advances[index];
-#endif
+        return m_advances[index];
     }
 
     void add(Glyph glyph, const SimpleFontData* font, float width)
     {
-        m_fontData.append(font);
-        m_glyphs.append(glyph);
-
-#if OS(MACOSX)
-        CGSize advance = { width, 0 };
-        m_advances.append(advance);
-#else
-        m_advances.append(FloatSize(width, 0));
-#endif
+        add(glyph, font, FloatSize(width, 0));
     }
 
-    void add(Glyph glyph, const SimpleFontData* font, GlyphBufferAdvance
advance)
+    void add(Glyph glyph, const SimpleFontData* font, const FloatSize& advance)
     {
         m_fontData.append(font);
         m_glyphs.append(glyph);
@@ -123,7 +90,7 @@ public:
     void expandLastAdvance(float width)
     {
         ASSERT(!isEmpty());
-        GlyphBufferAdvance& lastAdvance = m_advances.last();
+        FloatSize& lastAdvance = m_advances.last();
         lastAdvance.setWidth(lastAdvance.width() + width);
     }
 
@@ -138,14 +105,14 @@ private:
         m_glyphs[index1] = m_glyphs[index2];
         m_glyphs[index2] = g;
 
-        GlyphBufferAdvance s = m_advances[index1];
+        FloatSize s = m_advances[index1];
         m_advances[index1] = m_advances[index2];
         m_advances[index2] = s;
     }
 
     Vector<const SimpleFontData*, 2048> m_fontData;
     Vector<GlyphBufferGlyph, 2048> m_glyphs;
-    Vector<GlyphBufferAdvance, 2048> m_advances;
+    Vector<FloatSize, 2048> m_advances;
 };
 
 }

[jbroman, 2014-06-12 18:01:26]

The CQ bit was checked by jbroman@chromium.org

[commit-bot: I haz the power, 2014-06-12 18:02:31]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/jbroman@chromium.org/327243005/60001

[commit-bot: I haz the power, 2014-06-12 21:26:00]

Change committed as 176048