diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-31 23:45:46 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-31 23:45:46 +0000 |
| commit | 3953428eedab395e93faf28ee21270d748ca74b9 (patch) | |
| tree | 3a1f1be6107785d9189d9187f4400b4ea60bb932 /webkit/build | |
| parent | 0dea3ea8bee2b135b079d8b75c9e9fb7f2fa82a8 (diff) | |
| download | chromium_src-3953428eedab395e93faf28ee21270d748ca74b9.zip chromium_src-3953428eedab395e93faf28ee21270d748ca74b9.tar.gz chromium_src-3953428eedab395e93faf28ee21270d748ca74b9.tar.bz2 | |
Re-enabling ENABLE_VIDEO since and made appropriate changes due toWebKit merge since r41907 (http://trac.webkit.org/changeset/41907).Changes include change names of state enums and adding method tosupport added state change event in WebCore::MediaPlayer.
Review URL: http://codereview.chromium.org/56038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12917 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/build')
| -rwxr-xr-x | webkit/build/V8Bindings/build-generated-files.sh | 2 | ||||
| -rw-r--r-- | webkit/build/webkit_common_defines.vsprops | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/webkit/build/V8Bindings/build-generated-files.sh b/webkit/build/V8Bindings/build-generated-files.sh index 2453744..c175cc9 100755 --- a/webkit/build/V8Bindings/build-generated-files.sh +++ b/webkit/build/V8Bindings/build-generated-files.sh @@ -43,7 +43,7 @@ export ENCODINGS_PREFIX="" # To see what FEATURE_DEFINES Apple uses, look at: # webkit/third_party/WebCore/Configurations/WebCore.xcconfig -export FEATURE_DEFINES="ENABLE_WORKERS ENABLE_SVG ENABLE_SVG_ANIMATION ENABLE_SVG_AS_IMAGE ENABLE_SVG_FONTS ENABLE_SVG_FOREIGN_OBJECT ENABLE_SVG_USE ENABLE_XPATH ENABLE_XSLT" +export FEATURE_DEFINES="ENABLE_SVG ENABLE_SVG_ANIMATION ENABLE_SVG_AS_IMAGE ENABLE_SVG_FONTS ENABLE_SVG_FOREIGN_OBJECT ENABLE_SVG_USE ENABLE_VIDEO ENABLE_WORKERS ENABLE_XPATH ENABLE_XSLT" # Adjust the number of jobs spawned according to the CPU count. if [ -z "$NUMBER_OF_PROCESSORS" ]; then diff --git a/webkit/build/webkit_common_defines.vsprops b/webkit/build/webkit_common_defines.vsprops index bcfbe79..0563493 100644 --- a/webkit/build/webkit_common_defines.vsprops +++ b/webkit/build/webkit_common_defines.vsprops @@ -6,6 +6,6 @@ > <Tool Name="VCCLCompilerTool" - PreprocessorDefinitions="ENABLE_DATABASE=1;ENABLE_DASHBOARD_SUPPORT=0;ENABLE_JAVASCRIPT_DEBUGGER=0;ENABLE_JSC_MULTIPLE_THREADS=0;ENABLE_ICONDATABASE=0;ENABLE_XSLT=1;ENABLE_XPATH=1;ENABLE_SVG=1;ENABLE_SVG_ANIMATION=1;ENABLE_SVG_AS_IMAGE=1;ENABLE_SVG_USE=1;ENABLE_SVG_FOREIGN_OBJECT=1;ENABLE_SVG_FONTS=1;ENABLE_WORKERS=1;WEBCORE_NAVIGATOR_PLATFORM="\"Win32\"";USE_GOOGLE_URL_LIBRARY;CRASH=__debugbreak;BUILDING_CHROMIUM__=1" + PreprocessorDefinitions="ENABLE_DATABASE=1;ENABLE_DASHBOARD_SUPPORT=0;ENABLE_JAVASCRIPT_DEBUGGER=0;ENABLE_JSC_MULTIPLE_THREADS=0;ENABLE_ICONDATABASE=0;ENABLE_XSLT=1;ENABLE_XPATH=1;ENABLE_SVG=1;ENABLE_SVG_ANIMATION=1;ENABLE_SVG_AS_IMAGE=1;ENABLE_SVG_USE=1;ENABLE_SVG_FOREIGN_OBJECT=1;ENABLE_SVG_FONTS=1;ENABLE_VIDEO=1;ENABLE_WORKERS=1;WEBCORE_NAVIGATOR_PLATFORM="\"Win32\"";USE_GOOGLE_URL_LIBRARY;CRASH=__debugbreak;BUILDING_CHROMIUM__=1" /> </VisualStudioPropertySheet> |