Title: [154036] trunk/Source/WebCore
Revision
154036
Author
[email protected]
Date
2013-08-13 18:44:51 -0700 (Tue, 13 Aug 2013)

Log Message

Fix orphan needsLayout state in RenderTextControlSingleLine
https://bugs.webkit.org/show_bug.cgi?id=119726

Reviewed by Kent Tamura.

Merge https://chromium.googlesource.com/chromium/blink/+/c0aec52ef348b2be0c882f8646fe3cf537831f59

We should mark the renderer for containerElement, which wraps innerTextElement and innerBlockElement
in cases of input[type=search] and input[type=number], dirty.

* rendering/RenderTextControlSingleLine.cpp:
(WebCore::setNeedsLayoutOnAncestors):
(WebCore::RenderTextControlSingleLine::layout):

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (154035 => 154036)


--- trunk/Source/WebCore/ChangeLog	2013-08-14 01:21:38 UTC (rev 154035)
+++ trunk/Source/WebCore/ChangeLog	2013-08-14 01:44:51 UTC (rev 154036)
@@ -1,3 +1,19 @@
+2013-08-12  Ryosuke Niwa  <[email protected]>
+
+        Fix orphan needsLayout state in RenderTextControlSingleLine
+        https://bugs.webkit.org/show_bug.cgi?id=119726
+
+        Reviewed by Kent Tamura.
+
+        Merge https://chromium.googlesource.com/chromium/blink/+/c0aec52ef348b2be0c882f8646fe3cf537831f59
+
+        We should mark the renderer for containerElement, which wraps innerTextElement and innerBlockElement
+        in cases of input[type=search] and input[type=number], dirty.
+
+        * rendering/RenderTextControlSingleLine.cpp:
+        (WebCore::setNeedsLayoutOnAncestors):
+        (WebCore::RenderTextControlSingleLine::layout):
+
 2013-08-13  Sam Weinig  <[email protected]>
 
         [Re-land] Cleanup MediaQueryListListener

Modified: trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp (154035 => 154036)


--- trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp	2013-08-14 01:21:38 UTC (rev 154035)
+++ trunk/Source/WebCore/rendering/RenderTextControlSingleLine.cpp	2013-08-14 01:44:51 UTC (rev 154036)
@@ -98,6 +98,15 @@
     return containerElement() ? contentLogicalHeight() : logicalHeight();
 }
 
+static void setNeedsLayoutOnAncestors(RenderObject* start, RenderObject* ancestor)
+{
+    ASSERT(start != ancestor);
+    for (RenderObject* renderer = start; renderer != ancestor; renderer = renderer->parent()) {
+        ASSERT(renderer);
+        renderer->setNeedsLayout(true, MarkOnlyThis);
+    }
+}
+
 void RenderTextControlSingleLine::layout()
 {
     StackStats::LayoutCheckPoint layoutCheckPoint;
@@ -119,11 +128,11 @@
     // To ensure consistency between layouts, we need to reset any conditionally overriden height.
     if (innerTextRenderer && !innerTextRenderer->style()->logicalHeight().isAuto()) {
         innerTextRenderer->style()->setLogicalHeight(Length(Auto));
-        innerTextRenderer->setNeedsLayout(true, MarkOnlyThis);
+        setNeedsLayoutOnAncestors(innerTextRenderer, this);
     }
     if (innerBlockRenderer && !innerBlockRenderer->style()->logicalHeight().isAuto()) {
         innerBlockRenderer->style()->setLogicalHeight(Length(Auto));
-        innerBlockRenderer->setNeedsLayout(true, MarkOnlyThis);
+        setNeedsLayoutOnAncestors(innerBlockRenderer, this);
     }
 
     RenderBlock::layoutBlock(false);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to