languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-09-21 07:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some build breaks.

Browse source 
Fix test breaks

Roll dep forward to fix windows build.

Dartium typed js interop work dart repo side of the change. Also tries to get

BUG=

Review URL: https://codereview.chromium.org/1390113003 .
This commit is contained in:
Jacob Richman 2015-10-07 13:47:12 -07:00
parent c9334ed61f
commit 1f9516ba0b
4 changed files with 39 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
sdk/lib/html/dartium/html_dartium.dart
View file

@ -1170,12 +1170,17 @@ wrap_jso(jsObject) {
}
var constructor = js.JsNative.getProperty(jsObject, 'constructor');
if (__interop_checks) {
debug_or_assert("constructor != null", constructor != null);
if (constructor == null) {
// Perfectly valid case for JavaScript objects where __proto__ has
// intentionally been set to null.
js.setDartHtmlWrapperFor(jsObject, jsObject);
return jsObject;
}
var jsTypeName = js.JsNative.getProperty(constructor, 'name');
if (__interop_checks) {
debug_or_assert("constructor != null && jsTypeName.length > 0", constructor != null && jsTypeName.length > 0);
if (jsTypeName is! String || jsTypeName.length == 0) {
// Not an html type.
js.setDartHtmlWrapperFor(jsObject, jsObject);
return jsObject;
}
var dartClass_instance;
@ -1245,12 +1250,17 @@ wrap_jso_no_SerializedScriptvalue(jsObject) {
}
var constructor = js.JsNative.getProperty(jsObject, 'constructor');
if (__interop_checks) {
debug_or_assert("constructor != null", constructor != null);
if (constructor == null) {
// Perfectly valid case for JavaScript objects where __proto__ has
// intentionally been set to null.
js.setDartHtmlWrapperFor(jsObject, jsObject);
return jsObject;
}
var jsTypeName = js.JsNative.getProperty(constructor, 'name');
if (__interop_checks) {
debug_or_assert("constructor != null && jsTypeName.length > 0", constructor != null && jsTypeName.length > 0);
if (jsTypeName is! String || jsTypeName.length == 0) {
// Not an html type.
js.setDartHtmlWrapperFor(jsObject, jsObject);
return jsObject;
}
var func = getHtmlCreateFunction(jsTypeName);
@ -20524,7 +20534,7 @@ class HtmlDocument extends Document {
});
// document.registerElement('x-foo', {prototype: elemProto, extends: extendsTag});
var jsMap = new js.JsObject.jsify({'prototype': elemProto, 'extends': extendsTag});
js.Jsnative.callMethod(js.JsNative.getProperty(js.context, 'document'), 'registerElement', [tag, jsMap]);
js.JsNative.callMethod(js.JsNative.getProperty(js.context, 'document'), 'registerElement', [tag, jsMap]);
}
}

2
tools/deps/dartium.deps/DEPS
View file

@ -14,7 +14,7 @@ vars.update({
"dartium_chromium_commit": "62a7524d4f71c9e0858d24b0aa1bbff3a2d09bff",
"chromium_base_revision": "297060",
"dartium_webkit_branch": "/blink/branches/dart/dartium",
"dartium_webkit_revision": "202677",
"dartium_webkit_revision": "202678",
# We use mirrors of all github repos to guarantee reproducibility and
# consistency between what users see and what the bots see.

26
tools/dom/templates/html/dartium/html_dartium.darttemplate
View file

@ -415,12 +415,17 @@ wrap_jso(jsObject) {
}
var constructor = js.JsNative.getProperty(jsObject, 'constructor');
if (__interop_checks) {
debug_or_assert("constructor != null", constructor != null);
if (constructor == null) {
// Perfectly valid case for JavaScript objects where __proto__ has
// intentionally been set to null.
js.setDartHtmlWrapperFor(jsObject, jsObject);
return jsObject;
}
var jsTypeName = js.JsNative.getProperty(constructor, 'name');
if (__interop_checks) {
debug_or_assert("constructor != null && jsTypeName.length > 0", constructor != null && jsTypeName.length > 0);
if (jsTypeName is! String || jsTypeName.length == 0) {
// Not an html type.
js.setDartHtmlWrapperFor(jsObject, jsObject);
return jsObject;
}
var dartClass_instance;
@ -490,12 +495,17 @@ wrap_jso_no_SerializedScriptvalue(jsObject) {
}
var constructor = js.JsNative.getProperty(jsObject, 'constructor');
if (__interop_checks) {
debug_or_assert("constructor != null", constructor != null);
if (constructor == null) {
// Perfectly valid case for JavaScript objects where __proto__ has
// intentionally been set to null.
js.setDartHtmlWrapperFor(jsObject, jsObject);
return jsObject;
}
var jsTypeName = js.JsNative.getProperty(constructor, 'name');
if (__interop_checks) {
debug_or_assert("constructor != null && jsTypeName.length > 0", constructor != null && jsTypeName.length > 0);
if (jsTypeName is! String || jsTypeName.length == 0) {
// Not an html type.
js.setDartHtmlWrapperFor(jsObject, jsObject);
return jsObject;
}
var func = getHtmlCreateFunction(jsTypeName);

2
tools/dom/templates/html/impl/impl_HTMLDocument.darttemplate
View file

@ -424,7 +424,7 @@ $else
});
// document.registerElement('x-foo', {prototype: elemProto, extends: extendsTag});
var jsMap = new js.JsObject.jsify({'prototype': elemProto, 'extends': extendsTag});
js.Jsnative.callMethod(js.JsNative.getProperty(js.context, 'document'), 'registerElement', [tag, jsMap]);
js.JsNative.callMethod(js.JsNative.getProperty(js.context, 'document'), 'registerElement', [tag, jsMap]);
}
$endif
}