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

Unified Diff: content/browser/renderer_host/delegated_frame_host.cc

Issue 2652343003: Replace source pointer in cc::CopyOutputRequest with a base::UnguessableToken (Closed)
Patch Set: c Created 3 years, 11 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: content/browser/renderer_host/delegated_frame_host.cc
diff --git a/content/browser/renderer_host/delegated_frame_host.cc b/content/browser/renderer_host/delegated_frame_host.cc
index 5155431a863506efa9ae8f9acb239132bb3270bc..6fa63cc3e0e09060f4d366b71ea16a0b84d819e4 100644
--- a/content/browser/renderer_host/delegated_frame_host.cc
+++ b/content/browser/renderer_host/delegated_frame_host.cc
@@ -25,8 +25,8 @@
#include "components/display_compositor/gl_helper.h"
#include "content/browser/compositor/surface_utils.h"
#include "content/browser/gpu/compositor_util.h"
+#include "content/browser/renderer_host/render_widget_host_view_frame_subscriber.h"
#include "content/browser/renderer_host/resize_lock.h"
-#include "content/public/browser/render_widget_host_view_frame_subscriber.h"
#include "content/public/common/content_switches.h"
#include "media/base/video_frame.h"
#include "media/base/video_util.h"
@@ -364,7 +364,7 @@ void DelegatedFrameHost::AttemptFrameSubscriberCapture(
// DelegatedFrameHost (e.g., a call to CopyFromCompositingSurface() for
// screenshots) since those copy requests do not specify |frame_subscriber()|
// as a source.
- request->set_source(frame_subscriber());
+ request->set_source(frame_subscriber()->GetSourceIdForCopyRequest());
if (subscriber_texture.get()) {
request->SetTextureMailbox(cc::TextureMailbox(
subscriber_texture->mailbox(), subscriber_texture->sync_token(),

Powered by Google App Engine
This is Rietveld 408576698