diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-01 23:25:36 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-01 23:25:36 +0000 |
| commit | 3579c4dbb74148d4d3f0bb594a099c97811b029e (patch) | |
| tree | 5fa9f0c6a7f30f8cc6053e66995c7b96bf035648 /webkit | |
| parent | c238b694ea2c28b28c30f983e38ccf846a637234 (diff) | |
| download | chromium_src-3579c4dbb74148d4d3f0bb594a099c97811b029e.zip chromium_src-3579c4dbb74148d4d3f0bb594a099c97811b029e.tar.gz chromium_src-3579c4dbb74148d4d3f0bb594a099c97811b029e.tar.bz2 | |
Revert "Enable video in posix builds and remove unneeded ifdefs to guard windows."
This reverts commit 9c23aa9006918e7091742e1826181db081a16a65.
TBR=evan
Review URL: http://codereview.chromium.org/101020
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@15121 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/webkit.gyp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp index 320e610..f759ba3 100644 --- a/webkit/webkit.gyp +++ b/webkit/webkit.gyp @@ -19,7 +19,6 @@ 'ENABLE_SVG_USE=1', 'ENABLE_SVG_FOREIGN_OBJECT=1', 'ENABLE_SVG_FONTS=1', - 'ENABLE_VIDEO=1', 'ENABLE_WORKERS=1', ], 'non_feature_defines': [ @@ -107,6 +106,9 @@ ], }], ['OS=="win"', { + 'feature_defines': [ + 'ENABLE_VIDEO=1' + ], 'non_feature_defines': [ 'CRASH=__debugbreak', # Match Safari and Mozilla on Windows. @@ -118,6 +120,10 @@ '../third_party/WebKit/WebCore/platform/text/win', '../third_party/WebKit/WebCore/platform/win', ], + }, { # else: OS!="win" + 'feature_defines': [ + 'ENABLE_VIDEO=0' + ], }], ], }, @@ -4132,6 +4138,9 @@ ['exclude', 'Win\\.cpp$'], ['exclude', '/(Windows|Uniscribe)[^/]*\\.cpp$'] ], + 'sources!': [ + '../third_party/WebKit/WebCore/platform/graphics/MediaPlayer.cpp', + ], }], ], }, |