| 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 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 153 virtual void setLayerIsFixedToContainerLayer(GraphicsLayer*, bool) { } | 153 virtual void setLayerIsFixedToContainerLayer(GraphicsLayer*, bool) { } |
| 154 virtual void touchEventTargetRectsDidChange(const Document*) { } | 154 virtual void touchEventTargetRectsDidChange(const Document*) { } |
| 155 | 155 |
| 156 #if ENABLE(TOUCH_EVENT_TRACKING) | 156 #if ENABLE(TOUCH_EVENT_TRACKING) |
| 157 void computeAbsoluteTouchEventTargetRects(const Document*, Vector<IntRect>&)
; | 157 void computeAbsoluteTouchEventTargetRects(const Document*, Vector<IntRect>&)
; |
| 158 #endif | 158 #endif |
| 159 | 159 |
| 160 static String mainThreadScrollingReasonsAsText(MainThreadScrollingReasons); | 160 static String mainThreadScrollingReasonsAsText(MainThreadScrollingReasons); |
| 161 String mainThreadScrollingReasonsAsText() const; | 161 String mainThreadScrollingReasonsAsText() const; |
| 162 | 162 |
| 163 Region computeNonFastScrollableRegion(const Frame*, const IntPoint& frameLoc
ation) const; |
| 164 |
| 163 protected: | 165 protected: |
| 164 explicit ScrollingCoordinator(Page*); | 166 explicit ScrollingCoordinator(Page*); |
| 165 | 167 |
| 166 Region computeNonFastScrollableRegion(Frame*, const IntPoint& frameLocation)
; | |
| 167 unsigned computeCurrentWheelEventHandlerCount(); | 168 unsigned computeCurrentWheelEventHandlerCount(); |
| 168 GraphicsLayer* scrollLayerForFrameView(FrameView*); | 169 GraphicsLayer* scrollLayerForFrameView(FrameView*); |
| 169 | 170 |
| 170 Page* m_page; | 171 Page* m_page; |
| 171 | 172 |
| 172 private: | 173 private: |
| 173 virtual void recomputeWheelEventHandlerCountForFrameView(FrameView*) { } | 174 virtual void recomputeWheelEventHandlerCountForFrameView(FrameView*) { } |
| 174 virtual void setShouldUpdateScrollLayerPositionOnMainThread(MainThreadScroll
ingReasons) { } | 175 virtual void setShouldUpdateScrollLayerPositionOnMainThread(MainThreadScroll
ingReasons) { } |
| 175 | 176 |
| 176 virtual bool hasVisibleSlowRepaintFixedObjects(FrameView*) const; | 177 virtual bool hasVisibleSlowRepaintFixedObjects(FrameView*) const; |
| 177 void updateShouldUpdateScrollLayerPositionOnMainThread(); | 178 void updateShouldUpdateScrollLayerPositionOnMainThread(); |
| 178 | 179 |
| 179 void updateMainFrameScrollPositionTimerFired(Timer<ScrollingCoordinator>*); | 180 void updateMainFrameScrollPositionTimerFired(Timer<ScrollingCoordinator>*); |
| 180 | 181 |
| 181 Timer<ScrollingCoordinator> m_updateMainFrameScrollPositionTimer; | 182 Timer<ScrollingCoordinator> m_updateMainFrameScrollPositionTimer; |
| 182 IntPoint m_scheduledUpdateScrollPosition; | 183 IntPoint m_scheduledUpdateScrollPosition; |
| 183 bool m_scheduledUpdateIsProgrammaticScroll; | 184 bool m_scheduledUpdateIsProgrammaticScroll; |
| 184 SetOrSyncScrollingLayerPosition m_scheduledScrollingLayerPositionAction; | 185 SetOrSyncScrollingLayerPosition m_scheduledScrollingLayerPositionAction; |
| 185 | 186 |
| 186 bool m_forceMainThreadScrollLayerPositionUpdates; | 187 bool m_forceMainThreadScrollLayerPositionUpdates; |
| 187 }; | 188 }; |
| 188 | 189 |
| 189 } // namespace WebCore | 190 } // namespace WebCore |
| 190 | 191 |
| 191 #endif // ScrollingCoordinator_h | 192 #endif // ScrollingCoordinator_h |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 11875020:
Merge 138991 (Closed)
Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/