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

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

Issue 1903673003: [Merge M50] aw: Do not destroy functor in destroy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Created 4 years, 8 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.app.assist.AssistStructure.ViewNode; 9 import android.app.assist.AssistStructure.ViewNode;
10 import android.content.Context; 10 import android.content.Context;
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
454 } 454 }
455 455
456 // Make sure that we do not trigger any callbacks after destruction 456 // Make sure that we do not trigger any callbacks after destruction
457 mContentsClientAdapter.setWebChromeClient(null); 457 mContentsClientAdapter.setWebChromeClient(null);
458 mContentsClientAdapter.setWebViewClient(null); 458 mContentsClientAdapter.setWebViewClient(null);
459 mContentsClientAdapter.setPictureListener(null); 459 mContentsClientAdapter.setPictureListener(null);
460 mContentsClientAdapter.setFindListener(null); 460 mContentsClientAdapter.setFindListener(null);
461 mContentsClientAdapter.setDownloadListener(null); 461 mContentsClientAdapter.setDownloadListener(null);
462 462
463 mAwContents.destroy(); 463 mAwContents.destroy();
464 if (mGLfunctor != null) {
465 mGLfunctor.destroy();
466 mGLfunctor = null;
467 }
468 } 464 }
469 465
470 @Override 466 @Override
471 public void setNetworkAvailable(final boolean networkUp) { 467 public void setNetworkAvailable(final boolean networkUp) {
472 // Note that this purely toggles the JS navigator.online property. 468 // Note that this purely toggles the JS navigator.online property.
473 // It does not in affect chromium or network stack state in any way. 469 // It does not in affect chromium or network stack state in any way.
474 if (checkNeedsPost()) { 470 if (checkNeedsPost()) {
475 mRunQueue.addTask(new Runnable() { 471 mRunQueue.addTask(new Runnable() {
476 @Override 472 @Override
477 public void run() { 473 public void run() {
(...skipping 1888 matching lines...) Expand 10 before | Expand all | Expand 10 after
2366 mAwContents.extractSmartClipData(x, y, width, height); 2362 mAwContents.extractSmartClipData(x, y, width, height);
2367 } 2363 }
2368 2364
2369 // Implements SmartClipProvider 2365 // Implements SmartClipProvider
2370 @Override 2366 @Override
2371 public void setSmartClipResultHandler(final Handler resultHandler) { 2367 public void setSmartClipResultHandler(final Handler resultHandler) {
2372 checkThread(); 2368 checkThread();
2373 mAwContents.setSmartClipResultHandler(resultHandler); 2369 mAwContents.setSmartClipResultHandler(resultHandler);
2374 } 2370 }
2375 } 2371 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698