Index: ui/android/java/src/org/chromium/ui/base/WindowAndroid.java |
diff --git a/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java b/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java |
index 3d775de11c9f19e5be9260380f87fbb609a9f2fa..658d0be820dbdaa253e175e23c8a11e75b54bfd4 100644 |
--- a/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java |
+++ b/ui/android/java/src/org/chromium/ui/base/WindowAndroid.java |
@@ -77,6 +77,8 @@ public class WindowAndroid { |
protected Context mApplicationContext; |
protected SparseArray<IntentCallback> mOutstandingIntents; |
+ // We use a weak reference here to prevent this from leaking in WebView. |
+ private WeakReference<Context> mContextRef; |
// Ideally, this would be a SparseArray<String>, but there's no easy way to store a |
// SparseArray<String> in a bundle during saveInstanceState(). So we use a HashMap and suppress |
@@ -136,13 +138,20 @@ public class WindowAndroid { |
*/ |
@SuppressLint("UseSparseArrays") |
public WindowAndroid(Context context) { |
- assert context == context.getApplicationContext(); |
- mApplicationContext = context; |
+ mApplicationContext = context.getApplicationContext(); |
+ // context does not have the same lifetime guarantees as an application context so we can't |
+ // hold a strong reference to it. |
+ mContextRef = new WeakReference<Context>(context); |
mOutstandingIntents = new SparseArray<IntentCallback>(); |
mIntentErrors = new HashMap<Integer, String>(); |
mVSyncMonitor = new VSyncMonitor(context, mVSyncListener); |
- mAccessibilityManager = (AccessibilityManager) |
- context.getSystemService(Context.ACCESSIBILITY_SERVICE); |
+ mAccessibilityManager = (AccessibilityManager) mApplicationContext.getSystemService( |
+ Context.ACCESSIBILITY_SERVICE); |
+ } |
+ |
+ @CalledByNative |
+ private static WindowAndroid createForTesting(Context context) { |
+ return new WindowAndroid(context); |
} |
/** |
@@ -584,6 +593,16 @@ public class WindowAndroid { |
} |
/** |
+ * Getter for the current context (not necessarily the application context). |
+ * Make no assumptions regarding what type of Context is returned here, it could be for example |
+ * an Activity or a Context created specifically to target an external display. |
+ */ |
+ public WeakReference<Context> getContext() { |
+ // Return a new WeakReference to prevent clients from releasing our internal WeakReference. |
+ return new WeakReference<Context>(mContextRef.get()); |
+ } |
+ |
+ /** |
* Update whether the placeholder is 'drawn' based on whether an animation is running |
* or touch exploration is enabled - if either of those are true, we call |
* setWillNotDraw(false) to ensure that the animation is drawn over the SurfaceView, |