| Index: trunk/src/cc/trees/layer_tree_host_impl.h
|
| ===================================================================
|
| --- trunk/src/cc/trees/layer_tree_host_impl.h (revision 287455)
|
| +++ trunk/src/cc/trees/layer_tree_host_impl.h (working copy)
|
| @@ -331,8 +331,6 @@
|
| bool scroll_affects_scroll_handler() const {
|
| return scroll_affects_scroll_handler_;
|
| }
|
| - void QueueSwapPromiseForMainThreadScrollUpdate(
|
| - scoped_ptr<SwapPromise> swap_promise);
|
|
|
| bool IsCurrentlyScrolling() const;
|
|
|
| @@ -577,7 +575,6 @@
|
| void MarkUIResourceNotEvicted(UIResourceId uid);
|
|
|
| void NotifySwapPromiseMonitorsOfSetNeedsRedraw();
|
| - void NotifySwapPromiseMonitorsOfForwardingToMainThread();
|
|
|
| typedef base::hash_map<UIResourceId, UIResourceData>
|
| UIResourceMap;
|
| @@ -624,7 +621,6 @@
|
| bool wheel_scrolling_;
|
| bool scroll_affects_scroll_handler_;
|
| int scroll_layer_id_when_mouse_over_scrollbar_;
|
| - ScopedPtrVector<SwapPromise> swap_promises_for_main_thread_scroll_update_;
|
|
|
| bool tile_priorities_dirty_;
|
|
|
|
|