OLD | NEW |
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 183 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
194 return renderer()->view()->compositor(); | 194 return renderer()->view()->compositor(); |
195 } | 195 } |
196 | 196 |
197 void RenderLayer::contentChanged(ContentChangeType changeType) | 197 void RenderLayer::contentChanged(ContentChangeType changeType) |
198 { | 198 { |
199 // updateLayerCompositingState will query compositingReasons for accelerated
overflow scrolling. | 199 // updateLayerCompositingState will query compositingReasons for accelerated
overflow scrolling. |
200 // This is tripped by LayoutTests/compositing/content-changed-chicken-egg.ht
ml | 200 // This is tripped by LayoutTests/compositing/content-changed-chicken-egg.ht
ml |
201 DisableCompositingQueryAsserts disabler; | 201 DisableCompositingQueryAsserts disabler; |
202 | 202 |
203 // This can get called when video becomes accelerated, so the layers may cha
nge. | 203 // This can get called when video becomes accelerated, so the layers may cha
nge. |
204 if (changeType == CanvasChanged || changeType == VideoChanged || changeType
== FullScreenChanged) { | 204 if (changeType == CanvasChanged || changeType == VideoChanged || changeType
== FullScreenChanged) |
205 compositor()->updateLayerCompositingState(this); | |
206 compositor()->setNeedsCompositingUpdate(CompositingUpdateAfterCompositin
gInputChange); | 205 compositor()->setNeedsCompositingUpdate(CompositingUpdateAfterCompositin
gInputChange); |
207 } | |
208 | 206 |
209 if (changeType == CanvasContextChanged) { | 207 if (changeType == CanvasContextChanged) { |
210 compositor()->setNeedsCompositingUpdate(CompositingUpdateAfterCompositin
gInputChange); | 208 compositor()->setNeedsCompositingUpdate(CompositingUpdateAfterCompositin
gInputChange); |
211 | 209 |
212 // Although we're missing test coverage, we need to call | 210 // Although we're missing test coverage, we need to call |
213 // GraphicsLayer::setContentsToPlatformLayer with the new platform | 211 // GraphicsLayer::setContentsToPlatformLayer with the new platform |
214 // layer for this canvas. | 212 // layer for this canvas. |
215 // See http://crbug.com/349195 | 213 // See http://crbug.com/349195 |
216 if (hasCompositedLayerMapping()) | 214 if (hasCompositedLayerMapping()) |
217 compositedLayerMapping()->setNeedsGraphicsLayerUpdate(); | 215 compositedLayerMapping()->setNeedsGraphicsLayerUpdate(); |
(...skipping 3657 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3875 } | 3873 } |
3876 } | 3874 } |
3877 | 3875 |
3878 void showLayerTree(const WebCore::RenderObject* renderer) | 3876 void showLayerTree(const WebCore::RenderObject* renderer) |
3879 { | 3877 { |
3880 if (!renderer) | 3878 if (!renderer) |
3881 return; | 3879 return; |
3882 showLayerTree(renderer->enclosingLayer()); | 3880 showLayerTree(renderer->enclosingLayer()); |
3883 } | 3881 } |
3884 #endif | 3882 #endif |
OLD | NEW |