Diff
Modified: trunk/Source/WTF/ChangeLog (173615 => 173616)
--- trunk/Source/WTF/ChangeLog 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Source/WTF/ChangeLog 2014-09-15 09:45:01 UTC (rev 173616)
@@ -1,3 +1,16 @@
+2014-09-15 [email protected] <[email protected]>
+
+ [WinCairo] Make it easier to enable/disable GStreamer.
+ https://bugs.webkit.org/show_bug.cgi?id=135766
+
+ Reviewed by Brent Fulgham.
+
+ Make it possible to enable/disable GStreamer by editing the new user macro ENABLE_GSTREAMER_WINCAIRO.
+
+ * WTF.vcxproj/WTFDebugWinCairo.props: Import GStreamer property file.
+ * WTF.vcxproj/WTFReleaseWinCairo.props: Ditto.
+ * wtf/Platform.h: Enable GStreamer if ENABLE(GSTREAMER_WINCAIRO) is true, otherwise use Media Foundation.
+
2014-09-10 Jon Honeycutt <[email protected]>
Re-add the request autocomplete feature
Modified: trunk/Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props (173615 => 173616)
--- trunk/Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Source/WTF/WTF.vcxproj/WTFDebugWinCairo.props 2014-09-15 09:45:01 UTC (rev 173616)
@@ -7,6 +7,7 @@
<Import Project="WTFCommon.props" />
<Import Project="WTFCFLite.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\GStreamerCommon.props" />
</ImportGroup>
<PropertyGroup />
<PropertyGroup />
Modified: trunk/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props (173615 => 173616)
--- trunk/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Source/WTF/WTF.vcxproj/WTFReleaseWinCairo.props 2014-09-15 09:45:01 UTC (rev 173616)
@@ -7,6 +7,7 @@
<Import Project="WTFCommon.props" />
<Import Project="WTFCFLite.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\GStreamerCommon.props" />
</ImportGroup>
<PropertyGroup />
<ItemDefinitionGroup>
Modified: trunk/Source/WTF/wtf/Platform.h (173615 => 173616)
--- trunk/Source/WTF/wtf/Platform.h 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Source/WTF/wtf/Platform.h 2014-09-15 09:45:01 UTC (rev 173616)
@@ -872,8 +872,14 @@
#endif
#if ENABLE(VIDEO) && PLATFORM(WIN_CAIRO)
+#if ENABLE(GSTREAMER_WINCAIRO)
+#define WTF_USE_MEDIA_FOUNDATION 0
+#define WTF_USE_GLIB 1
+#define WTF_USE_GSTREAMER 1
+#else
#define WTF_USE_MEDIA_FOUNDATION 1
#endif
+#endif
#if PLATFORM(WIN_CAIRO)
#define WTF_USE_TEXTURE_MAPPER 1
Modified: trunk/Source/WebCore/ChangeLog (173615 => 173616)
--- trunk/Source/WebCore/ChangeLog 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Source/WebCore/ChangeLog 2014-09-15 09:45:01 UTC (rev 173616)
@@ -1,3 +1,15 @@
+2014-09-15 [email protected] <[email protected]>
+
+ [WinCairo] Make it easier to enable/disable GStreamer.
+ https://bugs.webkit.org/show_bug.cgi?id=135766
+
+ Reviewed by Brent Fulgham.
+
+ Make it possible to enable/disable GStreamer by editing the new user macro ENABLE_GSTREAMER_WINCAIRO.
+
+ * WebCore.vcxproj/WebCoreDebugWinCairo.props: Import GStreamer property file.
+ * WebCore.vcxproj/WebCoreReleaseWinCairo.props: Ditto.
+
2014-09-12 Sergio Villar Senin <[email protected]>
[CSS Grid Layout] Crash at CSSParser::parseGridTemplateRowsAndAreas
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCoreDebugWinCairo.props (173615 => 173616)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCoreDebugWinCairo.props 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCoreDebugWinCairo.props 2014-09-15 09:45:01 UTC (rev 173616)
@@ -6,6 +6,7 @@
<Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\debug_wincairo.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\GStreamerCommon.props" />
<Import Project="WebCoreCommon.props" />
<Import Project="WebCoreCairo.props" />
<Import Project="WebCoreCURL.props" />
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCoreReleaseWinCairo.props (173615 => 173616)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCoreReleaseWinCairo.props 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCoreReleaseWinCairo.props 2014-09-15 09:45:01 UTC (rev 173616)
@@ -5,6 +5,7 @@
<Import Project="$(WebKit_Libraries)\tools\vsprops\common.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\GStreamerCommon.props" />
<Import Project="WebCoreCommon.props" />
<Import Project="WebCoreCairo.props" />
<Import Project="WebCoreCURL.props" />
Modified: trunk/Source/WebKit/ChangeLog (173615 => 173616)
--- trunk/Source/WebKit/ChangeLog 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Source/WebKit/ChangeLog 2014-09-15 09:45:01 UTC (rev 173616)
@@ -1,3 +1,15 @@
+2014-09-15 [email protected] <[email protected]>
+
+ [WinCairo] Make it easier to enable/disable GStreamer.
+ https://bugs.webkit.org/show_bug.cgi?id=135766
+
+ Reviewed by Brent Fulgham.
+
+ Make it possible to enable/disable GStreamer by editing the new user macro ENABLE_GSTREAMER_WINCAIRO.
+
+ * WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props: Import GStreamer property file.
+ * WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props: Ditto.
+
2014-09-06 Darin Adler <[email protected]>
Make updates suggested by new version of Xcode
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props (173615 => 173616)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitDebugWinCairo.props 2014-09-15 09:45:01 UTC (rev 173616)
@@ -6,6 +6,7 @@
<Import Project="$(WebKit_Libraries)\tools\vsprops\debug.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\cURL.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\GStreamerCommon.props" />
<Import Project="WebKitCommon.props" />
<Import Project="WebKitDirectX.props" />
<Import Project="WebKitCFLite.props" />
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props (173615 => 173616)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKitReleaseWinCairo.props 2014-09-15 09:45:01 UTC (rev 173616)
@@ -6,6 +6,7 @@
<Import Project="$(WebKit_Libraries)\tools\vsprops\release.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\WinCairo.props" />
<Import Project="$(WebKit_Libraries)\tools\vsprops\cURL.props" />
+ <Import Project="$(WebKit_Libraries)\tools\vsprops\GStreamerCommon.props" />
<Import Project="WebKitCFLite.props" />
<Import Project="WebKitCommon.props" />
<Import Project="WebKitDirectX.props" />
Modified: trunk/Tools/ChangeLog (173615 => 173616)
--- trunk/Tools/ChangeLog 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Tools/ChangeLog 2014-09-15 09:45:01 UTC (rev 173616)
@@ -1,3 +1,14 @@
+2014-09-15 [email protected] <[email protected]>
+
+ [WinCairo] Make it easier to enable/disable GStreamer.
+ https://bugs.webkit.org/show_bug.cgi?id=135766
+
+ Reviewed by Brent Fulgham.
+
+ Make it possible to enable/disable GStreamer by editing the new user macro ENABLE_GSTREAMER_WINCAIRO.
+
+ * WinLauncher/WinMain.cpp: Compile fix when GStreamer is enabled.
+
2014-09-12 Brian J. Burg <[email protected]>
Web Inspector: remind about rebaselining generator test results
Modified: trunk/Tools/WinLauncher/WinMain.cpp (173615 => 173616)
--- trunk/Tools/WinLauncher/WinMain.cpp 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/Tools/WinLauncher/WinMain.cpp 2014-09-15 09:45:01 UTC (rev 173616)
@@ -31,6 +31,10 @@
#include "WinLauncherWebHost.h"
#include "Common.cpp"
+#if USE(GLIB)
+#include <glib.h>
+#endif
+
int WINAPI wWinMain(HINSTANCE, HINSTANCE, PWSTR, int nCmdShow)
{
#ifdef _CRTDBG_MAP_ALLOC
Modified: trunk/WebKitLibraries/ChangeLog (173615 => 173616)
--- trunk/WebKitLibraries/ChangeLog 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/WebKitLibraries/ChangeLog 2014-09-15 09:45:01 UTC (rev 173616)
@@ -1,3 +1,14 @@
+2014-09-15 [email protected] <[email protected]>
+
+ [WinCairo] Make it easier to enable/disable GStreamer.
+ https://bugs.webkit.org/show_bug.cgi?id=135766
+
+ Reviewed by Brent Fulgham.
+
+ Make it possible to enable/disable GStreamer by editing the new user macro ENABLE_GSTREAMER_WINCAIRO.
+
+ * win/tools/vsprops/GStreamerCommon.props: Add user macro ENABLE_GSTREAMER_WINCAIRO.
+
2014-09-08 Eva Balazsfalvi <[email protected]>
Remove FILTERS flag
Modified: trunk/WebKitLibraries/win/tools/vsprops/GStreamerCommon.props (173615 => 173616)
--- trunk/WebKitLibraries/win/tools/vsprops/GStreamerCommon.props 2014-09-15 09:12:18 UTC (rev 173615)
+++ trunk/WebKitLibraries/win/tools/vsprops/GStreamerCommon.props 2014-09-15 09:45:01 UTC (rev 173616)
@@ -1,8 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ImportGroup Label="PropertySheets">
+ <Import Project="GStreamer32.props" Condition="$(Platform)=='Win32'" />
+ <Import Project="GStreamer64.props" Condition="$(Platform)=='x64'" />
+ </ImportGroup>
+ <PropertyGroup Label="UserMacros">
+ <ENABLE_GSTREAMER_WINCAIRO></ENABLE_GSTREAMER_WINCAIRO>
+ </PropertyGroup>
<ItemDefinitionGroup>
- <Link>
+ <ClCompile>
+ <PreprocessorDefinitions>$(ENABLE_GSTREAMER_WINCAIRO);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ </ClCompile>
+ <Link Condition="$(ENABLE_GSTREAMER_WINCAIRO)=='ENABLE_GSTREAMER_WINCAIRO'">
<AdditionalDependencies>gstpbutils-1.0.lib;gstaudio-1.0.lib;gstbase-1.0.lib;gstvideo-1.0.lib;gobject-2.0.lib;gstapp-1.0.lib;glib-2.0.lib;gstreamer-1.0.lib;gsttag-1.0.lib;gio-2.0.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
+ <ItemGroup>
+ <BuildMacro Include="ENABLE_GSTREAMER_WINCAIRO">
+ <Value>$(ENABLE_GSTREAMER_WINCAIRO)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
+ </ItemGroup>
</Project>
\ No newline at end of file
