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

Side by Side Diff: Source/core/rendering/RenderLayer.cpp

Issue 131543013: Update scroll parent correctly for squashing layers. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: . 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Portions are Copyright (C) 1998 Netscape Communications Corporation. 4 * Portions are Copyright (C) 1998 Netscape Communications Corporation.
5 * 5 *
6 * Other contributors: 6 * Other contributors:
7 * Robert O'Callahan <roc+@cs.cmu.edu> 7 * Robert O'Callahan <roc+@cs.cmu.edu>
8 * David Baron <dbaron@fas.harvard.edu> 8 * David Baron <dbaron@fas.harvard.edu>
9 * Christian Biesinger <cbiesinger@web.de> 9 * Christian Biesinger <cbiesinger@web.de>
10 * Randall Jesup <rjesup@wgate.com> 10 * Randall Jesup <rjesup@wgate.com>
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 186
187 RenderLayerCompositor* RenderLayer::compositor() const 187 RenderLayerCompositor* RenderLayer::compositor() const
188 { 188 {
189 if (!renderer()->view()) 189 if (!renderer()->view())
190 return 0; 190 return 0;
191 return renderer()->view()->compositor(); 191 return renderer()->view()->compositor();
192 } 192 }
193 193
194 void RenderLayer::contentChanged(ContentChangeType changeType) 194 void RenderLayer::contentChanged(ContentChangeType changeType)
195 { 195 {
196 // updateLayerCompositingState will query compositingReasons for accelerated overflow scrolling.
197 // This is tripped by LayoutTests/compositing/content-changed-chicken-egg.ht ml
198 DisableCompositingQueryAsserts disabler;
199
196 // This can get called when video becomes accelerated, so the layers may cha nge. 200 // This can get called when video becomes accelerated, so the layers may cha nge.
197 if (changeType == CanvasChanged || changeType == VideoChanged || changeType == FullScreenChanged) 201 if (changeType == CanvasChanged || changeType == VideoChanged || changeType == FullScreenChanged)
198 compositor()->updateLayerCompositingState(this); 202 compositor()->updateLayerCompositingState(this);
199 203
200 if (changeType == CanvasContextChanged) 204 if (changeType == CanvasContextChanged)
201 compositor()->setNeedsCompositingUpdate(CompositingUpdateAfterCanvasCont extChange); 205 compositor()->setNeedsCompositingUpdate(CompositingUpdateAfterCanvasCont extChange);
202 206
203 if (m_compositedLayerMapping) 207 if (m_compositedLayerMapping)
204 m_compositedLayerMapping->contentChanged(changeType); 208 m_compositedLayerMapping->contentChanged(changeType);
205 } 209 }
(...skipping 3864 matching lines...) Expand 10 before | Expand all | Expand 10 after
4070 } 4074 }
4071 } 4075 }
4072 4076
4073 void showLayerTree(const WebCore::RenderObject* renderer) 4077 void showLayerTree(const WebCore::RenderObject* renderer)
4074 { 4078 {
4075 if (!renderer) 4079 if (!renderer)
4076 return; 4080 return;
4077 showLayerTree(renderer->enclosingLayer()); 4081 showLayerTree(renderer->enclosingLayer());
4078 } 4082 }
4079 #endif 4083 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698