Version 1.2.0-dev.5.4
Run tools/dom/scripts/go.sh on trunk.
R=ricow@google.com
Review URL: https://codereview.chromium.org//163553002
git-svn-id: http://dart.googlecode.com/svn/trunk@32653 260f80e4-7a28-3924-810f-c04153c831b5
diff --git a/sdk/lib/html/dart2js/html_dart2js.dart b/sdk/lib/html/dart2js/html_dart2js.dart
index 06fd6fb..729b216 100644
--- a/sdk/lib/html/dart2js/html_dart2js.dart
+++ b/sdk/lib/html/dart2js/html_dart2js.dart
@@ -14612,17 +14612,6 @@
*
* This is similar to [request] but specialized for HTTP GET requests which
* return text content.
- *
- * To add query parameters, append them to the [url] following a `?`,
- * joining each key to its value with `=` and separating key-value pairs with
- * `&`.
- *
- * var name = Uri.encodeQueryComponent('John');
- * var id = Uri.encodeQueryComponent('42');
- * HttpRequest.getString('users.json?name=$name&id=$id')
- * .then((HttpRequest resp) {
- * // Do something with the response.
- * });
*
* See also:
*
@@ -14641,20 +14630,6 @@
* to sending a FormData object with broader browser support but limited to
* String values.
*
- * If [data] is supplied, the key/value pairs are URI encoded with
- * [Uri.encodeQueryComponent] and converted into an HTTP query string.
- *
- * Unless otherwise specified, this method appends the following header:
- *
- * Content-Type: application/x-www-form-urlencoded; charset=UTF-8
- *
- * Here's an example of using this method:
- *
- * var data = { 'firstName' : 'John', 'lastName' : 'Doe' };
- * HttpRequest.postFormData('/send', data).then((HttpRequest resp) {
- * // Do something with the response.
- * });
- *
* See also:
*
* * [request]
@@ -14706,25 +14681,6 @@
* * The `Access-Control-Allow-Credentials` header of `url` must be set to true.
* * If `Access-Control-Expose-Headers` has not been set to true, only a subset of all the response headers will be returned when calling [getAllRequestHeaders].
*
- *
- * The following is equivalent to the [getString] sample above:
- *
- * var name = Uri.encodeQueryComponent('John');
- * var id = Uri.encodeQueryComponent('42');
- * HttpRequest.request('users.json?name=$name&id=$id')
- * .then((HttpRequest resp) {
- * // Do something with the response.
- * });
- *
- * Here's an example of submitting an entire form with [FormData].
- *
- * var myForm = querySelector('form#myForm');
- * var data = new FormData(myForm);
- * HttpRequest.request('/submit', method: 'POST', sendData: data)
- * .then((HttpRequest resp) {
- * // Do something with the response.
- * });
- *
* Note that requests for file:// URIs are only supported by Chrome extensions
* with appropriate permissions in their manifest. Requests to file:// URIs
* will also never fail- the Future will always complete successfully, even
diff --git a/sdk/lib/html/dartium/html_dartium.dart b/sdk/lib/html/dartium/html_dartium.dart
index 7a17fb6..dd2ad02 100644
--- a/sdk/lib/html/dartium/html_dartium.dart
+++ b/sdk/lib/html/dartium/html_dartium.dart
@@ -28922,13 +28922,13 @@
if ((blob_OR_source_OR_stream is Blob || blob_OR_source_OR_stream == null)) {
return _createObjectURL_1(blob_OR_source_OR_stream);
}
- if ((blob_OR_source_OR_stream is MediaStream || blob_OR_source_OR_stream == null)) {
+ if ((blob_OR_source_OR_stream is MediaSource || blob_OR_source_OR_stream == null)) {
return _createObjectURL_2(blob_OR_source_OR_stream);
}
- if ((blob_OR_source_OR_stream is MediaSource || blob_OR_source_OR_stream == null)) {
+ if ((blob_OR_source_OR_stream is _WebKitMediaSource || blob_OR_source_OR_stream == null)) {
return _createObjectURL_3(blob_OR_source_OR_stream);
}
- if ((blob_OR_source_OR_stream is _WebKitMediaSource || blob_OR_source_OR_stream == null)) {
+ if ((blob_OR_source_OR_stream is MediaStream || blob_OR_source_OR_stream == null)) {
return _createObjectURL_4(blob_OR_source_OR_stream);
}
throw new ArgumentError("Incorrect number or type of arguments");
diff --git a/tools/VERSION b/tools/VERSION
index c93926f..1fcfef6 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
MINOR 2
PATCH 0
PRERELEASE 5
-PRERELEASE_PATCH 3
+PRERELEASE_PATCH 4
