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

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura_unittest.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_aura_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
index e8e354dc1c796ea08bd906e97c8beffa6ac8392c..36665017959942e1c54fafe5935f6c485cf07446 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
@@ -43,6 +43,7 @@
#include "content/browser/renderer_host/render_widget_host_delegate.h"
#include "content/browser/renderer_host/render_widget_host_impl.h"
#include "content/browser/renderer_host/render_widget_host_view_event_handler.h"
+#include "content/browser/renderer_host/render_widget_host_view_frame_subscriber.h"
#include "content/browser/renderer_host/resize_lock.h"
#include "content/browser/renderer_host/text_input_manager.h"
#include "content/browser/web_contents/web_contents_view_aura.h"
@@ -52,7 +53,6 @@
#include "content/common/text_input_state.h"
#include "content/common/view_messages.h"
#include "content/public/browser/render_widget_host_view.h"
-#include "content/public/browser/render_widget_host_view_frame_subscriber.h"
#include "content/public/browser/web_contents_view_delegate.h"
#include "content/public/common/context_menu_params.h"
#include "content/public/test/mock_render_process_host.h"
@@ -269,7 +269,10 @@ class FakeSurfaceObserver : public cc::SurfaceObserver {
class FakeFrameSubscriber : public RenderWidgetHostViewFrameSubscriber {
public:
FakeFrameSubscriber(gfx::Size size, base::Callback<void(bool)> callback)
- : size_(size), callback_(callback), should_capture_(true) {}
+ : size_(size),
+ callback_(callback),
+ should_capture_(true),
+ source_id_for_copy_request_(base::UnguessableToken::Create()) {}
bool ShouldCaptureFrame(const gfx::Rect& damage_rect,
base::TimeTicks present_time,
@@ -285,6 +288,10 @@ class FakeFrameSubscriber : public RenderWidgetHostViewFrameSubscriber {
return true;
}
+ const base::UnguessableToken& GetSourceIdForCopyRequest() override {
+ return source_id_for_copy_request_;
+ }
+
base::TimeTicks last_present_time() const { return last_present_time_; }
void set_should_capture(bool should_capture) {
@@ -303,6 +310,7 @@ class FakeFrameSubscriber : public RenderWidgetHostViewFrameSubscriber {
base::Callback<void(bool)> callback_;
base::TimeTicks last_present_time_;
bool should_capture_;
+ base::UnguessableToken source_id_for_copy_request_;
};
class FakeWindowEventDispatcher : public aura::WindowEventDispatcher {

Powered by Google App Engine
This is Rietveld 408576698