| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011 Apple Inc. All rights reserved. | 2 * Copyright (C) 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 624 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 635 | 635 |
| 636 void ScrollingCoordinator::updateScrollParentForGraphicsLayer(GraphicsLayer* chi
ld, RenderLayer* parent) | 636 void ScrollingCoordinator::updateScrollParentForGraphicsLayer(GraphicsLayer* chi
ld, RenderLayer* parent) |
| 637 { | 637 { |
| 638 WebLayer* scrollParentWebLayer = 0; | 638 WebLayer* scrollParentWebLayer = 0; |
| 639 if (parent && parent->hasCompositedLayerMapping()) | 639 if (parent && parent->hasCompositedLayerMapping()) |
| 640 scrollParentWebLayer = toWebLayer(parent->compositedLayerMapping()->pare
ntForSublayers()); | 640 scrollParentWebLayer = toWebLayer(parent->compositedLayerMapping()->pare
ntForSublayers()); |
| 641 | 641 |
| 642 child->setScrollParent(scrollParentWebLayer); | 642 child->setScrollParent(scrollParentWebLayer); |
| 643 } | 643 } |
| 644 | 644 |
| 645 bool ScrollingCoordinator::hasScrollChildren(GraphicsLayer* layer) |
| 646 { |
| 647 return toWebLayer(layer)->hasScrollChildren(); |
| 648 } |
| 649 |
| 645 void ScrollingCoordinator::updateClipParentForGraphicsLayer(GraphicsLayer* child
, RenderLayer* parent) | 650 void ScrollingCoordinator::updateClipParentForGraphicsLayer(GraphicsLayer* child
, RenderLayer* parent) |
| 646 { | 651 { |
| 647 WebLayer* clipParentWebLayer = 0; | 652 WebLayer* clipParentWebLayer = 0; |
| 648 if (parent && parent->hasCompositedLayerMapping()) | 653 if (parent && parent->hasCompositedLayerMapping()) |
| 649 clipParentWebLayer = toWebLayer(parent->compositedLayerMapping()->parent
ForSublayers()); | 654 clipParentWebLayer = toWebLayer(parent->compositedLayerMapping()->parent
ForSublayers()); |
| 650 | 655 |
| 651 child->setClipParent(clipParentWebLayer); | 656 child->setClipParent(clipParentWebLayer); |
| 652 } | 657 } |
| 653 | 658 |
| 654 void ScrollingCoordinator::willDestroyRenderLayer(RenderLayer* layer) | 659 void ScrollingCoordinator::willDestroyRenderLayer(RenderLayer* layer) |
| (...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 977 bool frameIsScrollable = frameView && frameView->isScrollable(); | 982 bool frameIsScrollable = frameView && frameView->isScrollable(); |
| 978 if (frameIsScrollable != m_wasFrameScrollable) | 983 if (frameIsScrollable != m_wasFrameScrollable) |
| 979 return true; | 984 return true; |
| 980 | 985 |
| 981 if (WebLayer* scrollLayer = frameView ? toWebLayer(frameView->layerForScroll
ing()) : 0) | 986 if (WebLayer* scrollLayer = frameView ? toWebLayer(frameView->layerForScroll
ing()) : 0) |
| 982 return blink::WebSize(frameView->contentsSize()) != scrollLayer->bounds(
); | 987 return blink::WebSize(frameView->contentsSize()) != scrollLayer->bounds(
); |
| 983 return false; | 988 return false; |
| 984 } | 989 } |
| 985 | 990 |
| 986 } // namespace WebCore | 991 } // namespace WebCore |
| OLD | NEW |