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

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

Issue 2197433002: Revert of aw: Fix FactoryProvider threading (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 destroy(); 195 destroy();
196 } 196 }
197 } 197 }
198 }); 198 });
199 } 199 }
200 200
201 private void initForReal() { 201 private void initForReal() {
202 AwContentsStatics.setRecordFullDocument(sRecordWholeDocumentEnabledByApi 202 AwContentsStatics.setRecordFullDocument(sRecordWholeDocumentEnabledByApi
203 || mAppTargetSdkVersion < Build.VERSION_CODES.LOLLIPOP); 203 || mAppTargetSdkVersion < Build.VERSION_CODES.LOLLIPOP);
204 204
205 mAwContents = new AwContents(mFactory.getBrowserContextOnUiThread(), mWe bView, mContext, 205 mAwContents = new AwContents(mFactory.getBrowserContext(), mWebView, mCo ntext,
206 new InternalAccessAdapter(), new WebViewNativeDrawGLFunctorFacto ry(), 206 new InternalAccessAdapter(), new WebViewNativeDrawGLFunctorFacto ry(),
207 mContentsClientAdapter, mWebSettings.getAwSettings()); 207 mContentsClientAdapter, mWebSettings.getAwSettings());
208 208
209 if (mAppTargetSdkVersion >= Build.VERSION_CODES.KITKAT) { 209 if (mAppTargetSdkVersion >= Build.VERSION_CODES.KITKAT) {
210 // On KK and above, favicons are automatically downloaded as the met hod 210 // On KK and above, favicons are automatically downloaded as the met hod
211 // old apps use to enable that behavior is deprecated. 211 // old apps use to enable that behavior is deprecated.
212 AwContents.setShouldDownloadFavicons(); 212 AwContents.setShouldDownloadFavicons();
213 } 213 }
214 214
215 if (mAppTargetSdkVersion < Build.VERSION_CODES.LOLLIPOP) { 215 if (mAppTargetSdkVersion < Build.VERSION_CODES.LOLLIPOP) {
(...skipping 2011 matching lines...) Expand 10 before | Expand all | Expand 10 after
2227 mAwContents.extractSmartClipData(x, y, width, height); 2227 mAwContents.extractSmartClipData(x, y, width, height);
2228 } 2228 }
2229 2229
2230 // Implements SmartClipProvider 2230 // Implements SmartClipProvider
2231 @Override 2231 @Override
2232 public void setSmartClipResultHandler(final Handler resultHandler) { 2232 public void setSmartClipResultHandler(final Handler resultHandler) {
2233 checkThread(); 2233 checkThread();
2234 mAwContents.setSmartClipResultHandler(resultHandler); 2234 mAwContents.setSmartClipResultHandler(resultHandler);
2235 } 2235 }
2236 } 2236 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698