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}
diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
index e4145c5..583a4adf 100644
--- a/cc/trees/layer_tree_host_impl.h
+++ b/cc/trees/layer_tree_host_impl.h
@@ -222,6 +222,9 @@
// 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 @@
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.
