Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename PostMessageToMainFrame to PostWebMessage" into mnc-dev

Browse Source
This commit is contained in:
Selim Gurun
2015-05-15 18:47:43 +00:00
committed by Android (Google) Code Review
parent 2cc4a4755f 26de90aa2e
commit afabc21722
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.txt
View File

@@ -39076,9 +39076,9 @@ package android.webkit {
method public boolean pageDown(boolean);
method public boolean pageUp(boolean);
method public void pauseTimers();
method public void postMessageToMainFrame(android.webkit.WebMessage, android.net.Uri);
method public void postUrl(java.lang.String, byte[]);
method public void postVisualStateCallback(long, android.webkit.WebView.VisualStateCallback);
method public void postWebMessage(android.webkit.WebMessage, android.net.Uri);
method public void reload();
method public void removeJavascriptInterface(java.lang.String);
method public void requestFocusNodeHref(android.os.Message);

2
api/system-current.txt
View File

@@ -41416,9 +41416,9 @@ package android.webkit {
method public boolean pageDown(boolean);
method public boolean pageUp(boolean);
method public void pauseTimers();
method public void postMessageToMainFrame(android.webkit.WebMessage, android.net.Uri);
method public void postUrl(java.lang.String, byte[]);
method public void postVisualStateCallback(long, android.webkit.WebView.VisualStateCallback);
method public void postWebMessage(android.webkit.WebMessage, android.net.Uri);
method public void reload();
method public void removeJavascriptInterface(java.lang.String);
method public void requestFocusNodeHref(android.os.Message);

2
core/java/android/webkit/WebView.java
View File

@@ -1863,7 +1863,7 @@ public class WebView extends AbsoluteLayout
* practices, the user should not specify a wildcard (*) when
* specifying the origin.
*/
public void postMessageToMainFrame(WebMessage message, Uri targetOrigin) {
public void postWebMessage(WebMessage message, Uri targetOrigin) {
checkThread();
mProvider.postMessageToMainFrame(message, targetOrigin);
}