| 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 362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 373 | 373 |
| 374 // Our scrolling layer will clip. | 374 // Our scrolling layer will clip. |
| 375 if (m_owningLayer.needsCompositedScrolling()) | 375 if (m_owningLayer.needsCompositedScrolling()) |
| 376 needsDescendantsClippingLayer = false; | 376 needsDescendantsClippingLayer = false; |
| 377 | 377 |
| 378 RenderLayer* scrollParent = compositor->acceleratedCompositingForOverflowScr
ollEnabled() ? m_owningLayer.scrollParent() : 0; | 378 RenderLayer* scrollParent = compositor->acceleratedCompositingForOverflowScr
ollEnabled() ? m_owningLayer.scrollParent() : 0; |
| 379 bool needsAncestorClip = compositor->clippedByNonAncestorInStackingTree(&m_o
wningLayer); | 379 bool needsAncestorClip = compositor->clippedByNonAncestorInStackingTree(&m_o
wningLayer); |
| 380 if (scrollParent) { | 380 if (scrollParent) { |
| 381 // If our containing block is our ancestor scrolling layer, then we'll a
lready be clipped | 381 // If our containing block is our ancestor scrolling layer, then we'll a
lready be clipped |
| 382 // to it via our scroll parent and we don't need an ancestor clipping la
yer. | 382 // to it via our scroll parent and we don't need an ancestor clipping la
yer. |
| 383 if (m_owningLayer.renderer()->containingBlock()->enclosingLayer() == m_o
wningLayer.ancestorCompositedScrollingLayer()) | 383 if (m_owningLayer.renderer()->containingBlock()->enclosingLayer() == m_o
wningLayer.ancestorScrollingLayer()) |
| 384 needsAncestorClip = false; | 384 needsAncestorClip = false; |
| 385 } | 385 } |
| 386 | 386 |
| 387 if (updateClippingLayers(needsAncestorClip, needsDescendantsClippingLayer)) | 387 if (updateClippingLayers(needsAncestorClip, needsDescendantsClippingLayer)) |
| 388 layerConfigChanged = true; | 388 layerConfigChanged = true; |
| 389 | 389 |
| 390 if (updateOverflowControlsLayers(requiresHorizontalScrollbarLayer(), require
sVerticalScrollbarLayer(), requiresScrollCornerLayer())) | 390 if (updateOverflowControlsLayers(requiresHorizontalScrollbarLayer(), require
sVerticalScrollbarLayer(), requiresScrollCornerLayer())) |
| 391 layerConfigChanged = true; | 391 layerConfigChanged = true; |
| 392 | 392 |
| 393 bool scrollingConfigChanged = false; | 393 bool scrollingConfigChanged = false; |
| (...skipping 1872 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2266 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { | 2266 } else if (graphicsLayer == m_scrollingBlockSelectionLayer.get()) { |
| 2267 name = "Scrolling Block Selection Layer"; | 2267 name = "Scrolling Block Selection Layer"; |
| 2268 } else { | 2268 } else { |
| 2269 ASSERT_NOT_REACHED(); | 2269 ASSERT_NOT_REACHED(); |
| 2270 } | 2270 } |
| 2271 | 2271 |
| 2272 return name; | 2272 return name; |
| 2273 } | 2273 } |
| 2274 | 2274 |
| 2275 } // namespace WebCore | 2275 } // namespace WebCore |
| OLD | NEW |