| Chunk |
|---|
| Conflicting content |
|---|
*
* Load the url with postData using "POST" method into the WebView. If url
* is not a network url, it will be loaded with {link
* {@link #loadUrl(String)} instead.
<<<<<<< HEAD
*
* @param url The url of the resource to load.
* @param postData The data will be passed to "POST" request.
*
=======
*
* @param url The url of the resource to load.
* @param postData The data will be passed to "POST" request.
>>>>>>> 657c80b146f8d6319bf059f4aea2fce3b15a50b6
* @hide pending API solidification
*/
public void postUrl(String url, byte[] postData) { |
| Solution content |
|---|
* Load the url with postData using "POST" method into the WebView. If url
* is not a network url, it will be loaded with {link
* {@link #loadUrl(String)} instead.
*
* @param url The url of the resource to load.
* @param postData The data will be passed to "POST" request.
*
* @hide pending API solidification
*/
public void postUrl(String url, byte[] postData) { |
| File |
|---|
| WebView.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
"GET_SELECTION", // = 129;
"WEBKIT_DRAW", // = 130;
"SYNC_SCROLL", // = 131;
<<<<<<< HEAD
"POST_URL", // = 132;
=======
"REFRESH_PLUGINS", // = 132;
// this will replace REFRESH_PLUGINS in the next release
"POST_URL", // = 142;
>>>>>>> 657c80b146f8d6319bf059f4aea2fce3b15a50b6
"SPLIT_PICTURE_SET", // = 133;
"CLEAR_CONTENT", // = 134;
"SET_MOVE_MOUSE", // = 135; |
| Solution content |
|---|
"GET_SELECTION", // = 129;
"WEBKIT_DRAW", // = 130;
"SYNC_SCROLL", // = 131;
"POST_URL", // = 132;
"SPLIT_PICTURE_SET", // = 133;
"CLEAR_CONTENT", // = 134;
"SET_MOVE_MOUSE", // = 135; |
| File |
|---|
| WebViewCore.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Comment |
| Chunk |
|---|
| Conflicting content |
|---|
static final int GET_SELECTION = 129;
static final int WEBKIT_DRAW = 130;
static final int SYNC_SCROLL = 131;
<<<<<<< HEAD
static final int POST_URL = 132;
=======
static final int REFRESH_PLUGINS = 132;
// this will replace REFRESH_PLUGINS in the next release
static final int POST_URL = 142;
>>>>>>> 657c80b146f8d6319bf059f4aea2fce3b15a50b6
static final int SPLIT_PICTURE_SET = 133;
static final int CLEAR_CONTENT = 134;
|
| Solution content |
|---|
static final int GET_SELECTION = 129;
static final int WEBKIT_DRAW = 130;
static final int SYNC_SCROLL = 131;
static final int POST_URL = 132;
static final int SPLIT_PICTURE_SET = 133;
static final int CLEAR_CONTENT = 134;
|
| File |
|---|
| WebViewCore.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Attribute |
| Comment |