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

Unified Diff: content/common/gpu/gpu_channel_test_common.h

Issue 1365563002: Make channel preemption not require view contexts for hookup (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wakeup_gpu
Patch Set: rebase Created 5 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
« no previous file with comments | « content/common/gpu/gpu_channel_manager_unittest.cc ('k') | content/common/gpu/gpu_channel_test_common.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/gpu_channel_test_common.h
diff --git a/content/common/gpu/gpu_channel_test_common.h b/content/common/gpu/gpu_channel_test_common.h
index be4109bd0dfd97a3afb69765de5d9844dd160d50..dd95f174cdfd55967c400667a01d101fd110cfc2 100644
--- a/content/common/gpu/gpu_channel_test_common.h
+++ b/content/common/gpu/gpu_channel_test_common.h
@@ -33,10 +33,9 @@ class TestGpuChannelManager : public GpuChannelManager {
protected:
scoped_ptr<GpuChannel> CreateGpuChannel(
- gfx::GLShareGroup* share_group,
- gpu::gles2::MailboxManager* mailbox_manager,
int client_id,
uint64_t client_tracing_id,
+ bool preempts,
bool allow_future_sync_points,
bool allow_real_time_streams) override;
@@ -50,6 +49,7 @@ class TestGpuChannel : public GpuChannel {
GpuChannelManager* gpu_channel_manager,
gfx::GLShareGroup* share_group,
gpu::gles2::MailboxManager* mailbox_manager,
+ gpu::PreemptionFlag* preempting_flag,
base::SingleThreadTaskRunner* task_runner,
base::SingleThreadTaskRunner* io_task_runner,
int client_id,
« no previous file with comments | « content/common/gpu/gpu_channel_manager_unittest.cc ('k') | content/common/gpu/gpu_channel_test_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698