From 28040489d744e0c5d475a88663056c9040ed5320 Mon Sep 17 00:00:00 2001
From: Teng-Hui Zhu <ztenghui@google.com>
Date: Wed, 10 Nov 2010 15:31:59 -0800
Subject: Merge WebKit at r71558: Initial merge by git.

Change-Id: Ib345578fa29df7e4bc72b4f00e4a6fddcb754c4c
---
 .../JavaScriptCore.vcproj/WTF/WTF.vcproj           | 292 +++++++++++++--------
 1 file changed, 188 insertions(+), 104 deletions(-)

(limited to 'JavaScriptCore/JavaScriptCore.vcproj/WTF')

diff --git a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
index 3a53070..c0ecd45 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
+++ b/JavaScriptCore/JavaScriptCore.vcproj/WTF/WTF.vcproj
@@ -244,6 +244,114 @@
 				>
 			</File>
 		</Filter>
+		<Filter
+			Name="unicode"
+			>
+			<File
+				RelativePath="..\..\wtf\unicode\Collator.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\unicode\Unicode.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\unicode\UnicodeMacrosFromICU.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\unicode\UTF8.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\unicode\UTF8.h"
+				>
+			</File>
+			<Filter
+				Name="icu"
+				>
+				<File
+					RelativePath="..\..\wtf\unicode\icu\CollatorICU.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\wtf\unicode\icu\UnicodeIcu.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="text"
+			>
+			<File
+				RelativePath="..\..\wtf\text\AtomicString.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\text\AtomicString.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\text\AtomicStringHash.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\text\AtomicStringImpl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\text\CString.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\text\CString.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\text\StringBuffer.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\text\StringBuilder.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\text\StringBuilder.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\text\StringConcatenate.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\text\StringHash.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\text\StringImpl.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\text\StringImpl.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\text\StringImplBase.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\text\StringStatics.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\text\WTFString.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\wtf\text\WTFString.h"
+				>
+			</File>
+		</Filter>
 		<File
 			RelativePath="..\..\wtf\AlwaysInline.h"
 			>
@@ -265,23 +373,27 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\ByteArray.cpp"
+			RelativePath="..\..\wtf\AVLTree.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\ByteArray.h"
+			RelativePath="..\..\wtf\Bitmap.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\unicode\Collator.h"
+			RelativePath="..\..\wtf\BumpPointerAllocator.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\unicode\CollatorDefault.cpp"
+			RelativePath="..\..\wtf\ByteArray.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\unicode\icu\CollatorICU.cpp"
+			RelativePath="..\..\wtf\ByteArray.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\wtf\Complex.h"
 			>
 		</File>
 		<File
@@ -297,23 +409,27 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\Deque.h"
+			RelativePath="..\..\wtf\DecimalNumber.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\dtoa.cpp"
+			RelativePath="..\..\wtf\DecimalNumber.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\dtoa.h"
+			RelativePath="..\..\wtf\Deque.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\DecimalNumber.cpp"
+			RelativePath="..\..\wtf\DisallowCType.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\DecimalNumber.h"
+			RelativePath="..\..\wtf\dtoa.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\wtf\dtoa.h"
 			>
 		</File>
 		<File
@@ -337,7 +453,7 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\FastMallocInternal.h"
+			RelativePath="..\..\wtf\FixedArray.h"
 			>
 		</File>
 		<File
@@ -357,6 +473,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\wtf\HashIterators.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\wtf\HashMap.h"
 			>
 		</File>
@@ -389,31 +509,31 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\MD5.cpp"
+			RelativePath="..\..\wtf\MainThread.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\MD5.h"
+			RelativePath="..\..\wtf\MainThread.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\MainThread.cpp"
+			RelativePath="..\..\wtf\MallocZoneSupport.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\MainThread.h"
+			RelativePath="..\..\wtf\MathExtras.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\MathExtras.h"
+			RelativePath="..\..\wtf\MD5.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\MessageQueue.h"
+			RelativePath="..\..\wtf\MD5.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\NonCopyingSort.h"
+			RelativePath="..\..\wtf\MessageQueue.h"
 			>
 		</File>
 		<File
@@ -421,19 +541,23 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\wtf\NonCopyingSort.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\wtf\NotFound.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\OwnArrayPtr.h"
+			RelativePath="..\..\wtf\NullPtr.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\OwnFastMallocPtr.h"
+			RelativePath="..\..\wtf\NullPtr.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\OwnPtr.h"
+			RelativePath="..\..\wtf\OwnArrayPtr.h"
 			>
 		</File>
 		<File
