diff options
| author | hubbe@chromium.org <hubbe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-01 11:01:43 +0000 |
|---|---|---|
| committer | hubbe@chromium.org <hubbe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-01 11:01:43 +0000 |
| commit | bbbc5ed9a8101520f261cf4ac9970d51f31db560 (patch) | |
| tree | 1a67ed8498e0f3c612b7a3e32265db5604ef83b5 /webkit/common | |
| parent | 358b31dc3ab1dd0da65a041fb346e6cfee48d613 (diff) | |
| download | chromium_src-bbbc5ed9a8101520f261cf4ac9970d51f31db560.zip chromium_src-bbbc5ed9a8101520f261cf4ac9970d51f31db560.tar.gz chromium_src-bbbc5ed9a8101520f261cf4ac9970d51f31db560.tar.bz2 | |
Fixing gpu_ipc_browsertests.cc
(Turns out they were not running before.)
Review URL: https://chromiumcodereview.appspot.com/17904008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@209404 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/common')
| -rw-r--r-- | webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc | 5 | ||||
| -rw-r--r-- | webkit/common/gpu/webkit_gpu.gyp | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc index 203ffac..c193946 100644 --- a/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc +++ b/webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc @@ -1237,7 +1237,10 @@ void WebGraphicsContext3DInProcessCommandBufferImpl::signalSyncPoint( // Take ownership of the callback. context_->SignalSyncPoint( sync_point, base::Bind(&OnSignalSyncPoint, base::Owned(callback))); - // Stick something in the command buffer. + // Make sure we have something to flush, or shallowFlushCHROMIUM() + // doesn't do anything. + gl_->helper()->Noop(1); + // This fill force PumpCommands() to run which is what triggers the signal. shallowFlushCHROMIUM(); } diff --git a/webkit/common/gpu/webkit_gpu.gyp b/webkit/common/gpu/webkit_gpu.gyp index 37aec39..72bfd93 100644 --- a/webkit/common/gpu/webkit_gpu.gyp +++ b/webkit/common/gpu/webkit_gpu.gyp @@ -16,6 +16,7 @@ 'dependencies': [ '<(DEPTH)/base/base.gyp:base', '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', + '<(DEPTH)/gpu/command_buffer/command_buffer.gyp:gles2_utils', '<(DEPTH)/gpu/gpu.gyp:command_buffer_service', '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', |