Changeset 187335 in webkit

Timestamp:

Jul 24, 2015, 1:48:44 AM (11 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge custom patch for rdar://problem/21953865

Location:

branches/safari-601.1-branch

Files:

• LayoutTests/TestExpectations (modified) (1 diff)
• LayoutTests/js/script-tests/arrowfunction-asparamter-1.js (modified) (1 diff)
• LayoutTests/js/script-tests/arrowfunction-asparamter-2.js (modified) (1 diff)
• LayoutTests/js/script-tests/arrowfunction-associativity-1.js (modified) (1 diff)
• LayoutTests/js/script-tests/arrowfunction-associativity-2.js (modified) (1 diff)
• LayoutTests/js/script-tests/arrowfunction-block-1.js (modified) (1 diff)
• LayoutTests/js/script-tests/arrowfunction-block-2.js (modified) (1 diff)
• LayoutTests/js/script-tests/arrowfunction-syntax-endings.js (modified) (1 diff)
• LayoutTests/js/script-tests/arrowfunction-syntax-errors.js (modified) (1 diff)
• LayoutTests/js/script-tests/arrowfunction-syntax.js (modified) (1 diff)
• Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig (modified) (1 diff)
• Source/WTF/wtf/FeatureDefines.h (modified) (1 diff)

branches/safari-601.1-branch/LayoutTests/TestExpectations

@@ -530 +530 @@
 js/intl.html [ Skip ]
 
+# Arrow functions are not implemented in a semantically correct way.
+# <rdar://problem/21953865>
+js/arrowfunction-asparamter-1.html [ Skip ]
+js/arrowfunction-asparamter-2.html [ Skip ]
+js/arrowfunction-associativity-1.html [ Skip ]
+js/arrowfunction-associativity-2.html [ Skip ]
+js/arrowfunction-block-1.html [ Skip ]
+js/arrowfunction-block-2.html [ Skip ]
+js/arrowfunction-syntax-endings.html [ Skip ]
+js/arrowfunction-syntax-errors.html [ Skip ]
+js/arrowfunction-syntax.html [ Skip ]

branches/safari-601.1-branch/LayoutTests/js/script-tests/arrowfunction-asparamter-1.js

@@ +1 @@
+//@ skip
+
 description('Tests for ES6 arrow function, passing arrow function as the paramter');
 

branches/safari-601.1-branch/LayoutTests/js/script-tests/arrowfunction-asparamter-2.js

@@ +1 @@
+//@ skip
+
 description('Tests for ES6 arrow function, passing arrow function as the paramter');
 

branches/safari-601.1-branch/LayoutTests/js/script-tests/arrowfunction-associativity-1.js

@@ +1 @@
+//@ skip
+
 description('Tests for ES6 arrow function nested declaration');
 

branches/safari-601.1-branch/LayoutTests/js/script-tests/arrowfunction-associativity-2.js

@@ +1 @@
+//@ skip
+
 description('Tests for ES6 arrow function nested declaration');
 

branches/safari-601.1-branch/LayoutTests/js/script-tests/arrowfunction-block-1.js

@@ +1 @@
+//@ skip
+
 description('Tests for ES6 arrow function declaration body as block');
 

branches/safari-601.1-branch/LayoutTests/js/script-tests/arrowfunction-block-2.js

@@ +1 @@
+//@ skip
+
 description('Tests for ES6 arrow function declaration body as block');
 

branches/safari-601.1-branch/LayoutTests/js/script-tests/arrowfunction-syntax-endings.js

@@ +1 @@
+//@ skip
+
 description("Tests for ES6 arrow function endings");
 

branches/safari-601.1-branch/LayoutTests/js/script-tests/arrowfunction-syntax-errors.js

@@ +1 @@
+//@ skip
+
 description("Tests for ES6 arrow function syntax errors");
 

branches/safari-601.1-branch/LayoutTests/js/script-tests/arrowfunction-syntax.js

@@ +1 @@
+//@ skip
+
 description("Tests for ES6 arrow function calling");
 

branches/safari-601.1-branch/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig

@@ -46 +46 @@
 ENABLE_CANVAS_PROXY = ;
 ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
-ENABLE_ES6_ARROWFUNCTION_SYNTAX = ENABLE_ES6_ARROWFUNCTION_SYNTAX;
+ENABLE_ES6_ARROWFUNCTION_SYNTAX = ;
 ENABLE_ES6_CLASS_SYNTAX = ENABLE_ES6_CLASS_SYNTAX;
 ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX = ENABLE_ES6_TEMPLATE_LITERAL_SYNTAX;

branches/safari-601.1-branch/Source/WTF/wtf/FeatureDefines.h

@@ -355 +355 @@
 
 #if !defined(ENABLE_ES6_ARROWFUNCTION_SYNTAX)
-#define ENABLE_ES6_ARROWFUNCTION_SYNTAX 1
+#define ENABLE_ES6_ARROWFUNCTION_SYNTAX 0
 #endif