Title: [281386] trunk
Revision
281386
Author
za...@apple.com
Date
2021-08-21 20:31:33 -0700 (Sat, 21 Aug 2021)

Log Message

[IFC][Integration] Enable modern line layout for placeholder elements
https://bugs.webkit.org/show_bug.cgi?id=228887

Reviewed by Antti Koivisto.

Source/WebCore:

Apparently placeholders don't do strange things anymore (this check is originated in SLL).

* layout/integration/LayoutIntegrationCoverage.cpp:
(WebCore::LayoutIntegration::canUseForLineLayoutWithReason):

LayoutTests:

* platform/ios-wk2/fast/repaint/placeholder-after-caps-lock-hidden-expected.txt:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (281385 => 281386)


--- trunk/LayoutTests/ChangeLog	2021-08-22 03:26:31 UTC (rev 281385)
+++ trunk/LayoutTests/ChangeLog	2021-08-22 03:31:33 UTC (rev 281386)
@@ -1,3 +1,12 @@
+2021-08-21  Alan Bujtas  <za...@apple.com>
+
+        [IFC][Integration] Enable modern line layout for placeholder elements
+        https://bugs.webkit.org/show_bug.cgi?id=228887
+
+        Reviewed by Antti Koivisto.
+
+        * platform/ios-wk2/fast/repaint/placeholder-after-caps-lock-hidden-expected.txt:
+
 2021-08-21  Per Arne  <pvol...@apple.com>
 
         [Win] The layout test fast/visual-viewport/resize-event-fired-window-resized.html is a flaky timeout

Modified: trunk/LayoutTests/platform/ios-wk2/fast/repaint/placeholder-after-caps-lock-hidden-expected.txt (281385 => 281386)


--- trunk/LayoutTests/platform/ios-wk2/fast/repaint/placeholder-after-caps-lock-hidden-expected.txt	2021-08-22 03:26:31 UTC (rev 281385)
+++ trunk/LayoutTests/platform/ios-wk2/fast/repaint/placeholder-after-caps-lock-hidden-expected.txt	2021-08-22 03:31:33 UTC (rev 281386)
@@ -18,8 +18,8 @@
   (rect 16.50 55.50 37 17)
   (rect 13.50 54 43 20)
   (rect 16.50 57 37 14)
-  (rect 13.50 54 26 20)
-  (rect 16.50 57 20 14)
+  (rect 33.50 54 23 20)
+  (rect 36.50 57 17 14)
   (rect 13.50 54 43 20)
   (rect 16.50 57 37 14)
 )

Modified: trunk/Source/WebCore/ChangeLog (281385 => 281386)


--- trunk/Source/WebCore/ChangeLog	2021-08-22 03:26:31 UTC (rev 281385)
+++ trunk/Source/WebCore/ChangeLog	2021-08-22 03:31:33 UTC (rev 281386)
@@ -1,3 +1,15 @@
+2021-08-21  Alan Bujtas  <za...@apple.com>
+
+        [IFC][Integration] Enable modern line layout for placeholder elements
+        https://bugs.webkit.org/show_bug.cgi?id=228887
+
+        Reviewed by Antti Koivisto.
+
+        Apparently placeholders don't do strange things anymore (this check is originated in SLL).
+
+        * layout/integration/LayoutIntegrationCoverage.cpp:
+        (WebCore::LayoutIntegration::canUseForLineLayoutWithReason):
+
 2021-08-21  Sihui Liu  <sihui_...@apple.com>
 
         IndexedDB: crash when triggering IDBOpenRequest completion back on a worker thread

Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp (281385 => 281386)


--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp	2021-08-22 03:26:31 UTC (rev 281385)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.cpp	2021-08-22 03:31:33 UTC (rev 281386)
@@ -111,9 +111,6 @@
     case AvoidanceReason::FlowHasLineClamp:
         stream << "-webkit-line-clamp";
         break;
-    case AvoidanceReason::FlowParentIsPlaceholderElement:
-        stream << "placeholder element";
-        break;
     case AvoidanceReason::FlowHasNonSupportedChild:
         stream << "unsupported child renderer";
         break;
@@ -737,9 +734,6 @@
         SET_REASON_AND_RETURN_IF_NEEDED(FlowHasTextOverflow, reasons, includeReasons);
     if (!flow.parent()->style().lineClamp().isNone())
         SET_REASON_AND_RETURN_IF_NEEDED(FlowHasLineClamp, reasons, includeReasons);
-    // FIXME: Placeholders do something strange.
-    if (is<RenderTextControl>(*flow.parent()) && downcast<RenderTextControl>(*flow.parent()).textFormControlElement().placeholderElement())
-        SET_REASON_AND_RETURN_IF_NEEDED(FlowParentIsPlaceholderElement, reasons, includeReasons);
     // 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.
     for (auto walker = InlineWalker(const_cast<RenderBlockFlow&>(flow)); !walker.atEnd(); walker.advance()) {

Modified: trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h (281385 => 281386)


--- trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h	2021-08-22 03:26:31 UTC (rev 281385)
+++ trunk/Source/WebCore/layout/integration/LayoutIntegrationCoverage.h	2021-08-22 03:31:33 UTC (rev 281386)
@@ -44,7 +44,7 @@
     FlowIsPaginated                              = 1LLU  << 4,
     FlowHasTextOverflow                          = 1LLU  << 5,
     FlowHasLineClamp                             = 1LLU  << 6,
-    FlowParentIsPlaceholderElement               = 1LLU  << 7,
+    // Unused                                    = 1LLU  << 7,
     // Unused                                    = 1LLU  << 8,
     FlowHasNonSupportedChild                     = 1LLU  << 9,
     FlowHasUnsupportedFloat                      = 1LLU  << 10,
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to