diff options
| author | vmpstr <vmpstr@chromium.org> | 2015-11-18 02:41:28 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-18 10:42:27 +0000 |
| commit | a370ef52788ea0f6c410b05ec40a74ee9bf3a647 (patch) | |
| tree | 3a17b8c71c12f28b9aab3c6d82b30afda9b7a060 /cc/trees/layer_tree_host_impl.h | |
| parent | 93a4c577dd608bc72ac31ea396201590a23b46c5 (diff) | |
| download | chromium_src-a370ef52788ea0f6c410b05ec40a74ee9bf3a647.zip chromium_src-a370ef52788ea0f6c410b05ec40a74ee9bf3a647.tar.gz chromium_src-a370ef52788ea0f6c410b05ec40a74ee9bf3a647.tar.bz2 | |
cc: Remove ScopedPtrVector and cc::remove_if.
This patch removes ScopedPtrVector and cc::remove_if. It depends on
https://codereview.chromium.org/1441613002 for TakeBack.
R=danakj
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel
Review URL: https://codereview.chromium.org/1437413002
Cr-Commit-Position: refs/heads/master@{#360318}
Diffstat (limited to 'cc/trees/layer_tree_host_impl.h')
| -rw-r--r-- | cc/trees/layer_tree_host_impl.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h index e4145c5..583a4ad 100644 --- a/cc/trees/layer_tree_host_impl.h +++ b/cc/trees/layer_tree_host_impl.h @@ -222,6 +222,9 @@ class CC_EXPORT LayerTreeHostImpl // RenderPassSink implementation. void AppendRenderPass(scoped_ptr<RenderPass> render_pass) override; + + private: + DISALLOW_COPY_AND_ASSIGN(FrameData); }; virtual void BeginMainFrameAborted(CommitEarlyOutReason reason); @@ -738,7 +741,8 @@ class CC_EXPORT LayerTreeHostImpl 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_; + std::vector<scoped_ptr<SwapPromise>> + swap_promises_for_main_thread_scroll_update_; // An object to implement the ScrollElasticityHelper interface and // hold all state related to elasticity. May be NULL if never requested. |