summaryrefslogtreecommitdiffstats
path: root/content/common
diff options
context:
space:
mode:
authorbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-05 01:22:43 +0000
committerbacker@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-05 01:22:43 +0000
commit99b409c55961ff08620d95022c53dae982b3faca (patch)
tree30c779119e24ac556cab61a0b2204b667ee17f91 /content/common
parent26bfd8fb52c08484dea77a1de65bd9a2595712ec (diff)
downloadchromium_src-99b409c55961ff08620d95022c53dae982b3faca.zip
chromium_src-99b409c55961ff08620d95022c53dae982b3faca.tar.gz
chromium_src-99b409c55961ff08620d95022c53dae982b3faca.tar.bz2
Fix --enable-partial-swap for Aura
The change in RWHVA in r111835 missed the PostSubBuffer path. Also added a minor change to ImageTransportSurfaceLinuxGLX to get rid of an invalid call to SwapBuffers. R=piman,sky BUG=none TEST=try --ui-enable-partial-swap --enable-partial-swap on aura with intel graphics on webkit.org/blog-files/3d-transforms/poster-circle.html; resize the window Review URL: http://codereview.chromium.org/8983029 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116433 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/common')
-rw-r--r--content/common/gpu/image_transport_surface_linux.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/content/common/gpu/image_transport_surface_linux.cc b/content/common/gpu/image_transport_surface_linux.cc
index 240629a..87a197d 100644
--- a/content/common/gpu/image_transport_surface_linux.cc
+++ b/content/common/gpu/image_transport_surface_linux.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -530,7 +530,8 @@ void GLXImageTransportSurface::OnResize(gfx::Size size) {
// Seems necessary to perform a swap after a resize
// in order to resize the front and back buffers (Intel driver bug).
// This doesn't always happen with scissoring enabled, so do it now.
- if (gfx::g_GLX_MESA_copy_sub_buffer)
+ if (gfx::g_GLX_MESA_copy_sub_buffer &&
+ gfx::GLSurface::GetCurrent() == this)
gfx::NativeViewGLSurfaceGLX::SwapBuffers();
needs_resize_ = true;
}