Skip to content

Commit

Permalink
[WebLayer] Keep a strong ref to embedder context.
Browse files Browse the repository at this point in the history
Remove WeakReference From BrowserImpl per feedback here:
https://chromium-review.googlesource.com/c/chromium/src/+/2174203/5/weblayer/browser/java/org/chromium/weblayer_private/BrowserFragmentImpl.java#35

Change-Id: I40c66c625ac7fea4b20801be435240673eced443
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2171495
Auto-Submit: Mugdha Lakhani <nator@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Commit-Queue: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#764782}
  • Loading branch information
Mugdha Lakhani authored and Commit Bot committed May 1, 2020
1 parent 10be3a9 commit f993220
Showing 1 changed file with 4 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import org.chromium.weblayer_private.interfaces.ObjectWrapper;
import org.chromium.weblayer_private.interfaces.StrictModeWorkaround;

import java.lang.ref.WeakReference;
import java.util.Arrays;
import java.util.List;

Expand All @@ -53,7 +52,7 @@ public class BrowserImpl extends IBrowser.Stub {

private long mNativeBrowser;
private final ProfileImpl mProfile;
private WeakReference<Context> mEmbedderActivityContext;
private Context mEmbedderActivityContext;
private BrowserViewController mViewController;
private FragmentWindowAndroid mWindowAndroid;
private IBrowserClient mClient;
Expand Down Expand Up @@ -124,7 +123,7 @@ private void createAttachmentState(
assert mWindowAndroid == null;
assert mEmbedderActivityContext == null;
mWindowAndroid = windowAndroid;
mEmbedderActivityContext = new WeakReference<Context>(embedderAppContext);
mEmbedderActivityContext = embedderAppContext;
mViewController = new BrowserViewController(windowAndroid);
mLocaleReceiver = new LocaleChangedBroadcastReceiver(windowAndroid.getContext().get());
mPasswordEchoEnabled = null;
Expand Down Expand Up @@ -257,9 +256,8 @@ private boolean getPasswordEchoEnabled() {
boolean getDarkThemeEnabled() {
if (mEmbedderActivityContext == null) return false;
if (mDarkThemeEnabled == null) {
Context embedderActivitycontext = mEmbedderActivityContext.get();
if (embedderActivitycontext == null) return false;
int uiMode = embedderActivitycontext.getResources().getConfiguration().uiMode;
if (mEmbedderActivityContext == null) return false;
int uiMode = mEmbedderActivityContext.getResources().getConfiguration().uiMode;
mDarkThemeEnabled =
(uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;
}
Expand Down

0 comments on commit f993220

Please sign in to comment.