<!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>[187058] branches/safari-601.1-branch/Source/WebCore</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/187058">187058</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-07-20 21:36:40 -0700 (Mon, 20 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/186867">r186867</a>. rdar://problem/21643094</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchSourceWebCoreChangeLog">branches/safari-601.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreWebCorevcxprojWebCorevcxproj">branches/safari-601.1-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">branches/safari-601.1-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (187057 => 187058)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/ChangeLog        2015-07-21 04:36:37 UTC (rev 187057)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog        2015-07-21 04:36:40 UTC (rev 187058)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-07-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r186867. rdar://problem/21643094
+
+ 2015-07-15 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Unreviewed build fix after r186858.
+
+ Add missing DOMPath and PathUtilities files to project.
+
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+
+2015-07-20 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r186863. rdar://problem/21715050
</span><span class="cx">
</span><span class="cx"> 2015-07-15 Brady Eidson <beidson@apple.com>
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (187057 => 187058)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj        2015-07-21 04:36:37 UTC (rev 187057)
+++ branches/safari-601.1-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj        2015-07-21 04:36:40 UTC (rev 187058)
</span><span class="lines">@@ -6664,6 +6664,7 @@
</span><span class="cx"> <ClCompile Include="..\html\canvas\ANGLEInstancedArrays.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\CanvasContextAttributes.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\CanvasPathMethods.cpp" />
</span><ins>+ <ClCompile Include="..\html\canvas\DOMPath.cpp" />
</ins><span class="cx"> <ClCompile Include="..\html\canvas\EXTShaderTextureLOD.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\EXTsRGB.cpp" />
</span><span class="cx"> <ClCompile Include="..\html\canvas\EXTBlendMinMax.cpp" />
</span><span class="lines">@@ -7654,6 +7655,7 @@
</span><span class="cx"> <ClCompile Include="..\platform\graphics\opengl\GraphicsContext3DOpenGLCommon.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\graphics\opengl\GraphicsContext3DOpenGLES.cpp" />
</span><span class="cx"> <ClCompile Include="..\platform\graphics\opengl\TemporaryOpenGLSetting.cpp" />
</span><ins>+ <ClCompile Include="..\platform\graphics\PathUtilities.cpp" />
</ins><span class="cx"> <ClCompile Include="..\platform\graphics\PlatformDisplay.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span><span class="lines">@@ -19569,6 +19571,7 @@
</span><span class="cx"> <ClInclude Include="..\html\canvas\ANGLEInstancedArrays.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\CanvasContextAttributes.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\CanvasPathMethods.h" />
</span><ins>+ <ClInclude Include="..\html\canvas\DOMPath.h" />
</ins><span class="cx"> <ClInclude Include="..\html\canvas\EXTShaderTextureLOD.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\EXTsRGB.h" />
</span><span class="cx"> <ClInclude Include="..\html\canvas\EXTFragDepth.h" />
</span><span class="lines">@@ -20050,6 +20053,7 @@
</span><span class="cx"> <ClInclude Include="..\platform\graphics\opengl\GLDefs.h" />
</span><span class="cx"> <ClInclude Include="..\platform\graphics\opengl\GLPlatformContext.h" />
</span><span class="cx"> <ClInclude Include="..\platform\graphics\opengl\GLPlatformSurface.h" />
</span><ins>+ <ClInclude Include="..\platform\graphics\PathUtilities.h" />
</ins><span class="cx"> <ClInclude Include="..\platform\graphics\PlatformDisplay.h" />
</span><span class="cx"> <ClInclude Include="..\platform\graphics\texmap\BitmapTexture.h" />
</span><span class="cx"> <ClInclude Include="..\platform\graphics\texmap\BitmapTextureGL.h" />
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (187057 => 187058)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters        2015-07-21 04:36:37 UTC (rev 187057)
+++ branches/safari-601.1-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters        2015-07-21 04:36:40 UTC (rev 187058)
</span><span class="lines">@@ -7258,6 +7258,17 @@
</span><span class="cx"> <ClCompile Include="..\platform\win\MemoryPressureHandlerWin.cpp">
</span><span class="cx"> <Filter>platform\win</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\dom\NodeOrString.cpp" />
+ <ClCompile Include="..\bindings\js\JSCharacterDataCustom.cpp" />
+ <ClCompile Include="..\bindings\js\JSDocumentFragmentCustom.cpp" />
+ <ClCompile Include="..\bindings\js\JSDocumentTypeCustom.cpp" />
+ <ClCompile Include="..\bindings\js\JSNodeOrString.cpp" />
+ <ClCompile Include="..\html\canvas\DOMPath.cpp">
+ <Filter>html\canvas</Filter>
+ </ClCompile>
+ <ClCompile Include="..\platform\graphics\PathUtilities.cpp">
+ <Filter>platform\graphics</Filter>
+ </ClCompile>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="..\Modules\geolocation\Coordinates.h">
</span><span class="lines">@@ -15239,6 +15250,14 @@
</span><span class="cx"> <ClInclude Include="..\platform\VNodeTracker.h">
</span><span class="cx"> <Filter>platform</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\dom\NodeOrString.h" />
+ <ClInclude Include="..\bindings\js\JSNodeOrString.h" />
+ <ClInclude Include="..\html\canvas\DOMPath.h">
+ <Filter>html\canvas</Filter>
+ </ClInclude>
+ <ClInclude Include="..\platform\graphics\PathUtilities.h">
+ <Filter>platform\graphics</Filter>
+ </ClInclude>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <None Include="..\css\CSSGrammar.y.in">
</span></span></pre>
</div>
</div>
</body>
</html>