diff options
| author | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-05 23:14:41 +0000 |
|---|---|---|
| committer | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-05 23:14:41 +0000 |
| commit | 89b9208ab8d4dd8dacbc1ba39a81943fa7ec5796 (patch) | |
| tree | a57aa8885f826a518e9eb37e2f99e4487423a965 /webkit/port | |
| parent | e75cb49e1658fc0957a158e98910c0a7d172380b (diff) | |
| download | chromium_src-89b9208ab8d4dd8dacbc1ba39a81943fa7ec5796.zip chromium_src-89b9208ab8d4dd8dacbc1ba39a81943fa7ec5796.tar.gz chromium_src-89b9208ab8d4dd8dacbc1ba39a81943fa7ec5796.tar.bz2 | |
WebKit Merge 39520:39606, Chromium side
No Mac/SCons project changes needed. No regressions, a few new tests.
Review URL: http://codereview.chromium.org/17060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@7569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/port')
| -rw-r--r-- | webkit/port/DerivedSources.make | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/webkit/port/DerivedSources.make b/webkit/port/DerivedSources.make index cd0c02e..598cfcb 100644 --- a/webkit/port/DerivedSources.make +++ b/webkit/port/DerivedSources.make @@ -1007,7 +1007,20 @@ XPathGrammar.cpp : xml/XPathGrammar.y $(PROJECT_FILE) # user agent style sheets -USER_AGENT_STYLE_SHEETS = $(WebCore)/css/html4.css $(WebCore)/css/quirks.css $(WebCore)/css/view-source.css $(WebCore)/css/svg.css $(WebCore)/css/wml.css $(WebCore)/css/themeWin.css $(WebCore)/css/themeWinQuirks.css +USER_AGENT_STYLE_SHEETS = $(WebCore)/css/html4.css $(WebCore)/css/quirks.css $(WebCore)/css/view-source.css $(WebCore)/css/themeWin.css $(WebCore)/css/themeWinQuirks.css + +ifeq ($(findstring ENABLE_SVG,$(FEATURE_DEFINES)), ENABLE_SVG) + USER_AGENT_STYLE_SHEETS := $(USER_AGENT_STYLE_SHEETS) $(WebCore)/css/svg.css +endif + +ifeq ($(findstring ENABLE_WML,$(FEATURE_DEFINES)), ENABLE_WML) + USER_AGENT_STYLE_SHEETS := $(USER_AGENT_STYLE_SHEETS) $(WebCore)/css/wml.css +endif + +ifeq ($(findstring ENABLE_VIDEO,$(FEATURE_DEFINES)), ENABLE_VIDEO) + USER_AGENT_STYLE_SHEETS := $(USER_AGENT_STYLE_SHEETS) $(WebCore)/css/mediaControls.css +endif + UserAgentStyleSheets.h : css/make-css-file-arrays.pl $(USER_AGENT_STYLE_SHEETS) perl $< $@ UserAgentStyleSheetsData.cpp $(USER_AGENT_STYLE_SHEETS) |