| 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 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 } | 229 } |
| 230 ASSERT(rootLayer == root()); | 230 ASSERT(rootLayer == root()); |
| 231 | 231 |
| 232 LayoutPoint offset; | 232 LayoutPoint offset; |
| 233 parent()->convertToLayerCoords(rootLayer, offset); | 233 parent()->convertToLayerCoords(rootLayer, offset); |
| 234 return offset; | 234 return offset; |
| 235 } | 235 } |
| 236 | 236 |
| 237 void RenderLayer::updateLayerPositionsAfterLayout(const RenderLayer* rootLayer,
UpdateLayerPositionsFlags flags) | 237 void RenderLayer::updateLayerPositionsAfterLayout(const RenderLayer* rootLayer,
UpdateLayerPositionsFlags flags) |
| 238 { | 238 { |
| 239 TRACE_EVENT0("blink_rendering", "RenderLayer::updateLayerPositionsAfterLayou
t"); |
| 239 RenderGeometryMap geometryMap(UseTransforms); | 240 RenderGeometryMap geometryMap(UseTransforms); |
| 240 if (this != rootLayer) | 241 if (this != rootLayer) |
| 241 geometryMap.pushMappingsToAncestor(parent(), 0); | 242 geometryMap.pushMappingsToAncestor(parent(), 0); |
| 242 updateLayerPositions(&geometryMap, flags); | 243 updateLayerPositions(&geometryMap, flags); |
| 243 } | 244 } |
| 244 | 245 |
| 245 void RenderLayer::updateLayerPositions(RenderGeometryMap* geometryMap, UpdateLay
erPositionsFlags flags) | 246 void RenderLayer::updateLayerPositions(RenderGeometryMap* geometryMap, UpdateLay
erPositionsFlags flags) |
| 246 { | 247 { |
| 247 updateLayerPosition(); // For relpositioned layers or non-positioned layers, | 248 updateLayerPosition(); // For relpositioned layers or non-positioned layers, |
| 248 // we need to keep in sync, since we may have shifted
relative | 249 // we need to keep in sync, since we may have shifted
relative |
| (...skipping 3686 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3935 } | 3936 } |
| 3936 } | 3937 } |
| 3937 | 3938 |
| 3938 void showLayerTree(const WebCore::RenderObject* renderer) | 3939 void showLayerTree(const WebCore::RenderObject* renderer) |
| 3939 { | 3940 { |
| 3940 if (!renderer) | 3941 if (!renderer) |
| 3941 return; | 3942 return; |
| 3942 showLayerTree(renderer->enclosingLayer()); | 3943 showLayerTree(renderer->enclosingLayer()); |
| 3943 } | 3944 } |
| 3944 #endif | 3945 #endif |
| OLD | NEW |