From b13253836c8c98d13a8c44d6b23bdad477fb2179 Mon Sep 17 00:00:00 2001
From: "mpcomplete@google.com"
 <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 5 Dec 2008 21:29:08 +0000
Subject: Un-revert 6386 (my CSS change).  Layout tests pass for me.  I think
 the builders just need a clobber when this is checked in.

I also fixed the SConscript and deleted the old CSS files.
Review URL: http://codereview.chromium.org/13146

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6452 0039d316-1c4b-4281-b951-d872f2087c98
---
 webkit/build/WebCore/WebCore.vcproj |  8 ++++++++
 webkit/build/port/SConscript        | 16 ++++------------
 webkit/build/port/port.vcproj       | 12 ------------
 3 files changed, 12 insertions(+), 24 deletions(-)

(limited to 'webkit/build')

diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index d9a7d9e..1b491a7 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -2274,6 +2274,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\css\themeWin.css"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\css\themeWinQuirks.css"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\css\tokenizer.flex"
 				>
 			</File>
diff --git a/webkit/build/port/SConscript b/webkit/build/port/SConscript
index 1e16989..ae87fb5 100644
--- a/webkit/build/port/SConscript
+++ b/webkit/build/port/SConscript
@@ -542,23 +542,15 @@ def cat_files(target, source, env):
     fin.close()
   fout.close()
 
-env.Command('$DERIVED_DIR/html4.css',
-            ['$PORT_DIR/css/html4.css',
-             '$PORTROOT/css/html4-overrides.css'],
-            cat_files)
-
-env.Command('$DERIVED_DIR/quirks.css',
-            ['$PORT_DIR/css/quirks.css',
-             '$PORTROOT/css/quirks-overrides.css'],
-            cat_files)
-
 env.Command(['$DERIVED_DIR/UserAgentStyleSheets.h',
              '$DERIVED_DIR/UserAgentStyleSheetsData.cpp'],
             ['$PORT_DIR/css/make-css-file-arrays.pl',
              '$PORT_DIR/css/view-source.css',
              '$PORT_DIR/css/svg.css',
-             '$DERIVED_DIR/html4.css',
-             '$DERIVED_DIR/quirks.css'],
+             '$PORT_DIR/css/html4.css',
+             '$PORT_DIR/css/quirks.css',
+             '$PORT_DIR/css/themeWin.css',
+             '$PORT_DIR/css/themeWinQuirks.css'],
             '$PERL ${SOURCES[0].posix} ${TARGETS.posix} ${SOURCES[1:].posix}')
 
 def create_h_wrapper(target, source, env):
diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj
index 4e31f62..6ed828c 100644
--- a/webkit/build/port/port.vcproj
+++ b/webkit/build/port/port.vcproj
@@ -137,18 +137,6 @@
 	</References>
 	<Files>
 		<Filter
-			Name="css"
-			>
-			<File
-				RelativePath="..\..\port\css\html4-overrides.css"
-				>
-			</File>
-			<File
-				RelativePath="..\..\port\css\quirks-overrides.css"
-				>
-			</File>
-		</Filter>
-		<Filter
 			Name="page"
 			>
 			<File
-- 
cgit v1.1