| 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 632 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 643 if (renderView && renderView->compositor() && renderView->compositor()->stal
eInCompositingMode()) | 643 if (renderView && renderView->compositor() && renderView->compositor()->stal
eInCompositingMode()) |
| 644 m_page->deprecatedLocalMainFrame()->view()->scheduleAnimation(); | 644 m_page->deprecatedLocalMainFrame()->view()->scheduleAnimation(); |
| 645 | 645 |
| 646 m_touchEventTargetRectsAreDirty = true; | 646 m_touchEventTargetRectsAreDirty = true; |
| 647 } | 647 } |
| 648 | 648 |
| 649 void ScrollingCoordinator::updateScrollParentForGraphicsLayer(GraphicsLayer* chi
ld, RenderLayer* parent) | 649 void ScrollingCoordinator::updateScrollParentForGraphicsLayer(GraphicsLayer* chi
ld, RenderLayer* parent) |
| 650 { | 650 { |
| 651 WebLayer* scrollParentWebLayer = 0; | 651 WebLayer* scrollParentWebLayer = 0; |
| 652 if (parent && parent->hasCompositedLayerMapping()) | 652 if (parent && parent->hasCompositedLayerMapping()) |
| 653 scrollParentWebLayer = toWebLayer(parent->compositedLayerMapping()->pare
ntForSublayers()); | 653 scrollParentWebLayer = toWebLayer(parent->compositedLayerMapping()->scro
llingContentsLayer()); |
| 654 | 654 |
| 655 child->setScrollParent(scrollParentWebLayer); | 655 child->setScrollParent(scrollParentWebLayer); |
| 656 } | 656 } |
| 657 | 657 |
| 658 void ScrollingCoordinator::updateClipParentForGraphicsLayer(GraphicsLayer* child
, RenderLayer* parent) | 658 void ScrollingCoordinator::updateClipParentForGraphicsLayer(GraphicsLayer* child
, RenderLayer* parent) |
| 659 { | 659 { |
| 660 WebLayer* clipParentWebLayer = 0; | 660 WebLayer* clipParentWebLayer = 0; |
| 661 if (parent && parent->hasCompositedLayerMapping()) | 661 if (parent && parent->hasCompositedLayerMapping()) |
| 662 clipParentWebLayer = toWebLayer(parent->compositedLayerMapping()->parent
ForSublayers()); | 662 clipParentWebLayer = toWebLayer(parent->compositedLayerMapping()->parent
ForSublayers()); |
| 663 | 663 |
| (...skipping 335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 999 bool frameIsScrollable = frameView && frameView->isScrollable(); | 999 bool frameIsScrollable = frameView && frameView->isScrollable(); |
| 1000 if (frameIsScrollable != m_wasFrameScrollable) | 1000 if (frameIsScrollable != m_wasFrameScrollable) |
| 1001 return true; | 1001 return true; |
| 1002 | 1002 |
| 1003 if (WebLayer* scrollLayer = frameView ? toWebLayer(frameView->layerForScroll
ing()) : 0) | 1003 if (WebLayer* scrollLayer = frameView ? toWebLayer(frameView->layerForScroll
ing()) : 0) |
| 1004 return blink::WebSize(frameView->contentsSize()) != scrollLayer->bounds(
); | 1004 return blink::WebSize(frameView->contentsSize()) != scrollLayer->bounds(
); |
| 1005 return false; | 1005 return false; |
| 1006 } | 1006 } |
| 1007 | 1007 |
| 1008 } // namespace WebCore | 1008 } // namespace WebCore |
| OLD | NEW |