summaryrefslogtreecommitdiffstats
path: root/ui/gl
diff options
context:
space:
mode:
authorccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-17 00:01:03 +0000
committerccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-17 00:01:03 +0000
commit7d0d0ed9dac7a7c74a954ecec3c11446121423ec (patch)
treef295caa57da83dc241f828b7b684a45586350f8f /ui/gl
parenteb2a04f6dd16211e5238b99ecfcb57fe993cc9ae (diff)
downloadchromium_src-7d0d0ed9dac7a7c74a954ecec3c11446121423ec.zip
chromium_src-7d0d0ed9dac7a7c74a954ecec3c11446121423ec.tar.gz
chromium_src-7d0d0ed9dac7a7c74a954ecec3c11446121423ec.tar.bz2
Disable GPU memory usage workaround unconditionally.
This was previously disabled when running unit tests, but it looks like there are additional problems with WebViews, and potentially with switching in and out of compositing mode. TBR=zmo BUG=292655 Review URL: https://codereview.chromium.org/23757059 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@223480 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gl')
-rw-r--r--ui/gl/gl_surface_glx.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/gl/gl_surface_glx.cc b/ui/gl/gl_surface_glx.cc
index 10020d3..02e5a2a 100644
--- a/ui/gl/gl_surface_glx.cc
+++ b/ui/gl/gl_surface_glx.cc
@@ -390,6 +390,10 @@ bool GLSurfaceGLX::InitializeOneOff() {
base::MessageLoop::current() &&
base::MessageLoop::current()->type() == base::MessageLoop::TYPE_GPU;
+ // Disable this path because it is causing window contents to disappear.
+ // http://crbug.com/292655
+ g_create_child_windows = false;
+
if (g_create_child_windows)
g_display = base::MessagePumpX11::GetDefaultXDisplay();
else