Updated project files and added V8 bindings for HTML5 media/audio/video/sourcetags. Required some changes to CodeGeneratorV8.pm in order to generate headerguards. I left video disabled, but for those interested in building with HTML5media tags add ENABLE_VIDEO=1 to webkit_common_defines.vsprops and addENABLE_VIDEO to the FEATURE_DEFINES string in the build-generated-files.shscript.

Review URL: http://codereview.chromium.org/8198

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4332 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 107 insertions, 1 deletions

diff --git a/webkit/build/V8Bindings/SConscript b/webkit/build/V8Bindings/SConscript
index c8e9cf5..0229d44 100644
--- a/webkit/build/V8Bindings/SConscript
+++ b/webkit/build/V8Bindings/SConscript
@@ -93,6 +93,7 @@ inputs = [
     '$DERIVED_DIR/V8HTMLAnchorElement.cpp',
     '$DERIVED_DIR/V8HTMLAppletElement.cpp',
     '$DERIVED_DIR/V8HTMLAreaElement.cpp',
+    '$DERIVED_DIR/V8HTMLAudioElement.cpp',
     '$DERIVED_DIR/V8HTMLBaseElement.cpp',
     '$DERIVED_DIR/V8HTMLBaseFontElement.cpp',
     '$DERIVED_DIR/V8HTMLBlockquoteElement.cpp',
@@ -126,6 +127,7 @@ inputs = [
     '$DERIVED_DIR/V8HTMLLinkElement.cpp',
     '$DERIVED_DIR/V8HTMLMapElement.cpp',
     '$DERIVED_DIR/V8HTMLMarqueeElement.cpp',
+    '$DERIVED_DIR/V8HTMLMediaElement.cpp',
     '$DERIVED_DIR/V8HTMLMenuElement.cpp',
     '$DERIVED_DIR/V8HTMLMetaElement.cpp',
     '$DERIVED_DIR/V8HTMLModElement.cpp',
@@ -150,10 +152,12 @@ inputs = [
     '$DERIVED_DIR/V8HTMLTextAreaElement.cpp',
     '$DERIVED_DIR/V8HTMLTitleElement.cpp',
     '$DERIVED_DIR/V8HTMLUListElement.cpp',
+    '$DERIVED_DIR/V8HTMLVideoElement.cpp',
     '$DERIVED_DIR/V8ImageData.cpp',
     '$DERIVED_DIR/V8InspectorController.cpp',
     '$DERIVED_DIR/V8KeyboardEvent.cpp',
     '$DERIVED_DIR/V8Location.cpp',
+    '$DERIVED_DIR/V8MediaError.cpp',
     '$DERIVED_DIR/V8MediaList.cpp',
     '$DERIVED_DIR/V8MessageChannel.cpp',
     '$DERIVED_DIR/V8MessageEvent.cpp',
@@ -292,6 +296,7 @@ inputs = [
     '$DERIVED_DIR/V8Text.cpp',
     '$DERIVED_DIR/V8TextEvent.cpp',
     '$DERIVED_DIR/V8TextMetrics.cpp',
+    '$DERIVED_DIR/V8TimeRanges.cpp',
     '$DERIVED_DIR/V8TreeWalker.cpp',
     '$DERIVED_DIR/V8UIEvent.cpp',
     '$DERIVED_DIR/V8UndetectableHTMLCollection.cpp',
diff --git a/webkit/build/V8Bindings/V8Bindings.vcproj b/webkit/build/V8Bindings/V8Bindings.vcproj
index da3775c..12041b7 100644
--- a/webkit/build/V8Bindings/V8Bindings.vcproj
+++ b/webkit/build/V8Bindings/V8Bindings.vcproj
@@ -544,6 +544,14 @@
 				>
 			</File>
 			<File
+				RelativePath="$(IntDir)\DerivedSources\V8HTMLAudioElement.cpp"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\DerivedSources\V8HTMLAudioElement.h"
+				>
+			</File>
+			<File
 				RelativePath="$(IntDir)\DerivedSources\V8HTMLBaseElement.cpp"
 				>
 			</File>
@@ -808,6 +816,14 @@
 				>
 			</File>
 			<File
+				RelativePath="$(IntDir)\DerivedSources\V8HTMLMediaElement.cpp"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\DerivedSources\V8HTMLMediaElement.h"
+				>
+			</File>
+			<File
 				RelativePath="$(IntDir)\DerivedSources\V8HTMLMenuElement.cpp"
 				>
 			</File>
@@ -920,6 +936,14 @@
 				>
 			</File>
 			<File
+				RelativePath="$(IntDir)\DerivedSources\V8HTMLSourceElement.cpp"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\DerivedSources\V8HTMLSourceElement.h"
+				>
+			</File>
+			<File
 				RelativePath="$(IntDir)\DerivedSources\V8HTMLStyleElement.cpp"
 				>
 			</File>
@@ -1000,6 +1024,14 @@
 				>
 			</File>
 			<File
+				RelativePath="$(IntDir)\DerivedSources\V8HTMLVideoElement.cpp"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\DerivedSources\V8HTMLVideoElement.h"
+				>
+			</File>
+			<File
 				RelativePath="$(IntDir)\DerivedSources\V8ImageData.cpp"
 				>
 			</File>
@@ -1032,6 +1064,14 @@
 				>
 			</File>
 			<File
+				RelativePath="$(IntDir)\DerivedSources\V8MediaError.cpp"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\DerivedSources\V8MediaError.h"
+				>
+			</File>
+			<File
 				RelativePath="$(IntDir)\DerivedSources\V8MediaList.cpp"
 				>
 			</File>
@@ -2136,6 +2176,14 @@
 				>
 			</File>
 			<File
+				RelativePath="$(IntDir)\DerivedSources\V8TimeRanges.cpp"
+				>
+			</File>
+			<File
+				RelativePath="$(IntDir)\DerivedSources\V8TimeRanges.h"
+				>
+			</File>
+			<File
 				RelativePath="$(IntDir)\DerivedSources\V8TreeWalker.cpp"
 				>
 			</File>
diff --git a/webkit/build/WebCore/SConscript b/webkit/build/WebCore/SConscript
index e0a29dd..032ce63 100644
--- a/webkit/build/WebCore/SConscript
+++ b/webkit/build/WebCore/SConscript
@@ -291,6 +291,7 @@ input_files = [
     '$WEBCORE_DIR/html/HTMLQuoteElement.cpp',
     '$WEBCORE_DIR/html/HTMLScriptElement.cpp',
     '$WEBCORE_DIR/html/HTMLSelectElement.cpp',
+    '$WEBCORE_DIR/html/HTMLSourceElement.cpp',    
     '$WEBCORE_DIR/html/HTMLStyleElement.cpp',
     '$WEBCORE_DIR/html/HTMLTableCaptionElement.cpp',
     '$WEBCORE_DIR/html/HTMLTableCellElement.cpp',
@@ -330,6 +331,7 @@ input_files = [
     '$WEBCORE_DIR/loader/ImageLoader.cpp',
     '$WEBCORE_DIR/loader/loader.cpp',
     '$WEBCORE_DIR/loader/MainResourceLoader.cpp',
+    '$WEBCORE_DIR/loader/MediaDocument.cpp',    
     '$WEBCORE_DIR/loader/NavigationAction.cpp',
     '$WEBCORE_DIR/loader/NetscapePlugInStreamLoader.cpp',
     '$WEBCORE_DIR/loader/PluginDocument.cpp',
@@ -423,6 +425,8 @@ input_files = [
     '$WEBCORE_DIR/platform/graphics/GraphicsTypes.cpp',
     '$WEBCORE_DIR/platform/graphics/Image.cpp',
     '$WEBCORE_DIR/platform/graphics/IntRect.cpp',
+    '$WEBCORE_DIR/platform/graphics/MediaPlayer.cpp',
+    '$PORT_DIR/platform/graphics/chromium/MediaPlayerPrivateChromium.cpp',
     '$WEBCORE_DIR/platform/graphics/Path.cpp',
     '$WEBCORE_DIR/platform/graphics/PathTraversalState.cpp',
     '$WEBCORE_DIR/platform/graphics/Pattern.cpp',
@@ -511,6 +515,7 @@ input_files = [
     '$WEBCORE_DIR/rendering/RenderListItem.cpp',
     '$WEBCORE_DIR/rendering/RenderListMarker.cpp',
     '$WEBCORE_DIR/rendering/RenderMarquee.cpp',
+    '$WEBCORE_DIR/rendering/RenderMedia.cpp',    
     '$WEBCORE_DIR/rendering/RenderMenuList.cpp',
     '$WEBCORE_DIR/rendering/RenderObject.cpp',
     '$WEBCORE_DIR/rendering/RenderPart.cpp',
diff --git a/webkit/build/WebCore/WebCore.vcproj b/webkit/build/WebCore/WebCore.vcproj
index 1512dc7..7a1be9c 100644
--- a/webkit/build/WebCore/WebCore.vcproj
+++ b/webkit/build/WebCore/WebCore.vcproj
@@ -662,6 +662,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\loader\MediaDocument.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\loader\MediaDocument.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\loader\NavigationAction.cpp"
 				>
 			</File>
@@ -1257,6 +1265,14 @@
 					>
 				</File>
 				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\MediaPlayer.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\MediaPlayer.h"
+					>
+				</File>
+				<File
 					RelativePath="..\..\..\third_party\WebKit\WebCore\platform\graphics\Path.cpp"
 					>
 				</File>
@@ -2486,6 +2502,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderMedia.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderMedia.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\rendering\RenderMenuList.cpp"
 				>
 			</File>
@@ -4954,6 +4978,14 @@
 				>
 			</File>
 			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\html\HTMLSourceElement.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\html\HTMLSourceElement.h"
+				>
+			</File>
+			<File
 				RelativePath="..\..\..\third_party\WebKit\WebCore\html\HTMLStyleElement.cpp"
 				>
 			</File>
@@ -5089,6 +5121,14 @@
 				RelativePath="..\..\..\third_party\WebKit\WebCore\html\PreloadScanner.h"
 				>
 			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\html\TimeRanges.cpp"
+				>
+			</File>
+			<File
+				RelativePath="..\..\..\third_party\WebKit\WebCore\html\TimeRanges.h"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="history"
diff --git a/webkit/build/port/port.vcproj b/webkit/build/port/port.vcproj
index 6f5393b..17e2ba0 100644
--- a/webkit/build/port/port.vcproj
+++ b/webkit/build/port/port.vcproj
@@ -1018,6 +1018,14 @@
 						>
 					</File>
 					<File
+						RelativePath="..\..\port\platform\graphics\chromium\MediaPlayerPrivateChromium.cpp"
+						>
+					</File>
+					<File
+						RelativePath="..\..\port\platform\graphics\chromium\MediaPlayerPrivateChromium.h"
+						>
+					</File>
+					<File
 						RelativePath="..\..\port\platform\graphics\chromium\PlatformIcon.h"
 						>
 					</File>
diff --git a/webkit/build/webkit_common_defines.vsprops b/webkit/build/webkit_common_defines.vsprops
index 7f42fc2..dcf24fc 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=0;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;WEBCORE_NAVIGATOR_PLATFORM=&quot;\&quot;Win32\&quot;&quot;;USE_GOOGLE_URL_LIBRARY;USE_SYSTEM_MALLOC=1;CRASH=__debugbreak;BUILDING_CHROMIUM__=1;"
+		PreprocessorDefinitions="ENABLE_DATABASE=0;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;WEBCORE_NAVIGATOR_PLATFORM=&quot;\&quot;Win32\&quot;&quot;;USE_GOOGLE_URL_LIBRARY;USE_SYSTEM_MALLOC=1;CRASH=__debugbreak;BUILDING_CHROMIUM__=1;"
 	/>
 </VisualStudioPropertySheet>