Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1491)

Unified Diff: Source/core/rendering/RenderBlock.cpp

Issue 197283038: Add RenderObject::needsResizeLayout (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Rebase Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Source/core/rendering/RenderBox.h » ('j') | Source/core/rendering/RenderBox.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBlock.cpp
diff --git a/Source/core/rendering/RenderBlock.cpp b/Source/core/rendering/RenderBlock.cpp
index cd15f82298d0f43e0555e618307afe4122c118c4..c5828761114a9d6793f9a4f4be9073249d26e036 100644
--- a/Source/core/rendering/RenderBlock.cpp
+++ b/Source/core/rendering/RenderBlock.cpp
@@ -1632,7 +1632,8 @@ void RenderBlock::simplifiedNormalFlowLayout()
bool RenderBlock::simplifiedLayout()
{
- if ((!posChildNeedsLayout() && !needsSimplifiedNormalFlowLayout()) || normalChildNeedsLayout() || selfNeedsLayout())
+ if ((!posChildNeedsLayout() && !needsSimplifiedNormalFlowLayout() && !needsResizeLayout())
+ || normalChildNeedsLayout() || selfNeedsLayout())
return false;
@@ -1643,6 +1644,9 @@ bool RenderBlock::simplifiedLayout()
if (needsPositionedMovementLayout() && !tryLayoutDoingPositionedMovementOnly())
return false;
+ if (needsResizeLayout() && !tryLayoutDoingResizeOnly())
+ return false;
+
FastTextAutosizer::LayoutScope fastTextAutosizerLayoutScope(this);
// Lay out positioned descendants or objects that just need to recompute overflow.
@@ -3815,7 +3819,7 @@ bool RenderBlock::hasLineIfEmpty() const
if (node()->isRootEditableElement())
return true;
- if (node()->isShadowRoot() && isHTMLInputElement(*toShadowRoot(node())->host()))
+ if (node()->isShadowRoot() && toShadowRoot(node())->host()->hasTagName(inputTag))
return true;
return false;
« no previous file with comments | « no previous file | Source/core/rendering/RenderBox.h » ('j') | Source/core/rendering/RenderBox.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698