Move detachGLFunctor call before hardware teardown.

android_webview/java/src/org/chromium/android_webview/AwContents.java

 // Copyright 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.
 
 package org.chromium.android_webview;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.ComponentCallbacks2;
 import android.content.Context;
@@ skipping 2543 matching lines @@
             mContext.registerComponentCallbacks(mComponentCallbacks);
         }
 
         @Override
         public void onDetachedFromWindow() {
             if (isDestroyed()) return;
             if (!mIsAttachedToWindow) {
                 Log.w(TAG, "onDetachedFromWindow called when already detached. Ignoring");
                 return;
             }
+            mNativeGLDelegate.detachGLFunctor();

[boliu, 2015/02/12 19:42:43]

As discussed, this should be moved to invalidateOnFunctorDestroy. And you can
rename invalidateOnFunctorDestroy to something more sensible while you are at
it.

[boliu, 2015/02/13 01:33:28]

Since we might want to cherry-pick this back, do the rename in a follow up so
the cherry-pick is smaller.

+
             mIsAttachedToWindow = false;
             hideAutofillPopup();
             nativeOnDetachedFromWindow(mNativeAwContents);
 
             mContentViewCore.onDetachedFromWindow();
             updateHardwareAcceleratedFeaturesToggle();
 
             if (mComponentCallbacks != null) {
                 mContext.unregisterComponentCallbacks(mComponentCallbacks);
                 mComponentCallbacks = null;
             }
 
             mScrollAccessibilityHelper.removePostedCallbacks();
-            mNativeGLDelegate.detachGLFunctor();
         }
 
         @Override
         public void onWindowFocusChanged(boolean hasWindowFocus) {
             if (isDestroyed()) return;
             mWindowFocused = hasWindowFocus;
             mContentViewCore.onWindowFocusChanged(hasWindowFocus);
         }
 
         @Override
@@ skipping 173 matching lines @@
 
     private native void nativePreauthorizePermission(long nativeAwContents, String origin,
             long resources);
 
     private native void nativePostMessageToFrame(long nativeAwContents, String frameId,
             String message, String sourceOrigin, String targetOrigin, int[] msgPorts);
 
     private native void nativeCreateMessageChannel(long nativeAwContents,
             ValueCallback<MessagePort[]> callback);
 }