| 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 1677 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1688 convertToLayerCoords(rootLayer, offset); | 1688 convertToLayerCoords(rootLayer, offset); |
| 1689 } | 1689 } |
| 1690 offset.moveBy(translationOffset); | 1690 offset.moveBy(translationOffset); |
| 1691 | 1691 |
| 1692 LayoutObject* containerLayoutObject = containerLayer ? containerLayer->layou
tObject() : 0; | 1692 LayoutObject* containerLayoutObject = containerLayer ? containerLayer->layou
tObject() : 0; |
| 1693 if (layoutObject()->shouldUseTransformFromContainer(containerLayoutObject))
{ | 1693 if (layoutObject()->shouldUseTransformFromContainer(containerLayoutObject))
{ |
| 1694 TransformationMatrix containerTransform; | 1694 TransformationMatrix containerTransform; |
| 1695 layoutObject()->getTransformFromContainer(containerLayoutObject, toLayou
tSize(offset), containerTransform); | 1695 layoutObject()->getTransformFromContainer(containerLayoutObject, toLayou
tSize(offset), containerTransform); |
| 1696 transformState->applyTransform(containerTransform, HitTestingTransformSt
ate::AccumulateTransform); | 1696 transformState->applyTransform(containerTransform, HitTestingTransformSt
ate::AccumulateTransform); |
| 1697 } else { | 1697 } else { |
| 1698 transformState->translate(offset.x(), offset.y(), HitTestingTransformSta
te::AccumulateTransform); | 1698 transformState->translate(offset.x().toInt(), offset.y().toInt(), HitTes
tingTransformState::AccumulateTransform); |
| 1699 } | 1699 } |
| 1700 | 1700 |
| 1701 return transformState; | 1701 return transformState; |
| 1702 } | 1702 } |
| 1703 | 1703 |
| 1704 | 1704 |
| 1705 static bool isHitCandidate(const PaintLayer* hitLayer, bool canDepthSort, double
* zOffset, const HitTestingTransformState* transformState) | 1705 static bool isHitCandidate(const PaintLayer* hitLayer, bool canDepthSort, double
* zOffset, const HitTestingTransformState* transformState) |
| 1706 { | 1706 { |
| 1707 if (!hitLayer) | 1707 if (!hitLayer) |
| 1708 return false; | 1708 return false; |
| (...skipping 1215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2924 | 2924 |
| 2925 void showLayerTree(const blink::LayoutObject* layoutObject) | 2925 void showLayerTree(const blink::LayoutObject* layoutObject) |
| 2926 { | 2926 { |
| 2927 if (!layoutObject) { | 2927 if (!layoutObject) { |
| 2928 fprintf(stderr, "Cannot showLayerTree. Root is (nil)\n"); | 2928 fprintf(stderr, "Cannot showLayerTree. Root is (nil)\n"); |
| 2929 return; | 2929 return; |
| 2930 } | 2930 } |
| 2931 showLayerTree(layoutObject->enclosingLayer()); | 2931 showLayerTree(layoutObject->enclosingLayer()); |
| 2932 } | 2932 } |
| 2933 #endif | 2933 #endif |
| OLD | NEW |