[ddc,dart2js] restore null check in dart:js

sigmundch · commit-bot@chromium.org · commit 272a03a71dad · 2020-02-12T20:01:57.000Z
Change-Id: I275c202368eabc3d72fb49ff21d8635e0905ad69 Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/135443 Reviewed-by: Vijay Menon <vsm@google.com> Commit-Queue: Sigmund Cherem <sigmund@google.com>
diff --git a/sdk_nnbd/lib/_internal/js_dev_runtime/patch/js_patch.dart b/sdk_nnbd/lib/_internal/js_dev_runtime/patch/js_patch.dart
@@ -38,8 +38,8 @@ class JsObject {
 
   @patch
   factory JsObject.fromBrowserObject(Object object) {
-    if (object is num || object is String || object is bool) {
-      throw ArgumentError("object cannot be a num, string, or bool");
+    if (object is num || object is String || object is bool || object == null) {
+      throw ArgumentError("object cannot be a num, string, bool, or null");
     }
     return _wrapToDart(_convertToJS(object)!);
   }
diff --git a/sdk_nnbd/lib/_internal/js_runtime/lib/js_patch.dart b/sdk_nnbd/lib/_internal/js_runtime/lib/js_patch.dart
@@ -115,8 +115,8 @@ class JsObject {
 
   @patch
   factory JsObject.fromBrowserObject(Object object) {
-    if (object is num || object is String || object is bool) {
-      throw ArgumentError("object cannot be a num, string, or bool");
+    if (object is num || object is String || object is bool || object == null) {
+      throw ArgumentError("object cannot be a num, string, bool, or null");
     }
     return _wrapToDart(_convertToJS(object));
   }

Original file line number	Diff line number	Diff line change
`@@ -38,8 +38,8 @@ class JsObject {`
`38`	`38`
`39`	`39`	`@patch`
`40`	`40`	`factory JsObject.fromBrowserObject(Object object) {`
`41`		`- if (object is num \|\| object is String \|\| object is bool) {`
`42`		`- throw ArgumentError("object cannot be a num, string, or bool");`
	`41`	`+ if (object is num \|\| object is String \|\| object is bool \|\| object == null) {`
	`42`	`+ throw ArgumentError("object cannot be a num, string, bool, or null");`
`43`	`43`	`}`
`44`	`44`	`return _wrapToDart(_convertToJS(object)!);`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -115,8 +115,8 @@ class JsObject {`
`115`	`115`
`116`	`116`	`@patch`
`117`	`117`	`factory JsObject.fromBrowserObject(Object object) {`
`118`		`- if (object is num \|\| object is String \|\| object is bool) {`
`119`		`- throw ArgumentError("object cannot be a num, string, or bool");`
	`118`	`+ if (object is num \|\| object is String \|\| object is bool \|\| object == null) {`
	`119`	`+ throw ArgumentError("object cannot be a num, string, bool, or null");`
`120`	`120`	`}`
`121`	`121`	`return _wrapToDart(_convertToJS(object));`
`122`	`122`	`}`