<!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>[177512] 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/177512">177512</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-12-18 11:56:46 -0800 (Thu, 18 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Source/WebKit:
[Win] Correct Windows tests after Bug 139149.
https://bugs.webkit.org/show_bug.cgi?id=139781
Reviewed by Anders Carlsson.
* WebKit.vcxproj/Interfaces/Interfaces.vcxproj: Add new interface.
* WebKit.vcxproj/Interfaces/Interfaces.vcxproj.filters: Ditto.
* WebKit.vcxproj/WebKit/WebKit.vcxproj: Add new application cache object.
* WebKit.vcxproj/WebKit/WebKit.vcxproj.filters: Ditto.
Source/WebKit/win:
[Win] Correct Windows tests after Bug 139149.
https://bugs.webkit.org/show_bug.cgi?id=139781
Reviewed by Anders Carlsson.
* Interfaces/IWebApplicationCache.idl: Added.
* Interfaces/WebKit.idl: Add new IDL file.
* WebActionPropertyBag.cpp:
(WebActionPropertyBag::Read): Remove old debugging message.
* WebApplicationCache.cpp: Added.
(WebApplicationCache::WebApplicationCache):
(WebApplicationCache::~WebApplicationCache):
(WebApplicationCache::createInstance):
(WebApplicationCache::QueryInterface):
(WebApplicationCache::AddRef):
(WebApplicationCache::Release):
(WebApplicationCache::maximumSize):
(WebApplicationCache::setMaximumSize):
(WebApplicationCache::defaultOriginQuota):
(WebApplicationCache::setDefaultOriginQuota):
(WebApplicationCache::diskUsageForOrigin):
(WebApplicationCache::deleteAllApplicationCaches):
(WebApplicationCache::deleteCacheForOrigin):
(WebApplicationCache::originsWithCache):
* WebApplicationCache.h: Added.
* WebKitClassFactory.cpp: Add new interface header.
Tools:
[Win] Correct Windows tests after Bug 139149 (edit)
https://bugs.webkit.org/show_bug.cgi?id=139781
Reviewed by Anders Carlsson.
* DumpRenderTree/win/TestRunnerWin.cpp:
(TestRunner::clearAllApplicationCaches): Use new WebApplicationCache
interface.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojInterfacesInterfacesvcxproj">trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojInterfacesInterfacesvcxprojfilters">trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxproj">trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj</a></li>
<li><a href="#trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxprojfilters">trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinInterfacesWebKitidl">trunk/Source/WebKit/win/Interfaces/WebKit.idl</a></li>
<li><a href="#trunkSourceWebKitwinWebActionPropertyBagcpp">trunk/Source/WebKit/win/WebActionPropertyBag.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebKitClassFactorycpp">trunk/Source/WebKit/win/WebKitClassFactory.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreewinTestRunnerWincpp">trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitwinInterfacesIWebApplicationCacheidl">trunk/Source/WebKit/win/Interfaces/IWebApplicationCache.idl</a></li>
<li><a href="#trunkSourceWebKitwinWebApplicationCachecpp">trunk/Source/WebKit/win/WebApplicationCache.cpp</a></li>
<li><a href="#trunkSourceWebKitwinWebApplicationCacheh">trunk/Source/WebKit/win/WebApplicationCache.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (177511 => 177512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2014-12-18 19:52:03 UTC (rev 177511)
+++ trunk/Source/WebKit/ChangeLog 2014-12-18 19:56:46 UTC (rev 177512)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-12-18 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Correct Windows tests after Bug 139149.
+ https://bugs.webkit.org/show_bug.cgi?id=139781
+
+ Reviewed by Anders Carlsson.
+
+ * WebKit.vcxproj/Interfaces/Interfaces.vcxproj: Add new interface.
+ * WebKit.vcxproj/Interfaces/Interfaces.vcxproj.filters: Ditto.
+ * WebKit.vcxproj/WebKit/WebKit.vcxproj: Add new application cache object.
+ * WebKit.vcxproj/WebKit/WebKit.vcxproj.filters: Ditto.
+
</ins><span class="cx"> 2014-12-18 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Attempt to fix Windows build after Range::create() changes.
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojInterfacesInterfacesvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj (177511 => 177512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj 2014-12-18 19:52:03 UTC (rev 177511)
+++ trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj 2014-12-18 19:56:46 UTC (rev 177512)
</span><span class="lines">@@ -484,6 +484,16 @@
</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><span class="cx"> </Midl>
</span><ins>+ <Midl Include="..\..\win\Interfaces\IWebApplicationCache.idl">
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
+ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
+ </Midl>
</ins><span class="cx"> <Midl Include="..\..\win\Interfaces\IWebArchive.idl">
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
</span><span class="cx"> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojInterfacesInterfacesvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj.filters (177511 => 177512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj.filters 2014-12-18 19:52:03 UTC (rev 177511)
+++ trunk/Source/WebKit/WebKit.vcxproj/Interfaces/Interfaces.vcxproj.filters 2014-12-18 19:56:46 UTC (rev 177512)
</span><span class="lines">@@ -277,6 +277,9 @@
</span><span class="cx"> <Midl Include="..\..\win\Interfaces\Accessible2\AccessibleEditableText.idl">
</span><span class="cx"> <Filter>IDL\Accessibility2</Filter>
</span><span class="cx"> </Midl>
</span><ins>+ <Midl Include="..\..\win\Interfaces\IWebApplicationCache.idl">
+ <Filter>IDL</Filter>
+ </Midl>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <None Include="InterfacesPostBuild.cmd" />
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj (177511 => 177512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj 2014-12-18 19:52:03 UTC (rev 177511)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj 2014-12-18 19:56:46 UTC (rev 177512)
</span><span class="lines">@@ -303,6 +303,7 @@
</span><span class="cx"> <ClCompile Include="..\..\win\MarshallingHelpers.cpp" />
</span><span class="cx"> <ClCompile Include="..\..\win\MemoryStream.cpp" />
</span><span class="cx"> <ClCompile Include="..\..\win\WebActionPropertyBag.cpp" />
</span><ins>+ <ClCompile Include="..\..\win\WebApplicationCache.cpp" />
</ins><span class="cx"> <ClCompile Include="..\..\win\WebArchive.cpp" />
</span><span class="cx"> <ClCompile Include="..\..\win\WebBackForwardList.cpp" />
</span><span class="cx"> <ClCompile Include="..\..\win\WebCache.cpp" />
</span><span class="lines">@@ -441,6 +442,7 @@
</span><span class="cx"> <ClInclude Include="..\..\win\MemoryStream.h" />
</span><span class="cx"> <ClInclude Include="..\..\win\ProgIDMacros.h" />
</span><span class="cx"> <ClInclude Include="..\..\win\WebActionPropertyBag.h" />
</span><ins>+ <ClInclude Include="..\..\win\WebApplicationCache.h" />
</ins><span class="cx"> <ClInclude Include="..\..\win\WebArchive.h" />
</span><span class="cx"> <ClInclude Include="..\..\win\WebBackForwardList.h" />
</span><span class="cx"> <ClInclude Include="..\..\win\WebCache.h" />
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitvcxprojWebKitWebKitvcxprojfilters"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters (177511 => 177512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters 2014-12-18 19:52:03 UTC (rev 177511)
+++ trunk/Source/WebKit/WebKit.vcxproj/WebKit/WebKit.vcxproj.filters 2014-12-18 19:56:46 UTC (rev 177512)
</span><span class="lines">@@ -272,6 +272,10 @@
</span><span class="cx"> <ClCompile Include="..\..\win\WebCoreSupport\AcceleratedCompositingContext.cpp">
</span><span class="cx"> <Filter>WebCoreSupport</Filter>
</span><span class="cx"> </ClCompile>
</span><ins>+ <ClCompile Include="..\..\win\WebCoreSupport\WebVisitedLinkStore.cpp" />
+ <ClCompile Include="..\..\win\WebApplicationCache.cpp">
+ <Filter>Sources</Filter>
+ </ClCompile>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <ClInclude Include="..\..\win\WebCoreSupport\EmbeddedWidget.h">
</span><span class="lines">@@ -499,9 +503,6 @@
</span><span class="cx"> <ClInclude Include="..\..\win\WebSerializedJSValue.h">
</span><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><del>- <ClCompile Include="..\..\Storage\WebStorageNamespaceProvider.h">
- <Filter>Sources</Filter>
- </ClCompile>
</del><span class="cx"> <ClInclude Include="..\..\win\WebTextRenderer.h">
</span><span class="cx"> <Filter>Header Files</Filter>
</span><span class="cx"> </ClInclude>
</span><span class="lines">@@ -536,6 +537,15 @@
</span><span class="cx"> <ClInclude Include="..\..\win\WebCoreSupport\AcceleratedCompositingContext.h">
</span><span class="cx"> <Filter>WebCoreSupport</Filter>
</span><span class="cx"> </ClInclude>
</span><ins>+ <ClInclude Include="..\..\Storage\WebStorageNamespaceProvider.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\win\WebCoreSupport\WebVisitedLinkStore.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\win\WebApplicationCache.h">
+ <Filter>Sources</Filter>
+ </ClInclude>
</ins><span class="cx"> </ItemGroup>
</span><span class="cx"> <ItemGroup>
</span><span class="cx"> <None Include="WebKitPostBuild.cmd" />
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (177511 => 177512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-12-18 19:52:03 UTC (rev 177511)
+++ trunk/Source/WebKit/win/ChangeLog 2014-12-18 19:56:46 UTC (rev 177512)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2014-12-18 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Correct Windows tests after Bug 139149.
+ https://bugs.webkit.org/show_bug.cgi?id=139781
+
+ Reviewed by Anders Carlsson.
+
+ * Interfaces/IWebApplicationCache.idl: Added.
+ * Interfaces/WebKit.idl: Add new IDL file.
+ * WebActionPropertyBag.cpp:
+ (WebActionPropertyBag::Read): Remove old debugging message.
+ * WebApplicationCache.cpp: Added.
+ (WebApplicationCache::WebApplicationCache):
+ (WebApplicationCache::~WebApplicationCache):
+ (WebApplicationCache::createInstance):
+ (WebApplicationCache::QueryInterface):
+ (WebApplicationCache::AddRef):
+ (WebApplicationCache::Release):
+ (WebApplicationCache::maximumSize):
+ (WebApplicationCache::setMaximumSize):
+ (WebApplicationCache::defaultOriginQuota):
+ (WebApplicationCache::setDefaultOriginQuota):
+ (WebApplicationCache::diskUsageForOrigin):
+ (WebApplicationCache::deleteAllApplicationCaches):
+ (WebApplicationCache::deleteCacheForOrigin):
+ (WebApplicationCache::originsWithCache):
+ * WebApplicationCache.h: Added.
+ * WebKitClassFactory.cpp: Add new interface header.
+
</ins><span class="cx"> 2014-12-17 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Get rid of FrameLoader::defaultObjectContentType
</span></span></pre></div>
<a id="trunkSourceWebKitwinInterfacesIWebApplicationCacheidl"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit/win/Interfaces/IWebApplicationCache.idl (0 => 177512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Interfaces/IWebApplicationCache.idl (rev 0)
+++ trunk/Source/WebKit/win/Interfaces/IWebApplicationCache.idl 2014-12-18 19:56:46 UTC (rev 177512)
</span><span class="lines">@@ -0,0 +1,58 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef DO_NO_IMPORTS
+import "oaidl.idl";
+import "ocidl.idl";
+#endif
+
+interface IWebSecurityOrigin;
+
+#ifndef DO_NO_IMPORTS
+import "IWebSecurityOrigin.idl";
+#endif
+
+[
+ object,
+ oleautomation,
+ hidden,
+ uuid(D5762EBC-B712-4C99-BBF5-220FF4DC8DF5),
+ pointer_default(unique)
+]
+interface IWebApplicationCache : IUnknown
+{
+ HRESULT maximumSize([out, retval] long long*);
+ HRESULT setMaximumSize([in] long long);
+
+ HRESULT defaultOriginQuota([out, retval] long long*);
+ HRESULT setDefaultOriginQuota([in] long long);
+
+ HRESULT diskUsageForOrigin([in] IWebSecurityOrigin*, [out, retval] long long*);
+
+ HRESULT deleteAllApplicationCaches();
+ HRESULT deleteCacheForOrigin([in] IWebSecurityOrigin*);
+
+ HRESULT originsWithCache([out, retval] IPropertyBag**);
+}
</ins></span></pre></div>
<a id="trunkSourceWebKitwinInterfacesWebKitidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/Interfaces/WebKit.idl (177511 => 177512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/Interfaces/WebKit.idl 2014-12-18 19:52:03 UTC (rev 177511)
+++ trunk/Source/WebKit/win/Interfaces/WebKit.idl 2014-12-18 19:56:46 UTC (rev 177512)
</span><span class="lines">@@ -70,6 +70,7 @@
</span><span class="cx"> #include "DOMPrivate.idl"
</span><span class="cx"> #include "DOMRange.idl"
</span><span class="cx"> #include "DOMWindow.idl"
</span><ins>+#include "IWebApplicationCache.idl"
</ins><span class="cx"> #include "IWebArchive.idl"
</span><span class="cx"> #include "IWebBackForwardList.idl"
</span><span class="cx"> #include "IWebBackForwardListPrivate.idl"
</span><span class="lines">@@ -195,6 +196,11 @@
</span><span class="cx"> [default] interface IWebHistoryItem;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ [uuid(1119E970-4b13-4b9a-a049-41096104b689)]
+ coclass WebApplicationCache {
+ [default] interface IWebApplicationCache;
+ }
+
</ins><span class="cx"> [uuid(f71071fd-a51b-4b69-9eb6-44374405e80c)]
</span><span class="cx"> coclass WebCache {
</span><span class="cx"> [default] interface IWebCache;
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebActionPropertyBagcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebActionPropertyBag.cpp (177511 => 177512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebActionPropertyBag.cpp 2014-12-18 19:52:03 UTC (rev 177511)
+++ trunk/Source/WebKit/win/WebActionPropertyBag.cpp 2014-12-18 19:56:46 UTC (rev 177512)
</span><span class="lines">@@ -110,7 +110,6 @@
</span><span class="cx"> if (!pszPropName)
</span><span class="cx"> return E_POINTER;
</span><span class="cx">
</span><del>- WTFLogAlways("pVar Pointer Value: %p", pVar);
</del><span class="cx"> VariantClear(pVar);
</span><span class="cx">
</span><span class="cx"> if (isEqual(pszPropName, WebActionNavigationTypeKey)) {
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebApplicationCachecpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit/win/WebApplicationCache.cpp (0 => 177512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebApplicationCache.cpp (rev 0)
+++ trunk/Source/WebKit/win/WebApplicationCache.cpp 2014-12-18 19:56:46 UTC (rev 177512)
</span><span class="lines">@@ -0,0 +1,181 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "WebKitDLL.h"
+#include "WebApplicationCache.h"
+
+#include "CFDictionaryPropertyBag.h"
+#include "MarshallingHelpers.h"
+#include "WebSecurityOrigin.h"
+#include <wtf/RetainPtr.h>
+#include <WebCore/ApplicationCache.h>
+#include <WebCore/ApplicationCacheStorage.h>
+#include <WebCore/COMPtr.h>
+#include <WebCore/SecurityOrigin.h>
+#include <comutil.h>
+
+// WebApplicationCache ---------------------------------------------------------------------------
+
+WebApplicationCache::WebApplicationCache()
+ : m_refCount(0)
+{
+ gClassCount++;
+ gClassNameCount().add("WebApplicationCache");
+}
+
+WebApplicationCache::~WebApplicationCache()
+{
+ gClassCount--;
+ gClassNameCount().remove("WebApplicationCache");
+}
+
+WebApplicationCache* WebApplicationCache::createInstance()
+{
+ WebApplicationCache* instance = new WebApplicationCache();
+ instance->AddRef();
+ return instance;
+}
+
+// IUnknown -------------------------------------------------------------------
+
+HRESULT WebApplicationCache::QueryInterface(REFIID riid, void** ppvObject)
+{
+ *ppvObject = 0;
+ if (IsEqualGUID(riid, IID_IUnknown))
+ *ppvObject = static_cast<WebApplicationCache*>(this);
+ else if (IsEqualGUID(riid, IID_IWebApplicationCache))
+ *ppvObject = static_cast<WebApplicationCache*>(this);
+ else
+ return E_NOINTERFACE;
+
+ AddRef();
+ return S_OK;
+}
+
+ULONG WebApplicationCache::AddRef(void)
+{
+ return ++m_refCount;
+}
+
+ULONG WebApplicationCache::Release(void)
+{
+ ULONG newRef = --m_refCount;
+ if (!newRef)
+ delete(this);
+
+ return newRef;
+}
+
+// IWebApplicationCache ------------------------------------------------------------------------------
+
+HRESULT WebApplicationCache::maximumSize(long long* size)
+{
+ if (!size)
+ return E_POINTER;
+
+ *size = WebCore::cacheStorage().maximumSize();
+ return S_OK;
+}
+
+HRESULT WebApplicationCache::setMaximumSize(long long size)
+{
+ WebCore::cacheStorage().deleteAllEntries();
+ WebCore::cacheStorage().setMaximumSize(size);
+ return S_OK;
+}
+
+HRESULT WebApplicationCache::defaultOriginQuota(long long* quota)
+{
+ if (!quota)
+ return E_POINTER;
+
+ *quota = WebCore::cacheStorage().defaultOriginQuota();
+ return S_OK;
+}
+
+HRESULT WebApplicationCache::setDefaultOriginQuota(long long quota)
+{
+ WebCore::cacheStorage().setDefaultOriginQuota(quota);
+ return S_OK;
+}
+
+HRESULT WebApplicationCache::diskUsageForOrigin(IWebSecurityOrigin* origin, long long* size)
+{
+ if (!origin || !size)
+ return E_POINTER;
+
+ COMPtr<WebSecurityOrigin> webSecurityOrigin(Query, origin);
+ if (!webSecurityOrigin)
+ return E_FAIL;
+
+ *size = WebCore::ApplicationCache::diskUsageForOrigin(webSecurityOrigin->securityOrigin());
+ return S_OK;
+}
+
+HRESULT WebApplicationCache::deleteAllApplicationCaches()
+{
+ WebCore::ApplicationCache::deleteAllCaches();
+ return S_OK;
+}
+
+
+HRESULT WebApplicationCache::deleteCacheForOrigin(IWebSecurityOrigin* origin)
+{
+ if (!origin)
+ return E_POINTER;
+
+ COMPtr<WebSecurityOrigin> webSecurityOrigin(Query, origin);
+ if (!webSecurityOrigin)
+ return E_FAIL;
+
+ WebCore::ApplicationCache::deleteCacheForOrigin(webSecurityOrigin->securityOrigin());
+ return S_OK;
+}
+
+HRESULT WebApplicationCache::originsWithCache(IPropertyBag** origins)
+{
+ if (!origins)
+ return E_POINTER;
+
+ HashSet<RefPtr<WebCore::SecurityOrigin>> coreOrigins;
+ WebCore::cacheStorage().getOriginsWithCache(coreOrigins);
+
+ RetainPtr<CFMutableArrayRef> arrayItem = adoptCF(CFArrayCreateMutable(kCFAllocatorDefault, coreOrigins.size(), &MarshallingHelpers::kIUnknownArrayCallBacks));
+
+ for (auto it : coreOrigins)
+ CFArrayAppendValue(arrayItem.get(), reinterpret_cast<void*>(WebSecurityOrigin::createInstance(&(*it))));
+
+ RetainPtr<CFMutableDictionaryRef> dictionary = adoptCF(
+ CFDictionaryCreateMutable(0, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
+
+ RetainPtr<CFStringRef> key = adoptCF(MarshallingHelpers::BSTRToCFStringRef(_bstr_t(L"origins")));
+ CFDictionaryAddValue(dictionary.get(), key.get(), arrayItem.get());
+
+ COMPtr<CFDictionaryPropertyBag> result = CFDictionaryPropertyBag::createInstance();
+ result->setDictionary(dictionary.get());
+ *origins = result.leakRef();
+
+ return S_OK;
+}
</ins></span></pre></div>
<a id="trunkSourceWebKitwinWebApplicationCacheh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit/win/WebApplicationCache.h (0 => 177512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebApplicationCache.h (rev 0)
+++ trunk/Source/WebKit/win/WebApplicationCache.h 2014-12-18 19:56:46 UTC (rev 177512)
</span><span class="lines">@@ -0,0 +1,62 @@
</span><ins>+/*
+ * Copyright (C) 2014 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+ * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WebApplicationCache_h
+#define WebApplicationCache_h
+
+#include "WebKit.h"
+
+class WebApplicationCache : public IWebApplicationCache {
+public:
+ static WebApplicationCache* createInstance();
+protected:
+ WebApplicationCache();
+ ~WebApplicationCache();
+
+public:
+ // IUnknown
+ virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject);
+ virtual ULONG STDMETHODCALLTYPE AddRef(void);
+ virtual ULONG STDMETHODCALLTYPE Release(void);
+
+ // IWebApplicationCache
+ virtual HRESULT STDMETHODCALLTYPE maximumSize(/*[out, retval]*/ long long*);
+ virtual HRESULT STDMETHODCALLTYPE setMaximumSize(/*[in]*/ long long);
+
+ virtual HRESULT STDMETHODCALLTYPE defaultOriginQuota(/*[out, retval]*/ long long*);
+ virtual HRESULT STDMETHODCALLTYPE setDefaultOriginQuota(/*[in]*/ long long);
+
+ virtual HRESULT STDMETHODCALLTYPE diskUsageForOrigin(/*[in]*/ IWebSecurityOrigin*, /*[out, retval]*/ long long*);
+
+ virtual HRESULT STDMETHODCALLTYPE deleteAllApplicationCaches();
+ virtual HRESULT STDMETHODCALLTYPE deleteCacheForOrigin(/*[in]*/ IWebSecurityOrigin*);
+
+ virtual HRESULT STDMETHODCALLTYPE originsWithCache(/*[out, retval]*/ IPropertyBag**);
+
+protected:
+ ULONG m_refCount;
+};
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKitwinWebKitClassFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebKitClassFactory.cpp (177511 => 177512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebKitClassFactory.cpp 2014-12-18 19:52:03 UTC (rev 177511)
+++ trunk/Source/WebKit/win/WebKitClassFactory.cpp 2014-12-18 19:56:46 UTC (rev 177512)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006, 2007, 2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #include "CFDictionaryPropertyBag.h"
</span><span class="cx"> #include "ForEachCoClass.h"
</span><ins>+#include "WebApplicationCache.h"
</ins><span class="cx"> #include "WebArchive.h"
</span><span class="cx"> #include "WebCache.h"
</span><span class="cx"> #include "WebCoreStatistics.h"
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (177511 => 177512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-12-18 19:52:03 UTC (rev 177511)
+++ trunk/Tools/ChangeLog 2014-12-18 19:56:46 UTC (rev 177512)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-12-18 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] Correct Windows tests after Bug 139149 (edit)
+ https://bugs.webkit.org/show_bug.cgi?id=139781
+
+ Reviewed by Anders Carlsson.
+
+ * DumpRenderTree/win/TestRunnerWin.cpp:
+ (TestRunner::clearAllApplicationCaches): Use new WebApplicationCache
+ interface.
+
</ins><span class="cx"> 2014-12-18 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Remove the various aliases for --ios-simulator (--sim, --simulator, --ios-sim) in arguments for build and test scripts
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinTestRunnerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp (177511 => 177512)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2014-12-18 19:52:03 UTC (rev 177511)
+++ trunk/Tools/DumpRenderTree/win/TestRunnerWin.cpp 2014-12-18 19:56:46 UTC (rev 177512)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> /*
</span><del>- * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2012, 2013 Apple Inc. All rights reserved.
</del><ins>+ * Copyright (C) 2006-2014 Apple Inc. All rights reserved.
</ins><span class="cx"> *
</span><span class="cx"> * Redistribution and use in source and binary forms, with or without
</span><span class="cx"> * modification, are permitted provided that the following conditions
</span><span class="lines">@@ -750,7 +750,11 @@
</span><span class="cx">
</span><span class="cx"> void TestRunner::clearAllApplicationCaches()
</span><span class="cx"> {
</span><del>- // FIXME: Implement to support application cache quotas, and to make testing more reliable (see <https://bugs.webkit.org/show_bug.cgi?id=139149>).
</del><ins>+ COMPtr<IWebApplicationCache> applicationCache;
+ if (FAILED(WebKitCreateInstance(CLSID_WebApplicationCache, 0, IID_IWebApplicationCache, reinterpret_cast<void**>(&applicationCache))))
+ return;
+
+ applicationCache->deleteAllApplicationCaches();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void TestRunner::clearApplicationCacheForOrigin(JSStringRef origin)
</span></span></pre>
</div>
</div>
</body>
</html>