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 1076 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1087 graphicsLayerParentLocation = | 1087 graphicsLayerParentLocation = |
1088 layoutObject()->view()->documentRect().location(); | 1088 layoutObject()->view()->documentRect().location(); |
1089 } | 1089 } |
1090 | 1090 |
1091 if (compositingContainer && | 1091 if (compositingContainer && |
1092 compositingContainer->needsCompositedScrolling()) { | 1092 compositingContainer->needsCompositedScrolling()) { |
1093 LayoutBox* layoutBox = toLayoutBox(compositingContainer->layoutObject()); | 1093 LayoutBox* layoutBox = toLayoutBox(compositingContainer->layoutObject()); |
1094 IntSize scrollOffset = layoutBox->scrolledContentOffset(); | 1094 IntSize scrollOffset = layoutBox->scrolledContentOffset(); |
1095 IntPoint scrollOrigin = | 1095 IntPoint scrollOrigin = |
1096 compositingContainer->getScrollableArea()->scrollOrigin(); | 1096 compositingContainer->getScrollableArea()->scrollOrigin(); |
1097 scrollOrigin.move(-layoutBox->borderLeft(), -layoutBox->borderTop()); | 1097 scrollOrigin.move(-layoutBox->borderLeft().toInt(), |
| 1098 -layoutBox->borderTop().toInt()); |
1098 graphicsLayerParentLocation = -(scrollOrigin + scrollOffset); | 1099 graphicsLayerParentLocation = -(scrollOrigin + scrollOffset); |
1099 } | 1100 } |
1100 } | 1101 } |
1101 | 1102 |
1102 void CompositedLayerMapping::updateAncestorClippingLayerGeometry( | 1103 void CompositedLayerMapping::updateAncestorClippingLayerGeometry( |
1103 const PaintLayer* compositingContainer, | 1104 const PaintLayer* compositingContainer, |
1104 const IntPoint& snappedOffsetFromCompositedAncestor, | 1105 const IntPoint& snappedOffsetFromCompositedAncestor, |
1105 IntPoint& graphicsLayerParentLocation) { | 1106 IntPoint& graphicsLayerParentLocation) { |
1106 if (!compositingContainer || !m_ancestorClippingLayer) | 1107 if (!compositingContainer || !m_ancestorClippingLayer) |
1107 return; | 1108 return; |
(...skipping 2336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
3444 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { | 3445 } else if (graphicsLayer == m_decorationOutlineLayer.get()) { |
3445 name = "Decoration Layer"; | 3446 name = "Decoration Layer"; |
3446 } else { | 3447 } else { |
3447 ASSERT_NOT_REACHED(); | 3448 ASSERT_NOT_REACHED(); |
3448 } | 3449 } |
3449 | 3450 |
3450 return name; | 3451 return name; |
3451 } | 3452 } |
3452 | 3453 |
3453 } // namespace blink | 3454 } // namespace blink |
OLD | NEW |