Index: content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java |
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java |
index 97a72d57e7b2640f1491f85086cd13a52475c000..aa5956950fb1d677ff1cc82fe91b35127d6515a9 100644 |
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java |
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java |
@@ -535,7 +535,7 @@ public class ContentViewCore implements MotionEventDelegate { |
mImeAdapter = createImeAdapter(mContext); |
mKeyboardConnected = mContainerView.getResources().getConfiguration().keyboard |
!= Configuration.KEYBOARD_NOKEYS; |
- mVSyncMonitor = new VSyncMonitor(mContext, mContainerView, mVSyncListener); |
+ mVSyncMonitor = new VSyncMonitor(mContext, mVSyncListener); |
TraceEvent.end(); |
} |
@@ -588,12 +588,12 @@ public class ContentViewCore implements MotionEventDelegate { |
*/ |
public void destroy() { |
hidePopupDialog(); |
+ if (mVSyncMonitor != null) mVSyncMonitor.unregisterListener(); |
if (mNativeContentViewCore != 0) { |
nativeOnJavaContentViewCoreDestroyed(mNativeContentViewCore); |
} |
mNativeContentViewCore = 0; |
mContentSettings = null; |
- mVSyncMonitor.stop(); |
} |
/** |