@@ -441,6 +565,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\wtf\OwnFastMallocPtr.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\wtf\OwnPtr.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\wtf\OwnPtrCommon.h"
 			>
 		</File>
@@ -473,7 +605,11 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\PtrAndFlags.h"
+			RelativePath="..\..\wtf\PlatformRefPtr.h"
+			>
+		</File>
+		<File
+			RelativePath="..\..\wtf\PossiblyNull.h"
 			>
 		</File>
 		<File
@@ -497,6 +633,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\wtf\RefCountedLeakCounter.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\wtf\RefPtr.h"
 			>
 		</File>
@@ -513,14 +653,30 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\wtf\SizeLimits.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\wtf\StaticConstructors.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\wtf\StdLibExtras.h"
 			>
 		</File>
 		<File
+			RelativePath="..\..\wtf\StringExtras.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\wtf\StringExtras.h"
 			>
 		</File>
 		<File
+			RelativePath="..\..\wtf\StringHasher.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\wtf\TCPackedCache.h"
 			>
 		</File>
@@ -549,6 +705,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\wtf\ThreadingNone.cpp"
+			>
+		</File>
+		<File
 			RelativePath="..\..\wtf\ThreadingPrimitives.h"
 			>
 		</File>
@@ -577,103 +737,27 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\unicode\Unicode.h"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\unicode\icu\UnicodeIcu.h"
+			RelativePath="..\..\wtf\UnusedParam.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\UnusedParam.h"
+			RelativePath="..\..\wtf\ValueCheck.h"
 			>
 		</File>
 		<File
- 			RelativePath="..\..\wtf\text\AtomicString.cpp"
- 			>
- 		</File>
- 		<File
- 			RelativePath="..\..\wtf\text\AtomicString.h"
- 			>
- 		</File>
- 		<File
- 			RelativePath="..\..\wtf\text\AtomicStringHash.h"
- 			>
- 		</File>
- 		<File
- 			RelativePath="..\..\wtf\text\AtomicStringImpl.h"
- 			>
- 		</File>
-		<File
- 			RelativePath="..\..\wtf\text\CString.cpp"
- 			>
- 		</File>
- 		<File
- 			RelativePath="..\..\wtf\text\CString.h"
- 			>
- 		</File>
-		<File
- 			RelativePath="..\..\wtf\text\StringStatics.cpp"
- 			>
- 		</File>
- 		<File
- 			RelativePath="..\..\wtf\text\StringBuffer.h"
- 			>
- 		</File>
- 		<File
- 			RelativePath="..\..\wtf\text\StringBuilder.cpp"
- 			>
- 		</File>
- 		<File
- 			RelativePath="..\..\wtf\text\StringBuilder.h"
- 			>
- 		</File>
- 		<File
- 			RelativePath="..\..\wtf\text\StringConcatenate.h"
- 			>
- 		</File>
- 		<File
- 			RelativePath="..\..\wtf\text\StringHash.h"
- 			>
- 		</File>
-		<File
- 			RelativePath="..\..\wtf\text\StringImpl.cpp"
- 			>
- 		</File>
- 		<File
- 			RelativePath="..\..\wtf\text\StringImpl.h"
- 			>
- 		</File>
- 		<File
- 			RelativePath="..\..\wtf\text\TextPosition.h"
- 			>
- 		</File>
-		<File
- 			RelativePath="..\..\wtf\text\WTFString.cpp"
- 			>
- 		</File>
- 		<File
- 			RelativePath="..\..\wtf\text\WTFString.h"
- 			>
- 		</File>
- 		<File
-			RelativePath="..\..\wtf\unicode\UTF8.cpp"
-			>
-		</File>
-		<File
-			RelativePath="..\..\wtf\unicode\UTF8.h"
+			RelativePath="..\..\wtf\Vector.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\ValueCheck.h"
+			RelativePath="..\..\wtf\Vector3.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\Vector.h"
+			RelativePath="..\..\wtf\VectorTraits.h"
 			>
 		</File>
 		<File
-			RelativePath="..\..\wtf\VectorTraits.h"
+			RelativePath="..\..\wtf\VMTags.h"
 			>
 		</File>
 		<File
-- 
cgit v1.1