<!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>[163392] 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/163392">163392</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-02-04 11:10:25 -0800 (Tue, 04 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebCore: Build fix after last branch merge.
* WebCore.vcxproj/WebCore.vcxproj: Correct bad merge of media build steps.
Source/WebInspectorUI: Merge <a href="http://trac.webkit.org/projects/webkit/changeset/154395">r154395</a>.
2013-08-20 Brent Fulgham <bfulgham@apple.com>
<http://webkit.org/b/120098> [Windows] Enable the New Web Inspector
Reviewed by Brian Weinstein.
Add a new project to copy files to the appropriate spots in the
Windows port.
* WebInspectorUI.vcxproj: Added.
* WebInspectorUI.vcxproj/WebInspectorUI.vcxproj: Added.
* WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters: Added.
* WebInspectorUI.vcxproj/WebInspectorUIPostBuild.cmd: Added.
* WebInspectorUI.vcxproj/WebInspectorUIPreBuild.cmd: Added.
Source/WebKit: Merge <a href="http://trac.webkit.org/projects/webkit/changeset/154395">r154395</a>.
2013-08-20 Brent Fulgham <bfulgham@apple.com>
<https://webkit.org/b/120098> [Windows] Enable the new Web Inspector
Reviewed by Brian Weinstein.
* WebKit.vcxproj/WebKit.sln: Add reference to the new WebInspectorUI
project so that it will be included in new distributions.
Source/WebKit/win: Merge <a href="http://trac.webkit.org/projects/webkit/changeset/154394">r154394</a>
2013-08-20 Brent Fulgham <bfulgham@apple.com>
<https://webkit.org/b/120098> [Windows] Enable the New Web Inspector
Reviewed by Brian Weinstein.
* WebCoreSupport/WebInspectorClient.cpp:
(WebInspectorClient::openInspectorFrontend): Use the new inspector
if present in the WebKit distribution.
(WebInspectorFrontendClient::localizedStringsURL): Use the new
Web Inspector's localized strings (if present).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53775branchSourceWebCoreChangeLog">branches/safari-537.75-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebCoreWebCorevcxprojWebCorevcxproj">branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj</a></li>
<li><a href="#branchessafari53775branchSourceWebInspectorUIChangeLog">branches/safari-537.75-branch/Source/WebInspectorUI/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebKitChangeLog">branches/safari-537.75-branch/Source/WebKit/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebKitWebKitvcxprojWebKitsln">branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKit.sln</a></li>
<li><a href="#branchessafari53775branchSourceWebKitwinChangeLog">branches/safari-537.75-branch/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#branchessafari53775branchSourceWebKitwinWebCoreSupportWebInspectorClientcpp">branches/safari-537.75-branch/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>branches/safari-537.75-branch/Source/WebInspectorUI/WebInspectorUI.vcxproj/</li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branchessafari53775branch">branches/safari-537.75-branch/</a></li>
<li><a href="#branchessafari53775branchSourceWebKit">branches/safari-537.75-branch/Source/WebKit/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53775branch"></a>
<div class="propset"><h4>Property changes: branches/safari-537.75-branch</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk:53455,153629,154395,154470,155471,157607
</span><a id="branchessafari53775branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/ChangeLog (163391 => 163392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-02-04 19:09:52 UTC (rev 163391)
+++ branches/safari-537.75-branch/Source/WebCore/ChangeLog 2014-02-04 19:10:25 UTC (rev 163392)
</span><span class="lines">@@ -1,3 +1,9 @@
</span><ins>+2014-02-04 Brent Fulgham <bfulgham@apple.com>
+
+ Build fix after last branch merge.
+
+ * WebCore.vcxproj/WebCore.vcxproj: Correct bad merge of media build steps.
+
</ins><span class="cx"> 2014-02-03 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix after r162860.
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebCoreWebCorevcxprojWebCorevcxproj"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj (163391 => 163392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-02-04 19:09:52 UTC (rev 163391)
+++ branches/safari-537.75-branch/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj 2014-02-04 19:10:25 UTC (rev 163392)
</span><span class="lines">@@ -8833,12 +8833,18 @@
</span><span class="cx"> <ClCompile Include="..\css\FontValue.cpp" />
</span><span class="cx"> <ClCompile Include="..\css\LengthFunctions.cpp" />
</span><span class="cx"> <ClCompile Include="..\css\MediaAllInOne.cpp">
</span><del>- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
- <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
</del><ins>+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">false</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\css\MediaFeatureNames.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -8847,6 +8853,12 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><ins>+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\css\MediaList.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -8855,6 +8867,12 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><ins>+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\css\MediaQuery.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -8863,6 +8881,12 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><ins>+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\css\MediaQueryEvaluator.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -8871,6 +8895,12 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><ins>+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\css\MediaQueryExp.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -8879,6 +8909,12 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><ins>+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\css\MediaQueryList.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -8887,6 +8923,12 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><ins>+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\css\MediaQueryMatcher.cpp">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
</span><span class="lines">@@ -8895,6 +8937,12 @@
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
</span><ins>+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
</ins><span class="cx"> </ClCompile>
</span><span class="cx"> <ClCompile Include="..\css\PropertySetCSSStyleDeclaration.cpp" />
</span><span class="cx"> <ClCompile Include="..\css\RGBColor.cpp" />
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebInspectorUIChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebInspectorUI/ChangeLog (163391 => 163392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebInspectorUI/ChangeLog 2014-02-04 19:09:52 UTC (rev 163391)
+++ branches/safari-537.75-branch/Source/WebInspectorUI/ChangeLog 2014-02-04 19:10:25 UTC (rev 163392)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-02-04 Brent Fulgham <bfulgham@apple.com>
+
+ Merge r154395.
+
+ 2013-08-20 Brent Fulgham <bfulgham@apple.com>
+
+ <http://webkit.org/b/120098> [Windows] Enable the New Web Inspector
+
+ Reviewed by Brian Weinstein.
+
+ Add a new project to copy files to the appropriate spots in the
+ Windows port.
+
+ * WebInspectorUI.vcxproj: Added.
+ * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj: Added.
+ * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters: Added.
+ * WebInspectorUI.vcxproj/WebInspectorUIPostBuild.cmd: Added.
+ * WebInspectorUI.vcxproj/WebInspectorUIPreBuild.cmd: Added.
+
</ins><span class="cx"> 2013-11-08 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r157459
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebKit"></a>
<div class="propset"><h4>Property changes: branches/safari-537.75-branch/Source/WebKit</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /trunk/Source/WebKit:154395
</span><span class="cx">/trunk/WebKit:53455
</span><a id="branchessafari53775branchSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebKit/ChangeLog (163391 => 163392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebKit/ChangeLog 2014-02-04 19:09:52 UTC (rev 163391)
+++ branches/safari-537.75-branch/Source/WebKit/ChangeLog 2014-02-04 19:10:25 UTC (rev 163392)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-02-04 Brent Fulgham <bfulgham@apple.com>
+
+ Merge r154395.
+
+ 2013-08-20 Brent Fulgham <bfulgham@apple.com>
+
+ <https://webkit.org/b/120098> [Windows] Enable the new Web Inspector
+
+ Reviewed by Brian Weinstein.
+
+ * WebKit.vcxproj/WebKit.sln: Add reference to the new WebInspectorUI
+ project so that it will be included in new distributions.
+
</ins><span class="cx"> 2014-01-23 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build correction.
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebKitWebKitvcxprojWebKitsln"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKit.sln (163391 => 163392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKit.sln 2014-02-04 19:09:52 UTC (rev 163391)
+++ branches/safari-537.75-branch/Source/WebKit/WebKit.vcxproj/WebKit.sln 2014-02-04 19:10:25 UTC (rev 163392)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebKit", "WebKit\WebKit.vcxproj", "{0662A8A9-82A3-4638-97D8-EC425D8D87C9}"
</span><span class="cx"> ProjectSection(ProjectDependencies) = postProject
</span><span class="cx"> {0F837117-8C0B-4596-A373-A37E14A01223} = {0F837117-8C0B-4596-A373-A37E14A01223}
</span><ins>+ {0473724F-0AB3-4F12-892E-9FAB0186C804} = {0473724F-0AB3-4F12-892E-9FAB0186C804}
</ins><span class="cx"> EndProjectSection
</span><span class="cx"> EndProject
</span><span class="cx"> Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testRegExp", "..\..\JavaScriptCore\JavaScriptCore.vcxproj\testRegExp\testRegExp.vcxproj", "{BB16286B-AADC-46C1-BC0D-6C06F323E04B}"
</span><span class="lines">@@ -161,6 +162,8 @@
</span><span class="cx"> {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D} = {AF94D13A-36C1-45FF-9B0B-EB5D3FF6F43D}
</span><span class="cx"> EndProjectSection
</span><span class="cx"> EndProject
</span><ins>+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebInspectorUI", "..\..\WebInspectorUI\WebInspectorUI.vcxproj\WebInspectorUI.vcxproj", "{0473724F-0AB3-4F12-892E-9FAB0186C804}"
+EndProject
</ins><span class="cx"> Global
</span><span class="cx"> GlobalSection(SolutionConfigurationPlatforms) = preSolution
</span><span class="cx"> Debug_WinCairo|Win32 = Debug_WinCairo|Win32
</span><span class="lines">@@ -753,6 +756,21 @@
</span><span class="cx"> {67A61940-F80B-42A0-A29D-B6DB1C27BCEE}.Release|Win32.Build.0 = Release|Win32
</span><span class="cx"> {67A61940-F80B-42A0-A29D-B6DB1C27BCEE}.Release|x64.ActiveCfg = Release|x64
</span><span class="cx"> {67A61940-F80B-42A0-A29D-B6DB1C27BCEE}.Release|x64.Build.0 = Release|x64
</span><ins>+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug_WinCairo|Win32.ActiveCfg = Debug_WinCairo|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug_WinCairo|Win32.Build.0 = Debug_WinCairo|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug_WinCairo|x64.ActiveCfg = Debug|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug|Win32.ActiveCfg = Debug|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug|Win32.Build.0 = Debug|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Debug|x64.ActiveCfg = Debug|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Production|Win32.ActiveCfg = Production|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Production|Win32.Build.0 = Production|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Production|x64.ActiveCfg = Release|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release_WinCairo|Win32.ActiveCfg = Release_WinCairo|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release_WinCairo|Win32.Build.0 = Release_WinCairo|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release_WinCairo|x64.ActiveCfg = Release|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release|Win32.ActiveCfg = Release|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release|Win32.Build.0 = Release|Win32
+ {0473724F-0AB3-4F12-892E-9FAB0186C804}.Release|x64.ActiveCfg = Release|Win32
</ins><span class="cx"> EndGlobalSection
</span><span class="cx"> GlobalSection(SolutionProperties) = preSolution
</span><span class="cx"> HideSolutionNode = FALSE
</span><span class="lines">@@ -776,6 +794,7 @@
</span><span class="cx"> {0662A8A9-82A3-4638-97D8-EC425D8D87C9} = {39286F46-BA75-4997-8065-1909090A60F0}
</span><span class="cx"> {0F837117-8C0B-4596-A373-A37E14A01223} = {39286F46-BA75-4997-8065-1909090A60F0}
</span><span class="cx"> {A15EDAD8-8B87-4D4A-8498-77A04AB65F16} = {39286F46-BA75-4997-8065-1909090A60F0}
</span><ins>+ {0473724F-0AB3-4F12-892E-9FAB0186C804} = {39286F46-BA75-4997-8065-1909090A60F0}
</ins><span class="cx"> {20A8616C-E56B-4649-A910-8E97751DE145} = {6993F96C-409A-4FDC-A0BA-B40D5060B07C}
</span><span class="cx"> {3D4C8B23-9375-4A7C-869C-7CC262C42F9F} = {6993F96C-409A-4FDC-A0BA-B40D5060B07C}
</span><span class="cx"> {68A7C287-F9C4-4A31-9B49-995E64CAC100} = {6993F96C-409A-4FDC-A0BA-B40D5060B07C}
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebKit/win/ChangeLog (163391 => 163392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebKit/win/ChangeLog 2014-02-04 19:09:52 UTC (rev 163391)
+++ branches/safari-537.75-branch/Source/WebKit/win/ChangeLog 2014-02-04 19:10:25 UTC (rev 163392)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-02-03 Brent Fulgham <bfulgham@apple.com>
+
+ Merge r154394
+
+ 2013-08-20 Brent Fulgham <bfulgham@apple.com>
+
+ <https://webkit.org/b/120098> [Windows] Enable the New Web Inspector
+
+ Reviewed by Brian Weinstein.
+
+ * WebCoreSupport/WebInspectorClient.cpp:
+ (WebInspectorClient::openInspectorFrontend): Use the new inspector
+ if present in the WebKit distribution.
+ (WebInspectorFrontendClient::localizedStringsURL): Use the new
+ Web Inspector's localized strings (if present).
+
</ins><span class="cx"> 2013-12-23 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Update copyright strings.
</span></span></pre></div>
<a id="branchessafari53775branchSourceWebKitwinWebCoreSupportWebInspectorClientcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.75-branch/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp (163391 => 163392)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.75-branch/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp 2014-02-04 19:09:52 UTC (rev 163391)
+++ branches/safari-537.75-branch/Source/WebKit/win/WebCoreSupport/WebInspectorClient.cpp 2014-02-04 19:10:25 UTC (rev 163392)
</span><span class="lines">@@ -162,8 +162,10 @@
</span><span class="cx">
</span><span class="cx"> COMPtr<WebMutableURLRequest> request(AdoptCOM, WebMutableURLRequest::createInstance());
</span><span class="cx">
</span><del>- RetainPtr<CFURLRef> htmlURLRef = adoptCF(CFBundleCopyResourceURL(getWebKitBundle(), CFSTR("inspector"), CFSTR("html"), CFSTR("inspector")));
</del><ins>+ RetainPtr<CFURLRef> htmlURLRef = adoptCF(CFBundleCopyResourceURL(getWebKitBundle(), CFSTR("Main"), CFSTR("html"), CFSTR("WebInspectorUI")));
</ins><span class="cx"> if (!htmlURLRef)
</span><ins>+ htmlURLRef = adoptCF(CFBundleCopyResourceURL(getWebKitBundle(), CFSTR("inspector"), CFSTR("html"), CFSTR("inspector")));
+ if (!htmlURLRef)
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> CFStringRef urlStringRef = ::CFURLGetString(htmlURLRef.get());
</span><span class="lines">@@ -262,8 +264,11 @@
</span><span class="cx">
</span><span class="cx"> String WebInspectorFrontendClient::localizedStringsURL()
</span><span class="cx"> {
</span><del>- RetainPtr<CFURLRef> url = adoptCF(CFBundleCopyResourceURL(getWebKitBundle(), CFSTR("localizedStrings"), CFSTR("js"), 0));
</del><ins>+ RetainPtr<CFURLRef> url = adoptCF(CFBundleCopyResourceURL(getWebKitBundle(), CFSTR("localizedStrings"), CFSTR("js"), CFSTR("WebInspectorUI")));
</ins><span class="cx"> if (!url)
</span><ins>+ url = adoptCF(CFBundleCopyResourceURL(getWebKitBundle(), CFSTR("localizedStrings"), CFSTR("js"), 0));
+
+ if (!url)
</ins><span class="cx"> return String();
</span><span class="cx">
</span><span class="cx"> return CFURLGetString(url.get());
</span></span></pre>
</div>
</div>
</body>
</html>