cc/surfaces/surface_aggregator.cc - Issue 608503005: Revert of cc: Remove use of PassAs() and constructor-casting with scoped_ptr.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: cc/surfaces/surface_aggregator.cc

Issue 608503005: Revert of cc: Remove use of PassAs() and constructor-casting with scoped_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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 side-by-side diff with in-line comments

Download patch

Index: cc/surfaces/surface_aggregator.cc

diff --git a/cc/surfaces/surface_aggregator.cc b/cc/surfaces/surface_aggregator.cc

index 35107e8363adf32ffef983cc32801b5e4d481163..679d7516b621030e8f5156d72b8df9ce7adc22a2 100644

--- a/cc/surfaces/surface_aggregator.cc

+++ b/cc/surfaces/surface_aggregator.cc

@@ -355,7 +355,7 @@

contained_surfaces_[surface_id] = surface->frame_index();

const CompositorFrame* root_surface_frame = surface->GetEligibleFrame();

if (!root_surface_frame)

- return nullptr;

+ return scoped_ptr<CompositorFrame>();

TRACE_EVENT0("cc", "SurfaceAggregator::Aggregate");

scoped_ptr<CompositorFrame> frame(new CompositorFrame);

« no previous file with comments | « cc/resources/ui_resource_request.cc ('k') | cc/test/animation_test_common.cc » ('j') | no next file with comments »