diff options
| author | boliu <boliu@chromium.org> | 2015-03-09 13:45:43 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-09 20:46:51 +0000 |
| commit | 7b41c6561705c1645d65313d116f35c582bd6247 (patch) | |
| tree | 95003b746d6f196a6abede82b1833428de1f7727 | |
| parent | 5f379e0e00068336aec9b4b78a49826b424152da (diff) | |
| download | chromium_src-7b41c6561705c1645d65313d116f35c582bd6247.zip chromium_src-7b41c6561705c1645d65313d116f35c582bd6247.tar.gz chromium_src-7b41c6561705c1645d65313d116f35c582bd6247.tar.bz2 | |
Move onConsoleMessage implementation to chromium layer
Simple move of small chucnk of code out of glue layer.
BUG=464491
Review URL: https://codereview.chromium.org/984273002
Cr-Commit-Position: refs/heads/master@{#319726}
2 files changed, 5 insertions, 5 deletions
diff --git a/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java b/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java index 08b877b..4528f4e 100644 --- a/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java +++ b/android_webview/glue/java/src/com/android/webview/chromium/WebViewContentsClientAdapter.java @@ -385,10 +385,6 @@ public class WebViewContentsClientAdapter extends AwContentsClient { if (mWebChromeClient != null) { if (TRACE) Log.d(TAG, "onConsoleMessage: " + consoleMessage.message()); result = mWebChromeClient.onConsoleMessage(consoleMessage); - String message = consoleMessage.message(); - if (result && message != null && message.startsWith("[blocked]")) { - Log.e(TAG, "Blocked URL: " + message); - } } else { result = false; } diff --git a/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java b/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java index 8a32cc5..156d90f 100644 --- a/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java +++ b/android_webview/java/src/org/chromium/android_webview/AwWebContentsDelegateAdapter.java @@ -117,8 +117,12 @@ class AwWebContentsDelegateAdapter extends AwWebContentsDelegate { break; } - return mContentsClient.onConsoleMessage( + boolean result = mContentsClient.onConsoleMessage( new ConsoleMessage(message, sourceId, lineNumber, messageLevel)); + if (result && message != null && message.startsWith("[blocked]")) { + Log.e(TAG, "Blocked URL: " + message); + } + return result; } @Override |