summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer
diff options
context:
space:
mode:
authorthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-08 22:13:06 +0000
committerthakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-08 22:13:06 +0000
commitcfb73d625665af4f863c6f58205b4f1664b3f5c8 (patch)
tree6703b611ff9f1027bf214346275810274c453af6 /gpu/command_buffer
parent389262f15e7bf3b4792ced6c73efc95aeee602b0 (diff)
downloadchromium_src-cfb73d625665af4f863c6f58205b4f1664b3f5c8.zip
chromium_src-cfb73d625665af4f863c6f58205b4f1664b3f5c8.tar.gz
chromium_src-cfb73d625665af4f863c6f58205b4f1664b3f5c8.tar.bz2
Mac: Fix resizing of composited background tabs.
BUG=54842 TEST=Have an composited tab be a background tab. Resize window larger. Switch to composited tab. It should have the new size. Review URL: http://codereview.chromium.org/3528019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62026 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/command_buffer')
-rw-r--r--gpu/command_buffer/service/gpu_processor_mac.cc6
1 files changed, 6 insertions, 0 deletions
diff --git a/gpu/command_buffer/service/gpu_processor_mac.cc b/gpu/command_buffer/service/gpu_processor_mac.cc
index 19d2734..97b38a4 100644
--- a/gpu/command_buffer/service/gpu_processor_mac.cc
+++ b/gpu/command_buffer/service/gpu_processor_mac.cc
@@ -67,8 +67,14 @@ void GPUProcessor::Destroy() {
}
uint64 GPUProcessor::SetWindowSizeForIOSurface(const gfx::Size& size) {
+ // This is called from an IPC handler, so it's undefined which context is
+ // current. Make sure the right one is.
+ decoder_->GetGLContext()->MakeCurrent();
+
ResizeOffscreenFrameBuffer(size);
decoder_->UpdateOffscreenFrameBufferSize();
+
+ // Note: The following line changes the current context again.
return surface_->SetSurfaceSize(size);
}