diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-05 20:00:42 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-05 20:00:42 +0000 |
| commit | 02ca9ed3f3240658cf5ab6b6ae219f737f51e8f0 (patch) | |
| tree | 2ffa292dc77b10abdafd6bf1287b9296eebfb39f /webkit | |
| parent | 27845cac2c3443eca508003c3951739e88ae8f24 (diff) | |
| download | chromium_src-02ca9ed3f3240658cf5ab6b6ae219f737f51e8f0.zip chromium_src-02ca9ed3f3240658cf5ab6b6ae219f737f51e8f0.tar.gz chromium_src-02ca9ed3f3240658cf5ab6b6ae219f737f51e8f0.tar.bz2 | |
Reverting 6439.
Revision 6439 broke the build. I'm reverting it. Please monitor the build after submitting code
Review URL: http://codereview.chromium.org/13181
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6441 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rwxr-xr-x | webkit/build/V8Bindings/build-generated-files.sh | 2 | ||||
| -rw-r--r-- | webkit/build/webkit_common_defines.vsprops | 2 | ||||
| -rw-r--r-- | webkit/port/bindings/v8/v8_proxy.cpp | 13 |
3 files changed, 4 insertions, 13 deletions
diff --git a/webkit/build/V8Bindings/build-generated-files.sh b/webkit/build/V8Bindings/build-generated-files.sh index f46b202..f5aca10 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_VIDEO 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_XPATH ENABLE_XSLT" echo Building DerivedSources ${PORTROOT}... # Use silent flag. diff --git a/webkit/build/webkit_common_defines.vsprops b/webkit/build/webkit_common_defines.vsprops index 0ea8266..0f750cc 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_VIDEO=1;ENABLE_WORKERS=0;WEBCORE_NAVIGATOR_PLATFORM="\"Win32\"";USE_GOOGLE_URL_LIBRARY;USE_SYSTEM_MALLOC=1;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=0;ENABLE_WORKERS=0;WEBCORE_NAVIGATOR_PLATFORM="\"Win32\"";USE_GOOGLE_URL_LIBRARY;USE_SYSTEM_MALLOC=1;CRASH=__debugbreak;BUILDING_CHROMIUM__=1;" /> </VisualStudioPropertySheet> diff --git a/webkit/port/bindings/v8/v8_proxy.cpp b/webkit/port/bindings/v8/v8_proxy.cpp index 632c306..5981ef8b 100644 --- a/webkit/port/bindings/v8/v8_proxy.cpp +++ b/webkit/port/bindings/v8/v8_proxy.cpp @@ -98,7 +98,6 @@ #include "KeyboardEvent.h" #include "Location.h" #include "MediaList.h" -#include "MediaPlayer.h" #include "MessageChannel.h" #include "MessageEvent.h" #include "MessagePort.h" @@ -2583,7 +2582,8 @@ bool V8Proxy::IsWrapperOfType(v8::Handle<v8::Value> value, macro(textarea, TEXTAREA) \ macro(title, TITLE) \ macro(ul, ULIST) \ - macro(xmp, PRE) + macro(xmp, PRE) \ + FOR_EACH_VIDEO_TAG(macro) V8ClassIndex::V8WrapperType V8Proxy::GetHTMLElementType(HTMLElement* element) { @@ -2592,15 +2592,6 @@ V8ClassIndex::V8WrapperType V8Proxy::GetHTMLElementType(HTMLElement* element) #define ADD_TO_HASH_MAP(tag, name) \ map.set(#tag, V8ClassIndex::HTML##name##ELEMENT); FOR_EACH_TAG(ADD_TO_HASH_MAP) -#if ENABLE(VIDEO) - // If MediaPlayer::isAvailable() == false, WebCore::videoContructor - // creates a HTMLelement object for <video> tag rather than HTMLVideoElement - // so only add the mappings if media player is available, or we will get - // the wrong element type. Same thing for <audio> and <source>. - if (MediaPlayer::isAvailable()) { -FOR_EACH_VIDEO_TAG(ADD_TO_HASH_MAP) - } -#endif #undef ADD_TO_HASH_MAP } |