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

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

Issue 453113002: RenderLayer::hasVisibleContent should ASSERT(!m_visibleContentStatusDirty) (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 4 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/RenderLayer.h » ('j') | Source/core/rendering/RenderLayer.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/rendering/RenderBlockFlow.cpp
diff --git a/Source/core/rendering/RenderBlockFlow.cpp b/Source/core/rendering/RenderBlockFlow.cpp
index a786bb86aec1bad446dfa02dacd0e0e4a78e2d48..45ddedc4efb7340974bfa4451919dbaa52266d4c 100644
--- a/Source/core/rendering/RenderBlockFlow.cpp
+++ b/Source/core/rendering/RenderBlockFlow.cpp
@@ -358,8 +358,16 @@ void RenderBlockFlow::layoutBlock(bool relayoutChildren)
// we overflow or not.
updateScrollInfoAfterLayout();
- if (m_repaintLogicalTop != m_repaintLogicalBottom && (style()->visibility() == VISIBLE || enclosingLayer()->hasVisibleContent()))
- setShouldInvalidateOverflowForPaint(true);
+ if (m_repaintLogicalTop != m_repaintLogicalBottom) {
+ bool hasVisibleContent = style()->visibility() == VISIBLE;
+ if (!hasVisibleContent) {
+ RenderLayer* layer = enclosingLayer();
+ layer->updateDescendantDependentFlags();
+ hasVisibleContent = layer->hasVisibleContent();
+ }
+ if (hasVisibleContent)
+ setShouldInvalidateOverflowForPaint(true);
+ }
clearNeedsLayout();
}
« no previous file with comments | « no previous file | Source/core/rendering/RenderLayer.h » ('j') | Source/core/rendering/RenderLayer.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698