From 0187e9ec40dedb42a5278aa7bacbb3c571a6c787 Mon Sep 17 00:00:00 2001
From: Ben Murdoch <benm@google.com>
Date: Thu, 19 Nov 2009 18:14:53 +0000
Subject: [PATCH] Rename WebChromeClient.addMessageToConsole to
 WebChromeClient.onConsoleMessage. Do not merge.

BUG=b/2271636

This has already been submitted to eclair-mr2.

Change-Id: I81947f671f58be006ee3e1b30d73c6cb6cf2ebee
---
 api/current.xml                               | 34 +++++++++----------
 core/java/android/webkit/CallbackProxy.java   |  2 +-
 core/java/android/webkit/WebChromeClient.java |  6 ++--
 .../dumprendertree/TestShellActivity.java     |  2 +-
 4 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/api/current.xml b/api/current.xml
index cf997ce22d0c2..a60c3a1fb8c31 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -175159,23 +175159,6 @@
  visibility="public"
 >
 </constructor>
-<method name="addMessageToConsole"
- return="void"
- abstract="false"
- native="false"
- synchronized="false"
- static="false"
- final="false"
- deprecated="not deprecated"
- visibility="public"
->
-<parameter name="message" type="java.lang.String">
-</parameter>
-<parameter name="lineNumber" type="int">
-</parameter>
-<parameter name="sourceID" type="java.lang.String">
-</parameter>
-</method>
 <method name="getDefaultVideoPoster"
  return="android.graphics.Bitmap"
  abstract="false"
@@ -175224,6 +175207,23 @@
 <parameter name="window" type="android.webkit.WebView">
 </parameter>
 </method>
+<method name="onConsoleMessage"
+ return="void"
+ abstract="false"
+ native="false"
+ synchronized="false"
+ static="false"
+ final="false"
+ deprecated="not deprecated"
+ visibility="public"
+>
+<parameter name="message" type="java.lang.String">
+</parameter>
+<parameter name="lineNumber" type="int">
+</parameter>
+<parameter name="sourceID" type="java.lang.String">
+</parameter>
+</method>
 <method name="onCreateWindow"
  return="boolean"
  abstract="false"
diff --git a/core/java/android/webkit/CallbackProxy.java b/core/java/android/webkit/CallbackProxy.java
index f760b61f4715c..e9afcb63f7226 100644
--- a/core/java/android/webkit/CallbackProxy.java
+++ b/core/java/android/webkit/CallbackProxy.java
@@ -652,7 +652,7 @@ class CallbackProxy extends Handler {
                 String message = msg.getData().getString("message");
                 String sourceID = msg.getData().getString("sourceID");
                 int lineNumber = msg.getData().getInt("lineNumber");
-                mWebChromeClient.addMessageToConsole(message, lineNumber, sourceID);
+                mWebChromeClient.onConsoleMessage(message, lineNumber, sourceID);
                 break;
 
             case GET_VISITED_HISTORY:
diff --git a/core/java/android/webkit/WebChromeClient.java b/core/java/android/webkit/WebChromeClient.java
index c48444209f299..8ca4142cc7fe0 100644
--- a/core/java/android/webkit/WebChromeClient.java
+++ b/core/java/android/webkit/WebChromeClient.java
@@ -256,13 +256,13 @@ public class WebChromeClient {
     }
 
     /**
-     * Add a JavaScript error message to the console. Clients should override
-     * this to process the log message as they see fit.
+     * Report a JavaScript error message to the host application. The ChromeClient
+     * should override this to process the log message as they see fit.
      * @param message The error message to report.
      * @param lineNumber The line number of the error.
      * @param sourceID The name of the source file that caused the error.
      */
-    public void addMessageToConsole(String message, int lineNumber, String sourceID) {}
+    public void onConsoleMessage(String message, int lineNumber, String sourceID) {}
 
     /**
      * When not playing, video elements are represented by a 'poster' image. The
diff --git a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
index c084f8c53be39..aeb55b4499c92 100644
--- a/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
+++ b/tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java
@@ -638,7 +638,7 @@ public class TestShellActivity extends Activity implements LayoutTestController
         }
 
         @Override
-        public void addMessageToConsole(String message, int lineNumber,
+        public void onConsoleMessage(String message, int lineNumber,
                 String sourceID) {
             if (mConsoleMessages == null) {
                 mConsoleMessages = new StringBuffer();