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 182 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
193 return 0; | 193 return 0; |
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 if (changeType == CanvasChanged) |
204 if (changeType == CanvasChanged || changeType == VideoChanged || changeType
== FullScreenChanged) | |
205 compositor()->setNeedsCompositingUpdate(CompositingUpdateAfterCompositin
gInputChange); | 204 compositor()->setNeedsCompositingUpdate(CompositingUpdateAfterCompositin
gInputChange); |
206 | 205 |
207 if (changeType == CanvasContextChanged) { | 206 if (changeType == CanvasContextChanged) { |
208 compositor()->setNeedsCompositingUpdate(CompositingUpdateAfterCompositin
gInputChange); | 207 compositor()->setNeedsCompositingUpdate(CompositingUpdateAfterCompositin
gInputChange); |
209 | 208 |
210 // Although we're missing test coverage, we need to call | 209 // Although we're missing test coverage, we need to call |
211 // GraphicsLayer::setContentsToPlatformLayer with the new platform | 210 // GraphicsLayer::setContentsToPlatformLayer with the new platform |
212 // layer for this canvas. | 211 // layer for this canvas. |
213 // See http://crbug.com/349195 | 212 // See http://crbug.com/349195 |
214 if (hasCompositedLayerMapping()) | 213 if (hasCompositedLayerMapping()) |
(...skipping 3650 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3865 } | 3864 } |
3866 } | 3865 } |
3867 | 3866 |
3868 void showLayerTree(const WebCore::RenderObject* renderer) | 3867 void showLayerTree(const WebCore::RenderObject* renderer) |
3869 { | 3868 { |
3870 if (!renderer) | 3869 if (!renderer) |
3871 return; | 3870 return; |
3872 showLayerTree(renderer->enclosingLayer()); | 3871 showLayerTree(renderer->enclosingLayer()); |
3873 } | 3872 } |
3874 #endif | 3873 #endif |
OLD | NEW |