Transfer DrawGLFunctor ownership from AwContents to AwGLFunctor

android_webview/browser/render_thread_manager.cc

Index: android_webview/browser/render_thread_manager.cc
diff --git a/android_webview/browser/render_thread_manager.cc b/android_webview/browser/render_thread_manager.cc
index df7331a19a64058a3e1f9e0db7831fdbcff52cf8..db2fb83d2f0c2b56c8546f5319f14f45563ff1bf 100644
--- a/android_webview/browser/render_thread_manager.cc
+++ b/android_webview/browser/render_thread_manager.cc
@@ -144,7 +144,7 @@ void RenderThreadManager::ClientRequestDrawGLOnUI() {
   DCHECK(ui_loop_->BelongsToCurrentThread());
   ResetRequestDrawGLCallback();
   g_request_draw_gl_tracker.Get().SetQueuedFunctorOnUi(this);
-  if (!client_->RequestDrawGL(false)) {
+  if (!client_->RequestInvokeGL(false)) {

[boliu, 2016/04/20 16:49:09]

Hmm... this should *almost* never happen now. Should consider getting this thing
altogether. Ok for now though.

     g_request_draw_gl_tracker.Get().ResetPending();
     LOG(ERROR) << "Failed to request GL process. Deadlock likely";
   }
@@ -327,7 +327,7 @@ void RenderThreadManager::DeleteHardwareRendererOnUI() {
   // onTrimMemory will result in an unnecessary Render Thread DrawGL call.
   bool hardware_initialized = HasFrameOnUI();
   if (hardware_initialized) {
-    bool draw_functor_succeeded = client_->RequestDrawGL(true);
+    bool draw_functor_succeeded = client_->RequestInvokeGL(true);
     if (!draw_functor_succeeded) {
       LOG(ERROR) << "Unable to free GL resources. Has the Window leaked?";
       // Calling release on wrong thread intentionally.
@@ -349,7 +349,7 @@ void RenderThreadManager::DeleteHardwareRendererOnUI() {
 
   if (hardware_initialized) {
     // Flush any invoke functors that's caused by ReleaseHardware.
-    client_->RequestDrawGL(true);
+    client_->RequestInvokeGL(true);
   }
 }