<!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>[161640] trunk/WebKitLibraries</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/161640">161640</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-10 09:17:23 -0800 (Fri, 10 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WinCairo] Crash when rendering (in pixman dll)
https://bugs.webkit.org/show_bug.cgi?id=126750
Patch by peavo@outlook.com <peavo@outlook.com> on 2014-01-10
Reviewed by Brent Fulgham.
Since we link with cairo.lib, and the gstreamer installation also comes with cairo.lib,
we link with the wrong cairo.lib, and loads gstreamers cairo dll, instead of our own.
We should user our own cairo dll for rendering.
* win/tools/vsprops/GStreamer32.props: Put gstreamer lib path last, so we link with the correct cairo.lib.
* win/tools/vsprops/GStreamer64.props: Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebKitLibrariesChangeLog">trunk/WebKitLibraries/ChangeLog</a></li>
<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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/ChangeLog (161639 => 161640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/ChangeLog 2014-01-10 17:07:56 UTC (rev 161639)
+++ trunk/WebKitLibraries/ChangeLog 2014-01-10 17:17:23 UTC (rev 161640)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-01-10 peavo@outlook.com <peavo@outlook.com>
+
+ [WinCairo] Crash when rendering (in pixman dll)
+ https://bugs.webkit.org/show_bug.cgi?id=126750
+
+ Reviewed by Brent Fulgham.
+
+ Since we link with cairo.lib, and the gstreamer installation also comes with cairo.lib,
+ we link with the wrong cairo.lib, and loads gstreamers cairo dll, instead of our own.
+ We should user our own cairo dll for rendering.
+
+ * win/tools/vsprops/GStreamer32.props: Put gstreamer lib path last, so we link with the correct cairo.lib.
+ * win/tools/vsprops/GStreamer64.props: Ditto.
+
</ins><span class="cx"> 2014-01-03 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [WinCairo] Enable video using GStreamer.
</span></span></pre></div>
<a id="trunkWebKitLibrarieswintoolsvspropsGStreamer32props"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/win/tools/vsprops/GStreamer32.props (161639 => 161640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/win/tools/vsprops/GStreamer32.props 2014-01-10 17:07:56 UTC (rev 161639)
+++ trunk/WebKitLibraries/win/tools/vsprops/GStreamer32.props 2014-01-10 17:17:23 UTC (rev 161640)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> <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>
</span><span class="cx"> </ClCompile>
</span><span class="cx"> <Link>
</span><del>- <AdditionalLibraryDirectories>$(GSTREAMER_1_0_ROOT_X86)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</del><ins>+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(GSTREAMER_1_0_ROOT_X86)lib</AdditionalLibraryDirectories>
</ins><span class="cx"> </Link>
</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="trunkWebKitLibrarieswintoolsvspropsGStreamer64props"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/win/tools/vsprops/GStreamer64.props (161639 => 161640)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/win/tools/vsprops/GStreamer64.props 2014-01-10 17:07:56 UTC (rev 161639)
+++ trunk/WebKitLibraries/win/tools/vsprops/GStreamer64.props 2014-01-10 17:17:23 UTC (rev 161640)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> <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>
</span><span class="cx"> </ClCompile>
</span><span class="cx"> <Link>
</span><del>- <AdditionalLibraryDirectories>$(GSTREAMER_1_0_ROOT_X86_64)lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</del><ins>+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(GSTREAMER_1_0_ROOT_X86_64)lib</AdditionalLibraryDirectories>
</ins><span class="cx"> </Link>
</span><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> </Project>
</span><span class="cx">\ No newline at end of file
</span></span></pre>
</div>
</div>
</body>
</html>