<!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>[70597] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/70597">70597</a></dd>
<dt>Author</dt> <dd>bfulgham@webkit.org</dd>
<dt>Date</dt> <dd>2010-10-26 18:41:34 -0700 (Tue, 26 Oct 2010)</dd>
</dl>

<h3>Log Message</h3>
<pre>WebCore: Unreviewed build fixes.

* WebCore.vcproj/WebCore.vcproj: Turn off several non-WinCairo
files.  We don't support CoreAnimation!
* WebCore.vcproj/WebCoreCairo.vsprops: Add missing include path
for 'image-decoders/webp'
* platform/network/curl/CookieJarCurl.cpp:
(WebCore::setCookieStoragePrivateBrowsingEnabled): Add build stub.

WebKit/win: Unreviewed build fix.

* WebView.cpp: Conditionalize includes for CFNetwork-specific
Cookie implementation.
* WebView.h: Conditionalize includes for ACCELERATED_COMPOSITION.
WinCairo doesn't use CoreAnimation.

WebKit2: Unreviewed build fix.

* WebProcess/WebCoreSupport/win/WebErrorsWin.cpp:
(WebKit::cancelledError): Conditionalize use of CFNetwork calls
and includes.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoreWebCorevcprojWebCorevcproj">trunk/WebCore/WebCore.vcproj/WebCore.vcproj</a></li>
<li><a href="#trunkWebCoreWebCorevcprojWebCoreCairovsprops">trunk/WebCore/WebCore.vcproj/WebCoreCairo.vsprops</a></li>
<li><a href="#trunkWebCoreplatformnetworkcurlCookieJarCurlcpp">trunk/WebCore/platform/network/curl/CookieJarCurl.cpp</a></li>
<li><a href="#trunkWebKitwinChangeLog">trunk/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkWebKitwinWebViewcpp">trunk/WebKit/win/WebView.cpp</a></li>
<li><a href="#trunkWebKitwinWebViewh">trunk/WebKit/win/WebView.h</a></li>
<li><a href="#trunkWebKit2ChangeLog">trunk/WebKit2/ChangeLog</a></li>
<li><a href="#trunkWebKit2WebProcessWebCoreSupportwinWebErrorsWincpp">trunk/WebKit2/WebProcess/WebCoreSupport/win/WebErrorsWin.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (70596 => 70597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2010-10-27 01:30:34 UTC (rev 70596)
+++ trunk/WebCore/ChangeLog        2010-10-27 01:41:34 UTC (rev 70597)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2010-10-26  Brent Fulgham  &lt;bfulgham@webkit.org&gt;
+
+        Unreviewed build fixes.
+
+        * WebCore.vcproj/WebCore.vcproj: Turn off several non-WinCairo
+        files.  We don't support CoreAnimation!
+        * WebCore.vcproj/WebCoreCairo.vsprops: Add missing include path
+        for 'image-decoders/webp'
+        * platform/network/curl/CookieJarCurl.cpp:
+        (WebCore::setCookieStoragePrivateBrowsingEnabled): Add build stub.
+
</ins><span class="cx"> 2010-10-26  Ryosuke Niwa  &lt;rniwa@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Kent Tamura.
</span></span></pre></div>
<a id="trunkWebCoreWebCorevcprojWebCorevcproj"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCore.vcproj/WebCore.vcproj (70596 => 70597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCore.vcproj/WebCore.vcproj        2010-10-27 01:30:34 UTC (rev 70596)
+++ trunk/WebCore/WebCore.vcproj/WebCore.vcproj        2010-10-27 01:41:34 UTC (rev 70597)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-&lt;?xml version=&quot;1.0&quot; encoding=&quot;windows-1251&quot;?&gt;
</del><ins>+&lt;?xml version=&quot;1.0&quot; encoding=&quot;Windows-1252&quot;?&gt;
</ins><span class="cx"> &lt;VisualStudioProject
</span><span class="cx">         ProjectType=&quot;Visual C++&quot;
</span><span class="cx">         Version=&quot;8.00&quot;
</span><span class="lines">@@ -180,6 +180,7 @@
</span><span class="cx">                 &lt;/Configuration&gt;
</span><span class="cx">                 &lt;Configuration
</span><span class="cx">                         Name=&quot;Debug_Cairo|Win32&quot;
</span><ins>+                        IntermediateDirectory=&quot;$(ConfigurationName)&quot;
</ins><span class="cx">                         ConfigurationType=&quot;4&quot;
</span><span class="cx">                         InheritedPropertySheets=&quot;$(WebKitLibrariesDir)\tools\vsprops\FeatureDefinesCairo.vsprops;$(WebKitLibrariesDir)\tools\vsprops\common.vsprops;$(WebKitLibrariesDir)\tools\vsprops\debug.vsprops;$(WebKitLibrariesDir)\tools\vsprops\WinCairo.vsprops;.\WebCoreCommon.vsprops;.\WebCoreCairo.vsprops;.\WebCoreCURL.vsprops&quot;
</span><span class="cx">                         CharacterSet=&quot;1&quot;
</span><span class="lines">@@ -25791,10 +25792,42 @@
</span><span class="cx">                                         &lt;File
</span><span class="cx">                                                 RelativePath=&quot;..\platform\graphics\win\GraphicsLayerCACF.cpp&quot;
</span><span class="cx">                                                 &gt;
</span><ins>+                                                &lt;FileConfiguration
+                                                        Name=&quot;Debug_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCLCompilerTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
+                                                &lt;FileConfiguration
+                                                        Name=&quot;Release_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCLCompilerTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
</ins><span class="cx">                                         &lt;/File&gt;
</span><span class="cx">                                         &lt;File
</span><span class="cx">                                                 RelativePath=&quot;..\platform\graphics\win\GraphicsLayerCACF.h&quot;
</span><span class="cx">                                                 &gt;
</span><ins>+                                                &lt;FileConfiguration
+                                                        Name=&quot;Debug_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCustomBuildTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
+                                                &lt;FileConfiguration
+                                                        Name=&quot;Release_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCustomBuildTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
</ins><span class="cx">                                         &lt;/File&gt;
</span><span class="cx">                                         &lt;File
</span><span class="cx">                                                 RelativePath=&quot;..\platform\graphics\win\IconWin.cpp&quot;
</span><span class="lines">@@ -25879,18 +25912,82 @@
</span><span class="cx">                                         &lt;File
</span><span class="cx">                                                 RelativePath=&quot;..\platform\graphics\win\MediaPlayerPrivateFullscreenWindow.cpp&quot;
</span><span class="cx">                                                 &gt;
</span><ins>+                                                &lt;FileConfiguration
+                                                        Name=&quot;Debug_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCLCompilerTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
+                                                &lt;FileConfiguration
+                                                        Name=&quot;Release_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCLCompilerTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
</ins><span class="cx">                                         &lt;/File&gt;
</span><span class="cx">                                         &lt;File
</span><span class="cx">                                                 RelativePath=&quot;..\platform\graphics\win\MediaPlayerPrivateFullscreenWindow.h&quot;
</span><span class="cx">                                                 &gt;
</span><ins>+                                                &lt;FileConfiguration
+                                                        Name=&quot;Debug_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCustomBuildTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
+                                                &lt;FileConfiguration
+                                                        Name=&quot;Release_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCustomBuildTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
</ins><span class="cx">                                         &lt;/File&gt;
</span><span class="cx">                                         &lt;File
</span><span class="cx">                                                 RelativePath=&quot;..\platform\graphics\win\MediaPlayerPrivateQuickTimeVisualContext.cpp&quot;
</span><span class="cx">                                                 &gt;
</span><ins>+                                                &lt;FileConfiguration
+                                                        Name=&quot;Debug_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCLCompilerTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
+                                                &lt;FileConfiguration
+                                                        Name=&quot;Release_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCLCompilerTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
</ins><span class="cx">                                         &lt;/File&gt;
</span><span class="cx">                                         &lt;File
</span><span class="cx">                                                 RelativePath=&quot;..\platform\graphics\win\MediaPlayerPrivateQuickTimeVisualContext.h&quot;
</span><span class="cx">                                                 &gt;
</span><ins>+                                                &lt;FileConfiguration
+                                                        Name=&quot;Debug_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCustomBuildTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
+                                                &lt;FileConfiguration
+                                                        Name=&quot;Release_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCustomBuildTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
</ins><span class="cx">                                         &lt;/File&gt;
</span><span class="cx">                                         &lt;File
</span><span class="cx">                                                 RelativePath=&quot;..\platform\graphics\win\MediaPlayerPrivateQuickTimeWin.cpp&quot;
</span><span class="lines">@@ -26027,50 +26124,242 @@
</span><span class="cx">                                         &lt;File
</span><span class="cx">                                                 RelativePath=&quot;..\platform\graphics\win\WebLayer.cpp&quot;
</span><span class="cx">                                                 &gt;
</span><ins>+                                                &lt;FileConfiguration
+                                                        Name=&quot;Debug_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCLCompilerTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
+                                                &lt;FileConfiguration
+                                                        Name=&quot;Release_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCLCompilerTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
</ins><span class="cx">                                         &lt;/File&gt;
</span><span class="cx">                                         &lt;File
</span><span class="cx">                                                 RelativePath=&quot;..\platform\graphics\win\WebLayer.h&quot;
</span><span class="cx">                                                 &gt;
</span><ins>+                                                &lt;FileConfiguration
+                                                        Name=&quot;Debug_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCustomBuildTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
+                                                &lt;FileConfiguration
+                                                        Name=&quot;Release_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCustomBuildTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
</ins><span class="cx">                                         &lt;/File&gt;
</span><span class="cx">                                         &lt;File
</span><span class="cx">                                                 RelativePath=&quot;..\platform\graphics\win\WebTiledLayer.cpp&quot;
</span><span class="cx">                                                 &gt;
</span><ins>+                                                &lt;FileConfiguration
+                                                        Name=&quot;Debug_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCLCompilerTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
+                                                &lt;FileConfiguration
+                                                        Name=&quot;Release_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCLCompilerTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
</ins><span class="cx">                                         &lt;/File&gt;
</span><span class="cx">                                         &lt;File
</span><span class="cx">                                                 RelativePath=&quot;..\platform\graphics\win\WebTiledLayer.h&quot;
</span><span class="cx">                                                 &gt;
</span><ins>+                                                &lt;FileConfiguration
+                                                        Name=&quot;Debug_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCustomBuildTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
+                                                &lt;FileConfiguration
+                                                        Name=&quot;Release_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCustomBuildTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
</ins><span class="cx">                                         &lt;/File&gt;
</span><span class="cx">                                         &lt;File
</span><span class="cx">                                                 RelativePath=&quot;..\platform\graphics\win\WKCACFContextFlusher.cpp&quot;
</span><span class="cx">                                                 &gt;
</span><ins>+                                                &lt;FileConfiguration
+                                                        Name=&quot;Debug_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCLCompilerTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
+                                                &lt;FileConfiguration
+                                                        Name=&quot;Release_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCLCompilerTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
</ins><span class="cx">                                         &lt;/File&gt;
</span><span class="cx">                                         &lt;File
</span><span class="cx">                                                 RelativePath=&quot;..\platform\graphics\win\WKCACFContextFlusher.h&quot;
</span><span class="cx">                                                 &gt;
</span><ins>+                                                &lt;FileConfiguration
+                                                        Name=&quot;Debug_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCustomBuildTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
+                                                &lt;FileConfiguration
+                                                        Name=&quot;Release_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCustomBuildTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
</ins><span class="cx">                                         &lt;/File&gt;
</span><span class="cx">                                         &lt;File
</span><span class="cx">                                                 RelativePath=&quot;..\platform\graphics\win\WKCACFLayer.cpp&quot;
</span><span class="cx">                                                 &gt;
</span><ins>+                                                &lt;FileConfiguration
+                                                        Name=&quot;Debug_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCLCompilerTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
+                                                &lt;FileConfiguration
+                                                        Name=&quot;Release_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCLCompilerTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
</ins><span class="cx">                                         &lt;/File&gt;
</span><span class="cx">                                         &lt;File
</span><span class="cx">                                                 RelativePath=&quot;..\platform\graphics\win\WKCACFLayer.h&quot;
</span><span class="cx">                                                 &gt;
</span><ins>+                                                &lt;FileConfiguration
+                                                        Name=&quot;Debug_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCustomBuildTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
+                                                &lt;FileConfiguration
+                                                        Name=&quot;Release_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCustomBuildTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
</ins><span class="cx">                                         &lt;/File&gt;
</span><span class="cx">                                         &lt;File
</span><span class="cx">                                                 RelativePath=&quot;..\platform\graphics\win\WKCACFLayerRenderer.cpp&quot;
</span><span class="cx">                                                 &gt;
</span><ins>+                                                &lt;FileConfiguration
+                                                        Name=&quot;Debug_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCLCompilerTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
+                                                &lt;FileConfiguration
+                                                        Name=&quot;Release_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCLCompilerTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
</ins><span class="cx">                                         &lt;/File&gt;
</span><span class="cx">                                         &lt;File
</span><span class="cx">                                                 RelativePath=&quot;..\platform\graphics\win\WKCACFLayerRenderer.h&quot;
</span><span class="cx">                                                 &gt;
</span><ins>+                                                &lt;FileConfiguration
+                                                        Name=&quot;Debug_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCustomBuildTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
+                                                &lt;FileConfiguration
+                                                        Name=&quot;Release_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCustomBuildTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
</ins><span class="cx">                                         &lt;/File&gt;
</span><span class="cx">                                         &lt;File
</span><span class="cx">                                                 RelativePath=&quot;..\platform\graphics\win\WKCAImageQueue.cpp&quot;
</span><span class="cx">                                                 &gt;
</span><ins>+                                                &lt;FileConfiguration
+                                                        Name=&quot;Debug_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCLCompilerTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
+                                                &lt;FileConfiguration
+                                                        Name=&quot;Release_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCLCompilerTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
</ins><span class="cx">                                         &lt;/File&gt;
</span><span class="cx">                                         &lt;File
</span><span class="cx">                                                 RelativePath=&quot;..\platform\graphics\win\WKCAImageQueue.h&quot;
</span><span class="cx">                                                 &gt;
</span><ins>+                                                &lt;FileConfiguration
+                                                        Name=&quot;Debug_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCustomBuildTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
+                                                &lt;FileConfiguration
+                                                        Name=&quot;Release_Cairo|Win32&quot;
+                                                        ExcludedFromBuild=&quot;true&quot;
+                                                        &gt;
+                                                        &lt;Tool
+                                                                Name=&quot;VCCustomBuildTool&quot;
+                                                        /&gt;
+                                                &lt;/FileConfiguration&gt;
</ins><span class="cx">                                         &lt;/File&gt;
</span><span class="cx">                                 &lt;/Filter&gt;
</span><span class="cx">                                 &lt;Filter
</span></span></pre></div>
<a id="trunkWebCoreWebCorevcprojWebCoreCairovsprops"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/WebCore.vcproj/WebCoreCairo.vsprops (70596 => 70597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/WebCore.vcproj/WebCoreCairo.vsprops        2010-10-27 01:30:34 UTC (rev 70596)
+++ trunk/WebCore/WebCore.vcproj/WebCoreCairo.vsprops        2010-10-27 01:41:34 UTC (rev 70597)
</span><span class="lines">@@ -6,6 +6,6 @@
</span><span class="cx">         &gt;
</span><span class="cx">         &lt;Tool
</span><span class="cx">                 Name=&quot;VCCLCompilerTool&quot;
</span><del>-                AdditionalIncludeDirectories=&quot;&amp;quot;$(ProjectDir)..\platform\graphics\cairo&amp;quot;;&amp;quot;$(ProjectDir)..\svg\graphics\cairo&amp;quot;;&amp;quot;$(ProjectDir)..\platform\image-decoders&amp;quot;;&amp;quot;$(ProjectDir)..\platform\image-decoders\bmp&amp;quot;;&amp;quot;$(ProjectDir)..\platform\image-decoders\gif&amp;quot;;&amp;quot;$(ProjectDir)..\platform\image-decoders\ico&amp;quot;;&amp;quot;$(ProjectDir)..\platform\image-decoders\jpeg&amp;quot;;&amp;quot;$(ProjectDir)..\platform\image-decoders\png&amp;quot;;&amp;quot;$(ProjectDir)..\platform\image-decoders\xbm&amp;quot;;&amp;quot;$(ProjectDir)..\platform\image-decoders\zlib&amp;quot;;&amp;quot;$(WebKitLibrariesDir)\include\cairo&amp;quot;&quot;
</del><ins>+                AdditionalIncludeDirectories=&quot;&amp;quot;$(ProjectDir)..\platform\graphics\cairo&amp;quot;;&amp;quot;$(ProjectDir)..\svg\graphics\cairo&amp;quot;;&amp;quot;$(ProjectDir)..\platform\image-decoders&amp;quot;;&amp;quot;$(ProjectDir)..\platform\image-decoders\bmp&amp;quot;;&amp;quot;$(ProjectDir)..\platform\image-decoders\cairo&amp;quot;;&amp;quot;$(ProjectDir)..\platform\image-decoders\gif&amp;quot;;&amp;quot;$(ProjectDir)..\platform\image-decoders\ico&amp;quot;;&amp;quot;$(ProjectDir)..\platform\image-decoders\jpeg&amp;quot;;&amp;quot;$(ProjectDir)..\platform\image-decoders\png&amp;quot;;&amp;quot;$(ProjectDir)..\platform\image-decoders\webp&amp;quot;;&amp;quot;$(WebKitLibrariesDir)\include\cairo&amp;quot;&quot;
</ins><span class="cx">         /&gt;
</span><span class="cx"> &lt;/VisualStudioPropertySheet&gt;
</span></span></pre></div>
<a id="trunkWebCoreplatformnetworkcurlCookieJarCurlcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/platform/network/curl/CookieJarCurl.cpp (70596 => 70597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/platform/network/curl/CookieJarCurl.cpp        2010-10-27 01:30:34 UTC (rev 70596)
+++ trunk/WebCore/platform/network/curl/CookieJarCurl.cpp        2010-10-27 01:41:34 UTC (rev 70597)
</span><span class="lines">@@ -61,4 +61,9 @@
</span><span class="cx">     // FIXME: Not yet implemented
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void setCookieStoragePrivateBrowsingEnabled(bool enabled)
+{
+    // FIXME: Not yet implemented
</ins><span class="cx"> }
</span><ins>+
+}
</ins></span></pre></div>
<a id="trunkWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/ChangeLog (70596 => 70597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/ChangeLog        2010-10-27 01:30:34 UTC (rev 70596)
+++ trunk/WebKit/win/ChangeLog        2010-10-27 01:41:34 UTC (rev 70597)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2010-10-26  Brent Fulgham  &lt;bfulgham@webkit.org&gt;
+
+        Unreviewed build fix.
+
+        * WebView.cpp: Conditionalize includes for CFNetwork-specific
+        Cookie implementation.
+        * WebView.h: Conditionalize includes for ACCELERATED_COMPOSITION.
+        WinCairo doesn't use CoreAnimation.
+
</ins><span class="cx"> 2010-10-26  Jenn Braithwaite  &lt;jennb@chromium.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Dmitry Titov.
</span></span></pre></div>
<a id="trunkWebKitwinWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/WebView.cpp (70596 => 70597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebView.cpp        2010-10-27 01:30:34 UTC (rev 70596)
+++ trunk/WebKit/win/WebView.cpp        2010-10-27 01:41:34 UTC (rev 70597)
</span><span class="lines">@@ -73,7 +73,6 @@
</span><span class="cx"> #include &lt;WebCore/Chrome.h&gt;
</span><span class="cx"> #include &lt;WebCore/ContextMenu.h&gt;
</span><span class="cx"> #include &lt;WebCore/ContextMenuController.h&gt;
</span><del>-#include &lt;WebCore/CookieStorageCFNet.h&gt;
</del><span class="cx"> #include &lt;WebCore/Cursor.h&gt;
</span><span class="cx"> #include &lt;WebCore/Document.h&gt;
</span><span class="cx"> #include &lt;WebCore/DragController.h&gt;
</span><span class="lines">@@ -148,6 +147,7 @@
</span><span class="cx"> #if USE(CFNETWORK)
</span><span class="cx"> #include &lt;CFNetwork/CFURLCachePriv.h&gt;
</span><span class="cx"> #include &lt;CFNetwork/CFURLProtocolPriv.h&gt;
</span><ins>+#include &lt;WebCore/CookieStorageCFNet.h&gt;
</ins><span class="cx"> #include &lt;WebKitSystemInterface/WebKitSystemInterface.h&gt; 
</span><span class="cx"> #endif
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebKitwinWebViewh"></a>
<div class="modfile"><h4>Modified: trunk/WebKit/win/WebView.h (70596 => 70597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit/win/WebView.h        2010-10-27 01:30:34 UTC (rev 70596)
+++ trunk/WebKit/win/WebView.h        2010-10-27 01:41:34 UTC (rev 70597)
</span><span class="lines">@@ -35,12 +35,15 @@
</span><span class="cx"> #include &lt;WebCore/RefCountedGDIHandle.h&gt;
</span><span class="cx"> #include &lt;WebCore/SuspendableTimer.h&gt;
</span><span class="cx"> #include &lt;WebCore/WindowMessageListener.h&gt;
</span><del>-#include &lt;WebCore/WKCACFLayer.h&gt;
-#include &lt;WebCore/WKCACFLayerRenderer.h&gt;
</del><span class="cx"> #include &lt;wtf/HashSet.h&gt;
</span><span class="cx"> #include &lt;wtf/OwnPtr.h&gt;
</span><span class="cx"> #include &lt;wtf/RefPtr.h&gt;
</span><span class="cx"> 
</span><ins>+#if USE(ACCELERATED_COMPOSITING)
+#include &lt;WebCore/WKCACFLayer.h&gt;
+#include &lt;WebCore/WKCACFLayerRenderer.h&gt;
+#endif
+
</ins><span class="cx"> class FullscreenVideoController;
</span><span class="cx"> class WebBackForwardList;
</span><span class="cx"> class WebFrame;
</span></span></pre></div>
<a id="trunkWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebKit2/ChangeLog (70596 => 70597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit2/ChangeLog        2010-10-27 01:30:34 UTC (rev 70596)
+++ trunk/WebKit2/ChangeLog        2010-10-27 01:41:34 UTC (rev 70597)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2010-10-26  Brent Fulgham  &lt;bfulgham@webkit.org&gt;
+
+        Unreviewed build fix.
+
+        * WebProcess/WebCoreSupport/win/WebErrorsWin.cpp:
+        (WebKit::cancelledError): Conditionalize use of CFNetwork calls
+        and includes.
+
</ins><span class="cx"> 2010-10-26  Alexey Proskuryakov  &lt;ap@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Build fix.
</span></span></pre></div>
<a id="trunkWebKit2WebProcessWebCoreSupportwinWebErrorsWincpp"></a>
<div class="modfile"><h4>Modified: trunk/WebKit2/WebProcess/WebCoreSupport/win/WebErrorsWin.cpp (70596 => 70597)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebKit2/WebProcess/WebCoreSupport/win/WebErrorsWin.cpp        2010-10-27 01:30:34 UTC (rev 70596)
+++ trunk/WebKit2/WebProcess/WebCoreSupport/win/WebErrorsWin.cpp        2010-10-27 01:41:34 UTC (rev 70597)
</span><span class="lines">@@ -27,17 +27,24 @@
</span><span class="cx"> 
</span><span class="cx"> #include &quot;WKError.h&quot;
</span><span class="cx"> #include &quot;WebError.h&quot;
</span><del>-#include &lt;CFNetwork/CFNetworkErrors.h&gt;
</del><span class="cx"> #include &lt;WebCore/ResourceRequest.h&gt;
</span><span class="cx"> #include &lt;WebCore/ResourceResponse.h&gt;
</span><span class="cx"> 
</span><ins>+#if USE(CFNETWORK)
+#include &lt;CFNetwork/CFNetworkErrors.h&gt;
+#endif
+
</ins><span class="cx"> using namespace WebCore;
</span><span class="cx"> 
</span><span class="cx"> namespace WebKit {
</span><span class="cx"> 
</span><span class="cx"> ResourceError cancelledError(const ResourceRequest&amp; request)
</span><span class="cx"> {
</span><ins>+#if USE(CFNETWORK)
</ins><span class="cx">     return ResourceError(kCFErrorDomainCFNetwork, kCFURLErrorCancelled, request.url().string(), String());
</span><ins>+#else
+    return ResourceError(); // FIXME
+#endif
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> ResourceError blockedError(const ResourceRequest&amp; request)
</span></span></pre>
</div>
</div>

</body>
</html>