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

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 177 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 188
189 RenderLayerCompositor* RenderLayer::compositor() const 189 RenderLayerCompositor* RenderLayer::compositor() const
190 { 190 {
191 if (!renderer()->view()) 191 if (!renderer()->view())
192 return 0; 192 return 0;
193 return renderer()->view()->compositor(); 193 return renderer()->view()->compositor();
194 } 194 }
195 195
196 void RenderLayer::contentChanged(ContentChangeType changeType) 196 void RenderLayer::contentChanged(ContentChangeType changeType)
197 { 197 {
198 // updateLayerCompositingState will query compositingReasons for accelerated overflow scrolling.
199 // This is tripped by LayoutTests/compositing/content-changed-chicken-egg.ht ml
200 DisableCompositingQueryAsserts disabler;
201
198 // This can get called when video becomes accelerated, so the layers may cha nge. 202 // This can get called when video becomes accelerated, so the layers may cha nge.
199 if (changeType == CanvasChanged || changeType == VideoChanged || changeType == FullScreenChanged) 203 if (changeType == CanvasChanged || changeType == VideoChanged || changeType == FullScreenChanged)
200 compositor()->updateLayerCompositingState(this); 204 compositor()->updateLayerCompositingState(this);
201 205
202 if (changeType == CanvasContextChanged) 206 if (changeType == CanvasContextChanged)
203 compositor()->setNeedsCompositingUpdate(CompositingUpdateAfterCanvasCont extChange); 207 compositor()->setNeedsCompositingUpdate(CompositingUpdateAfterCanvasCont extChange);
204 208
205 if (m_compositedLayerMapping) 209 if (m_compositedLayerMapping)
206 m_compositedLayerMapping->contentChanged(changeType); 210 m_compositedLayerMapping->contentChanged(changeType);
207 } 211 }
(...skipping 3948 matching lines...) Expand 10 before | Expand all | Expand 10 after
4156 } 4160 }
4157 } 4161 }
4158 4162
4159 void showLayerTree(const WebCore::RenderObject* renderer) 4163 void showLayerTree(const WebCore::RenderObject* renderer)
4160 { 4164 {
4161 if (!renderer) 4165 if (!renderer)
4162 return; 4166 return;
4163 showLayerTree(renderer->enclosingLayer()); 4167 showLayerTree(renderer->enclosingLayer());
4164 } 4168 }
4165 #endif 4169 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698