Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0187e9ec authored by Ben Murdoch's avatar Ben Murdoch Committed by Steve Block
Browse files

Rename WebChromeClient.addMessageToConsole to WebChromeClient.onConsoleMessage. Do not merge. 

BUG=b/2271636

This has already been submitted to eclair-mr2.

Change-Id: I81947f671f58be006ee3e1b30d73c6cb6cf2ebee
parent 545a2a12

api/current.xml

+16 −16
Original line number Diff line number Diff line
@@ -175159,8 +175159,8 @@ 
 visibility="public"

>

</constructor>

<method name="addMessageToConsole"

 return="void"

<method name="getDefaultVideoPoster"

 return="android.graphics.Bitmap"

 abstract="false"

 native="false"

 synchronized="false"
@@ -175169,15 +175169,9 @@ 
 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"

<method name="getVideoLoadingProgressView"

 return="android.view.View"

 abstract="false"

 native="false"

 synchronized="false"
@@ -175187,8 +175181,8 @@ 
 visibility="public"

>

</method>

<method name="getVideoLoadingProgressView"

 return="android.view.View"

<method name="getVisitedHistory"

 return="void"

 abstract="false"

 native="false"

 synchronized="false"
@@ -175197,8 +175191,10 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="callback" type="android.webkit.ValueCallback&lt;java.lang.String[]&gt;">

</parameter>

</method>

<method name="getVisitedHistory"

<method name="onCloseWindow"

 return="void"

 abstract="false"

 native="false"
@@ -175208,10 +175204,10 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="callback" type="android.webkit.ValueCallback&lt;java.lang.String[]&gt;">

<parameter name="window" type="android.webkit.WebView">

</parameter>

</method>

<method name="onCloseWindow"

<method name="onConsoleMessage"

 return="void"

 abstract="false"

 native="false"
@@ -175221,7 +175217,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"

core/java/android/webkit/CallbackProxy.java

+1 −1
Original line number Diff line number Diff line
@@ -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:

core/java/android/webkit/WebChromeClient.java

+3 −3
Original line number Diff line number Diff line
@@ -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

tests/DumpRenderTree/src/com/android/dumprendertree/TestShellActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -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();