<!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>[187908] 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/187908">187908</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-08-04 16:10:36 -0700 (Tue, 04 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] Update Apple Windows build for VS2015
https://bugs.webkit.org/show_bug.cgi?id=147653
Reviewed by Dean Jackson.
Source/JavaScriptCore:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters: Drive-by-fix.
Show JSC files in proper project locations in IDE.
Source/WebKit/win:
* WebView.cpp:
(WebView::setCacheModel): Add explicit 'get' to satisfy compiler.
Source/WTF:
* WTF.vcxproj/WTF.vcxproj.filters: Drive-by-fix to place files in
proper project locations in the IDE.
* wtf/Platform.h: Don't define the _HAS_EXCEPTIONS macro when building with
Visual Studio 2015.
Tools:
* DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/PluginTest.h: If building with
something older than VS2015, define snprintf as _snprintf.
* DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginCommon.props:
Remove unneeded macro definition for snprintf.
* Scripts/webkitpy/common/system/platforminfo.py:
(PlatformInfo._determine_win_version): Recognize Windows 10.
* Scripts/webkitpy/port/win.py:
(WinPort): Ditto.
* Scripts/webkitpy/port/win_unittest.py:
(WinPortTest.test_baseline_search_path): Include Windows 10 in tests.
(WinPortTest._assert_version): Ditto.
WebKitLibraries:
* win/tools/vsprops/common.props: Fix build flags to use Windows 7
(WINVER=0x601) as minimum build target for 64-bit builds.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters">trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters</a></li>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFvcxprojWTFvcxprojfilters">trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebViewcpp">trunk/Source/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeDumpRenderTreevcxprojTestNetscapePluginTestNetscapePluginCommonprops">trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginCommon.props</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestNetscapePlugInPluginTesth">trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.h</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemplatforminfopy">trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportwinpy">trunk/Tools/Scripts/webkitpy/port/win.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportwin_unittestpy">trunk/Tools/Scripts/webkitpy/port/win_unittest.py</a></li>
<li><a href="#trunkWebKitLibrariesChangeLog">trunk/WebKitLibraries/ChangeLog</a></li>
<li><a href="#trunkWebKitLibrarieswintoolsvspropscommonprops">trunk/WebKitLibraries/win/tools/vsprops/common.props</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (187907 => 187908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-08-04 23:10:36 UTC (rev 187908)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-04 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Update Apple Windows build for VS2015
+ https://bugs.webkit.org/show_bug.cgi?id=147653
+
+ Reviewed by Dean Jackson.
+
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters: Drive-by-fix.
+ Show JSC files in proper project locations in IDE.
+
</ins><span class="cx"> 2015-08-04 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Object previews for SVG elements shows SVGAnimatedString instead of text
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (187907 => 187908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-08-04 23:10:36 UTC (rev 187908)
</span><span class="lines">@@ -1170,9 +1170,6 @@
</span><span class="cx"> <ClCompile Include="..\dfg\DFGDesiredWeakReferences.cpp">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dfg\DFGDesiredWriteBarriers.cpp">
- <Filter>dfg</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\dfg\DFGDisassembler.cpp">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -1314,9 +1311,6 @@
</span><span class="cx"> <ClCompile Include="..\dfg\DFGStackLayoutPhase.cpp">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dfg\DFGStoreBarrierElisionPhase.cpp">
- <Filter>dfg</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\dfg\DFGThunks.cpp">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -1830,6 +1824,13 @@
</span><span class="cx"> <ClCompile Include="..\wasm\WASMReader.cpp">
</span><span class="cx"> <Filter>wasm</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\bytecode\TrackedReferences.cpp" />
+ <ClCompile Include="..\dfg\DFGCombinedLiveness.cpp" />
+ <ClCompile Include="..\dfg\DFGConstantHoistingPhase.cpp" />
+ <ClCompile Include="..\dfg\DFGIntegerRangeOptimizationPhase.cpp" />
+ <ClCompile Include="..\dfg\DFGMinifiedGraph.cpp" />
+ <ClCompile Include="..\dfg\DFGOSRExitFuzz.cpp" />
+ <ClCompile Include="..\dfg\DFGStoreBarrierInsertionPhase.cpp" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="..\API\APICallbackFunction.h">
</span><span class="lines">@@ -3555,9 +3556,6 @@
</span><span class="cx"> <ClInclude Include="..\dfg\DFGDesiredWeakReferences.h">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\dfg\DFGDesiredWriteBarriers.h">
- <Filter>dfg</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\dfg\DFGDisassembler.h">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -3750,9 +3748,6 @@
</span><span class="cx"> <ClInclude Include="..\dfg\DFGStackLayoutPhase.h">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\dfg\DFGStoreBarrierElisionPhase.h">
- <Filter>dfg</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\dfg\DFGStructureAbstractValue.h">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -4370,6 +4365,12 @@
</span><span class="cx"> <ClInclude Include="..\wasm\WASMReader.h">
</span><span class="cx"> <Filter>wasm</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\bytecode\TrackedReferences.h" />
+ <ClInclude Include="..\dfg\DFGCombinedLiveness.h" />
+ <ClInclude Include="..\dfg\DFGConstantHoistingPhase.h" />
+ <ClInclude Include="..\dfg\DFGIntegerRangeOptimizationPhase.h" />
+ <ClInclude Include="..\dfg\DFGOSRExitFuzz.h" />
+ <ClInclude Include="..\dfg\DFGStoreBarrierInsertionPhase.h" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <None Include="JavaScriptCorePreLink.cmd" />
</span><span class="lines">@@ -4558,4 +4559,4 @@
</span><span class="cx"> <Filter>jit</Filter>
</span><span class="cx"> </MASM>
</span><span class="cx"> </ItemGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (187907 => 187908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Source/WTF/ChangeLog 2015-08-04 23:10:36 UTC (rev 187908)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-08-04 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Update Apple Windows build for VS2015
+ https://bugs.webkit.org/show_bug.cgi?id=147653
+
+ Reviewed by Dean Jackson.
+
+ * WTF.vcxproj/WTF.vcxproj.filters: Drive-by-fix to place files in
+ proper project locations in the IDE.
+ * wtf/Platform.h: Don't define the _HAS_EXCEPTIONS macro when building with
+ Visual Studio 2015.
+
</ins><span class="cx"> 2015-08-04 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r187815 and r187817.
</span></span></pre></div>
<a id="trunkSourceWTFWTFvcxprojWTFvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters (187907 => 187908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Source/WTF/WTF.vcxproj/WTF.vcxproj.filters 2015-08-04 23:10:36 UTC (rev 187908)
</span><span class="lines">@@ -713,9 +713,10 @@
</span><span class="cx"> <ClInclude Include="..\wtf\win\WorkItemWin.h">
</span><span class="cx"> <Filter>wtf\win</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\wtf\TinyPtrSet.h" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <None Include="WTFPostBuild.cmd" />
</span><span class="cx"> <None Include="WTFPreBuild.cmd" />
</span><span class="cx"> </ItemGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (187907 => 187908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Source/WTF/wtf/Platform.h 2015-08-04 23:10:36 UTC (rev 187908)
</span><span class="lines">@@ -1106,7 +1106,7 @@
</span><span class="cx"> #define ENABLE_PLATFORM_FONT_LOOKUP 1
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if COMPILER(MSVC)
</del><ins>+#if COMPILER(MSVC) && _MSC_VER < 1900
</ins><span class="cx"> #undef __STDC_LIMIT_MACROS
</span><span class="cx"> #define __STDC_LIMIT_MACROS
</span><span class="cx"> #undef _HAS_EXCEPTIONS
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (187907 => 187908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Source/WebKit/win/ChangeLog 2015-08-04 23:10:36 UTC (rev 187908)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-04 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Update Apple Windows build for VS2015
+ https://bugs.webkit.org/show_bug.cgi?id=147653
+
+ Reviewed by Dean Jackson.
+
+ * WebView.cpp:
+ (WebView::setCacheModel): Add explicit 'get' to satisfy compiler.
+
</ins><span class="cx"> 2015-08-04 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Fix Windows build after r187886.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebView.cpp (187907 => 187908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebView.cpp 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Source/WebKit/win/WebView.cpp 2015-08-04 23:10:36 UTC (rev 187908)
</span><span class="lines">@@ -539,7 +539,7 @@
</span><span class="cx"> else
</span><span class="cx"> cfurlCacheDirectory = WebCore::localUserSpecificStorageDirectory().createCFString();
</span><span class="cx"> }
</span><del>- cacheDirectory = String(cfurlCacheDirectory);
</del><ins>+ cacheDirectory = String(cfurlCacheDirectory.get());
</ins><span class="cx"> CFIndex cacheMemoryCapacity = 0;
</span><span class="cx"> CFIndex cacheDiskCapacity = 0;
</span><span class="cx"> #elif USE(CURL)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (187907 => 187908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Tools/ChangeLog 2015-08-04 23:10:36 UTC (rev 187908)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-08-04 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Update Apple Windows build for VS2015
+ https://bugs.webkit.org/show_bug.cgi?id=147653
+
+ Reviewed by Dean Jackson.
+
+ * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/PluginTest.h: If building with
+ something older than VS2015, define snprintf as _snprintf.
+ * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginCommon.props:
+ Remove unneeded macro definition for snprintf.
+ * Scripts/webkitpy/common/system/platforminfo.py:
+ (PlatformInfo._determine_win_version): Recognize Windows 10.
+ * Scripts/webkitpy/port/win.py:
+ (WinPort): Ditto.
+ * Scripts/webkitpy/port/win_unittest.py:
+ (WinPortTest.test_baseline_search_path): Include Windows 10 in tests.
+ (WinPortTest._assert_version): Ditto.
+
</ins><span class="cx"> 2015-08-04 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, update email addresses in contributors.json and watchlist.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeDumpRenderTreevcxprojTestNetscapePluginTestNetscapePluginCommonprops"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginCommon.props (187907 => 187908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginCommon.props 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePluginCommon.props 2015-08-04 23:10:36 UTC (rev 187908)
</span><span class="lines">@@ -6,7 +6,6 @@
</span><span class="cx"> <ItemDefinitionGroup>
</span><span class="cx"> <ClCompile>
</span><span class="cx"> <AdditionalIncludeDirectories>$(ProjectDir);$(ProjectDir)..\..\TestNetscapePlugIn;$(ProjectDir)..\..\TestNetscapePlugIn\win;$(ConfigurationBuildDir)\Include;$(ConfigurationBuildDir)\Include\private;$(ConfigurationBuildDir)\Include\JavaScriptCore;$(ConfigurationBuildDir)\Include\WebCore\ForwardingHeaders;$(WebKit_Libraries)\include;$(WebKit_Libraries)\include\private;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</span><del>- <PreprocessorDefinitions>snprintf=_snprintf;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</del><span class="cx"> </ClCompile>
</span><span class="cx"> <Link>
</span><span class="cx"> <AdditionalDependencies>Msimg32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestNetscapePlugInPluginTesth"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.h (187907 => 187908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.h 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Tools/DumpRenderTree/TestNetscapePlugIn/PluginTest.h 2015-08-04 23:10:36 UTC (rev 187908)
</span><span class="lines">@@ -31,6 +31,10 @@
</span><span class="cx"> #include <map>
</span><span class="cx"> #include <string>
</span><span class="cx">
</span><ins>+#if defined(_MSC_VER) && _MSC_VER < 1900
+#define snprintf _snprintf
+#endif
+
</ins><span class="cx"> // Helper classes for implementing has_member
</span><span class="cx"> typedef char (&no_tag)[1];
</span><span class="cx"> typedef char (&yes_tag)[2];
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemplatforminfopy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py (187907 => 187908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Tools/Scripts/webkitpy/common/system/platforminfo.py 2015-08-04 23:10:36 UTC (rev 187908)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> # Copyright (c) 2011 Google Inc. All rights reserved.
</span><ins>+# Copyright (c) 2015 Apple Inc. All rights reserved.
</ins><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -165,6 +166,8 @@
</span><span class="cx"> return 'lucid'
</span><span class="cx">
</span><span class="cx"> def _determine_win_version(self, win_version_tuple):
</span><ins>+ if win_version_tuple[:3] == (0, 0, 10240):
+ return 'win10'
</ins><span class="cx"> if win_version_tuple[:3] == (6, 1, 7600):
</span><span class="cx"> return '7sp0'
</span><span class="cx"> if win_version_tuple[:2] == (6, 0):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportwinpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/win.py (187907 => 187908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/win.py 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Tools/Scripts/webkitpy/port/win.py 2015-08-04 23:10:36 UTC (rev 187908)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> class WinPort(ApplePort):
</span><span class="cx"> port_name = "win"
</span><span class="cx">
</span><del>- VERSION_FALLBACK_ORDER = ["win-xp", "win-vista", "win-7sp0", "win"]
</del><ins>+ VERSION_FALLBACK_ORDER = ["win-xp", "win-vista", "win-7sp0", "win-win10", "win"]
</ins><span class="cx">
</span><span class="cx"> ARCHITECTURES = ['x86', 'x86_64']
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportwin_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/win_unittest.py (187907 => 187908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/win_unittest.py 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/Tools/Scripts/webkitpy/port/win_unittest.py 2015-08-04 23:10:36 UTC (rev 187908)
</span><span class="lines">@@ -63,13 +63,13 @@
</span><span class="cx"> self.assertEqual(port.baseline_search_path(), absolute_search_paths)
</span><span class="cx">
</span><span class="cx"> def test_baseline_search_path(self):
</span><del>- self._assert_search_path(['win-xp', 'win-vista', 'win-7sp0', 'win', 'mac'], 'xp')
- self._assert_search_path(['win-vista', 'win-7sp0', 'win', 'mac'], 'vista')
- self._assert_search_path(['win-7sp0', 'win', 'mac'], '7sp0')
</del><ins>+ self._assert_search_path(['win-xp', 'win-vista', 'win-7sp0', 'win-win10', 'win', 'mac'], 'xp')
+ self._assert_search_path(['win-vista', 'win-7sp0', 'win-win10', 'win', 'mac'], 'vista')
+ self._assert_search_path(['win-7sp0', 'win-win10', 'win', 'mac'], '7sp0')
</ins><span class="cx">
</span><del>- self._assert_search_path(['win-wk2', 'win-xp', 'win-vista', 'win-7sp0', 'win', 'mac-wk2', 'mac'], 'xp', use_webkit2=True)
- self._assert_search_path(['win-wk2', 'win-vista', 'win-7sp0', 'win', 'mac-wk2', 'mac'], 'vista', use_webkit2=True)
- self._assert_search_path(['win-wk2', 'win-7sp0', 'win', 'mac-wk2', 'mac'], '7sp0', use_webkit2=True)
</del><ins>+ self._assert_search_path(['win-wk2', 'win-xp', 'win-vista', 'win-7sp0', 'win-win10', 'win', 'mac-wk2', 'mac'], 'xp', use_webkit2=True)
+ self._assert_search_path(['win-wk2', 'win-vista', 'win-7sp0', 'win-win10', 'win', 'mac-wk2', 'mac'], 'vista', use_webkit2=True)
+ self._assert_search_path(['win-wk2', 'win-7sp0', 'win-win10', 'win', 'mac-wk2', 'mac'], '7sp0', use_webkit2=True)
</ins><span class="cx">
</span><span class="cx"> def _assert_version(self, port_name, expected_version):
</span><span class="cx"> host = MockSystemHost(os_name='win', os_version=expected_version)
</span></span></pre></div>
<a id="trunkWebKitLibrariesChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/ChangeLog (187907 => 187908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/ChangeLog 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/WebKitLibraries/ChangeLog 2015-08-04 23:10:36 UTC (rev 187908)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-08-04 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Update Apple Windows build for VS2015
+ https://bugs.webkit.org/show_bug.cgi?id=147653
+
+ Reviewed by Dean Jackson.
+
+ * win/tools/vsprops/common.props: Fix build flags to use Windows 7
+ (WINVER=0x601) as minimum build target for 64-bit builds.
+
</ins><span class="cx"> 2015-08-03 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Check in LLVM 3.6.2 binary drops for El Capitan
</span></span></pre></div>
<a id="trunkWebKitLibrarieswintoolsvspropscommonprops"></a>
<div class="modfile"><h4>Modified: trunk/WebKitLibraries/win/tools/vsprops/common.props (187907 => 187908)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKitLibraries/win/tools/vsprops/common.props 2015-08-04 23:08:55 UTC (rev 187907)
+++ trunk/WebKitLibraries/win/tools/vsprops/common.props 2015-08-04 23:10:36 UTC (rev 187908)
</span><span class="lines">@@ -40,9 +40,9 @@
</span><span class="cx"> <ItemDefinitionGroup>
</span><span class="cx"> <ClCompile>
</span><span class="cx"> <AdditionalOptions>/bigobj /GS %(AdditionalOptions)</AdditionalOptions>
</span><del>- <PreprocessorDefinitions>_WINDOWS;WINVER=0x502;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName);NOMINMAX;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="$(Platform)=='Win32'">WIN32;WINVER=0x601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <PreprocessorDefinitions Condition="$(Platform)=='Win64'">x64</PreprocessorDefinitions>
</del><ins>+ <PreprocessorDefinitions>_WINDOWS;WINVER=0x601;_CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1;_HAS_EXCEPTIONS=0;BUILDING_$(ProjectName);NOMINMAX;WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="$(Platform)=='Win32'">WIN32;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions Condition="$(Platform)=='Win64'">x64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ins><span class="cx"> <ExceptionHandling>false</ExceptionHandling>
</span><span class="cx"> <RuntimeTypeInfo>false</RuntimeTypeInfo>
</span><span class="cx"> <WarningLevel>Level4</WarningLevel>
</span></span></pre>
</div>
</div>
</body>
</html>