OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009, 2010 Apple Inc. All rights reserved. | 2 * Copyright (C) 2009, 2010 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 1151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1162 IntPoint scrollPosition = frameView->scrollPosition(); | 1162 IntPoint scrollPosition = frameView->scrollPosition(); |
1163 | 1163 |
1164 if (!m_scrollLayer) | 1164 if (!m_scrollLayer) |
1165 return; | 1165 return; |
1166 | 1166 |
1167 // If there's a scrolling coordinator that manages scrolling for this frame
view, | 1167 // If there's a scrolling coordinator that manages scrolling for this frame
view, |
1168 // it will also manage updating the scroll layer position. | 1168 // it will also manage updating the scroll layer position. |
1169 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator(
)) { | 1169 if (ScrollingCoordinator* scrollingCoordinator = this->scrollingCoordinator(
)) { |
1170 if (scrollingCoordinator->coordinatesScrollingForFrameView(frameView)) | 1170 if (scrollingCoordinator->coordinatesScrollingForFrameView(frameView)) |
1171 return; | 1171 return; |
| 1172 if (Settings* settings = m_renderView->document()->settings()) |
| 1173 if (settings->compositedScrollingForFramesEnabled()) |
| 1174 scrollingCoordinator->scrollableAreaScrollLayerDidChange(frameVi
ew, m_scrollLayer.get()); |
1172 } | 1175 } |
1173 | 1176 |
1174 m_scrollLayer->setPosition(FloatPoint(-scrollPosition.x(), -scrollPosition.y
())); | 1177 m_scrollLayer->setPosition(FloatPoint(-scrollPosition.x(), -scrollPosition.y
())); |
1175 } | 1178 } |
1176 | 1179 |
1177 void RenderLayerCompositor::frameViewDidLayout() | 1180 void RenderLayerCompositor::frameViewDidLayout() |
1178 { | 1181 { |
1179 RenderLayerBacking* renderViewBacking = m_renderView->layer()->backing(); | 1182 RenderLayerBacking* renderViewBacking = m_renderView->layer()->backing(); |
1180 if (renderViewBacking) | 1183 if (renderViewBacking) |
1181 renderViewBacking->adjustTileCacheCoverage(); | 1184 renderViewBacking->adjustTileCacheCoverage(); |
(...skipping 1613 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2795 #if ENABLE(RUBBER_BANDING) | 2798 #if ENABLE(RUBBER_BANDING) |
2796 info.addMember(m_layerForOverhangAreas); | 2799 info.addMember(m_layerForOverhangAreas); |
2797 info.addMember(m_contentShadowLayer); | 2800 info.addMember(m_contentShadowLayer); |
2798 #endif | 2801 #endif |
2799 info.addMember(m_layerUpdater); | 2802 info.addMember(m_layerUpdater); |
2800 } | 2803 } |
2801 | 2804 |
2802 } // namespace WebCore | 2805 } // namespace WebCore |
2803 | 2806 |
2804 #endif // USE(ACCELERATED_COMPOSITING) | 2807 #endif // USE(ACCELERATED_COMPOSITING) |
OLD | NEW |