Title: [195249] releases/WebKitGTK/webkit-2.10
Revision
195249
Author
[email protected]
Date
2016-01-18 23:41:47 -0800 (Mon, 18 Jan 2016)

Log Message

Merge r194823 - REGRESSION (r194426): First email field is not autofilled on amazon.com
https://bugs.webkit.org/show_bug.cgi?id=152945
<rdar://problem/24082914>

Reviewed by Simon Fraser.

r194426 missed marking the m_layoutRoot for layout while converting to full layout (it only marked the new layout root).

Source/WebCore:

Test: fast/forms/multiple-subtree-layout-failure.html

* page/FrameView.cpp:
(WebCore::FrameView::scheduleRelayoutOfSubtree):

LayoutTests:

* fast/forms/multiple-subtree-layout-failure-expected.html: Added.
* fast/forms/multiple-subtree-layout-failure.html: Added.

Modified Paths

Added Paths

Diff

Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (195248 => 195249)


--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog	2016-01-19 07:37:32 UTC (rev 195248)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog	2016-01-19 07:41:47 UTC (rev 195249)
@@ -1,3 +1,16 @@
+2016-01-09  Zalan Bujtas  <[email protected]>
+
+        REGRESSION (r194426): First email field is not autofilled on amazon.com
+        https://bugs.webkit.org/show_bug.cgi?id=152945
+        <rdar://problem/24082914>
+
+        Reviewed by Simon Fraser.
+
+        r194426 missed marking the m_layoutRoot for layout while converting to full layout (it only marked the new layout root).
+
+        * fast/forms/multiple-subtree-layout-failure-expected.html: Added.
+        * fast/forms/multiple-subtree-layout-failure.html: Added.
+
 2016-01-07  Zalan Bujtas  <[email protected]>
 
         Incorrect position: fixed; rendering when child of position:relative/sticky.

Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/multiple-subtree-layout-failure-expected.html (0 => 195249)


--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/multiple-subtree-layout-failure-expected.html	                        (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/multiple-subtree-layout-failure-expected.html	2016-01-19 07:41:47 UTC (rev 195249)
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests when we issue subtree layout on multiple subtrees, they all get laid out properly.</title>
+</head>
+<body>
+<div><input value="foobar"></div>
+<div><input value="foobar"></div>
+</body>
+</html>

Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/multiple-subtree-layout-failure.html (0 => 195249)


--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/multiple-subtree-layout-failure.html	                        (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/forms/multiple-subtree-layout-failure.html	2016-01-19 07:41:47 UTC (rev 195249)
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests when we issue subtree layout on multiple subtrees, they all get laid out properly.</title>
+</head>
+<body>
+<div><input id="test"></div>
+<div><input id="test1"></div>
+<script>
+if (window.testRunner)
+    testRunner.waitUntilDone();
+setTimeout(function() {
+    document.getElementById("test").value = "foobar";
+    document.getElementById("test1").value = "foobar";
+    if (window.testRunner)
+        testRunner.notifyDone();
+    }, 0);
+</script>
+</body>
+</html>

Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (195248 => 195249)


--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog	2016-01-19 07:37:32 UTC (rev 195248)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog	2016-01-19 07:41:47 UTC (rev 195249)
@@ -1,3 +1,18 @@
+2016-01-09  Zalan Bujtas  <[email protected]>
+
+        REGRESSION (r194426): First email field is not autofilled on amazon.com
+        https://bugs.webkit.org/show_bug.cgi?id=152945
+        <rdar://problem/24082914>
+
+        Reviewed by Simon Fraser.
+
+        r194426 missed marking the m_layoutRoot for layout while converting to full layout (it only marked the new layout root).
+
+        Test: fast/forms/multiple-subtree-layout-failure.html
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::scheduleRelayoutOfSubtree):
+
 2016-01-07  Brent Fulgham  <[email protected]>
 
         Correct missing EXT_sRGB Format Handling

Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/page/FrameView.cpp (195248 => 195249)


--- releases/WebKitGTK/webkit-2.10/Source/WebCore/page/FrameView.cpp	2016-01-19 07:37:32 UTC (rev 195248)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/page/FrameView.cpp	2016-01-19 07:41:47 UTC (rev 195249)
@@ -2644,7 +2644,7 @@
         return;
 
     if (!m_layoutRoot) {
-        // Just relayout the subtree.
+        // We already have a pending (full) layout. Just mark the subtree for layout.
         newRelayoutRoot.markContainingBlocksForLayout(ScheduleRelayout::No);
         InspectorInstrumentation::didInvalidateLayout(frame());
         return;
@@ -2665,10 +2665,9 @@
         InspectorInstrumentation::didInvalidateLayout(frame());
         return;
     }
-
-    // Just do a full relayout.
-    m_layoutRoot = &newRelayoutRoot;
+    // Two disjoint subtrees need layout. Mark both of them and issue a full layout instead.
     convertSubtreeLayoutToFullLayout();
+    newRelayoutRoot.markContainingBlocksForLayout(ScheduleRelayout::No);
     InspectorInstrumentation::didInvalidateLayout(frame());
 }
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to