| 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 // Invalidating the scrolling tree will break the reference cycle between th
e ScrollingCoordinator and ScrollingTree objects. | 81 // Invalidating the scrolling tree will break the reference cycle between th
e ScrollingCoordinator and ScrollingTree objects. |
| 82 ScrollingThread::dispatch(bind(&ScrollingTree::invalidate, m_scrollingTree.r
elease())); | 82 ScrollingThread::dispatch(bind(&ScrollingTree::invalidate, m_scrollingTree.r
elease())); |
| 83 } | 83 } |
| 84 | 84 |
| 85 ScrollingTree* ScrollingCoordinatorMac::scrollingTree() const | 85 ScrollingTree* ScrollingCoordinatorMac::scrollingTree() const |
| 86 { | 86 { |
| 87 ASSERT(m_scrollingTree); | 87 ASSERT(m_scrollingTree); |
| 88 return m_scrollingTree.get(); | 88 return m_scrollingTree.get(); |
| 89 } | 89 } |
| 90 | 90 |
| 91 bool ScrollingCoordinatorMac::isRubberBandInProgress() const | |
| 92 { | |
| 93 return scrollingTree()->isRubberBandInProgress(); | |
| 94 } | |
| 95 | |
| 96 void ScrollingCoordinatorMac::commitTreeStateIfNeeded() | 91 void ScrollingCoordinatorMac::commitTreeStateIfNeeded() |
| 97 { | 92 { |
| 98 if (!m_scrollingStateTree->hasChangedProperties()) | 93 if (!m_scrollingStateTree->hasChangedProperties()) |
| 99 return; | 94 return; |
| 100 | 95 |
| 101 commitTreeState(); | 96 commitTreeState(); |
| 102 m_scrollingStateTreeCommitterTimer.stop(); | 97 m_scrollingStateTreeCommitterTimer.stop(); |
| 103 } | 98 } |
| 104 | 99 |
| 105 void ScrollingCoordinatorMac::frameViewLayoutUpdated(FrameView* frameView) | 100 void ScrollingCoordinatorMac::frameViewLayoutUpdated(FrameView* frameView) |
| (...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 485 } | 480 } |
| 486 | 481 |
| 487 String ScrollingCoordinatorMac::scrollingStateTreeAsText() const | 482 String ScrollingCoordinatorMac::scrollingStateTreeAsText() const |
| 488 { | 483 { |
| 489 return m_scrollingStateTree->rootStateNode()->scrollingStateTreeAsText(); | 484 return m_scrollingStateTree->rootStateNode()->scrollingStateTreeAsText(); |
| 490 } | 485 } |
| 491 | 486 |
| 492 } // namespace WebCore | 487 } // namespace WebCore |
| 493 | 488 |
| 494 #endif // ENABLE(THREADED_SCROLLING) | 489 #endif // ENABLE(THREADED_SCROLLING) |
| OLD | NEW |