Use glFinish() before EGL context switch for ARM

ui/gl/gl_context_egl.cc

 // 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.
 
 #include "ui/gl/gl_context_egl.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "build/build_config.h"
@@ skipping 57 matching lines @@
 
     context_ = NULL;
   }
 }
 
 bool GLContextEGL::MakeCurrent(GLSurface* surface) {
   DCHECK(context_);
   if (IsCurrent(surface))
       return true;
 
-  TRACE_EVENT0("gpu", "GLContextEGL::MakeCurrent");
+  TRACE_EVENT2("gpu", "GLContextEGL::MakeCurrent",
+               "context", context_,
+               "surface", surface);
+
+  // Mali work-around: glFlush() does not synchronize between contexts
+  // chrome-os-partner:10068
+#if defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
+  if (eglGetCurrentContext() != NULL)
+    glFinish();
+#endif // defined(OS_CHROMEOS) && defined(ARCH_CPU_ARMEL)
 
   if (!eglMakeCurrent(display_,
                       surface->GetHandle(),
                       surface->GetHandle(),
                       context_)) {
     DVLOG(1) << "eglMakeCurrent failed with error "
              << GetLastEGLErrorString();
     return false;
   }
 
@@ skipping 62 matching lines @@
     return GLContext::GetExtensions();
 
   return GLContext::GetExtensions() + " " + extensions;
 }
 
 GLContextEGL::~GLContextEGL() {
   Destroy();
 }
 
 }  // namespace gfx