Merge "Create WebViewDatabaseClassic from WebViewDatabase." into jb-dev (c6911d47) · Commits · e / os / android_frameworks_base

core/java/android/webkit/BrowserFrame.java

+5 −6

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@ class BrowserFrame extends Handler {
		private final CallbackProxy mCallbackProxy;
		private final WebSettingsClassic mSettings;
		private final Context mContext;
		private final WebViewDatabase mDatabase;
		private final WebViewDatabaseClassic mDatabase;
		private final WebViewCore mWebViewCore;
		/* package */ boolean mLoadInitFromJava;
		private int mLoadType;
		@@ -241,7 +241,7 @@ class BrowserFrame extends Handler {
		mSettings = settings;
		mContext = context;
		mCallbackProxy = proxy;
		mDatabase = WebViewDatabase.getInstance(appContext);
		mDatabase = WebViewDatabaseClassic.getInstance(appContext);
		mWebViewCore = w;

		mSearchBox = new SearchBoxImpl(mWebViewCore, mCallbackProxy);
		@@ -496,8 +496,8 @@ class BrowserFrame extends Handler {
		if (item != null) {
		WebAddress uri = new WebAddress(item.getUrl());
		String schemePlusHost = uri.getScheme() + uri.getHost();
		String[] up =
		mDatabase.getUsernamePassword(schemePlusHost);
		String[] up = mDatabase.getUsernamePassword(
		schemePlusHost);
		if (up != null && up[0] != null) {
		setUsernamePassword(up[0], up[1]);
		}
		@@ -809,8 +809,7 @@ class BrowserFrame extends Handler {
		// non-null username implies that user has
		// chosen to save password, so update the
		// recorded password
		mDatabase.setUsernamePassword(
		schemePlusHost, username, password);
		mDatabase.setUsernamePassword(schemePlusHost, username, password);
		}
		} else {
		// CallbackProxy will handle creating the resume

core/java/android/webkit/WebViewClassic.java

+8 −4

Original line number	Diff line number	Diff line
		@@ -701,7 +701,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
		// A final CallbackProxy shared by WebViewCore and BrowserFrame.
		private CallbackProxy mCallbackProxy;

		private WebViewDatabase mDatabase;
		private WebViewDatabaseClassic mDatabase;

		// SSL certificate for the main top-level page (if secure)
		private SslCertificate mCertificate;
		@@ -1230,7 +1230,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
		mViewManager = new ViewManager(this);
		L10nUtils.setApplicationContext(context.getApplicationContext());
		mWebViewCore = new WebViewCore(context, this, mCallbackProxy, javaScriptInterfaces);
		mDatabase = WebViewDatabase.getInstance(context);
		mDatabase = WebViewDatabaseClassic.getInstance(context);
		mScroller = new OverScroller(context, null, 0, 0, false); //TODO Use OverScroller's flywheel
		mZoomManager = new ZoomManager(this, mCallbackProxy);

		@@ -1294,6 +1294,11 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
		public WebStorage getWebStorage() {
		return WebStorageClassic.getInstance();
		}

		@Override
		public WebViewDatabase getWebViewDatabase(Context context) {
		return WebViewDatabaseClassic.getInstance(context);
		}
		}

		private void onHandleUiEvent(MotionEvent event, int eventType, int flags) {
		@@ -7192,8 +7197,7 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc
		break;
		}
		case NEVER_REMEMBER_PASSWORD: {
		mDatabase.setUsernamePassword(
		msg.getData().getString("host"), null, null);
		mDatabase.setUsernamePassword(msg.getData().getString("host"), null, null);
		((Message) msg.obj).sendToTarget();
		break;
		}