diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-21 00:19:18 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-21 00:19:18 +0000 |
| commit | d6229dbfe5c2689f62613bd8c4faca34ff77f828 (patch) | |
| tree | 0605114a14fbd426dd6df9028c5931ad88c23357 /webkit/gpu | |
| parent | 6d5de1d3103b58bcc818b6c7759c75dacf48536d (diff) | |
| download | chromium_src-d6229dbfe5c2689f62613bd8c4faca34ff77f828.zip chromium_src-d6229dbfe5c2689f62613bd8c4faca34ff77f828.tar.gz chromium_src-d6229dbfe5c2689f62613bd8c4faca34ff77f828.tar.bz2 | |
Fix chromium-gpu layout tests.
GLInProcessContext was not setting the parent context.
Review URL: http://codereview.chromium.org/7205046
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89768 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/gpu')
| -rw-r--r-- | webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc index 68a3486..25597b4 100644 --- a/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc +++ b/webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.cc @@ -609,6 +609,12 @@ bool GLInProcessContext::Initialize(bool onscreen, return false; } + if (!gpu_scheduler_->SetParent(parent_.get() ? parent_->gpu_scheduler_ : NULL, + parent_texture_id_)) { + Destroy(); + return false; + } + command_buffer_->SetPutOffsetChangeCallback( NewCallback(this, &GLInProcessContext::PumpCommands)); |