From 3bc5360723f5b6287a99d67cc4c104e3eec5ca53 Mon Sep 17 00:00:00 2001
From: "levin@chromium.org"
 <levin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Wed, 14 Jan 2009 00:50:33 +0000
Subject: Webkit merge 39829:39744, Chromium portion.

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7995 0039d316-1c4b-4281-b951-d872f2087c98
---
 webkit/build/JavaScriptCore/SConscript |  1 +
 webkit/build/JavaScriptCore/WTF.vcproj | 12 ++++++++++++
 webkit/build/WebCore/SConscript        |  1 -
 webkit/build/WebCore/WebCore.vcproj    |  4 ----
 4 files changed, 13 insertions(+), 5 deletions(-)

(limited to 'webkit/build')

diff --git a/webkit/build/JavaScriptCore/SConscript b/webkit/build/JavaScriptCore/SConscript
index afb7f10..e691d31 100644
--- a/webkit/build/JavaScriptCore/SConscript
+++ b/webkit/build/JavaScriptCore/SConscript
@@ -148,6 +148,7 @@ if env.Bit('windows'):
 wtf_inputs = [
     '$JAVASCRIPTCORE_DIR/runtime/ByteArray.cpp',
     '$WTF_DIR/Assertions.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 fcdb697..baf5d8c 100644
--- a/webkit/build/JavaScriptCore/WTF.vcproj
+++ b/webkit/build/JavaScriptCore/WTF.vcproj
@@ -154,6 +154,14 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\CurrentTime.cpp"
+			>
+		</File>
+		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\CurrentTime.h"
+			>
+		</File>
+		<File
 			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\Deque.h"
 			>
 		</File>
@@ -246,6 +254,10 @@
 			>
 		</File>
 		<File
+			RelativePath="..\..\..\third_party\WebKit\JavaScriptCore\wtf\PtrAndFlags.h"
+			>
+		</File>
+		<File
 			RelativePath="..\precompiled_webkit.cc"
 			>
 			<FileConfiguration
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index be7e4f0..d905cd4 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -846,7 +846,6 @@ input_files = [
     '$WEBCORE_DIR/svg/graphics/SVGResourceMarker.cpp',
     '$WEBCORE_DIR/svg/graphics/SVGResourceMasker.cpp',
 
-    '$WEBCORE_DIR/svg/graphics/skia/RenderPathSkia.cpp',
     '$WEBCORE_DIR/svg/graphics/skia/SVGPaintServerPatternSkia.cpp',
     '$WEBCORE_DIR/svg/graphics/skia/SVGPaintServerSkia.cpp',
     '$WEBCORE_DIR/svg/graphics/skia/SVGResourceFilterSkia.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 8ae60a5..29e7cbf 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -7052,10 +7052,6 @@
 					Name="skia"
 					>
 					<File
-						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\RenderPathSkia.cpp"
-						>
-					</File>
-					<File
 						RelativePath="..\..\..\third_party\WebKit\WebCore\svg\graphics\skia\SVGPaintServerPatternSkia.cpp"
 						>
 					</File>
-- 
cgit v1.1