diff options
-rw-r--r-- | api/current.xml | 20 | ||||
-rw-r--r-- | core/java/android/webkit/CallbackProxy.java | 2 | ||||
-rw-r--r-- | core/java/android/webkit/WebChromeClient.java | 6 | ||||
-rw-r--r-- | tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java | 2 |
4 files changed, 15 insertions, 15 deletions
diff --git a/api/current.xml b/api/current.xml index 3957b98..c3da81e 100644 --- a/api/current.xml +++ b/api/current.xml @@ -176269,8 +176269,8 @@ visibility="public" > </constructor> -<method name="addMessageToConsole" - return="void" +<method name="getDefaultVideoPoster" + return="android.graphics.Bitmap" abstract="false" native="false" synchronized="false" @@ -176279,15 +176279,11 @@ 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 name="window" type="android.webkit.WebView"> </parameter> </method> -<method name="getDefaultVideoPoster" - return="android.graphics.Bitmap" +<method name="onConsoleMessage" + return="void" abstract="false" native="false" synchronized="false" @@ -176331,7 +176327,11 @@ deprecated="not deprecated" visibility="public" > -<parameter name="window" type="android.webkit.WebView"> +<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" diff --git a/core/java/android/webkit/CallbackProxy.java b/core/java/android/webkit/CallbackProxy.java index 4a8e758..fb369d3 100644 --- a/core/java/android/webkit/CallbackProxy.java +++ b/core/java/android/webkit/CallbackProxy.java @@ -665,7 +665,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 dd494e1..f40b55c 100644 --- a/core/java/android/webkit/WebChromeClient.java +++ b/core/java/android/webkit/WebChromeClient.java @@ -257,13 +257,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 c084f8c..aeb55b4 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(); |