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 586 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
597 { | 597 { |
598 m_layersWithTouchRects.remove(layer); | 598 m_layersWithTouchRects.remove(layer); |
599 } | 599 } |
600 | 600 |
601 void ScrollingCoordinator::setWheelEventHandlerCount(unsigned count) | 601 void ScrollingCoordinator::setWheelEventHandlerCount(unsigned count) |
602 { | 602 { |
603 if (WebLayer* scrollLayer = scrollingWebLayerForScrollableArea(m_page->mainF
rame()->view())) | 603 if (WebLayer* scrollLayer = scrollingWebLayerForScrollableArea(m_page->mainF
rame()->view())) |
604 scrollLayer->setHaveWheelEventHandlers(count > 0); | 604 scrollLayer->setHaveWheelEventHandlers(count > 0); |
605 } | 605 } |
606 | 606 |
607 void ScrollingCoordinator::recomputeWheelEventHandlerCountForFrameView(FrameView
* frameView) | 607 void ScrollingCoordinator::recomputeWheelEventHandlerCountForFrameView(FrameView
*) |
608 { | 608 { |
609 UNUSED_PARAM(frameView); | |
610 setWheelEventHandlerCount(computeCurrentWheelEventHandlerCount()); | 609 setWheelEventHandlerCount(computeCurrentWheelEventHandlerCount()); |
611 } | 610 } |
612 | 611 |
613 void ScrollingCoordinator::setShouldUpdateScrollLayerPositionOnMainThread(MainTh
readScrollingReasons reasons) | 612 void ScrollingCoordinator::setShouldUpdateScrollLayerPositionOnMainThread(MainTh
readScrollingReasons reasons) |
614 { | 613 { |
615 if (WebLayer* scrollLayer = scrollingWebLayerForScrollableArea(m_page->mainF
rame()->view())) { | 614 if (WebLayer* scrollLayer = scrollingWebLayerForScrollableArea(m_page->mainF
rame()->view())) { |
616 m_lastMainThreadScrollingReasons = reasons; | 615 m_lastMainThreadScrollingReasons = reasons; |
617 scrollLayer->setShouldScrollOnMainThread(reasons); | 616 scrollLayer->setShouldScrollOnMainThread(reasons); |
618 } | 617 } |
619 } | 618 } |
(...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
924 } | 923 } |
925 | 924 |
926 bool ScrollingCoordinator::frameViewIsScrollableIsDirty() const | 925 bool ScrollingCoordinator::frameViewIsScrollableIsDirty() const |
927 { | 926 { |
928 FrameView* frameView = m_page->mainFrame()->view(); | 927 FrameView* frameView = m_page->mainFrame()->view(); |
929 bool frameIsScrollable = frameView && frameView->isScrollable(); | 928 bool frameIsScrollable = frameView && frameView->isScrollable(); |
930 return frameIsScrollable != m_wasFrameScrollable; | 929 return frameIsScrollable != m_wasFrameScrollable; |
931 } | 930 } |
932 | 931 |
933 } // namespace WebCore | 932 } // namespace WebCore |
OLD | NEW |