Changeset 285783 in webkit

Timestamp:

Nov 13, 2021, 3:21:41 PM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC][Integration] Add support for optional bidi character coverage checking
​https://bugs.webkit.org/show_bug.cgi?id=233049

Reviewed by Antti Koivisto.

This is in preparation for enabling bidi for IFC.

• layout/formattingContexts/inline/InlineItemsBuilder.cpp:
• layout/integration/LayoutIntegrationCoverage.cpp:

(WebCore::LayoutIntegration::canUseForFontAndText):
(WebCore::LayoutIntegration::canUseForRenderInlineChild):
(WebCore::LayoutIntegration::canUseForLineLayoutWithReason):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/integration/LayoutIntegrationCoverage.cpp (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-11-13  Alan Bujtas  <zalan@apple.com>
+
+        [LFC][Integration] Add support for optional bidi character coverage checking
+        https://bugs.webkit.org/show_bug.cgi?id=233049
+
+        Reviewed by Antti Koivisto.
+
+        This is in preparation for enabling bidi for IFC.
+
+        * layout/formattingContexts/inline/InlineItemsBuilder.cpp:
+        * layout/integration/LayoutIntegrationCoverage.cpp:
+        (WebCore::LayoutIntegration::canUseForFontAndText):
+        (WebCore::LayoutIntegration::canUseForRenderInlineChild):
+        (WebCore::LayoutIntegration::canUseForLineLayoutWithReason):
+
 2021-11-13  Alan Bujtas  <zalan@apple.com>
 

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

@@ -46 +46 @@
 #if ENABLE(LAYOUT_FORMATTING_CONTEXT)
 
+#define ALLOW_BIDI_CONTENT 0
+#define ALLOW_BIDI_CONTENT_WITH_INLINE_BOX 0
+
 #ifndef NDEBUG
 #define SET_REASON_AND_RETURN_IF_NEEDED(reason, reasons, includeReasons) { \
@@ -389 +392 @@
 }
 
-static OptionSet<AvoidanceReason> canUseForFontAndText(const RenderBoxModelObject& container, IncludeReasons includeReasons)
+enum class CheckForBidiCharacters { Yes, No };
+static OptionSet<AvoidanceReason> canUseForFontAndText(const RenderBoxModelObject& container, CheckForBidiCharacters checkForBidiCharacters, IncludeReasons includeReasons)
 {
     OptionSet<AvoidanceReason> reasons;
@@ -419 +423 @@
         }
 
-        auto textReasons = canUseForText(textRenderer.stringView(), includeReasons);
-        if (textReasons)
-            ADD_REASONS_AND_RETURN_IF_NEEDED(textReasons, reasons, includeReasons);
+        if (checkForBidiCharacters == CheckForBidiCharacters::Yes) {
+            if (auto textReasons = canUseForText(textRenderer.stringView(), includeReasons))
+                ADD_REASONS_AND_RETURN_IF_NEEDED(textReasons, reasons, includeReasons);
+        }
     }
     return reasons;
@@ -485 +490 @@
     if (renderInline.containingBlock()->style().lineBoxContain() != RenderStyle::initialLineBoxContain())
         SET_REASON_AND_RETURN_IF_NEEDED(FlowHasLineBoxContainProperty, reasons, includeReasons);
-    auto fontAndTextReasons = canUseForFontAndText(renderInline, includeReasons);
+    auto checkForBidiCharacters = CheckForBidiCharacters::Yes;
+#if ALLOW_BIDI_CONTENT_WITH_INLINE_BOX
+    checkForBidiCharacters = CheckForBidiCharacters::No;
+#endif
+    auto fontAndTextReasons = canUseForFontAndText(renderInline, checkForBidiCharacters, includeReasons);
     if (fontAndTextReasons)
         ADD_REASONS_AND_RETURN_IF_NEEDED(fontAndTextReasons, reasons, includeReasons);
+
     auto styleReasons = canUseForStyle(style, includeReasons);
     if (styleReasons)
@@ -633 +643 @@
     // This currently covers <blockflow>#text</blockflow>, <blockflow>#text<br></blockflow> and mutiple (sibling) RenderText cases.
     // The <blockflow><inline>#text</inline></blockflow> case is also popular and should be relatively easy to cover.
+    auto hasSeenInlineBox = false;
     for (auto walker = InlineWalker(flow); !walker.atEnd(); walker.advance()) {
         if (auto childReasons = canUseForChild(flow, *walker.current(), includeReasons))
             ADD_REASONS_AND_RETURN_IF_NEEDED(childReasons, reasons, includeReasons);
+        hasSeenInlineBox = hasSeenInlineBox || is<RenderInline>(*walker.current());
     }
     auto styleReasons = canUseForStyle(flow.style(), includeReasons);
@@ -650 +662 @@
         }
     }
-    auto fontAndTextReasons = canUseForFontAndText(flow, includeReasons);
+    auto checkForBidiCharacters = CheckForBidiCharacters::Yes;
+#if ALLOW_BIDI_CONTENT
+    if (!hasSeenInlineBox)
+        checkForBidiCharacters = CheckForBidiCharacters::No;
+#endif
+#if ALLOW_BIDI_CONTENT_WITH_INLINE_BOX
+    checkForBidiCharacters = CheckForBidiCharacters::No;
+#endif
+    auto fontAndTextReasons = canUseForFontAndText(flow, checkForBidiCharacters, includeReasons);
     if (fontAndTextReasons)
         ADD_REASONS_AND_RETURN_IF_NEEDED(fontAndTextReasons, reasons, includeReasons);