android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java - Issue 2738663003: Fix TODOs related to SDK 24

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

Issue 2738663003: Fix TODOs related to SDK 24 (Closed)

Patch Set: Keep mOffscreenPreRaster remain the same. Created 3 years, 9 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 side-by-side diff with in-line comments

« no previous file with comments | « android_webview/apk/java/proguard.flags ('k') | android_webview/java/src/org/chromium/android_webview/AwContents.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java

diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java

index 0ea08497cb7717c0143ce83d383b73c463d12917..99dd3fa6a44bfd75c01dad80f70ccc834f4d3ab5 100644

--- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java

+++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewChromium.java

@@ -63,7 +63,6 @@ import org.chromium.content_public.browser.NavigationHistory;

import java.io.BufferedWriter;

import java.io.File;

import java.lang.reflect.Field;

-import java.lang.reflect.Method;

import java.util.Map;

import java.util.concurrent.Callable;

@@ -1730,8 +1729,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate

mAwContents.onConfigurationChanged(newConfig);

}

- //TODO(hush): add override after release.

- //@Override

+ @Override

public boolean onDragEvent(final DragEvent event) {

mFactory.startYourEngines(false);

if (checkNeedsPost()) {

@@ -2213,15 +2211,7 @@ class WebViewChromium implements WebViewProvider, WebViewProvider.ScrollDelegate

@Override

public void super_startActivityForResult(Intent intent, int requestCode) {

- // TODO(hush): Use mWebViewPrivate.super_startActivityForResult

- // after N release. crbug.com/543272.

- try {

- Method startActivityForResultMethod =

- View.class.getMethod("startActivityForResult", Intent.class, int.class);

- startActivityForResultMethod.invoke(mWebView, intent, requestCode);

- } catch (Exception e) {

- throw new RuntimeException("Invalid reflection", e);

- }

+ mWebViewPrivate.super_startActivityForResult(intent, requestCode);

Torne 2017/03/10 15:53:42 This change caused crbug.com/699972 - this functio

boliu 2017/03/10 16:54:47 Huh, odd. How did this not throw an exception befo

}

@Override

« no previous file with comments | « android_webview/apk/java/proguard.flags ('k') | android_webview/java/src/org/chromium/android_webview/AwContents.java » ('j') | no next file with comments »