From 12117f3379caccd1e75cbee72f94667073b14d18 Mon Sep 17 00:00:00 2001
From: "darin@chromium.org"
 <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 11 Mar 2009 18:18:57 +0000
Subject: Re-apply the webkit merge.  This is a revert of 11454 and 11455.

TBR=jar

Review URL: http://codereview.chromium.org/42080

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11457 0039d316-1c4b-4281-b951-d872f2087c98
---
 webkit/build/JavaScriptCore/SConscript | 1 -
 webkit/build/JavaScriptCore/WTF.vcproj | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'webkit/build/JavaScriptCore')

diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index b8c612c..08c577c 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -149,7 +149,6 @@ wtf_inputs = [
     '$WTF_DIR/ByteArray.cpp',
     '$WTF_DIR/Assertions.cpp',
     '$WTF_DIR/chromium/MainThreadChromium.cpp',
-    '$WTF_DIR/CurrentTime.cpp',
     '$WTF_DIR/dtoa.cpp',
     '$WTF_DIR/FastMalloc.cpp',
     '$WTF_DIR/HashTable.cpp',
diff --git a/webkit/build/JavaScriptCore/WTF.vcproj b/webkit/build/JavaScriptCore/WTF.vcproj
index 502ca67..77bc8ef 100644
--- a/webkit/build/JavaScriptCore/WTF.vcproj
+++ b/webkit/build/JavaScriptCore/WTF.vcproj
@@ -170,6 +170,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\CrossThreadRefCounted.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\CurrentTime.h"
 			>
 		</File>
-- 
cgit v1.1