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

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

Issue 15219003: Move updateLayout() call from RenderLayer to RenderView (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: add fixme Created 7 years, 7 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
Index: Source/core/rendering/RenderLayer.cpp
diff --git a/Source/core/rendering/RenderLayer.cpp b/Source/core/rendering/RenderLayer.cpp
index 0873e8a5ad897001c40e2d53226d12a48f662b68..189e9f355f52464f74012c21ce6a81e30d45c680 100644
--- a/Source/core/rendering/RenderLayer.cpp
+++ b/Source/core/rendering/RenderLayer.cpp
@@ -4328,8 +4328,10 @@ bool RenderLayer::hitTest(const HitTestRequest& request, const HitTestLocation&
{
ASSERT(isSelfPaintingLayer() || hasSelfPaintingLayerDescendant());
- renderer()->document()->updateLayout();
-
+ // RenderView should make sure to update layout before entering hit testing
+ ASSERT(!renderer()->frame()->view()->layoutPending());
+ ASSERT(!renderer()->document()->renderer()->needsLayout());
+
LayoutRect hitTestArea = isOutOfFlowRenderFlowThread() ? toRenderFlowThread(renderer())->borderBoxRect() : renderer()->view()->documentRect();
if (!request.ignoreClipping())
hitTestArea.intersect(frameVisibleRect(renderer()));
« no previous file with comments | « LayoutTests/compositing/iframes/crash-mouse-event-expected.txt ('k') | Source/core/rendering/RenderView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698