Title: [283879] trunk
- Revision
- 283879
- Author
- [email protected]
- Date
- 2021-10-10 15:24:10 -0700 (Sun, 10 Oct 2021)
Log 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:
Modified Paths
Diff
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (283878 => 283879)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2021-10-10 21:28:42 UTC (rev 283878)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2021-10-10 22:24:10 UTC (rev 283879)
@@ -1,3 +1,12 @@
+2021-10-10 Alan Bujtas <[email protected]>
+
+ [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 <[email protected]>
Add support for '-webkit-appearance: auto'
Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom-view/getBoundingClientRect-shy-expected.txt (283878 => 283879)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom-view/getBoundingClientRect-shy-expected.txt 2021-10-10 21:28:42 UTC (rev 283878)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/css/cssom-view/getBoundingClientRect-shy-expected.txt 2021-10-10 22:24:10 UTC (rev 283879)
@@ -14,5 +14,5 @@
FAIL Collapsed soft-hyphen should be 0 width. assert_equals: expected 0 but got 5
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.
Modified: trunk/Source/WebCore/ChangeLog (283878 => 283879)
--- trunk/Source/WebCore/ChangeLog 2021-10-10 21:28:42 UTC (rev 283878)
+++ trunk/Source/WebCore/ChangeLog 2021-10-10 22:24:10 UTC (rev 283879)
@@ -1,5 +1,19 @@
2021-10-10 Alan Bujtas <[email protected]>
+ [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 <[email protected]>
+
[LFC][IFC] Do no bail out on boundary neutral characters
https://bugs.webkit.org/show_bug.cgi?id=231485
Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp (283878 => 283879)
--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp 2021-10-10 21:28:42 UTC (rev 283878)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp 2021-10-10 22:24:10 UTC (rev 283879)
@@ -152,9 +152,6 @@
case AvoidanceReason::FlowTextHasDirectionCharacter:
stream << "direction character";
break;
- case AvoidanceReason::FlowIsMissingPrimaryFont:
- stream << "missing primary font";
- break;
case AvoidanceReason::FlowTextIsCombineText:
stream << "text is combine";
break;
@@ -400,8 +397,6 @@
// We assume that all lines have metrics based purely on the primary font.
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);
for (const auto& textRenderer : childrenOfType<RenderText>(container)) {
@@ -422,7 +417,7 @@
} else {
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);
}
Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h (283878 => 283879)
--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h 2021-10-10 21:28:42 UTC (rev 283878)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h 2021-10-10 22:24:10 UTC (rev 283879)
@@ -71,7 +71,7 @@
// Unused = 1LLU << 30,
FlowHasSVGFont = 1LLU << 31,
FlowTextHasDirectionCharacter = 1LLU << 32,
- FlowIsMissingPrimaryFont = 1LLU << 33,
+ // Unused = 1LLU << 33,
// Unused = 1LLU << 34,
FlowTextIsCombineText = 1LLU << 35,
FlowTextIsRenderCounter = 1LLU << 36,
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
