<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[160798] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/160798">160798</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-18 15:11:02 -0800 (Wed, 18 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WinCairo] Preparation for GStreamer on Windows.
https://bugs.webkit.org/show_bug.cgi?id=125946
Patch by Alex Christensen <achristensen@webkit.org> on 2013-12-18
Reviewed by Brent Fulgham.
Source/WebCore:
* WebCore.vcxproj/WebCore.vcxproj:
Use new GStreamer property sheets for WinCairo.
* WebCore.vcxproj/WebCoreCairo.props:
Include GStreamer directory.
Source/WebKit:
* 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.
Source/WTF:
* WTF.vcxproj/WTF.vcxproj:
Use new GStreamer property sheets for WinCairo.
Tools:
* 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.
WebKitLibraries:
* 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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFvcxproj">trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCorevcxproj">trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#trunkSourceWebCoreWebCorevcxprojWebCoreCairoprops">trunk/Source/WebCore/WebCore.vcxproj/WebCoreCairo.props</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxproj">trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin">trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWinLauncherWinLaunchervcxprojWinLauncherLibvcxproj">trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj</a></li>
<li><a href="#trunkToolswinDLLLauncherDLLLauncherMaincpp">trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp</a></li>
<li><a href="#trunkWebKitLibrariesChangeLog">trunk/WebKitLibraries/ChangeLog</a></li>
<li><a href="#trunkWebKitLibrarieswintoolsvspropsFeatureDefinesCairoprops">trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkWebKitLibrarieswintoolsvspropsGStreamer32props">trunk/WebKitLibraries/win/tools/vsprops/GStreamer32.props</a></li>
<li><a href="#trunkWebKitLibrarieswintoolsvspropsGStreamer64props">trunk/WebKitLibraries/win/tools/vsprops/GStreamer64.props</a></li>
<li><a href="#trunkWebKitLibrarieswintoolsvspropsGStreamerCommonprops">trunk/WebKitLibraries/win/tools/vsprops/GStreamerCommon.props</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (160797 => 160798)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-12-18 Alex Christensen <achristensen@webkit.org>
+
+ [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.
+
</ins><span class="cx"> 2013-12-18 Mark Hahnenberg <mhahnenberg@apple.com>
</span><span class="cx">
</span><span class="cx"> DFG should have a separate StoreBarrier node
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj (160797 => 160798)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -410,10 +410,14 @@
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="WTFDebugWinCairo.props" />
</span><ins>+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer32.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="WTFDebugWinCairo.props" />
</span><ins>+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer64.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="lines">@@ -436,10 +440,14 @@
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="WTFReleaseWinCairo.props" />
</span><ins>+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer32.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="WTFReleaseWinCairo.props" />
</span><ins>+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer64.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160797 => 160798)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-12-18 Alex Christensen <achristensen@webkit.org>
+
+ [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.
+
</ins><span class="cx"> 2013-12-18 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Refactor CodeGeneratorJS - Move attribute function creation out of getOwnPropertyName guard
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (160797 => 160798)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -131,10 +131,14 @@
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="WebCoreReleaseWinCairo.props" />
</span><ins>+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer32.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="WebCoreReleaseWinCairo.props" />
</span><ins>+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer64.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="lines">@@ -155,10 +159,14 @@
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="WebCoreDebugWinCairo.props" />
</span><ins>+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer32.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="WebCoreDebugWinCairo.props" />
</span><ins>+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer64.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorevcxprojWebCoreCairoprops"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.vcxproj/WebCoreCairo.props (160797 => 160798)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <ItemDefinitionGroup>
</span><span class="cx"> <ClCompile>
</span><del>- <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>
</del><ins>+ <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>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> </Project>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (160797 => 160798)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2013-12-18 Alex Christensen <achristensen@webkit.org>
+
+ [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.
+
</ins><span class="cx"> 2013-12-16 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed build fix for 64-bit.
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj (160797 => 160798)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -131,10 +131,14 @@
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="WebKitReleaseWinCairo.props" />
</span><ins>+ <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer32.props" />
+ <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="WebKitReleaseWinCairo.props" />
</span><ins>+ <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer64.props" />
+ <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="lines">@@ -155,10 +159,14 @@
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="WebKitDebugWinCairo.props" />
</span><ins>+ <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer32.props" />
+ <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="WebKitDebugWinCairo.props" />
</span><ins>+ <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer64.props" />
+ <Import Project="..\..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportsdefin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in (160797 => 160798)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -182,7 +182,7 @@
</span><span class="cx"> symbolWithPointer(?cacheDOMStructure@WebCore@@YAPAVStructure@JSC@@PAVJSDOMGlobalObject@1@PAV23@PBUClassInfo@3@@Z, ?cacheDOMStructure@WebCore@@YAPEAVStructure@JSC@@PEAVJSDOMGlobalObject@1@PEAV23@PEBUClassInfo@3@@Z)
</span><span class="cx"> symbolWithPointer(?childItemWithTarget@HistoryItem@WebCore@@QBEPAV12@ABVString@WTF@@@Z, ?childItemWithTarget@HistoryItem@WebCore@@QEBAPEAV12@AEBVString@WTF@@@Z)
</span><span class="cx"> 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)
</span><del>- symbolWithPointer(?commonVM@JSDOMWindowBase@WebCore@@SAPAVVM@JSC@@XZ, ?commonVM@JSDOMWindowBase@WebCore@@SAPAVVM@JSC@@XZ)
</del><ins>+ symbolWithPointer(?commonVM@JSDOMWindowBase@WebCore@@SAPAVVM@JSC@@XZ, ?commonVM@JSDOMWindowBase@WebCore@@SAPEAVVM@JSC@@XZ)
</ins><span class="cx"> 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)
</span><span class="cx"> #if USE(CF)
</span><span class="cx"> symbolWithPointer(?createCFString@String@WTF@@QBE?AV?$RetainPtr@PBU__CFString@@@2@XZ, ?createCFString@String@WTF@@QEBA?AV?$RetainPtr@PEBU__CFString@@@2@XZ)
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> symbolWithPointer(??1InspectorFrontendClientLocal@WebCore@@UAE@XZ, ??1InspectorFrontendClientLocal@WebCore@@UEAA@XZ)
</span><span class="cx"> symbolWithPointer(?changeAttachedWindowHeight@InspectorFrontendClientLocal@WebCore@@UAEXI@Z, ?changeAttachedWindowHeight@InspectorFrontendClientLocal@WebCore@@UEAAXI@Z)
</span><span class="cx"> symbolWithPointer(?changeAttachedWindowWidth@InspectorFrontendClientLocal@WebCore@@UAEXI@Z, ?changeAttachedWindowWidth@InspectorFrontendClientLocal@WebCore@@UEAAXI@Z)
</span><del>- symbolWithPointer(?connectFrontend@InspectorController@WebCore@@QAEXPAVInspectorFrontendChannel@Inspector@@@Z, connectFrontend@InspectorController@WebCore@@QEAAXPEAVInspectorFrontendChannel@Inspector@@@Z)
</del><ins>+ symbolWithPointer(?connectFrontend@InspectorController@WebCore@@QAEXPAVInspectorFrontendChannel@Inspector@@@Z, ?connectFrontend@InspectorController@WebCore@@QEAAXPEAVInspectorFrontendChannel@Inspector@@@Z)
</ins><span class="cx"> symbolWithPointer(?doDispatchMessageOnFrontendPage@InspectorClient@WebCore@@SA_NPAVPage@2@ABVString@WTF@@@Z, ?doDispatchMessageOnFrontendPage@InspectorClient@WebCore@@SA_NPEAVPage@2@AEBVString@WTF@@@Z)
</span><span class="cx"> symbolWithPointer(?frontendLoaded@InspectorFrontendClientLocal@WebCore@@UAEXXZ, ?frontendLoaded@InspectorFrontendClientLocal@WebCore@@UEAAXXZ)
</span><span class="cx"> symbolWithPointer(?getProperty@Settings@InspectorFrontendClientLocal@WebCore@@UAE?AVString@WTF@@ABV45@@Z, ?getProperty@Settings@InspectorFrontendClientLocal@WebCore@@UEAA?AVString@WTF@@AEBV45@@Z)
</span><span class="lines">@@ -443,7 +443,10 @@
</span><span class="cx"> 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)
</span><span class="cx"> symbolWithPointer(?nearest@TimeRanges@WebCore@@QBENN@Z, ?nearest@TimeRanges@WebCore@@QEBANN@Z)
</span><span class="cx"> symbolWithPointer(?add@TimeRanges@WebCore@@QAEXNN@Z, ?add@TimeRanges@WebCore@@QEAAXNN@Z)
</span><ins>+#if USE(GSTREAMER)
+ symbolWithPointer(?simulateAudioInterruption@MediaPlayer@WebCore@@QAEXXZ, ?simulateAudioInterruption@MediaPlayer@WebCore@@QEAAXXZ)
</ins><span class="cx"> #endif
</span><ins>+#endif
</ins><span class="cx"> symbolWithPointer(?standardFontFamily@Settings@WebCore@@QBEABVAtomicString@WTF@@W4UScriptCode@@@Z, ?standardFontFamily@Settings@WebCore@@QEBAAEBVAtomicString@WTF@@W4UScriptCode@@@Z)
</span><span class="cx"> symbolWithPointer(?serifFontFamily@Settings@WebCore@@QBEABVAtomicString@WTF@@W4UScriptCode@@@Z, ?serifFontFamily@Settings@WebCore@@QEBAAEBVAtomicString@WTF@@W4UScriptCode@@@Z)
</span><span class="cx"> symbolWithPointer(?sansSerifFontFamily@Settings@WebCore@@QBEABVAtomicString@WTF@@W4UScriptCode@@@Z, ?sansSerifFontFamily@Settings@WebCore@@QEBAAEBVAtomicString@WTF@@W4UScriptCode@@@Z)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (160797 => 160798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2013-12-18 23:05:09 UTC (rev 160797)
+++ trunk/Tools/ChangeLog 2013-12-18 23:11:02 UTC (rev 160798)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2013-12-18 Alex Christensen <achristensen@webkit.org>
+
+ [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.
+
</ins><span class="cx"> 2013-12-18 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove now useless test.
</span></span></pre></div>
<a id="trunkToolsWinLauncherWinLaunchervcxprojWinLauncherLibvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj (160797 => 160798)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -133,11 +133,15 @@
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="WinLauncherLibRelease.props" />
</span><span class="cx"> <Import Project="WinLauncherCFLite.props" />
</span><ins>+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer32.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="WinLauncherLibRelease.props" />
</span><span class="cx"> <Import Project="WinLauncherCFLite.props" />
</span><ins>+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer64.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="lines">@@ -163,11 +167,15 @@
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="WinLauncherLibDebug.props" />
</span><span class="cx"> <Import Project="WinLauncherCFLite.props" />
</span><ins>+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer32.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span><span class="cx"> <Import Project="WinLauncherLibDebug.props" />
</span><span class="cx"> <Import Project="WinLauncherCFLite.props" />
</span><ins>+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamer64.props" />
+ <Import Project="..\..\..\WebKitLibraries\win\tools\vsprops\GStreamerCommon.props" />
</ins><span class="cx"> </ImportGroup>
</span><span class="cx"> <ImportGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="PropertySheets">
</span><span class="cx"> <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</span></span></pre></div>
<a id="trunkToolswinDLLLauncherDLLLauncherMaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp (160797 => 160798)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -130,7 +130,20 @@
</span><span class="cx">
</span><span class="cx"> static bool modifyPath(const wstring& programName)
</span><span class="cx"> {
</span><ins>+#ifdef WIN_CAIRO
+
</ins><span class="cx"> #if defined(_M_X64)
</span><ins>+ 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)
</ins><span class="cx"> static const wstring pathPrefix = L"C:\\Program Files\\Common Files\\Apple\\Apple Application Support";
</span><span class="cx"> #else
</span><span class="cx"> static const wstring pathPrefix = L"C:\\Program Files (x86)\\Common Files\\Apple\\Apple Application Support";
</span><span class="lines">@@ -146,6 +159,7 @@
</span><span class="cx">
</span><span class="cx"> fatalError(programName, L"Failed to modify PATH environment variable.");
</span><span class="cx"> return false;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static wstring getLastErrorString(HRESULT hr)
</span><span class="lines">@@ -180,10 +194,8 @@
</span><span class="cx">
</span><span class="cx"> wstring programName = ::PathFindFileNameW(exePath);
</span><span class="cx">
</span><del>-#ifndef WIN_CAIRO
</del><span class="cx"> if (!modifyPath(programName))
</span><span class="cx"> return 1;
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> // Load our corresponding DLL.
</span><span class="cx"> wstring dllName = programName + L".dll";
</span></span></pre></div>
<a id="trunkWebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/ChangeLog (160797 => 160798)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/ChangeLog 2013-12-18 23:05:09 UTC (rev 160797)
+++ trunk/WebKitLibraries/ChangeLog 2013-12-18 23:11:02 UTC (rev 160798)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2013-12-18 Alex Christensen <achristensen@webkit.org>
+
+ [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.
+
</ins><span class="cx"> 2013-12-13 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed build fix for VS2013
</span></span></pre></div>
<a id="trunkWebKitLibrarieswintoolsvspropsFeatureDefinesCairoprops"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/win/tools/vsprops/FeatureDefinesCairo.props (160797 => 160798)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> <ENABLE_LINK_PREFETCH />
</span><span class="cx"> <ENABLE_LINK_PRERENDER />
</span><span class="cx"> <ENABLE_MATHML>ENABLE_MATHML</ENABLE_MATHML>
</span><ins>+ <ENABLE_MEDIA_CONTROLS_SCRIPT>ENABLE_MEDIA_CONTROLS_SCRIPT</ENABLE_MEDIA_CONTROLS_SCRIPT>
</ins><span class="cx"> <ENABLE_MEDIA_SOURCE />
</span><span class="cx"> <ENABLE_MEDIA_STATISTICS />
</span><span class="cx"> <ENABLE_METER_ELEMENT>ENABLE_METER_ELEMENT</ENABLE_METER_ELEMENT>
</span><span class="lines">@@ -90,7 +91,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <ItemDefinitionGroup>
</span><span class="cx"> <ClCompile>
</span><del>-<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>
</del><ins>+<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>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="lines">@@ -298,6 +299,10 @@
</span><span class="cx"> <Value>$(ENABLE_MATHML)</Value>
</span><span class="cx"> <EnvironmentVariable>true</EnvironmentVariable>
</span><span class="cx"> </BuildMacro>
</span><ins>+ <BuildMacro Include="ENABLE_MEDIA_CONTROLS_SCRIPT">
+ <Value>$(ENABLE_MEDIA_CONTROLS_SCRIPT)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
</ins><span class="cx"> <BuildMacro Include="ENABLE_MEDIA_SOURCE">
</span><span class="cx"> <Value>$(ENABLE_MEDIA_SOURCE)</Value>
</span><span class="cx"> <EnvironmentVariable>true</EnvironmentVariable>
</span><span class="lines">@@ -406,6 +411,10 @@
</span><span class="cx"> <Value>$(ENABLE_VIEW_MODE_CSS_MEDIA)</Value>
</span><span class="cx"> <EnvironmentVariable>true</EnvironmentVariable>
</span><span class="cx"> </BuildMacro>
</span><ins>+ <BuildMacro Include="ENABLE_VIDEO_TRACK">
+ <Value>$(ENABLE_VIDEO_TRACK)</Value>
+ <EnvironmentVariable>true</EnvironmentVariable>
+ </BuildMacro>
</ins><span class="cx"> <BuildMacro Include="ENABLE_WEB_AUDIO">
</span><span class="cx"> <Value>$(ENABLE_WEB_AUDIO)</Value>
</span><span class="cx"> <EnvironmentVariable>true</EnvironmentVariable>
</span></span></pre></div>
<a id="trunkWebKitLibrarieswintoolsvspropsGStreamer32props"></a>
<div class="addfile"><h4>Added: trunk/WebKitLibraries/win/tools/vsprops/GStreamer32.props (0 => 160798)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<?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>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkWebKitLibrarieswintoolsvspropsGStreamer64props"></a>
<div class="addfile"><h4>Added: trunk/WebKitLibraries/win/tools/vsprops/GStreamer64.props (0 => 160798)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+<?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>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkWebKitLibrarieswintoolsvspropsGStreamerCommonprops"></a>
<div class="addfile"><h4>Added: trunk/WebKitLibraries/win/tools/vsprops/GStreamerCommon.props (0 => 160798)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<?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>
</ins><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>