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 168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
179 return renderer()->debugName(); | 179 return renderer()->debugName(); |
180 } | 180 } |
181 | 181 |
182 RenderLayerCompositor* RenderLayer::compositor() const | 182 RenderLayerCompositor* RenderLayer::compositor() const |
183 { | 183 { |
184 if (!renderer()->view()) | 184 if (!renderer()->view()) |
185 return 0; | 185 return 0; |
186 return renderer()->view()->compositor(); | 186 return renderer()->view()->compositor(); |
187 } | 187 } |
188 | 188 |
189 void RenderLayer::contentChanged(ContentChangeType changeType) | 189 void RenderLayer::contentChanged(ContentChangeType changeType, const IntRect& di
rtyRect) |
190 { | 190 { |
191 // updateLayerCompositingState will query compositingReasons for accelerated
overflow scrolling. | 191 // updateLayerCompositingState will query compositingReasons for accelerated
overflow scrolling. |
192 // This is tripped by LayoutTests/compositing/content-changed-chicken-egg.ht
ml | 192 // This is tripped by LayoutTests/compositing/content-changed-chicken-egg.ht
ml |
193 DisableCompositingQueryAsserts disabler; | 193 DisableCompositingQueryAsserts disabler; |
194 | 194 |
195 if (changeType == CanvasChanged) | 195 if (changeType == CanvasChanged) |
196 compositor()->setNeedsCompositingUpdate(CompositingUpdateAfterCompositin
gInputChange); | 196 compositor()->setNeedsCompositingUpdate(CompositingUpdateAfterCompositin
gInputChange); |
197 | 197 |
198 if (changeType == CanvasContextChanged) { | 198 if (changeType == CanvasContextChanged) { |
199 compositor()->setNeedsCompositingUpdate(CompositingUpdateAfterCompositin
gInputChange); | 199 compositor()->setNeedsCompositingUpdate(CompositingUpdateAfterCompositin
gInputChange); |
200 | 200 |
201 // Although we're missing test coverage, we need to call | 201 // Although we're missing test coverage, we need to call |
202 // GraphicsLayer::setContentsToPlatformLayer with the new platform | 202 // GraphicsLayer::setContentsToPlatformLayer with the new platform |
203 // layer for this canvas. | 203 // layer for this canvas. |
204 // See http://crbug.com/349195 | 204 // See http://crbug.com/349195 |
205 if (hasCompositedLayerMapping()) | 205 if (hasCompositedLayerMapping()) |
206 compositedLayerMapping()->setNeedsGraphicsLayerUpdate(GraphicsLayerU
pdateSubtree); | 206 compositedLayerMapping()->setNeedsGraphicsLayerUpdate(GraphicsLayerU
pdateSubtree); |
207 } | 207 } |
208 | 208 |
209 if (m_compositedLayerMapping) | 209 if (m_compositedLayerMapping) |
210 m_compositedLayerMapping->contentChanged(changeType); | 210 m_compositedLayerMapping->contentChanged(changeType, dirtyRect); |
211 } | 211 } |
212 | 212 |
213 bool RenderLayer::paintsWithFilters() const | 213 bool RenderLayer::paintsWithFilters() const |
214 { | 214 { |
215 if (!renderer()->hasFilter()) | 215 if (!renderer()->hasFilter()) |
216 return false; | 216 return false; |
217 | 217 |
218 // https://code.google.com/p/chromium/issues/detail?id=343759 | 218 // https://code.google.com/p/chromium/issues/detail?id=343759 |
219 DisableCompositingQueryAsserts disabler; | 219 DisableCompositingQueryAsserts disabler; |
220 return !m_compositedLayerMapping || compositingState() != PaintsIntoOwnBacki
ng; | 220 return !m_compositedLayerMapping || compositingState() != PaintsIntoOwnBacki
ng; |
(...skipping 2625 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2846 } | 2846 } |
2847 } | 2847 } |
2848 | 2848 |
2849 void showLayerTree(const blink::RenderObject* renderer) | 2849 void showLayerTree(const blink::RenderObject* renderer) |
2850 { | 2850 { |
2851 if (!renderer) | 2851 if (!renderer) |
2852 return; | 2852 return; |
2853 showLayerTree(renderer->enclosingLayer()); | 2853 showLayerTree(renderer->enclosingLayer()); |
2854 } | 2854 } |
2855 #endif | 2855 #endif |
OLD | NEW |