| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011, 2012 Apple Inc. All rights |
| 3 * reserved. | 3 * reserved. |
| 4 * | 4 * |
| 5 * Portions are Copyright (C) 1998 Netscape Communications Corporation. | 5 * Portions are Copyright (C) 1998 Netscape Communications Corporation. |
| 6 * | 6 * |
| 7 * Other contributors: | 7 * Other contributors: |
| 8 * Robert O'Callahan <roc+@cs.cmu.edu> | 8 * Robert O'Callahan <roc+@cs.cmu.edu> |
| 9 * David Baron <dbaron@fas.harvard.edu> | 9 * David Baron <dbaron@fas.harvard.edu> |
| 10 * Christian Biesinger <cbiesinger@web.de> | 10 * Christian Biesinger <cbiesinger@web.de> |
| (...skipping 1451 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1462 } | 1462 } |
| 1463 | 1463 |
| 1464 void PaintLayer::convertToLayerCoords(const PaintLayer* ancestorLayer, | 1464 void PaintLayer::convertToLayerCoords(const PaintLayer* ancestorLayer, |
| 1465 LayoutRect& rect) const { | 1465 LayoutRect& rect) const { |
| 1466 LayoutPoint delta; | 1466 LayoutPoint delta; |
| 1467 convertToLayerCoords(ancestorLayer, delta); | 1467 convertToLayerCoords(ancestorLayer, delta); |
| 1468 rect.moveBy(delta); | 1468 rect.moveBy(delta); |
| 1469 } | 1469 } |
| 1470 | 1470 |
| 1471 LayoutPoint PaintLayer::visualOffsetFromAncestor( | 1471 LayoutPoint PaintLayer::visualOffsetFromAncestor( |
| 1472 const PaintLayer* ancestorLayer) const { | 1472 const PaintLayer* ancestorLayer, |
| 1473 LayoutPoint offset; | 1473 LayoutPoint offset) const { |
| 1474 if (ancestorLayer == this) | 1474 if (ancestorLayer == this) |
| 1475 return offset; | 1475 return offset; |
| 1476 PaintLayer* paginationLayer = enclosingPaginationLayer(); | 1476 PaintLayer* paginationLayer = enclosingPaginationLayer(); |
| 1477 if (paginationLayer == this) | 1477 if (paginationLayer == this) |
| 1478 paginationLayer = parent()->enclosingPaginationLayer(); | 1478 paginationLayer = parent()->enclosingPaginationLayer(); |
| 1479 if (!paginationLayer) { | 1479 if (!paginationLayer) { |
| 1480 convertToLayerCoords(ancestorLayer, offset); | 1480 convertToLayerCoords(ancestorLayer, offset); |
| 1481 return offset; | 1481 return offset; |
| 1482 } | 1482 } |
| 1483 | 1483 |
| (...skipping 1743 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3227 } | 3227 } |
| 3228 | 3228 |
| 3229 void showLayerTree(const blink::LayoutObject* layoutObject) { | 3229 void showLayerTree(const blink::LayoutObject* layoutObject) { |
| 3230 if (!layoutObject) { | 3230 if (!layoutObject) { |
| 3231 LOG(INFO) << "Cannot showLayerTree. Root is (nil)"; | 3231 LOG(INFO) << "Cannot showLayerTree. Root is (nil)"; |
| 3232 return; | 3232 return; |
| 3233 } | 3233 } |
| 3234 showLayerTree(layoutObject->enclosingLayer()); | 3234 showLayerTree(layoutObject->enclosingLayer()); |
| 3235 } | 3235 } |
| 3236 #endif | 3236 #endif |
| OLD | NEW |