From c87c57661f672b34b2bbe8d53816810a3edf55e6 Mon Sep 17 00:00:00 2001 From: Anthony Restaino Date: Fri, 27 Mar 2015 20:55:48 -0400 Subject: [PATCH] Remove overdraw and stop blocking DOM storage (breaks sites) in incognito mode --- src/acr/browser/lightning/BrowserActivity.java | 1 + src/acr/browser/lightning/LightningView.java | 13 ++++--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/acr/browser/lightning/BrowserActivity.java b/src/acr/browser/lightning/BrowserActivity.java index b0eeb3d..dbaadad 100644 --- a/src/acr/browser/lightning/BrowserActivity.java +++ b/src/acr/browser/lightning/BrowserActivity.java @@ -157,6 +157,7 @@ public class BrowserActivity extends ActionBarActivity implements BrowserControl } mActivity = this; mClickHandler = new ClickHandler(this); + getWindow().setBackgroundDrawable(null); mBrowserFrame = (FrameLayout) findViewById(R.id.content_frame); mToolbarLayout = (LinearLayout) findViewById(R.id.toolbar_layout); mPageLayout = (LinearLayout) findViewById(R.id.main_layout); diff --git a/src/acr/browser/lightning/LightningView.java b/src/acr/browser/lightning/LightningView.java index 461016f..9628eb6 100644 --- a/src/acr/browser/lightning/LightningView.java +++ b/src/acr/browser/lightning/LightningView.java @@ -84,7 +84,9 @@ public class LightningView { mWebView.setFocusableInTouchMode(true); mWebView.setFocusable(true); mWebView.setAnimationCacheEnabled(false); - mWebView.setDrawingCacheEnabled(true); + mWebView.setDrawingCacheEnabled(false); + mWebView.setWillNotCacheDrawing(true); + mWebView.setAlwaysDrawnWithCacheEnabled(false); mWebView.setBackgroundColor(activity.getResources().getColor(android.R.color.white)); if (API > 15) { @@ -93,8 +95,6 @@ public class LightningView { } else if (mWebView.getRootView() != null) { mWebView.getRootView().setBackgroundDrawable(null); } - mWebView.setWillNotCacheDrawing(false); - mWebView.setAlwaysDrawnWithCacheEnabled(true); mWebView.setScrollbarFadingEnabled(true); mWebView.setSaveEnabled(true); mWebView.setWebChromeClient(new LightningChromeClient(activity)); @@ -366,12 +366,7 @@ public class LightningView { // We're in Incognito mode, reject settings.setMixedContentMode(WebSettings.MIXED_CONTENT_NEVER_ALLOW); } - // TODO - if (!mBrowserController.isIncognito()) { - settings.setDomStorageEnabled(true); - } else { - settings.setDomStorageEnabled(false); - } + settings.setDomStorageEnabled(true); settings.setAppCacheEnabled(true); settings.setCacheMode(WebSettings.LOAD_DEFAULT); settings.setDatabaseEnabled(true);