Skip to content

Commit 83c8cbd

Browse files
alan-knightdgrove
authored andcommitted
Cherry-pick d60efa8
Cherry-pick b4b02da Cherry-pick bbfa1da Cherry-pick 0bb2d5e
1 parent 53f9f6c commit 83c8cbd

File tree

20 files changed

+44824
-29652
lines changed

20 files changed

+44824
-29652
lines changed

pkg/dev_compiler/lib/js/amd/dart_sdk.js

Lines changed: 9279 additions & 6528 deletions
Large diffs are not rendered by default.

pkg/dev_compiler/lib/js/amd/dart_sdk.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/dev_compiler/lib/js/common/dart_sdk.js

Lines changed: 9279 additions & 6528 deletions
Large diffs are not rendered by default.

pkg/dev_compiler/lib/js/common/dart_sdk.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/dev_compiler/lib/js/es6/dart_sdk.js

Lines changed: 9279 additions & 6528 deletions
Large diffs are not rendered by default.

pkg/dev_compiler/lib/js/es6/dart_sdk.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/dev_compiler/lib/js/legacy/dart_sdk.js

Lines changed: 9279 additions & 6528 deletions
Large diffs are not rendered by default.

pkg/dev_compiler/lib/js/legacy/dart_sdk.js.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/dev_compiler/lib/sdk/ddc_sdk.sum

231 KB
Binary file not shown.

pkg/dev_compiler/lib/src/compiler/code_generator.dart

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6033,8 +6033,7 @@ String jsLibraryName(String libraryRoot, LibraryElement library) {
60336033
// E.g., "foo/bar.dart" and "foo$47bar.dart" would collide.
60346034
qualifiedPath = uri.pathSegments.skip(1).join(encodedSeparator);
60356035
} else if (isWithin(libraryRoot, uri.toFilePath())) {
6036-
qualifiedPath = uri.path
6037-
.substring(libraryRoot.length)
6036+
qualifiedPath = relative(uri.toFilePath(), from: libraryRoot)
60386037
.replaceAll(separator, encodedSeparator);
60396038
} else {
60406039
// We don't have a unique name.
@@ -6059,30 +6058,6 @@ String jsLibraryDebuggerName(String libraryRoot, LibraryElement library) {
60596058
return relative(filePath, from: libraryRoot);
60606059
}
60616060

6062-
String jsDebuggingLibraryName(String libraryRoot, LibraryElement library) {
6063-
var uri = library.source.uri;
6064-
if (uri.scheme == 'dart') {
6065-
return uri.path;
6066-
}
6067-
// TODO(vsm): This is not necessarily unique if '__' appears in a file name.
6068-
var separator = '__';
6069-
String qualifiedPath;
6070-
if (uri.scheme == 'package') {
6071-
// Strip the package name.
6072-
// TODO(vsm): This is not unique if an escaped '/'appears in a filename.
6073-
// E.g., "foo/bar.dart" and "foo$47bar.dart" would collide.
6074-
qualifiedPath = uri.pathSegments.skip(1).join(separator);
6075-
} else if (uri.toFilePath().startsWith(libraryRoot)) {
6076-
qualifiedPath =
6077-
uri.path.substring(libraryRoot.length).replaceAll('/', separator);
6078-
} else {
6079-
// We don't have a unique name.
6080-
throw 'Invalid library root. $libraryRoot does not contain ${uri
6081-
.toFilePath()}';
6082-
}
6083-
return pathToJSIdentifier(qualifiedPath);
6084-
}
6085-
60866061
/// Shorthand for identifier-like property names.
60876062
/// For now, we emit them as strings and the printer restores them to
60886063
/// identifiers if it can.

pkg/dev_compiler/test/browser/language_tests.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ define(['dart_sdk', 'async_helper', 'expect', 'unittest', 'is', 'require'],
114114
'const_switch_test_02_multi': fail,
115115
'const_switch_test_04_multi': fail,
116116
'constructor12_test': fail,
117-
'covariant_subtyping_tearoff2_test': fail,
117+
'covariant_subtyping_tearoff2_test': fail,
118118
'covariant_subtyping_tearoff3_test': fail,
119119
'covariant_subtyping_unsafe_call2_test': fail,
120120
'covariant_subtyping_unsafe_call3_test': fail,
@@ -496,7 +496,6 @@ define(['dart_sdk', 'async_helper', 'expect', 'unittest', 'is', 'require'],
496496

497497
// was https://github.com/dart-lang/sdk/issues/27578, needs triage
498498
'speechrecognition_test': firefox_fail,
499-
'svgelement_test': chrome_fail,
500499
'text_event_test': firefox_fail,
501500

502501
// was https://github.com/dart-lang/sdk/issues/27578, needs triage

pkg/dev_compiler/test/not_yet_strong_tests.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2402,7 +2402,6 @@ final notYetStrongTests = new HashSet<String>.from([
24022402
'lib/html/custom/document_register_basic_test',
24032403
'lib/html/custom/document_register_type_extensions_test',
24042404
'lib/html/custom/element_upgrade_test',
2405-
'lib/html/element_dimensions_test',
24062405
'lib/html/element_test',
24072406
'lib/html/events_test',
24082407
'lib/html/fileapi_test',

0 commit comments

Comments
 (0)