Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(176)

Side by Side Diff: android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java

Issue 2298093008: android webview: Upstream android 7 glue layer (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 package com.android.webview.chromium; 5 package com.android.webview.chromium;
6 6
7 import android.annotation.SuppressLint; 7 import android.annotation.SuppressLint;
8 import android.annotation.TargetApi; 8 import android.annotation.TargetApi;
9 import android.content.Context; 9 import android.content.Context;
10 import android.content.Intent; 10 import android.content.Intent;
(...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 107
108 private static boolean sRecordWholeDocumentEnabledByApi = false; 108 private static boolean sRecordWholeDocumentEnabledByApi = false;
109 static void enableSlowWholeDocumentDraw() { 109 static void enableSlowWholeDocumentDraw() {
110 sRecordWholeDocumentEnabledByApi = true; 110 sRecordWholeDocumentEnabledByApi = true;
111 } 111 }
112 112
113 // This does not touch any global / non-threadsafe state, but note that 113 // This does not touch any global / non-threadsafe state, but note that
114 // init is ofter called right after and is NOT threadsafe. 114 // init is ofter called right after and is NOT threadsafe.
115 public WebViewChromium(WebViewChromiumFactoryProvider factory, WebView webVi ew, 115 public WebViewChromium(WebViewChromiumFactoryProvider factory, WebView webVi ew,
116 WebView.PrivateAccess webViewPrivate, boolean shouldDisableThreadChe cking) { 116 WebView.PrivateAccess webViewPrivate, boolean shouldDisableThreadChe cking) {
117 WebViewChromiumFactoryProvider.checkStorageIsNotDeviceProtected(webView. getContext());
117 mWebView = webView; 118 mWebView = webView;
118 mWebViewPrivate = webViewPrivate; 119 mWebViewPrivate = webViewPrivate;
119 mHitTestResult = new WebView.HitTestResult(); 120 mHitTestResult = new WebView.HitTestResult();
120 mContext = ResourcesContextWrapperFactory.get(mWebView.getContext()); 121 mContext = ResourcesContextWrapperFactory.get(mWebView.getContext());
121 mAppTargetSdkVersion = mContext.getApplicationInfo().targetSdkVersion; 122 mAppTargetSdkVersion = mContext.getApplicationInfo().targetSdkVersion;
122 mFactory = factory; 123 mFactory = factory;
123 mShouldDisableThreadChecking = shouldDisableThreadChecking; 124 mShouldDisableThreadChecking = shouldDisableThreadChecking;
124 factory.getWebViewDelegate().addWebViewAssetPath(mWebView.getContext()); 125 factory.getWebViewDelegate().addWebViewAssetPath(mWebView.getContext());
125 } 126 }
126 127
(...skipping 2134 matching lines...) Expand 10 before | Expand all | Expand 10 after
2261 mAwContents.extractSmartClipData(x, y, width, height); 2262 mAwContents.extractSmartClipData(x, y, width, height);
2262 } 2263 }
2263 2264
2264 // Implements SmartClipProvider 2265 // Implements SmartClipProvider
2265 @Override 2266 @Override
2266 public void setSmartClipResultHandler(final Handler resultHandler) { 2267 public void setSmartClipResultHandler(final Handler resultHandler) {
2267 checkThread(); 2268 checkThread();
2268 mAwContents.setSmartClipResultHandler(resultHandler); 2269 mAwContents.setSmartClipResultHandler(resultHandler);
2269 } 2270 }
2270 } 2271 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698