OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
(...skipping 1102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1113 graphicsLayerParentLocation = | 1113 graphicsLayerParentLocation = |
1114 layoutObject()->view()->documentRect().location(); | 1114 layoutObject()->view()->documentRect().location(); |
1115 } | 1115 } |
1116 | 1116 |
1117 if (compositingContainer && | 1117 if (compositingContainer && |
1118 compositingContainer->needsCompositedScrolling()) { | 1118 compositingContainer->needsCompositedScrolling()) { |
1119 LayoutBox* layoutBox = toLayoutBox(compositingContainer->layoutObject()); | 1119 LayoutBox* layoutBox = toLayoutBox(compositingContainer->layoutObject()); |
1120 IntSize scrollOffset = layoutBox->scrolledContentOffset(); | 1120 IntSize scrollOffset = layoutBox->scrolledContentOffset(); |
1121 IntPoint scrollOrigin = | 1121 IntPoint scrollOrigin = |
1122 compositingContainer->getScrollableArea()->scrollOrigin(); | 1122 compositingContainer->getScrollableArea()->scrollOrigin(); |
1123 scrollOrigin.move(-layoutBox->borderLeft(), -layoutBox->borderTop()); | 1123 scrollOrigin.move(-layoutBox->borderLeft().toInt(), |
| 1124 -layoutBox->borderTop().toInt()); |
1124 graphicsLayerParentLocation = -(scrollOrigin + scrollOffset); | 1125 graphicsLayerParentLocation = -(scrollOrigin + scrollOffset); |
1125 } | 1126 } |
1126 } | 1127 } |
1127 | 1128 |
1128 void CompositedLayerMapping::updateAncestorClippingLayerGeometry( | 1129 void CompositedLayerMapping::updateAncestorClippingLayerGeometry( |
1129 const PaintLayer* compositingContainer, | 1130 const PaintLayer* compositingContainer, |
1130 const IntPoint& snappedOffsetFromCompositedAncestor, | 1131 const IntPoint& snappedOffsetFromCompositedAncestor, |
1131 IntPoint& graphicsLayerParentLocation) { | 1132 IntPoint& graphicsLayerParentLocation) { |
1132 if (!compositingContainer || !m_ancestorClippingLayer) | 1133 if (!compositingContainer || !m_ancestorClippingLayer) |
1133 return; | 1134 return; |
(...skipping 2335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3469 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { | 3470 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { |
3470 name = "Decoration Layer"; | 3471 name = "Decoration Layer"; |
3471 } else { | 3472 } else { |
3472 ASSERT_NOT_REACHED(); | 3473 ASSERT_NOT_REACHED(); |
3473 } | 3474 } |
3474 | 3475 |
3475 return name; | 3476 return name; |
3476 } | 3477 } |
3477 | 3478 |
3478 } // namespace blink | 3479 } // namespace blink |
OLD | NEW |