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

Unified Diff: cc/layers/delegated_frame_provider.cc

Issue 1437413002: cc: Remove ScopedPtrVector and cc::remove_if. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/debug/micro_benchmark_controller_impl.cc ('k') | cc/layers/delegated_renderer_layer_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/delegated_frame_provider.cc
diff --git a/cc/layers/delegated_frame_provider.cc b/cc/layers/delegated_frame_provider.cc
index 5e016ebc6acd6953580d94f19085373b0f3b30f7..5d07cc4e10f5b0bdd96c553fa11e62acdb2b1419 100644
--- a/cc/layers/delegated_frame_provider.cc
+++ b/cc/layers/delegated_frame_provider.cc
@@ -15,7 +15,7 @@ DelegatedFrameProvider::DelegatedFrameProvider(
const scoped_refptr<DelegatedFrameResourceCollection>& resource_collection,
scoped_ptr<DelegatedFrameData> frame)
: resource_collection_(resource_collection) {
- RenderPass* root_pass = frame->render_pass_list.back();
+ RenderPass* root_pass = frame->render_pass_list.back().get();
frame_size_ = root_pass->output_rect.size();
DCHECK(!frame_size_.IsEmpty());
SetFrameData(frame.Pass());
@@ -66,7 +66,7 @@ void DelegatedFrameProvider::SetFrameData(
resource_collection_->ReceivedResources(frame_->resource_list);
resource_collection_->RefResources(frame_->resource_list);
- RenderPass* root_pass = frame_->render_pass_list.back();
+ RenderPass* root_pass = frame_->render_pass_list.back().get();
DCHECK_EQ(frame_size_.ToString(), root_pass->output_rect.size().ToString())
<< "All frames in a single DelegatedFrameProvider must have the same "
<< "size. Use a new frame provider for frames of a different size.";
« no previous file with comments | « cc/debug/micro_benchmark_controller_impl.cc ('k') | cc/layers/delegated_renderer_layer_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698