<!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>[162552] branches/safari-537.75-branch</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/162552">162552</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-01-22 13:58:42 -0800 (Wed, 22 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/157607">r157607</a>
2013-10-17 Alex Christensen <achristensen@webkit.org>
Run JavaScriptCore tests again on Windows.
https://bugs.webkit.org/show_bug.cgi?id=122787
Reviewed by Tim Horton.
Source/JavaScriptCore:
* JavaScriptCore.vcxproj/JavaScriptCore.sln: Added.
* jit/JITStubsMSVC64.asm: Removed reference to cti_vm_throw unused since <a href="http://trac.webkit.org/projects/webkit/changeset/157581">r157581</a>.
Tools:
* Scripts/build-jsc:
(buildMyProject): Use JavaScriptCore.sln to build JavaScriptCore and WTF.
* Scripts/run-javascriptcore-tests: Don't run stress tests on WinCairo.
* Scripts/webkitdirs.pm:
(determineConfigurationForVisualStudio):
(determineConfigurationProductDir):
Build directory should end with bin64 and configuration should end with |x64 on Win64.
(isAppleWinWebKit):
(copyInspectorFrontendFiles):
(setPathForRunningWebKitApp):
Separated WinCairo directories and options from AppleWin.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53775branchSourceJavaScriptCoreChangeLog">branches/safari-537.75-branch/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceJavaScriptCorejitJITStubsMSVC64asm">branches/safari-537.75-branch/Source/JavaScriptCore/jit/JITStubsMSVC64.asm</a></li>
<li><a href="#branchessafari53775branchToolsChangeLog">branches/safari-537.75-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari53775branchToolsScriptsbuildjsc">branches/safari-537.75-branch/Tools/Scripts/build-jsc</a></li>
<li><a href="#branchessafari53775branchToolsScriptswebkitdirspm">branches/safari-537.75-branch/Tools/Scripts/webkitdirs.pm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari53775branchSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoresln">branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.sln</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 (162551 => 162552)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/JavaScriptCore/ChangeLog 2014-01-22 21:56:18 UTC (rev 162551)
+++ branches/safari-537.75-branch/Source/JavaScriptCore/ChangeLog 2014-01-22 21:58:42 UTC (rev 162552)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-01-22 Brent Fulgham <bfulgham@apple.com>
+
+ Merge r157607
+
+ 2013-10-17 Alex Christensen <achristensen@webkit.org>
+
+ Run JavaScriptCore tests again on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=122787
+
+ Reviewed by Tim Horton.
+
+ * JavaScriptCore.vcxproj/JavaScriptCore.sln: Added.
+ * jit/JITStubsMSVC64.asm: Removed reference to cti_vm_throw unused since r157581.
+
</ins><span class="cx"> 2013-12-23 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge 161003: <rdar://problem/15719584>
</span></span></pre></div>
<a id="branchessafari53775branchSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoreslnfromrev157607trunkSourceJavaScriptCoreJavaScriptCorevcxprojJavaScriptCoresln"></a>
<div class="copfile"><h4>Copied: branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.sln (from rev 157607, trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.sln) (0 => 162552)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.sln (rev 0)
+++ branches/safari-537.75-branch/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.sln 2014-01-22 21:58:42 UTC (rev 162552)
</span><span class="lines">@@ -0,0 +1,311 @@
</span><ins>+
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCore", "JavaScriptCore.vcxproj", "{22413D41-3A18-42B7-92A8-CEDC6CE86920}"
+ ProjectSection(ProjectDependencies) = postProject
+ {9221744B-5715-4F56-9590-42F7AB23DD8B} = {9221744B-5715-4F56-9590-42F7AB23DD8B}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JavaScriptCoreGenerated", "JavaScriptCoreGenerated.vcxproj", "{3670D01F-95F3-45A8-B878-947EB6CF214E}"
+ ProjectSection(ProjectDependencies) = postProject
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5} = {8EF73779-BED3-45BB-816D-9FF58399AFA5}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jsc", "jsc\jsc.vcxproj", "{2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}"
+ ProjectSection(ProjectDependencies) = postProject
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920} = {22413D41-3A18-42B7-92A8-CEDC6CE86920}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLIntAssembly", "LLInt\LLIntAssembly\LLIntAssembly.vcxproj", "{9221744B-5715-4F56-9590-42F7AB23DD8B}"
+ ProjectSection(ProjectDependencies) = postProject
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96} = {D595E3F6-24F2-4C60-935C-95D50C6B3E96}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLIntDesiredOffsets", "LLInt\LLIntDesiredOffsets\LLIntDesiredOffsets.vcxproj", "{877150A0-41B3-4730-9D98-1B8298098B14}"
+ ProjectSection(ProjectDependencies) = postProject
+ {3670D01F-95F3-45A8-B878-947EB6CF214E} = {3670D01F-95F3-45A8-B878-947EB6CF214E}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LLIntOffsetsExtractor", "LLInt\LLIntOffsetsExtractor\LLIntOffsetsExtractor.vcxproj", "{D595E3F6-24F2-4C60-935C-95D50C6B3E96}"
+ ProjectSection(ProjectDependencies) = postProject
+ {877150A0-41B3-4730-9D98-1B8298098B14} = {877150A0-41B3-4730-9D98-1B8298098B14}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testapi", "testapi\testapi.vcxproj", "{5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}"
+ ProjectSection(ProjectDependencies) = postProject
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B} = {BB16286B-AADC-46C1-BC0D-6C06F323E04B}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testRegExp", "testRegExp\testRegExp.vcxproj", "{BB16286B-AADC-46C1-BC0D-6C06F323E04B}"
+ ProjectSection(ProjectDependencies) = postProject
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3} = {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTF", "..\..\WTF\WTF.vcxproj\WTF.vcxproj", "{8EF73779-BED3-45BB-816D-9FF58399AFA5}"
+ ProjectSection(ProjectDependencies) = postProject
+ {F7366596-0520-4433-B8FF-D843E31E5199} = {F7366596-0520-4433-B8FF-D843E31E5199}
+ EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WTFGenerated", "..\..\WTF\WTF.vcxproj\WTFGenerated.vcxproj", "{F7366596-0520-4433-B8FF-D843E31E5199}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug_WinCairo|Win32 = Debug_WinCairo|Win32
+ Debug_WinCairo|x64 = Debug_WinCairo|x64
+ Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
+ DebugSuffix|Win32 = DebugSuffix|Win32
+ DebugSuffix|x64 = DebugSuffix|x64
+ Production|Win32 = Production|Win32
+ Production|x64 = Production|x64
+ Release_WinCairo|Win32 = Release_WinCairo|Win32
+ Release_WinCairo|x64 = Release_WinCairo|x64
+ Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug|Win32.ActiveCfg = Debug|Win32
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug|Win32.Build.0 = Debug|Win32
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug|x64.ActiveCfg = Debug|x64
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Debug|x64.Build.0 = Debug|x64
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Production|Win32.ActiveCfg = Production|Win32
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Production|Win32.Build.0 = Production|Win32
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Production|x64.ActiveCfg = Production|x64
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Production|x64.Build.0 = Production|x64
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release|Win32.ActiveCfg = Release|Win32
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release|Win32.Build.0 = Release|Win32
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release|x64.ActiveCfg = Release|x64
+ {22413D41-3A18-42B7-92A8-CEDC6CE86920}.Release|x64.Build.0 = Release|x64
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug|Win32.ActiveCfg = Debug|Win32
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug|Win32.Build.0 = Debug|Win32
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug|x64.ActiveCfg = Debug|x64
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Debug|x64.Build.0 = Debug|x64
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Production|Win32.ActiveCfg = Production|Win32
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Production|Win32.Build.0 = Production|Win32
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Production|x64.ActiveCfg = Production|x64
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Production|x64.Build.0 = Production|x64
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release|Win32.ActiveCfg = Release|Win32
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release|Win32.Build.0 = Release|Win32
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release|x64.ActiveCfg = Release|x64
+ {3670D01F-95F3-45A8-B878-947EB6CF214E}.Release|x64.Build.0 = Release|x64
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug|Win32.ActiveCfg = Debug|Win32
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug|Win32.Build.0 = Debug|Win32
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug|x64.ActiveCfg = Debug|x64
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Debug|x64.Build.0 = Debug|x64
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Production|Win32.ActiveCfg = Production|Win32
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Production|Win32.Build.0 = Production|Win32
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Production|x64.ActiveCfg = Production|x64
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Production|x64.Build.0 = Production|x64
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release|Win32.ActiveCfg = Release|Win32
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release|Win32.Build.0 = Release|Win32
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release|x64.ActiveCfg = Release|x64
+ {2BD437CF-BDAC-4119-9ED6-E10EF46C69F3}.Release|x64.Build.0 = Release|x64
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug|Win32.Build.0 = Debug|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug|x64.ActiveCfg = Debug|x64
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Debug|x64.Build.0 = Debug|x64
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Production|Win32.ActiveCfg = Production|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Production|Win32.Build.0 = Production|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Production|x64.ActiveCfg = Production|x64
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Production|x64.Build.0 = Production|x64
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release|Win32.ActiveCfg = Release|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release|Win32.Build.0 = Release|Win32
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release|x64.ActiveCfg = Release|x64
+ {9221744B-5715-4F56-9590-42F7AB23DD8B}.Release|x64.Build.0 = Release|x64
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Debug|Win32.ActiveCfg = Debug|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Debug|Win32.Build.0 = Debug|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Debug|x64.ActiveCfg = Debug|x64
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Debug|x64.Build.0 = Debug|x64
+ {877150A0-41B3-4730-9D98-1B8298098B14}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {877150A0-41B3-4730-9D98-1B8298098B14}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Production|Win32.ActiveCfg = Production|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Production|Win32.Build.0 = Production|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Production|x64.ActiveCfg = Production|x64
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Production|x64.Build.0 = Production|x64
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Release|Win32.ActiveCfg = Release|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Release|Win32.Build.0 = Release|Win32
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Release|x64.ActiveCfg = Release|x64
+ {877150A0-41B3-4730-9D98-1B8298098B14}.Release|x64.Build.0 = Release|x64
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug|Win32.ActiveCfg = Debug|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug|Win32.Build.0 = Debug|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug|x64.ActiveCfg = Debug|x64
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Debug|x64.Build.0 = Debug|x64
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Production|Win32.ActiveCfg = Production|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Production|Win32.Build.0 = Production|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Production|x64.ActiveCfg = Production|x64
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Production|x64.Build.0 = Production|x64
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release|Win32.ActiveCfg = Release|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release|Win32.Build.0 = Release|Win32
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release|x64.ActiveCfg = Release|x64
+ {D595E3F6-24F2-4C60-935C-95D50C6B3E96}.Release|x64.Build.0 = Release|x64
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug|Win32.ActiveCfg = Debug|Win32
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug|Win32.Build.0 = Debug|Win32
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug|x64.ActiveCfg = Debug|x64
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Debug|x64.Build.0 = Debug|x64
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Production|Win32.ActiveCfg = Production|Win32
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Production|Win32.Build.0 = Production|Win32
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Production|x64.ActiveCfg = Production|x64
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Production|x64.Build.0 = Production|x64
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release|Win32.ActiveCfg = Release|Win32
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release|Win32.Build.0 = Release|Win32
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release|x64.ActiveCfg = Release|x64
+ {5CC08E13-2CF9-4C2E-8544-07DA4E8C1843}.Release|x64.Build.0 = Release|x64
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug|Win32.ActiveCfg = Debug|Win32
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug|Win32.Build.0 = Debug|Win32
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug|x64.ActiveCfg = Debug|x64
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Debug|x64.Build.0 = Debug|x64
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Production|Win32.ActiveCfg = Production|Win32
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Production|Win32.Build.0 = Production|Win32
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Production|x64.ActiveCfg = Production|x64
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Production|x64.Build.0 = Production|x64
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release|Win32.ActiveCfg = Release|Win32
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release|Win32.Build.0 = Release|Win32
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release|x64.ActiveCfg = Release|x64
+ {BB16286B-AADC-46C1-BC0D-6C06F323E04B}.Release|x64.Build.0 = Release|x64
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug|Win32.ActiveCfg = Debug|Win32
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug|Win32.Build.0 = Debug|Win32
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug|x64.ActiveCfg = Debug|x64
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Debug|x64.Build.0 = Debug|x64
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Production|Win32.ActiveCfg = Production|Win32
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Production|Win32.Build.0 = Production|Win32
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Production|x64.ActiveCfg = Production|x64
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Production|x64.Build.0 = Production|x64
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release|Win32.ActiveCfg = Release|Win32
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release|Win32.Build.0 = Release|Win32
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release|x64.ActiveCfg = Release|x64
+ {8EF73779-BED3-45BB-816D-9FF58399AFA5}.Release|x64.Build.0 = Release|x64
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Debug_WinCairo|x64.ActiveCfg = Debug_WinCairo|x64
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Debug_WinCairo|x64.Build.0 = Debug_WinCairo|x64
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Debug|Win32.ActiveCfg = Debug|Win32
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Debug|Win32.Build.0 = Debug|Win32
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Debug|x64.ActiveCfg = Debug|x64
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Debug|x64.Build.0 = Debug|x64
+ {F7366596-0520-4433-B8FF-D843E31E5199}.DebugSuffix|Win32.ActiveCfg = DebugSuffix|Win32
+ {F7366596-0520-4433-B8FF-D843E31E5199}.DebugSuffix|Win32.Build.0 = DebugSuffix|Win32
+ {F7366596-0520-4433-B8FF-D843E31E5199}.DebugSuffix|x64.ActiveCfg = DebugSuffix|x64
+ {F7366596-0520-4433-B8FF-D843E31E5199}.DebugSuffix|x64.Build.0 = DebugSuffix|x64
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Production|Win32.ActiveCfg = Production|Win32
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Production|Win32.Build.0 = Production|Win32
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Production|x64.ActiveCfg = Production|x64
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Production|x64.Build.0 = Production|x64
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Release_WinCairo|x64.ActiveCfg = Release_WinCairo|x64
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Release_WinCairo|x64.Build.0 = Release_WinCairo|x64
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Release|Win32.ActiveCfg = Release|Win32
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Release|Win32.Build.0 = Release|Win32
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Release|x64.ActiveCfg = Release|x64
+ {F7366596-0520-4433-B8FF-D843E31E5199}.Release|x64.Build.0 = Release|x64
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+EndGlobal
</ins></span></pre></div>
<a id="branchessafari53775branchSourceJavaScriptCorejitJITStubsMSVC64asm"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/JavaScriptCore/jit/JITStubsMSVC64.asm (162551 => 162552)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/JavaScriptCore/jit/JITStubsMSVC64.asm 2014-01-22 21:56:18 UTC (rev 162551)
+++ branches/safari-537.75-branch/Source/JavaScriptCore/jit/JITStubsMSVC64.asm 2014-01-22 21:58:42 UTC (rev 162552)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx"> ; OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> ;*/
</span><span class="cx">
</span><del>-EXTERN cti_vm_throw : near
</del><span class="cx"> PUBLIC ctiTrampoline
</span><span class="cx"> PUBLIC ctiVMThrowTrampoline
</span><span class="cx"> PUBLIC ctiOpThrowNotCaught
</span></span></pre></div>
<a id="branchessafari53775branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Tools/ChangeLog (162551 => 162552)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Tools/ChangeLog 2014-01-22 21:56:18 UTC (rev 162551)
+++ branches/safari-537.75-branch/Tools/ChangeLog 2014-01-22 21:58:42 UTC (rev 162552)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-01-22 Brent Fulgham <bfulgham@apple.com>
+
+ Merge r157607
+
+ 2013-10-17 Alex Christensen <achristensen@webkit.org>
+
+ Run JavaScriptCore tests again on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=122787
+
+ Reviewed by Tim Horton.
+
+ * Scripts/build-jsc:
+ (buildMyProject): Use JavaScriptCore.sln to build JavaScriptCore and WTF.
+ * Scripts/run-javascriptcore-tests: Don't run stress tests on WinCairo.
+ * Scripts/webkitdirs.pm:
+ (determineConfigurationForVisualStudio):
+ (determineConfigurationProductDir):
+ Build directory should end with bin64 and configuration should end with |x64 on Win64.
+ (isAppleWinWebKit):
+ (copyInspectorFrontendFiles):
+ (setPathForRunningWebKitApp):
+ Separated WinCairo directories and options from AppleWin.
+
</ins><span class="cx"> 2013-12-19 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r160726
</span></span></pre></div>
<a id="branchessafari53775branchToolsScriptsbuildjsc"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Tools/Scripts/build-jsc (162551 => 162552)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Tools/Scripts/build-jsc 2014-01-22 21:56:18 UTC (rev 162551)
+++ branches/safari-537.75-branch/Tools/Scripts/build-jsc 2014-01-22 21:58:42 UTC (rev 162552)
</span><span class="lines">@@ -81,8 +81,11 @@
</span><span class="cx"> chdir $projectDirectory or die "Can't find $projectName directory to build from";
</span><span class="cx"> if (isAppleMacWebKit()) {
</span><span class="cx"> $result = system "sh", "-c", ('xcodebuild -project ' . $projectName . '.xcodeproj "$@" | grep -v setenv && exit ${PIPESTATUS[0]}'), "xcodebuild", @options, @ARGV, @coverageSupportOptions;
</span><del>- } elsif (isAppleWinWebKit()) {
- $result = buildVisualStudioProject("$projectName.vcxproj/$projectName.submit.sln");
</del><ins>+ } elsif (isAppleWinWebKit() || isWinCairo()) {
+ # WTF is a part of JavaScriptCore.sln because jsc.exe wouldn't start otherwise.
+ if ($projectName ne "WTF") {
+ $result = buildVisualStudioProject("$projectName.vcxproj/$projectName.sln");
+ }
</ins><span class="cx"> } elsif (isGtk()) {
</span><span class="cx"> checkForArgumentAndRemoveFromARGV("--gtk");
</span><span class="cx"> $result = buildGtkProject($projectName, 0);
</span></span></pre></div>
<a id="branchessafari53775branchToolsScriptswebkitdirspm"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Tools/Scripts/webkitdirs.pm (162551 => 162552)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Tools/Scripts/webkitdirs.pm 2014-01-22 21:56:18 UTC (rev 162551)
+++ branches/safari-537.75-branch/Tools/Scripts/webkitdirs.pm 2014-01-22 21:58:42 UTC (rev 162552)
</span><span class="lines">@@ -463,7 +463,7 @@
</span><span class="cx"> return if defined $configurationForVisualStudio;
</span><span class="cx"> determineConfiguration();
</span><span class="cx"> # FIXME: We should detect when Debug_All or Production has been chosen.
</span><del>- $configurationForVisualStudio = $configuration;
</del><ins>+ $configurationForVisualStudio = $configuration . (isWin64() ? "|x64" : "");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub usesPerConfigurationBuildDirectory
</span><span class="lines">@@ -480,9 +480,9 @@
</span><span class="cx"> return if defined $configurationProductDir;
</span><span class="cx"> determineBaseProductDir();
</span><span class="cx"> determineConfiguration();
</span><del>- if (isAppleWinWebKit()) {
</del><ins>+ if (isAppleWinWebKit() || isWinCairo()) {
</ins><span class="cx"> my $binDir = isWin64() ? "bin64" : "bin32";
</span><del>- $configurationProductDir = File::Spec->catdir($baseProductDir, configurationForVisualStudio(), $binDir);
</del><ins>+ $configurationProductDir = File::Spec->catdir($baseProductDir, $configuration, $binDir);
</ins><span class="cx"> } else {
</span><span class="cx"> if (usesPerConfigurationBuildDirectory()) {
</span><span class="cx"> $configurationProductDir = "$baseProductDir";
</span><span class="lines">@@ -1323,7 +1323,7 @@
</span><span class="cx">
</span><span class="cx"> sub isAppleWinWebKit()
</span><span class="cx"> {
</span><del>- return isAppleWebKit() && (isCygwin() || isWindows());
</del><ins>+ return isAppleWebKit() && (isCygwin() || isWindows()) && !isWinCairo();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> sub isPerianInstalled()
</span><span class="lines">@@ -1726,7 +1726,7 @@
</span><span class="cx">
</span><span class="cx"> if (isAppleMacWebKit()) {
</span><span class="cx"> $inspectorResourcesDirPath = $productDir . "/WebCore.framework/Resources/inspector";
</span><del>- } elsif (isAppleWinWebKit()) {
</del><ins>+ } elsif (isAppleWinWebKit() || isWinCairo()) {
</ins><span class="cx"> $inspectorResourcesDirPath = $productDir . "/WebKit.resources/inspector";
</span><span class="cx"> } elsif (isQt() || isGtk()) {
</span><span class="cx"> my $prefix = $ENV{"WebKitInstallationPrefix"};
</span><span class="lines">@@ -2424,6 +2424,9 @@
</span><span class="cx"> my $qtLibs = `$qmakebin -query QT_INSTALL_LIBS`;
</span><span class="cx"> $qtLibs =~ s/[\n|\r]$//g;
</span><span class="cx"> $env->{PATH} = join(';', $qtLibs, productDir() . "/lib", $env->{PATH} || "");
</span><ins>+ } elsif (isWinCairo()) {
+ my $winCairoBin = sourceDir() . "/WebKitLibraries/win/" . (isWin64() ? "bin64/" : "bin32/");
+ $env->{PATH} = join(':', productDir(), $winCairoBin , $env->{PATH} || "");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>