| 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 848 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 859 return; | 859 return; |
| 860 | 860 |
| 861 m_shouldScrollOnMainThreadDirty = true; | 861 m_shouldScrollOnMainThreadDirty = true; |
| 862 } | 862 } |
| 863 | 863 |
| 864 bool ScrollingCoordinator::isForMainFrame(ScrollableArea* scrollableArea) const | 864 bool ScrollingCoordinator::isForMainFrame(ScrollableArea* scrollableArea) const |
| 865 { | 865 { |
| 866 return scrollableArea == m_page->mainFrame()->view(); | 866 return scrollableArea == m_page->mainFrame()->view(); |
| 867 } | 867 } |
| 868 | 868 |
| 869 GraphicsLayer* ScrollingCoordinator::scrollLayerForFrameView(FrameView* frameVie
w) | |
| 870 { | |
| 871 RenderView* renderView = frameView->frame().contentRenderer(); | |
| 872 if (!renderView) | |
| 873 return 0; | |
| 874 return renderView->compositor()->scrollLayer(); | |
| 875 } | |
| 876 | |
| 877 GraphicsLayer* ScrollingCoordinator::counterScrollingLayerForFrameView(FrameView
*) | |
| 878 { | |
| 879 return 0; | |
| 880 } | |
| 881 | |
| 882 void ScrollingCoordinator::frameViewRootLayerDidChange(FrameView* frameView) | 869 void ScrollingCoordinator::frameViewRootLayerDidChange(FrameView* frameView) |
| 883 { | 870 { |
| 884 ASSERT(isMainThread()); | 871 ASSERT(isMainThread()); |
| 885 ASSERT(m_page); | 872 ASSERT(m_page); |
| 886 | 873 |
| 887 if (!coordinatesScrollingForFrameView(frameView)) | 874 if (!coordinatesScrollingForFrameView(frameView)) |
| 888 return; | 875 return; |
| 889 | 876 |
| 890 notifyLayoutUpdated(); | 877 notifyLayoutUpdated(); |
| 891 updateHaveWheelEventHandlers(); | 878 updateHaveWheelEventHandlers(); |
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 978 bool frameIsScrollable = frameView && frameView->isScrollable(); | 965 bool frameIsScrollable = frameView && frameView->isScrollable(); |
| 979 if (frameIsScrollable != m_wasFrameScrollable) | 966 if (frameIsScrollable != m_wasFrameScrollable) |
| 980 return true; | 967 return true; |
| 981 | 968 |
| 982 if (WebLayer* scrollLayer = frameView ? toWebLayer(frameView->layerForScroll
ing()) : 0) | 969 if (WebLayer* scrollLayer = frameView ? toWebLayer(frameView->layerForScroll
ing()) : 0) |
| 983 return blink::WebSize(frameView->contentsSize()) != scrollLayer->bounds(
); | 970 return blink::WebSize(frameView->contentsSize()) != scrollLayer->bounds(
); |
| 984 return false; | 971 return false; |
| 985 } | 972 } |
| 986 | 973 |
| 987 } // namespace WebCore | 974 } // namespace WebCore |
| OLD | NEW |