Changeset 205775 in webkit

Timestamp:

Sep 9, 2016 5:06:06 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r205771.
​https://bugs.webkit.org/show_bug.cgi?id=161823

Broke Windows build (Requested by litherum on #webkit).

Reverted changeset:

"Remove unused member of GlyphBuffer"
​https://bugs.webkit.org/show_bug.cgi?id=161814
​http://trac.webkit.org/changeset/205771

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/FontCascade.cpp (modified) (2 diffs)
• platform/graphics/GlyphBuffer.h (modified) (6 diffs)
• platform/graphics/win/UniscribeController.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-09  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r205771.
+        https://bugs.webkit.org/show_bug.cgi?id=161823
+
+        Broke Windows build (Requested by litherum on #webkit).
+
+        Reverted changeset:
+
+        "Remove unused member of GlyphBuffer"
+        https://bugs.webkit.org/show_bug.cgi?id=161814
+        http://trac.webkit.org/changeset/205771
+
 2016-09-09  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/platform/graphics/FontCascade.cpp

@@ -1285 +1285 @@
     // Draw each contiguous run of glyphs that use the same font data.
     const Font* fontData = glyphBuffer.fontAt(0);
+    FloatSize offset = glyphBuffer.offsetAt(0);
     FloatPoint startPoint(point.x(), point.y() - glyphBuffer.initialAdvance().height());
     float nextX = startPoint.x() + glyphBuffer.advanceAt(0).width();
@@ -1292 +1293 @@
     while (nextGlyph < glyphBuffer.size()) {
         const Font* nextFontData = glyphBuffer.fontAt(nextGlyph);
-
-        if (nextFontData != fontData) {
+        FloatSize nextOffset = glyphBuffer.offsetAt(nextGlyph);
+
+        if (nextFontData != fontData || nextOffset != offset) {
             context.drawGlyphs(*this, *fontData, glyphBuffer, lastFrom, nextGlyph - lastFrom, startPoint);
 
             lastFrom = nextGlyph;
             fontData = nextFontData;
+            offset = nextOffset;
             startPoint.setX(nextX);
             startPoint.setY(nextY);

trunk/Source/WebCore/platform/graphics/GlyphBuffer.h

@@ -88 +88 @@
         if (m_offsetsInString)
             m_offsetsInString->clear();
+#if PLATFORM(WIN)
+        m_offsets.clear();
+#endif
     }
 
@@ -116 +119 @@
         return m_advances[index];
     }
+
+    FloatSize offsetAt(unsigned index) const
+    {
+#if PLATFORM(WIN)
+        return m_offsets[index];
+#else
+        UNUSED_PARAM(index);
+        return FloatSize();
+#endif
+    }
     
     static const unsigned noOffset = UINT_MAX;
-    void add(Glyph glyph, const Font* font, float width, unsigned offsetInString = noOffset)
+    void add(Glyph glyph, const Font* font, float width, unsigned offsetInString = noOffset, const FloatSize* offset = 0)
     {
         m_font.append(font);
@@ -135 +148 @@
 #else
         m_advances.append(FloatSize(width, 0));
+#endif
+
+#if PLATFORM(WIN)
+        if (offset)
+            m_offsets.append(*offset);
+        else
+            m_offsets.append(FloatSize());
+#else
+        UNUSED_PARAM(offset);
 #endif
         
@@ -191 +213 @@
         if (m_offsetsInString)
             m_offsetsInString->shrink(truncationPoint);
+#if PLATFORM(WIN)
+        m_offsets.shrink(truncationPoint);
+#endif
     }
 
@@ -207 +232 @@
         m_advances[index1] = m_advances[index2];
         m_advances[index2] = s;
+
+#if PLATFORM(WIN)
+        FloatSize offset = m_offsets[index1];
+        m_offsets[index1] = m_offsets[index2];
+        m_offsets[index2] = offset;
+#endif
     }
 
@@ -214 +245 @@
     GlyphBufferAdvance m_initialAdvance;
     std::unique_ptr<Vector<unsigned, 2048>> m_offsetsInString;
+#if PLATFORM(WIN)
+    Vector<FloatSize, 2048> m_offsets;
+#endif
     float m_leadingExpansion;
 };

trunk/Source/WebCore/platform/graphics/win/UniscribeController.cpp

@@ -366 +366 @@
         if (glyphBuffer) {
             FloatSize size(offsetX, -offsetY);
-            glyphBuffer->add(glyph, fontData, advance, GlyphBuffer::noOffset);
+            glyphBuffer->add(glyph, fontData, advance, GlyphBuffer::noOffset, &size);
         }