| 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 625 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 636 if (renderView && renderView->compositor() && renderView->compositor()->stal
eInCompositingMode()) | 636 if (renderView && renderView->compositor() && renderView->compositor()->stal
eInCompositingMode()) |
| 637 m_page->mainFrame()->view()->scheduleAnimation(); | 637 m_page->mainFrame()->view()->scheduleAnimation(); |
| 638 | 638 |
| 639 m_touchEventTargetRectsAreDirty = true; | 639 m_touchEventTargetRectsAreDirty = true; |
| 640 } | 640 } |
| 641 | 641 |
| 642 void ScrollingCoordinator::updateScrollParentForGraphicsLayer(GraphicsLayer* chi
ld, RenderLayer* parent) | 642 void ScrollingCoordinator::updateScrollParentForGraphicsLayer(GraphicsLayer* chi
ld, RenderLayer* parent) |
| 643 { | 643 { |
| 644 WebLayer* scrollParentWebLayer = 0; | 644 WebLayer* scrollParentWebLayer = 0; |
| 645 if (parent && parent->hasCompositedLayerMapping()) | 645 if (parent && parent->hasCompositedLayerMapping()) |
| 646 scrollParentWebLayer = toWebLayer(parent->compositedLayerMapping()->pare
ntForSublayers()); | 646 scrollParentWebLayer = toWebLayer(parent->compositedLayerMapping()->scro
llingContentsLayer()); |
| 647 | 647 |
| 648 child->setScrollParent(scrollParentWebLayer); | 648 child->setScrollParent(scrollParentWebLayer); |
| 649 } | 649 } |
| 650 | 650 |
| 651 void ScrollingCoordinator::updateClipParentForGraphicsLayer(GraphicsLayer* child
, RenderLayer* parent) | 651 void ScrollingCoordinator::updateClipParentForGraphicsLayer(GraphicsLayer* child
, RenderLayer* parent) |
| 652 { | 652 { |
| 653 WebLayer* clipParentWebLayer = 0; | 653 WebLayer* clipParentWebLayer = 0; |
| 654 if (parent && parent->hasCompositedLayerMapping()) | 654 if (parent && parent->hasCompositedLayerMapping()) |
| 655 clipParentWebLayer = toWebLayer(parent->compositedLayerMapping()->parent
ForSublayers()); | 655 clipParentWebLayer = toWebLayer(parent->compositedLayerMapping()->parent
ForSublayers()); |
| 656 | 656 |
| (...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 985 bool frameIsScrollable = frameView && frameView->isScrollable(); | 985 bool frameIsScrollable = frameView && frameView->isScrollable(); |
| 986 if (frameIsScrollable != m_wasFrameScrollable) | 986 if (frameIsScrollable != m_wasFrameScrollable) |
| 987 return true; | 987 return true; |
| 988 | 988 |
| 989 if (WebLayer* scrollLayer = frameView ? toWebLayer(frameView->layerForScroll
ing()) : 0) | 989 if (WebLayer* scrollLayer = frameView ? toWebLayer(frameView->layerForScroll
ing()) : 0) |
| 990 return blink::WebSize(frameView->contentsSize()) != scrollLayer->bounds(
); | 990 return blink::WebSize(frameView->contentsSize()) != scrollLayer->bounds(
); |
| 991 return false; | 991 return false; |
| 992 } | 992 } |
| 993 | 993 |
| 994 } // namespace WebCore | 994 } // namespace WebCore |
| OLD | NEW |