content/browser/frame_host/render_widget_host_view_guest.cc - Issue 2103333002: Revert of Make cc::CompositorFrames movable [Part 2 of 2]

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: content/browser/frame_host/render_widget_host_view_guest.cc

Issue 2103333002: Revert of Make cc::CompositorFrames movable [Part 2 of 2] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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

« no previous file with comments | « content/browser/frame_host/render_widget_host_view_child_frame.cc ('k') | content/browser/renderer_host/delegated_frame_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/frame_host/render_widget_host_view_guest.cc

diff --git a/content/browser/frame_host/render_widget_host_view_guest.cc b/content/browser/frame_host/render_widget_host_view_guest.cc

index 983176d3868ca7fbfdfbcaa2bb786de4050ad61c..798fe2d2761418a7bffc574c5eab23bee7b21b1d 100644

--- a/content/browser/frame_host/render_widget_host_view_guest.cc

+++ b/content/browser/frame_host/render_widget_host_view_guest.cc

@@ -282,7 +282,9 @@

ack_pending_count_++;

// If this value grows very large, something is going wrong.

DCHECK(ack_pending_count_ < 1000);

- surface_factory_->SubmitCompositorFrame(surface_id_, std::move(frame),

+ std::unique_ptr<cc::CompositorFrame> frame_copy(new cc::CompositorFrame);

+ *frame_copy = std::move(frame);

+ surface_factory_->SubmitCompositorFrame(surface_id_, std::move(frame_copy),

ack_callback);

ProcessFrameSwappedCallbacks();