Attachment 362361 Details for Bug 191368 – Alternative patch

[patch] Alternative patch

bug-191368-20190218175948.patch (text/plain), 6.08 KB, created by Myles C. Maxfield on 2019-02-18 17:59:49 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Myles C. Maxfield

Created: 2019-02-18 17:59:49 PST

Size: 6.08 KB

patch

obsolete

>Subversion Revision: 241733
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 7e86ea94c805f67c58c412f73b3330926e22f7d6..4af76faf959dc41df2c60d51ec11a4c676bc99da 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,25 @@
>+2019-02-18  Myles C. Maxfield  <mmaxfield@apple.com>
>+
>+        Layout Test fast/text/international/khmer-selection.html is crashing
>+        https://bugs.webkit.org/show_bug.cgi?id=191368
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        GlyphBuffer's offset array wasn't getting filled by UniscribeController.
>+        Our underlining code requires this array.
>+
>+        Uniscribe gives us a character -> glyph mapping, so we just have to compute
>+        the inverse and give it to the GlyphBuffer.
>+
>+        Test: fast/text/international/khmer-selection.html.
>+
>+        * platform/graphics/GlyphBuffer.h:
>+        (WebCore::GlyphBuffer::add):
>+        * platform/graphics/win/UniscribeController.cpp:
>+        (WebCore::UniscribeController::advance):
>+        (WebCore::UniscribeController::itemizeShapeAndPlace):
>+        (WebCore::UniscribeController::shapeAndPlaceItem):
>+
> 2019-02-18  Eric Carlson  <eric.carlson@apple.com>
> 
>         Add MSE logging configuration
>diff --git a/Source/WebCore/platform/graphics/GlyphBuffer.h b/Source/WebCore/platform/graphics/GlyphBuffer.h
>index bf0e94c767b831008edfd537eb04023ef1b5d58f..a58db6bff0c8f793f15e5db78eed3498da455f5a 100644
>--- a/Source/WebCore/platform/graphics/GlyphBuffer.h
>+++ b/Source/WebCore/platform/graphics/GlyphBuffer.h
>@@ -117,7 +117,7 @@ public:
>         add(glyph, font, advance, offsetInString);
>     }
> 
>-    void add(Glyph glyph, const Font* font, GlyphBufferAdvance advance, unsigned offsetInString = noOffset)
>+    void add(Glyph glyph, const Font* font, GlyphBufferAdvance advance, unsigned offsetInString)
>     {
>         m_font.append(font);
>         m_glyphs.append(glyph);
>diff --git a/Source/WebCore/platform/graphics/win/UniscribeController.cpp b/Source/WebCore/platform/graphics/win/UniscribeController.cpp
>index 440a0a1e1cdd211044802417f2d9f1c3c9d38aec..77abb346237dd9f84a904cb8d00063820c06e836 100644
>--- a/Source/WebCore/platform/graphics/win/UniscribeController.cpp
>+++ b/Source/WebCore/platform/graphics/win/UniscribeController.cpp
>@@ -171,7 +171,7 @@ void UniscribeController::advance(unsigned offset, GlyphBuffer* glyphBuffer)
>             int itemStart = m_run.rtl() ? index + 1 : indexOfFontTransition;
>             int itemLength = m_run.rtl() ? indexOfFontTransition - index : index - indexOfFontTransition;
>             m_currentCharacter = baseCharacter + itemStart;
>-            itemizeShapeAndPlace((isSmallCaps ? smallCapsBuffer.data() : cp) + itemStart, itemLength, fontData, glyphBuffer);
>+            itemizeShapeAndPlace((isSmallCaps ? smallCapsBuffer.data() : cp) + itemStart, itemStart, itemLength, fontData, glyphBuffer);
>             indexOfFontTransition = index;
>         }
>     }
>@@ -183,13 +183,13 @@ void UniscribeController::advance(unsigned offset, GlyphBuffer* glyphBuffer)
> 
>         int itemStart = m_run.rtl() ? 0 : indexOfFontTransition;
>         m_currentCharacter = baseCharacter + itemStart;
>-        itemizeShapeAndPlace((nextIsSmallCaps ? smallCapsBuffer.data() : cp) + itemStart, itemLength, nextFontData, glyphBuffer);
>+        itemizeShapeAndPlace((nextIsSmallCaps ? smallCapsBuffer.data() : cp) + itemStart, itemStart, itemLength, nextFontData, glyphBuffer);
>     }
> 
>     m_currentCharacter = baseCharacter + length;
> }
> 
>-void UniscribeController::itemizeShapeAndPlace(const UChar* cp, unsigned length, const Font* fontData, GlyphBuffer* glyphBuffer)
>+void UniscribeController::itemizeShapeAndPlace(const UChar* cp, unsigned stringOffset, unsigned length, const Font* fontData, GlyphBuffer* glyphBuffer)
> {
>     // ScriptItemize (in Windows XP versions prior to SP2) can overflow by 1.  This is why there is an extra empty item
>     // hanging out at the end of the array
>@@ -208,12 +208,12 @@ void UniscribeController::itemizeShapeAndPlace(const UChar* cp, unsigned length,
> 
>     if (m_run.rtl()) {
>         for (int i = m_items.size() - 2; i >= 0; i--) {
>-            if (!shapeAndPlaceItem(cp, i, fontData, glyphBuffer))
>+            if (!shapeAndPlaceItem(cp, stringOffset, i, fontData, glyphBuffer))
>                 return;
>         }
>     } else {
>         for (unsigned i = 0; i < m_items.size() - 1; i++) {
>-            if (!shapeAndPlaceItem(cp, i, fontData, glyphBuffer))
>+            if (!shapeAndPlaceItem(cp, stringOffset, i, fontData, glyphBuffer))
>                 return;
>         }
>     }
>@@ -231,7 +231,7 @@ void UniscribeController::resetControlAndState()
>     m_state.fOverrideDirection = m_run.directionalOverride();
> }
> 
>-bool UniscribeController::shapeAndPlaceItem(const UChar* cp, unsigned i, const Font* fontData, GlyphBuffer* glyphBuffer)
>+bool UniscribeController::shapeAndPlaceItem(const UChar* cp, unsigned stringOffset, unsigned i, const Font* fontData, GlyphBuffer* glyphBuffer)
> {
>     // Determine the string for this item.
>     const UChar* str = cp + m_items[i].iCharPos;
>@@ -253,6 +253,14 @@ bool UniscribeController::shapeAndPlaceItem(const UChar* cp, unsigned i, const F
>     if (!shape(str, len, item, fontData, glyphs, clusters, visualAttributes))
>         return true;
> 
>+    Vector<Optional<unsigned>> stringOffsets(glyphs.size());
>+    for (size_t i = 0; i < len; ++i) {
>+        if (stringOffsets[clusters[i]])
>+            stringOffsets[clusters[i]] = std::min(*stringOffsets[clusters[i]], i);
>+        else
>+            stringOffsets[clusters[i]] = i;
>+    }
>+
>     // We now have a collection of glyphs.
>     Vector<GOFFSET> offsets;
>     Vector<int> advances;
>@@ -367,7 +375,7 @@ bool UniscribeController::shapeAndPlaceItem(const UChar* cp, unsigned i, const F
>             else
>                 glyphBuffer->expandLastAdvance(origin);
>             GlyphBufferAdvance glyphAdvance(-origin.width() + advance, -origin.height());
>-            glyphBuffer->add(glyph, fontData, glyphAdvance);
>+            glyphBuffer->add(glyph, fontData, glyphAdvance, stringOffsets[k].value_or(0) + stringOffset);
>         }
> 
>         FloatRect glyphBounds = fontData->boundsForGlyph(glyph);

Actions: View | Formatted Diff | Diff

Attachments on bug 191368: 362192 | 362361 | 362519 | 362533 | 362552 | 362558 | 362613