diff options
| author | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-05 21:29:08 +0000 |
|---|---|---|
| committer | mpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-05 21:29:08 +0000 |
| commit | b13253836c8c98d13a8c44d6b23bdad477fb2179 (patch) | |
| tree | de8a40d4ede83a4c8341cd09dd79e7d99c72b264 /webkit/build/port | |
| parent | faf4d4d4a80456caf39fbc547763f80bee50acee (diff) | |
| download | chromium_src-b13253836c8c98d13a8c44d6b23bdad477fb2179.zip chromium_src-b13253836c8c98d13a8c44d6b23bdad477fb2179.tar.gz chromium_src-b13253836c8c98d13a8c44d6b23bdad477fb2179.tar.bz2 | |
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
Diffstat (limited to 'webkit/build/port')
| -rw-r--r-- | webkit/build/port/SConscript | 16 | ||||
| -rw-r--r-- | webkit/build/port/port.vcproj | 12 |
2 files changed, 4 insertions, 24 deletions
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
|