Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(216)

Unified Diff: webkit/webkit.gyp

Issue 100195: Enable video in linux build and remove unneeded ifdefs to guard windows. (Closed)
Patch Set: Fix inifite loop. Created 11 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/media.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/webkit.gyp
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index f759ba3cf0301ca29857b4a8ce5863deb62f45c2..320e610b58b20e01e1bd0ed47566e3b8a3336c00 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -19,6 +19,7 @@
'ENABLE_SVG_USE=1',
'ENABLE_SVG_FOREIGN_OBJECT=1',
'ENABLE_SVG_FONTS=1',
+ 'ENABLE_VIDEO=1',
'ENABLE_WORKERS=1',
],
'non_feature_defines': [
@@ -106,9 +107,6 @@
],
}],
['OS=="win"', {
- 'feature_defines': [
- 'ENABLE_VIDEO=1'
- ],
'non_feature_defines': [
'CRASH=__debugbreak',
# Match Safari and Mozilla on Windows.
@@ -120,10 +118,6 @@
'../third_party/WebKit/WebCore/platform/text/win',
'../third_party/WebKit/WebCore/platform/win',
],
- }, { # else: OS!="win"
- 'feature_defines': [
- 'ENABLE_VIDEO=0'
- ],
}],
],
},
@@ -4138,9 +4132,6 @@
['exclude', 'Win\\.cpp$'],
['exclude', '/(Windows|Uniscribe)[^/]*\\.cpp$']
],
- 'sources!': [
- '../third_party/WebKit/WebCore/platform/graphics/MediaPlayer.cpp',
- ],
}],
],
},
« no previous file with comments | « media/media.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698