diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-05 22:55:06 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-12-05 22:55:06 +0000 |
| commit | 2ec06cb7d23646552d95a10fc74d02d0bfb9130f (patch) | |
| tree | d8fb6c812357bc69bbf85545a962a0973d9acf87 | |
| parent | 1f0329ae584c906e96ef8b42eb7158b2e5469542 (diff) | |
| download | chromium_src-2ec06cb7d23646552d95a10fc74d02d0bfb9130f.zip chromium_src-2ec06cb7d23646552d95a10fc74d02d0bfb9130f.tar.gz chromium_src-2ec06cb7d23646552d95a10fc74d02d0bfb9130f.tar.bz2 | |
Original CL: http://codereview.chromium.org/12831, fix the build error for http://codereview.chromium.org/13181.
Review URL: http://codereview.chromium.org/13217
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6463 0039d316-1c4b-4281-b951-d872f2087c98
| -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 | 15 |
3 files changed, 15 insertions, 4 deletions
diff --git a/webkit/build/V8Bindings/build-generated-files.sh b/webkit/build/V8Bindings/build-generated-files.sh index f5aca10..f46b202 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_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_VIDEO 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 0f750cc..0ea8266 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=0;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=1;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 5981ef8b..87b4361 100644 --- a/webkit/port/bindings/v8/v8_proxy.cpp +++ b/webkit/port/bindings/v8/v8_proxy.cpp @@ -97,7 +97,9 @@ #include "InspectorController.h" #include "KeyboardEvent.h" #include "Location.h" +#include "MediaError.h" #include "MediaList.h" +#include "MediaPlayer.h" #include "MessageChannel.h" #include "MessageEvent.h" #include "MessagePort.h" @@ -127,6 +129,7 @@ #include "StyleSheetList.h" #include "TextEvent.h" #include "TextMetrics.h" +#include "TimeRanges.h" #include "TreeWalker.h" #include "WebKitCSSTransformValue.h" #include "XMLHttpRequest.h" @@ -2582,8 +2585,7 @@ bool V8Proxy::IsWrapperOfType(v8::Handle<v8::Value> value, macro(textarea, TEXTAREA) \ macro(title, TITLE) \ macro(ul, ULIST) \ - macro(xmp, PRE) \ - FOR_EACH_VIDEO_TAG(macro) + macro(xmp, PRE) V8ClassIndex::V8WrapperType V8Proxy::GetHTMLElementType(HTMLElement* element) { @@ -2592,6 +2594,15 @@ 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::videoConstructor + // created a HTMLElement object for <video> tag rather than HTMLVideoElement + // so only add the mappings if the 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 } |