<!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>[184264] branches/safari-601.1.32-branch</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/184264">184264</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2015-05-12 22:33:16 -0700 (Tue, 12 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/184137">r184137</a>. rdar://problem/20707307</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601132branchSourceJavaScriptCoreChangeLog">branches/safari-601.1.32-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters">branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters</a></li>
<li><a href="#branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreGeneratedvcxproj">branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntAssemblyLLIntAssemblyvcxproj">branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntDesiredOffsetsLLIntDesiredOffsetsvcxproj">branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntOffsetsExtractorLLIntOffsetsExtractorvcxproj">branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojjscjscvcxproj">branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jsc.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojjscjscLaunchervcxproj">branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscLauncher.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojlibllvmForJSClibllvmForJSCvcxproj">branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojtestRegExptestRegExpvcxproj">branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojtestRegExptestRegExpLaunchervcxproj">branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpLauncher.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojtestapitestapivcxproj">branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapi.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojtestapitestapiLaunchervcxproj">branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiLauncher.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceJavaScriptCoreconfigh">branches/safari-601.1.32-branch/Source/JavaScriptCore/config.h</a></li>
<li><a href="#branchessafari601132branchSourceThirdPartyANGLEANGLEvcxprojlibEGLvcxproj">branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceThirdPartyANGLEANGLEvcxprojlibGLESv2vcxproj">branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceThirdPartyANGLEANGLEvcxprojpreprocessorvcxproj">branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceThirdPartyANGLEANGLEvcxprojtranslator_commonvcxproj">branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceThirdPartyANGLEANGLEvcxprojtranslator_glslvcxproj">branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceThirdPartyANGLEANGLEvcxprojtranslator_hlslvcxproj">branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceThirdPartyANGLEChangeLog">branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceThirdPartyChangeLog">branches/safari-601.1.32-branch/Source/ThirdParty/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceThirdPartygtestmsvcgtestmdvcxproj">branches/safari-601.1.32-branch/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceWTFChangeLog">branches/safari-601.1.32-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWTFWTFvcxprojWTFvcxproj">branches/safari-601.1.32-branch/Source/WTF/WTF.vcxproj/WTF.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceWTFWTFvcxprojWTFGeneratedvcxproj">branches/safari-601.1.32-branch/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceWTFconfigh">branches/safari-601.1.32-branch/Source/WTF/config.h</a></li>
<li><a href="#branchessafari601132branchSourceWebCoreChangeLog">branches/safari-601.1.32-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebCoreWebCorevcxprojWebCorevcxproj">branches/safari-601.1.32-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceWebCoreWebCorevcxprojWebCoreGeneratedvcxproj">branches/safari-601.1.32-branch/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceWebCoreWebCorevcxprojWebCoreTestSupportvcxproj">branches/safari-601.1.32-branch/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceWebCoreWebCorePrefixh">branches/safari-601.1.32-branch/Source/WebCore/WebCorePrefix.h</a></li>
<li><a href="#branchessafari601132branchSourceWebCoreconfigh">branches/safari-601.1.32-branch/Source/WebCore/config.h</a></li>
<li><a href="#branchessafari601132branchSourceWebCoretestingjsWebCoreTestSupportPrefixh">branches/safari-601.1.32-branch/Source/WebCore/testing/js/WebCoreTestSupportPrefix.h</a></li>
<li><a href="#branchessafari601132branchSourceWebInspectorUIChangeLog">branches/safari-601.1.32-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIvcxproj">branches/safari-601.1.32-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceWebKitChangeLog">branches/safari-601.1.32-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebKitWebKitvcxprojInterfacesInterfacesvcxproj">branches/safari-601.1.32-branch/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceWebKitWebKitvcxprojWebKitWebKitvcxproj">branches/safari-601.1.32-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceWebKitWebKitvcxprojWebKitGUIDWebKitGUIDvcxproj">branches/safari-601.1.32-branch/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj</a></li>
<li><a href="#branchessafari601132branchSourceWebKitwinChangeLog">branches/safari-601.1.32-branch/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#branchessafari601132branchSourceWebKitwinWebKitPrefixh">branches/safari-601.1.32-branch/Source/WebKit/win/WebKitPrefix.h</a></li>
<li><a href="#branchessafari601132branchToolsChangeLog">branches/safari-601.1.32-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari601132branchToolsDumpRenderTreeDumpRenderTreevcxprojDumpRenderTreeDumpRenderTreevcxproj">branches/safari-601.1.32-branch/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj</a></li>
<li><a href="#branchessafari601132branchToolsDumpRenderTreeDumpRenderTreevcxprojDumpRenderTreeDumpRenderTreeLaunchervcxproj">branches/safari-601.1.32-branch/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj</a></li>
<li><a href="#branchessafari601132branchToolsDumpRenderTreeDumpRenderTreevcxprojImageDiffImageDiffvcxproj">branches/safari-601.1.32-branch/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiff.vcxproj</a></li>
<li><a href="#branchessafari601132branchToolsDumpRenderTreeDumpRenderTreevcxprojImageDiffImageDiffLaunchervcxproj">branches/safari-601.1.32-branch/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncher.vcxproj</a></li>
<li><a href="#branchessafari601132branchToolsDumpRenderTreeDumpRenderTreevcxprojTestNetscapePluginTestNetscapePluginvcxproj">branches/safari-601.1.32-branch/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj</a></li>
<li><a href="#branchessafari601132branchToolsDumpRenderTreeconfigh">branches/safari-601.1.32-branch/Tools/DumpRenderTree/config.h</a></li>
<li><a href="#branchessafari601132branchToolsTestWebKitAPITestWebKitAPIvcxprojTestWebKitAPIvcxproj">branches/safari-601.1.32-branch/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj</a></li>
<li><a href="#branchessafari601132branchToolsWinLauncherWinLaunchervcxprojWinLaunchervcxproj">branches/safari-601.1.32-branch/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj</a></li>
<li><a href="#branchessafari601132branchToolsWinLauncherWinLaunchervcxprojWinLauncherLibvcxproj">branches/safari-601.1.32-branch/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj</a></li>
<li><a href="#branchessafari601132branchToolsWinLauncherstdafxh">branches/safari-601.1.32-branch/Tools/WinLauncher/stdafx.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601132branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/ChangeLog (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/ChangeLog 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/ChangeLog 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2015-05-12 Dana Burkart
+Dana Burkart <dburkart@apple.com
+dburkart@apple.com>
+
+ Merge r184137. rdar://problem/20707307
+
+ 2015-05-11 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Move Windows build target to Windows 7 (or newer)
+ https://bugs.webkit.org/show_bug.cgi?id=144890
+ <rdar://problem/20707307>
+
+ Reviewed by Anders Carlsson.
+
+ Update linked SDK and minimal Windows level to be compatible with
+ Windows 7 or newer.
+
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+ * JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj:
+ * JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj:
+ * JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj:
+ * JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj:
+ * JavaScriptCore.vcxproj/jsc/jsc.vcxproj:
+ * JavaScriptCore.vcxproj/jsc/jscLauncher.vcxproj:
+ * JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.vcxproj:
+ * JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj:
+ * JavaScriptCore.vcxproj/testRegExp/testRegExpLauncher.vcxproj:
+ * JavaScriptCore.vcxproj/testapi/testapi.vcxproj:
+ * JavaScriptCore.vcxproj/testapi/testapiLauncher.vcxproj:
+ * config.h:
+
</ins><span class="cx"> 2015-05-05 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Sane chain and string watchpoints should be set in FixupPhase or the backend rather than WatchpointCollectionPhase
</span></span></pre></div>
<a id="branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span></span></pre></div>
<a id="branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -516,9 +516,6 @@
</span><span class="cx"> <ClCompile Include="..\runtime\ArgList.cpp">
</span><span class="cx"> <Filter>runtime</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\runtime\Arguments.cpp">
- <Filter>runtime</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\runtime\ArrayConstructor.cpp">
</span><span class="cx"> <Filter>runtime</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -1071,9 +1068,6 @@
</span><span class="cx"> <ClCompile Include="..\dfg\DFGAbstractValue.cpp">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dfg\DFGArgumentsSimplificationPhase.cpp">
- <Filter>dfg</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\dfg\DFGArrayMode.cpp">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -1254,9 +1248,6 @@
</span><span class="cx"> <ClCompile Include="..\dfg\DFGOSRExitPreparation.cpp">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dfg\DFGPhantomCanonicalizationPhase.cpp">
- <Filter>dfg</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\dfg\DFGPhase.cpp">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -1398,9 +1389,6 @@
</span><span class="cx"> <ClCompile Include="..\dfg\DFGAvailability.cpp">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dfg\DFGResurrectionForValidationPhase.cpp">
- <Filter>dfg</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\bytecode\CodeBlockJettisoningWatchpoint.cpp">
</span><span class="cx"> <Filter>bytecode</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -1689,9 +1677,6 @@
</span><span class="cx"> <ClCompile Include="..\dfg\DFGMayExit.cpp">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dfg\DFGPhantomRemovalPhase.cpp">
- <Filter>dfg</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\dfg\DFGPureValue.cpp">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -1716,9 +1701,6 @@
</span><span class="cx"> <ClCompile Include="..\bytecode\ToThisStatus.cpp">
</span><span class="cx"> <Filter>bytecode</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\bytecode\VariableWatchpointSet.cpp">
- <Filter>bytecode</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\bytecode\CallEdge.cpp">
</span><span class="cx"> <Filter>bytecode</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -1788,6 +1770,25 @@
</span><span class="cx"> <ClCompile Include="..\jit\ExecutableAllocatorFixedVMPool.cpp">
</span><span class="cx"> <Filter>jit</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\bytecode\VariableWriteFireDetail.cpp" />
+ <ClCompile Include="..\dfg\DFGArgumentsEliminationPhase.cpp" />
+ <ClCompile Include="..\dfg\DFGArgumentsUtilities.cpp" />
+ <ClCompile Include="..\dfg\DFGCleanUpPhase.cpp" />
+ <ClCompile Include="..\dfg\DFGEpoch.cpp" />
+ <ClCompile Include="..\dfg\DFGMovHintRemovalPhase.cpp" />
+ <ClCompile Include="..\dfg\DFGPhantomInsertionPhase.cpp" />
+ <ClCompile Include="..\dfg\DFGVarargsForwardingPhase.cpp" />
+ <ClCompile Include="..\jit\ExecutableAllocationFuzz.cpp" />
+ <ClCompile Include="..\runtime\ClonedArguments.cpp" />
+ <ClCompile Include="..\runtime\ConstantMode.cpp" />
+ <ClCompile Include="..\runtime\DirectArguments.cpp" />
+ <ClCompile Include="..\runtime\DirectArgumentsOffset.cpp" />
+ <ClCompile Include="..\runtime\InferredValue.cpp" />
+ <ClCompile Include="..\runtime\ScopeOffset.cpp" />
+ <ClCompile Include="..\runtime\ScopedArguments.cpp" />
+ <ClCompile Include="..\runtime\ScopedArgumentsTable.cpp" />
+ <ClCompile Include="..\runtime\TypeofType.cpp" />
+ <ClCompile Include="..\runtime\VarOffset.cpp" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="..\API\APICallbackFunction.h">
</span><span class="lines">@@ -2528,9 +2529,6 @@
</span><span class="cx"> <ClInclude Include="..\runtime\ArgList.h">
</span><span class="cx"> <Filter>runtime</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\runtime\Arguments.h">
- <Filter>runtime</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\runtime\ArrayConstructor.h">
</span><span class="cx"> <Filter>runtime</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -3393,9 +3391,6 @@
</span><span class="cx"> <ClInclude Include="..\dfg\DFGArgumentPosition.h">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\dfg\DFGArgumentsSimplificationPhase.h">
- <Filter>dfg</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\dfg\DFGArrayifySlowPathGenerator.h">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -3624,9 +3619,6 @@
</span><span class="cx"> <ClInclude Include="..\dfg\DFGOSRExitPreparation.h">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\dfg\DFGPhantomCanonicalizationPhase.h">
- <Filter>dfg</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\dfg\DFGPhase.h">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -3702,9 +3694,6 @@
</span><span class="cx"> <ClInclude Include="..\dfg\DFGValidate.h">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\dfg\DFGValueRecoveryOverride.h">
- <Filter>dfg</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\dfg\DFGValueSource.h">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -3825,9 +3814,6 @@
</span><span class="cx"> <ClInclude Include="..\jit\JITInlineCacheGenerator.h">
</span><span class="cx"> <Filter>jit</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\dfg\DFGResurrectionForValidationPhase.h">
- <Filter>dfg</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\dfg\DFGAvailability.h">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -3840,9 +3826,6 @@
</span><span class="cx"> <ClInclude Include="..\runtime\StackAlignment.h">
</span><span class="cx"> <Filter>runtime</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\bytecode\VariableWatchpointSet.h">
- <Filter>bytecode</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\bindings\ScriptFunctionCall.h">
</span><span class="cx"> <Filter>bindings</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -4174,9 +4157,6 @@
</span><span class="cx"> <ClInclude Include="..\dfg\DFGMayExit.h">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="..\dfg\DFGPhantomRemovalPhase.h">
- <Filter>dfg</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="..\dfg\DFGPureValue.h">
</span><span class="cx"> <Filter>dfg</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -4274,6 +4254,31 @@
</span><span class="cx"> <ClInclude Include="..\runtime\JSCatchScope.h" />
</span><span class="cx"> <ClInclude Include="..\runtime\JSFunctionNameScope.h" />
</span><span class="cx"> <ClInclude Include="..\runtime\MathCommon.h" />
</span><ins>+ <ClInclude Include="..\bytecode\BytecodeKills.h" />
+ <ClInclude Include="..\bytecode\VariableWriteFireDetail.h" />
+ <ClInclude Include="..\dfg\DFGArgumentsEliminationPhase.h" />
+ <ClInclude Include="..\dfg\DFGArgumentsUtilities.h" />
+ <ClInclude Include="..\dfg\DFGCallCreateDirectArgumentsSlowPathGenerator.h" />
+ <ClInclude Include="..\dfg\DFGCleanUpPhase.h" />
+ <ClInclude Include="..\dfg\DFGEpoch.h" />
+ <ClInclude Include="..\dfg\DFGForAllKills.h" />
+ <ClInclude Include="..\dfg\DFGMovHintRemovalPhase.h" />
+ <ClInclude Include="..\dfg\DFGPhantomInsertionPhase.h" />
+ <ClInclude Include="..\dfg\DFGVarargsForwardingPhase.h" />
+ <ClInclude Include="..\jit\ExecutableAllocationFuzz.h" />
+ <ClInclude Include="..\runtime\ArgumentsMode.h" />
+ <ClInclude Include="..\runtime\ClonedArguments.h" />
+ <ClInclude Include="..\runtime\DirectArguments.h" />
+ <ClInclude Include="..\runtime\DirectArgumentsOffset.h" />
+ <ClInclude Include="..\runtime\GenericArguments.h" />
+ <ClInclude Include="..\runtime\GenericArgumentsInlines.h" />
+ <ClInclude Include="..\runtime\GenericOffset.h" />
+ <ClInclude Include="..\runtime\InferredValue.h" />
+ <ClInclude Include="..\runtime\ScopeOffset.h" />
+ <ClInclude Include="..\runtime\ScopedArguments.h" />
+ <ClInclude Include="..\runtime\ScopedArgumentsTable.h" />
+ <ClInclude Include="..\runtime\TypeofType.h" />
+ <ClInclude Include="..\runtime\VarOffset.h" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <None Include="JavaScriptCorePreLink.cmd" />
</span></span></pre></div>
<a id="branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreGeneratedvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCoreGenerated.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -84,17 +84,17 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -223,4 +223,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntAssemblyLLIntAssemblyvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntAssembly/LLIntAssembly.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -280,4 +280,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntDesiredOffsetsLLIntDesiredOffsetsvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntDesiredOffsets/LLIntDesiredOffsets.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -74,7 +74,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -266,4 +266,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojLLIntLLIntOffsetsExtractorLLIntOffsetsExtractorvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/LLInt/LLIntOffsetsExtractor/LLIntOffsetsExtractor.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span></span></pre></div>
<a id="branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojjscjscvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jsc.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jsc.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jsc.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span></span></pre></div>
<a id="branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojjscjscLaunchervcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscLauncher.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscLauncher.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jscLauncher.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span></span></pre></div>
<a id="branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojlibllvmForJSClibllvmForJSCvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/libllvmForJSC/libllvmForJSC.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -61,12 +61,12 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <WholeProgramOptimization>true</WholeProgramOptimization>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span></span></pre></div>
<a id="branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojtestRegExptestRegExpvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span></span></pre></div>
<a id="branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojtestRegExptestRegExpLaunchervcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpLauncher.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpLauncher.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExpLauncher.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span></span></pre></div>
<a id="branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojtestapitestapivcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapi.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapi.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapi.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -302,4 +302,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601132branchSourceJavaScriptCoreJavaScriptCorevcxprojtestapitestapiLaunchervcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiLauncher.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiLauncher.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapiLauncher.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span></span></pre></div>
<a id="branchessafari601132branchSourceJavaScriptCoreconfigh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/JavaScriptCore/config.h (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/JavaScriptCore/config.h 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/JavaScriptCore/config.h 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -32,11 +32,11 @@
</span><span class="cx"> #if OS(WINDOWS)
</span><span class="cx">
</span><span class="cx"> #ifndef _WIN32_WINNT
</span><del>-#define _WIN32_WINNT 0x0502
</del><ins>+#define _WIN32_WINNT 0x601
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifndef WINVER
</span><del>-#define WINVER 0x0502
</del><ins>+#define WINVER 0x0601
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !COMPILER(MSVC7_OR_LOWER)
</span></span></pre></div>
<a id="branchessafari601132branchSourceThirdPartyANGLEANGLEvcxprojlibEGLvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libEGL.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -60,17 +60,17 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <WholeProgramOptimization>true</WholeProgramOptimization>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span></span></pre></div>
<a id="branchessafari601132branchSourceThirdPartyANGLEANGLEvcxprojlibGLESv2vcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/libGLESv2.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -59,15 +59,15 @@
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <WholeProgramOptimization>true</WholeProgramOptimization>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -432,4 +432,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601132branchSourceThirdPartyANGLEANGLEvcxprojpreprocessorvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/preprocessor.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -58,15 +58,15 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
</span><span class="cx"> <ImportGroup Label="ExtensionSettings">
</span><span class="lines">@@ -200,4 +200,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601132branchSourceThirdPartyANGLEANGLEvcxprojtranslator_commonvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_common.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -58,15 +58,15 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
</span><span class="cx"> <ImportGroup Label="ExtensionSettings">
</span><span class="lines">@@ -282,4 +282,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601132branchSourceThirdPartyANGLEANGLEvcxprojtranslator_glslvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_glsl.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -58,15 +58,15 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
</span><span class="cx"> <ImportGroup Label="ExtensionSettings">
</span><span class="lines">@@ -189,4 +189,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601132branchSourceThirdPartyANGLEANGLEvcxprojtranslator_hlslvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ANGLE.vcxproj/translator_hlsl.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -58,15 +58,15 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
</span><span class="cx"> <ImportGroup Label="ExtensionSettings">
</span><span class="lines">@@ -181,4 +181,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601132branchSourceThirdPartyANGLEChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ChangeLog (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ChangeLog 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/ThirdParty/ANGLE/ChangeLog 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-05-12 Dana Burkart
+Dana Burkart <dburkart@apple.com
+dburkart@apple.com>
+
+ Merge r184137. rdar://problem/20707307
+
+ 2015-05-11 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Move Windows build target to Windows 7 (or newer)
+ https://bugs.webkit.org/show_bug.cgi?id=144890
+ <rdar://problem/20707307>
+
+ Reviewed by Anders Carlsson.
+
+ Update linked SDK and minimal Windows level to be compatible with
+ Windows 7 or newer.
+
+ * ANGLE.vcxproj/libEGL.vcxproj:
+ * ANGLE.vcxproj/libGLESv2.vcxproj:
+ * ANGLE.vcxproj/preprocessor.vcxproj:
+ * ANGLE.vcxproj/translator_common.vcxproj:
+ * ANGLE.vcxproj/translator_glsl.vcxproj:
+ * ANGLE.vcxproj/translator_hlsl.vcxproj:
+
</ins><span class="cx"> 2015-04-01 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Progress towards CMake on Windows and Mac.
</span></span></pre></div>
<a id="branchessafari601132branchSourceThirdPartyChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/ThirdParty/ChangeLog (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/ThirdParty/ChangeLog 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/ThirdParty/ChangeLog 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-05-12 Dana Burkart
+Dana Burkart <dburkart@apple.com
+dburkart@apple.com>
+
+ Merge r184137. rdar://problem/20707307
+
+ 2015-05-11 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Move Windows build target to Windows 7 (or newer)
+ https://bugs.webkit.org/show_bug.cgi?id=144890
+ <rdar://problem/20707307>
+
+ Reviewed by Anders Carlsson.
+
+ Update linked SDK and minimal Windows level to be compatible with
+ Windows 7 or newer.
+
+ * gtest/msvc/gtest-md.vcxproj:
+
</ins><span class="cx"> 2015-04-01 Gyuyoung Kim <gyuyoung.kim@webkit.org>
</span><span class="cx">
</span><span class="cx"> [CMake] Make gtest/CMakeLists.txt more readable
</span></span></pre></div>
<a id="branchessafari601132branchSourceThirdPartygtestmsvcgtestmdvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/ThirdParty/gtest/msvc/gtest-md.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>MultiByte</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>MultiByte</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>MultiByte</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>MultiByte</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span></span></pre></div>
<a id="branchessafari601132branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WTF/ChangeLog (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WTF/ChangeLog 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/WTF/ChangeLog 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-05-12 Dana Burkart
+Dana Burkart <dburkart@apple.com
+dburkart@apple.com>
+
+ Merge r184137. rdar://problem/20707307
+
+ 2015-05-11 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Move Windows build target to Windows 7 (or newer)
+ https://bugs.webkit.org/show_bug.cgi?id=144890
+ <rdar://problem/20707307>
+
+ Reviewed by Anders Carlsson.
+
+ Update linked SDK and minimal Windows level to be compatible with
+ Windows 7 or newer.
+
+ * WTF.vcxproj/WTF.vcxproj:
+ * WTF.vcxproj/WTFGenerated.vcxproj:
+ * config.h:
+
</ins><span class="cx"> 2015-05-05 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Async operations running in the WorkQueue thread should schedule their sources to the WorkQueue main lopp
</span></span></pre></div>
<a id="branchessafari601132branchSourceWTFWTFvcxprojWTFvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WTF/WTF.vcxproj/WTF.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WTF/WTF.vcxproj/WTF.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/WTF/WTF.vcxproj/WTF.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -328,7 +328,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -352,7 +352,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -364,7 +364,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -388,7 +388,7 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -769,4 +769,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601132branchSourceWTFWTFvcxprojWTFGeneratedvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/WTF/WTF.vcxproj/WTFGenerated.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -94,7 +94,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -114,7 +114,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -250,4 +250,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="branchessafari601132branchSourceWTFconfigh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WTF/config.h (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WTF/config.h 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/WTF/config.h 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -29,20 +29,12 @@
</span><span class="cx"> #if OS(WINDOWS)
</span><span class="cx">
</span><span class="cx"> #ifndef _WIN32_WINNT
</span><del>-#if defined(_M_X64) || defined(__x86_64__)
-#define _WIN32_WINNT 0x600
-#else
-#define _WIN32_WINNT 0x0502
</del><ins>+#define _WIN32_WINNT 0x601
</ins><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #ifndef WINVER
</span><del>-#if defined(_M_X64) || defined(__x86_64__)
-#define WINVER 0x0600
-#else
-#define WINVER 0x0502
</del><ins>+#define WINVER 0x0601
</ins><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if !COMPILER(MSVC7_OR_LOWER)
</span><span class="cx"> // We need to define this before the first #include of stdlib.h or it won't contain rand_s.
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/ChangeLog (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/ChangeLog 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/WebCore/ChangeLog 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -2,478 +2,474 @@
</span><span class="cx"> Dana Burkart <dburkart@apple.com
</span><span class="cx"> dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r184116. rdar://problem/20774613
</del><ins>+ Merge r184137. rdar://problem/20707307
</ins><span class="cx">
</span><del>- 2015-05-11 Alex Christensen <achristensen@webkit.org>
</del><ins>+ 2015-05-11 Brent Fulgham <bfulgham@apple.com>
</ins><span class="cx">
</span><del>- [Content Extensions] Support domain-specific rules and exceptions.
- https://bugs.webkit.org/show_bug.cgi?id=144833
</del><ins>+ [Win] Move Windows build target to Windows 7 (or newer)
+ https://bugs.webkit.org/show_bug.cgi?id=144890
+ <rdar://problem/20707307>
</ins><span class="cx">
</span><del>- Reviewed by Darin Adler.
</del><ins>+ Reviewed by Anders Carlsson.
</ins><span class="cx">
</span><del>- Test: http/tests/contentextensions/domain-rules.html
- (And lots of API tests)
</del><ins>+ Update linked SDK and minimal Windows level to be compatible with
+ Windows 7 or newer.
</ins><span class="cx">
</span><del>- This patch adds if-domain and unless-domain to the trigger in the JSON format.
- if-domain makes the rule apply only to domains in the list.
- unless-domain makes the rule apply to domains that are not in the list.
</del><ins>+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCoreGenerated.vcxproj:
+ * WebCore.vcxproj/WebCoreTestSupport.vcxproj:
+ * WebCorePrefix.h:
+ * config.h:
+ * testing/js/WebCoreTestSupportPrefix.h:
</ins><span class="cx">
</span><del>- All rules without if-domain or unless-domain are compiled into a set of DFAs. This behavior is unchanged.
- All rules with if-domain or unless-domain are compiled into a separate set of DFAs.
- The domains are also compiled into another set of DFAs. This makes 3 arrays of DFA bytecode instead of 1.
-
- If there are no domain specific rules, there is no change in behavior.
- If there are domain specific rules, the URL will be checked for matches in both
- filtersWithoutDomainsBytecode and filtersWithDomainsBytecode. If there are matches from
- filtersWithDomainsBytecode then the domain of the main document will be checked with
- domainFiltersBytecode to see which of the matches applies to this domain.
-
- * contentextensions/CombinedURLFilters.cpp:
- (WebCore::ContentExtensions::CombinedURLFilters::isEmpty):
- (WebCore::ContentExtensions::CombinedURLFilters::addDomain):
- * contentextensions/CombinedURLFilters.h:
- Added addDomain, which adds characters from a domain to the prefix tree directly without using YARR.
- * contentextensions/CompiledContentExtension.cpp:
- (WebCore::ContentExtensions::CompiledContentExtension::globalDisplayNoneSelectors):
- * contentextensions/CompiledContentExtension.h:
- * contentextensions/ContentExtensionCompiler.cpp:
- (WebCore::ContentExtensions::serializeActions):
- (WebCore::ContentExtensions::compileRuleList):
- Separate the rules into rules with domains and rules without domains and compile to bytecode.
- * contentextensions/ContentExtensionCompiler.h:
- Updated compiler interface to reflect the slightly more complicated structure.
- * contentextensions/ContentExtensionError.cpp:
- (WebCore::ContentExtensions::contentExtensionErrorCategory):
- * contentextensions/ContentExtensionError.h:
- Added new parsing errors.
- * contentextensions/ContentExtensionParser.cpp:
- (WebCore::ContentExtensions::getDomainList):
- (WebCore::ContentExtensions::loadTrigger):
- (WebCore::ContentExtensions::loadEncodedRules):
- * contentextensions/ContentExtensionRule.h:
- (WebCore::ContentExtensions::Trigger::operator==):
- Parse the new domain structures from JSON into the Trigger structure.
- * contentextensions/ContentExtensionsBackend.cpp:
- (WebCore::ContentExtensions::ContentExtensionsBackend::actionsForResourceLoad):
- Interpret as much bytecode as necessary to determine which rules apply to this URL and domain.
- * contentextensions/DFABytecode.h:
- (WebCore::ContentExtensions::instructionSizeWithArguments):
- * contentextensions/DFABytecodeCompiler.cpp:
- (WebCore::ContentExtensions::DFABytecodeCompiler::emitAppendAction):
- (WebCore::ContentExtensions::DFABytecodeCompiler::emitTestFlagsAndAppendAction):
- (WebCore::ContentExtensions::DFABytecodeCompiler::compileNode):
- * contentextensions/DFABytecodeCompiler.h:
- * contentextensions/DFABytecodeInterpreter.cpp:
- (WebCore::ContentExtensions::DFABytecodeInterpreter::interpretAppendAction):
- (WebCore::ContentExtensions::DFABytecodeInterpreter::interpretTestFlagsAndAppendAction):
- (WebCore::ContentExtensions::DFABytecodeInterpreter::actionsFromDFARoot):
- (WebCore::ContentExtensions::DFABytecodeInterpreter::interpret):
- * contentextensions/DFABytecodeInterpreter.h:
- * loader/ResourceLoadInfo.h:
- Keep track of which actions have an if-domain trigger. If an action is in the
- filtersWithDomainsBytecode, then it either has an if-domain or an unless-domain in its trigger.
- This requires additional information in the bytecode, so there are two new bytecode types.
-
</del><span class="cx"> 2015-05-12 Dana Burkart
</span><span class="cx"> Dana Burkart <dburkart@apple.com
</span><span class="cx"> dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r184104. rdar://problem/20727702
</del><ins>+ Merge r184116. rdar://problem/20774613
</ins><span class="cx">
</span><del>- 2015-05-11 Antti Koivisto <antti@apple.com>
</del><ins>+ 2015-05-11 Alex Christensen <achristensen@webkit.org>
</ins><span class="cx">
</span><del>- WebContent crash under com.apple.WebCore: WebCore::WebKitCSSResourceValue::isCSSValueNone const + 6
- https://bugs.webkit.org/show_bug.cgi?id=144870
- rdar://problem/20727702
</del><ins>+ [Content Extensions] Support domain-specific rules and exceptions.
+ https://bugs.webkit.org/show_bug.cgi?id=144833
</ins><span class="cx">
</span><del>- Reviewed by Simon Fraser.
</del><ins>+ Reviewed by Darin Adler.
</ins><span class="cx">
</span><del>- No repro but we are seeing null pointer crashes like this:
</del><ins>+ Test: http/tests/contentextensions/domain-rules.html
+ (And lots of API tests)
</ins><span class="cx">
</span><del>- Thread 0 Crashed:: Dispatch queue: com.apple.main-thread
- 0 com.apple.WebCore 0x00007fff92da5706 WebCore::WebKitCSSResourceValue::isCSSValueNone() const + 6
- 1 com.apple.WebCore 0x00007fff93382b48 WebCore::MaskImageOperation::isCSSValueNone() const + 24
- 2 com.apple.WebCore 0x00007fff92e0475e WebCore::FillLayer::hasNonEmptyMaskImage() const + 30
</del><ins>+ This patch adds if-domain and unless-domain to the trigger in the JSON format.
+ if-domain makes the rule apply only to domains in the list.
+ unless-domain makes the rule apply to domains that are not in the list.
</ins><span class="cx">
</span><del>- * platform/graphics/MaskImageOperation.cpp:
- (WebCore::MaskImageOperation::MaskImageOperation):
- (WebCore::MaskImageOperation::isCSSValueNone):
</del><ins>+ All rules without if-domain or unless-domain are compiled into a set of DFAs. This behavior is unchanged.
+ All rules with if-domain or unless-domain are compiled into a separate set of DFAs.
+ The domains are also compiled into another set of DFAs. This makes 3 arrays of DFA bytecode instead of 1.
</ins><span class="cx">
</span><del>- This would crash like this if both m_styleImage and m_cssMaskImageValue are null.
- There are no obvious guarantees that this doesn't happen. Two of the constructor variants allow it
- and there is setImage which may turn m_styleImage null later too.
</del><ins>+ If there are no domain specific rules, there is no change in behavior.
+ If there are domain specific rules, the URL will be checked for matches in both
+ filtersWithoutDomainsBytecode and filtersWithDomainsBytecode. If there are matches from
+ filtersWithDomainsBytecode then the domain of the main document will be checked with
+ domainFiltersBytecode to see which of the matches applies to this domain.
</ins><span class="cx">
</span><del>- Fix by making null m_cssMaskImageValue always signify CSSValueNone.
</del><ins>+ * contentextensions/CombinedURLFilters.cpp:
+ (WebCore::ContentExtensions::CombinedURLFilters::isEmpty):
+ (WebCore::ContentExtensions::CombinedURLFilters::addDomain):
+ * contentextensions/CombinedURLFilters.h:
+ Added addDomain, which adds characters from a domain to the prefix tree directly without using YARR.
+ * contentextensions/CompiledContentExtension.cpp:
+ (WebCore::ContentExtensions::CompiledContentExtension::globalDisplayNoneSelectors):
+ * contentextensions/CompiledContentExtension.h:
+ * contentextensions/ContentExtensionCompiler.cpp:
+ (WebCore::ContentExtensions::serializeActions):
+ (WebCore::ContentExtensions::compileRuleList):
+ Separate the rules into rules with domains and rules without domains and compile to bytecode.
+ * contentextensions/ContentExtensionCompiler.h:
+ Updated compiler interface to reflect the slightly more complicated structure.
+ * contentextensions/ContentExtensionError.cpp:
+ (WebCore::ContentExtensions::contentExtensionErrorCategory):
+ * contentextensions/ContentExtensionError.h:
+ Added new parsing errors.
+ * contentextensions/ContentExtensionParser.cpp:
+ (WebCore::ContentExtensions::getDomainList):
+ (WebCore::ContentExtensions::loadTrigger):
+ (WebCore::ContentExtensions::loadEncodedRules):
+ * contentextensions/ContentExtensionRule.h:
+ (WebCore::ContentExtensions::Trigger::operator==):
+ Parse the new domain structures from JSON into the Trigger structure.
+ * contentextensions/ContentExtensionsBackend.cpp:
+ (WebCore::ContentExtensions::ContentExtensionsBackend::actionsForResourceLoad):
+ Interpret as much bytecode as necessary to determine which rules apply to this URL and domain.
+ * contentextensions/DFABytecode.h:
+ (WebCore::ContentExtensions::instructionSizeWithArguments):
+ * contentextensions/DFABytecodeCompiler.cpp:
+ (WebCore::ContentExtensions::DFABytecodeCompiler::emitAppendAction):
+ (WebCore::ContentExtensions::DFABytecodeCompiler::emitTestFlagsAndAppendAction):
+ (WebCore::ContentExtensions::DFABytecodeCompiler::compileNode):
+ * contentextensions/DFABytecodeCompiler.h:
+ * contentextensions/DFABytecodeInterpreter.cpp:
+ (WebCore::ContentExtensions::DFABytecodeInterpreter::interpretAppendAction):
+ (WebCore::ContentExtensions::DFABytecodeInterpreter::interpretTestFlagsAndAppendAction):
+ (WebCore::ContentExtensions::DFABytecodeInterpreter::actionsFromDFARoot):
+ (WebCore::ContentExtensions::DFABytecodeInterpreter::interpret):
+ * contentextensions/DFABytecodeInterpreter.h:
+ * loader/ResourceLoadInfo.h:
+ Keep track of which actions have an if-domain trigger. If an action is in the
+ filtersWithDomainsBytecode, then it either has an if-domain or an unless-domain in its trigger.
+ This requires additional information in the bytecode, so there are two new bytecode types.
</ins><span class="cx">
</span><del>- (WebCore::MaskImageOperation::cssValue):
-
</del><span class="cx"> 2015-05-12 Dana Burkart
</span><span class="cx"> Dana Burkart <dburkart@apple.com
</span><span class="cx"> dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r184005. rdar://problem/20486538
</del><ins>+ Merge r184104. rdar://problem/20727702
</ins><span class="cx">
</span><del>- 2015-05-08 Alexey Proskuryakov <ap@apple.com>
</del><ins>+ 2015-05-11 Antti Koivisto <antti@apple.com>
</ins><span class="cx">
</span><del>- Crashes in SocketStreamHandleBase::close
- https://bugs.webkit.org/show_bug.cgi?id=144767
- rdar://problem/20486538
</del><ins>+ WebContent crash under com.apple.WebCore: WebCore::WebKitCSSResourceValue::isCSSValueNone const + 6
+ https://bugs.webkit.org/show_bug.cgi?id=144870
+ rdar://problem/20727702
</ins><span class="cx">
</span><del>- Reviewed by Brady Eidson.
</del><ins>+ Reviewed by Simon Fraser.
</ins><span class="cx">
</span><del>- This is a speculative fix, I could not reproduce the crash.
</del><ins>+ No repro but we are seeing null pointer crashes like this:
</ins><span class="cx">
</span><del>- * Modules/websockets/WebSocketChannel.cpp: (WebCore::WebSocketChannel::processFrame):
- Normally, processOutgoingFrameQueue() closes the handle in the end when called in
- OutgoingFrameQueueClosing state. But there is no definitive protection against
- processing two CLOSE frames, in which case we'd try to close the handle twice.
</del><ins>+ Thread 0 Crashed:: Dispatch queue: com.apple.main-thread
+ 0 com.apple.WebCore 0x00007fff92da5706 WebCore::WebKitCSSResourceValue::isCSSValueNone() const + 6
+ 1 com.apple.WebCore 0x00007fff93382b48 WebCore::MaskImageOperation::isCSSValueNone() const + 24
+ 2 com.apple.WebCore 0x00007fff92e0475e WebCore::FillLayer::hasNonEmptyMaskImage() const + 30
</ins><span class="cx">
</span><del>- * platform/network/cf/SocketStreamHandleCFNet.cpp:
- (WebCore::SocketStreamHandle::readStreamCallback): Passing empty data to the client
- results in the socket being closed, which makes no sense here.
</del><ins>+ * platform/graphics/MaskImageOperation.cpp:
+ (WebCore::MaskImageOperation::MaskImageOperation):
+ (WebCore::MaskImageOperation::isCSSValueNone):
</ins><span class="cx">
</span><ins>+ This would crash like this if both m_styleImage and m_cssMaskImageValue are null.
+ There are no obvious guarantees that this doesn't happen. Two of the constructor variants allow it
+ and there is setImage which may turn m_styleImage null later too.
+
+ Fix by making null m_cssMaskImageValue always signify CSSValueNone.
+
+ (WebCore::MaskImageOperation::cssValue):
+
</ins><span class="cx"> 2015-05-12 Dana Burkart
</span><span class="cx"> Dana Burkart <dburkart@apple.com
</span><span class="cx"> dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r184001. rdar://problem/20862460
</del><ins>+ Merge r184005. rdar://problem/20486538
</ins><span class="cx">
</span><del>- 2015-05-08 Eric Carlson <eric.carlson@apple.com>
</del><ins>+ 2015-05-08 Alexey Proskuryakov <ap@apple.com>
</ins><span class="cx">
</span><del>- [Mac] Playback target clients do not unregister on page reload
- https://bugs.webkit.org/show_bug.cgi?id=144761
</del><ins>+ Crashes in SocketStreamHandleBase::close
+ https://bugs.webkit.org/show_bug.cgi?id=144767
+ rdar://problem/20486538
</ins><span class="cx">
</span><span class="cx"> Reviewed by Brady Eidson.
</span><span class="cx">
</span><del>- * dom/Document.cpp:
- (WebCore::Document::prepareForDestruction): Unregister all target picker clients.
</del><ins>+ This is a speculative fix, I could not reproduce the crash.
</ins><span class="cx">
</span><del>- * html/HTMLMediaElement.cpp:
- (WebCore::HTMLMediaElement::registerWithDocument): Register for page cache callback.
- (WebCore::HTMLMediaElement::unregisterWithDocument): Unregister for page cache callback.
- (WebCore::HTMLMediaElement::documentWillSuspendForPageCache): New.
- (WebCore::HTMLMediaElement::documentDidResumeFromPageCache): New.
</del><ins>+ * Modules/websockets/WebSocketChannel.cpp: (WebCore::WebSocketChannel::processFrame):
+ Normally, processOutgoingFrameQueue() closes the handle in the end when called in
+ OutgoingFrameQueueClosing state. But there is no definitive protection against
+ processing two CLOSE frames, in which case we'd try to close the handle twice.
</ins><span class="cx">
</span><ins>+ * platform/network/cf/SocketStreamHandleCFNet.cpp:
+ (WebCore::SocketStreamHandle::readStreamCallback): Passing empty data to the client
+ results in the socket being closed, which makes no sense here.
+
</ins><span class="cx"> 2015-05-12 Dana Burkart
</span><span class="cx"> Dana Burkart <dburkart@apple.com
</span><span class="cx"> dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r183971. rdar://problem/20065572
</del><ins>+ Merge r184001. rdar://problem/20862460
</ins><span class="cx">
</span><del>- 2015-05-07 Dean Jackson <dino@apple.com>
</del><ins>+ 2015-05-08 Eric Carlson <eric.carlson@apple.com>
</ins><span class="cx">
</span><del>- [iOS] MediaControls: disappear while scrubbing
- https://bugs.webkit.org/show_bug.cgi?id=144777
- <rdar://problem/20065572>
</del><ins>+ [Mac] Playback target clients do not unregister on page reload
+ https://bugs.webkit.org/show_bug.cgi?id=144761
</ins><span class="cx">
</span><del>- Reviewed by Eric Carlson.
</del><ins>+ Reviewed by Brady Eidson.
</ins><span class="cx">
</span><del>- If we are scrubbing we shouldn't hide the controls.
</del><ins>+ * dom/Document.cpp:
+ (WebCore::Document::prepareForDestruction): Unregister all target picker clients.
</ins><span class="cx">
</span><del>- * Modules/mediacontrols/mediaControlsApple.js:
- (Controller.prototype.hideControls): Return early if we are scrubbing.
- * Modules/mediacontrols/mediaControlsiOS.js:
- (ControllerIOS.prototype): Add initial value for _potentiallyScrubbing and
- rename from non-underscored value throughout the file.
- (ControllerIOS.prototype.handleTimelineTouchEnd): When we finish scrubbing, reset
- the timer to hide the controls.
</del><ins>+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::registerWithDocument): Register for page cache callback.
+ (WebCore::HTMLMediaElement::unregisterWithDocument): Unregister for page cache callback.
+ (WebCore::HTMLMediaElement::documentWillSuspendForPageCache): New.
+ (WebCore::HTMLMediaElement::documentDidResumeFromPageCache): New.
</ins><span class="cx">
</span><span class="cx"> 2015-05-12 Dana Burkart
</span><span class="cx"> Dana Burkart <dburkart@apple.com
</span><span class="cx"> dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r183970. rdar://problem/20769741
</del><ins>+ Merge r183971. rdar://problem/20065572
</ins><span class="cx">
</span><del>- 2015-05-07 Simon Fraser <simon.fraser@apple.com>
</del><ins>+ 2015-05-07 Dean Jackson <dino@apple.com>
</ins><span class="cx">
</span><del>- REGRESSION (r183300): Fixed elements flash when scrolling
- https://bugs.webkit.org/show_bug.cgi?id=144778
- rdar://problem/20769741
</del><ins>+ [iOS] MediaControls: disappear while scrubbing
+ https://bugs.webkit.org/show_bug.cgi?id=144777
+ <rdar://problem/20065572>
</ins><span class="cx">
</span><del>- Reviewed by Dean Jackson.
</del><ins>+ Reviewed by Eric Carlson.
</ins><span class="cx">
</span><del>- After r183300 we can detached layer backing store when outside the coverage region.
- However, position:fixed layers are moved around by the ScrollingCoordinator behind
- GraphicsLayer's back, so we can do layer flushes with stale information about layer
- geometry.
</del><ins>+ If we are scrubbing we shouldn't hide the controls.
</ins><span class="cx">
</span><del>- To avoid dropping backing store for layers in this situation, prevent backing
- store detachment on layers registered with the ScrollingCoordinator as viewport-constrained
- layers. Preventing detachment on a layer also prevents detachment on all descendant
- layers.
</del><ins>+ * Modules/mediacontrols/mediaControlsApple.js:
+ (Controller.prototype.hideControls): Return early if we are scrubbing.
+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype): Add initial value for _potentiallyScrubbing and
+ rename from non-underscored value throughout the file.
+ (ControllerIOS.prototype.handleTimelineTouchEnd): When we finish scrubbing, reset
+ the timer to hide the controls.
</ins><span class="cx">
</span><del>- * platform/graphics/GraphicsLayer.h:
- (WebCore::GraphicsLayer::setAllowsBackingStoreDetachment):
- (WebCore::GraphicsLayer::allowsBackingStoreDetachment):
- * platform/graphics/ca/GraphicsLayerCA.cpp:
- (WebCore::GraphicsLayerCA::GraphicsLayerCA):
- (WebCore::GraphicsLayerCA::setVisibleAndCoverageRects): Set m_intersectsCoverageRect to true
- if backing store detachment is prevented.
- (WebCore::GraphicsLayerCA::recursiveCommitChanges): Set a bit in the CommitState to
- communicate to descendants that detachment is prevented.
- * platform/graphics/ca/GraphicsLayerCA.h:
- (WebCore::GraphicsLayerCA::CommitState::CommitState): Deleted.
- * rendering/RenderLayerBacking.cpp:
- (WebCore::RenderLayerBacking::setIsScrollCoordinatedWithViewportConstrainedRole):
- * rendering/RenderLayerBacking.h:
- (WebCore::RenderLayerBacking::setScrollingNodeIDForRole): If registering with a non-zero
- nodeID for the ViewportConstrained role, turn off backing store detachment.
-
</del><span class="cx"> 2015-05-12 Dana Burkart
</span><span class="cx"> Dana Burkart <dburkart@apple.com
</span><span class="cx"> dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r183965. rdar://problem/20866590
</del><ins>+ Merge r183970. rdar://problem/20769741
</ins><span class="cx">
</span><del>- 2015-05-07 Dean Jackson <dino@apple.com>
</del><ins>+ 2015-05-07 Simon Fraser <simon.fraser@apple.com>
</ins><span class="cx">
</span><del>- [iOS] While scrubbing and holding down, video continues to play
- https://bugs.webkit.org/show_bug.cgi?id=144776
- <rdar://problem/20863757>
</del><ins>+ REGRESSION (r183300): Fixed elements flash when scrolling
+ https://bugs.webkit.org/show_bug.cgi?id=144778
+ rdar://problem/20769741
</ins><span class="cx">
</span><del>- Reviewed by Simon Fraser.
</del><ins>+ Reviewed by Dean Jackson.
</ins><span class="cx">
</span><del>- When we are scrubbing a video, we should pause playback. As we
- let go of the scrubber playback can resume (but only if it was
- playing originally).
</del><ins>+ After r183300 we can detached layer backing store when outside the coverage region.
+ However, position:fixed layers are moved around by the ScrollingCoordinator behind
+ GraphicsLayer's back, so we can do layer flushes with stale information about layer
+ geometry.
</ins><span class="cx">
</span><del>- * Modules/mediacontrols/mediaControlsiOS.js:
- (ControllerIOS.prototype.createControls): Listen for touchstart on the scrubber.
- (ControllerIOS.prototype.handleTimelineInput): Call the prototype, but pause if necessary.
- (ControllerIOS.prototype.handleTimelineChange): Just moved this to be with the other timeline functions.
- (ControllerIOS.prototype.handleTimelineTouchStart): Add the listeners for end and cancel. Remember that we are
- potentially about to scrub.
- (ControllerIOS.prototype.handleTimelineTouchEnd): Remove the listeners.
</del><ins>+ To avoid dropping backing store for layers in this situation, prevent backing
+ store detachment on layers registered with the ScrollingCoordinator as viewport-constrained
+ layers. Preventing detachment on a layer also prevents detachment on all descendant
+ layers.
</ins><span class="cx">
</span><ins>+ * platform/graphics/GraphicsLayer.h:
+ (WebCore::GraphicsLayer::setAllowsBackingStoreDetachment):
+ (WebCore::GraphicsLayer::allowsBackingStoreDetachment):
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::GraphicsLayerCA):
+ (WebCore::GraphicsLayerCA::setVisibleAndCoverageRects): Set m_intersectsCoverageRect to true
+ if backing store detachment is prevented.
+ (WebCore::GraphicsLayerCA::recursiveCommitChanges): Set a bit in the CommitState to
+ communicate to descendants that detachment is prevented.
+ * platform/graphics/ca/GraphicsLayerCA.h:
+ (WebCore::GraphicsLayerCA::CommitState::CommitState): Deleted.
+ * rendering/RenderLayerBacking.cpp:
+ (WebCore::RenderLayerBacking::setIsScrollCoordinatedWithViewportConstrainedRole):
+ * rendering/RenderLayerBacking.h:
+ (WebCore::RenderLayerBacking::setScrollingNodeIDForRole): If registering with a non-zero
+ nodeID for the ViewportConstrained role, turn off backing store detachment.
+
</ins><span class="cx"> 2015-05-12 Dana Burkart
</span><span class="cx"> Dana Burkart <dburkart@apple.com
</span><span class="cx"> dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r183954. rdar://problem/20281886
</del><ins>+ Merge r183965. rdar://problem/20866590
</ins><span class="cx">
</span><del>- 2015-05-07 Beth Dakin <bdakin@apple.com>
</del><ins>+ 2015-05-07 Dean Jackson <dino@apple.com>
</ins><span class="cx">
</span><del>- New force-related DOM events should fire in WK1 views
- https://bugs.webkit.org/show_bug.cgi?id=144663
- -and corresponding-
- rdar://problem/20281886
</del><ins>+ [iOS] While scrubbing and holding down, video continues to play
+ https://bugs.webkit.org/show_bug.cgi?id=144776
+ <rdar://problem/20863757>
</ins><span class="cx">
</span><del>- Reviewed by Sam Weinig.
</del><ins>+ Reviewed by Simon Fraser.
</ins><span class="cx">
</span><del>- All of the WK1 mouse events need to take the correspondingPressureEvent.
- * page/EventHandler.h:
</del><ins>+ When we are scrubbing a video, we should pause playback. As we
+ let go of the scrubber playback can resume (but only if it was
+ playing originally).
</ins><span class="cx">
</span><del>- Make correspondingPressureEvent a part of CurrentEventScope. This is needed to
- have accurate pressure information for all of the mouse events in subframes.
- * page/mac/EventHandlerMac.mm:
- (WebCore::correspondingPressureEventSlot):
- (WebCore::EventHandler::correspondingPressureEvent):
- (WebCore::CurrentEventScope::CurrentEventScope):
- (WebCore::CurrentEventScope::~CurrentEventScope):
</del><ins>+ * Modules/mediacontrols/mediaControlsiOS.js:
+ (ControllerIOS.prototype.createControls): Listen for touchstart on the scrubber.
+ (ControllerIOS.prototype.handleTimelineInput): Call the prototype, but pause if necessary.
+ (ControllerIOS.prototype.handleTimelineChange): Just moved this to be with the other timeline functions.
+ (ControllerIOS.prototype.handleTimelineTouchStart): Add the listeners for end and cancel. Remember that we are
+ potentially about to scrub.
+ (ControllerIOS.prototype.handleTimelineTouchEnd): Remove the listeners.
</ins><span class="cx">
</span><del>- These events don’t have an associated pressure, so send nil for the
- correspondingPressureEvent.
- (WebCore::EventHandler::wheelEvent):
- (WebCore::EventHandler::keyEvent):
</del><ins>+ 2015-05-12 Dana Burkart
+ Dana Burkart <dburkart@apple.com
+ dburkart@apple.com>
</ins><span class="cx">
</span><del>- Pipe through correspondingPressureEvent.
- (WebCore::EventHandler::mouseDown):
- (WebCore::EventHandler::mouseDragged):
- (WebCore::EventHandler::mouseUp):
- (WebCore::EventHandler::mouseMoved):
</del><ins>+ Merge r183954. rdar://problem/20281886
</ins><span class="cx">
</span><del>- New function to handle pressure change events.
- (WebCore::EventHandler::pressureChange):
</del><ins>+ 2015-05-07 Beth Dakin <bdakin@apple.com>
</ins><span class="cx">
</span><del>- Pipe through correspondingPressureEvent.
- (WebCore::EventHandler::passMouseMovedEventToScrollbars):
- (WebCore::EventHandler::currentPlatformMouseEvent):
</del><ins>+ New force-related DOM events should fire in WK1 views
+ https://bugs.webkit.org/show_bug.cgi?id=144663
+ -and corresponding-
+ rdar://problem/20281886
</ins><span class="cx">
</span><del>- Take the correspondingPressureEvent in order to build a PlatformMouseEvent with
- the correct pressure information.
- * platform/mac/PlatformEventFactoryMac.h:
- * platform/mac/PlatformEventFactoryMac.mm:
- (WebCore::globalPointForEvent):
- (WebCore::pointForEvent):
- (WebCore::mouseButtonForEvent):
- (WebCore::PlatformMouseEventBuilder::PlatformMouseEventBuilder):
- (WebCore::PlatformEventFactory::createPlatformMouseEvent):
</del><ins>+ Reviewed by Sam Weinig.
</ins><span class="cx">
</span><del>- 2015-05-12 Dana Burkart
- Dana Burkart <dburkart@apple.com
- dburkart@apple.com>
</del><ins>+ All of the WK1 mouse events need to take the correspondingPressureEvent.
+ * page/EventHandler.h:
</ins><span class="cx">
</span><del>- Merge r183953. rdar://problem/19997548
</del><ins>+ Make correspondingPressureEvent a part of CurrentEventScope. This is needed to
+ have accurate pressure information for all of the mouse events in subframes.
+ * page/mac/EventHandlerMac.mm:
+ (WebCore::correspondingPressureEventSlot):
+ (WebCore::EventHandler::correspondingPressureEvent):
+ (WebCore::CurrentEventScope::CurrentEventScope):
+ (WebCore::CurrentEventScope::~CurrentEventScope):
</ins><span class="cx">
</span><del>- 2015-05-06 Roger Fong <roger_fong@apple.com>
</del><ins>+ These events don’t have an associated pressure, so send nil for the
+ correspondingPressureEvent.
+ (WebCore::EventHandler::wheelEvent):
+ (WebCore::EventHandler::keyEvent):
</ins><span class="cx">
</span><del>- Media Controls: Scrubber should be independent of actual video time, causes scrubber to be jumpy.
- https://bugs.webkit.org/show_bug.cgi?id=144700.
- <rdar://problem/19997548>
</del><ins>+ Pipe through correspondingPressureEvent.
+ (WebCore::EventHandler::mouseDown):
+ (WebCore::EventHandler::mouseDragged):
+ (WebCore::EventHandler::mouseUp):
+ (WebCore::EventHandler::mouseMoved):
</ins><span class="cx">
</span><del>- Reviewed by Jer Noble.
</del><ins>+ New function to handle pressure change events.
+ (WebCore::EventHandler::pressureChange):
</ins><span class="cx">
</span><del>- Update time and timeline during the timeline input event instead of the wrapper's mousemove.
- (Controller.prototype.handleWrapperMouseMove):
- (Controller.prototype.handleTimelineMouseMove):
- (Controller.prototype.drawTimelineBackground):
</del><ins>+ Pipe through correspondingPressureEvent.
+ (WebCore::EventHandler::passMouseMovedEventToScrollbars):
+ (WebCore::EventHandler::currentPlatformMouseEvent):
</ins><span class="cx">
</span><del>- (Controller.prototype.updateControlsWhileScrubbing):
- Updates time and scrubber to reflect timeline user input.
</del><ins>+ Take the correspondingPressureEvent in order to build a PlatformMouseEvent with
+ the correct pressure information.
+ * platform/mac/PlatformEventFactoryMac.h:
+ * platform/mac/PlatformEventFactoryMac.mm:
+ (WebCore::globalPointForEvent):
+ (WebCore::pointForEvent):
+ (WebCore::mouseButtonForEvent):
+ (WebCore::PlatformMouseEventBuilder::PlatformMouseEventBuilder):
+ (WebCore::PlatformEventFactory::createPlatformMouseEvent):
</ins><span class="cx">
</span><span class="cx"> 2015-05-12 Dana Burkart
</span><span class="cx"> Dana Burkart <dburkart@apple.com
</span><span class="cx"> dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r183943. rdar://problem/19913748
</del><ins>+ Merge r183953. rdar://problem/19997548
</ins><span class="cx">
</span><del>- 2015-05-07 Simon Fraser <simon.fraser@apple.com>
</del><ins>+ 2015-05-06 Roger Fong <roger_fong@apple.com>
</ins><span class="cx">
</span><del>- Remove the WK1-only code path for independently composited iframes
- https://bugs.webkit.org/show_bug.cgi?id=144722
</del><ins>+ Media Controls: Scrubber should be independent of actual video time, causes scrubber to be jumpy.
+ https://bugs.webkit.org/show_bug.cgi?id=144700.
+ <rdar://problem/19997548>
</ins><span class="cx">
</span><del>- Reviewed by Dean Jackson.
</del><ins>+ Reviewed by Jer Noble.
</ins><span class="cx">
</span><del>- In WebKit1 on Mac, we allowed iframes to be composited independently of their
- parent document, relying on the fact that the frame's platform view can host
- a layer-backed view. However, this ran into bugs (rdar://problem/18862298),
- and triggers the assertion at the end of FrameView::updateLayoutAndStyleIfNeededRecursive(),
- because the compositing update after a layout can dirty style in notifyIFramesOfCompositingChange().
</del><ins>+ Update time and timeline during the timeline input event instead of the wrapper's mousemove.
+ (Controller.prototype.handleWrapperMouseMove):
+ (Controller.prototype.handleTimelineMouseMove):
+ (Controller.prototype.drawTimelineBackground):
</ins><span class="cx">
</span><del>- Removing the WK1-only code path solves these problems. It also eliminates the need
- to do compositing-specific frame overlap testing.
</del><ins>+ (Controller.prototype.updateControlsWhileScrubbing):
+ Updates time and scrubber to reflect timeline user input.
</ins><span class="cx">
</span><del>- * page/FrameView.cpp:
- (WebCore::FrameView::setIsOverlapped): No need to do compositing-related things here.
- Any iframe that gets composited will participate in the normal compositing overlap
- testing in its parent frame.
- (WebCore::FrameView::hasCompositedContentIncludingDescendants): Deleted.
- (WebCore::FrameView::hasCompositingAncestor): Deleted.
- * page/FrameView.h:
- * rendering/RenderLayerCompositor.cpp: Replace ownerElement() checks in this file
- with an isMainFrameCompositor() for readability. Some 0->nullptr.
- (WebCore::RenderLayerCompositor::cacheAcceleratedCompositingFlags):
- (WebCore::RenderLayerCompositor::chromeClient):
- (WebCore::RenderLayerCompositor::enclosingCompositorFlushingLayers):
- (WebCore::RenderLayerCompositor::updateCompositingLayers):
- (WebCore::RenderLayerCompositor::appendDocumentOverlayLayers):
- (WebCore::RenderLayerCompositor::updateBacking):
- (WebCore::RenderLayerCompositor::layerTreeAsText):
- (WebCore::RenderLayerCompositor::frameContentsCompositor):
- (WebCore::RenderLayerCompositor::setIsInWindow):
- (WebCore::RenderLayerCompositor::requiresCompositingForScrollableFrame):
- (WebCore::RenderLayerCompositor::requiresCompositingForFrame): frameRenderer.requiresAcceleratedCompositing()
- already bails on no content RenderView, so the shouldPropagateCompositingToEnclosingFrame() check does
- nothing and is removed.
- (WebCore::RenderLayerCompositor::isAsyncScrollableStickyLayer):
- (WebCore::RenderLayerCompositor::requiresScrollLayer):
- (WebCore::RenderLayerCompositor::documentUsesTiledBacking):
- (WebCore::RenderLayerCompositor::isMainFrameCompositor):
- (WebCore::RenderLayerCompositor::shouldCompositeOverflowControls):
- (WebCore::RenderLayerCompositor::requiresOverhangAreasLayer):
- (WebCore::RenderLayerCompositor::requiresContentShadowLayer):
- (WebCore::RenderLayerCompositor::updateLayerForTopOverhangArea):
- (WebCore::RenderLayerCompositor::updateLayerForBottomOverhangArea):
- (WebCore::RenderLayerCompositor::updateLayerForHeader):
- (WebCore::RenderLayerCompositor::updateLayerForFooter):
- (WebCore::RenderLayerCompositor::ensureRootLayer): Main frame attaches via ChromeClient,
- all other frames attach via parent frame.
- (WebCore::RenderLayerCompositor::notifyIFramesOfCompositingChange): This call to
- scheduleSetNeedsStyleRecalc(SyntheticStyleChange) was the source of dirtying style after
- layout, but is no longer needed so remove it.
- (WebCore::RenderLayerCompositor::registerAllViewportConstrainedLayers):
- (WebCore::RenderLayerCompositor::unregisterAllViewportConstrainedLayers):
- (WebCore::RenderLayerCompositor::scrollingCoordinator):
- (WebCore::RenderLayerCompositor::graphicsLayerFactory):
- (WebCore::RenderLayerCompositor::allowsIndependentlyCompositedFrames): Deleted.
- (WebCore::RenderLayerCompositor::shouldPropagateCompositingToEnclosingFrame): Deleted.
- (WebCore::RenderLayerCompositor::mainFrameBackingIsTiled): Deleted. This was mis-named;
- it really asks whether the document uses tiled backing, but does not check for main frame.
- * rendering/RenderLayerCompositor.h:
- * rendering/RenderWidget.cpp:
- (WebCore::RenderWidget::paintContents): No need to do frame overlap testing for
- compositing now.
-
</del><span class="cx"> 2015-05-12 Dana Burkart
</span><span class="cx"> Dana Burkart <dburkart@apple.com
</span><span class="cx"> dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r183927. rdar://problem/20854785
</del><ins>+ Merge r183943. rdar://problem/19913748
</ins><span class="cx">
</span><del>- 2015-05-07 Eric Carlson <eric.carlson@apple.com>
</del><ins>+ 2015-05-07 Simon Fraser <simon.fraser@apple.com>
</ins><span class="cx">
</span><del>- [Mac] Playback target isn't set on new element
- https://bugs.webkit.org/show_bug.cgi?id=144724
</del><ins>+ Remove the WK1-only code path for independently composited iframes
+ https://bugs.webkit.org/show_bug.cgi?id=144722
</ins><span class="cx">
</span><del>- Reviewed by Jer Noble.
</del><ins>+ Reviewed by Dean Jackson.
</ins><span class="cx">
</span><del>- * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
- * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
- (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer): Call setShouldPlayToPlaybackTarget
- if necessary.
- (WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget): Remember
- the setting in case we don't have an AVPlayer yet.
</del><ins>+ In WebKit1 on Mac, we allowed iframes to be composited independently of their
+ parent document, relying on the fact that the frame's platform view can host
+ a layer-backed view. However, this ran into bugs (rdar://problem/18862298),
+ and triggers the assertion at the end of FrameView::updateLayoutAndStyleIfNeededRecursive(),
+ because the compositing update after a layout can dirty style in notifyIFramesOfCompositingChange().
</ins><span class="cx">
</span><ins>+ Removing the WK1-only code path solves these problems. It also eliminates the need
+ to do compositing-specific frame overlap testing.
+
+ * page/FrameView.cpp:
+ (WebCore::FrameView::setIsOverlapped): No need to do compositing-related things here.
+ Any iframe that gets composited will participate in the normal compositing overlap
+ testing in its parent frame.
+ (WebCore::FrameView::hasCompositedContentIncludingDescendants): Deleted.
+ (WebCore::FrameView::hasCompositingAncestor): Deleted.
+ * page/FrameView.h:
+ * rendering/RenderLayerCompositor.cpp: Replace ownerElement() checks in this file
+ with an isMainFrameCompositor() for readability. Some 0->nullptr.
+ (WebCore::RenderLayerCompositor::cacheAcceleratedCompositingFlags):
+ (WebCore::RenderLayerCompositor::chromeClient):
+ (WebCore::RenderLayerCompositor::enclosingCompositorFlushingLayers):
+ (WebCore::RenderLayerCompositor::updateCompositingLayers):
+ (WebCore::RenderLayerCompositor::appendDocumentOverlayLayers):
+ (WebCore::RenderLayerCompositor::updateBacking):
+ (WebCore::RenderLayerCompositor::layerTreeAsText):
+ (WebCore::RenderLayerCompositor::frameContentsCompositor):
+ (WebCore::RenderLayerCompositor::setIsInWindow):
+ (WebCore::RenderLayerCompositor::requiresCompositingForScrollableFrame):
+ (WebCore::RenderLayerCompositor::requiresCompositingForFrame): frameRenderer.requiresAcceleratedCompositing()
+ already bails on no content RenderView, so the shouldPropagateCompositingToEnclosingFrame() check does
+ nothing and is removed.
+ (WebCore::RenderLayerCompositor::isAsyncScrollableStickyLayer):
+ (WebCore::RenderLayerCompositor::requiresScrollLayer):
+ (WebCore::RenderLayerCompositor::documentUsesTiledBacking):
+ (WebCore::RenderLayerCompositor::isMainFrameCompositor):
+ (WebCore::RenderLayerCompositor::shouldCompositeOverflowControls):
+ (WebCore::RenderLayerCompositor::requiresOverhangAreasLayer):
+ (WebCore::RenderLayerCompositor::requiresContentShadowLayer):
+ (WebCore::RenderLayerCompositor::updateLayerForTopOverhangArea):
+ (WebCore::RenderLayerCompositor::updateLayerForBottomOverhangArea):
+ (WebCore::RenderLayerCompositor::updateLayerForHeader):
+ (WebCore::RenderLayerCompositor::updateLayerForFooter):
+ (WebCore::RenderLayerCompositor::ensureRootLayer): Main frame attaches via ChromeClient,
+ all other frames attach via parent frame.
+ (WebCore::RenderLayerCompositor::notifyIFramesOfCompositingChange): This call to
+ scheduleSetNeedsStyleRecalc(SyntheticStyleChange) was the source of dirtying style after
+ layout, but is no longer needed so remove it.
+ (WebCore::RenderLayerCompositor::registerAllViewportConstrainedLayers):
+ (WebCore::RenderLayerCompositor::unregisterAllViewportConstrainedLayers):
+ (WebCore::RenderLayerCompositor::scrollingCoordinator):
+ (WebCore::RenderLayerCompositor::graphicsLayerFactory):
+ (WebCore::RenderLayerCompositor::allowsIndependentlyCompositedFrames): Deleted.
+ (WebCore::RenderLayerCompositor::shouldPropagateCompositingToEnclosingFrame): Deleted.
+ (WebCore::RenderLayerCompositor::mainFrameBackingIsTiled): Deleted. This was mis-named;
+ it really asks whether the document uses tiled backing, but does not check for main frame.
+ * rendering/RenderLayerCompositor.h:
+ * rendering/RenderWidget.cpp:
+ (WebCore::RenderWidget::paintContents): No need to do frame overlap testing for
+ compositing now.
+
</ins><span class="cx"> 2015-05-12 Dana Burkart
</span><span class="cx"> Dana Burkart <dburkart@apple.com
</span><span class="cx"> dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r183909. rdar://problem/18894598
</del><ins>+ Merge r183927. rdar://problem/20854785
</ins><span class="cx">
</span><del>- 2015-05-06 Daniel Bates <dabates@apple.com>
</del><ins>+ 2015-05-07 Eric Carlson <eric.carlson@apple.com>
</ins><span class="cx">
</span><del>- [iOS][WK2] Pause/resume database thread when UIProcess enters/leaves the background
- https://bugs.webkit.org/show_bug.cgi?id=144657
- <rdar://problem/18894598>
</del><ins>+ [Mac] Playback target isn't set on new element
+ https://bugs.webkit.org/show_bug.cgi?id=144724
</ins><span class="cx">
</span><del>- Reviewed by Andy Estes.
</del><ins>+ Reviewed by Jer Noble.
</ins><span class="cx">
</span><del>- Export WebCore functionality to pause and resume the database thread so that we can
- make use of this functionality from WebKit2.
</del><ins>+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.h:
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::createAVPlayer): Call setShouldPlayToPlaybackTarget
+ if necessary.
+ (WebCore::MediaPlayerPrivateAVFoundationObjC::setShouldPlayToPlaybackTarget): Remember
+ the setting in case we don't have an AVPlayer yet.
</ins><span class="cx">
</span><del>- * Modules/webdatabase/AbstractDatabaseServer.h:
- * Modules/webdatabase/DatabaseManager.cpp:
- (WebCore::DatabaseManager::setPauseAllDatabases): Added; turns around and calls DatabaseServer::setPauseAllDatabases().
- * Modules/webdatabase/DatabaseManager.h:
- * Modules/webdatabase/DatabaseServer.cpp:
- (WebCore::DatabaseServer::setPauseAllDatabases): Added; turns around and calls
- DatabaseTracker::tracker().setDatabasesPaused() to pause or resume the database thread.
- For now, we guard this call with PLATFORM(IOS). We'll look to remove this guard once
- we fix <https://bugs.webkit.org/show_bug.cgi?id=144660>.
- * Modules/webdatabase/DatabaseServer.h:
-
</del><span class="cx"> 2015-05-12 Dana Burkart
</span><del>- Dana Burkart <dburkart@apple.com>
</del><ins>+ Dana Burkart <dburkart@apple.com
+ dburkart@apple.com>
</ins><span class="cx">
</span><del>- Merge r183942. rdar://problem/20049088
</del><ins>+ Merge r183909. rdar://problem/18894598
</ins><span class="cx">
</span><del>- 2015-05-06 Dean Jackson <dino@apple.com>
</del><ins>+ 2015-05-06 Daniel Bates <dabates@apple.com>
</ins><span class="cx">
</span><del>- Handle backdrop views that have to tile
- https://bugs.webkit.org/show_bug.cgi?id=142317
- <rdar://problem/20049088>
</del><ins>+ [iOS][WK2] Pause/resume database thread when UIProcess enters/leaves the background
+ https://bugs.webkit.org/show_bug.cgi?id=144657
+ <rdar://problem/18894598>
</ins><span class="cx">
</span><del>- Reviewed by Simon Fraser.
</del><ins>+ Reviewed by Andy Estes.
</ins><span class="cx">
</span><del>- Take 2 - this was rolled out because Mavericks was crashing.
</del><ins>+ Export WebCore functionality to pause and resume the database thread so that we can
+ make use of this functionality from WebKit2.
</ins><span class="cx">
</span><del>- Make sure backdrop layers don't tile. If they are big
- enough, we'll leave it to the platform compositor to handle.
</del><ins>+ * Modules/webdatabase/AbstractDatabaseServer.h:
+ * Modules/webdatabase/DatabaseManager.cpp:
+ (WebCore::DatabaseManager::setPauseAllDatabases): Added; turns around and calls DatabaseServer::setPauseAllDatabases().
+ * Modules/webdatabase/DatabaseManager.h:
+ * Modules/webdatabase/DatabaseServer.cpp:
+ (WebCore::DatabaseServer::setPauseAllDatabases): Added; turns around and calls
+ DatabaseTracker::tracker().setDatabasesPaused() to pause or resume the database thread.
+ For now, we guard this call with PLATFORM(IOS). We'll look to remove this guard once
+ we fix <https://bugs.webkit.org/show_bug.cgi?id=144660>.
+ * Modules/webdatabase/DatabaseServer.h:
</ins><span class="cx">
</span><del>- This also fixes a bug where if a layer changed from a backdrop
- type to a tiled type, it would still retain its custom appearance
- and we'd try to add children to the wrong layer.
-
- Test: compositing/media-controls-bar-appearance-big.html
-
- * platform/graphics/ca/GraphicsLayerCA.cpp:
- (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): Check if
- a layer needs a backdrop before checking if it needs to tile.
-
</del><span class="cx"> 2015-05-12 Dana Burkart
</span><span class="cx"> Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r183894. rdar://problem/20049088
</del><ins>+ Merge r183942. rdar://problem/20049088
</ins><span class="cx">
</span><span class="cx"> 2015-05-06 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="lines">@@ -483,6 +479,8 @@
</span><span class="cx">
</span><span class="cx"> Reviewed by Simon Fraser.
</span><span class="cx">
</span><ins>+ Take 2 - this was rolled out because Mavericks was crashing.
+
</ins><span class="cx"> Make sure backdrop layers don't tile. If they are big
</span><span class="cx"> enough, we'll leave it to the platform compositor to handle.
</span><span class="cx">
</span><span class="lines">@@ -496,6 +494,32 @@
</span><span class="cx"> (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): Check if
</span><span class="cx"> a layer needs a backdrop before checking if it needs to tile.
</span><span class="cx">
</span><ins>+ 2015-05-12 Dana Burkart
+ Dana Burkart <dburkart@apple.com>
+
+ Merge r183894. rdar://problem/20049088
+
+ 2015-05-06 Dean Jackson <dino@apple.com>
+
+ Handle backdrop views that have to tile
+ https://bugs.webkit.org/show_bug.cgi?id=142317
+ <rdar://problem/20049088>
+
+ Reviewed by Simon Fraser.
+
+ Make sure backdrop layers don't tile. If they are big
+ enough, we'll leave it to the platform compositor to handle.
+
+ This also fixes a bug where if a layer changed from a backdrop
+ type to a tiled type, it would still retain its custom appearance
+ and we'd try to add children to the wrong layer.
+
+ Test: compositing/media-controls-bar-appearance-big.html
+
+ * platform/graphics/ca/GraphicsLayerCA.cpp:
+ (WebCore::GraphicsLayerCA::commitLayerChangesBeforeSublayers): Check if
+ a layer needs a backdrop before checking if it needs to tile.
+
</ins><span class="cx"> 2015-05-06 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Scroll-snap points do not handle margins and padding propertly
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-<?xml version="1.0" encoding="utf-8"?>
</del><ins>+<?xml version="1.0" encoding="utf-8"?>
</ins><span class="cx"> <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</span><span class="cx"> <ItemGroup Label="ProjectConfigurations">
</span><span class="cx"> <ProjectConfiguration Include="DebugSuffix|Win32">
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -21786,4 +21786,4 @@
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCoreWebCorevcxprojWebCoreGeneratedvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/WebCore/WebCore.vcxproj/WebCoreGenerated.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> <OutDir>$(SolutionDir)$(Configuration)\</OutDir>
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="lines">@@ -103,7 +103,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -123,7 +123,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -201,4 +201,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="branchessafari601132branchSourceWebCoreWebCorevcxprojWebCoreTestSupportvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/WebCore/WebCore.vcxproj/WebCoreTestSupport.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -304,4 +304,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCoreWebCorePrefixh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/WebCorePrefix.h (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/WebCorePrefix.h 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/WebCore/WebCorePrefix.h 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -40,11 +40,11 @@
</span><span class="cx"> #if OS(WINDOWS)
</span><span class="cx">
</span><span class="cx"> #ifndef _WIN32_WINNT
</span><del>-#define _WIN32_WINNT 0x0502
</del><ins>+#define _WIN32_WINNT 0x601
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifndef WINVER
</span><del>-#define WINVER 0x0502
</del><ins>+#define WINVER 0x0601
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !USE(CURL)
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCoreconfigh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/config.h (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/config.h 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/WebCore/config.h 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -45,11 +45,11 @@
</span><span class="cx"> #if OS(WINDOWS)
</span><span class="cx">
</span><span class="cx"> #ifndef _WIN32_WINNT
</span><del>-#define _WIN32_WINNT 0x0502
</del><ins>+#define _WIN32_WINNT 0x601
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifndef WINVER
</span><del>-#define WINVER 0x0502
</del><ins>+#define WINVER 0x0601
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // CURL needs winsock, so don't prevent inclusion of it
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebCoretestingjsWebCoreTestSupportPrefixh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebCore/testing/js/WebCoreTestSupportPrefix.h (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebCore/testing/js/WebCoreTestSupportPrefix.h 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/WebCore/testing/js/WebCoreTestSupportPrefix.h 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -40,11 +40,11 @@
</span><span class="cx"> #if OS(WINDOWS)
</span><span class="cx">
</span><span class="cx"> #ifndef _WIN32_WINNT
</span><del>-#define _WIN32_WINNT 0x0502
</del><ins>+#define _WIN32_WINNT 0x601
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifndef WINVER
</span><del>-#define WINVER 0x0502
</del><ins>+#define WINVER 0x0601
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if !USE(CURL)
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebInspectorUI/ChangeLog (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebInspectorUI/ChangeLog 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/WebInspectorUI/ChangeLog 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -2,89 +2,108 @@
</span><span class="cx"> Dana Burkart <dburkart@apple.com
</span><span class="cx"> dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r184130. rdar://problem/20829494
</del><ins>+ Merge r184137. rdar://problem/20707307
</ins><span class="cx">
</span><del>- 2015-05-11 Timothy Hatcher <timothy@apple.com>
</del><ins>+ 2015-05-11 Brent Fulgham <bfulgham@apple.com>
</ins><span class="cx">
</span><del>- Web Inspector: REGRESSION (Tabs): Issues reloading a resource with breakpoints
- https://bugs.webkit.org/show_bug.cgi?id=144650
</del><ins>+ [Win] Move Windows build target to Windows 7 (or newer)
+ https://bugs.webkit.org/show_bug.cgi?id=144890
+ <rdar://problem/20707307>
</ins><span class="cx">
</span><del>- Fix a number of issues with Debugger tab and navigation/reloading:
- - Close old content views in the Debugger tab when main frame navigates.
- - Prune old resource tree elements before attempting to restore a cookie that might match an old resource.
- - Allow breakpoint selections to be restored from a saved cookie.
- - Fix an assert when closing a content view that isn't the current index, but is the current view.
- - Avoid calling closed() multiple times when a ContentView is in the back/forward list more than once.
- - Make restoreStateFromCookie properly set and use the causedByNavigation argument for a longer restore delay.
- - Create a new cookie object per tab instead of it being cumulative from the previous cookie.
</del><ins>+ Reviewed by Anders Carlsson.
</ins><span class="cx">
</span><del>- Reviewed by Brian Burg.
</del><ins>+ Update linked SDK and minimal Windows level to be compatible with
+ Windows 7 or newer.
</ins><span class="cx">
</span><del>- * UserInterface/Base/Main.js:
- (WebInspector._mainResourceDidChange): Delay calling _restoreCookieForOpenTabs to give time for sidebars
- and tabs to respond to the main resource change.
- (WebInspector._restoreCookieForOpenTabs): Rename causedByReload to causedByNavigation. Nothing special about
- reload since we restore on all navigation.
</del><ins>+ * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj:
</ins><span class="cx">
</span><del>- * UserInterface/Views/ContentView.js:
- (WebInspector.ContentView): Support Breakpoint as a represented object, which happens during a cookie restore.
- (WebInspector.ContentView.isViewable): Ditto.
</del><ins>+ 2015-05-12 Dana Burkart
+ Dana Burkart <dburkart@apple.com
+ dburkart@apple.com>
</ins><span class="cx">
</span><del>- * UserInterface/Views/ContentViewContainer.js:
- (WebInspector.ContentViewContainer.prototype.closeAllContentViews): Disassociate if the view is current and not just
- the current entry index. This matches other close functions. This fixes an assert in _disassociateFromContentView.
- (WebInspector.ContentViewContainer.prototype._disassociateFromContentView): Don't disassociate multiple times. This
- avoids calling the closed() function on a view more than once.
</del><ins>+ Merge r184130. rdar://problem/20829494
</ins><span class="cx">
</span><del>- * UserInterface/Views/DebuggerSidebarPanel.js:
- (WebInspector.DebuggerSidebarPanel.prototype.saveStateToCookie):
- (WebInspector.DebuggerSidebarPanel.prototype._mainResourceDidChange): Renamed from _mainResourceChanged.
- Close all content views if this is the main frame. Also prune all old resources. Doing this now avoids a flash
- of having old and new resources in the tree caused by the default delay in NavigationSidebarPanel's _checkForOldResources.
</del><ins>+ 2015-05-11 Timothy Hatcher <timothy@apple.com>
</ins><span class="cx">
</span><del>- * UserInterface/Views/NavigationSidebarPanel.js:
- (WebInspector.NavigationSidebarPanel): Set _autoPruneOldTopLevelResourceTreeElements for later.
- (WebInspector.NavigationSidebarPanel.prototype.get contentTreeOutlineToAutoPrune): Deleted.
- (WebInspector.NavigationSidebarPanel.prototype.showDefaultContentView): Fix typo.
- (WebInspector.NavigationSidebarPanel.prototype.showDefaultContentViewForTreeElement): Fix whitespace.
- (WebInspector.NavigationSidebarPanel.prototype.pruneOldResourceTreeElements): Added. Broken out from
- _checkForOldResources.delayedWork so it can be called manually. Also check all visible tree outlines.
- (WebInspector.NavigationSidebarPanel.prototype._treeElementAddedOrChanged): Pass treeElement in an array.
- (WebInspector.NavigationSidebarPanel.prototype._checkForOldResourcesIfNeeded): Added.
- (WebInspector.NavigationSidebarPanel.prototype._checkForOldResources): Call pruneOldResourceTreeElements on a delay.
- (WebInspector.NavigationSidebarPanel.prototype._checkForOldResources.delayedWork): Deleted.
- (WebInspector.NavigationSidebarPanel.prototype._checkOutlinesForPendingViewStateCookie): Call _checkForOldResourcesIfNeeded.
- (WebInspector.NavigationSidebarPanel.prototype._checkElementsForPendingViewStateCookie): Remove array folding code.
</del><ins>+ Web Inspector: REGRESSION (Tabs): Issues reloading a resource with breakpoints
+ https://bugs.webkit.org/show_bug.cgi?id=144650
</ins><span class="cx">
</span><del>- * UserInterface/Views/TabContentView.js:
- (WebInspector.TabContentView.prototype.restoreStateFromCookie): Rename causedByReload to causedByNavigation.
- (WebInspector.TabContentView.prototype.saveStateToCookie): Don't allow the cookie to build on the old cookie.
</del><ins>+ Fix a number of issues with Debugger tab and navigation/reloading:
+ - Close old content views in the Debugger tab when main frame navigates.
+ - Prune old resource tree elements before attempting to restore a cookie that might match an old resource.
+ - Allow breakpoint selections to be restored from a saved cookie.
+ - Fix an assert when closing a content view that isn't the current index, but is the current view.
+ - Avoid calling closed() multiple times when a ContentView is in the back/forward list more than once.
+ - Make restoreStateFromCookie properly set and use the causedByNavigation argument for a longer restore delay.
+ - Create a new cookie object per tab instead of it being cumulative from the previous cookie.
</ins><span class="cx">
</span><del>- 2015-05-12 Dana Burkart
- Dana Burkart <dburkart@apple.com
- dburkart@apple.com>
</del><ins>+ Reviewed by Brian Burg.
</ins><span class="cx">
</span><del>- Merge r184108. rdar://problem/20903134
</del><ins>+ * UserInterface/Base/Main.js:
+ (WebInspector._mainResourceDidChange): Delay calling _restoreCookieForOpenTabs to give time for sidebars
+ and tabs to respond to the main resource change.
+ (WebInspector._restoreCookieForOpenTabs): Rename causedByReload to causedByNavigation. Nothing special about
+ reload since we restore on all navigation.
</ins><span class="cx">
</span><del>- 2015-05-11 Timothy Hatcher <timothy@apple.com>
</del><ins>+ * UserInterface/Views/ContentView.js:
+ (WebInspector.ContentView): Support Breakpoint as a represented object, which happens during a cookie restore.
+ (WebInspector.ContentView.isViewable): Ditto.
</ins><span class="cx">
</span><del>- Web Inspector: NavigationSidebarPanel leaks some event listeners
- https://bugs.webkit.org/show_bug.cgi?id=144523
</del><ins>+ * UserInterface/Views/ContentViewContainer.js:
+ (WebInspector.ContentViewContainer.prototype.closeAllContentViews): Disassociate if the view is current and not just
+ the current entry index. This matches other close functions. This fixes an assert in _disassociateFromContentView.
+ (WebInspector.ContentViewContainer.prototype._disassociateFromContentView): Don't disassociate multiple times. This
+ avoids calling the closed() function on a view more than once.
</ins><span class="cx">
</span><del>- Reviewed by Joseph Pecoraro.
</del><ins>+ * UserInterface/Views/DebuggerSidebarPanel.js:
+ (WebInspector.DebuggerSidebarPanel.prototype.saveStateToCookie):
+ (WebInspector.DebuggerSidebarPanel.prototype._mainResourceDidChange): Renamed from _mainResourceChanged.
+ Close all content views if this is the main frame. Also prune all old resources. Doing this now avoids a flash
+ of having old and new resources in the tree caused by the default delay in NavigationSidebarPanel's _checkForOldResources.
</ins><span class="cx">
</span><span class="cx"> * UserInterface/Views/NavigationSidebarPanel.js:
</span><del>- (WebInspector.NavigationSidebarPanel):
- (WebInspector.NavigationSidebarPanel.prototype.closed):
- * UserInterface/Views/ResourceSidebarPanel.js:
- (WebInspector.ResourceSidebarPanel.prototype.closed):
- * UserInterface/Views/SearchSidebarPanel.js:
- (WebInspector.SearchSidebarPanel.prototype.closed):
- * UserInterface/Views/StorageSidebarPanel.js:
- (WebInspector.StorageSidebarPanel.prototype.closed):
- * UserInterface/Views/TimelineSidebarPanel.js:
- (WebInspector.TimelineSidebarPanel.prototype.closed):
</del><ins>+ (WebInspector.NavigationSidebarPanel): Set _autoPruneOldTopLevelResourceTreeElements for later.
+ (WebInspector.NavigationSidebarPanel.prototype.get contentTreeOutlineToAutoPrune): Deleted.
+ (WebInspector.NavigationSidebarPanel.prototype.showDefaultContentView): Fix typo.
+ (WebInspector.NavigationSidebarPanel.prototype.showDefaultContentViewForTreeElement): Fix whitespace.
+ (WebInspector.NavigationSidebarPanel.prototype.pruneOldResourceTreeElements): Added. Broken out from
+ _checkForOldResources.delayedWork so it can be called manually. Also check all visible tree outlines.
+ (WebInspector.NavigationSidebarPanel.prototype._treeElementAddedOrChanged): Pass treeElement in an array.
+ (WebInspector.NavigationSidebarPanel.prototype._checkForOldResourcesIfNeeded): Added.
+ (WebInspector.NavigationSidebarPanel.prototype._checkForOldResources): Call pruneOldResourceTreeElements on a delay.
+ (WebInspector.NavigationSidebarPanel.prototype._checkForOldResources.delayedWork): Deleted.
+ (WebInspector.NavigationSidebarPanel.prototype._checkOutlinesForPendingViewStateCookie): Call _checkForOldResourcesIfNeeded.
+ (WebInspector.NavigationSidebarPanel.prototype._checkElementsForPendingViewStateCookie): Remove array folding code.
</ins><span class="cx">
</span><ins>+ * UserInterface/Views/TabContentView.js:
+ (WebInspector.TabContentView.prototype.restoreStateFromCookie): Rename causedByReload to causedByNavigation.
+ (WebInspector.TabContentView.prototype.saveStateToCookie): Don't allow the cookie to build on the old cookie.
+
+ 2015-05-12 Dana Burkart
+ Dana Burkart <dburkart@apple.com
+ dburkart@apple.com>
+
+ Merge r184108. rdar://problem/20903134
+
+ 2015-05-11 Timothy Hatcher <timothy@apple.com>
+
+ Web Inspector: NavigationSidebarPanel leaks some event listeners
+ https://bugs.webkit.org/show_bug.cgi?id=144523
+
+ Reviewed by Joseph Pecoraro.
+
+ * UserInterface/Views/NavigationSidebarPanel.js:
+ (WebInspector.NavigationSidebarPanel):
+ (WebInspector.NavigationSidebarPanel.prototype.closed):
+ * UserInterface/Views/ResourceSidebarPanel.js:
+ (WebInspector.ResourceSidebarPanel.prototype.closed):
+ * UserInterface/Views/SearchSidebarPanel.js:
+ (WebInspector.SearchSidebarPanel.prototype.closed):
+ * UserInterface/Views/StorageSidebarPanel.js:
+ (WebInspector.StorageSidebarPanel.prototype.closed):
+ * UserInterface/Views/TimelineSidebarPanel.js:
+ (WebInspector.TimelineSidebarPanel.prototype.closed):
+
</ins><span class="cx"> 2015-05-06 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: The text in the left pane overlaps the "Filter Time Events" field in the Timeline after the Web Inspector is resized
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebInspectorUIWebInspectorUIvcxprojWebInspectorUIvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -59,27 +59,27 @@
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <WholeProgramOptimization>true</WholeProgramOptimization>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <WholeProgramOptimization>true</WholeProgramOptimization>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Makefile</ConfigurationType>
</span><span class="lines">@@ -839,4 +839,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="branchessafari601132branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit/ChangeLog (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit/ChangeLog 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/WebKit/ChangeLog 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -2,65 +2,86 @@
</span><span class="cx"> Dana Burkart <dburkart@apple.com
</span><span class="cx"> dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r183954. rdar://problem/20281886
</del><ins>+ Merge r184137. rdar://problem/20707307
</ins><span class="cx">
</span><del>- 2015-05-07 Beth Dakin <bdakin@apple.com>
</del><ins>+ 2015-05-11 Brent Fulgham <bfulgham@apple.com>
</ins><span class="cx">
</span><del>- New force-related DOM events should fire in WK1 views
- https://bugs.webkit.org/show_bug.cgi?id=144663
- -and corresponding-
- rdar://problem/20281886
</del><ins>+ [Win] Move Windows build target to Windows 7 (or newer)
+ https://bugs.webkit.org/show_bug.cgi?id=144890
+ <rdar://problem/20707307>
</ins><span class="cx">
</span><del>- Reviewed by Sam Weinig.
</del><ins>+ Reviewed by Anders Carlsson.
</ins><span class="cx">
</span><del>- Pass the lastPressureEvent to WebCore.
- * WebView/WebHTMLView.mm:
- (-[WebHTMLView _updateMouseoverWithEvent:]):
- (-[WebHTMLView rightMouseUp:]):
- (-[WebHTMLView menuForEvent:]):
- (-[WebHTMLView acceptsFirstMouse:]):
- (-[WebHTMLView shouldDelayWindowOrderingForEvent:]):
- (-[WebHTMLView mouseDown:mouseDown:]):
- (-[WebHTMLView mouseDragged:]):
- (-[WebHTMLView mouseUp:mouseUp:]):
</del><ins>+ Update linked SDK and minimal Windows level to be compatible with
+ Windows 7 or newer.
</ins><span class="cx">
</span><del>- New NSRespnder method for pressure changes.
- (-[WebHTMLView pressureChangeWithEvent:]):
</del><ins>+ * WebKit.vcxproj/Interfaces/Interfaces.vcxproj:
+ * WebKit.vcxproj/WebKit/WebKit.vcxproj:
+ * WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj:
</ins><span class="cx">
</span><del>- New BOOL _contentPreventsDefault tracks whether the HitTestResult prevented the
- default action. Get rid of willHandleMouseDown; now that the gesture recognizer
- sets delaysPrimaryMouseButtonEvents to NO, we don’t need this.
- * WebView/WebImmediateActionController.h:
- * WebView/WebImmediateActionController.mm:
- (-[WebImmediateActionController _clearImmediateActionState]):
</del><ins>+ 2015-05-12 Dana Burkart
+ Dana Burkart <dburkart@apple.com
+ dburkart@apple.com>
</ins><span class="cx">
</span><del>- Set all of the immediateActionStages on EventHandler. This is critical to keep
- link navigation happening at the right time now that
- delaysPrimaryMouseButtonEvents is set to NO.
- (-[WebImmediateActionController performHitTestAtPoint:]):
- (-[WebImmediateActionController immediateActionRecognizerDidUpdateAnimation:]):
- (-[WebImmediateActionController immediateActionRecognizerDidCancelAnimation:]):
- (-[WebImmediateActionController immediateActionRecognizerDidCompleteAnimation:]):
</del><ins>+ Merge r183954. rdar://problem/20281886
</ins><span class="cx">
</span><del>- Use a dummy animation controller if the content prevents default.
- (-[WebImmediateActionController _defaultAnimationController]):
- (-[WebImmediateActionController _updateImmediateActionItem]):
- (-[WebImmediateActionController webView:willHandleMouseDown:]): Deleted.
</del><ins>+ 2015-05-07 Beth Dakin <bdakin@apple.com>
</ins><span class="cx">
</span><del>- Set delaysPrimaryMouseButtonEvents to NO so that we get existing mouse events when
- we expect to.
- * WebView/WebView.mm:
- (-[WebView _commonInitializationWithFrameName:groupName:]):
</del><ins>+ New force-related DOM events should fire in WK1 views
+ https://bugs.webkit.org/show_bug.cgi?id=144663
+ -and corresponding-
+ rdar://problem/20281886
</ins><span class="cx">
</span><del>- Cache the most recent pressure event so that we can send it to WebCore for all of
- the mouse events.
- (-[WebView _pressureEvent]):
- (-[WebView _setPressureEvent:]):
- * WebView/WebViewData.h:
- * WebView/WebViewData.mm:
- (-[WebViewPrivate dealloc]):
- * WebView/WebViewInternal.h:
</del><ins>+ Reviewed by Sam Weinig.
</ins><span class="cx">
</span><ins>+ Pass the lastPressureEvent to WebCore.
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView _updateMouseoverWithEvent:]):
+ (-[WebHTMLView rightMouseUp:]):
+ (-[WebHTMLView menuForEvent:]):
+ (-[WebHTMLView acceptsFirstMouse:]):
+ (-[WebHTMLView shouldDelayWindowOrderingForEvent:]):
+ (-[WebHTMLView mouseDown:mouseDown:]):
+ (-[WebHTMLView mouseDragged:]):
+ (-[WebHTMLView mouseUp:mouseUp:]):
+
+ New NSRespnder method for pressure changes.
+ (-[WebHTMLView pressureChangeWithEvent:]):
+
+ New BOOL _contentPreventsDefault tracks whether the HitTestResult prevented the
+ default action. Get rid of willHandleMouseDown; now that the gesture recognizer
+ sets delaysPrimaryMouseButtonEvents to NO, we don’t need this.
+ * WebView/WebImmediateActionController.h:
+ * WebView/WebImmediateActionController.mm:
+ (-[WebImmediateActionController _clearImmediateActionState]):
+
+ Set all of the immediateActionStages on EventHandler. This is critical to keep
+ link navigation happening at the right time now that
+ delaysPrimaryMouseButtonEvents is set to NO.
+ (-[WebImmediateActionController performHitTestAtPoint:]):
+ (-[WebImmediateActionController immediateActionRecognizerDidUpdateAnimation:]):
+ (-[WebImmediateActionController immediateActionRecognizerDidCancelAnimation:]):
+ (-[WebImmediateActionController immediateActionRecognizerDidCompleteAnimation:]):
+
+ Use a dummy animation controller if the content prevents default.
+ (-[WebImmediateActionController _defaultAnimationController]):
+ (-[WebImmediateActionController _updateImmediateActionItem]):
+ (-[WebImmediateActionController webView:willHandleMouseDown:]): Deleted.
+
+ Set delaysPrimaryMouseButtonEvents to NO so that we get existing mouse events when
+ we expect to.
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+
+ Cache the most recent pressure event so that we can send it to WebCore for all of
+ the mouse events.
+ (-[WebView _pressureEvent]):
+ (-[WebView _setPressureEvent:]):
+ * WebView/WebViewData.h:
+ * WebView/WebViewData.mm:
+ (-[WebViewPrivate dealloc]):
+ * WebView/WebViewInternal.h:
+
</ins><span class="cx"> 2015-04-27 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Deactivate WebGL until Windows tests work properly
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKitWebKitvcxprojInterfacesInterfacesvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -119,13 +119,13 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
</span><span class="cx"> <ImportGroup Label="ExtensionSettings">
</span><span class="lines">@@ -1498,4 +1498,4 @@
</span><span class="cx"> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><span class="cx">\ No newline at end of file
</span><ins>+</Project>
</ins></span></pre></div>
<a id="branchessafari601132branchSourceWebKitWebKitvcxprojWebKitWebKitvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -625,4 +625,4 @@
</span><span class="cx"> <ImportGroup Label="ExtensionTargets">
</span><span class="cx"> <Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</span><span class="cx"> </ImportGroup>
</span><del>-</Project>
</del><ins>+</Project>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKitWebKitvcxprojWebKitGUIDWebKitGUIDvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit/win/ChangeLog (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit/win/ChangeLog 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/WebKit/win/ChangeLog 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-05-12 Dana Burkart
+Dana Burkart <dburkart@apple.com
+dburkart@apple.com>
+
+ Merge r184137. rdar://problem/20707307
+
+ 2015-05-11 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Move Windows build target to Windows 7 (or newer)
+ https://bugs.webkit.org/show_bug.cgi?id=144890
+ <rdar://problem/20707307>
+
+ Reviewed by Anders Carlsson.
+
+ Update linked SDK and minimal Windows level to be compatible with
+ Windows 7 or newer.
+
+ * WebKitPrefix.h:
+
</ins><span class="cx"> 2015-05-05 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed WinCairo buildfix after r183807.
</span></span></pre></div>
<a id="branchessafari601132branchSourceWebKitwinWebKitPrefixh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Source/WebKit/win/WebKitPrefix.h (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Source/WebKit/win/WebKitPrefix.h 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Source/WebKit/win/WebKitPrefix.h 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -27,11 +27,11 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #ifndef _WIN32_WINNT
</span><del>-#define _WIN32_WINNT 0x0502
</del><ins>+#define _WIN32_WINNT 0x601
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifndef WINVER
</span><del>-#define WINVER 0x0502
</del><ins>+#define WINVER 0x0601
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifndef _WINSOCKAPI_
</span></span></pre></div>
<a id="branchessafari601132branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Tools/ChangeLog (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Tools/ChangeLog 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Tools/ChangeLog 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -2,46 +2,74 @@
</span><span class="cx"> Dana Burkart <dburkart@apple.com
</span><span class="cx"> dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r184116. rdar://problem/20774613
</del><ins>+ Merge r184137. rdar://problem/20707307
</ins><span class="cx">
</span><del>- 2015-05-11 Alex Christensen <achristensen@webkit.org>
</del><ins>+ 2015-05-11 Brent Fulgham <bfulgham@apple.com>
</ins><span class="cx">
</span><del>- [Content Extensions] Support domain-specific rules and exceptions.
- https://bugs.webkit.org/show_bug.cgi?id=144833
</del><ins>+ [Win] Move Windows build target to Windows 7 (or newer)
+ https://bugs.webkit.org/show_bug.cgi?id=144890
+ <rdar://problem/20707307>
</ins><span class="cx">
</span><del>- Reviewed by Darin Adler.
</del><ins>+ Reviewed by Anders Carlsson.
</ins><span class="cx">
</span><del>- * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
- (TestWebKitAPI::InMemoryCompiledContentExtension::createFromFilter):
- (TestWebKitAPI::InMemoryCompiledContentExtension::create):
- (TestWebKitAPI::InMemoryCompiledContentExtension::InMemoryCompiledContentExtension):
- Moved CompiledContentExtensionData from ContentExtensionCompiler.h because it is only used for testing.
- (TestWebKitAPI::mainDocumentRequest):
- (TestWebKitAPI::subResourceRequest):
- (TestWebKitAPI::TEST_F):
- (TestWebKitAPI::checkCompilerError):
- Added tests for parsing and functionality of if-domain and unless-domain.
</del><ins>+ Update linked SDK and minimal Windows level to be compatible with
+ Windows 7 or newer.
</ins><span class="cx">
</span><ins>+ * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj:
+ * DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj:
+ * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiff.vcxproj:
+ * DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncher.vcxproj:
+ * DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj:
+ * DumpRenderTree/config.h:
+ * TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj:
+ * WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj:
+ * WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj:
+ * WinLauncher/stdafx.h:
+
</ins><span class="cx"> 2015-05-12 Dana Burkart
</span><span class="cx"> Dana Burkart <dburkart@apple.com
</span><span class="cx"> dburkart@apple.com>
</span><span class="cx">
</span><del>- Merge r183954. rdar://problem/20281886
</del><ins>+ Merge r184116. rdar://problem/20774613
</ins><span class="cx">
</span><del>- 2015-05-07 Beth Dakin <bdakin@apple.com>
</del><ins>+ 2015-05-11 Alex Christensen <achristensen@webkit.org>
</ins><span class="cx">
</span><del>- New force-related DOM events should fire in WK1 views
- https://bugs.webkit.org/show_bug.cgi?id=144663
- -and corresponding-
- rdar://problem/20281886
</del><ins>+ [Content Extensions] Support domain-specific rules and exceptions.
+ https://bugs.webkit.org/show_bug.cgi?id=144833
</ins><span class="cx">
</span><del>- Reviewed by Sam Weinig.
</del><ins>+ Reviewed by Darin Adler.
</ins><span class="cx">
</span><del>- PlatformEventFactory::createPlatformMouseEvent() takes the last pressure event
- now. Just send nil.
- * TestWebKitAPI/Tests/mac/MenuTypesForMouseEvents.mm:
- (TestWebKitAPI::buildAndPerformTest):
</del><ins>+ * TestWebKitAPI/Tests/WebCore/ContentExtensions.cpp:
+ (TestWebKitAPI::InMemoryCompiledContentExtension::createFromFilter):
+ (TestWebKitAPI::InMemoryCompiledContentExtension::create):
+ (TestWebKitAPI::InMemoryCompiledContentExtension::InMemoryCompiledContentExtension):
+ Moved CompiledContentExtensionData from ContentExtensionCompiler.h because it is only used for testing.
+ (TestWebKitAPI::mainDocumentRequest):
+ (TestWebKitAPI::subResourceRequest):
+ (TestWebKitAPI::TEST_F):
+ (TestWebKitAPI::checkCompilerError):
+ Added tests for parsing and functionality of if-domain and unless-domain.
</ins><span class="cx">
</span><ins>+ 2015-05-12 Dana Burkart
+ Dana Burkart <dburkart@apple.com
+ dburkart@apple.com>
+
+ Merge r183954. rdar://problem/20281886
+
+ 2015-05-07 Beth Dakin <bdakin@apple.com>
+
+ New force-related DOM events should fire in WK1 views
+ https://bugs.webkit.org/show_bug.cgi?id=144663
+ -and corresponding-
+ rdar://problem/20281886
+
+ Reviewed by Sam Weinig.
+
+ PlatformEventFactory::createPlatformMouseEvent() takes the last pressure event
+ now. Just send nil.
+ * TestWebKitAPI/Tests/mac/MenuTypesForMouseEvents.mm:
+ (TestWebKitAPI::buildAndPerformTest):
+
</ins><span class="cx"> 2015-05-06 Matt Baker <mattbaker@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, updated my list of email addresses.
</span></span></pre></div>
<a id="branchessafari601132branchToolsDumpRenderTreeDumpRenderTreevcxprojDumpRenderTreeDumpRenderTreevcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTree.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span></span></pre></div>
<a id="branchessafari601132branchToolsDumpRenderTreeDumpRenderTreevcxprojDumpRenderTreeDumpRenderTreeLaunchervcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Tools/DumpRenderTree/DumpRenderTree.vcxproj/DumpRenderTree/DumpRenderTreeLauncher.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span></span></pre></div>
<a id="branchessafari601132branchToolsDumpRenderTreeDumpRenderTreevcxprojImageDiffImageDiffvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiff.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiff.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiff.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -88,7 +88,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -108,7 +108,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span></span></pre></div>
<a id="branchessafari601132branchToolsDumpRenderTreeDumpRenderTreevcxprojImageDiffImageDiffLaunchervcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncher.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncher.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Tools/DumpRenderTree/DumpRenderTree.vcxproj/ImageDiff/ImageDiffLauncher.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span></span></pre></div>
<a id="branchessafari601132branchToolsDumpRenderTreeDumpRenderTreevcxprojTestNetscapePluginTestNetscapePluginvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Tools/DumpRenderTree/DumpRenderTree.vcxproj/TestNetscapePlugin/TestNetscapePlugin.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -131,7 +131,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -141,7 +141,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -161,7 +161,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span></span></pre></div>
<a id="branchessafari601132branchToolsDumpRenderTreeconfigh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Tools/DumpRenderTree/config.h (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Tools/DumpRenderTree/config.h 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Tools/DumpRenderTree/config.h 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -48,10 +48,10 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #undef _WIN32_WINNT
</span><del>-#define _WIN32_WINNT 0x0502
</del><ins>+#define _WIN32_WINNT 0x601
</ins><span class="cx">
</span><span class="cx"> #undef WINVER
</span><del>-#define WINVER 0x0502
</del><ins>+#define WINVER 0x0601
</ins><span class="cx">
</span><span class="cx"> #undef _WINSOCKAPI_
</span><span class="cx"> #define _WINSOCKAPI_ // Prevent inclusion of winsock.h in windows.h
</span></span></pre></div>
<a id="branchessafari601132branchToolsTestWebKitAPITestWebKitAPIvcxprojTestWebKitAPIvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Tools/TestWebKitAPI/TestWebKitAPI.vcxproj/TestWebKitAPI.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span></span></pre></div>
<a id="branchessafari601132branchToolsWinLauncherWinLaunchervcxprojWinLaunchervcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncher.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span></span></pre></div>
<a id="branchessafari601132branchToolsWinLauncherWinLaunchervcxprojWinLauncherLibvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Tools/WinLauncher/WinLauncher.vcxproj/WinLauncherLib.vcxproj 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -79,7 +79,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -89,7 +89,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><del>- <PlatformToolset>v120_xp</PlatformToolset>
</del><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span></span></pre></div>
<a id="branchessafari601132branchToolsWinLauncherstdafxh"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1.32-branch/Tools/WinLauncher/stdafx.h (184263 => 184264)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1.32-branch/Tools/WinLauncher/stdafx.h 2015-05-13 05:33:03 UTC (rev 184263)
+++ branches/safari-601.1.32-branch/Tools/WinLauncher/stdafx.h 2015-05-13 05:33:16 UTC (rev 184264)
</span><span class="lines">@@ -32,16 +32,16 @@
</span><span class="cx">
</span><span class="cx"> // Modify the following defines if you have to target a platform prior to the ones specified below.
</span><span class="cx"> // Refer to MSDN for the latest info on corresponding values for different platforms.
</span><del>-#ifndef WINVER // Allow use of features specific to Windows XP SP2 or later.
-#define WINVER 0x0502 // Change this to the appropriate value to target other versions of Windows.
</del><ins>+#ifndef WINVER // Allow use of features specific to Windows 7 or later.
+#define WINVER 0x0601 // Change this to the appropriate value to target other versions of Windows.
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-#ifndef _WIN32_WINNT // Allow use of features specific to Windows XP SP2 or later.
-#define _WIN32_WINNT 0x0502 // Change this to the appropriate value to target other versions of Windows.
</del><ins>+#ifndef _WIN32_WINNT // Allow use of features specific to Windows 7 or later.
+#define _WIN32_WINNT 0x601 // Change this to the appropriate value to target other versions of Windows.
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 98 or later.
-#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later.
</del><ins>+#ifndef _WIN32_WINDOWS // Allow use of features specific to Windows 7 or later.
+#define _WIN32_WINDOWS 0x601 // Change this to the appropriate value to target Windows 7 or later.
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #ifndef _WIN32_IE // Allow use of features specific to IE 6.0 or later.
</span></span></pre>
</div>
</div>
</body>
</html>