From 7b41c6561705c1645d65313d116f35c582bd6247 Mon Sep 17 00:00:00 2001 From: boliu Date: Mon, 9 Mar 2015 13:45:43 -0700 Subject: 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} --- .../com/android/webview/chromium/WebViewContentsClientAdapter.java | 4 ---- .../org/chromium/android_webview/AwWebContentsDelegateAdapter.java | 6 +++++- 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 -- cgit v1.1