[Android WebView] Call RequestProcessGL on UI thread

android_webview/browser/in_process_view_renderer.cc

 // Copyright 2013 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 "android_webview/browser/in_process_view_renderer.h"
 
 #include <android/bitmap.h>
 
 #include "android_webview/browser/aw_gl_surface.h"
 #include "android_webview/browser/scoped_app_gl_state_restore.h"
@@ skipping 153 matching lines @@
 }
 
 ScopedAllowGL::~ScopedAllowGL() {
   allow_gl = false;
 }
 
 bool ScopedAllowGL::allow_gl = false;
 
 base::LazyInstance<GLViewRendererManager>::Leaky g_view_renderer_manager;
 
+void RequestProcessGLOnUIThread() {
+  if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
+    BrowserThread::PostTask(
+        BrowserThread::UI, FROM_HERE, base::Bind(&RequestProcessGLOnUIThread));
+    return;
+  }
+
+  InProcessViewRenderer* renderer = static_cast<InProcessViewRenderer*>(
+      g_view_renderer_manager.Get().GetMostRecentlyDrawn());
+  if (!renderer || !renderer->RequestProcessGL()) {
+    LOG(ERROR) << "Failed to request GL process. Deadlock likely: "
+               << !!renderer;
+  }
+}
+
 }  // namespace
 
 // Called from different threads!
 static void ScheduleGpuWork() {
   if (ScopedAllowGL::IsAllowed()) {
     gpu::InProcessCommandBuffer::ProcessGpuWorkOnCurrentThread();
   } else {
-    InProcessViewRenderer* renderer = static_cast<InProcessViewRenderer*>(
-        g_view_renderer_manager.Get().GetMostRecentlyDrawn());
-    if (!renderer || !renderer->RequestProcessGL()) {
-      LOG(ERROR) << "Failed to request DrawGL. Probably going to deadlock.";
-    }
+    RequestProcessGLOnUIThread();
   }
 }
 
 // static
 void BrowserViewRenderer::SetAwDrawSWFunctionTable(
     AwDrawSWFunctionTable* table) {
   g_sw_draw_functions = table;
   gpu::InProcessCommandBuffer::SetScheduleCallback(
       base::Bind(&ScheduleGpuWork));
 }
@@ skipping 580 matching lines @@
 
   // Unretained here is safe because the callback is cancelled when
   // |fallback_tick_| is destroyed.
   fallback_tick_.Reset(base::Bind(&InProcessViewRenderer::FallbackTickFired,
                                   base::Unretained(this)));
 
   // No need to reschedule fallback tick if compositor does not need to be
   // ticked. This can happen if this is reached because
   // invalidate_ignore_compositor is true.
   if (compositor_needs_continuous_invalidate_) {
-    base::MessageLoop::current()->PostDelayedTask(
+    BrowserThread::PostDelayedTask(
+        BrowserThread::UI,
         FROM_HERE,
         fallback_tick_.callback(),
         base::TimeDelta::FromMilliseconds(
             kFallbackTickTimeoutInMilliseconds));
   }
 }
 
 void InProcessViewRenderer::FallbackTickFired() {
   TRACE_EVENT1("android_webview",
                "InProcessViewRenderer::FallbackTickFired",
@@ skipping 62 matching lines @@
     base::StringAppendF(&str,
                         "surface width height: [%d %d] ",
                         draw_info->width,
                         draw_info->height);
     base::StringAppendF(&str, "is_layer: %d ", draw_info->is_layer);
   }
   return str;
 }
 
 }  // namespace android_webview