Version 1.13.0-dev.7.6
Cherry pick e84f9941e1cf210646aef72e01eefaa993a7b798 to dev
Updated dartium_webkit_revision to 202694
diff --git a/sdk/lib/html/html_common/conversions_dartium.dart b/sdk/lib/html/html_common/conversions_dartium.dart
index 0f2c075..56ed9d5 100644
--- a/sdk/lib/html/html_common/conversions_dartium.dart
+++ b/sdk/lib/html/html_common/conversions_dartium.dart
@@ -176,11 +176,19 @@
} else {
func = getHtmlCreateFunction(jsTypeName);
if (func == null) {
- if (jsTypeName == 'auto-binding') {
- func = getHtmlCreateFunction('HTMLTemplateElement');
- } else if (jsObject.toString() == "[object HTMLElement]") {
- // One last ditch effort could be a JS custom element.
- func = getHtmlCreateFunction('HTMLElement');
+ // Start walking the prototype chain looking for a JS class.
+ var prototype = jsObject['__proto__'];
+ var keepWalking = true;
+ while (keepWalking && prototype.hasProperty('__proto__')) {
+ prototype = prototype['__proto__'];
+ if (prototype != null && prototype is Element &&
+ prototype.blink_jsObject != null) {
+ // We're a Dart class that's pointing to a JS class.
+ var blinkJso = prototype.blink_jsObject;
+ jsTypeName = blinkJso['constructor']['name'];
+ func = getHtmlCreateFunction(jsTypeName);
+ keepWalking = func == null;
+ }
}
}
}
diff --git a/tools/VERSION b/tools/VERSION
index 6051ec3..85daf0b 100644
--- a/tools/VERSION
+++ b/tools/VERSION
@@ -28,4 +28,4 @@
MINOR 13
PATCH 0
PRERELEASE 7
-PRERELEASE_PATCH 5
+PRERELEASE_PATCH 6
diff --git a/tools/deps/dartium.deps/DEPS b/tools/deps/dartium.deps/DEPS
index ca01b17..7cb4b7f9 100644
--- a/tools/deps/dartium.deps/DEPS
+++ b/tools/deps/dartium.deps/DEPS
@@ -14,7 +14,7 @@
"dartium_chromium_commit": "62a7524d4f71c9e0858d24b0aa1bbff3a2d09bff",
"chromium_base_revision": "297060",
"dartium_webkit_branch": "/blink/branches/dart/2171_4",
- "dartium_webkit_revision": "202693",
+ "dartium_webkit_revision": "202694",
# We use mirrors of all github repos to guarantee reproducibility and
# consistency between what users see and what the bots see.
