Changeset 195249 in webkit

Timestamp:

Jan 18, 2016, 11:41:47 PM (11 years ago)

Author:

Carlos Garcia Campos

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.

Location:

releases/WebKitGTK/webkit-2.10

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/multiple-subtree-layout-failure-expected.html (added)
• LayoutTests/fast/forms/multiple-subtree-layout-failure.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/FrameView.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog

@@ +1 @@
+2016-01-09  Zalan Bujtas  <zalan@apple.com>
+
+        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  <zalan@apple.com>
 

releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog

@@ +1 @@
+2016-01-09  Zalan Bujtas  <zalan@apple.com>
+
+        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  <bfulgham@apple.com>
 

releases/WebKitGTK/webkit-2.10/Source/WebCore/page/FrameView.cpp

@@ -2645 +2645 @@
 
     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());
@@ -2666 +2666 @@
         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());
 }