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

Unified Diff: content/browser/renderer_host/render_widget_host_view_browsertest.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/render_widget_host_view_browsertest.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
index b2f1ae95e658638087625111b8507e7f8146426c..dea46c6c853f581f3d40348a0028a8788f91a344 100644
--- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc
@@ -19,9 +19,9 @@
#include "content/browser/renderer_host/dip_util.h"
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_base.h"
+#include "content/browser/renderer_host/render_widget_host_view_frame_subscriber.h"
#include "content/public/browser/gpu_data_manager.h"
#include "content/public/browser/render_view_host.h"
-#include "content/public/browser/render_widget_host_view_frame_subscriber.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/content_paths.h"
#include "content/public/common/content_switches.h"
@@ -250,9 +250,9 @@ class CompositingRenderWidgetHostViewBrowserTest
class FakeFrameSubscriber : public RenderWidgetHostViewFrameSubscriber {
public:
FakeFrameSubscriber(
- RenderWidgetHostViewFrameSubscriber::DeliverFrameCallback callback)
- : callback_(callback) {
- }
+ RenderWidgetHostViewFrameSubscriber::DeliverFrameCallback callback)
+ : callback_(callback),
+ source_id_for_copy_request_(base::UnguessableToken::Create()) {}
bool ShouldCaptureFrame(const gfx::Rect& damage_rect,
base::TimeTicks present_time,
@@ -271,8 +271,13 @@ class FakeFrameSubscriber : public RenderWidgetHostViewFrameSubscriber {
return true;
}
+ const base::UnguessableToken& GetSourceIdForCopyRequest() override {
+ return source_id_for_copy_request_;
+ }
+
private:
DeliverFrameCallback callback_;
+ base::UnguessableToken source_id_for_copy_request_;
};
// Disable tests for Android as it has an incomplete implementation.

Powered by Google App Engine
This is Rietveld 408576698