Changeset 265490 in webkit

Timestamp:

Aug 10, 2020 11:11:42 PM (4 years ago)

Author:

mmaxfield@apple.com

Message:

Fix bad merge in r265488
​https://bugs.webkit.org/show_bug.cgi?id=214769

Unreviewed. This is something that got dropped in a bad merge from r265488.

• platform/graphics/FontCascade.cpp:

(WebCore::FontCascade::layoutSimpleText const):

• platform/graphics/GlyphBuffer.h:

(WebCore::GlyphBuffer::originAt const):
(WebCore::GlyphBuffer::expandInitialAdvance):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-08-10  Myles C. Maxfield  <mmaxfield@apple.com>
+
+        Fix bad merge in r265488
+        https://bugs.webkit.org/show_bug.cgi?id=214769
+
+        Unreviewed. This is something that got dropped in a bad merge from r265488.
+
+        * platform/graphics/FontCascade.cpp:
+        (WebCore::FontCascade::layoutSimpleText const):
+        * platform/graphics/GlyphBuffer.h:
+        (WebCore::GlyphBuffer::originAt const):
+        (WebCore::GlyphBuffer::expandInitialAdvance):
+
 2020-08-10  Myles C. Maxfield  <mmaxfield@apple.com>
 

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

@@ -1399 +1399 @@
     }
     glyphBuffer.expandInitialAdvance(initialAdvance);
+    if (!glyphBuffer.isEmpty()) {
+        // The initial advance is supposed to point directly to the first glyph's paint position.
+        // See the ascii-art diagram in ComplexTextController.h.
+        glyphBuffer.expandInitialAdvance(GlyphBufferAdvance(glyphBuffer.originAt(0).x(), glyphBuffer.originAt(0).y()));
+    }
 
     // The glyph buffer is currently in logical order,

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

@@ -200 +200 @@
     Glyph glyphAt(unsigned index) const { return m_glyphs[index]; }
     GlyphBufferAdvance advanceAt(unsigned index) const { return m_advances[index]; }
+    GlyphBufferOrigin originAt(unsigned index) const { return m_origins[index]; }
     GlyphBufferStringOffset stringOffsetAt(unsigned index) const { return m_offsetsInString[index]; }
 
@@ -205 +206 @@
     const GlyphBufferAdvance& initialAdvance() const { return m_initialAdvance; }
     void expandInitialAdvance(float width) { m_initialAdvance.setWidth(m_initialAdvance.width() + width); }
+    void expandInitialAdvance(GlyphBufferAdvance additionalAdvance)
+    {
+        m_initialAdvance.setWidth(m_initialAdvance.width() + additionalAdvance.width());
+        m_initialAdvance.setHeight(m_initialAdvance.height() + additionalAdvance.height());
+    }
     
     static constexpr GlyphBufferStringOffset noOffset = std::numeric_limits<GlyphBufferStringOffset>::max();