summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSelim Gurun <sgurun@google.com>2015-05-15 11:02:45 -0700
committerSelim Gurun <sgurun@google.com>2015-05-15 11:02:45 -0700
commit26de90aa2e2b2de10f489511038e119af331ca02 (patch)
tree7a1ffd665336dfebb376888d513c733006515940
parentb3fa8bf221c239ebce7f5cdfd33dadcda9f137b3 (diff)
downloadframeworks_base-26de90aa2e2b2de10f489511038e119af331ca02.zip
frameworks_base-26de90aa2e2b2de10f489511038e119af331ca02.tar.gz
frameworks_base-26de90aa2e2b2de10f489511038e119af331ca02.tar.bz2
Rename PostMessageToMainFrame to PostWebMessage
Bug: 20557074 There is no need to keep the name PostMessageToMainFrame since we may choose to not implement the special condition to posting to a named subframe. And if we want, we can do this by overloading the function. Change-Id: I9896ad479e1c30cda500352cfdb1b7d336383568
-rw-r--r--api/current.txt2
-rw-r--r--api/system-current.txt2
-rw-r--r--core/java/android/webkit/WebView.java2
3 files changed, 3 insertions, 3 deletions
diff --git a/api/current.txt b/api/current.txt
index 27f3eff..c5ee418 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -39080,9 +39080,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);
diff --git a/api/system-current.txt b/api/system-current.txt
index ff42705c..0093a34 100644
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -41420,9 +41420,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);
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index 92615f3..ccb98b4 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -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);
}