<!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>[162624] branches/safari-537.75-branch/Source</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/162624">162624</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-01-23 10:47:57 -0800 (Thu, 23 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/162621">r162621</a>
2014-01-22 Brent Fulgham <bfulgham@apple.com>
Source/JavaScriptCore:
[Win] Update project and solution files for 64-bit builds.
https://bugs.webkit.org/show_bug.cgi?id=127457
Reviewed by Eric Carlson.
* JavaScriptCore.vcxproj/JavaScriptCore.submit.sln: Add 64-bit target.
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj: Specify v100 target
for all builds on this branch.
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters: Add missing
file from project view.
* JavaScriptCore.vcxproj/jsc/jsc.vcxproj: Specify v100 target for
all builds on this branch.
* JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj: Ditto
* JavaScriptCore.vcxproj/testapi/testapi.vcxproj: Ditto
Source/WebCore:
[Win] Update project and solution files for 64-bit builds
https://bugs.webkit.org/show_bug.cgi?id=127457
Reviewed by Eric Carlson.
* WebCore.vcxproj/QTMovieWin/QTMovieWin.vcxproj: Specify v100 target
* WebCore.vcxproj/WebCore.submit.sln: Add x64 targets
* WebCore.vcxproj/WebCore.vcxproj: Specify v100 target for all builds
on this branch. Also exclude 32-bit specific assembly when building
64-bit target, and correct bad merge from branch.
* WebCore.vcxproj/WebCore.vcxproj.filters: Correct branch merge
* config.h: Handle 64-bit type definitions.
* platform/graphics/ca/win/PlatformCAAnimationWin.cpp:
(PlatformCAAnimation::setFromValue): Use CGFloat to support 64-bit builds
(PlatformCAAnimation::setToValue): Ditto
(PlatformCAAnimation::setValues): Ditto
* platform/graphics/win/FontCustomPlatformData.cpp:
(WebCore::FontCustomPlatformData::fontPlatformData): Add cast to
support 32- and 64-bit targets.
* platform/graphics/win/GraphicsContextCGWin.cpp:
(WebCore::GraphicsContext::drawLineForDocumentMarker): Use CGFloat to
support 64-bit builds.
* platform/win/PasteboardWin.cpp:
(WebCore::Pasteboard::writeURLToDataObject): Specialize std::min to
work on 32- and 64-bit code.
(WebCore::createGlobalImageFileDescriptor): Ditto
* platform/win/StructuredExceptionHandlerSuppressor.cpp:
(WebCore::StructuredExceptionHandlerSuppressor::StructuredExceptionHandlerSuppressor):
Comment out 32-bit inline assembly.
(WebCore::StructuredExceptionHandlerSuppressor::~StructuredExceptionHandlerSuppressor):
Ditto
Source/WebKit:
[Win] Update project and solution files for 64-bit builds
https://bugs.webkit.org/show_bug.cgi?id=127457
Reviewed by Eric Carlson.
* WebKit.vcxproj/Interfaces/Interfaces.vcxproj: Specify v100 target
for all builds on this branch.
* WebKit.vcxproj/WebKit.submit.sln: Add 64-bit target.
* WebKit.vcxproj/WebKit/WebKit.vcxproj: Specify v100 target for all
builds on this branch.
* WebKit.vcxproj/WebKit/WebKitApple.props: Remove unused QTMovieWin
library dependency.
* WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj:
Specify v100 target for all builds on this branch.
* WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj: Ditto
Source/WTF:
[Win] Update project and solution files for 64-bit builds.
https://bugs.webkit.org/show_bug.cgi?id=127457
Reviewed by Eric Carlson.
* WTF.vcxproj/WTF.submit.sln: Add x64 targets.
* WTF.vcxproj/WTF.vcxproj: Specify v100 target for all builds on this
branch.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53775branchSourceJavaScriptCoreChangeLog">branches/safari-537.75-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoresubmitsln">branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.submit.sln</a></li>
<li><a href="#branchessafari53775branchSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj">branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj</a></li>
<li><a href="#branchessafari53775branchSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters">branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters</a></li>
<li><a href="#branchessafari53775branchSourceJavaScriptCoreJavaScriptCorevcxprojjscjscvcxproj">branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jsc.vcxproj</a></li>
<li><a href="#branchessafari53775branchSourceJavaScriptCoreJavaScriptCorevcxprojtestRegExptestRegExpvcxproj">branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj</a></li>
<li><a href="#branchessafari53775branchSourceJavaScriptCoreJavaScriptCorevcxprojtestapitestapivcxproj">branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapi.vcxproj</a></li>
<li><a href="#branchessafari53775branchSourceWTFChangeLog">branches/safari-537.75-branch/Source/WTF/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWTFWTFvcxprojWTFsubmitsln">branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/WTF.submit.sln</a></li>
<li><a href="#branchessafari53775branchSourceWTFWTFvcxprojWTFvcxproj">branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/WTF.vcxproj</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreChangeLog">branches/safari-537.75-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreWebCorevcxprojQTMovieWinQTMovieWinvcxproj">branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWin.vcxproj</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreWebCorevcxprojWebCoresubmitsln">branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.submit.sln</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreWebCorevcxprojWebCorevcxproj">branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreWebCorevcxprojWebCorevcxprojfilters">branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreconfigh">branches/safari-537.75-branch/Source/WebCore/config.h</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreplatformgraphicscawinPlatformCAAnimationWincpp">branches/safari-537.75-branch/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreplatformgraphicswinFontCustomPlatformDatacpp">branches/safari-537.75-branch/Source/WebCore/platform/graphics/win/FontCustomPlatformData.cpp</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreplatformgraphicswinGraphicsContextCGWincpp">branches/safari-537.75-branch/Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreplatformwinPasteboardWincpp">branches/safari-537.75-branch/Source/WebCore/platform/win/PasteboardWin.cpp</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreplatformwinStructuredExceptionHandlerSuppressorcpp">branches/safari-537.75-branch/Source/WebCore/platform/win/StructuredExceptionHandlerSuppressor.cpp</a></li>
<li><a href="#branchessafari53775branchSourceWebKitChangeLog">branches/safari-537.75-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebKitWebKitvcxprojInterfacesInterfacesvcxproj">branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj</a></li>
<li><a href="#branchessafari53775branchSourceWebKitWebKitvcxprojWebKitWebKitvcxproj">branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj</a></li>
<li><a href="#branchessafari53775branchSourceWebKitWebKitvcxprojWebKitWebKitAppleprops">branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKitApple.props</a></li>
<li><a href="#branchessafari53775branchSourceWebKitWebKitvcxprojWebKitsubmitsln">branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKit.submit.sln</a></li>
<li><a href="#branchessafari53775branchSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportGeneratorvcxproj">branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj</a></li>
<li><a href="#branchessafari53775branchSourceWebKitWebKitvcxprojWebKitGUIDWebKitGUIDvcxproj">branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53775branchSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/JavaScriptCore/ChangeLog (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/JavaScriptCore/ChangeLog 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/JavaScriptCore/ChangeLog 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-01-23 Brent Fulgham <bfulgham@apple.com>
+
+ Merge r162621
+
+ 2014-01-22 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Update project and solution files for 64-bit builds.
+ https://bugs.webkit.org/show_bug.cgi?id=127457
+
+ Reviewed by Eric Carlson.
+
+ * JavaScriptCore.vcxproj/JavaScriptCore.submit.sln: Add 64-bit target.
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj: Specify v100 target
+ for all builds on this branch.
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters: Add missing
+ file from project view.
+ * JavaScriptCore.vcxproj/jsc/jsc.vcxproj: Specify v100 target for
+ all builds on this branch.
+ * JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj: Ditto
+ * JavaScriptCore.vcxproj/testapi/testapi.vcxproj: Ditto
+
</ins><span class="cx"> 2014-01-22 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r157607
</span></span></pre></div>
<a id="branchessafari53775branchSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoresubmitsln"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.submit.sln (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.submit.sln 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.submit.sln 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><span class="cx">
</span><del>-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
</del><ins>+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
</ins><span class="cx"> Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore", "JavaScriptCore.vcxproj", "{22413D41-3A18-42B7-92A8-CEDC6CE86920}"
</span><span class="cx"> ProjectSection(ProjectDependencies) = postProject
</span><span class="cx"> {3670D01F-95F3-45A8-B878-947EB6CF214E} = {3670D01F-95F3-45A8-B878-947EB6CF214E}
</span><span class="lines">@@ -26,51 +28,95 @@
</span><span class="cx"> Global
</span><span class="cx"> GlobalSection(SolutionConfigurationPlatforms) = preSolution
</span><span class="cx"> Debug|Win32 = Debug|Win32
</span><ins>+ Debug|x64 = Debug|x64
</ins><span class="cx"> DebugSuffix|Win32 = DebugSuffix|Win32
</span><ins>+ DebugSuffix|x64 = DebugSuffix|x64
</ins><span class="cx"> Production|Win32 = Production|Win32
</span><ins>+ Production|x64 = Production|x64
</ins><span class="cx"> Release|Win32 = Release|Win32
</span><ins>+ Release|x64 = Release|x64
</ins><span class="cx"> EndGlobalSection
</span><span class="cx"> GlobalSection(ProjectConfigurationPlatforms) = postSolution
</span><span class="cx"> {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug|Win32.ActiveCfg = Debug|Win32
</span><span class="cx"> {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug|Win32.Build.0 = Debug|Win32
</span><ins>+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug|x64.ActiveCfg = Debug|x64
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug|x64.Build.0 = Debug|x64
</ins><span class="cx"> {22413D41-3A18-42B7-92A8-CEDC6CE86920}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
</span><span class="cx"> {22413D41-3A18-42B7-92A8-CEDC6CE86920}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
</span><ins>+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
</ins><span class="cx"> {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Production|Win32.ActiveCfg = Production|Win32
</span><span class="cx"> {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Production|Win32.Build.0 = Production|Win32
</span><ins>+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Production|x64.ActiveCfg = Production|x64
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Production|x64.Build.0 = Production|x64
</ins><span class="cx"> {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release|Win32.ActiveCfg = Release|Win32
</span><span class="cx"> {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release|Win32.Build.0 = Release|Win32
</span><ins>+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release|x64.ActiveCfg = Release|x64
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release|x64.Build.0 = Release|x64
</ins><span class="cx"> {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug|Win32.ActiveCfg = Debug|Win32
</span><span class="cx"> {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug|Win32.Build.0 = Debug|Win32
</span><ins>+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug|x64.ActiveCfg = Debug|x64
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug|x64.Build.0 = Debug|x64
</ins><span class="cx"> {3670D01F-95F3-45A8-B878-947EB6CF214E}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
</span><span class="cx"> {3670D01F-95F3-45A8-B878-947EB6CF214E}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
</span><ins>+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
</ins><span class="cx"> {3670D01F-95F3-45A8-B878-947EB6CF214E}.Production|Win32.ActiveCfg = Production|Win32
</span><span class="cx"> {3670D01F-95F3-45A8-B878-947EB6CF214E}.Production|Win32.Build.0 = Production|Win32
</span><ins>+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Production|x64.ActiveCfg = Production|x64
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Production|x64.Build.0 = Production|x64
</ins><span class="cx"> {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release|Win32.ActiveCfg = Release|Win32
</span><span class="cx"> {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release|Win32.Build.0 = Release|Win32
</span><ins>+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release|x64.ActiveCfg = Release|x64
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release|x64.Build.0 = Release|x64
</ins><span class="cx"> {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug|Win32.ActiveCfg = Debug|Win32
</span><span class="cx"> {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug|Win32.Build.0 = Debug|Win32
</span><ins>+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug|x64.ActiveCfg = Debug|x64
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug|x64.Build.0 = Debug|x64
</ins><span class="cx"> {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
</span><span class="cx"> {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
</span><ins>+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
</ins><span class="cx"> {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Production|Win32.ActiveCfg = Production|Win32
</span><span class="cx"> {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Production|Win32.Build.0 = Production|Win32
</span><ins>+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Production|x64.ActiveCfg = Production|x64
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Production|x64.Build.0 = Production|x64
</ins><span class="cx"> {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release|Win32.ActiveCfg = Release|Win32
</span><span class="cx"> {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release|Win32.Build.0 = Release|Win32
</span><ins>+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release|x64.ActiveCfg = Release|x64
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release|x64.Build.0 = Release|x64
</ins><span class="cx"> {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug|Win32.ActiveCfg = Debug|Win32
</span><span class="cx"> {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug|Win32.Build.0 = Debug|Win32
</span><ins>+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug|x64.ActiveCfg = Debug|x64
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug|x64.Build.0 = Debug|x64
</ins><span class="cx"> {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
</span><span class="cx"> {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
</span><ins>+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
</ins><span class="cx"> {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Production|Win32.ActiveCfg = Production|Win32
</span><span class="cx"> {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Production|Win32.Build.0 = Production|Win32
</span><ins>+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Production|x64.ActiveCfg = Production|x64
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Production|x64.Build.0 = Production|x64
</ins><span class="cx"> {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release|Win32.ActiveCfg = Release|Win32
</span><span class="cx"> {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release|Win32.Build.0 = Release|Win32
</span><ins>+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release|x64.ActiveCfg = Release|x64
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release|x64.Build.0 = Release|x64
</ins><span class="cx"> {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug|Win32.ActiveCfg = Debug|Win32
</span><span class="cx"> {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug|Win32.Build.0 = Debug|Win32
</span><ins>+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug|x64.ActiveCfg = Debug|x64
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug|x64.Build.0 = Debug|x64
</ins><span class="cx"> {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
</span><span class="cx"> {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
</span><ins>+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
</ins><span class="cx"> {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Production|Win32.ActiveCfg = Production|Win32
</span><span class="cx"> {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Production|Win32.Build.0 = Production|Win32
</span><ins>+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Production|x64.ActiveCfg = Production|x64
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Production|x64.Build.0 = Production|x64
</ins><span class="cx"> {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release|Win32.ActiveCfg = Release|Win32
</span><span class="cx"> {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release|Win32.Build.0 = Release|Win32
</span><ins>+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release|x64.ActiveCfg = Release|x64
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release|x64.Build.0 = Release|x64
</ins><span class="cx"> EndGlobalSection
</span><span class="cx"> GlobalSection(SolutionProperties) = preSolution
</span><span class="cx"> HideSolutionNode = FALSE
</span></span></pre></div>
<a id="branchessafari53775branchSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><del>-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</del><ins>+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</ins><span class="cx"> <ItemGroup Label="ProjectConfigurations">
</span><span class="cx"> <ProjectConfiguration Include="DebugSuffix|Win32">
</span><span class="cx"> <Configuration>DebugSuffix</Configuration>
</span><span class="lines">@@ -61,61 +61,73 @@
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v100</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="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v100</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="cx"> <CharacterSet>Unicode</CharacterSet>
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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></pre></div>
<a id="branchessafari53775branchSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -1926,6 +1926,7 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\ArrayPrototype.lut.h">
</span><span class="cx"> <Filter>Derived Sources</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataViewPrototype.lut.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="branchessafari53775branchSourceJavaScriptCoreJavaScriptCorevcxprojjscjscvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jsc.vcxproj (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jsc.vcxproj 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/jsc/jsc.vcxproj 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><del>-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</del><ins>+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</ins><span class="cx"> <ItemGroup Label="ProjectConfigurations">
</span><span class="cx"> <ProjectConfiguration Include="DebugSuffix|Win32">
</span><span class="cx"> <Configuration>DebugSuffix</Configuration>
</span><span class="lines">@@ -60,61 +60,73 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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></pre></div>
<a id="branchessafari53775branchSourceJavaScriptCoreJavaScriptCorevcxprojtestRegExptestRegExpvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testRegExp/testRegExp.vcxproj 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><del>-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</del><ins>+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</ins><span class="cx"> <ItemGroup Label="ProjectConfigurations">
</span><span class="cx"> <ProjectConfiguration Include="DebugSuffix|Win32">
</span><span class="cx"> <Configuration>DebugSuffix</Configuration>
</span><span class="lines">@@ -61,61 +61,73 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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></pre></div>
<a id="branchessafari53775branchSourceJavaScriptCoreJavaScriptCorevcxprojtestapitestapivcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapi.vcxproj (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapi.vcxproj 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/testapi/testapi.vcxproj 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><del>-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</del><ins>+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</ins><span class="cx"> <ItemGroup Label="ProjectConfigurations">
</span><span class="cx"> <ProjectConfiguration Include="DebugSuffix|Win32">
</span><span class="cx"> <Configuration>DebugSuffix</Configuration>
</span><span class="lines">@@ -60,61 +60,73 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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></pre></div>
<a id="branchessafari53775branchSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WTF/ChangeLog (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WTF/ChangeLog 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/WTF/ChangeLog 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-01-23 Brent Fulgham <bfulgham@apple.com>
+
+ Merge r162621
+
+ 2014-01-22 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Update project and solution files for 64-bit builds.
+ https://bugs.webkit.org/show_bug.cgi?id=127457
+
+ Reviewed by Eric Carlson.
+
+ * WTF.vcxproj/WTF.submit.sln: Add x64 targets.
+ * WTF.vcxproj/WTF.vcxproj: Specify v100 target for all builds on this
+ branch.
+
</ins><span class="cx"> 2014-01-22 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r154520
</span></span></pre></div>
<a id="branchessafari53775branchSourceWTFWTFvcxprojWTFsubmitsln"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/WTF.submit.sln (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/WTF.submit.sln 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/WTF.submit.sln 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><span class="cx">
</span><del>-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
</del><ins>+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
</ins><span class="cx"> Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTFGenerated", "WTFGenerated.vcxproj", "{F7366596-0520-4433-B8FF-D843E31E5199}"
</span><span class="cx"> EndProject
</span><span class="cx"> Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "WTF.vcxproj", "{8EF73779-BED3-45BB-816D-9FF58399AFA5}"
</span><span class="lines">@@ -8,27 +10,47 @@
</span><span class="cx"> Global
</span><span class="cx"> GlobalSection(SolutionConfigurationPlatforms) = preSolution
</span><span class="cx"> Debug|Win32 = Debug|Win32
</span><ins>+ Debug|x64 = Debug|x64
</ins><span class="cx"> DebugSuffix|Win32 = DebugSuffix|Win32
</span><ins>+ DebugSuffix|x64 = DebugSuffix|x64
</ins><span class="cx"> Production|Win32 = Production|Win32
</span><ins>+ Production|x64 = Production|x64
</ins><span class="cx"> Release|Win32 = Release|Win32
</span><ins>+ Release|x64 = Release|x64
</ins><span class="cx"> EndGlobalSection
</span><span class="cx"> GlobalSection(ProjectConfigurationPlatforms) = postSolution
</span><span class="cx"> {F7366596-0520-4433-B8FF-D843E31E5199}.Debug|Win32.ActiveCfg = Debug|Win32
</span><span class="cx"> {F7366596-0520-4433-B8FF-D843E31E5199}.Debug|Win32.Build.0 = Debug|Win32
</span><ins>+ {F7366596-0520-4433-B8FF-D843E31E5199}.Debug|x64.ActiveCfg = Debug|x64
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Debug|x64.Build.0 = Debug|x64
</ins><span class="cx"> {F7366596-0520-4433-B8FF-D843E31E5199}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
</span><span class="cx"> {F7366596-0520-4433-B8FF-D843E31E5199}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
</span><ins>+ {F7366596-0520-4433-B8FF-D843E31E5199}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {F7366596-0520-4433-B8FF-D843E31E5199}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
</ins><span class="cx"> {F7366596-0520-4433-B8FF-D843E31E5199}.Production|Win32.ActiveCfg = Production|Win32
</span><span class="cx"> {F7366596-0520-4433-B8FF-D843E31E5199}.Production|Win32.Build.0 = Production|Win32
</span><ins>+ {F7366596-0520-4433-B8FF-D843E31E5199}.Production|x64.ActiveCfg = Production|x64
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Production|x64.Build.0 = Production|x64
</ins><span class="cx"> {F7366596-0520-4433-B8FF-D843E31E5199}.Release|Win32.ActiveCfg = Release|Win32
</span><span class="cx"> {F7366596-0520-4433-B8FF-D843E31E5199}.Release|Win32.Build.0 = Release|Win32
</span><ins>+ {F7366596-0520-4433-B8FF-D843E31E5199}.Release|x64.ActiveCfg = Release|x64
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Release|x64.Build.0 = Release|x64
</ins><span class="cx"> {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug|Win32.ActiveCfg = Debug|Win32
</span><span class="cx"> {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug|Win32.Build.0 = Debug|Win32
</span><ins>+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug|x64.ActiveCfg = Debug|x64
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug|x64.Build.0 = Debug|x64
</ins><span class="cx"> {8EF73779-BED3-45BB-816D-9FF58399AFA5}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
</span><span class="cx"> {8EF73779-BED3-45BB-816D-9FF58399AFA5}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
</span><ins>+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
</ins><span class="cx"> {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Production|Win32.ActiveCfg = Production|Win32
</span><span class="cx"> {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Production|Win32.Build.0 = Production|Win32
</span><ins>+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Production|x64.ActiveCfg = Production|x64
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Production|x64.Build.0 = Production|x64
</ins><span class="cx"> {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release|Win32.ActiveCfg = Release|Win32
</span><span class="cx"> {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release|Win32.Build.0 = Release|Win32
</span><ins>+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release|x64.ActiveCfg = Release|x64
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release|x64.Build.0 = Release|x64
</ins><span class="cx"> EndGlobalSection
</span><span class="cx"> GlobalSection(SolutionProperties) = preSolution
</span><span class="cx"> HideSolutionNode = FALSE
</span></span></pre></div>
<a id="branchessafari53775branchSourceWTFWTFvcxprojWTFvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/WTF.vcxproj (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/WTF.vcxproj 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/WTF/WTF.vcxproj/WTF.vcxproj 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><del>-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</del><ins>+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</ins><span class="cx"> <ItemGroup Label="ProjectConfigurations">
</span><span class="cx"> <ProjectConfiguration Include="DebugSuffix|Win32">
</span><span class="cx"> <Configuration>DebugSuffix</Configuration>
</span><span class="lines">@@ -300,61 +300,73 @@
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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></pre></div>
<a id="branchessafari53775branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2014-01-23 Brent Fulgham <bfulgham@apple.com>
+
+ Merge r162621
+
+ 2014-01-22 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Update project and solution files for 64-bit builds
+ https://bugs.webkit.org/show_bug.cgi?id=127457
+
+ Reviewed by Eric Carlson.
+
+ * WebCore.vcxproj/QTMovieWin/QTMovieWin.vcxproj: Specify v100 target
+ * WebCore.vcxproj/WebCore.submit.sln: Add x64 targets
+ * WebCore.vcxproj/WebCore.vcxproj: Specify v100 target for all builds
+ on this branch. Also exclude 32-bit specific assembly when building
+ 64-bit target, and correct bad merge from branch.
+ * WebCore.vcxproj/WebCore.vcxproj.filters: Correct branch merge
+ * config.h: Handle 64-bit type definitions.
+ * platform/graphics/ca/win/PlatformCAAnimationWin.cpp:
+ (PlatformCAAnimation::setFromValue): Use CGFloat to support 64-bit builds
+ (PlatformCAAnimation::setToValue): Ditto
+ (PlatformCAAnimation::setValues): Ditto
+ * platform/graphics/win/FontCustomPlatformData.cpp:
+ (WebCore::FontCustomPlatformData::fontPlatformData): Add cast to
+ support 32- and 64-bit targets.
+ * platform/graphics/win/GraphicsContextCGWin.cpp:
+ (WebCore::GraphicsContext::drawLineForDocumentMarker): Use CGFloat to
+ support 64-bit builds.
+ * platform/win/PasteboardWin.cpp:
+ (WebCore::Pasteboard::writeURLToDataObject): Specialize std::min to
+ work on 32- and 64-bit code.
+ (WebCore::createGlobalImageFileDescriptor): Ditto
+ * platform/win/StructuredExceptionHandlerSuppressor.cpp:
+ (WebCore::StructuredExceptionHandlerSuppressor::StructuredExceptionHandlerSuppressor):
+ Comment out 32-bit inline assembly.
+ (WebCore::StructuredExceptionHandlerSuppressor::~StructuredExceptionHandlerSuppressor):
+ Ditto
+
</ins><span class="cx"> 2014-01-22 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix for branch.
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreWebCorevcxprojQTMovieWinQTMovieWinvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWin.vcxproj (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWin.vcxproj 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/QTMovieWin/QTMovieWin.vcxproj 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><del>-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</del><ins>+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</ins><span class="cx"> <ItemGroup Label="ProjectConfigurations">
</span><span class="cx"> <ProjectConfiguration Include="DebugSuffix|Win32">
</span><span class="cx"> <Configuration>DebugSuffix</Configuration>
</span><span class="lines">@@ -59,50 +59,62 @@
</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><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="cx"> <CharacterSet>Unicode</CharacterSet>
</span><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>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><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>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><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="cx"> <CharacterSet>Unicode</CharacterSet>
</span><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><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="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v120</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><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><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="cx"> <CharacterSet>Unicode</CharacterSet>
</span><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></pre></div>
<a id="branchessafari53775branchSourceWebCoreWebCorevcxprojWebCoresubmitsln"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.submit.sln (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.submit.sln 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.submit.sln 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -1,50 +1,59 @@
</span><span class="cx">
</span><del>-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
</del><ins>+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
</ins><span class="cx"> Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCoreGenerated", "WebCoreGenerated.vcxproj", "{A4159B6F-3106-4F75-9EDD-582307BDB96A}"
</span><span class="cx"> EndProject
</span><span class="cx"> Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebCore", "WebCore.vcxproj", "{1C16337B-ACF3-4D03-AA90-851C5B5EADA6}"
</span><span class="cx"> ProjectSection(ProjectDependencies) = postProject
</span><del>- {E498CA9D-3BD2-4D52-8E37-C8DC76526325} = {E498CA9D-3BD2-4D52-8E37-C8DC76526325}
- EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "QTMovieWin", "QTMovieWin\QTMovieWin.vcxproj", "{E498CA9D-3BD2-4D52-8E37-C8DC76526325}"
- ProjectSection(ProjectDependencies) = postProject
</del><span class="cx"> {A4159B6F-3106-4F75-9EDD-582307BDB96A} = {A4159B6F-3106-4F75-9EDD-582307BDB96A}
</span><span class="cx"> EndProjectSection
</span><span class="cx"> EndProject
</span><span class="cx"> Global
</span><span class="cx"> GlobalSection(SolutionConfigurationPlatforms) = preSolution
</span><span class="cx"> Debug|Win32 = Debug|Win32
</span><ins>+ Debug|x64 = Debug|x64
</ins><span class="cx"> DebugSuffix|Win32 = DebugSuffix|Win32
</span><ins>+ DebugSuffix|x64 = DebugSuffix|x64
</ins><span class="cx"> Production|Win32 = Production|Win32
</span><ins>+ Production|x64 = Production|x64
</ins><span class="cx"> Release|Win32 = Release|Win32
</span><ins>+ Release|x64 = Release|x64
</ins><span class="cx"> EndGlobalSection
</span><span class="cx"> GlobalSection(ProjectConfigurationPlatforms) = postSolution
</span><span class="cx"> {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Debug|Win32.ActiveCfg = Debug|Win32
</span><span class="cx"> {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Debug|Win32.Build.0 = Debug|Win32
</span><ins>+ {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Debug|x64.ActiveCfg = Debug|x64
+ {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Debug|x64.Build.0 = Debug|x64
</ins><span class="cx"> {A4159B6F-3106-4F75-9EDD-582307BDB96A}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
</span><span class="cx"> {A4159B6F-3106-4F75-9EDD-582307BDB96A}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
</span><ins>+ {A4159B6F-3106-4F75-9EDD-582307BDB96A}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {A4159B6F-3106-4F75-9EDD-582307BDB96A}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
</ins><span class="cx"> {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Production|Win32.ActiveCfg = Production|Win32
</span><span class="cx"> {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Production|Win32.Build.0 = Production|Win32
</span><ins>+ {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Production|x64.ActiveCfg = Production|x64
+ {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Production|x64.Build.0 = Production|x64
</ins><span class="cx"> {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Release|Win32.ActiveCfg = Release|Win32
</span><span class="cx"> {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Release|Win32.Build.0 = Release|Win32
</span><ins>+ {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Release|x64.ActiveCfg = Release|x64
+ {A4159B6F-3106-4F75-9EDD-582307BDB96A}.Release|x64.Build.0 = Release|x64
</ins><span class="cx"> {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Win32.ActiveCfg = Debug|Win32
</span><span class="cx"> {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|Win32.Build.0 = Debug|Win32
</span><ins>+ {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|x64.ActiveCfg = Debug|x64
+ {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Debug|x64.Build.0 = Debug|x64
</ins><span class="cx"> {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
</span><span class="cx"> {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
</span><ins>+ {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
</ins><span class="cx"> {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Production|Win32.ActiveCfg = Production|Win32
</span><span class="cx"> {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Production|Win32.Build.0 = Production|Win32
</span><ins>+ {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Production|x64.ActiveCfg = Production|x64
+ {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Production|x64.Build.0 = Production|x64
</ins><span class="cx"> {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|Win32.ActiveCfg = Release|Win32
</span><span class="cx"> {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|Win32.Build.0 = Release|Win32
</span><del>- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug|Win32.ActiveCfg = Debug|Win32
- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Debug|Win32.Build.0 = Debug|Win32
- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Production|Win32.ActiveCfg = Production|Win32
- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Production|Win32.Build.0 = Production|Win32
- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release|Win32.ActiveCfg = Release|Win32
- {E498CA9D-3BD2-4D52-8E37-C8DC76526325}.Release|Win32.Build.0 = Release|Win32
</del><ins>+ {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|x64.ActiveCfg = Release|x64
+ {1C16337B-ACF3-4D03-AA90-851C5B5EADA6}.Release|x64.Build.0 = Release|x64
</ins><span class="cx"> EndGlobalSection
</span><span class="cx"> GlobalSection(SolutionProperties) = preSolution
</span><span class="cx"> HideSolutionNode = FALSE
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><del>-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</del><ins>+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</ins><span class="cx"> <ItemGroup Label="ProjectConfigurations">
</span><span class="cx"> <ProjectConfiguration Include="DebugSuffix|Win32">
</span><span class="cx"> <Configuration>DebugSuffix</Configuration>
</span><span class="lines">@@ -59,50 +59,62 @@
</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><ins>+ <PlatformToolset>v100</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="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</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><ins>+ <PlatformToolset>v100</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"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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">@@ -20836,13 +20848,19 @@
</span><span class="cx"> <None Include="WebCorePreBuild.cmd" />
</span><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><del>- <MASM Include="..\platform\win\makesafeseh.asm">
</del><ins>+ <MASM Include="..\platform\win\makesafeseh.asm">
</ins><span class="cx"> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">/safeseh %(AdditionalOptions)</AdditionalOptions>
</span><span class="cx"> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">/safeseh %(AdditionalOptions)</AdditionalOptions>
</span><span class="cx"> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">/safeseh %(AdditionalOptions)</AdditionalOptions>
</span><span class="cx"> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">/safeseh %(AdditionalOptions)</AdditionalOptions>
</span><span class="cx"> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">/safeseh %(AdditionalOptions)</AdditionalOptions>
</span><span class="cx"> <AdditionalOptions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">/safeseh %(AdditionalOptions)</AdditionalOptions>
</span><ins>+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
</ins><span class="cx"> </MASM>
</span><span class="cx"> <MASM Include="..\plugins\win\PaintHooks.asm">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -20856,4 +20874,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="branchessafari53775branchSourceWebCoreWebCorevcxprojWebCorevcxprojfilters"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -2319,9 +2319,6 @@
</span><span class="cx"> <ClCompile Include="..\css\MediaQueryList.cpp">
</span><span class="cx"> <Filter>css</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\css\MediaQueryListListener.cpp">
- <Filter>css</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\css\MediaQueryMatcher.cpp">
</span><span class="cx"> <Filter>css</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -3330,9 +3327,6 @@
</span><span class="cx"> <ClCompile Include="..\dom\MessagePortChannel.cpp">
</span><span class="cx"> <Filter>dom</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dom\MicroDataItemList.cpp">
- <Filter>dom</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\dom\MouseEvent.cpp">
</span><span class="cx"> <Filter>dom</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -3414,9 +3408,6 @@
</span><span class="cx"> <ClCompile Include="..\dom\ProgressEvent.cpp">
</span><span class="cx"> <Filter>dom</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dom\PropertyNodeList.cpp">
- <Filter>dom</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="..\dom\PseudoElement.cpp">
</span><span class="cx"> <Filter>dom</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -6061,9 +6052,6 @@
</span><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSMetadataCallback.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSMicroDataItemValue.cpp">
- <Filter>DerivedSources</Filter>
- </ClCompile>
</del><span class="cx"> <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSMouseEvent.cpp">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClCompile>
</span><span class="lines">@@ -6808,7 +6796,9 @@
</span><span class="cx"> <ClCompile Include="..\rendering\style\StyleCachedImageSet.cpp">
</span><span class="cx"> <Filter>rendering\style</Filter>
</span><span class="cx"> </ClCompile>
</span><del>- <ClCompile Include="..\dom\StyleElement.cpp" />
</del><ins>+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSMediaQueryListListener.cpp" />
+ <ClCompile Include="..\dom\InlineStyleSheetOwner.cpp" />
+ <ClCompile Include="..\dom\TextNodeTraversal.cpp" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="..\Modules\filesystem\AsyncFileWriter.h">
</span><span class="lines">@@ -13050,9 +13040,6 @@
</span><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataTransferItemList.h">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDedicatedWorkerContext.h">
- <Filter>DerivedSources</Filter>
- </ClInclude>
</del><span class="cx"> <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSDeviceMotionEvent.h">
</span><span class="cx"> <Filter>DerivedSources</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -14290,6 +14277,9 @@
</span><span class="cx"> <ClInclude Include="..\platform\graphics\ca\PlatformCAFilters.h">
</span><span class="cx"> <Filter>platform\graphics\ca</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSDedicatedWorkerContext.h" />
+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSMediaQueryListListener.h" />
+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSSVGGraphicsElement.h" />
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <None Include="..\css\CSSGrammar.y.in">
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreconfigh"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/config.h (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/config.h 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/WebCore/config.h 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx">
</span><span class="cx"> #if USE(CG)
</span><span class="cx"> #ifndef CGFLOAT_DEFINED
</span><del>-#ifdef __LP64__
</del><ins>+#if (defined(__LP64__) && __LP64__) || (defined(__x86_64__) && __x86_64__) || defined(_M_X64) || defined(__amd64__)
</ins><span class="cx"> typedef double CGFloat;
</span><span class="cx"> #else
</span><span class="cx"> typedef float CGFloat;
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreplatformgraphicscawinPlatformCAAnimationWincpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/WebCore/platform/graphics/ca/win/PlatformCAAnimationWin.cpp 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -365,7 +365,7 @@
</span><span class="cx"> if (animationType() != Basic)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- float a[3] = { value.x(), value.y(), value.z() };
</del><ins>+ CGFloat a[3] = { value.x(), value.y(), value.z() };
</ins><span class="cx"> RetainPtr<CACFVectorRef> v = adoptCF(CACFVectorCreate(3, a));
</span><span class="cx"> CACFAnimationSetFromValue(m_animation.get(), v.get());
</span><span class="cx"> }
</span><span class="lines">@@ -375,7 +375,7 @@
</span><span class="cx"> if (animationType() != Basic)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- float a[4] = { value.red(), value.green(), value.blue(), value.alpha() };
</del><ins>+ CGFloat a[4] = { value.red(), value.green(), value.blue(), value.alpha() };
</ins><span class="cx"> RetainPtr<CACFVectorRef> v = adoptCF(CACFVectorCreate(4, a));
</span><span class="cx"> CACFAnimationSetFromValue(m_animation.get(), v.get());
</span><span class="cx"> }
</span><span class="lines">@@ -418,7 +418,7 @@
</span><span class="cx"> if (animationType() != Basic)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- float a[3] = { value.x(), value.y(), value.z() };
</del><ins>+ CGFloat a[3] = { value.x(), value.y(), value.z() };
</ins><span class="cx"> RetainPtr<CACFVectorRef> v = adoptCF(CACFVectorCreate(3, a));
</span><span class="cx"> CACFAnimationSetToValue(m_animation.get(), v.get());
</span><span class="cx"> }
</span><span class="lines">@@ -428,7 +428,7 @@
</span><span class="cx"> if (animationType() != Basic)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- float a[4] = { value.red(), value.green(), value.blue(), value.alpha() };
</del><ins>+ CGFloat a[4] = { value.red(), value.green(), value.blue(), value.alpha() };
</ins><span class="cx"> RetainPtr<CACFVectorRef> v = adoptCF(CACFVectorCreate(4, a));
</span><span class="cx"> CACFAnimationSetToValue(m_animation.get(), v.get());
</span><span class="cx"> }
</span><span class="lines">@@ -485,7 +485,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFMutableArrayRef> array = adoptCF(CFArrayCreateMutable(0, value.size(), &kCFTypeArrayCallBacks));
</span><span class="cx"> for (size_t i = 0; i < value.size(); ++i) {
</span><del>- float a[3] = { value[i].x(), value[i].y(), value[i].z() };
</del><ins>+ CGFloat a[3] = { value[i].x(), value[i].y(), value[i].z() };
</ins><span class="cx"> RetainPtr<CACFVectorRef> v = adoptCF(CACFVectorCreate(3, a));
</span><span class="cx"> CFArrayAppendValue(array.get(), v.get());
</span><span class="cx"> }
</span><span class="lines">@@ -500,7 +500,7 @@
</span><span class="cx">
</span><span class="cx"> RetainPtr<CFMutableArrayRef> array = adoptCF(CFArrayCreateMutable(0, value.size(), &kCFTypeArrayCallBacks));
</span><span class="cx"> for (size_t i = 0; i < value.size(); ++i) {
</span><del>- float a[4] = { value[i].red(), value[i].green(), value[i].blue(), value[i].alpha() };
</del><ins>+ CGFloat a[4] = { value[i].red(), value[i].green(), value[i].blue(), value[i].alpha() };
</ins><span class="cx"> RetainPtr<CACFVectorRef> v = adoptCF(CACFVectorCreate(4, a));
</span><span class="cx"> CFArrayAppendValue(array.get(), v.get());
</span><span class="cx"> }
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreplatformgraphicswinFontCustomPlatformDatacpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/platform/graphics/win/FontCustomPlatformData.cpp (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/platform/graphics/win/FontCustomPlatformData.cpp 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/WebCore/platform/graphics/win/FontCustomPlatformData.cpp 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> ASSERT(m_fontReference);
</span><span class="cx">
</span><span class="cx"> LOGFONT& logFont = *static_cast<LOGFONT*>(malloc(sizeof(LOGFONT)));
</span><del>- memcpy(logFont.lfFaceName, m_name.charactersWithNullTermination(), sizeof(logFont.lfFaceName[0]) * min(static_cast<size_t>(LF_FACESIZE), 1 + m_name.length()));
</del><ins>+ memcpy(logFont.lfFaceName, m_name.charactersWithNullTermination(), sizeof(logFont.lfFaceName[0]) * std::min<size_t>(static_cast<size_t>(LF_FACESIZE), 1 + m_name.length()));
</ins><span class="cx">
</span><span class="cx"> logFont.lfHeight = -size;
</span><span class="cx"> if (renderingMode == NormalRenderingMode)
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreplatformgraphicswinGraphicsContextCGWincpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/WebCore/platform/graphics/win/GraphicsContextCGWin.cpp 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -222,10 +222,10 @@
</span><span class="cx">
</span><span class="cx"> // Dash lengths for the top and bottom of the error underline are the same.
</span><span class="cx"> // These are magic.
</span><del>- static const float edge_dash_lengths[] = {2.0f, 2.0f};
- static const float middle_dash_lengths[] = {2.76f, 1.24f};
- static const float edge_offset = -(edge_dash_lengths[1] - 1.0f) / 2.0f;
- static const float middle_offset = -(middle_dash_lengths[1] - 1.0f) / 2.0f;
</del><ins>+ static const CGFloat edge_dash_lengths[] = {2.0f, 2.0f};
+ static const CGFloat middle_dash_lengths[] = { 2.76f, 1.24f };
+ static const CGFloat edge_offset = -(edge_dash_lengths[1] - 1.0f) / 2.0f;
+ static const CGFloat middle_offset = -(middle_dash_lengths[1] - 1.0f) / 2.0f;
</ins><span class="cx">
</span><span class="cx"> // Line opacities. Once again, these are magic.
</span><span class="cx"> const float upperOpacity = 0.33f;
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreplatformwinPasteboardWincpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/platform/win/PasteboardWin.cpp (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/platform/win/PasteboardWin.cpp 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/WebCore/platform/win/PasteboardWin.cpp 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -677,7 +677,7 @@
</span><span class="cx"> fgd->fgd[0].dwFlags = FD_FILESIZE;
</span><span class="cx"> fgd->fgd[0].nFileSizeLow = content.length();
</span><span class="cx">
</span><del>- unsigned maxSize = std::min(fsPath.length(), WTF_ARRAY_LENGTH(fgd->fgd[0].cFileName));
</del><ins>+ unsigned maxSize = std::min<unsigned>(fsPath.length(), WTF_ARRAY_LENGTH(fgd->fgd[0].cFileName));
</ins><span class="cx"> CopyMemory(fgd->fgd[0].cFileName, fsPath.characters(), maxSize * sizeof(UChar));
</span><span class="cx"> GlobalUnlock(urlFileDescriptor);
</span><span class="cx">
</span><span class="lines">@@ -929,7 +929,7 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- int maxSize = std::min(fsPath.length(), WTF_ARRAY_LENGTH(fgd->fgd[0].cFileName));
</del><ins>+ int maxSize = std::min<int>(fsPath.length(), WTF_ARRAY_LENGTH(fgd->fgd[0].cFileName));
</ins><span class="cx"> CopyMemory(fgd->fgd[0].cFileName, (LPCWSTR)fsPath.characters(), maxSize * sizeof(UChar));
</span><span class="cx"> GlobalUnlock(memObj);
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreplatformwinStructuredExceptionHandlerSuppressorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/platform/win/StructuredExceptionHandlerSuppressor.cpp (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/platform/win/StructuredExceptionHandlerSuppressor.cpp 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/WebCore/platform/win/StructuredExceptionHandlerSuppressor.cpp 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -27,7 +27,9 @@
</span><span class="cx">
</span><span class="cx"> #include "StructuredExceptionHandlerSuppressor.h"
</span><span class="cx">
</span><ins>+#if defined(_M_IX86)
</ins><span class="cx"> extern "C" int __stdcall exceptionHandlerThunk(); // Defined in makesafeseh.asm
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> static bool exceptionShouldTerminateProgram(int code)
</span><span class="cx"> {
</span><span class="lines">@@ -75,6 +77,7 @@
</span><span class="cx">
</span><span class="cx"> StructuredExceptionHandlerSuppressor::StructuredExceptionHandlerSuppressor(ExceptionRegistration& exceptionRegistration)
</span><span class="cx"> {
</span><ins>+#if defined(_M_IX86)
</ins><span class="cx"> // Note: Windows requires that the EXCEPTION_REGISTRATION block (modeled here as our
</span><span class="cx"> // ExceptionRegistration struct) be stack allocated. Therefore we instantiated it prior
</span><span class="cx"> // to building this object so that Windows can still find it in stack memory when it
</span><span class="lines">@@ -120,13 +123,19 @@
</span><span class="cx"> __asm mov FS:[0], eax
</span><span class="cx">
</span><span class="cx"> m_savedExceptionRegistration = registration;
</span><ins>+#else
+ // 64-bit x64 no longer needs dynamic modification of the exception handlers.
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> StructuredExceptionHandlerSuppressor::~StructuredExceptionHandlerSuppressor()
</span><span class="cx"> {
</span><ins>+#if defined(_M_IX86)
</ins><span class="cx"> // Restore the exception handler
</span><span class="cx"> __asm mov eax, [m_savedExceptionRegistration]
</span><span class="cx"> __asm mov FS:[0], eax
</span><ins>+#else
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #pragma warning(pop)
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebKit/ChangeLog (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebKit/ChangeLog 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/WebKit/ChangeLog 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-01-23 Brent Fulgham <bfulgham@apple.com>
+
+ Merge r162621
+
+ 2014-01-22 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Update project and solution files for 64-bit builds
+ https://bugs.webkit.org/show_bug.cgi?id=127457
+
+ Reviewed by Eric Carlson.
+
+ * WebKit.vcxproj/Interfaces/Interfaces.vcxproj: Specify v100 target
+ for all builds on this branch.
+ * WebKit.vcxproj/WebKit.submit.sln: Add 64-bit target.
+ * WebKit.vcxproj/WebKit/WebKit.vcxproj: Specify v100 target for all
+ builds on this branch.
+ * WebKit.vcxproj/WebKit/WebKitApple.props: Remove unused QTMovieWin
+ library dependency.
+ * WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj:
+ Specify v100 target for all builds on this branch.
+ * WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj: Ditto
+
</ins><span class="cx"> 2013-12-11 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r154513
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebKitWebKitvcxprojInterfacesInterfacesvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><del>-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</del><ins>+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</ins><span class="cx"> <ItemGroup Label="ProjectConfigurations">
</span><span class="cx"> <ProjectConfiguration Include="DebugSuffix|Win32">
</span><span class="cx"> <Configuration>DebugSuffix</Configuration>
</span><span class="lines">@@ -59,61 +59,73 @@
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|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><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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><ins>+ <PlatformToolset>v100</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></pre></div>
<a id="branchessafari53775branchSourceWebKitWebKitvcxprojWebKitWebKitvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><del>-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</del><ins>+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</ins><span class="cx"> <ItemGroup Label="ProjectConfigurations">
</span><span class="cx"> <ProjectConfiguration Include="DebugSuffix|Win32">
</span><span class="cx"> <Configuration>DebugSuffix</Configuration>
</span><span class="lines">@@ -60,50 +60,62 @@
</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><ins>+ <PlatformToolset>v100</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="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</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><ins>+ <PlatformToolset>v100</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="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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><ins>+ <PlatformToolset>v100</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="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>DynamicLibrary</ConfigurationType>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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><ins>+ <PlatformToolset>v100</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="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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></pre></div>
<a id="branchessafari53775branchSourceWebKitWebKitvcxprojWebKitWebKitAppleprops"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKitApple.props (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKitApple.props 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKit/WebKitApple.props 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <ItemDefinitionGroup>
</span><span class="cx"> <Link>
</span><del>- <AdditionalDependencies>CFNetwork$(DebugSuffix).lib;CoreFoundation$(DebugSuffix).lib;CoreGraphics$(DebugSuffix).lib;WebKitSystemInterface$(DebugSuffix).lib;QTMovieWin$(DebugSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
</del><ins>+ <AdditionalDependencies>CFNetwork$(DebugSuffix).lib;CoreFoundation$(DebugSuffix).lib;CoreGraphics$(DebugSuffix).lib;WebKitSystemInterface$(DebugSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
</ins><span class="cx"> </Link>
</span><span class="cx"> </ItemDefinitionGroup>
</span><span class="cx"> </Project>
</span><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebKitWebKitvcxprojWebKitsubmitsln"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKit.submit.sln (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKit.submit.sln 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKit.submit.sln 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -1,6 +1,8 @@
</span><span class="cx">
</span><del>-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
</del><ins>+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.21005.1
+MinimumVisualStudioVersion = 10.0.40219.1
</ins><span class="cx"> Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Interfaces", "Interfaces\Interfaces.vcxproj", "{1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}"
</span><span class="cx"> EndProject
</span><span class="cx"> Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit", "WebKit\WebKit.vcxproj", "{0662A8A9-82A3-4638-97D8-EC425D8D87C9}"
</span><span class="lines">@@ -21,43 +23,79 @@
</span><span class="cx"> Global
</span><span class="cx"> GlobalSection(SolutionConfigurationPlatforms) = preSolution
</span><span class="cx"> Debug|Win32 = Debug|Win32
</span><ins>+ Debug|x64 = Debug|x64
</ins><span class="cx"> DebugSuffix|Win32 = DebugSuffix|Win32
</span><ins>+ DebugSuffix|x64 = DebugSuffix|x64
</ins><span class="cx"> Production|Win32 = Production|Win32
</span><ins>+ Production|x64 = Production|x64
</ins><span class="cx"> Release|Win32 = Release|Win32
</span><ins>+ Release|x64 = Release|x64
</ins><span class="cx"> EndGlobalSection
</span><span class="cx"> GlobalSection(ProjectConfigurationPlatforms) = postSolution
</span><span class="cx"> {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Debug|Win32.ActiveCfg = Debug|Win32
</span><span class="cx"> {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Debug|Win32.Build.0 = Debug|Win32
</span><ins>+ {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Debug|x64.ActiveCfg = Debug|x64
+ {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Debug|x64.Build.0 = Debug|x64
</ins><span class="cx"> {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
</span><span class="cx"> {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
</span><ins>+ {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
</ins><span class="cx"> {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Production|Win32.ActiveCfg = Production|Win32
</span><span class="cx"> {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Production|Win32.Build.0 = Production|Win32
</span><ins>+ {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Production|x64.ActiveCfg = Production|x64
+ {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Production|x64.Build.0 = Production|x64
</ins><span class="cx"> {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Release|Win32.ActiveCfg = Release|Win32
</span><span class="cx"> {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Release|Win32.Build.0 = Release|Win32
</span><ins>+ {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Release|x64.ActiveCfg = Release|x64
+ {1659B1B6-F2A3-46B3-AE02-FE65B4A607EB}.Release|x64.Build.0 = Release|x64
</ins><span class="cx"> {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug|Win32.ActiveCfg = Debug|Win32
</span><span class="cx"> {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug|Win32.Build.0 = Debug|Win32
</span><ins>+ {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug|x64.ActiveCfg = Debug|x64
+ {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Debug|x64.Build.0 = Debug|x64
</ins><span class="cx"> {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
</span><span class="cx"> {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
</span><ins>+ {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
</ins><span class="cx"> {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Production|Win32.ActiveCfg = Production|Win32
</span><span class="cx"> {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Production|Win32.Build.0 = Production|Win32
</span><ins>+ {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Production|x64.ActiveCfg = Production|x64
+ {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Production|x64.Build.0 = Production|x64
</ins><span class="cx"> {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release|Win32.ActiveCfg = Release|Win32
</span><span class="cx"> {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release|Win32.Build.0 = Release|Win32
</span><ins>+ {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release|x64.ActiveCfg = Release|x64
+ {0662A8A9-82A3-4638-97D8-EC425D8D87C9}.Release|x64.Build.0 = Release|x64
</ins><span class="cx"> {0F837117-8C0B-4596-A373-A37E14A01223}.Debug|Win32.ActiveCfg = Debug|Win32
</span><span class="cx"> {0F837117-8C0B-4596-A373-A37E14A01223}.Debug|Win32.Build.0 = Debug|Win32
</span><ins>+ {0F837117-8C0B-4596-A373-A37E14A01223}.Debug|x64.ActiveCfg = Debug|x64
+ {0F837117-8C0B-4596-A373-A37E14A01223}.Debug|x64.Build.0 = Debug|x64
</ins><span class="cx"> {0F837117-8C0B-4596-A373-A37E14A01223}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
</span><span class="cx"> {0F837117-8C0B-4596-A373-A37E14A01223}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
</span><ins>+ {0F837117-8C0B-4596-A373-A37E14A01223}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {0F837117-8C0B-4596-A373-A37E14A01223}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
</ins><span class="cx"> {0F837117-8C0B-4596-A373-A37E14A01223}.Production|Win32.ActiveCfg = Production|Win32
</span><span class="cx"> {0F837117-8C0B-4596-A373-A37E14A01223}.Production|Win32.Build.0 = Production|Win32
</span><ins>+ {0F837117-8C0B-4596-A373-A37E14A01223}.Production|x64.ActiveCfg = Production|x64
+ {0F837117-8C0B-4596-A373-A37E14A01223}.Production|x64.Build.0 = Production|x64
</ins><span class="cx"> {0F837117-8C0B-4596-A373-A37E14A01223}.Release|Win32.ActiveCfg = Release|Win32
</span><span class="cx"> {0F837117-8C0B-4596-A373-A37E14A01223}.Release|Win32.Build.0 = Release|Win32
</span><ins>+ {0F837117-8C0B-4596-A373-A37E14A01223}.Release|x64.ActiveCfg = Release|x64
+ {0F837117-8C0B-4596-A373-A37E14A01223}.Release|x64.Build.0 = Release|x64
</ins><span class="cx"> {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Debug|Win32.ActiveCfg = Debug|Win32
</span><span class="cx"> {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Debug|Win32.Build.0 = Debug|Win32
</span><ins>+ {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Debug|x64.ActiveCfg = Debug|x64
+ {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Debug|x64.Build.0 = Debug|x64
</ins><span class="cx"> {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
</span><span class="cx"> {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
</span><ins>+ {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
</ins><span class="cx"> {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Production|Win32.ActiveCfg = Production|Win32
</span><span class="cx"> {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Production|Win32.Build.0 = Production|Win32
</span><ins>+ {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Production|x64.ActiveCfg = Production|x64
+ {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Production|x64.Build.0 = Production|x64
</ins><span class="cx"> {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Release|Win32.ActiveCfg = Release|Win32
</span><span class="cx"> {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Release|Win32.Build.0 = Release|Win32
</span><ins>+ {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Release|x64.ActiveCfg = Release|x64
+ {A15EDAD8-8B87-4D4A-8498-77A04AB65F16}.Release|x64.Build.0 = Release|x64
</ins><span class="cx"> EndGlobalSection
</span><span class="cx"> GlobalSection(SolutionProperties) = preSolution
</span><span class="cx"> HideSolutionNode = FALSE
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebKitWebKitvcxprojWebKitExportGeneratorWebKitExportGeneratorvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExportGenerator.vcxproj 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><del>-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</del><ins>+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</ins><span class="cx"> <ItemGroup Label="ProjectConfigurations">
</span><span class="cx"> <ProjectConfiguration Include="DebugSuffix|Win32">
</span><span class="cx"> <Configuration>DebugSuffix</Configuration>
</span><span class="lines">@@ -61,61 +61,73 @@
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>Application</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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></pre></div>
<a id="branchessafari53775branchSourceWebKitWebKitvcxprojWebKitGUIDWebKitGUIDvcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj (162623 => 162624)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj 2014-01-23 18:20:38 UTC (rev 162623)
+++ branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKitGUID/WebKitGUID.vcxproj 2014-01-23 18:47:57 UTC (rev 162624)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> <?xml version="1.0" encoding="utf-8"?>
</span><del>-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</del><ins>+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
</ins><span class="cx"> <ItemGroup Label="ProjectConfigurations">
</span><span class="cx"> <ProjectConfiguration Include="DebugSuffix|Win32">
</span><span class="cx"> <Configuration>DebugSuffix</Configuration>
</span><span class="lines">@@ -59,51 +59,61 @@
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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><span class="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>true</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|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><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Production|Win32'" Label="Configuration">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="cx"> <UseDebugLibraries>false</UseDebugLibraries>
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
</span><span class="cx"> <ConfigurationType>StaticLibrary</ConfigurationType>
</span><span class="lines">@@ -113,9 +123,11 @@
</span><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Label="Configuration" Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</PlatformToolset>
</ins><span class="cx"> </PropertyGroup>
</span><span class="cx"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'" Label="Configuration">
</span><span class="cx"> <CharacterSet>Unicode</CharacterSet>
</span><ins>+ <PlatformToolset>v100</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></pre>
</div>
</div>
</body>
</html>