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

Side by Side Diff: Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2012 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 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 // These functions are used to indicate that a layer should be (or should no t longer be) represented by a node 68 // These functions are used to indicate that a layer should be (or should no t longer be) represented by a node
69 // in the scrolling tree. 69 // in the scrolling tree.
70 virtual ScrollingNodeID attachToStateTree(ScrollingNodeType, ScrollingNodeID newNodeID, ScrollingNodeID parentID); 70 virtual ScrollingNodeID attachToStateTree(ScrollingNodeType, ScrollingNodeID newNodeID, ScrollingNodeID parentID);
71 virtual void detachFromStateTree(ScrollingNodeID); 71 virtual void detachFromStateTree(ScrollingNodeID);
72 72
73 // This function wipes out the current tree. 73 // This function wipes out the current tree.
74 virtual void clearStateTree(); 74 virtual void clearStateTree();
75 75
76 virtual String scrollingStateTreeAsText() const OVERRIDE; 76 virtual String scrollingStateTreeAsText() const OVERRIDE;
77 77
78 virtual bool isRubberBandInProgress() const OVERRIDE;
79
80 private: 78 private:
81 // Return whether this scrolling coordinator can keep fixed position layers fixed to their 79 // Return whether this scrolling coordinator can keep fixed position layers fixed to their
82 // containers while scrolling. 80 // containers while scrolling.
83 virtual bool supportsFixedPositionLayers() const OVERRIDE { return true; } 81 virtual bool supportsFixedPositionLayers() const OVERRIDE { return true; }
84 82
85 // This function will update the ScrollingStateNode for the given viewport c onstrained object. 83 // This function will update the ScrollingStateNode for the given viewport c onstrained object.
86 virtual void updateViewportConstrainedNode(ScrollingNodeID, const ViewportCo nstraints&, GraphicsLayer*) OVERRIDE; 84 virtual void updateViewportConstrainedNode(ScrollingNodeID, const ViewportCo nstraints&, GraphicsLayer*) OVERRIDE;
87 85
88 virtual void updateScrollingNode(ScrollingNodeID, GraphicsLayer* scrollLayer , GraphicsLayer* counterScrollingLayer) OVERRIDE; 86 virtual void updateScrollingNode(ScrollingNodeID, GraphicsLayer* scrollLayer , GraphicsLayer* counterScrollingLayer) OVERRIDE;
89 87
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 Timer<ScrollingCoordinatorMac> m_scrollingStateTreeCommitterTimer; 134 Timer<ScrollingCoordinatorMac> m_scrollingStateTreeCommitterTimer;
137 135
138 HashMap<ScrollingNodeID, ScrollingStateNode*> m_stateNodeMap; 136 HashMap<ScrollingNodeID, ScrollingStateNode*> m_stateNodeMap;
139 }; 137 };
140 138
141 } // namespace WebCore 139 } // namespace WebCore
142 140
143 #endif // ENABLE(THREADED_SCROLLING) 141 #endif // ENABLE(THREADED_SCROLLING)
144 142
145 #endif // ScrollingCoordinatorMac_h 143 #endif // ScrollingCoordinatorMac_h
OLDNEW
« no previous file with comments | « Source/WebCore/page/scrolling/ScrollingTree.cpp ('k') | Source/WebCore/page/scrolling/mac/ScrollingCoordinatorMac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698