Title: [227878] branches/safari-605-branch
- Revision
- 227878
- Author
- [email protected]
- Date
- 2018-01-31 00:14:02 -0800 (Wed, 31 Jan 2018)
Log Message
Cherry-pick r227649. rdar://problem/37019344
Modified Paths
Added Paths
Diff
Modified: branches/safari-605-branch/LayoutTests/ChangeLog (227877 => 227878)
--- branches/safari-605-branch/LayoutTests/ChangeLog 2018-01-31 08:13:59 UTC (rev 227877)
+++ branches/safari-605-branch/LayoutTests/ChangeLog 2018-01-31 08:14:02 UTC (rev 227878)
@@ -1,3 +1,16 @@
+2018-01-30 Jason Marcell <[email protected]>
+
+ Cherry-pick r227649. rdar://problem/37019344
+
+ 2018-01-25 Yusuke Suzuki <[email protected]>
+
+ imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling.html crashes
+ https://bugs.webkit.org/show_bug.cgi?id=181980
+
+ Reviewed by Ryosuke Niwa.
+
+ * TestExpectations:
+
2018-01-30 Ryan Haddad <[email protected]>
Cherry-pick r227867. rdar://problem/36912402
Modified: branches/safari-605-branch/LayoutTests/imported/w3c/ChangeLog (227877 => 227878)
--- branches/safari-605-branch/LayoutTests/imported/w3c/ChangeLog 2018-01-31 08:13:59 UTC (rev 227877)
+++ branches/safari-605-branch/LayoutTests/imported/w3c/ChangeLog 2018-01-31 08:14:02 UTC (rev 227878)
@@ -1,5 +1,19 @@
2018-01-30 Jason Marcell <[email protected]>
+ Cherry-pick r227649. rdar://problem/37019344
+
+ 2018-01-25 Yusuke Suzuki <[email protected]>
+
+ imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling.html crashes
+ https://bugs.webkit.org/show_bug.cgi?id=181980
+
+ Reviewed by Ryosuke Niwa.
+
+ * web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error-expected.txt:
+ * web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-expected.txt: Added.
+
+2018-01-30 Jason Marcell <[email protected]>
+
Cherry-pick r227625. rdar://problem/37019502
2018-01-25 Youenn Fablet <[email protected]>
Added: branches/safari-605-branch/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error-expected.txt (0 => 227878)
--- branches/safari-605-branch/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error-expected.txt (rev 0)
+++ branches/safari-605-branch/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/dynamic-import/dynamic-imports-script-error-expected.txt 2018-01-31 08:14:02 UTC (rev 227878)
@@ -0,0 +1,13 @@
+
+PASS import() must reject when there is a parse error
+PASS import() must reject with the same error object for each import when there is a parse error
+PASS import() must reject when there is a bad module specifier
+PASS import() must reject with different error objects for each import when there is a bad module specifier
+PASS import() must reject when there is a bad module specifier in a dependency
+PASS import() must reject with the same error object for each import when there is a bad module specifier in a dependency
+PASS import() must reject when there is a instantiation error
+PASS import() must reject with the same error object for each import when there is a instantiation error
+PASS import() must reject when there is a evaluation error
+FAIL import() must reject with the same error object for each import when there is a evaluation error assert_unreached: Should have rejected: It must reject the second time Reached unreachable code
+PASS import()ing a module with an evaluation error must stop evaluation
+
Added: branches/safari-605-branch/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-expected.txt (0 => 227878)
--- branches/safari-605-branch/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-expected.txt (rev 0)
+++ branches/safari-605-branch/LayoutTests/imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling-expected.txt 2018-01-31 08:14:02 UTC (rev 227878)
@@ -0,0 +1,15 @@
+CONSOLE MESSAGE: TypeError: 'text/plain' is not a valid _javascript_ MIME type.
+CONSOLE MESSAGE: TypeError: 'text/plain' is not a valid _javascript_ MIME type.
+CONSOLE MESSAGE: line 1: SyntaxError: No identifiers allowed directly after numeric literal
+CONSOLE MESSAGE: line 1: SyntaxError: No identifiers allowed directly after numeric literal
+CONSOLE MESSAGE: line 1: SyntaxError: No identifiers allowed directly after numeric literal
+CONSOLE MESSAGE: line 1: SyntaxError: No identifiers allowed directly after numeric literal
+html-script-module-errorHandling
+
+
+FAIL IFrame test: 'iframe_parseError_Root' assert_equals: Unexpected _errorReported value expected "error" but got ""
+PASS IFrame test: 'iframe_parseError_Dependent'
+PASS IFrame test: 'iframe_parseError_DependentMultiple'
+PASS External root module with non-script mimetype
+PASS Module with imported non-script mimetype
+
Modified: branches/safari-605-branch/Source/_javascript_Core/ChangeLog (227877 => 227878)
--- branches/safari-605-branch/Source/_javascript_Core/ChangeLog 2018-01-31 08:13:59 UTC (rev 227877)
+++ branches/safari-605-branch/Source/_javascript_Core/ChangeLog 2018-01-31 08:14:02 UTC (rev 227878)
@@ -1,5 +1,25 @@
2018-01-30 Jason Marcell <[email protected]>
+ Cherry-pick r227649. rdar://problem/37019344
+
+ 2018-01-25 Yusuke Suzuki <[email protected]>
+
+ imported/w3c/web-platform-tests/html/semantics/scripting-1/the-script-element/module/errorhandling.html crashes
+ https://bugs.webkit.org/show_bug.cgi?id=181980
+
+ Reviewed by Ryosuke Niwa.
+
+ We accidentally failed to propagate errored promise in instantiate and satify phase if entry.{instantiate,satisfy}
+ promises are set. Since we just returned `entry`, it becomes succeeded promise even if the dependent fetch, instantiate,
+ and satisfy promises are failed. This patch fixes error propagation by returning `entry.instantiate` and `entry.satisfy`
+ correctly.
+
+ * builtins/ModuleLoaderPrototype.js:
+ (requestInstantiate):
+ (requestSatisfy):
+
+2018-01-30 Jason Marcell <[email protected]>
+
Cherry-pick r227742. rdar://problem/37019360
2018-01-29 Michael Saboff <[email protected]>
Modified: branches/safari-605-branch/Source/_javascript_Core/builtins/ModuleLoaderPrototype.js (227877 => 227878)
--- branches/safari-605-branch/Source/_javascript_Core/builtins/ModuleLoaderPrototype.js 2018-01-31 08:13:59 UTC (rev 227877)
+++ branches/safari-605-branch/Source/_javascript_Core/builtins/ModuleLoaderPrototype.js 2018-01-31 08:14:02 UTC (rev 227878)
@@ -193,7 +193,7 @@
// Now fetching request succeeds. Then even if instantiation fails, we should cache it.
// Instantiation won't be retried.
if (entry.instantiate)
- return entry;
+ return entry.instantiate;
entry.instantiate = instantiatePromise;
var key = entry.key;
@@ -229,7 +229,7 @@
visited.@add(entry);
var satisfyPromise = this.requestInstantiate(entry, parameters, fetcher).then((entry) => {
if (entry.satisfy)
- return entry;
+ return entry.satisfy;
var depLoads = @newArrayWithSize(entry.dependencies.length);
for (var i = 0, length = entry.dependencies.length; i < length; ++i) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
