Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(622)

Unified Diff: sdk/lib/html/dartium/html_dartium.dart

Side-by-side diff isn't available for this file because of its large size.
Issue 1390113003: Fix some build breaks. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: TBR Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
Download patch
« no previous file with comments | « no previous file | tools/deps/dartium.deps/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sdk/lib/html/dartium/html_dartium.dart
diff --git a/sdk/lib/html/dartium/html_dartium.dart b/sdk/lib/html/dartium/html_dartium.dart
index 7ccde21651ded72341ab3b937536ba393d84d81e..c9a259d9a5064092165b4b1950993433e772b5db 100644
--- a/sdk/lib/html/dartium/html_dartium.dart
+++ b/sdk/lib/html/dartium/html_dartium.dart
@@ -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]);
}
}
« no previous file with comments | « no previous file | tools/deps/dartium.deps/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698