diff options
| author | Ben Murdoch <benm@google.com> | 2010-10-22 13:02:20 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-10-26 15:21:41 +0100 |
| commit | a94275402997c11dd2e778633dacf4b7e630a35d (patch) | |
| tree | e66f56c67e3b01f22c9c23cd932271ee9ac558ed /JavaScriptCore/JavaScriptCore.gypi | |
| parent | 09e26c78506587b3f5d930d7bc72a23287ffbec0 (diff) | |
| download | external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.zip external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.gz external_webkit-a94275402997c11dd2e778633dacf4b7e630a35d.tar.bz2 | |
Merge WebKit at r70209: Initial merge by Git
Change-Id: Id23a68efa36e9d1126bcce0b137872db00892c8e
Diffstat (limited to 'JavaScriptCore/JavaScriptCore.gypi')
| -rw-r--r-- | JavaScriptCore/JavaScriptCore.gypi | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/JavaScriptCore/JavaScriptCore.gypi b/JavaScriptCore/JavaScriptCore.gypi index 462960d..6252d07 100644 --- a/JavaScriptCore/JavaScriptCore.gypi +++ b/JavaScriptCore/JavaScriptCore.gypi @@ -346,6 +346,8 @@ 'runtime/Tracing.h', 'runtime/UString.cpp', 'runtime/UString.h', + 'runtime/UStringBuilder.h', + 'runtime/UStringConcatenate.h', 'runtime/WeakRandom.h', 'wtf/AlwaysInline.h', 'wtf/ASCIICType.h', @@ -363,6 +365,7 @@ 'wtf/CurrentTime.h', 'wtf/DateMath.cpp', 'wtf/DateMath.h', + 'wtf/DecimalNumber.cpp', 'wtf/Deque.h', 'wtf/DisallowCType.h', 'wtf/dtoa.cpp', @@ -422,7 +425,7 @@ 'wtf/StaticConstructors.h', 'wtf/StdLibExtras.h', 'wtf/StringExtras.h', - 'wtf/StringHashFunctions.h', + 'wtf/StringHasher.h', 'wtf/TCPackedCache.h', 'wtf/qt/MainThreadQt.cpp', 'wtf/qt/StringQt.cpp', @@ -450,6 +453,10 @@ 'wtf/text/AtomicStringImpl.h', 'wtf/text/CString.cpp', 'wtf/text/CString.h', + 'wtf/text/StringBuffer.h', + 'wtf/text/StringBuilder.cpp', + 'wtf/text/StringBuilder.h', + 'wtf/text/StringConcatenate.h', 'wtf/text/StringHash.h', 'wtf/text/StringImpl.cpp', 'wtf/text/StringImpl.h', |