Diff
Modified: trunk/Source/WTF/ChangeLog (160797 => 160798)
--- trunk/Source/WTF/ChangeLog 2013-12-18 23:05:09 UTC (rev 160797)
+++ trunk/Source/WTF/ChangeLog 2013-12-18 23:11:02 UTC (rev 160798)
@@ -1,3 +1,13 @@
+2013-12-18 Alex Christensen <[email protected]>
+
+ [WinCairo] Preparation for GStreamer on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=125946
+
+ Reviewed by Brent Fulgham.
+
+ * WTF.vcxproj/WTF.vcxproj:
+ Use new GStreamer property sheets for WinCairo.
+
2013-12-18 Mark Hahnenberg <[email protected]>
DFG should have a separate StoreBarrier node
Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj (160797 => 160798)
--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2013-12-18 23:05:09 UTC (rev 160797)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj 2013-12-18 23:11:02 UTC (rev 160798)
@@ -410,10 +410,14 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="WTFDebugWinCairo.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer32.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="WTFDebugWinCairo.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer64.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -436,10 +440,14 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="WTFReleaseWinCairo.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer32.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="WTFReleaseWinCairo.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer64.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
Modified: trunk/Source/WebCore/ChangeLog (160797 => 160798)
--- trunk/Source/WebCore/ChangeLog 2013-12-18 23:05:09 UTC (rev 160797)
+++ trunk/Source/WebCore/ChangeLog 2013-12-18 23:11:02 UTC (rev 160798)
@@ -1,3 +1,15 @@
+2013-12-18 Alex Christensen <[email protected]>
+
+ [WinCairo] Preparation for GStreamer on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=125946
+
+ Reviewed by Brent Fulgham.
+
+ * WebCore.vcxproj/WebCore.vcxproj:
+ Use new GStreamer property sheets for WinCairo.
+ * WebCore.vcxproj/WebCoreCairo.props:
+ Include GStreamer directory.
+
2013-12-18 Oliver Hunt <[email protected]>
Refactor CodeGeneratorJS - Move attribute function creation out of getOwnPropertyName guard
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (160797 => 160798)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-12-18 23:05:09 UTC (rev 160797)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2013-12-18 23:11:02 UTC (rev 160798)
@@ -131,10 +131,14 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="WebCoreReleaseWinCairo.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer32.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="WebCoreReleaseWinCairo.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer64.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -155,10 +159,14 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="WebCoreDebugWinCairo.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer32.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="WebCoreDebugWinCairo.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer64.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCoreCairo.props (160797 => 160798)
--- trunk/Source/WebCore/WebCore.vcxproj/WebCoreCairo.props 2013-12-18 23:05:09 UTC (rev 160797)
+++ trunk/Source/WebCore/WebCore.vcxproj/WebCoreCairo.props 2013-12-18 23:11:02 UTC (rev 160798)
@@ -5,7 +5,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>$(ProjectDir)..\platform\graphics\cairo;$(ProjectDir)..\platform\graphics\win\cairo;$(ProjectDir)..\svg\graphics\cairo;$(ProjectDir)..\platform\image-decoders;$(ProjectDir)..\platform\image-decoders\bmp;$(ProjectDir)..\platform\image-decoders\cairo;$(ProjectDir)..\platform\image-decoders\gif;$(ProjectDir)..\platform\image-decoders\ico;$(ProjectDir)..\platform\image-decoders\jpeg;$(ProjectDir)..\platform\image-decoders\png;$(ProjectDir)..\platform\image-decoders\webp;$(ProjectDir)..\platform\graphics\texmap;$(ProjectDir)..\platform\graphics\texmap\coordinated;$(ProjectDir)..\page\scrolling\coordinatedgraphics;$(WebKit_Libraries)\include\cairo;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)..\platform\graphics\cairo;$(ProjectDir)..\platform\graphics\win\cairo;$(ProjectDir)..\svg\graphics\cairo;$(ProjectDir)..\platform\image-decoders;$(ProjectDir)..\platform\image-decoders\bmp;$(ProjectDir)..\platform\image-decoders\cairo;$(ProjectDir)..\platform\image-decoders\gif;$(ProjectDir)..\platform\image-decoders\ico;$(ProjectDir)..\platform\image-decoders\jpeg;$(ProjectDir)..\platform\image-decoders\png;$(ProjectDir)..\platform\image-decoders\webp;$(ProjectDir)..\platform\graphics\texmap;$(ProjectDir)..\platform\graphics\texmap\coordinated;$(ProjectDir)..\page\scrolling\coordinatedgraphics;$(WebKit_Libraries)\include\cairo;$(ProjectDir)..\platform\graphics\gstreamer;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
</ItemDefinitionGroup>
</Project>
\ No newline at end of file
Modified: trunk/Source/WebKit/ChangeLog (160797 => 160798)
--- trunk/Source/WebKit/ChangeLog 2013-12-18 23:05:09 UTC (rev 160797)
+++ trunk/Source/WebKit/ChangeLog 2013-12-18 23:11:02 UTC (rev 160798)
@@ -1,3 +1,15 @@
+2013-12-18 Alex Christensen <[email protected]>
+
+ [WinCairo] Preparation for GStreamer on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=125946
+
+ Reviewed by Brent Fulgham.
+
+ * WebKit.vcxproj/WebKit/WebKit.vcxproj:
+ Use new GStreamer property sheets for WinCairo.
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
+ Fixed 64-bit symbols, added GStreamer symbol.
+
2013-12-16 Alex Christensen <[email protected]>
[Win] Unreviewed build fix for 64-bit.
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj (160797 => 160798)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj 2013-12-18 23:05:09 UTC (rev 160797)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj 2013-12-18 23:11:02 UTC (rev 160798)
@@ -131,10 +131,14 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="WebKitReleaseWinCairo.props" />
+ <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer32.props" />
+ <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="WebKitReleaseWinCairo.props" />
+ <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer64.props" />
+ <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -155,10 +159,14 @@
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="WebKitDebugWinCairo.props" />
+ <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer32.props" />
+ <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="WebKitDebugWinCairo.props" />
+ <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer64.props" />
+ <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (160797 => 160798)
--- trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2013-12-18 23:05:09 UTC (rev 160797)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in 2013-12-18 23:11:02 UTC (rev 160798)
@@ -182,7 +182,7 @@
symbolWithPointer(?cacheDOMStructure@WebCore@@YAPAVStructure@JSC@@PAVJSDOMGlobalObject@1@PAV23@PBUClassInfo@3@@Z, ?cacheDOMStructure@WebCore@@YAPEAVStructure@JSC@@PEAVJSDOMGlobalObject@1@PEAV23@PEBUClassInfo@3@@Z)
symbolWithPointer(?childItemWithTarget@HistoryItem@WebCore@@QBEPAV12@ABVString@WTF@@@Z, ?childItemWithTarget@HistoryItem@WebCore@@QEBAPEAV12@AEBVString@WTF@@@Z)
symbolWithPointer(?create@Range@WebCore@@SA?AV?$PassRefPtr@VRange@WebCore@@@WTF@@AAVDocument@2@V?$PassRefPtr@VNode@WebCore@@@4@H1H@Z, ?create@Range@WebCore@@SA?AV?$PassRefPtr@VRange@WebCore@@@WTF@@AEAVDocument@2@V?$PassRefPtr@VNode@WebCore@@@4@H1H@Z)
- symbolWithPointer(?commonVM@JSDOMWindowBase@WebCore@@SAPAVVM@JSC@@XZ, ?commonVM@JSDOMWindowBase@WebCore@@SAPAVVM@JSC@@XZ)
+ symbolWithPointer(?commonVM@JSDOMWindowBase@WebCore@@SAPAVVM@JSC@@XZ, ?commonVM@JSDOMWindowBase@WebCore@@SAPEAVVM@JSC@@XZ)
symbolWithPointer(?create@SerializedScriptValue@WebCore@@SA?AV?$PassRefPtr@VSerializedScriptValue@WebCore@@@WTF@@ABVString@4@@Z, ?create@SerializedScriptValue@WebCore@@SA?AV?$PassRefPtr@VSerializedScriptValue@WebCore@@@WTF@@AEBVString@4@@Z)
#if USE(CF)
symbolWithPointer(?createCFString@String@WTF@@QBE?AV?$RetainPtr@PBU__CFString@@@2@XZ, ?createCFString@String@WTF@@QEBA?AV?$RetainPtr@PEBU__CFString@@@2@XZ)
@@ -222,7 +222,7 @@
symbolWithPointer(??1InspectorFrontendClientLocal@WebCore@@UAE@XZ, ??1InspectorFrontendClientLocal@WebCore@@UEAA@XZ)
symbolWithPointer(?changeAttachedWindowHeight@InspectorFrontendClientLocal@WebCore@@UAEXI@Z, ?changeAttachedWindowHeight@InspectorFrontendClientLocal@WebCore@@UEAAXI@Z)
symbolWithPointer(?changeAttachedWindowWidth@InspectorFrontendClientLocal@WebCore@@UAEXI@Z, ?changeAttachedWindowWidth@InspectorFrontendClientLocal@WebCore@@UEAAXI@Z)
- symbolWithPointer(?connectFrontend@InspectorController@WebCore@@QAEXPAVInspectorFrontendChannel@Inspector@@@Z, connectFrontend@InspectorController@WebCore@@QEAAXPEAVInspectorFrontendChannel@Inspector@@@Z)
+ symbolWithPointer(?connectFrontend@InspectorController@WebCore@@QAEXPAVInspectorFrontendChannel@Inspector@@@Z, ?connectFrontend@InspectorController@WebCore@@QEAAXPEAVInspectorFrontendChannel@Inspector@@@Z)
symbolWithPointer(?doDispatchMessageOnFrontendPage@InspectorClient@WebCore@@SA_NPAVPage@2@ABVString@WTF@@@Z, ?doDispatchMessageOnFrontendPage@InspectorClient@WebCore@@SA_NPEAVPage@2@AEBVString@WTF@@@Z)
symbolWithPointer(?frontendLoaded@InspectorFrontendClientLocal@WebCore@@UAEXXZ, ?frontendLoaded@InspectorFrontendClientLocal@WebCore@@UEAAXXZ)
symbolWithPointer(?getProperty@Settings@InspectorFrontendClientLocal@WebCore@@UAE?AVString@WTF@@ABV45@@Z, ?getProperty@Settings@InspectorFrontendClientLocal@WebCore@@UEAA?AVString@WTF@@AEBV45@@Z)
@@ -443,7 +443,10 @@
symbolWithPointer(?toJS@WebCore@@YA?AVJSValue@JSC@@PAVExecState@3@PAVJSDOMGlobalObject@1@PAVTimeRanges@1@@Z, ?toJS@WebCore@@YA?AVJSValue@JSC@@PEAVExecState@3@PEAVJSDOMGlobalObject@1@PEAVTimeRanges@1@@Z)
symbolWithPointer(?nearest@TimeRanges@WebCore@@QBENN@Z, ?nearest@TimeRanges@WebCore@@QEBANN@Z)
symbolWithPointer(?add@TimeRanges@WebCore@@QAEXNN@Z, ?add@TimeRanges@WebCore@@QEAAXNN@Z)
+#if USE(GSTREAMER)
+ symbolWithPointer(?simulateAudioInterruption@MediaPlayer@WebCore@@QAEXXZ, ?simulateAudioInterruption@MediaPlayer@WebCore@@QEAAXXZ)
#endif
+#endif
symbolWithPointer(?standardFontFamily@Settings@WebCore@@QBEABVAtomicString@WTF@@W4UScriptCode@@@Z, ?standardFontFamily@Settings@WebCore@@QEBAAEBVAtomicString@WTF@@W4UScriptCode@@@Z)
symbolWithPointer(?serifFontFamily@Settings@WebCore@@QBEABVAtomicString@WTF@@W4UScriptCode@@@Z, ?serifFontFamily@Settings@WebCore@@QEBAAEBVAtomicString@WTF@@W4UScriptCode@@@Z)
symbolWithPointer(?sansSerifFontFamily@Settings@WebCore@@QBEABVAtomicString@WTF@@W4UScriptCode@@@Z, ?sansSerifFontFamily@Settings@WebCore@@QEBAAEBVAtomicString@WTF@@W4UScriptCode@@@Z)
Modified: trunk/Tools/ChangeLog (160797 => 160798)
--- trunk/Tools/ChangeLog 2013-12-18 23:05:09 UTC (rev 160797)
+++ trunk/Tools/ChangeLog 2013-12-18 23:11:02 UTC (rev 160798)
@@ -1,3 +1,17 @@
+2013-12-18 Alex Christensen <[email protected]>
+
+ [WinCairo] Preparation for GStreamer on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=125946
+
+ Reviewed by Brent Fulgham.
+
+ * WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj:
+ Use new GStreamer property sheets for WinCairo.
+ * win/DLLLauncher/DLLLauncherMain.cpp:
+ (modifyPath):
+ (wWinMain):
+ Prepend GStreamer bin directory to path if it exists.
+
2013-12-18 Anders Carlsson <[email protected]>
Remove now useless test.
Modified: trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj (160797 => 160798)
--- trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj 2013-12-18 23:05:09 UTC (rev 160797)
+++ trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj 2013-12-18 23:11:02 UTC (rev 160798)
@@ -133,11 +133,15 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="WinLauncherLibRelease.props" />
<Import Project="WinLauncherCFLite.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer32.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="WinLauncherLibRelease.props" />
<Import Project="WinLauncherCFLite.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer64.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
@@ -163,11 +167,15 @@
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="WinLauncherLibDebug.props" />
<Import Project="WinLauncherCFLite.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer32.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
<Import Project="WinLauncherLibDebug.props" />
<Import Project="WinLauncherCFLite.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer64.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ImportGroup>
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
Modified: trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp (160797 => 160798)
--- trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2013-12-18 23:05:09 UTC (rev 160797)
+++ trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2013-12-18 23:11:02 UTC (rev 160798)
@@ -130,7 +130,20 @@
static bool modifyPath(const wstring& programName)
{
+#ifdef WIN_CAIRO
+
#if defined(_M_X64)
+ wstring path = copyEnvironmentVariable(L"GSTREAMER_1_0_ROOT_X86_64") + L"bin";
+#else
+ wstring path = copyEnvironmentVariable(L"GSTREAMER_1_0_ROOT_X86") + L"bin";
+#endif
+ if (directoryExists(path))
+ prependPath(path);
+ return true;
+
+#else
+
+#if defined(_M_X64)
static const wstring pathPrefix = L"C:\\Program Files\\Common Files\\Apple\\Apple Application Support";
#else
static const wstring pathPrefix = L"C:\\Program Files (x86)\\Common Files\\Apple\\Apple Application Support";
@@ -146,6 +159,7 @@
fatalError(programName, L"Failed to modify PATH environment variable.");
return false;
+#endif
}
static wstring getLastErrorString(HRESULT hr)
@@ -180,10 +194,8 @@
wstring programName = ::PathFindFileNameW(exePath);
-#ifndef WIN_CAIRO
if (!modifyPath(programName))
return 1;
-#endif
// Load our corresponding DLL.
wstring dllName = programName + L".dll";
Modified: trunk/WebKitLibraries/ChangeLog (160797 => 160798)
--- trunk/WebKitLibraries/ChangeLog 2013-12-18 23:05:09 UTC (rev 160797)
+++ trunk/WebKitLibraries/ChangeLog 2013-12-18 23:11:02 UTC (rev 160798)
@@ -1,3 +1,16 @@
+2013-12-18 Alex Christensen <[email protected]>
+
+ [WinCairo] Preparation for GStreamer on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=125946
+
+ Reviewed by Brent Fulgham.
+
+ * win/tools/vsprops/FeatureDefinesCairo.props:
+ Added ENABLE_MEDIA_CONTROLS_SCRIPT and ENABLE_VIDEO_TRACK for DerivedSources.make.
+ * win/tools/vsprops/GStreamer32.props: Added.
+ * win/tools/vsprops/GStreamer64.props: Added.
+ * win/tools/vsprops/GStreamerCommon.props: Added.
+
2013-12-13 Brent Fulgham <[email protected]>
[Win] Unreviewed build fix for VS2013
Modified: trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props (160797 => 160798)
--- trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props 2013-12-18 23:05:09 UTC (rev 160797)
+++ trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props 2013-12-18 23:11:02 UTC (rev 160798)
@@ -52,6 +52,7 @@
<ENABLE_LINK_PREFETCH />
<ENABLE_LINK_PRERENDER />
<ENABLE_MATHML>ENABLE_MATHML</ENABLE_MATHML>
+ <ENABLE_MEDIA_CONTROLS_SCRIPT>ENABLE_MEDIA_CONTROLS_SCRIPT</ENABLE_MEDIA_CONTROLS_SCRIPT>
<ENABLE_MEDIA_SOURCE />
<ENABLE_MEDIA_STATISTICS />
<ENABLE_METER_ELEMENT>ENABLE_METER_ELEMENT</ENABLE_METER_ELEMENT>
@@ -90,7 +91,7 @@
</PropertyGroup>
<ItemDefinitionGroup>
<ClCompile>
-<PreprocessorDefinitions>$(ENABLE_IFRAME_SEAMLESS);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_BLOB);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_STICKY_POSITION);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_TEMPLATE_ELEMENT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
+<PreprocessorDefinitions>$(ENABLE_IFRAME_SEAMLESS);$(ENABLE_PROMISES);$(ENABLE_REQUEST_ANIMATION_FRAME);$(ENABLE_3D_RENDERING);$(ENABLE_ACCELERATED_2D_CANVAS);$(ENABLE_ACCELERATED_OVERFLOW_SCROLLING);$(ENABLE_BLOB);$(ENABLE_CANVAS_PROXY);$(ENABLE_CHANNEL_MESSAGING);$(ENABLE_CSS3_CONDITIONAL_RULES);$(ENABLE_CSS3_TEXT);$(ENABLE_CSS_BOX_DECORATION_BREAK);$(ENABLE_CSS_FILTERS);$(ENABLE_CSS_GRID_LAYOUT);$(ENABLE_CSS_IMAGE_SET);$(ENABLE_CSS_SHADERS);$(ENABLE_CSS_COMPOSITING);$(ENABLE_CSS_REGIONS);$(ENABLE_CSS_EXCLUSIONS);$(ENABLE_CSS_SHAPES);$(ENABLE_CSS_STICKY_POSITION);$(ENABLE_CSS_TRANSFORMS_ANIMATIONS_TRANSITIONS_UNPREFIXED);$(ENABLE_CUSTOM_SCHEME_HANDLER);$(ENABLE_SQL_DATABASE);$(ENABLE_DATAGRID);$(ENABLE_DATALIST_ELEMENT);$(ENABLE_DATA_TRANSFER_ITEMS);$(ENABLE_DETAILS_ELEMENT);$(ENABLE_DEVICE_ORIENTATION);$(ENABLE_DIRECTORY_UPLOAD);$(ENABLE_FILTERS);$(ENABLE_FILE_SYSTEM);$(ENABLE_FULLSCREEN_API);$(ENABLE_GAMEPAD);$(ENABLE_GEOLOCATION);$(ENABLE_HIDDEN_PAGE_DOM_TIMER_THROTTLING);$(ENABLE_HIGH_DPI_CANVAS);$(ENABLE_ICONDATABASE);$(ENABLE_INDEXED_DATABASE);$(ENABLE_INPUT_TYPE_COLOR);$(ENABLE_INPUT_SPEECH);$(ENABLE_INPUT_TYPE_DATE);$(ENABLE_INPUT_TYPE_DATETIME_INCOMPLETE);$(ENABLE_INPUT_TYPE_DATETIMELOCAL);$(ENABLE_INPUT_TYPE_MONTH);$(ENABLE_INPUT_TYPE_TIME);$(ENABLE_INPUT_TYPE_WEEK);$(ENABLE_JAVASCRIPT_DEBUGGER);$(ENABLE_LEGACY_CSS_VENDOR_PREFIXES);$(ENABLE_LEGACY_NOTIFICATIONS);$(ENABLE_LINK_PREFETCH);$(ENABLE_LINK_PRERENDER);$(ENABLE_MATHML);$(ENABLE_MEDIA_CONTROLS_SCRIPT);$(ENABLE_METER_ELEMENT);$(ENABLE_MICRODATA);$(ENABLE_NOTIFICATIONS);$(ENABLE_PAGE_VISIBILITY_API);$(ENABLE_PROGRESS_ELEMENT);$(ENABLE_PROXIMITY_EVENTS);$(ENABLE_QUOTA);$(ENABLE_NAVIGATOR_CONTENT_UTILS);$(ENABLE_SCRIPTED_SPEECH);$(ENABLE_SHADOW_DOM);$(ENABLE_SHARED_WORKERS);$(ENABLE_STYLE_SCOPED);$(ENABLE_SVG);$(ENABLE_SVG_DOM_OBJC_BINDINGS);$(ENABLE_SVG_FONTS);$(ENABLE_SUBPIXEL_LAYOUT);$(ENABLE_TEMPLATE_ELEMENT);$(ENABLE_TEXT_AUTOSIZING);$(ENABLE_VIDEO);$(ENABLE_VIDEO_TRACK);$(ENABLE_VIEW_MODE_CSS_MEDIA);$(ENABLE_MEDIA_SOURCE);$(ENABLE_MEDIA_STATISTICS);$(ENABLE_VIDEO_TRACK);$(ENABLE_WEB_SOCKETS);$(ENABLE_WEB_TIMING);$(ENABLE_XSLT);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
<ItemGroup>
@@ -298,6 +299,10 @@
<Value>$(ENABLE_MATHML)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
+ <BuildMacro Include="ENABLE_MEDIA_CONTROLS_SCRIPT">
+ <Value>$(ENABLE_MEDIA_CONTROLS_SCRIPT)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
<BuildMacro Include="ENABLE_MEDIA_SOURCE">
<Value>$(ENABLE_MEDIA_SOURCE)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
@@ -406,6 +411,10 @@
<Value>$(ENABLE_VIEW_MODE_CSS_MEDIA)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
</BuildMacro>
+ <BuildMacro Include="ENABLE_VIDEO_TRACK">
+ <Value>$(ENABLE_VIDEO_TRACK)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
<BuildMacro Include="ENABLE_WEB_AUDIO">
<Value>$(ENABLE_WEB_AUDIO)</Value>
<EnvironmentVariable>true</EnvironmentVariable>
Added: trunk/WebKitLibraries/win/tools/vsprops/GStreamer32.props (0 => 160798)
--- trunk/WebKitLibraries/win/tools/vsprops/GStreamer32.props (rev 0)
+++ trunk/WebKitLibraries/win/tools/vsprops/GStreamer32.props 2013-12-18 23:11:02 UTC (rev 160798)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <AdditionalIncludeDirectories>$(GSTREAMER_1_0_ROOT_X86)include\gstreamer-1.0;$(GSTREAMER_1_0_ROOT_X86)include\glib-2.0;$(GSTREAMER_1_0_ROOT_X86)lib\glib-2.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <AdditionalLibraryDirectories>$(GSTREAMER_1_0_ROOT_X86)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+</Project>
\ No newline at end of file
Added: trunk/WebKitLibraries/win/tools/vsprops/GStreamer64.props (0 => 160798)
--- trunk/WebKitLibraries/win/tools/vsprops/GStreamer64.props (rev 0)
+++ trunk/WebKitLibraries/win/tools/vsprops/GStreamer64.props 2013-12-18 23:11:02 UTC (rev 160798)
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemDefinitionGroup>
+ <ClCompile>
+ <AdditionalIncludeDirectories>$(GSTREAMER_1_0_ROOT_X86_64)include\gstreamer-1.0;$(GSTREAMER_1_0_ROOT_X86_64)include\glib-2.0;$(GSTREAMER_1_0_ROOT_X86_64)lib\glib-2.0\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ </ClCompile>
+ <Link>
+ <AdditionalLibraryDirectories>$(GSTREAMER_1_0_ROOT_X86_64)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ </Link>
+ </ItemDefinitionGroup>
+</Project>
\ No newline at end of file
Added: trunk/WebKitLibraries/win/tools/vsprops/GStreamerCommon.props (0 => 160798)
--- trunk/WebKitLibraries/win/tools/vsprops/GStreamerCommon.props (rev 0)
+++ trunk/WebKitLibraries/win/tools/vsprops/GStreamerCommon.props 2013-12-18 23:11:02 UTC (rev 160798)
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <ItemDefinitionGroup>
+ <Link>
+ <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;%(AdditionalDependencies)</AdditionalDependencies>
+ </Link>
+ </ItemDefinitionGroup>
+</Project>
\ No newline at end of file
