Changeset 283879 in webkit

Timestamp:

Oct 10, 2021, 3:24:10 PM (5 years ago)

Author:

Alan Bujtas

Message:

[IFC][Integration] Do not bail out on missing primary font
​https://bugs.webkit.org/show_bug.cgi?id=231488

Reviewed by Antti Koivisto.

LayoutTests/imported/w3c:

• web-platform-tests/css/cssom-view/getBoundingClientRect-shy-expected.txt:

Source/WebCore:

IFC has non-primary font support now.

• layout/integration/LayoutIntegrationCoverage.cpp:

(WebCore::LayoutIntegration::printReason):
(WebCore::LayoutIntegration::canUseForFontAndText):

• layout/integration/LayoutIntegrationCoverage.h:

Location:

trunk

Files:

• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/css/cssom-view/getBoundingClientRect-shy-expected.txt (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp (modified) (3 diffs)
• Source/WebCore/layout/integration/LayoutIntegrationCoverage.h (modified) (1 diff)

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2021-10-10  Alan Bujtas  <zalan@apple.com>
+
+        [IFC][Integration] Do not bail out on missing primary font
+        https://bugs.webkit.org/show_bug.cgi?id=231488
+
+        Reviewed by Antti Koivisto.
+
+        * web-platform-tests/css/cssom-view/getBoundingClientRect-shy-expected.txt:
+
 2021-10-08  Aditya Keerthi  <akeerthi@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom-view/getBoundingClientRect-shy-expected.txt

@@ -15 +15 @@
 FAIL Rendered soft-hyphen should have a width. assert_equals: expected 10 but got 15
 PASS Collapsed soft-hyphen in a span should be 0 width.
-FAIL Rendered soft-hyphen in a span should have a width. assert_equals: expected 10 but got 0
+PASS Rendered soft-hyphen in a span should have a width.
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-10-10  Alan Bujtas  <zalan@apple.com>
+
+        [IFC][Integration] Do not bail out on missing primary font
+        https://bugs.webkit.org/show_bug.cgi?id=231488
+
+        Reviewed by Antti Koivisto.
+
+        IFC has non-primary font support now.
+
+        * layout/integration/LayoutIntegrationCoverage.cpp:
+        (WebCore::LayoutIntegration::printReason):
+        (WebCore::LayoutIntegration::canUseForFontAndText):
+        * layout/integration/LayoutIntegrationCoverage.h:
+
 2021-10-10  Alan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp

@@ -153 +153 @@
         stream << "direction character";
         break;
-    case AvoidanceReason::FlowIsMissingPrimaryFont:
-        stream << "missing primary font";
-        break;
     case AvoidanceReason::FlowTextIsCombineText:
         stream << "text is combine";
@@ -401 +398 @@
     const auto& style = container.style();
     auto& fontCascade = style.fontCascade();
-    if (fontCascade.primaryFont().isInterstitial())
-        SET_REASON_AND_RETURN_IF_NEEDED(FlowIsMissingPrimaryFont, reasons, includeReasons);
     if (style.lineBoxContain().contains(LineBoxContain::Glyphs))
         SET_REASON_AND_RETURN_IF_NEEDED(FlowHasLineBoxContainGlyphs, reasons, includeReasons);
@@ -423 +418 @@
             WebCore::TextRun run(String(textRenderer.text()));
             run.setCharacterScanForCodePath(false);
-            if (style.fontCascade().codePath(run) != FontCascade::CodePath::Simple)
+            if (fontCascade.codePath(run) != FontCascade::CodePath::Simple)
                 SET_REASON_AND_RETURN_IF_NEEDED(FlowHasComplexFontCodePath, reasons, includeReasons);
         }

trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h

@@ -72 +72 @@
     FlowHasSVGFont                               = 1LLU  << 31,
     FlowTextHasDirectionCharacter                = 1LLU  << 32,
-    FlowIsMissingPrimaryFont                     = 1LLU  << 33,
+    // Unused                                    = 1LLU  << 33,
     // Unused                                    = 1LLU  << 34,
     FlowTextIsCombineText                        = 1LLU  << 35,