diff options
| author | Ben Murdoch <benm@google.com> | 2011-05-13 16:23:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2011-05-16 11:35:02 +0100 |
| commit | 65f03d4f644ce73618e5f4f50dd694b26f55ae12 (patch) | |
| tree | f478babb801e720de7bfaee23443ffe029f58731 /Source/JavaScriptCore/JavaScriptCore.gypi | |
| parent | 47de4a2fb7262c7ebdb9cd133ad2c54c187454d0 (diff) | |
| download | external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.zip external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.gz external_webkit-65f03d4f644ce73618e5f4f50dd694b26f55ae12.tar.bz2 | |
Merge WebKit at r75993: Initial merge by git.
Change-Id: I602bbdc3974787a3b0450456a30a7868286921c3
Diffstat (limited to 'Source/JavaScriptCore/JavaScriptCore.gypi')
| -rw-r--r-- | Source/JavaScriptCore/JavaScriptCore.gypi | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/Source/JavaScriptCore/JavaScriptCore.gypi b/Source/JavaScriptCore/JavaScriptCore.gypi index e60969e..a08b439 100644 --- a/Source/JavaScriptCore/JavaScriptCore.gypi +++ b/Source/JavaScriptCore/JavaScriptCore.gypi @@ -182,8 +182,10 @@ 'runtime/CallData.cpp', 'runtime/CallData.h', 'runtime/ClassInfo.h', - 'runtime/Collector.cpp', - 'runtime/Collector.h', + 'runtime/MarkedSpace.cpp', + 'runtime/MarkedSpace.h', + 'runtime/Heap.cpp', + 'runtime/Heap.h', 'runtime/CollectorHeapIterator.h', 'runtime/CommonIdentifiers.cpp', 'runtime/CommonIdentifiers.h', @@ -276,6 +278,8 @@ 'runtime/LiteralParser.h', 'runtime/Lookup.cpp', 'runtime/Lookup.h', + 'runtime/MachineStackMarker.cpp', + 'runtime/MachineStackMarker.h', 'runtime/MarkStack.cpp', 'runtime/MarkStack.h', 'runtime/MarkStackWin.cpp', @@ -492,13 +496,16 @@ 'wtf/win/MainThreadWin.cpp', 'wtf/win/OwnPtrWin.cpp', 'wtf/wx/MainThreadWx.cpp', - 'yarr/RegexInterpreter.cpp', - 'yarr/RegexInterpreter.h', - 'yarr/RegexJIT.cpp', - 'yarr/RegexJIT.h', - 'yarr/RegexParser.h', - 'yarr/RegexPattern.cpp', - 'yarr/RegexPattern.h', + 'yarr/Yarr.h' + 'yarr/YarrInterpreter.cpp', + 'yarr/YarrInterpreter.h', + 'yarr/YarrJIT.cpp', + 'yarr/YarrJIT.h', + 'yarr/YarrParser.h', + 'yarr/YarrPattern.cpp', + 'yarr/YarrPattern.h', + 'yarr/YarrSyntaxChecker.cpp', + 'yarr/YarrSyntaxChecker.h', ] } } |