Chromium Code Reviews| 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 510 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 521 } | 521 } |
| 522 } | 522 } |
| 523 | 523 |
| 524 LayoutPoint RenderLayer::positionFromPaintInvalidationBacking(const RenderObject * renderObject, const RenderLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationState) | 524 LayoutPoint RenderLayer::positionFromPaintInvalidationBacking(const RenderObject * renderObject, const RenderLayerModelObject* paintInvalidationContainer, const PaintInvalidationState* paintInvalidationState) |
| 525 { | 525 { |
| 526 if (!paintInvalidationContainer || !paintInvalidationContainer->layer()->gro upedMapping()) | 526 if (!paintInvalidationContainer || !paintInvalidationContainer->layer()->gro upedMapping()) |
| 527 return renderObject->positionFromPaintInvalidationContainer(paintInvalid ationContainer, paintInvalidationState); | 527 return renderObject->positionFromPaintInvalidationContainer(paintInvalid ationContainer, paintInvalidationState); |
| 528 | 528 |
| 529 RenderLayerModelObject* transformedAncestor = paintInvalidationContainer->la yer()->enclosingTransformedAncestor()->renderer(); | 529 RenderLayerModelObject* transformedAncestor = paintInvalidationContainer->la yer()->enclosingTransformedAncestor()->renderer(); |
| 530 LayoutPoint point = renderObject->positionFromPaintInvalidationContainer(pai ntInvalidationContainer, paintInvalidationState); | 530 LayoutPoint point = renderObject->positionFromPaintInvalidationContainer(pai ntInvalidationContainer, paintInvalidationState); |
| 531 if (!transformedAncestor) | 531 if (!transformedAncestor) |
|
chrishtr
2014/09/17 16:41:33
mapPontToPaintBackingCoordinates(paintInvalidation
trchen
2014/09/17 19:34:15
Acknowledged.
| |
| 532 return point; | 532 return point; |
| 533 | 533 |
| 534 point = LayoutPoint(paintInvalidationContainer->localToContainerPoint(point, transformedAncestor)); | 534 point = LayoutPoint(paintInvalidationContainer->localToContainerPoint(point, transformedAncestor)); |
| 535 point.moveBy(-paintInvalidationContainer->layer()->groupedMapping()->squashi ngOffsetFromTransformedAncestor()); | 535 point.moveBy(-paintInvalidationContainer->layer()->groupedMapping()->squashi ngOffsetFromTransformedAncestor()); |
| 536 return point; | 536 return point; |
| 537 } | 537 } |
| 538 | 538 |
| 539 void RenderLayer::mapPointToPaintBackingCoordinates(const RenderLayerModelObject * paintInvalidationContainer, FloatPoint& point) | |
| 540 { | |
| 541 RenderLayer* paintInvalidationLayer = paintInvalidationContainer->layer(); | |
| 542 if (!paintInvalidationLayer->groupedMapping()) { | |
| 543 point.move(paintInvalidationLayer->compositedLayerMapping()->contentOffs etInCompositingLayer()); | |
| 544 return; | |
| 545 } | |
| 546 | |
| 547 RenderLayerModelObject* transformedAncestor = paintInvalidationLayer->enclos ingTransformedAncestor()->renderer(); | |
| 548 if (!transformedAncestor) | |
| 549 return; | |
| 550 | |
| 551 // |paintInvalidationContainer| may have a local 2D transform on it, so take that into account when mapping into the space of the | |
| 552 // transformed ancestor. | |
| 553 point = paintInvalidationContainer->localToContainerPoint(point, transformed Ancestor); | |
| 554 | |
| 555 point.moveBy(-paintInvalidationLayer->groupedMapping()->squashingOffsetFromT ransformedAncestor()); | |
| 556 } | |
| 557 | |
| 539 void RenderLayer::mapRectToPaintBackingCoordinates(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect& rect) | 558 void RenderLayer::mapRectToPaintBackingCoordinates(const RenderLayerModelObject* paintInvalidationContainer, LayoutRect& rect) |
| 540 { | 559 { |
| 541 RenderLayer* paintInvalidationLayer = paintInvalidationContainer->layer(); | 560 RenderLayer* paintInvalidationLayer = paintInvalidationContainer->layer(); |
| 542 if (!paintInvalidationLayer->groupedMapping()) { | 561 if (!paintInvalidationLayer->groupedMapping()) { |
| 543 rect.move(paintInvalidationLayer->compositedLayerMapping()->contentOffse tInCompositingLayer()); | 562 rect.move(paintInvalidationLayer->compositedLayerMapping()->contentOffse tInCompositingLayer()); |
| 544 return; | 563 return; |
| 545 } | 564 } |
| 546 | 565 |
| 547 RenderLayerModelObject* transformedAncestor = paintInvalidationLayer->enclos ingTransformedAncestor()->renderer(); | 566 RenderLayerModelObject* transformedAncestor = paintInvalidationLayer->enclos ingTransformedAncestor()->renderer(); |
| 548 if (!transformedAncestor) | 567 if (!transformedAncestor) |
| (...skipping 3138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 3687 } | 3706 } |
| 3688 } | 3707 } |
| 3689 | 3708 |
| 3690 void showLayerTree(const blink::RenderObject* renderer) | 3709 void showLayerTree(const blink::RenderObject* renderer) |
| 3691 { | 3710 { |
| 3692 if (!renderer) | 3711 if (!renderer) |
| 3693 return; | 3712 return; |
| 3694 showLayerTree(renderer->enclosingLayer()); | 3713 showLayerTree(renderer->enclosingLayer()); |
| 3695 } | 3714 } |
| 3696 #endif | 3715 #endif |
| OLD | NEW |