aw: Do not assume functor will be called 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 25 matching lines @@
 
 using base::android::AttachCurrentThread;
 using base::android::JavaRef;
 using base::android::ScopedJavaLocalRef;
 using content::BrowserThread;
 
 namespace android_webview {
 
 namespace {
 
-
 const void* kUserDataKey = &kUserDataKey;
 
 class UserData : public content::WebContents::Data {
  public:
   UserData(InProcessViewRenderer* ptr) : instance_(ptr) {}
   virtual ~UserData() {
     instance_->WebContentsGone();
   }
 
   static InProcessViewRenderer* GetInstance(content::WebContents* contents) {
@@ skipping 75 matching lines @@
       switches::kDisableWebViewGLMode);
   return g_hw_enabled;
 }
 
 // Provides software rendering functions from the Android glue layer.
 // Allows preventing extra copies of data when rendering.
 AwDrawSWFunctionTable* g_sw_draw_functions = NULL;
 
 const int64 kFallbackTickTimeoutInMilliseconds = 20;
 
-
 // Used to calculate memory and resource allocation. Determined experimentally.
 size_t g_memory_multiplier = 10;
 size_t g_num_gralloc_limit = 150;
 const size_t kBytesPerPixel = 4;
 const size_t kMemoryAllocationStep = 5 * 1024 * 1024;
 
+base::LazyInstance<GLViewRendererManager>::Leaky g_view_renderer_manager =
+    LAZY_INSTANCE_INITIALIZER;
+
 class ScopedAllowGL {
  public:
   ScopedAllowGL();
   ~ScopedAllowGL();
 
   static bool IsAllowed() {
-    return BrowserThread::CurrentlyOn(BrowserThread::UI) && allow_gl;
+    return g_view_renderer_manager.Get().OnRenderThread() && allow_gl;
   }
 
  private:
   static bool allow_gl;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedAllowGL);
 };
 
 ScopedAllowGL::ScopedAllowGL() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DCHECK(g_view_renderer_manager.Get().OnRenderThread());
   DCHECK(!allow_gl);
   allow_gl = true;
 }
 
 ScopedAllowGL::~ScopedAllowGL() {
   allow_gl = false;
 }
 
 bool ScopedAllowGL::allow_gl = false;
 
-base::LazyInstance<GLViewRendererManager>::Leaky g_view_renderer_manager =
-    LAZY_INSTANCE_INITIALIZER;
-
 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()) {
@@ skipping 909 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