| 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 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 box->style()->applyTransform(currTransform, box->pixelSnappedBorderBoxRe
ct().size(), RenderStyle::ExcludeTransformOrigin); | 267 box->style()->applyTransform(currTransform, box->pixelSnappedBorderBoxRe
ct().size(), RenderStyle::ExcludeTransformOrigin); |
| 268 makeMatrixRenderable(currTransform); | 268 makeMatrixRenderable(currTransform); |
| 269 return currTransform; | 269 return currTransform; |
| 270 } | 270 } |
| 271 | 271 |
| 272 return *m_transform; | 272 return *m_transform; |
| 273 } | 273 } |
| 274 | 274 |
| 275 TransformationMatrix RenderLayer::renderableTransform(PaintBehavior paintBehavio
r) const | 275 TransformationMatrix RenderLayer::renderableTransform(PaintBehavior paintBehavio
r) const |
| 276 { | 276 { |
| 277 if (!m_transform) | 277 return m_transform ? *m_transform : TransformationMatrix(); |
| 278 return TransformationMatrix(); | |
| 279 | |
| 280 if (paintBehavior & PaintBehaviorFlattenCompositingLayers) { | |
| 281 TransformationMatrix matrix = *m_transform; | |
| 282 makeMatrixRenderable(matrix); | |
| 283 return matrix; | |
| 284 } | |
| 285 | |
| 286 return *m_transform; | |
| 287 } | 278 } |
| 288 | 279 |
| 289 RenderLayer* RenderLayer::enclosingOverflowClipLayer(IncludeSelfOrNot includeSel
f) const | 280 RenderLayer* RenderLayer::enclosingOverflowClipLayer(IncludeSelfOrNot includeSel
f) const |
| 290 { | 281 { |
| 291 const RenderLayer* layer = (includeSelf == IncludeSelf) ? this : parent(); | 282 const RenderLayer* layer = (includeSelf == IncludeSelf) ? this : parent(); |
| 292 while (layer) { | 283 while (layer) { |
| 293 if (layer->renderer()->hasOverflowClip()) | 284 if (layer->renderer()->hasOverflowClip()) |
| 294 return const_cast<RenderLayer*>(layer); | 285 return const_cast<RenderLayer*>(layer); |
| 295 | 286 |
| 296 layer = layer->parent(); | 287 layer = layer->parent(); |
| (...skipping 1949 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2246 } | 2237 } |
| 2247 } | 2238 } |
| 2248 | 2239 |
| 2249 void showLayerTree(const blink::RenderObject* renderer) | 2240 void showLayerTree(const blink::RenderObject* renderer) |
| 2250 { | 2241 { |
| 2251 if (!renderer) | 2242 if (!renderer) |
| 2252 return; | 2243 return; |
| 2253 showLayerTree(renderer->enclosingLayer()); | 2244 showLayerTree(renderer->enclosingLayer()); |
| 2254 } | 2245 } |
| 2255 #endif | 2246 #endif |
| OLD | NEW |