Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(102)

Side by Side Diff: Source/WebCore/page/scrolling/ScrollingCoordinator.h

Issue 12279017: Revert 140571 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1410/
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/WebCore/page/FrameView.cpp ('k') | Source/WebCore/page/scrolling/ScrollingTree.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 virtual void commitTreeStateIfNeeded() { } 119 virtual void commitTreeStateIfNeeded() { }
120 virtual bool requestScrollPositionUpdate(FrameView*, const IntPoint&) { retu rn false; } 120 virtual bool requestScrollPositionUpdate(FrameView*, const IntPoint&) { retu rn false; }
121 virtual bool handleWheelEvent(FrameView*, const PlatformWheelEvent&) { retur n true; } 121 virtual bool handleWheelEvent(FrameView*, const PlatformWheelEvent&) { retur n true; }
122 virtual ScrollingNodeID attachToStateTree(ScrollingNodeType, ScrollingNodeID newNodeID, ScrollingNodeID /*parentID*/) { return newNodeID; } 122 virtual ScrollingNodeID attachToStateTree(ScrollingNodeType, ScrollingNodeID newNodeID, ScrollingNodeID /*parentID*/) { return newNodeID; }
123 virtual void detachFromStateTree(ScrollingNodeID) { } 123 virtual void detachFromStateTree(ScrollingNodeID) { }
124 virtual void clearStateTree() { } 124 virtual void clearStateTree() { }
125 virtual void updateViewportConstrainedNode(ScrollingNodeID, const ViewportCo nstraints&, GraphicsLayer*) { } 125 virtual void updateViewportConstrainedNode(ScrollingNodeID, const ViewportCo nstraints&, GraphicsLayer*) { }
126 virtual void updateScrollingNode(ScrollingNodeID, GraphicsLayer* /*scrollLay er*/, GraphicsLayer* /*counterScrollingLayer*/) { } 126 virtual void updateScrollingNode(ScrollingNodeID, GraphicsLayer* /*scrollLay er*/, GraphicsLayer* /*counterScrollingLayer*/) { }
127 virtual void syncChildPositions(const LayoutRect&) { } 127 virtual void syncChildPositions(const LayoutRect&) { }
128 virtual String scrollingStateTreeAsText() const; 128 virtual String scrollingStateTreeAsText() const;
129 virtual bool isRubberBandInProgress() const { return false; }
130 129
131 // Generated a unique id for scroll layers. 130 // Generated a unique id for scroll layers.
132 ScrollingNodeID uniqueScrollLayerID(); 131 ScrollingNodeID uniqueScrollLayerID();
133 132
134 // Dispatched by the scrolling tree whenever the main frame scroll position changes. 133 // Dispatched by the scrolling tree whenever the main frame scroll position changes.
135 void scheduleUpdateMainFrameScrollPosition(const IntPoint&, bool programmati cScroll, SetOrSyncScrollingLayerPosition); 134 void scheduleUpdateMainFrameScrollPosition(const IntPoint&, bool programmati cScroll, SetOrSyncScrollingLayerPosition);
136 void updateMainFrameScrollPosition(const IntPoint&, bool programmaticScroll, SetOrSyncScrollingLayerPosition); 135 void updateMainFrameScrollPosition(const IntPoint&, bool programmaticScroll, SetOrSyncScrollingLayerPosition);
137 136
138 enum MainThreadScrollingReasonFlags { 137 enum MainThreadScrollingReasonFlags {
139 ForcedOnMainThread = 1 << 0, 138 ForcedOnMainThread = 1 << 0,
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 IntPoint m_scheduledUpdateScrollPosition; 185 IntPoint m_scheduledUpdateScrollPosition;
187 bool m_scheduledUpdateIsProgrammaticScroll; 186 bool m_scheduledUpdateIsProgrammaticScroll;
188 SetOrSyncScrollingLayerPosition m_scheduledScrollingLayerPositionAction; 187 SetOrSyncScrollingLayerPosition m_scheduledScrollingLayerPositionAction;
189 188
190 bool m_forceMainThreadScrollLayerPositionUpdates; 189 bool m_forceMainThreadScrollLayerPositionUpdates;
191 }; 190 };
192 191
193 } // namespace WebCore 192 } // namespace WebCore
194 193
195 #endif // ScrollingCoordinator_h 194 #endif // ScrollingCoordinator_h
OLDNEW
« no previous file with comments | « Source/WebCore/page/FrameView.cpp ('k') | Source/WebCore/page/scrolling/ScrollingTree.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698