Attachment 248414 Details for Bug 140855 – Patch

[patch] Patch

bug-140855-20150311144628.patch (text/plain), 81.15 KB, created by GSkachkov on 2015-03-11 05:46:55 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: GSkachkov

Created: 2015-03-11 05:46:55 PDT

Size: 81.15 KB

patch

obsolete

>Subversion Revision: 181364
>diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
>index f54b504d7394b79a4b8cf64157302848311b8f3b..28daa6ceab0484c931fe9bf4c6e30b0b1979ba30 100644
>--- a/Source/JavaScriptCore/ChangeLog
>+++ b/Source/JavaScriptCore/ChangeLog
>@@ -1,3 +1,77 @@
>+2015-03-11  Alexandr Skachkov  <gskachkov@gmail.com>
>+
>+        [ES6] Implement ES6 arrow function syntax
>+        https://bugs.webkit.org/show_bug.cgi?id=140855
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Added support of ES6 arrow function. In patch were implemented the simplest cases:
>+        1 no paramters       () => 10 + 20
>+        2 one parameter       x => x + 20
>+        3 multiple paramters (x, y) => x + y
>+        4 fat arrow function x => { return x*10;}
>+
>+        * Configurations/FeatureDefines.xcconfig:
>+        Added feature flag ENABLE_ES6_ARROWFUNCTION_SYNTAX for arrow function
>+
>+         * parser/ASTBuilder.h:
>+        (JSC::ASTBuilder::createArrowFunctionExpr):
>+        Added function that create expresion for arrow function
>+        * parser/Lexer.cpp:
>+        (JSC::Lexer<T>::setTokenPosition):
>+        Method that allow to set currect position for the tocken outside the Lexer clas
>+        (JSC::Lexer<T>::lex):
>+        Method changed to support of the arrow function
>+        * parser/Lexer.h:
>+        (JSC::Lexer<T>::setTokenPosition):
>+        Declaration of the method that allow to set currect position for the tocken outside the Lexer class
>+        * parser/Parser.cpp:
>+        (JSC::Parser<LexerType>::parseSourceElements):
>+        Modified method to support two methods of the parse js function. The first type is standard function and new type is arrow function.
>+        (JSC::Parser<LexerType>::parsePrimaryExpression):
>+        Modified method to support two methods of the parse js function. The first type is standard function and new type is arrow function.
>+        (JSC::Parser::):Added new structure to suppord different type of parsing the function
>+        (JSC::Parser::parseSourceElement): Added FunctionParseType as paramter in method
>+        (JSC::Parser::parseStatement): Added FunctionParseType as paramter in method. Added separated logic for ending
>+        the statement in case of the parsing in arrow function type. Added logic to support parsing the source code that follow afte => symbol
>+        (JSC::Parser::parseAssignmentExpression) Modified method to support parsing the arrow function
>+        (JSC::Parser::parsePrimaryExpression) Modified method to support case when after IDENT is going the arrow function
>+        (JSC::Parser::parseArrowExpression): Added method declaration that is responsible to parse arrow expression.
>+        (JSC::Parser::setEndOfStatement): Added method that used to set correct position of the lexer
>+        (JSC::Parser::parseArrowFunctionWrapper): Added method that is starting point in parsing of the arrow function
>+        (JSC::Parser::parseArrowFunctionInfo): Added method that is used to parse function paramters. Close to parseFunctionInfo.
>+        Was made as the separete method to prevent pollution of the logic parsing the stander function.
>+        Can be merge with parseFunctionInfo after approving the arrow function patch
>+        (JSC::Parser::parseArrowFunctionBody):Added method that is used to parse function body. Close to parseFunctionInfo.
>+        Was made as the separete method to prevent pollution of the logic parsing the stander function.
>+        Can be merge with parseFunctionInfo after approving the arrow function patch
>+        * parser/Parser.h:
>+        (JSC::Parser::FunctionParseType):Added new structure to suppord different type of parsing the function
>+        (JSC::Parser::parseSourceElement): Added FunctionParseType as paramter in method
>+        (JSC::Parser::parseStatement): Added FunctionParseType as paramter in method
>+        (JSC::Parser::parseArrowExpression): Added method declaration that is responsible to parse arrow expression
>+        (JSC::Parser::setEndOfStatement): Added method that used to set correct position of the lexer
>+        (JSC::Parser::parseArrowFunctionWrapper): Added method that is starting point in parsing of the arrow function
>+        (JSC::Parser::parseArrowFunctionInfo): Added method that is used to parse function paramters. Close to parseFunctionInfo.
>+        Was made as the separete method to prevent pollution of the logic parsing the stander function.
>+        Can be merge with parseFunctionInfo after approving the arrow function patch
>+        (JSC::Parser::parseArrowFunctionBody):Added method that is used to parse function body. Close to parseFunctionInfo.
>+        Was made as the separete method to prevent pollution of the logic parsing the stander function.
>+        Can be merge with parseFunctionInfo after approving the arrow function patch
>+        * parser/ParserTokens.h:
>+        Added new ARROWFUNCTION tocken
>+        * parser/SourceCode.h:
>+        (JSC::SourceCode::subArrowExpression):Added function that is used for creating source code object. Logic the same
>+        as in subExpresion function except different check for start and ending of the expression
>+        * parser/SyntaxChecker.h:
>+        (JSC::SyntaxChecker::createArrowFunctionExpr): Added defenition of the createArrowFunctionExpr close to the createFunctionExpr
>+        * parser/SourceProviderCacheItem:
>+        (JSC::SourceProviderCacheItemCreationParameters): Added additional properties to correct cache the arrow function
>+        (JSC::SourceProviderCacheItem): Added additional properties to correct cache the arrow function
>+        (JSC::SourceProviderCacheItem::endArrowFunctionToken): Added function to set correct tocken at the end of the arrow function in case of cache
>+        * tests/stress/js/arrowfunction.js:
>+        Added tests of the arrow function
>+
> 2015-03-10  Darin Adler  <darin@apple.com>
> 
>         Some event handler fixes
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index d0b55935338ba0ce7ccddde37319bded80f96a88..e32e5cdf8018880dce4197e1b6d9d84d4d8253aa 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,14 @@
>+2015-03-10  Skachkov Alexandr  <gskachkov@gmail.com>
>+
>+         [ES6] Implement ES6 arrow function syntax
>+        https://bugs.webkit.org/show_bug.cgi?id=140855
>+
>+         Reviewed by NOBODY (OOPS!).
>+
>+         Added feature flag ENABLE_ES6_ARROWFUNCTION_SYNTAX for arrow function
>+
>+         * Configurations/FeatureDefines.xcconfig:
>+
> 2015-03-10  Darin Adler  <darin@apple.com>
> 
>         Some event handler fixes
>diff --git a/Source/WebKit/mac/ChangeLog b/Source/WebKit/mac/ChangeLog
>index 8ecb0bad34e858cb333a596b2706a7c2e3dc383f..bf39218f17cbd70aa540be1cba325be880e48e82 100644
>--- a/Source/WebKit/mac/ChangeLog
>+++ b/Source/WebKit/mac/ChangeLog
>@@ -1,3 +1,13 @@
>+2015-03-11  Skachkov Alexandr  <gskachkov@gmail.com>
>+
>+         [ES6] Implement ES6 arrow function syntax
>+        https://bugs.webkit.org/show_bug.cgi?id=140855
>+
>+         Reviewed by NOBODY (OOPS!).
>+
>+         Added feature flag ENABLE_ES6_ARROWFUNCTION_SYNTAX for arrow function
>+
>+         * Configurations/FeatureDefines.xcconfig:
> 2015-03-10  Timothy Horton  <timothy_horton@apple.com>
> 
>         Fix the build
>diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
>index 5a85fd1d30b2ab8f0be95262a4c7b5384a5cfe89..26059931214eceadcae156756c239a2e6e63d1dc 100644
>--- a/Source/WebKit2/ChangeLog
>+++ b/Source/WebKit2/ChangeLog
>@@ -1,3 +1,14 @@
>+2015-03-11  Skachkov Alexandr  <gskachkov@gmail.com>
>+
>+         [ES6] Implement ES6 arrow function syntax
>+        https://bugs.webkit.org/show_bug.cgi?id=140855
>+
>+         Reviewed by NOBODY (OOPS!).
>+
>+         Added feature flag ENABLE_ES6_ARROWFUNCTION_SYNTAX for arrow function
>+
>+         * Configurations/FeatureDefines.xcconfig:
>+
> 2015-03-10  Antti Koivisto  <antti@apple.com>
> 
>         Add interface to delete disk cache entries
>diff --git a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>index ad0b8e8c4c6ff80e132c29aa8064000c3d6dd7a9..6dd09430818fef90061fdcf3a01282f9ccdd27dc 100644
>--- a/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/JavaScriptCore/Configurations/FeatureDefines.xcconfig
>@@ -45,6 +45,7 @@ ENABLE_CANVAS_PATH = ENABLE_CANVAS_PATH;
> ENABLE_CANVAS_PROXY = ;
> ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
> ENABLE_ES6_CLASS_SYNTAX = ;
>+ENABLE_ES6_ARROWFUNCTION_SYNTAX = ENABLE_ES6_ARROWFUNCTION_SYNTAX;
> ENABLE_CONTENT_FILTERING = ENABLE_CONTENT_FILTERING;
> ENABLE_CSP_NEXT = ;
> ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
>@@ -209,4 +210,4 @@ ENABLE_LLINT_C_LOOP = ;
> 
> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
> 
>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
>diff --git a/Source/JavaScriptCore/parser/ASTBuilder.h b/Source/JavaScriptCore/parser/ASTBuilder.h
>index df3be1e9410fdcf5ebeaccd85158760e5af86f39..37c08d76fa0f4d80705f248e8961efe9c92a059e 100644
>--- a/Source/JavaScriptCore/parser/ASTBuilder.h
>+++ b/Source/JavaScriptCore/parser/ASTBuilder.h
>@@ -307,11 +307,25 @@ public:
>         return new (m_parserArena) FunctionBodyNode(m_parserArena, startLocation, endLocation, startColumn, endColumn, inStrictContext, constructorKind);
>     }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    ExpressionNode* createArrowFunctionExpr(const JSTokenLocation& location, const ParserFunctionInfo<ASTBuilder>& info, unsigned arrowFunctionKeywordStart)
>+    {
>+        SourceCode source = info.arrowFunctionBodyType == ArrowFunctionBodyExpression
>+        ? m_sourceCode->subArrowExpression(info.arrowFunctionOffset, info.closeBraceOffset, info.bodyStartLine, info.bodyStartColumn)
>+        : m_sourceCode->subExpression(info.openBraceOffset, info.closeBraceOffset, info.bodyStartLine, info.bodyStartColumn);
>+
>+        FuncExprNode* result = new (m_parserArena) FuncExprNode(location, *info.name, info.body, source, info.parameters);
>+        info.body->setLoc(info.bodyStartLine, info.bodyEndLine, location.startOffset, location.lineStartOffset);
>+        info.body->setFunctionKeywordStart(arrowFunctionKeywordStart);
>+        return result;
>+    }
>+#endif
>+
>     void setFunctionNameStart(FunctionBodyNode* body, int functionNameStart)
>     {
>         body->setFunctionNameStart(functionNameStart);
>     }
>-    
>+
>     NEVER_INLINE PropertyNode* createGetterOrSetterProperty(const JSTokenLocation& location, PropertyNode::Type type, bool,
>         const Identifier* name, const ParserFunctionInfo<ASTBuilder>& info, unsigned getOrSetStartOffset, SuperBinding superBinding)
>     {
>diff --git a/Source/JavaScriptCore/parser/Lexer.cpp b/Source/JavaScriptCore/parser/Lexer.cpp
>index 1ec67df1b8e8c0d731949b1272a9bc75fff8016f..b1d91e38ff83cd193cb8ccd673970a8e17748c8a 100644
>--- a/Source/JavaScriptCore/parser/Lexer.cpp
>+++ b/Source/JavaScriptCore/parser/Lexer.cpp
>@@ -1389,10 +1389,22 @@ bool Lexer<T>::nextTokenIsColon()
>     const T* code = m_code;
>     while (code < m_codeEnd && (isWhiteSpace(*code) || isLineTerminator(*code)))
>         code++;
>-    
>+
>     return code < m_codeEnd && *code == ':';
> }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+template <typename T>
>+void Lexer<T>::setTokenPosition(JSToken* tokenRecord)
>+{
>+    JSTokenData* tokenData = &tokenRecord->m_data;
>+    tokenData->line = lineNumber();
>+    tokenData->offset = currentOffset();
>+    tokenData->lineStartOffset = currentLineStartOffset();
>+    ASSERT(tokenData->offset >= tokenData->lineStartOffset);
>+}
>+#endif
>+
> template <typename T>
> JSTokenType Lexer<T>::lex(JSToken* tokenRecord, unsigned lexerFlags, bool strictMode)
> {
>@@ -1456,7 +1468,12 @@ start:
>         }
>         token = GT;
>         break;
>-    case CharacterEqual:
>+    case CharacterEqual: {
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+        uint32_t savedlineNumber = tokenData->line;
>+        uint32_t savedOffset = currentOffset();
>+        uint32_t savedLineStartOffset = currentLineStartOffset();
>+#endif
>         shift();
>         if (m_current == '=') {
>             shift();
>@@ -1468,8 +1485,22 @@ start:
>             token = EQEQ;
>             break;
>         }
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+        if (m_current == '>') {
>+            shift();
>+            token = ARROWFUNCTION;
>+
>+            tokenData->line = savedlineNumber;
>+            tokenData->offset = savedOffset;
>+            tokenData->lineStartOffset = savedLineStartOffset;
>+
>+            ASSERT(tokenData->offset >= tokenData->lineStartOffset);
>+            break;
>+        }
>+#endif
>         token = EQUAL;
>         break;
>+    }
>     case CharacterLess:
>         shift();
>         if (m_current == '!' && peek(1) == '-' && peek(2) == '-') {
>diff --git a/Source/JavaScriptCore/parser/Lexer.h b/Source/JavaScriptCore/parser/Lexer.h
>index 81b4334d849d83e75fadafef54208416a8d16d66..c9d3ac8cba0fc621b99b5811210a82e0987c2bb3 100644
>--- a/Source/JavaScriptCore/parser/Lexer.h
>+++ b/Source/JavaScriptCore/parser/Lexer.h
>@@ -51,16 +51,16 @@ public:
>     {
>         m_keywordTable.deleteTable();
>     }
>-    
>+
> private:
>     friend class VM;
>-    
>+
>     VM& m_vm;
>     const HashTable m_keywordTable;
> };
> 
> enum LexerFlags {
>-    LexerFlagsIgnoreReservedWords = 1, 
>+    LexerFlagsIgnoreReservedWords = 1,
>     LexerFlagsDontBuildStrings = 2,
>     LexexFlagsDontBuildKeywords = 4
> };
>@@ -84,7 +84,9 @@ public:
>     void setCode(const SourceCode&, ParserArena*);
>     void setIsReparsing() { m_isReparsing = true; }
>     bool isReparsing() const { return m_isReparsing; }
>-
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    void setTokenPosition(JSToken* tokenRecord);
>+#endif
>     JSTokenType lex(JSToken*, unsigned, bool strictMode);
>     bool nextTokenIsColon();
>     int lineNumber() const { return m_lineNumber; }
>diff --git a/Source/JavaScriptCore/parser/Parser.cpp b/Source/JavaScriptCore/parser/Parser.cpp
>index 16e143c5fa49a3168f771061fcb262d92676aa8d..c17f838fbdd93d8348338be1142b21ca930478f6 100644
>--- a/Source/JavaScriptCore/parser/Parser.cpp
>+++ b/Source/JavaScriptCore/parser/Parser.cpp
>@@ -305,7 +305,7 @@ String Parser<LexerType>::parseInner()
> }
> 
> template <typename LexerType>
>-void Parser<LexerType>::didFinishParsing(SourceElements* sourceElements, DeclarationStacks::VarStack& varStack, 
>+void Parser<LexerType>::didFinishParsing(SourceElements* sourceElements, DeclarationStacks::VarStack& varStack,
>     DeclarationStacks::FunctionStack& funcStack, CodeFeatures features, int numConstants, IdentifierSet& capturedVars, const Vector<RefPtr<StringImpl>>&& closedVariables)
> {
>     m_sourceElements = sourceElements;
>@@ -323,8 +323,13 @@ bool Parser<LexerType>::allowAutomaticSemicolon()
>     return match(CLOSEBRACE) || match(EOFTOK) || m_lexer->prevTerminator();
> }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+template <typename LexerType>
>+template <class TreeBuilder> TreeSourceElements Parser<LexerType>::parseSourceElements(TreeBuilder& context, SourceElementsMode mode, FunctionParseType functionParseType)
>+#else
> template <typename LexerType>
> template <class TreeBuilder> TreeSourceElements Parser<LexerType>::parseSourceElements(TreeBuilder& context, SourceElementsMode mode)
>+#endif
> {
>     const unsigned lengthOfUseStrictLiteral = 12; // "use strict".length
>     TreeSourceElements sourceElements = context.createSourceElements();
>@@ -333,7 +338,11 @@ template <class TreeBuilder> TreeSourceElements Parser<LexerType>::parseSourceEl
>     unsigned directiveLiteralLength = 0;
>     auto savePoint = createSavePoint();
>     bool hasSetStrict = false;
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    while (TreeStatement statement = parseStatement(context, directive, &directiveLiteralLength, functionParseType)) {
>+#else
>     while (TreeStatement statement = parseStatement(context, directive, &directiveLiteralLength)) {
>+#endif
>         if (mode == CheckForStrictMode && !seenNonDirective) {
>             if (directive) {
>                 // "use strict" must be the exact literal without escape sequences or line continuation.
>@@ -452,7 +461,7 @@ template <class TreeBuilder> TreeExpression Parser<LexerType>::parseVarDeclarati
>     TreeExpression head = 0;
>     TreeExpression tail = 0;
>     const Identifier* lastIdent;
>-    JSToken lastIdentToken; 
>+    JSToken lastIdentToken;
>     do {
>         lastIdent = 0;
>         lastPattern = 0;
>@@ -565,6 +574,32 @@ template <class TreeBuilder> TreeDeconstructionPattern Parser<LexerType>::create
>     return context.createBindingLocation(token.m_location, name, token.m_startPosition, token.m_endPosition);
> }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+template <typename LexerType>
>+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseArrowFunctionStatement(TreeBuilder& context)
>+{
>+    ASSERT(match(ARROWFUNCTION));
>+
>+    JSTokenLocation location(tokenLocation());
>+    semanticFailIfFalse(currentScope()->isFunction(), "Return statements are only valid inside arrow functions");
>+    JSTextPosition start = tokenStartPosition();
>+    JSTextPosition end = tokenEndPosition();
>+
>+    next();
>+    TreeExpression expr = parseArrowFunctionExpression(context);
>+    failIfFalse(expr, "Cannot parse the arrow function expression");
>+    end = lastTokenEndPosition();
>+
>+    bool correcArrowFinish = match(SEMICOLON) || match(COMMA) || match(CLOSEPAREN) || match(CLOSEBRACE) || match(CLOSEBRACKET) || match(EOFTOK);
>+    failIfFalse(correcArrowFinish, "Expected a ';', ']', '}', ')', or ',' following a arrow function statement");
>+
>+    end = tokenEndPosition();
>+    setEndOfStatement();
>+
>+    return context.createReturnStatement(location, expr, start, end);
>+}
>+#endif
>+
> template <typename LexerType>
> template <class TreeBuilder> TreeDeconstructionPattern Parser<LexerType>::tryParseDeconstructionPatternExpression(TreeBuilder& context)
> {
>@@ -1138,8 +1173,13 @@ template <class TreeBuilder> TreeStatement Parser<LexerType>::parseBlockStatemen
>     return result;
> }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+template <typename LexerType>
>+template <class TreeBuilder> TreeStatement Parser<LexerType>::parseStatement(TreeBuilder& context, const Identifier*& directive, unsigned* directiveLiteralLength, FunctionParseType type)
>+#else
> template <typename LexerType>
> template <class TreeBuilder> TreeStatement Parser<LexerType>::parseStatement(TreeBuilder& context, const Identifier*& directive, unsigned* directiveLiteralLength)
>+#endif
> {
>     DepthManager statementDepth(&m_statementDepth);
>     m_statementDepth++;
>@@ -1148,6 +1188,27 @@ template <class TreeBuilder> TreeStatement Parser<LexerType>::parseStatement(Tre
>     failIfStackOverflow();
>     TreeStatement result = 0;
>     bool shouldSetEndOffset = true;
>+
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    bool handled = false;
>+    if (type == ArrowFunctionParseType) {
>+        switch (m_token.m_type) {
>+        case CLOSEPAREN:
>+        case CLOSEBRACKET:
>+        case COMMA:
>+        case SEMICOLON: {
>+            result = 0;
>+            handled = true;
>+            break;
>+        }
>+        default:
>+            break;
>+        }
>+
>+        if (handled)
>+            goto endStatemenet;
>+    }
>+#endif
>     switch (m_token.m_type) {
>     case OPENBRACE:
>         result = parseBlockStatement(context);
>@@ -1193,6 +1254,11 @@ template <class TreeBuilder> TreeStatement Parser<LexerType>::parseStatement(Tre
>     case BREAK:
>         result = parseBreakStatement(context);
>         break;
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    case ARROWFUNCTION:
>+        result = parseArrowFunctionStatement(context);
>+        break;
>+#endif
>     case RETURN:
>         result = parseReturnStatement(context);
>         break;
>@@ -1234,6 +1300,8 @@ template <class TreeBuilder> TreeStatement Parser<LexerType>::parseStatement(Tre
>         break;
>     }
> 
>+endStatemenet:
>+
>     if (result && shouldSetEndOffset)
>         context.setEndOffset(result, m_lastTokenEndPosition.offset);
>     return result;
>@@ -1254,6 +1322,23 @@ template <class TreeBuilder> TreeFormalParameterList Parser<LexerType>::parseFor
>     return list;
> }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+template <typename LexerType>
>+template <class TreeBuilder> TreeFunctionBody Parser<LexerType>::parseArrowFunctionBody(TreeBuilder& context, ConstructorKind constructorKind)
>+{
>+    JSTokenLocation startLocation(tokenLocation());
>+    unsigned startColumn = tokenColumn();
>+
>+    DepthManager statementDepth(&m_statementDepth);
>+    m_statementDepth = 0;
>+    typename TreeBuilder::FunctionBodyBuilder bodyBuilder(const_cast<VM*>(m_vm), m_lexer.get());
>+
>+    failIfFalse(parseSourceElements(bodyBuilder, CheckForStrictMode, ArrowFunctionParseType), "Cannot parse body of this arrow function");
>+    unsigned endColumn = tokenColumn();
>+    return context.createFunctionBody(startLocation, tokenLocation(), startColumn, endColumn, strictMode(), constructorKind);
>+}
>+#endif
>+
> template <typename LexerType>
> template <class TreeBuilder> TreeFunctionBody Parser<LexerType>::parseFunctionBody(TreeBuilder& context, ConstructorKind constructorKind)
> {
>@@ -1412,6 +1497,160 @@ template <class TreeBuilder> bool Parser<LexerType>::parseFunctionInfo(TreeBuild
>     return true;
> }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+template <typename LexerType>
>+template <class TreeBuilder> bool Parser<LexerType>::parseArrowFunctionInfo(TreeBuilder& context, FunctionParseMode mode, ConstructorKind constructorKind, ParserFunctionInfo<TreeBuilder>& info)
>+{
>+    AutoPopScopeRef functionScope(this, pushScope());
>+    functionScope->setIsFunction();
>+    int functionNameStart = m_token.m_location.startOffset;
>+    const Identifier* lastFunctionName = m_lastFunctionName;
>+    m_lastFunctionName = nullptr;
>+
>+    if (!match(IDENT) && !match(OPENPAREN)) {
>+        semanticFailureDueToKeyword(stringForFunctionMode(mode), " name");
>+        failWithMessage("Expected an arrow function input parameter");
>+    } else {
>+        if (match(OPENPAREN)) {
>+            consume(OPENPAREN);
>+
>+            if (!match(CLOSEPAREN)) {
>+                info.parameters = parseFormalParameters(context);
>+                failIfFalse(info.parameters, "Cannot parse parameters for this ", stringForFunctionMode(mode));
>+            }
>+
>+            consumeOrFail(CLOSEPAREN, "Expected a ')' or a ',' after a parameter declaration");
>+        } else {
>+            info.parameters = parseFormalParameters(context);
>+            failIfFalse(info.parameters, "Cannot parse parameters for this ", stringForFunctionMode(mode));
>+        }
>+    }
>+
>+    matchOrFail(ARROWFUNCTION, "Expected a '=>' after arrow function parameter declaration");
>+
>+    info.arrowFunctionOffset = m_token.m_data.offset;
>+    info.openBraceOffset = m_token.m_data.offset;
>+    info.bodyStartLine = tokenLine();
>+    info.bodyStartColumn = m_token.m_data.offset - m_token.m_data.lineStartOffset;
>+
>+    JSTokenLocation startLocation(tokenLocation());
>+
>+    // If we know about this function already, we can use the cached info and skip the parser to the end of the function.
>+    if (const SourceProviderCacheItem* cachedInfo = TreeBuilder::CanUseFunctionCache ? findCachedFunctionInfo(info.openBraceOffset) : 0) {
>+        // If we're in a strict context, the cached function info must say it was strict too.
>+        ASSERT(!strictMode() || cachedInfo->strictMode);
>+        JSTokenLocation endLocation;
>+
>+        endLocation.line = cachedInfo->closeBraceLine;
>+        endLocation.startOffset = cachedInfo->closeBraceOffset;
>+        endLocation.lineStartOffset = cachedInfo->closeBraceLineStartOffset;
>+
>+        bool endColumnIsOnStartLine = (endLocation.line == info.bodyStartLine);
>+        ASSERT(endLocation.startOffset >= endLocation.lineStartOffset);
>+        unsigned bodyEndColumn = endColumnIsOnStartLine ?
>+        endLocation.startOffset - m_token.m_data.lineStartOffset :
>+        endLocation.startOffset - endLocation.lineStartOffset;
>+        unsigned currentLineStartOffset = m_token.m_location.lineStartOffset;
>+
>+        info.body = context.createFunctionBody(startLocation, endLocation, info.bodyStartColumn, bodyEndColumn, cachedInfo->strictMode, constructorKind);
>+
>+        functionScope->restoreFromSourceProviderCache(cachedInfo);
>+        failIfFalse(popScope(functionScope, TreeBuilder::NeedsFreeVariableInfo), "Parser error");
>+
>+        info.closeBraceOffset = cachedInfo->closeBraceOffset;
>+        info.arrowFunctionBodyType = cachedInfo->isBodyArrowFunctionBlock ? ArrowFunctionBodyBlock : ArrowFunctionBodyExpression;
>+
>+        context.setFunctionNameStart(info.body, functionNameStart);
>+
>+        m_token = info.arrowFunctionBodyType == ArrowFunctionBodyBlock ? cachedInfo->closeBraceToken() : cachedInfo->endArrowFunctionToken();
>+
>+        if (endColumnIsOnStartLine)
>+            m_token.m_location.lineStartOffset = currentLineStartOffset;
>+
>+        m_lexer->setOffset(m_token.m_location.endOffset, m_token.m_location.lineStartOffset);
>+        m_lexer->setLineNumber(m_token.m_location.line);
>+
>+        context.setEndOffset(info.body, m_lexer->currentOffset());
>+
>+        if (info.arrowFunctionBodyType == ArrowFunctionBodyBlock)
>+            next();
>+
>+        info.bodyEndLine = m_lastTokenEndPosition.line;
>+        return true;
>+    }
>+    m_lastFunctionName = lastFunctionName;
>+    ParserState oldState = saveState();
>+
>+    SavePoint savePoint = createSavePoint();
>+    next();
>+    // Check if arrow body start with {. If it true it mean that arrow function is Fat arrow function
>+    // and we need use common approach to parse function body
>+
>+    info.arrowFunctionBodyType = match(OPENBRACE) ? ArrowFunctionBodyBlock : ArrowFunctionBodyExpression;
>+
>+    if (info.arrowFunctionBodyType == ArrowFunctionBodyBlock) {
>+        info.openBraceOffset = m_token.m_data.offset;
>+        info.bodyStartLine = tokenLine();
>+        info.bodyStartColumn = m_token.m_data.offset - m_token.m_data.lineStartOffset;
>+
>+        info.body = parseFunctionBody(context, constructorKind);
>+    } else {
>+        restoreSavePoint(savePoint);
>+        info.body = parseArrowFunctionBody(context, constructorKind);
>+    }
>+
>+    restoreState(oldState);
>+    failIfFalse(info.body, "Cannot parse the body of this ", stringForFunctionMode(mode));
>+    context.setEndOffset(info.body, m_lexer->currentOffset());
>+    if (functionScope->strictMode() && info.name) {
>+        RELEASE_ASSERT(mode == FunctionMode);
>+        semanticFailIfTrue(m_vm->propertyNames->arguments == *info.name, "'", info.name->impl(), "' is not a valid function name in strict mode");
>+        semanticFailIfTrue(m_vm->propertyNames->eval == *info.name, "'", info.name->impl(), "' is not a valid function name in strict mode");
>+    }
>+
>+    info.closeBraceOffset = m_token.m_data.offset;
>+
>+    unsigned closeBraceLine = m_token.m_data.line;
>+    unsigned closeBraceLineStartOffset = m_token.m_data.lineStartOffset;
>+    bool isBodyArrowFunctionBlock = info.arrowFunctionBodyType == ArrowFunctionBodyBlock;
>+
>+    // Cache the tokenizer state and the function scope the first time the function is parsed.
>+    // Any future reparsing can then skip the function.
>+    static const int minimumFunctionLengthToCache = 16;
>+    std::unique_ptr<SourceProviderCacheItem> newInfo;
>+    int functionLength = info.closeBraceOffset - info.openBraceOffset;
>+    if (TreeBuilder::CanUseFunctionCache && m_functionCache && functionLength > minimumFunctionLengthToCache) {
>+        SourceProviderCacheItemCreationParameters parameters;
>+        parameters.functionNameStart = functionNameStart;
>+        parameters.closeBraceLine = closeBraceLine;
>+        parameters.closeBraceOffset = info.closeBraceOffset;
>+        parameters.closeBraceLineStartOffset = closeBraceLineStartOffset;
>+        parameters.isBodyArrowFunctionBlock = isBodyArrowFunctionBlock;
>+        parameters.tokenType = m_token.m_type;
>+
>+        functionScope->fillParametersForSourceProviderCache(parameters);
>+        newInfo = SourceProviderCacheItem::create(parameters);
>+    }
>+    context.setFunctionNameStart(info.body, functionNameStart);
>+
>+    failIfFalse(popScope(functionScope, TreeBuilder::NeedsFreeVariableInfo), "Parser error");
>+
>+    if (info.arrowFunctionBodyType == ArrowFunctionBodyBlock) {
>+        matchOrFail(CLOSEBRACE, "Expected a closing '}' after a ", stringForFunctionMode(mode), " body");
>+        next();
>+    } else {
>+        bool isEndOfArrowFunction = match(SEMICOLON) || match(COMMA) || match(CLOSEPAREN) || match(CLOSEBRACE) || match(CLOSEBRACKET);
>+        failIfFalse(isEndOfArrowFunction, "Expected the closing ';' ',' ']' ')' '}' after arrow function");
>+    }
>+
>+    if (newInfo)
>+        m_functionCache->add(info.openBraceOffset, WTF::move(newInfo));
>+
>+    info.bodyEndLine = m_lastTokenEndPosition.line;
>+    return true;
>+}
>+#endif
>+
> template <typename LexerType>
> template <class TreeBuilder> TreeStatement Parser<LexerType>::parseFunctionDeclaration(TreeBuilder& context)
> {
>@@ -1725,6 +1964,18 @@ template <class TreeBuilder> TreeStatement Parser<LexerType>::parseIfStatement(T
>     return context.createIfStatement(ifLocation, condition, trueBlock, statementStack.last(), start, end);
> }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+template <typename LexerType>
>+template <class TreeBuilder> TreeExpression Parser<LexerType>::parseArrowFunctionExpression(TreeBuilder& context)
>+{
>+    failIfStackOverflow();
>+    TreeExpression node = parseAssignmentExpression(context);
>+    failIfFalse(node, "Cannot parse expression");
>+    context.setEndOffset(node, m_lastTokenEndPosition.offset);
>+    return node;
>+}
>+#endif
>+
> template <typename LexerType>
> template <class TreeBuilder> TreeExpression Parser<LexerType>::parseExpression(TreeBuilder& context)
> {
>@@ -1772,6 +2023,43 @@ template <typename TreeBuilder> TreeExpression Parser<LexerType>::parseAssignmen
>         }
>         restoreSavePoint(savePoint);
>     }
>+
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    SavePoint saveArrowFunctionPoint = createSavePoint();
>+    bool arrowFunctionEmptyList = false;
>+    if (match(OPENPAREN)) {
>+        next();
>+        if (match(CLOSEPAREN)) {
>+            next();
>+
>+            if (match(ARROWFUNCTION))
>+                arrowFunctionEmptyList = true;
>+        }
>+
>+        if (!arrowFunctionEmptyList)
>+            restoreSavePoint(saveArrowFunctionPoint);
>+    }
>+#endif
>+
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    TreeExpression lhs;
>+    if (!arrowFunctionEmptyList) {
>+        lhs = parseConditionalExpression(context);
>+        failIfFalse(lhs, "Cannot parse expression");
>+        if (initialNonLHSCount != m_nonLHSCount) {
>+            if (m_token.m_type >= EQUAL && m_token.m_type <= OREQUAL)
>+                semanticFail("Left hand side of operator '", getToken(), "' must be a reference");
>+
>+            return lhs;
>+        }
>+    }
>+
>+    if (match(ARROWFUNCTION)) {
>+        restoreSavePoint(saveArrowFunctionPoint);
>+        lhs = parseArrowFunctionWrapper(context);
>+        return lhs;
>+    }
>+#else
>     TreeExpression lhs = parseConditionalExpression(context);
>     failIfFalse(lhs, "Cannot parse expression");
>     if (initialNonLHSCount != m_nonLHSCount) {
>@@ -1780,7 +2068,8 @@ template <typename TreeBuilder> TreeExpression Parser<LexerType>::parseAssignmen
> 
>         return lhs;
>     }
>-    
>+#endif
>+
>     int assignmentStack = 0;
>     Operator op;
>     bool hadAssignment = false;
>@@ -2252,6 +2541,23 @@ template <class TreeBuilder> TreeExpression Parser<LexerType>::parsePrimaryExpre
>         return context.thisExpr(location);
>     }
>     case IDENT: {
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+        SavePoint saveArrowFunctionPoint = createSavePoint();
>+        JSTextPosition start = tokenStartPosition();
>+        const Identifier* ident = m_token.m_data.ident;
>+        JSTokenLocation location(tokenLocation());
>+        next();
>+
>+        if (!match(ARROWFUNCTION)) {
>+            currentScope()->useVariable(ident, m_vm->propertyNames->eval == *ident);
>+            m_lastIdentifier = ident;
>+            return context.createResolve(location, ident, start);
>+        }
>+
>+        restoreSavePoint(saveArrowFunctionPoint);
>+        TreeExpression lhs = parseArrowFunctionWrapper(context);
>+        return lhs;
>+#else
>         JSTextPosition start = tokenStartPosition();
>         const Identifier* ident = m_token.m_data.ident;
>         JSTokenLocation location(tokenLocation());
>@@ -2259,6 +2565,7 @@ template <class TreeBuilder> TreeExpression Parser<LexerType>::parsePrimaryExpre
>         currentScope()->useVariable(ident, m_vm->propertyNames->eval == *ident);
>         m_lastIdentifier = ident;
>         return context.createResolve(location, ident, start);
>+#endif
>     }
>     case STRING: {
>         const Identifier* ident = m_token.m_data.ident;
>@@ -2445,6 +2752,32 @@ endMemberExpression:
>     return base;
> }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+template <typename LexerType>
>+template <class TreeBuilder> TreeExpression Parser<LexerType>::parseArrowFunctionWrapper(TreeBuilder& context)
>+{
>+    TreeExpression base = 0;
>+    JSTextPosition expressionStart = tokenStartPosition();
>+    int newCount = 0;
>+    JSTokenLocation location;
>+
>+    if (match(IDENT) || match(OPENPAREN)) {
>+        unsigned functionKeywordStart = tokenStart();
>+        location = tokenLocation();
>+        ParserFunctionInfo<TreeBuilder> info;
>+        info.name = &m_vm->propertyNames->nullIdentifier;
>+        failIfFalse((parseArrowFunctionInfo(context, FunctionMode, ConstructorKind::Base, info)), "Cannot parse function expression");
>+        base = context.createArrowFunctionExpr(location, info, functionKeywordStart);
>+    } else
>+        base = parsePrimaryExpression(context);
>+
>+    failIfFalse(base, "Cannot parse base expression");
>+    while (newCount--)
>+        base = context.createNewExpr(location, base, expressionStart, lastTokenEndPosition());
>+    return base;
>+}
>+#endif
>+
> static const char* operatorString(bool prefix, unsigned tok)
> {
>     switch (tok) {
>diff --git a/Source/JavaScriptCore/parser/Parser.h b/Source/JavaScriptCore/parser/Parser.h
>index a1cb2950123aef3f85098daa557795a9ecfefd5f..90b2234beb09e93e3ea43e933588cbea8ba97287 100644
>--- a/Source/JavaScriptCore/parser/Parser.h
>+++ b/Source/JavaScriptCore/parser/Parser.h
>@@ -80,6 +80,9 @@ class SourceCode;
> COMPILE_ASSERT(LastUntaggedToken < 64, LessThan64UntaggedTokens);
> 
> enum SourceElementsMode { CheckForStrictMode, DontCheckForStrictMode };
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+enum FunctionParseType { StandardFunctionParseType, ArrowFunctionParseType };
>+#endif
> enum FunctionRequirements { FunctionNoRequirements, FunctionNeedsName };
> enum FunctionParseMode {
>     FunctionMode,
>@@ -540,8 +543,8 @@ private:
>     }
>     
>     ScopeStack m_scopeStack;
>-    
>-    const SourceProviderCacheItem* findCachedFunctionInfo(int openBracePos) 
>+
>+    const SourceProviderCacheItem* findCachedFunctionInfo(int openBracePos)
>     {
>         return m_functionCache ? m_functionCache->get(openBracePos) : 0;
>     }
>@@ -549,7 +552,7 @@ private:
>     Parser();
>     String parseInner();
> 
>-    void didFinishParsing(SourceElements*, DeclarationStacks::VarStack&, 
>+    void didFinishParsing(SourceElements*, DeclarationStacks::VarStack&,
>         DeclarationStacks::FunctionStack&, CodeFeatures, int, IdentifierSet&, const Vector<RefPtr<StringImpl>>&&);
> 
>     // Used to determine type of error to report.
>@@ -708,9 +711,14 @@ private:
>         }
>         return result;
>     }
>-    
>+
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    template <class TreeBuilder> TreeSourceElements parseSourceElements(TreeBuilder&, SourceElementsMode, FunctionParseType functionParseType = StandardFunctionParseType);
>+    template <class TreeBuilder> TreeStatement parseStatement(TreeBuilder&, const Identifier*& directive, unsigned* directiveLiteralLength = 0, FunctionParseType functionParseType = StandardFunctionParseType);
>+#else
>     template <class TreeBuilder> TreeSourceElements parseSourceElements(TreeBuilder&, SourceElementsMode);
>     template <class TreeBuilder> TreeStatement parseStatement(TreeBuilder&, const Identifier*& directive, unsigned* directiveLiteralLength = 0);
>+#endif
> #if ENABLE(ES6_CLASS_SYNTAX)
>     template <class TreeBuilder> TreeStatement parseClassDeclaration(TreeBuilder&);
> #endif
>@@ -755,6 +763,14 @@ private:
>     template <class TreeBuilder> TreeExpression parseVarDeclarationList(TreeBuilder&, int& declarations, TreeDeconstructionPattern& lastPattern, TreeExpression& lastInitializer, JSTextPosition& identStart, JSTextPosition& initStart, JSTextPosition& initEnd, VarDeclarationListContext);
>     template <class TreeBuilder> NEVER_INLINE TreeConstDeclList parseConstDeclarationList(TreeBuilder&);
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    template <class TreeBuilder> TreeExpression parseArrowFunctionExpression(TreeBuilder&);
>+    template <class TreeBuilder> TreeStatement parseArrowFunctionStatement(TreeBuilder&);
>+    template <class TreeBuilder> TreeExpression parseArrowFunctionWrapper(TreeBuilder&);
>+    template <class TreeBuilder> NEVER_INLINE bool parseArrowFunctionInfo(TreeBuilder&, FunctionParseMode, ConstructorKind, ParserFunctionInfo<TreeBuilder>&);
>+    template <class TreeBuilder> ALWAYS_INLINE TreeFunctionBody parseArrowFunctionBody(TreeBuilder&, ConstructorKind);
>+#endif
>+
>     template <class TreeBuilder> NEVER_INLINE TreeDeconstructionPattern createBindingPattern(TreeBuilder&, DeconstructionKind, const Identifier&, int depth, JSToken);
>     template <class TreeBuilder> NEVER_INLINE TreeDeconstructionPattern parseDeconstructionPattern(TreeBuilder&, DeconstructionKind, int depth = 0);
>     template <class TreeBuilder> NEVER_INLINE TreeDeconstructionPattern tryParseDeconstructionPatternExpression(TreeBuilder&);
>@@ -775,7 +791,14 @@ private:
>         }
>         return allowAutomaticSemicolon();
>     }
>-    
>+
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    void setEndOfStatement()
>+    {
>+        m_lexer->setTokenPosition(&m_token);
>+    }
>+#endif
>+
>     bool canRecurse()
>     {
>         return m_vm->isSafeToRecurse();
>diff --git a/Source/JavaScriptCore/parser/ParserFunctionInfo.h b/Source/JavaScriptCore/parser/ParserFunctionInfo.h
>index e20824541a30616df5b9e2b1677da079e9be77a5..a1a5a001ea98980095cd67b69d55f025af1797d3 100644
>--- a/Source/JavaScriptCore/parser/ParserFunctionInfo.h
>+++ b/Source/JavaScriptCore/parser/ParserFunctionInfo.h
>@@ -28,6 +28,10 @@
> 
> namespace JSC {
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+enum ArrowFunctionBodyType { ArrowFunctionBodyExpression, ArrowFunctionBodyBlock};
>+#endif
>+
> template <class TreeBuilder>
> struct ParserFunctionInfo {
>     const Identifier* name = 0;
>@@ -38,6 +42,10 @@ struct ParserFunctionInfo {
>     int bodyStartLine = 0;
>     int bodyEndLine = 0;
>     unsigned bodyStartColumn = 0;
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    unsigned arrowFunctionOffset = 0;
>+    ArrowFunctionBodyType arrowFunctionBodyType = ArrowFunctionBodyExpression;
>+#endif
> };
> 
> }
>diff --git a/Source/JavaScriptCore/parser/ParserTokens.h b/Source/JavaScriptCore/parser/ParserTokens.h
>index 3ff279866af6e28690bc07c5f721bc7a38056ea2..4c63dc120007421e913c1394d3a918a9aa2b0be2 100644
>--- a/Source/JavaScriptCore/parser/ParserTokens.h
>+++ b/Source/JavaScriptCore/parser/ParserTokens.h
>@@ -75,6 +75,9 @@ enum JSTokenType {
>     FINALLY,
>     DEBUGGER,
>     ELSE,
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    ARROWFUNCTION,
>+#endif
> #if ENABLE(ES6_CLASS_SYNTAX)
>     CLASSTOKEN,
>     EXTENDS,
>diff --git a/Source/JavaScriptCore/parser/SourceCode.h b/Source/JavaScriptCore/parser/SourceCode.h
>index 73d23db82af25ea46c0f89785ce424bb60eb61a7..928e712a90e348988bc355489875b09077675523 100644
>--- a/Source/JavaScriptCore/parser/SourceCode.h
>+++ b/Source/JavaScriptCore/parser/SourceCode.h
>@@ -105,6 +105,9 @@ namespace JSC {
>         
>         SourceCode subExpression(unsigned openBrace, unsigned closeBrace, int firstLine, int startColumn);
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+        SourceCode subArrowExpression(unsigned startArrowFunction, unsigned endArrowFunction, int firstLine, int startColumn);
>+#endif
>     private:
>         RefPtr<SourceProvider> m_provider;
>         int m_startChar;
>@@ -118,6 +121,17 @@ namespace JSC {
>         return SourceCode(StringSourceProvider::create(source, url, startPosition), startPosition.m_line.oneBasedInt(), startPosition.m_column.oneBasedInt());
>     }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    inline SourceCode SourceCode::subArrowExpression(unsigned startArrowFunction, unsigned endArrowFunction, int firstLine, int startColumn)
>+    {
>+        ASSERT(provider()->source()[startArrowFunction] == '=' && provider()->source()[startArrowFunction + 1] == '>');
>+        // Fixme: Use better approach to check symbol
>+        ASSERT(provider()->source()[endArrowFunction - 1] == ',' || provider()->source()[endArrowFunction - 1] == ';' || provider()->source()[endArrowFunction - 1] == ')' || provider()->source()[endArrowFunction - 1] == ']' || provider()->source()[endArrowFunction - 1] == '}');
>+        startColumn += 1; // Convert to base 1.
>+        return SourceCode(provider(), startArrowFunction, endArrowFunction - 1, firstLine, startColumn);
>+    }
>+#endif
>+
>     inline SourceCode SourceCode::subExpression(unsigned openBrace, unsigned closeBrace, int firstLine, int startColumn)
>     {
>         ASSERT(provider()->source()[openBrace] == '{');
>diff --git a/Source/JavaScriptCore/parser/SourceProviderCacheItem.h b/Source/JavaScriptCore/parser/SourceProviderCacheItem.h
>index 635379e3f445668c52b872f7616dcb5921a82944..85077a460c636c263dad097527cb7a8ecbd0b468 100644
>--- a/Source/JavaScriptCore/parser/SourceProviderCacheItem.h
>+++ b/Source/JavaScriptCore/parser/SourceProviderCacheItem.h
>@@ -40,6 +40,10 @@ struct SourceProviderCacheItemCreationParameters {
>     bool needsFullActivation;
>     bool usesEval;
>     bool strictMode;
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    bool isBodyArrowFunctionBlock;
>+    JSTokenType tokenType;
>+#endif
>     Vector<RefPtr<StringImpl>> usedVariables;
>     Vector<RefPtr<StringImpl>> writtenVariables;
> };
>@@ -69,9 +73,24 @@ public:
>         return token;
>     }
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    JSToken endArrowFunctionToken() const
>+    {
>+        JSToken token;
>+        token.m_type = tokenType;
>+        token.m_data.offset = closeBraceOffset;
>+        token.m_location.startOffset = closeBraceOffset;
>+        token.m_location.endOffset = closeBraceOffset + 1;
>+        token.m_location.line = closeBraceLine;
>+        token.m_location.lineStartOffset = closeBraceLineStartOffset;
>+
>+        return token;
>+    }
>+#endif
>+
>     unsigned functionNameStart : 31;
>     bool needsFullActivation : 1;
>-    
>+
>     unsigned closeBraceLine : 31;
>     bool usesEval : 1;
> 
>@@ -82,6 +101,11 @@ public:
>     unsigned usedVariablesCount;
>     unsigned writtenVariablesCount;
> 
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    bool isBodyArrowFunctionBlock;
>+    JSTokenType tokenType;
>+#endif
>+
>     StringImpl** usedVariables() const { return const_cast<StringImpl**>(m_variables); }
>     StringImpl** writtenVariables() const { return const_cast<StringImpl**>(&m_variables[usedVariablesCount]); }
> 
>@@ -115,6 +139,10 @@ inline SourceProviderCacheItem::SourceProviderCacheItem(const SourceProviderCach
>     , closeBraceLineStartOffset(parameters.closeBraceLineStartOffset)
>     , usedVariablesCount(parameters.usedVariables.size())
>     , writtenVariablesCount(parameters.writtenVariables.size())
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    , isBodyArrowFunctionBlock(parameters.isBodyArrowFunctionBlock)
>+    , tokenType(parameters.tokenType)
>+#endif
> {
>     unsigned j = 0;
>     for (unsigned i = 0; i < usedVariablesCount; ++i, ++j) {
>diff --git a/Source/JavaScriptCore/parser/SyntaxChecker.h b/Source/JavaScriptCore/parser/SyntaxChecker.h
>index aa38e32db166a42001ca2326808738ed200b8b5a..99855480a0c49ee6b323ca192f9fc9a35fcc50ee 100644
>--- a/Source/JavaScriptCore/parser/SyntaxChecker.h
>+++ b/Source/JavaScriptCore/parser/SyntaxChecker.h
>@@ -169,6 +169,9 @@ public:
>     ClassExpression createClassExpr(const JSTokenLocation&, const Identifier&, ExpressionType, ExpressionType, PropertyList, PropertyList) { return ClassExpr; }
> #endif
>     ExpressionType createFunctionExpr(const JSTokenLocation&, const ParserFunctionInfo<SyntaxChecker>&, int) { return FunctionExpr; }
>+#if ENABLE(ES6_ARROWFUNCTION_SYNTAX)
>+    ExpressionType createArrowFunctionExpr(const JSTokenLocation&, const ParserFunctionInfo<SyntaxChecker>&, int) { return FunctionExpr; }
>+#endif    
>     int createFunctionBody(const JSTokenLocation&, const JSTokenLocation&, int, int, bool, ConstructorKind) { return FunctionBodyResult; }
>     void setFunctionNameStart(int, int) { }
>     int createArguments() { return ArgumentsResult; }
>diff --git a/Source/JavaScriptCore/tests/stress/arrowfunction.js b/Source/JavaScriptCore/tests/stress/arrowfunction.js
>new file mode 100644
>index 0000000000000000000000000000000000000000..3d3b90a8d4b1ef928e2399ab6ab42cf7e1a49276
>--- /dev/null
>+++ b/Source/JavaScriptCore/tests/stress/arrowfunction.js
>@@ -0,0 +1,127 @@
>+var result;
>+
>+ var testCase = function (actual, expected, message) {
>+  if (actual !== expected) {
>+    throw message + ". Expected '" + expected + "', but was '" + actual + "'";
>+  }
>+};
>+
>+ var arrowFunction0 = v => v + 1;
>+result = arrowFunction0(10);
>+testCase(result, 11 ,"Error: Not correct execution of the arrow function: v => v + 1");
>+
>+ var arrowFunction1 = (v) => v * 2;
>+result = arrowFunction1(10);
>+testCase(result, 20 ,"Error: Not correct execution of the arrow function: (v) => v + 1");
>+
>+ var arrowFunction2 = () => 1000;
>+result = arrowFunction2(1212);
>+testCase(result, 1000 ,"Error: Not correct execution of the arrow function: () => 1000");
>+
>+ var tmpVarialve2_1 = 151;
>+var arrowFunction2_1 = () => tmpVarialve2_1;
>+result = arrowFunction2_1(121);
>+testCase(result, tmpVarialve2_1 ,"Error: Not correct execution of the arrow function: () => variable");
>+
>+ var arrowFunction3 = (v, x) => v + x;
>+result = arrowFunction3(11,12);
>+testCase(result, 23 ,"Error: Not correct execution of the arrow function: (x, y) => x + y");
>+
>+ var arrowFunctionWrapper = function (cl, paramter) { return cl(paramter); };
>+
>+ result = arrowFunctionWrapper(x => 1234);
>+testCase(result, 1234 ,"Error: Not correct execution of the arrow function as paramter: f(x => c)");
>+
>+ result = arrowFunctionWrapper(x => 1234, 2345);
>+testCase(result, 1234 ,"Error: Not correct execution of the arrow function as paramter: f(x => c, y)");
>+
>+ result = arrowFunctionWrapper(x => 121 + 232);
>+testCase(result, 353 ,"Error: Not correct execution of the arrow function as paramter: f(x => c1 + c2)");
>+
>+ result = arrowFunctionWrapper(x => 123 + 321, 9999);
>+testCase(result, 444 ,"Error: Not correct execution of the arrow function as paramter: f(x => c1 + c2, y)");
>+
>+ result = arrowFunctionWrapper(x => x + 12, 21);
>+testCase(result, 33 ,"Error: Not correct execution of the arrow function as paramter: f(x => x + c1, y)");
>+
>+ result = arrowFunctionWrapper((x) => x + 21, 32);
>+testCase(result, 53, "Error: Not correct execution of the arrow function as paramter: f((x) => c1 + c2, y)");
>+
>+ result = arrowFunctionWrapper(() => 100);
>+testCase(result, 100, "Error: Not correct execution of the arrow function as paramter: f(() => c)");
>+
>+ var ext_value = 121;
>+result = arrowFunctionWrapper(() => ext_value);
>+testCase(result, 121, "Error: Not correct execution of the arrow function as paramter: f(() => v)");
>+
>+ result = arrowFunctionWrapper(() => ext_value * 10);
>+testCase(result, 1210 ,"Error: Not correct execution of the arrow function as paramter: f(() => v*x)");
>+
>+ result = arrowFunctionWrapper((x) => ext_value * x, 30);
>+testCase(result, 30*ext_value ,"Error: Not correct execution of the arrow function as paramter: f((x) => v*x, y)");
>+
>+ result = arrowFunctionWrapper(() => 100, 11);
>+testCase(result, 100 ,"Error: Not correct execution of the arrow function as paramter: f(() => c1, y)");
>+
>+ result = arrowFunctionWrapper(() => 100 + 10);
>+testCase(result, 110 ,"Error: Not correct execution of the arrow function as paramter: f(() => c1 + c2)");
>+
>+ result = arrowFunctionWrapper(() => 100 + 11, 12);
>+testCase(result, 111 ,"Error: Not correct execution of the arrow function as paramter: f(() => c1 + c2, y)");
>+
>+ var arrowFunction4 = v => v + 1, xyz1 = 10101;
>+result = arrowFunction4(1011);
>+testCase(result, 1012 ,"Error: Not correct parsing of th arrow function inside of the list of vars: var af = v=> v + 1; zxc=c;");
>+testCase(xyz1, 10101 ,"Error: Not correct parsing of th arrow function inside of the list of vars: var af = v=> v + 1; zxc=c;");
>+
>+ var arrowFunctionWrapper2 = function (cl, paramter1, paramter2) { return cl(paramter1, paramter2); };
>+result = arrowFunctionWrapper2((x, y) => x + y, 12 ,43);
>+testCase(result, 55 ,"Error: Not correct execution of the arrow function as parameter: f((x, y) => x + y, c1, c2)");
>+
>+ var arrowFunctioArray0 = [v => v * 10];
>+result = arrowFunctioArray0[0](10);
>+testCase(result, 100 ,"Error: Not correct execution of the arrow function as item in array: [v=>v*10]");
>+
>+ var arrowFunctioArray1 = [v => v + 1, v => v + 2];
>+result = arrowFunctioArray1[0](10);
>+testCase(result, 11 ,"Error: Not correct execution of the arrow function as item in array: [v => v + 1,  v => v + 2]");
>+result = arrowFunctioArray1[1](11);
>+testCase(result, 13 ,"Error: Not correct execution of the arrow function as item in array: [v => v + 1,  v => v + 2]");
>+
>+ var arrowFunctioArray2 = [(v) => v + 1, (v) => v + 2];
>+result = arrowFunctioArray2[0](11);
>+testCase(result, 12 ,"Error: Not correct execution of the arrow function as item in array: [(v) => v + 1,  (v) => v + 2]");
>+result = arrowFunctioArray2[1](11);
>+testCase(result, 13 ,"Error: Not correct execution of the arrow function as item in array: [(v) => v + 1,  (v) => v + 2]");
>+
>+ var arrowFunctioArray3 = [() => 101, () => 12323];
>+result = arrowFunctioArray3[0](11);
>+testCase(result, 101, "Error: Not correct execution of the arrow function as item in array: [() => c1,  () => c2]");
>+result = arrowFunctioArray3[1](11);
>+testCase(result, 12323, "Error: Not correct execution of the arrow function as item in array: [() => c1,  () => c2]");
>+
>+ var arrowFunctionObj = {func : y => y + 12 };
>+result = arrowFunctionObj.func(11);
>+testCase(result, 23 ,"Error: Not correct execution of the arrow function as property: {func : y => y + 12 }");
>+
>+ var arrowFatFunction0 = () => { return 1000; };
>+result = arrowFatFunction0(11);
>+testCase(result, 1000 ,"Error: Not correct execution of the arrow function with body as block: () => { return 1000; }");
>+
>+ var arrowFatFunction1 = v => { var intval = 100; return v * intval; };
>+result = arrowFatFunction1(11);
>+testCase(result, 1100 ,"Error: Not correct execution of the arrow function with body as block: x => { var v=1000; return v*x; }");
>+
>+ var arrowFatFunction2 = (v) => { var int = 200; return v * int; };
>+result = arrowFatFunction2(11);
>+testCase(result, 2200 ,"Error: Not correct execution of the arrow function with body as block: (x) => { var v=1000; return v*x; }");
>+
>+ var arrowFatFunction3 = (v, x) => { var result = x * v; return result; };
>+result = arrowFatFunction3(11, 12222);
>+testCase(result, 134442 ,"Error: Not correct execution of the arrow function with body as block: (v, x) => { var result = x * v; return result; }");
>+
>+ result = arrowFunctionWrapper(x=>{return x * 25;}, 121);
>+testCase(result, 25*121 ,"Error: Not correct execution of the arrow function with body as block: f(x => {return x * 25;}, 121)");
>+
>+ result = arrowFunctionWrapper2((x, y)=>{return x * y;}, 14, 12);
>+testCase(result, 14*12 ,"Error: Not correct execution of the arrow function with body as block: f((x, y)=>{return x * y;}, 14, 121))");
>diff --git a/Source/WebCore/Configurations/FeatureDefines.xcconfig b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>index ad0b8e8c4c6ff80e132c29aa8064000c3d6dd7a9..6dd09430818fef90061fdcf3a01282f9ccdd27dc 100644
>--- a/Source/WebCore/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebCore/Configurations/FeatureDefines.xcconfig
>@@ -45,6 +45,7 @@ ENABLE_CANVAS_PATH = ENABLE_CANVAS_PATH;
> ENABLE_CANVAS_PROXY = ;
> ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
> ENABLE_ES6_CLASS_SYNTAX = ;
>+ENABLE_ES6_ARROWFUNCTION_SYNTAX = ENABLE_ES6_ARROWFUNCTION_SYNTAX;
> ENABLE_CONTENT_FILTERING = ENABLE_CONTENT_FILTERING;
> ENABLE_CSP_NEXT = ;
> ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
>@@ -209,4 +210,4 @@ ENABLE_LLINT_C_LOOP = ;
> 
> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
> 
>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
>diff --git a/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig b/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
>index ad0b8e8c4c6ff80e132c29aa8064000c3d6dd7a9..6dd09430818fef90061fdcf3a01282f9ccdd27dc 100644
>--- a/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKit/mac/Configurations/FeatureDefines.xcconfig
>@@ -45,6 +45,7 @@ ENABLE_CANVAS_PATH = ENABLE_CANVAS_PATH;
> ENABLE_CANVAS_PROXY = ;
> ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
> ENABLE_ES6_CLASS_SYNTAX = ;
>+ENABLE_ES6_ARROWFUNCTION_SYNTAX = ENABLE_ES6_ARROWFUNCTION_SYNTAX;
> ENABLE_CONTENT_FILTERING = ENABLE_CONTENT_FILTERING;
> ENABLE_CSP_NEXT = ;
> ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
>@@ -209,4 +210,4 @@ ENABLE_LLINT_C_LOOP = ;
> 
> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
> 
>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
>diff --git a/Source/WebKit2/Configurations/FeatureDefines.xcconfig b/Source/WebKit2/Configurations/FeatureDefines.xcconfig
>index ad0b8e8c4c6ff80e132c29aa8064000c3d6dd7a9..6dd09430818fef90061fdcf3a01282f9ccdd27dc 100644
>--- a/Source/WebKit2/Configurations/FeatureDefines.xcconfig
>+++ b/Source/WebKit2/Configurations/FeatureDefines.xcconfig
>@@ -45,6 +45,7 @@ ENABLE_CANVAS_PATH = ENABLE_CANVAS_PATH;
> ENABLE_CANVAS_PROXY = ;
> ENABLE_CHANNEL_MESSAGING = ENABLE_CHANNEL_MESSAGING;
> ENABLE_ES6_CLASS_SYNTAX = ;
>+ENABLE_ES6_ARROWFUNCTION_SYNTAX = ENABLE_ES6_ARROWFUNCTION_SYNTAX;
> ENABLE_CONTENT_FILTERING = ENABLE_CONTENT_FILTERING;
> ENABLE_CSP_NEXT = ;
> ENABLE_CSS_BOX_DECORATION_BREAK = ENABLE_CSS_BOX_DECORATION_BREAK;
>@@ -209,4 +210,4 @@ ENABLE_LLINT_C_LOOP = ;
> 
> ENABLE_SATURATED_LAYOUT_ARITHMETIC = ENABLE_SATURATED_LAYOUT_ARITHMETIC;
> 
>-FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
>+FEATURE_DEFINES = $(ENABLE_3D_RENDERING) $(ENABLE_ACCELERATED_2D_CANVAS) $(ENABLE_ACCELERATED_OVERFLOW_SCROLLING) $(ENABLE_AVF_CAPTIONS) $(ENABLE_ATTACHMENT_ELEMENT) $(ENABLE_CACHE_PARTITIONING) $(ENABLE_CANVAS_PATH) $(ENABLE_CANVAS_PROXY) $(ENABLE_CHANNEL_MESSAGING) $(ENABLE_ES6_CLASS_SYNTAX) $(ENABLE_ES6_ARROWFUNCTION_SYNTAX) $(ENABLE_CONTENT_FILTERING) $(ENABLE_CSP_NEXT) $(ENABLE_CSS_BOX_DECORATION_BREAK) $(ENABLE_CSS_COMPOSITING) $(ENABLE_CSS_DEVICE_ADAPTATION) $(ENABLE_CSS_GRID_LAYOUT) $(ENABLE_CSS_IMAGE_ORIENTATION) $(ENABLE_CSS_IMAGE_RESOLUTION) $(ENABLE_CSS_REGIONS) $(ENABLE_CSS_SELECTORS_LEVEL4) $(ENABLE_CSS_SHAPES) $(ENABLE_CSS3_TEXT) $(ENABLE_CSS3_TEXT_LINE_BREAK) $(ENABLE_CURSOR_VISIBILITY) $(ENABLE_CUSTOM_SCHEME_HANDLER) $(ENABLE_DASHBOARD_SUPPORT) $(ENABLE_DATALIST_ELEMENT) $(ENABLE_DATA_TRANSFER_ITEMS) $(ENABLE_DETAILS_ELEMENT) $(ENABLE_DEVICE_ORIENTATION) $(ENABLE_DOM4_EVENTS_CONSTRUCTOR) $(ENABLE_ENCRYPTED_MEDIA) $(ENABLE_ENCRYPTED_MEDIA_V2) $(ENABLE_FILTERS_LEVEL_2) $(ENABLE_FONT_LOAD_EVENTS) $(ENABLE_FULLSCREEN_API) $(ENABLE_GAMEPAD) $(ENABLE_GAMEPAD_DEPRECATED) $(ENABLE_GEOLOCATION) $(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING) $(ENABLE_ICONDATABASE) $(ENABLE_SERVICE_CONTROLS) $(ENABLE_INDEXED_DATABASE) $(ENABLE_INDEXED_DATABASE_IN_WORKERS) $(ENABLE_INDIE_UI) $(ENABLE_INPUT_TYPE_COLOR) $(ENABLE_INPUT_TYPE_COLOR_POPOVER) $(ENABLE_INPUT_TYPE_DATE) $(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE) $(ENABLE_INPUT_TYPE_DATETIMELOCAL) $(ENABLE_INPUT_TYPE_MONTH) $(ENABLE_INPUT_TYPE_TIME) $(ENABLE_INPUT_TYPE_WEEK) $(ENABLE_WIRELESS_PLAYBACK_TARGET) $(ENABLE_IOS_GESTURE_EVENTS) $(ENABLE_IOS_TEXT_AUTOSIZING) $(ENABLE_IOS_TOUCH_EVENTS) $(ENABLE_LEGACY_CSS_VENDOR_PREFIXES) $(ENABLE_LEGACY_NOTIFICATIONS) $(ENABLE_LEGACY_VENDOR_PREFIXES) $(ENABLE_LEGACY_WEB_AUDIO) $(ENABLE_LETTERPRESS) $(ENABLE_LINK_PREFETCH) $(ENABLE_MATHML) $(ENABLE_MEDIA_CONTROLS_SCRIPT) $(ENABLE_MEDIA_SOURCE) $(ENABLE_MEDIA_STATISTICS) $(ENABLE_METER_ELEMENT) $(ENABLE_MHTML) $(ENABLE_MOUSE_CURSOR_SCALE) $(ENABLE_NAVIGATOR_CONTENT_UTILS) $(ENABLE_NAVIGATOR_HWCONCURRENCY) $(ENABLE_NOTIFICATIONS) $(ENABLE_PDFKIT_PLUGIN) $(ENABLE_POINTER_LOCK) $(ENABLE_PROMISES) $(ENABLE_PROXIMITY_EVENTS) $(ENABLE_PUBLIC_SUFFIX_LIST) $(ENABLE_QUOTA) $(ENABLE_REQUEST_ANIMATION_FRAME) $(ENABLE_REQUEST_AUTOCOMPLETE) $(ENABLE_REMOTE_INSPECTOR) $(ENABLE_RESOLUTION_MEDIA_QUERY) $(ENABLE_RUBBER_BANDING) $(ENABLE_CSS_SCROLL_SNAP) $(ENABLE_SPEECH_SYNTHESIS) $(ENABLE_STREAMS_API) $(ENABLE_SUBTLE_CRYPTO) $(ENABLE_SVG_FONTS) $(ENABLE_SVG_OTF_CONVERTER) $(ENABLE_TELEPHONE_NUMBER_DETECTION) $(ENABLE_TEMPLATE_ELEMENT) $(ENABLE_TEXT_AUTOSIZING) $(ENABLE_TOUCH_EVENTS) $(ENABLE_TOUCH_ICON_LOADING) $(ENABLE_CSS_TRAILING_WORD) $(ENABLE_USERSELECT_ALL) $(ENABLE_VIDEO) $(ENABLE_VIDEO_TRACK) $(ENABLE_DATACUE_VALUE) $(ENABLE_VIEW_MODE_CSS_MEDIA) $(ENABLE_WEBGL) $(ENABLE_WEB_AUDIO) $(ENABLE_WEB_REPLAY) $(ENABLE_WEB_SOCKETS) $(ENABLE_PICTURE_SIZES) $(ENABLE_WEB_TIMING) $(ENABLE_WEBVTT_REGIONS) $(ENABLE_XHR_TIMEOUT) $(ENABLE_XSLT) $(ENABLE_FTL_JIT) $(ENABLE_LLINT_C_LOOP) $(ENABLE_SATURATED_LAYOUT_ARITHMETIC) $(ENABLE_VIDEO_PRESENTATION_MODE);
>diff --git a/Source/cmake/WebKitFeatures.cmake b/Source/cmake/WebKitFeatures.cmake
>index 887261726408344ab0252c9c0ef1fc977d063fba..0500372cb8454d84867e642e697701cdd09f28af 100644
>--- a/Source/cmake/WebKitFeatures.cmake
>+++ b/Source/cmake/WebKitFeatures.cmake
>@@ -28,6 +28,7 @@ macro(WEBKIT_OPTION_BEGIN)
>     WEBKIT_OPTION_DEFINE(ENABLE_CANVAS_PROXY "Toggle CanvasProxy support" OFF)
>     WEBKIT_OPTION_DEFINE(ENABLE_CHANNEL_MESSAGING "Toggle MessageChannel and MessagePort support" ON)
>     WEBKIT_OPTION_DEFINE(ENABLE_ES6_CLASS_SYNTAX "Toggle ES6 class syntax support" OFF)
>+    WEBKIT_OPTION_DEFINE(ENABLE_ES6_ARROWFUNCTION_SYNTAX "Toggle ES6 arrow function syntax support" ON)
>     WEBKIT_OPTION_DEFINE(ENABLE_CONTENT_FILTERING "Toggle content filtering support" OFF)
>     WEBKIT_OPTION_DEFINE(ENABLE_CONTEXT_MENUS "Toggle Context Menu support" ON)
>     WEBKIT_OPTION_DEFINE(ENABLE_CSP_NEXT "Toggle Content Security Policy 1.1 support" OFF)
>diff --git a/Source/cmakeconfig.h.cmake b/Source/cmakeconfig.h.cmake
>index 1a745ca5cd89fb20082f77bc02688a9b0b4bd4b9..3106b5ea084b38431d959944c6ca181f2fce21ff 100644
>--- a/Source/cmakeconfig.h.cmake
>+++ b/Source/cmakeconfig.h.cmake
>@@ -13,6 +13,7 @@
> #cmakedefine01 ENABLE_CANVAS_PROXY
> #cmakedefine01 ENABLE_CHANNEL_MESSAGING
> #cmakedefine01 ENABLE_ES6_CLASS_SYNTAX
>+#cmakedefine01 ENABLE_ES6_ARROWFUNCTION_SYNTAX
> #cmakedefine01 ENABLE_CONTENT_FILTERING
> #cmakedefine01 ENABLE_CONTEXT_MENUS
> #cmakedefine01 ENABLE_CREDENTIAL_STORAGE
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 85bffd2a245e460f37ea2bc2e7a1ce0e18eb7114..bcf1459c3a9edbdf902c1e7e856ce952b354be98 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,14 @@
>+2015-03-11  Skachkov Alexandr  <gskachkov@gmail.com>
>+
>+         [ES6] Implement ES6 arrow function syntax
>+        https://bugs.webkit.org/show_bug.cgi?id=140855
>+
>+         Reviewed by NOBODY (OOPS!).
>+
>+         Added feature flag ENABLE_ES6_ARROWFUNCTION_SYNTAX for arrow function
>+
>+         * Scripts/webkitperl/FeatureList.pm:
>+
> 2015-03-10  Brent Fulgham  <bfulgham@apple.com>
> 
>         Regression(r181257): WTF_WorkQueue.Simple is flaky
>diff --git a/Tools/Scripts/webkitperl/FeatureList.pm b/Tools/Scripts/webkitperl/FeatureList.pm
>index 35425f5e4b555af30032d21ee3caec6854f79a4b..9a2a732efdfe95a61074c2e20822ffe51adc0baf 100644
>--- a/Tools/Scripts/webkitperl/FeatureList.pm
>+++ b/Tools/Scripts/webkitperl/FeatureList.pm
>@@ -44,6 +44,7 @@ BEGIN {
> my (
>     $threeDRenderingSupport,
>     $accelerated2DCanvasSupport,
>+    $arrowfunctionSyntax,
>     $batteryStatusSupport,
>     $canvasPathSupport,
>     $canvasProxySupport,
>@@ -154,6 +155,9 @@ my @features = (
>     { option => "accelerated-2d-canvas", desc => "Toggle Accelerated 2D Canvas support",
>       define => "ENABLE_ACCELERATED_2D_CANVAS", default => isGtk(), value => \$accelerated2DCanvasSupport },
> 
>+    { option => "arrowfunction-syntax", desc => "Toggle ES6 arrow function syntax support",
>+      define => "ENABLE_ES6_ARROWFUNCTION_SYNTAX", default => 1, value => \$arrowfunctionSyntax },
>+
>     { option => "battery-status", desc => "Toggle Battery Status support",
>       define => "ENABLE_BATTERY_STATUS", default => isEfl(), value => \$batteryStatusSupport },
> 
>diff --git a/ChangeLog b/ChangeLog
>index 3c4916f48a2f64c35d1fdcf8bfda799a6737a0ed..38441f302e9eb890f2937223598ab5925d750844 100644
>--- a/ChangeLog
>+++ b/ChangeLog
>@@ -1,3 +1,15 @@
>+2015-03-11  Skachkov Alexandr  <gskachkov@gmail.com>
>+
>+         [ES6] Implement ES6 arrow function syntax
>+        https://bugs.webkit.org/show_bug.cgi?id=140855
>+
>+         Reviewed by NOBODY (OOPS!).
>+
>+         Added feature flag to switch on/off es6 arrow function ENABLE_ES6_ARROWFUNCTION_SYNTAX
>+
>+         * Source/cmake/WebKitFeatures.cmake:
>+         * Source/cmakeconfig.h.cmake:
>+
> 2015-03-10  Carlos Garcia Campos  <cgarcia@igalia.com> and JosÃ© Dapena Paz  <jdapena@igalia.com>
> 
>         [GTK] Add a configure option to build with OpenGL ES 2

Actions: View | Formatted Diff | Diff

Attachments on bug 140855: 247543 | 247579 | 247598 | 247599 | 247600 | 247601 | 247886 | 247894 | 247906 | 247909 | 247934 | 248363 | 248414 | 249479 | 249529 | 249563 | 249565 | 249587 | 249664 | 249862 | 249940 | 249942 | 249946 | 249965 | 249966 | 249967 | 249968 | 250421 | 250425 | 250430 | 250437 | 250438 | 250618 | 250626 | 250628 | 250629 | 250633 | 250643 | 250647 | 250649 | 250651 | 250656 | 250911 | 250912 | 251029 | 251037 | 251050 | 251055 | 251056 | 251057 | 251059 | 251061 | 251063 | 251129 | 252149 | 252164 | 252174 | 252175 | 252184 | 252189 | 252191 | 252199 | 252201 | 252204 | 252205 | 252411 | 252412 | 252416 | 252606 | 252633 | 252637