Changeset 286637 in webkit

Timestamp:

Dec 7, 2021, 6:11:05 PM (5 years ago)

Author:

Cameron McCormack

Message:

Remove expandAroundIdeographs static variables
​https://bugs.webkit.org/show_bug.cgi?id=233750

Reviewed by Myles Maxfield.

With OffscreenCanvas, we can call into
ComplexTextController::adjustGlyphsAndAdvances,
FontCascade::expansionOpportunityCountInternal, and
WidthIterator::calculateAdditionalWidth from worker threads.
These all have a static variable variable with an initializer
that calls FontCascade::canExpandAroundIdeographsInComplexText,
and such initializers are not safe under -fno-threadsafe-statics.

canExpandAroundIdeographsInComplexText is a simple enough function in
all ports (it just returns a constant bool) that it's not worth caching
the result in a static.

• platform/graphics/ComplexTextController.cpp:

(WebCore::ComplexTextController::adjustGlyphsAndAdvances):

• platform/graphics/FontCascade.cpp:

(WebCore::FontCascade::expansionOpportunityCountInternal):

• platform/graphics/WidthIterator.cpp:

(WebCore::WidthIterator::calculateAdditionalWidth const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/ComplexTextController.cpp (modified) (1 diff)
• platform/graphics/FontCascade.cpp (modified) (3 diffs)
• platform/graphics/WidthIterator.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-07  Cameron McCormack  <heycam@apple.com>
+
+        Remove expandAroundIdeographs static variables
+        https://bugs.webkit.org/show_bug.cgi?id=233750
+
+        Reviewed by Myles Maxfield.
+
+        With OffscreenCanvas, we can call into
+        ComplexTextController::adjustGlyphsAndAdvances,
+        FontCascade::expansionOpportunityCountInternal, and
+        WidthIterator::calculateAdditionalWidth from worker threads.
+        These all have a static variable variable with an initializer
+        that calls FontCascade::canExpandAroundIdeographsInComplexText,
+        and such initializers are not safe under -fno-threadsafe-statics.
+
+        canExpandAroundIdeographsInComplexText is a simple enough function in
+        all ports (it just returns a constant bool) that it's not worth caching
+        the result in a static.
+
+        * platform/graphics/ComplexTextController.cpp:
+        (WebCore::ComplexTextController::adjustGlyphsAndAdvances):
+        * platform/graphics/FontCascade.cpp:
+        (WebCore::FontCascade::expansionOpportunityCountInternal):
+        * platform/graphics/WidthIterator.cpp:
+        (WebCore::WidthIterator::calculateAdditionalWidth const):
+
 2021-12-07  Cameron McCormack  <heycam@apple.com>
 

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

@@ -753 +753 @@
                     forbidRightExpansion = m_run.ltr() ? isLastCharacter : isFirstCharacter;
                 // Handle justification and word-spacing.
-                static bool expandAroundIdeographs = FontCascade::canExpandAroundIdeographsInComplexText();
-                bool ideograph = expandAroundIdeographs && FontCascade::isCJKIdeographOrSymbol(ch);
+                bool ideograph = FontCascade::canExpandAroundIdeographsInComplexText() && FontCascade::isCJKIdeographOrSymbol(ch);
                 if (treatAsSpace || ideograph || forceLeftExpansion || forceRightExpansion) {
                     // Distribute the run's total expansion evenly over all expansion opportunities in the run.

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

@@ -1002 +1002 @@
 std::pair<unsigned, bool> FontCascade::expansionOpportunityCountInternal(const UChar* characters, unsigned length, TextDirection direction, ExpansionBehavior expansionBehavior)
 {
-    static bool expandAroundIdeographs = canExpandAroundIdeographsInComplexText();
     unsigned count = 0;
     bool isAfterExpansion = (expansionBehavior & LeftExpansionMask) == ForbidLeftExpansion;
@@ -1021 +1020 @@
                 i++;
             }
-            if (expandAroundIdeographs && isCJKIdeographOrSymbol(character)) {
+            if (canExpandAroundIdeographsInComplexText() && isCJKIdeographOrSymbol(character)) {
                 if (!isAfterExpansion)
                     count++;
@@ -1042 +1041 @@
                 i--;
             }
-            if (expandAroundIdeographs && isCJKIdeographOrSymbol(character)) {
+            if (canExpandAroundIdeographsInComplexText() && isCJKIdeographOrSymbol(character)) {
                 if (!isAfterExpansion)
                     count++;

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

@@ -391 +391 @@
             bool forbidRightExpansion = isRightmostCharacter && (m_run.expansionBehavior() & RightExpansionMask) == ForbidRightExpansion;
 
-            static const bool expandAroundIdeographs = FontCascade::canExpandAroundIdeographsInComplexText();
-            bool isIdeograph = expandAroundIdeographs && FontCascade::isCJKIdeographOrSymbol(character);
+            bool isIdeograph = FontCascade::canExpandAroundIdeographsInComplexText() && FontCascade::isCJKIdeographOrSymbol(character);
 
             if (treatAsSpace || isIdeograph || forceLeftExpansion || forceRightExpansion) {