summaryrefslogtreecommitdiffstats
path: root/gpu/gles2_conform_support
diff options
context:
space:
mode:
authorjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-09 07:56:25 +0000
committerjamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-09 07:56:25 +0000
commit3f0855c057b90feb3f77176d67d990d9e8d1097c (patch)
treea4b1bfca1cab915ab98c6e07702e809bed12e638 /gpu/gles2_conform_support
parente65e0b769b533835228a15cc9f2e7bd989f22908 (diff)
downloadchromium_src-3f0855c057b90feb3f77176d67d990d9e8d1097c.zip
chromium_src-3f0855c057b90feb3f77176d67d990d9e8d1097c.tar.gz
chromium_src-3f0855c057b90feb3f77176d67d990d9e8d1097c.tar.bz2
Move in process SignalQuery implementation to service side
R=sievers Review URL: https://codereview.chromium.org/26091002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227693 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gles2_conform_support')
-rw-r--r--gpu/gles2_conform_support/egl/display.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/gpu/gles2_conform_support/egl/display.cc b/gpu/gles2_conform_support/egl/display.cc
index 53a73a7..bcd1a34 100644
--- a/gpu/gles2_conform_support/egl/display.cc
+++ b/gpu/gles2_conform_support/egl/display.cc
@@ -123,8 +123,8 @@ EGLSurface Display::CreateWindowSurface(EGLConfig config,
gpu_scheduler_.reset(new gpu::GpuScheduler(command_buffer.get(),
decoder_.get(),
NULL));
- gpu_control_.reset(new gpu::GpuControlService(NULL, NULL,
- group->mailbox_manager()));
+ gpu_control_.reset(
+ new gpu::GpuControlService(NULL, NULL, group->mailbox_manager(), NULL));
decoder_->set_engine(gpu_scheduler_.get());
gfx::Size size(create_offscreen_width_, create_offscreen_height_);