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

Use the crossorigin attribute of the main script on deferred hunks.

Browse source 
If the main script is loaded using a CORS request the deferred hunks
will be as well preventing errors from being muted.

Bug: 35594
Change-Id: I3283307b5d9e1d6708a4808e1e3fd7689a672a9b
Reviewed-on: https://dart-review.googlesource.com/c/89141
Commit-Queue: Sigmund Cherem <sigmund@google.com>
Reviewed-by: Sigmund Cherem <sigmund@google.com>
This commit is contained in:
Rick Earnshaw 2019-01-18 19:08:44 +00:00 committed by commit-bot@chromium.org
parent aeaf82577e
commit 5724158d58
3 changed files with 55 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sdk/lib/_internal/js_runtime/lib/js_helper.dart
View file

@ -3356,6 +3356,15 @@ String _computeCspNonce() {
return JS('String', 'String(#.nonce)', currentScript);
}
/// The 'crossOrigin' value on the current script used for CORS, if any.
String _crossOrigin = _computeCrossOrigin();
String _computeCrossOrigin() {
var currentScript = JS_EMBEDDED_GLOBAL('', CURRENT_SCRIPT);
if (currentScript == null) return null;
return JS('String|Null', '#.crossOrigin', currentScript);
}
/// Returns true if we are currently in a worker context.
bool _isWorker() {
requiresPreamble();
@ -3501,6 +3510,9 @@ Future<Null> _loadHunk(String hunkName) {
if (_cspNonce != null && _cspNonce != '') {
JS('', '#.nonce = #', script, _cspNonce);
}
if (_crossOrigin != null && _crossOrigin != '') {
JS('', '#.crossOrigin = #', script, _crossOrigin);
}
JS('', '#.addEventListener("load", #, false)', script, jsSuccess);
JS('', '#.addEventListener("error", #, false)', script, jsFailure);
JS('', 'document.body.appendChild(#)', script);

7
tests/compiler/dart2js_extra/deferred_with_cross_origin_lib.dart Normal file
View file

@ -0,0 +1,7 @@
// Copyright (c) 2015, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
foo() {
return "loaded";
}

36
tests/compiler/dart2js_extra/deferred_with_cross_origin_test.dart Normal file
View file

@ -0,0 +1,36 @@
// Copyright (c) 2018, the Dart project authors. Please see the AUTHORS file
// for details. All rights reserved. Use of this source code is governed by a
// BSD-style license that can be found in the LICENSE file.
// Test that code loaded via deferred imports uses the same crossorigin value as
// the main page.
import "deferred_with_cross_origin_lib.dart" deferred as lib;
import "package:expect/expect.dart";
import "package:async_helper/async_helper.dart";
import "dart:html";
main() {
asyncStart();
var scripts = document
.querySelectorAll<ScriptElement>('script')
.where((s) => s.src.contains("generated_compilations"))
.toList();
Expect.equals(1, scripts.length);
Expect.equals(null, scripts.first.crossOrigin);
scripts.first.crossOrigin = "anonymous";
lib.loadLibrary().then((_) {
print(lib.foo());
var scripts = document
.querySelectorAll<ScriptElement>('script')
.where((s) => s.src.contains("generated_compilations"))
.toList();
Expect.equals(2, scripts.length);
for (var script in scripts) {
Expect.equals("anonymous", script.crossOrigin);
}
asyncEnd();
});
}