Commit 4849f0cb authored by tobiasjs's avatar tobiasjs Committed by Commit bot

Move detachGLFunctor call before hardware teardown.

By not detaching the GL functor until after the teardown, we ran the
risk of stray draw calls occurring that could potentially reinitialize
the hardware renderer, causing the SharedRendererState destructor to
DCHECK.

BUG=

Review URL: https://codereview.chromium.org/920083002

Cr-Commit-Position: refs/heads/master@{#316222}
parent 3a1c9723
...@@ -2209,6 +2209,7 @@ public class AwContents implements SmartClipProvider { ...@@ -2209,6 +2209,7 @@ public class AwContents implements SmartClipProvider {
// draw functor destruction. // draw functor destruction.
@CalledByNative @CalledByNative
private void invalidateOnFunctorDestroy() { private void invalidateOnFunctorDestroy() {
mNativeGLDelegate.detachGLFunctor();
mContainerView.invalidate(); mContainerView.invalidate();
} }
...@@ -2566,7 +2567,6 @@ public class AwContents implements SmartClipProvider { ...@@ -2566,7 +2567,6 @@ public class AwContents implements SmartClipProvider {
} }
mScrollAccessibilityHelper.removePostedCallbacks(); mScrollAccessibilityHelper.removePostedCallbacks();
mNativeGLDelegate.detachGLFunctor();
} }
@Override @Override
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment