<!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>[172790] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/172790">172790</a></dd>
<dt>Author</dt> <dd>psolanki@apple.com</dd>
<dt>Date</dt> <dd>2014-08-19 16:55:36 -0700 (Tue, 19 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove PurgeableBuffer since it is not very useful any more
https://bugs.webkit.org/show_bug.cgi?id=135939
Reviewed by Andreas Kling.
Source/WebCore:
The usefulness of having purgeable memory for cached resources has diminished now that
WebKit uses file backed resources when possible. Since this is read only memory, it is in
essence "purgeable". Having the PurgeableBuffer code adds additional complexity that we
don't need. e.g. on my Mac, I am not seeing any entry for "WebCore purgeable data" when I
run vmmap against the web processes that I have running. It is used on iOS, however even
there much of the purgeable memory we create gets replaced by file backed memory once we get
the notification from CFNetwork.
No new tests because no functional changes.
* WebCore.xcodeproj/project.pbxproj:
* inspector/InspectorPageAgent.cpp:
(WebCore::prepareCachedResourceBuffer):
* loader/DocumentLoader.cpp:
(WebCore::DocumentLoader::subresource):
* loader/ResourceBuffer.cpp:
(WebCore::ResourceBuffer::hasPurgeableBuffer): Deleted.
(WebCore::ResourceBuffer::setShouldUsePurgeableMemory): Deleted.
(WebCore::ResourceBuffer::createPurgeableBuffer): Deleted.
(WebCore::ResourceBuffer::releasePurgeableBuffer): Deleted.
* loader/ResourceBuffer.h:
* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::didFinishLoading):
* loader/cache/CachedCSSStyleSheet.cpp:
(WebCore::CachedCSSStyleSheet::sheetText):
(WebCore::CachedCSSStyleSheet::destroyDecodedData):
* loader/cache/CachedCSSStyleSheet.h:
* loader/cache/CachedImage.cpp:
(WebCore::CachedImage::image):
(WebCore::CachedImage::imageForRenderer):
(WebCore::CachedImage::imageSizeForRenderer):
(WebCore::CachedImage::destroyDecodedData):
(WebCore::CachedImage::canUseDiskImageCache):
* loader/cache/CachedImage.h:
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::addClientToSet):
(WebCore::CachedResource::isSafeToMakePurgeable): Deleted.
(WebCore::CachedResource::makePurgeable): Deleted.
(WebCore::CachedResource::isPurgeable): Deleted.
(WebCore::CachedResource::wasPurged): Deleted.
* loader/cache/CachedResource.h:
(WebCore::CachedResource::resourceBuffer):
(WebCore::CachedResource::purgePriority): Deleted.
* loader/cache/CachedScript.cpp:
(WebCore::CachedScript::script):
(WebCore::CachedScript::destroyDecodedData):
* loader/cache/CachedScript.h:
* loader/cache/MemoryCache.cpp:
(WebCore::MemoryCache::resourceForRequestImpl):
(WebCore::MemoryCache::pruneDeadResourcesToSize):
(WebCore::MemoryCache::evict):
(WebCore::MemoryCache::TypeStatistic::addResource):
(WebCore::MemoryCache::dumpStats):
(WebCore::MemoryCache::dumpLRULists):
(WebCore::MemoryCache::makeResourcePurgeable): Deleted.
* loader/cache/MemoryCache.h:
(WebCore::MemoryCache::TypeStatistic::TypeStatistic):
(WebCore::MemoryCache::shouldMakeResourcePurgeableOnEviction): Deleted.
* platform/PurgePriority.h: Removed.
* platform/PurgeableBuffer.h: Removed.
* platform/SharedBuffer.cpp:
(WebCore::SharedBuffer::SharedBuffer):
(WebCore::SharedBuffer::size):
(WebCore::SharedBuffer::data):
(WebCore::SharedBuffer::append):
(WebCore::SharedBuffer::clear):
(WebCore::SharedBuffer::copy):
(WebCore::SharedBuffer::getSomeData):
(WebCore::SharedBuffer::adoptPurgeableBuffer): Deleted.
(WebCore::SharedBuffer::createPurgeableBuffer): Deleted.
(WebCore::SharedBuffer::releasePurgeableBuffer): Deleted.
* platform/SharedBuffer.h:
(WebCore::SharedBuffer::hasPurgeableBuffer): Deleted.
(WebCore::SharedBuffer::shouldUsePurgeableMemory): Deleted.
* platform/cf/SharedBufferCF.cpp:
(WebCore::SharedBuffer::SharedBuffer):
* platform/mac/PurgeableBufferMac.cpp: Removed.
* platform/mac/SharedBufferMac.mm:
(WebCore::SharedBuffer::createCFData):
* platform/soup/SharedBufferSoup.cpp:
Source/WebKit/mac:
* Misc/WebCache.mm:
(+[WebCache statistics]):
Source/WebKit/win:
* WebCache.cpp:
(WebCache::statistics):
Source/WebKit2:
* WebProcess/WebProcess.cpp:
(WebKit::getWebCoreMemoryCacheStatistics):
Source/WTF:
* wtf/Platform.h: Remove ENABLE_PURGEABLE_MEMORY define.
* wtf/VMTags.h: Remove VM tags used by WebCore for cached resource purgeable memory.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfPlatformh">trunk/Source/WTF/wtf/Platform.h</a></li>
<li><a href="#trunkSourceWTFwtfVMTagsh">trunk/Source/WTF/wtf/VMTags.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorPageAgentcpp">trunk/Source/WebCore/inspector/InspectorPageAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentLoadercpp">trunk/Source/WebCore/loader/DocumentLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceBuffercpp">trunk/Source/WebCore/loader/ResourceBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceBufferh">trunk/Source/WebCore/loader/ResourceBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreloaderSubresourceLoadercpp">trunk/Source/WebCore/loader/SubresourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedCSSStyleSheetcpp">trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedCSSStyleSheeth">trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedImagecpp">trunk/Source/WebCore/loader/cache/CachedImage.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedImageh">trunk/Source/WebCore/loader/cache/CachedImage.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourcecpp">trunk/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceh">trunk/Source/WebCore/loader/cache/CachedResource.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedScriptcpp">trunk/Source/WebCore/loader/cache/CachedScript.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedScripth">trunk/Source/WebCore/loader/cache/CachedScript.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCachecpp">trunk/Source/WebCore/loader/cache/MemoryCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheMemoryCacheh">trunk/Source/WebCore/loader/cache/MemoryCache.h</a></li>
<li><a href="#trunkSourceWebCoreplatformSharedBuffercpp">trunk/Source/WebCore/platform/SharedBuffer.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformSharedBufferh">trunk/Source/WebCore/platform/SharedBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcfSharedBufferCFcpp">trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmacSharedBufferMacmm">trunk/Source/WebCore/platform/mac/SharedBufferMac.mm</a></li>
<li><a href="#trunkSourceWebCoreplatformsoupSharedBufferSoupcpp">trunk/Source/WebCore/platform/soup/SharedBufferSoup.cpp</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebCachemm">trunk/Source/WebKit/mac/Misc/WebCache.mm</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitwinWebCachecpp">trunk/Source/WebKit/win/WebCache.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebProcesscpp">trunk/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformPurgePriorityh">trunk/Source/WebCore/platform/PurgePriority.h</a></li>
<li><a href="#trunkSourceWebCoreplatformPurgeableBufferh">trunk/Source/WebCore/platform/PurgeableBuffer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmacPurgeableBufferMaccpp">trunk/Source/WebCore/platform/mac/PurgeableBufferMac.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WTF/ChangeLog 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-08-19 Pratik Solanki <psolanki@apple.com>
+
+ Remove PurgeableBuffer since it is not very useful any more
+ https://bugs.webkit.org/show_bug.cgi?id=135939
+
+ Reviewed by Andreas Kling.
+
+ * wtf/Platform.h: Remove ENABLE_PURGEABLE_MEMORY define.
+ * wtf/VMTags.h: Remove VM tags used by WebCore for cached resource purgeable memory.
+
</ins><span class="cx"> 2014-08-19 Magnus Granberg <zorry@gentoo.org>
</span><span class="cx">
</span><span class="cx"> TEXTREL in libjavascriptcoregtk-1.0.so.0.11.0 on x86 (or i586)
</span></span></pre></div>
<a id="trunkSourceWTFwtfPlatformh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/Platform.h (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/Platform.h 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WTF/wtf/Platform.h 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -490,10 +490,6 @@
</span><span class="cx">
</span><span class="cx"> #endif /* PLATFORM(MAC) */
</span><span class="cx">
</span><del>-#if OS(DARWIN) && !PLATFORM(GTK)
-#define ENABLE_PURGEABLE_MEMORY 1
-#endif
-
</del><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx">
</span><span class="cx"> #define DONT_FINALIZE_ON_MAIN_THREAD 1
</span></span></pre></div>
<a id="trunkSourceWTFwtfVMTagsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/VMTags.h (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/VMTags.h 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WTF/wtf/VMTags.h 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -56,19 +56,12 @@
</span><span class="cx"> #define VM_TAG_FOR_COLLECTOR_MEMORY VM_MAKE_TAG(63)
</span><span class="cx"> #endif // defined(VM_MEMORY_JAVASCRIPT_CORE)
</span><span class="cx">
</span><del>-#if defined(VM_MEMORY_WEBCORE_PURGEABLE_BUFFERS)
-#define VM_TAG_FOR_WEBCORE_PURGEABLE_MEMORY VM_MAKE_TAG(VM_MEMORY_WEBCORE_PURGEABLE_BUFFERS)
-#else
-#define VM_TAG_FOR_WEBCORE_PURGEABLE_MEMORY VM_MAKE_TAG(69)
-#endif // defined(VM_MEMORY_WEBCORE_PURGEABLE_BUFFERS)
-
</del><span class="cx"> #else // OS(DARWIN)
</span><span class="cx">
</span><span class="cx"> #define VM_TAG_FOR_TCMALLOC_MEMORY -1
</span><span class="cx"> #define VM_TAG_FOR_COLLECTOR_MEMORY -1
</span><span class="cx"> #define VM_TAG_FOR_EXECUTABLEALLOCATOR_MEMORY -1
</span><span class="cx"> #define VM_TAG_FOR_REGISTERFILE_MEMORY -1
</span><del>-#define VM_TAG_FOR_WEBCORE_PURGEABLE_MEMORY -1
</del><span class="cx">
</span><span class="cx"> #endif // OS(DARWIN)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/ChangeLog 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -1,3 +1,91 @@
</span><ins>+2014-08-19 Pratik Solanki <psolanki@apple.com>
+
+ Remove PurgeableBuffer since it is not very useful any more
+ https://bugs.webkit.org/show_bug.cgi?id=135939
+
+ Reviewed by Andreas Kling.
+
+ The usefulness of having purgeable memory for cached resources has diminished now that
+ WebKit uses file backed resources when possible. Since this is read only memory, it is in
+ essence "purgeable". Having the PurgeableBuffer code adds additional complexity that we
+ don't need. e.g. on my Mac, I am not seeing any entry for "WebCore purgeable data" when I
+ run vmmap against the web processes that I have running. It is used on iOS, however even
+ there much of the purgeable memory we create gets replaced by file backed memory once we get
+ the notification from CFNetwork.
+
+ No new tests because no functional changes.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::prepareCachedResourceBuffer):
+ * loader/DocumentLoader.cpp:
+ (WebCore::DocumentLoader::subresource):
+ * loader/ResourceBuffer.cpp:
+ (WebCore::ResourceBuffer::hasPurgeableBuffer): Deleted.
+ (WebCore::ResourceBuffer::setShouldUsePurgeableMemory): Deleted.
+ (WebCore::ResourceBuffer::createPurgeableBuffer): Deleted.
+ (WebCore::ResourceBuffer::releasePurgeableBuffer): Deleted.
+ * loader/ResourceBuffer.h:
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::didFinishLoading):
+ * loader/cache/CachedCSSStyleSheet.cpp:
+ (WebCore::CachedCSSStyleSheet::sheetText):
+ (WebCore::CachedCSSStyleSheet::destroyDecodedData):
+ * loader/cache/CachedCSSStyleSheet.h:
+ * loader/cache/CachedImage.cpp:
+ (WebCore::CachedImage::image):
+ (WebCore::CachedImage::imageForRenderer):
+ (WebCore::CachedImage::imageSizeForRenderer):
+ (WebCore::CachedImage::destroyDecodedData):
+ (WebCore::CachedImage::canUseDiskImageCache):
+ * loader/cache/CachedImage.h:
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::addClientToSet):
+ (WebCore::CachedResource::isSafeToMakePurgeable): Deleted.
+ (WebCore::CachedResource::makePurgeable): Deleted.
+ (WebCore::CachedResource::isPurgeable): Deleted.
+ (WebCore::CachedResource::wasPurged): Deleted.
+ * loader/cache/CachedResource.h:
+ (WebCore::CachedResource::resourceBuffer):
+ (WebCore::CachedResource::purgePriority): Deleted.
+ * loader/cache/CachedScript.cpp:
+ (WebCore::CachedScript::script):
+ (WebCore::CachedScript::destroyDecodedData):
+ * loader/cache/CachedScript.h:
+ * loader/cache/MemoryCache.cpp:
+ (WebCore::MemoryCache::resourceForRequestImpl):
+ (WebCore::MemoryCache::pruneDeadResourcesToSize):
+ (WebCore::MemoryCache::evict):
+ (WebCore::MemoryCache::TypeStatistic::addResource):
+ (WebCore::MemoryCache::dumpStats):
+ (WebCore::MemoryCache::dumpLRULists):
+ (WebCore::MemoryCache::makeResourcePurgeable): Deleted.
+ * loader/cache/MemoryCache.h:
+ (WebCore::MemoryCache::TypeStatistic::TypeStatistic):
+ (WebCore::MemoryCache::shouldMakeResourcePurgeableOnEviction): Deleted.
+ * platform/PurgePriority.h: Removed.
+ * platform/PurgeableBuffer.h: Removed.
+ * platform/SharedBuffer.cpp:
+ (WebCore::SharedBuffer::SharedBuffer):
+ (WebCore::SharedBuffer::size):
+ (WebCore::SharedBuffer::data):
+ (WebCore::SharedBuffer::append):
+ (WebCore::SharedBuffer::clear):
+ (WebCore::SharedBuffer::copy):
+ (WebCore::SharedBuffer::getSomeData):
+ (WebCore::SharedBuffer::adoptPurgeableBuffer): Deleted.
+ (WebCore::SharedBuffer::createPurgeableBuffer): Deleted.
+ (WebCore::SharedBuffer::releasePurgeableBuffer): Deleted.
+ * platform/SharedBuffer.h:
+ (WebCore::SharedBuffer::hasPurgeableBuffer): Deleted.
+ (WebCore::SharedBuffer::shouldUsePurgeableMemory): Deleted.
+ * platform/cf/SharedBufferCF.cpp:
+ (WebCore::SharedBuffer::SharedBuffer):
+ * platform/mac/PurgeableBufferMac.cpp: Removed.
+ * platform/mac/SharedBufferMac.mm:
+ (WebCore::SharedBuffer::createCFData):
+ * platform/soup/SharedBufferSoup.cpp:
+
</ins><span class="cx"> 2014-08-19 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE(SUBPIXEL_LAYOUT).
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -2431,7 +2431,6 @@
</span><span class="cx"> 7CE6CBFB187F370700D46BF5 /* FormatConverter.h in Headers */ = {isa = PBXBuildFile; fileRef = 7CE6CBFA187F370700D46BF5 /* FormatConverter.h */; };
</span><span class="cx"> 7CE6CBFD187F394900D46BF5 /* FormatConverter.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7CE6CBFC187F394900D46BF5 /* FormatConverter.cpp */; };
</span><span class="cx"> 7D741BDA177226AA00859170 /* CSSValueKeywords.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 6565814809D13043000E61D7 /* CSSValueKeywords.h */; };
</span><del>- 7E33CD01127F340D00BE8F17 /* PurgePriority.h in Headers */ = {isa = PBXBuildFile; fileRef = 7E33CD00127F340D00BE8F17 /* PurgePriority.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 7E37EF2E1339208800B29250 /* SubresourceLoaderCF.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E37EF2D1339208800B29250 /* SubresourceLoaderCF.cpp */; };
</span><span class="cx"> 7E428CE513E3407F003B661C /* ResourceHandleIOS.mm in Sources */ = {isa = PBXBuildFile; fileRef = 7E428CE413E3407F003B661C /* ResourceHandleIOS.mm */; };
</span><span class="cx"> 7E46F6FA1627A2CA00062223 /* JSOESElementIndexUint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7E46F6F81627A2C900062223 /* JSOESElementIndexUint.cpp */; };
</span><span class="lines">@@ -6189,8 +6188,6 @@
</span><span class="cx"> E4D58EB817B4ED8900CBDCA8 /* StyleFontSizeFunctions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4D58EB617B4ED8900CBDCA8 /* StyleFontSizeFunctions.cpp */; };
</span><span class="cx"> E4D58EB917B4ED8900CBDCA8 /* StyleFontSizeFunctions.h in Headers */ = {isa = PBXBuildFile; fileRef = E4D58EB717B4ED8900CBDCA8 /* StyleFontSizeFunctions.h */; };
</span><span class="cx"> E4D58EBB17B8F12800CBDCA8 /* ElementTraversal.h in Headers */ = {isa = PBXBuildFile; fileRef = E4D58EBA17B8F12800CBDCA8 /* ElementTraversal.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><del>- E4D687770ED7AE3D006EA978 /* PurgeableBufferMac.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4D687760ED7AE3D006EA978 /* PurgeableBufferMac.cpp */; };
- E4D687790ED7AE4F006EA978 /* PurgeableBuffer.h in Headers */ = {isa = PBXBuildFile; fileRef = E4D687780ED7AE4F006EA978 /* PurgeableBuffer.h */; };
</del><span class="cx"> E4D988B417BFD1F60084FB88 /* TextNodeTraversal.h in Headers */ = {isa = PBXBuildFile; fileRef = E4D988B317BFD1F60084FB88 /* TextNodeTraversal.h */; };
</span><span class="cx"> E4D988B617BFEB210084FB88 /* TextNodeTraversal.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4D988B517BFEB210084FB88 /* TextNodeTraversal.cpp */; };
</span><span class="cx"> E4DEAA1717A93DC3000E0430 /* StyleResolveTree.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4DEAA1517A93DC3000E0430 /* StyleResolveTree.cpp */; };
</span><span class="lines">@@ -9588,7 +9585,6 @@
</span><span class="cx"> 7CE683461921821500F4D928 /* UserMessageHandlerDescriptorTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserMessageHandlerDescriptorTypes.h; sourceTree = "<group>"; };
</span><span class="cx"> 7CE6CBFA187F370700D46BF5 /* FormatConverter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FormatConverter.h; sourceTree = "<group>"; };
</span><span class="cx"> 7CE6CBFC187F394900D46BF5 /* FormatConverter.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = FormatConverter.cpp; sourceTree = "<group>"; };
</span><del>- 7E33CD00127F340D00BE8F17 /* PurgePriority.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PurgePriority.h; sourceTree = "<group>"; };
</del><span class="cx"> 7E37EF2D1339208800B29250 /* SubresourceLoaderCF.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SubresourceLoaderCF.cpp; path = cf/SubresourceLoaderCF.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7E428CE413E3407F003B661C /* ResourceHandleIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ResourceHandleIOS.mm; sourceTree = "<group>"; };
</span><span class="cx"> 7E46F6F81627A2C900062223 /* JSOESElementIndexUint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSOESElementIndexUint.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -13710,8 +13706,6 @@
</span><span class="cx"> E4D58EB617B4ED8900CBDCA8 /* StyleFontSizeFunctions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleFontSizeFunctions.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E4D58EB717B4ED8900CBDCA8 /* StyleFontSizeFunctions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StyleFontSizeFunctions.h; sourceTree = "<group>"; };
</span><span class="cx"> E4D58EBA17B8F12800CBDCA8 /* ElementTraversal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ElementTraversal.h; sourceTree = "<group>"; };
</span><del>- E4D687760ED7AE3D006EA978 /* PurgeableBufferMac.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PurgeableBufferMac.cpp; sourceTree = "<group>"; };
- E4D687780ED7AE4F006EA978 /* PurgeableBuffer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PurgeableBuffer.h; sourceTree = "<group>"; };
</del><span class="cx"> E4D988B317BFD1F60084FB88 /* TextNodeTraversal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextNodeTraversal.h; sourceTree = "<group>"; };
</span><span class="cx"> E4D988B517BFEB210084FB88 /* TextNodeTraversal.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TextNodeTraversal.cpp; sourceTree = "<group>"; };
</span><span class="cx"> E4DEAA1517A93DC3000E0430 /* StyleResolveTree.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StyleResolveTree.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -16470,7 +16464,6 @@
</span><span class="cx"> BC94D1070C274F88006BC617 /* PlatformScreenMac.mm */,
</span><span class="cx"> 29E4D8E016B0959800C84704 /* PlatformSpeechSynthesizerMac.mm */,
</span><span class="cx"> 0081FEFE16B0A2B6008AAA7A /* PublicSuffixMac.mm */,
</span><del>- E4D687760ED7AE3D006EA978 /* PurgeableBufferMac.cpp */,
</del><span class="cx"> BCAE1FA512939DB7004CB026 /* ScrollAnimatorMac.h */,
</span><span class="cx"> BC51156D12B1749C00C96754 /* ScrollAnimatorMac.mm */,
</span><span class="cx"> BC8B853C0E7C7F1100AB6984 /* ScrollbarThemeMac.h */,
</span><span class="lines">@@ -21418,8 +21411,6 @@
</span><span class="cx"> ABC128760B33AA6D00C693D5 /* PopupMenuClient.h */,
</span><span class="cx"> BC3BE12A0E98092F00835588 /* PopupMenuStyle.h */,
</span><span class="cx"> 0081FEFD16B0A244008AAA7A /* PublicSuffix.h */,
</span><del>- E4D687780ED7AE4F006EA978 /* PurgeableBuffer.h */,
- 7E33CD00127F340D00BE8F17 /* PurgePriority.h */,
</del><span class="cx"> A72EA3BA1585CF55004FAA26 /* RefCountedSupplement.h */,
</span><span class="cx"> 9831AE49154225A200FE2644 /* ReferrerPolicy.h */,
</span><span class="cx"> 293EAE201356B32E0067ACF9 /* RuntimeApplicationChecks.cpp */,
</span><span class="lines">@@ -25601,8 +25592,6 @@
</span><span class="cx"> FF945ECC161F7F3600971BC8 /* PseudoElement.h in Headers */,
</span><span class="cx"> 0081FF0016B0A2D3008AAA7A /* PublicSuffix.h in Headers */,
</span><span class="cx"> 10FB084B14E15C7E00A3DB98 /* PublicURLManager.h in Headers */,
</span><del>- E4D687790ED7AE4F006EA978 /* PurgeableBuffer.h in Headers */,
- 7E33CD01127F340D00BE8F17 /* PurgePriority.h in Headers */,
</del><span class="cx"> 550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */,
</span><span class="cx"> 442AF7A9102CDDEA008FD4D3 /* QuickLook.h in Headers */,
</span><span class="cx"> 072AE1E8183C0741000A5988 /* QuickTimePluginReplacement.h in Headers */,
</span><span class="lines">@@ -29103,7 +29092,6 @@
</span><span class="cx"> FF945ECB161F7F3600971BC8 /* PseudoElement.cpp in Sources */,
</span><span class="cx"> 0081FEFF16B0A2B6008AAA7A /* PublicSuffixMac.mm in Sources */,
</span><span class="cx"> CDEE393717974259001D7580 /* PublicURLManager.cpp in Sources */,
</span><del>- E4D687770ED7AE3D006EA978 /* PurgeableBufferMac.cpp in Sources */,
</del><span class="cx"> 550A0BC9085F6039007353D6 /* QualifiedName.cpp in Sources */,
</span><span class="cx"> 442AF7AA102CDDEA008FD4D3 /* QuickLook.mm in Sources */,
</span><span class="cx"> 072AE1E6183C0741000A5988 /* QuickTimePluginReplacement.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorPageAgent.cpp (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/inspector/InspectorPageAgent.cpp 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -112,17 +112,6 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (cachedResource->isPurgeable()) {
- // If the resource is purgeable then make it unpurgeable to get
- // get its data. This might fail, in which case we return an
- // empty String.
- // FIXME: should we do something else in the case of a purged
- // resource that informs the user why there is no data in the
- // inspector?
- if (!cachedResource->makePurgeable(false))
- return false;
- }
-
</del><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentLoader.cpp (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/loader/DocumentLoader.cpp 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -1093,11 +1093,6 @@
</span><span class="cx"> if (resource->type() == CachedResource::MainResource)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- // FIXME: This has the side effect of making the resource non-purgeable.
- // It would be better if it didn't have this permanent effect.
- if (!resource->makePurgeable(false))
- return 0;
-
</del><span class="cx"> ResourceBuffer* data = resource->resourceBuffer();
</span><span class="cx"> if (!data)
</span><span class="cx"> return 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceBuffer.cpp (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceBuffer.cpp 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/loader/ResourceBuffer.cpp 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "ResourceBuffer.h"
</span><span class="cx">
</span><del>-#include "PurgeableBuffer.h"
</del><span class="cx"> #include "SharedBuffer.h"
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -113,30 +112,6 @@
</span><span class="cx"> return ResourceBuffer::adoptSharedBuffer(m_sharedBuffer->copy());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool ResourceBuffer::hasPurgeableBuffer() const
-{
- return m_sharedBuffer->hasPurgeableBuffer();
-}
-
-#if PLATFORM(IOS)
-void ResourceBuffer::setShouldUsePurgeableMemory(bool shouldUsePurgeableMemory)
-{
- ASSERT(m_sharedBuffer);
- sharedBuffer()->shouldUsePurgeableMemory(shouldUsePurgeableMemory);
-}
-#endif
-
-void ResourceBuffer::createPurgeableBuffer() const
-{
- ASSERT(m_sharedBuffer);
- sharedBuffer()->createPurgeableBuffer();
-}
-
-PassOwnPtr<PurgeableBuffer> ResourceBuffer::releasePurgeableBuffer()
-{
- return m_sharedBuffer->releasePurgeableBuffer();
-}
-
</del><span class="cx"> #if USE(CF)
</span><span class="cx"> RetainPtr<CFDataRef> ResourceBuffer::createCFData()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceBuffer.h (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceBuffer.h 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/loader/ResourceBuffer.h 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -38,7 +38,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class PurgeableBuffer;
</del><span class="cx"> class SharedBuffer;
</span><span class="cx">
</span><span class="cx"> class ResourceBuffer : public RefCounted<ResourceBuffer> {
</span><span class="lines">@@ -69,17 +68,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> PassRefPtr<ResourceBuffer> copy() const;
</span><span class="cx">
</span><del>- bool hasPurgeableBuffer() const;
- void createPurgeableBuffer() const;
-
-#if PLATFORM(IOS)
- // FIXME: Remove PLATFORM(IOS)-guard once we upstream the iOS changes to SharedBuffer.{cpp, h} and SharedBufferCF.cpp.
- void setShouldUsePurgeableMemory(bool);
-#endif
-
- // Ensure this buffer has no other clients before calling this.
- PassOwnPtr<PurgeableBuffer> releasePurgeableBuffer();
-
</del><span class="cx"> #if USE(FOUNDATION)
</span><span class="cx"> RetainPtr<NSData> createNSData();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubresourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -299,12 +299,8 @@
</span><span class="cx"> LOG(ResourceLoading, "Received '%s'.", m_resource->url().string().latin1().data());
</span><span class="cx">
</span><span class="cx"> Ref<SubresourceLoader> protect(*this);
</span><del>-
-#if PLATFORM(IOS)
- if (resourceData())
- resourceData()->setShouldUsePurgeableMemory(true);
-#endif
</del><span class="cx"> CachedResourceHandle<CachedResource> protectResource(m_resource);
</span><ins>+
</ins><span class="cx"> m_state = Finishing;
</span><span class="cx"> m_resource->setLoadFinishTime(finishTime);
</span><span class="cx"> m_resource->finishLoading(resourceData());
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedCSSStyleSheetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.cpp 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -80,8 +80,6 @@
</span><span class="cx">
</span><span class="cx"> const String CachedCSSStyleSheet::sheetText(bool enforceMIMEType, bool* hasValidMIMEType) const
</span><span class="cx"> {
</span><del>- ASSERT(!isPurgeable());
-
</del><span class="cx"> if (!m_data || m_data->isEmpty() || !canUseSheet(enforceMIMEType, hasValidMIMEType))
</span><span class="cx"> return String();
</span><span class="cx">
</span><span class="lines">@@ -148,9 +146,6 @@
</span><span class="cx"> m_parsedStyleSheetCache.clear();
</span><span class="cx">
</span><span class="cx"> setDecodedSize(0);
</span><del>-
- if (!MemoryCache::shouldMakeResourcePurgeableOnEviction() && isSafeToMakePurgeable())
- makePurgeable(true);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<StyleSheetContents> CachedCSSStyleSheet::restoreParsedStyleSheet(const CSSParserContext& context)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedCSSStyleSheeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/loader/cache/CachedCSSStyleSheet.h 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -48,7 +48,6 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> bool canUseSheet(bool enforceMIMEType, bool* hasValidMIMEType) const;
</span><del>- virtual PurgePriority purgePriority() const override { return PurgeLast; }
</del><span class="cx"> virtual bool mayTryReplaceEncodedData() const override { return true; }
</span><span class="cx">
</span><span class="cx"> virtual void didAddClient(CachedResourceClient*) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -192,8 +192,6 @@
</span><span class="cx">
</span><span class="cx"> Image* CachedImage::image()
</span><span class="cx"> {
</span><del>- ASSERT(!isPurgeable());
-
</del><span class="cx"> if (errorOccurred() && m_shouldPaintBrokenImage) {
</span><span class="cx"> // Returning the 1x broken image is non-ideal, but we cannot reliably access the appropriate
</span><span class="cx"> // deviceScaleFactor from here. It is critical that callers use CachedImage::brokenImage()
</span><span class="lines">@@ -209,8 +207,6 @@
</span><span class="cx">
</span><span class="cx"> Image* CachedImage::imageForRenderer(const RenderObject* renderer)
</span><span class="cx"> {
</span><del>- ASSERT(!isPurgeable());
-
</del><span class="cx"> if (errorOccurred() && m_shouldPaintBrokenImage) {
</span><span class="cx"> // Returning the 1x broken image is non-ideal, but we cannot reliably access the appropriate
</span><span class="cx"> // deviceScaleFactor from here. It is critical that callers use CachedImage::brokenImage()
</span><span class="lines">@@ -274,8 +270,6 @@
</span><span class="cx">
</span><span class="cx"> LayoutSize CachedImage::imageSizeForRenderer(const RenderObject* renderer, float multiplier, SizeType sizeType)
</span><span class="cx"> {
</span><del>- ASSERT(!isPurgeable());
-
</del><span class="cx"> if (!m_image)
</span><span class="cx"> return LayoutSize();
</span><span class="cx">
</span><span class="lines">@@ -462,13 +456,9 @@
</span><span class="cx"> void CachedImage::destroyDecodedData()
</span><span class="cx"> {
</span><span class="cx"> bool canDeleteImage = !m_image || (m_image->hasOneRef() && m_image->isBitmapImage());
</span><del>- if (isSafeToMakePurgeable() && canDeleteImage && !isLoading()) {
- // Image refs the data buffer so we should not make it purgeable while the image is alive.
- // Invoking addClient() will reconstruct the image object.
</del><ins>+ if (canDeleteImage && !isLoading()) {
</ins><span class="cx"> m_image = 0;
</span><span class="cx"> setDecodedSize(0);
</span><del>- if (!MemoryCache::shouldMakeResourcePurgeableOnEviction())
- makePurgeable(true);
</del><span class="cx"> } else if (m_image && !errorOccurred())
</span><span class="cx"> m_image->destroyDecodedData();
</span><span class="cx"> }
</span><span class="lines">@@ -524,9 +514,6 @@
</span><span class="cx"> if (!m_data)
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- if (isPurgeable())
- return false;
-
</del><span class="cx"> if (m_data->size() < diskImageCache().minimumImageSize())
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImage.h (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedImage.h 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/loader/cache/CachedImage.h 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -101,7 +101,6 @@
</span><span class="cx"> void clearImage();
</span><span class="cx"> // If not null, changeRect is the changed part of the image.
</span><span class="cx"> void notifyObservers(const IntRect* changeRect = 0);
</span><del>- virtual PurgePriority purgePriority() const override { return PurgeFirst; }
</del><span class="cx"> void checkShouldPaintBrokenImage();
</span><span class="cx">
</span><span class="cx"> virtual void switchClientsToRevalidatedResource() override;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -40,7 +40,6 @@
</span><span class="cx"> #include "Logging.h"
</span><span class="cx"> #include "MemoryCache.h"
</span><span class="cx"> #include "PlatformStrategies.h"
</span><del>-#include "PurgeableBuffer.h"
</del><span class="cx"> #include "ResourceBuffer.h"
</span><span class="cx"> #include "ResourceHandle.h"
</span><span class="cx"> #include "ResourceLoadScheduler.h"
</span><span class="lines">@@ -466,8 +465,6 @@
</span><span class="cx">
</span><span class="cx"> bool CachedResource::addClientToSet(CachedResourceClient* client)
</span><span class="cx"> {
</span><del>- ASSERT(!isPurgeable());
-
</del><span class="cx"> if (m_preloadResult == PreloadNotReferenced) {
</span><span class="cx"> if (isLoaded())
</span><span class="cx"> m_preloadResult = PreloadReferencedWhileComplete;
</span><span class="lines">@@ -786,64 +783,6 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool CachedResource::isSafeToMakePurgeable() const
-{
-#if ENABLE(DISK_IMAGE_CACHE)
- // It does not make sense to have a resource in the disk image cache
- // (memory mapped on disk) and purgeable (in memory). So do not allow
- // disk image cached resources to be purgeable.
- if (isUsingDiskImageCache())
- return false;
-#endif
-
- return !hasClients() && !m_proxyResource && !m_resourceToRevalidate;
-}
-
-bool CachedResource::makePurgeable(bool purgeable)
-{
- if (purgeable) {
- ASSERT(isSafeToMakePurgeable());
-
- if (m_purgeableData) {
- ASSERT(!m_data);
- return true;
- }
- if (!m_data)
- return false;
-
- m_data->createPurgeableBuffer();
- if (!m_data->hasPurgeableBuffer())
- return false;
-
- m_purgeableData = m_data->releasePurgeableBuffer();
- m_purgeableData->setPurgePriority(purgePriority());
- m_purgeableData->makePurgeable(true);
- m_data.clear();
- return true;
- }
-
- if (!m_purgeableData)
- return true;
- ASSERT(!m_data);
- ASSERT(!hasClients());
-
- if (!m_purgeableData->makePurgeable(false))
- return false;
-
- m_data = ResourceBuffer::adoptSharedBuffer(SharedBuffer::adoptPurgeableBuffer(m_purgeableData.release()));
- return true;
-}
-
-bool CachedResource::isPurgeable() const
-{
- return m_purgeableData && m_purgeableData->isPurgeable();
-}
-
-bool CachedResource::wasPurged() const
-{
- return m_purgeableData && m_purgeableData->wasPurged();
-}
-
</del><span class="cx"> unsigned CachedResource::overheadSize() const
</span><span class="cx"> {
</span><span class="cx"> static const int kAverageClientsHashMapSize = 384;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.h 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx">
</span><span class="cx"> #include "CachePolicy.h"
</span><span class="cx"> #include "FrameLoaderTypes.h"
</span><del>-#include "PurgePriority.h"
</del><span class="cx"> #include "ResourceError.h"
</span><span class="cx"> #include "ResourceLoadPriority.h"
</span><span class="cx"> #include "ResourceLoaderOptions.h"
</span><span class="lines">@@ -47,7 +46,6 @@
</span><span class="cx"> class CachedResourceHandleBase;
</span><span class="cx"> class CachedResourceLoader;
</span><span class="cx"> class InspectorResource;
</span><del>-class PurgeableBuffer;
</del><span class="cx"> class ResourceBuffer;
</span><span class="cx"> class SecurityOrigin;
</span><span class="cx"> class SharedBuffer;
</span><span class="lines">@@ -188,7 +186,7 @@
</span><span class="cx">
</span><span class="cx"> void clearLoader();
</span><span class="cx">
</span><del>- ResourceBuffer* resourceBuffer() const { ASSERT(!m_purgeableData); return m_data.get(); }
</del><ins>+ ResourceBuffer* resourceBuffer() const { return m_data.get(); }
</ins><span class="cx">
</span><span class="cx"> virtual void willSendRequest(ResourceRequest&, const ResourceResponse&) { m_requestedFromNetworkingLayer = true; }
</span><span class="cx"> virtual void responseReceived(const ResourceResponse&);
</span><span class="lines">@@ -231,14 +229,6 @@
</span><span class="cx"> bool isCacheValidator() const { return m_resourceToRevalidate; }
</span><span class="cx"> CachedResource* resourceToRevalidate() const { return m_resourceToRevalidate; }
</span><span class="cx">
</span><del>- bool isPurgeable() const;
- bool wasPurged() const;
-
- // This is used by the archive machinery to get at a purged resource without
- // triggering a load. We should make it protected again if we can find a
- // better way to handle the archive case.
- bool makePurgeable(bool purgeable);
-
</del><span class="cx"> // HTTP revalidation support methods for CachedResourceLoader.
</span><span class="cx"> void setResourceToRevalidate(CachedResource*);
</span><span class="cx"> virtual void switchClientsToRevalidatedResource();
</span><span class="lines">@@ -273,8 +263,6 @@
</span><span class="cx"> void setDecodedSize(unsigned);
</span><span class="cx"> void didAccessDecodedData(double timeStamp);
</span><span class="cx">
</span><del>- bool isSafeToMakePurgeable() const;
-
</del><span class="cx"> HashCountedSet<CachedResourceClient*> m_clients;
</span><span class="cx">
</span><span class="cx"> class CachedResourceCallback {
</span><span class="lines">@@ -302,7 +290,6 @@
</span><span class="cx"> double m_responseTimestamp;
</span><span class="cx">
</span><span class="cx"> RefPtr<ResourceBuffer> m_data;
</span><del>- OwnPtr<PurgeableBuffer> m_purgeableData;
</del><span class="cx"> DeferrableOneShotTimer m_decodedDataDeletionTimer;
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -310,7 +297,6 @@
</span><span class="cx">
</span><span class="cx"> void decodedDataDeletionTimerFired();
</span><span class="cx">
</span><del>- virtual PurgePriority purgePriority() const { return PurgeDefault; }
</del><span class="cx"> virtual bool mayTryReplaceEncodedData() const { return false; }
</span><span class="cx">
</span><span class="cx"> double currentAge() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedScriptcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedScript.cpp (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedScript.cpp 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/loader/cache/CachedScript.cpp 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -71,8 +71,6 @@
</span><span class="cx">
</span><span class="cx"> const String& CachedScript::script()
</span><span class="cx"> {
</span><del>- ASSERT(!isPurgeable());
-
</del><span class="cx"> if (!m_script && m_data) {
</span><span class="cx"> m_script = m_decoder->decodeAndFlush(m_data->data(), encodedSize());
</span><span class="cx"> setDecodedSize(m_script.sizeInBytes());
</span><span class="lines">@@ -93,8 +91,6 @@
</span><span class="cx"> {
</span><span class="cx"> m_script = String();
</span><span class="cx"> setDecodedSize(0);
</span><del>- if (!MemoryCache::shouldMakeResourcePurgeableOnEviction() && isSafeToMakePurgeable())
- makePurgeable(true);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(NOSNIFF)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedScripth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedScript.h (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedScript.h 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/loader/cache/CachedScript.h 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -47,7 +47,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- virtual PurgePriority purgePriority() const override { return PurgeLast; }
</del><span class="cx"> virtual bool mayTryReplaceEncodedData() const override { return true; }
</span><span class="cx">
</span><span class="cx"> virtual bool shouldIgnoreHTTPStatusCodeErrors() const override;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.cpp (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.cpp 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -212,15 +212,6 @@
</span><span class="cx"> #else
</span><span class="cx"> CachedResource* resource = resources.get(url);
</span><span class="cx"> #endif
</span><del>- bool wasPurgeable = MemoryCache::shouldMakeResourcePurgeableOnEviction() && resource && resource->isPurgeable();
- if (resource && !resource->makePurgeable(false)) {
- ASSERT(!resource->hasClients());
- evict(resource);
- return 0;
- }
- // Add the size back since we had subtracted it when we marked the memory as purgeable.
- if (wasPurgeable)
- adjustSize(resource->hasClients(), resource->size());
</del><span class="cx"> return resource;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -404,19 +395,6 @@
</span><span class="cx">
</span><span class="cx"> int size = m_allResources.size();
</span><span class="cx">
</span><del>- // See if we have any purged resources we can evict.
- for (int i = 0; i < size; i++) {
- CachedResource* current = m_allResources[i].m_tail;
- while (current) {
- CachedResource* prev = current->m_prevInAllResourcesList;
- if (current->wasPurged()) {
- ASSERT(!current->hasClients());
- ASSERT(!current->isPreloaded());
- evict(current);
- }
- current = prev;
- }
- }
</del><span class="cx"> if (targetSize && m_deadSize <= targetSize)
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="lines">@@ -452,9 +430,7 @@
</span><span class="cx"> CachedResourceHandle<CachedResource> previous = current->m_prevInAllResourcesList;
</span><span class="cx"> ASSERT(!previous || previous->inCache());
</span><span class="cx"> if (!current->hasClients() && !current->isPreloaded() && !current->isCacheValidator()) {
</span><del>- if (!makeResourcePurgeable(current))
- evict(current);
-
</del><ins>+ evict(current);
</ins><span class="cx"> if (targetSize && m_deadSize <= targetSize)
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -521,28 +497,6 @@
</span><span class="cx"> prune();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool MemoryCache::makeResourcePurgeable(CachedResource* resource)
-{
- if (!MemoryCache::shouldMakeResourcePurgeableOnEviction())
- return false;
-
- if (!resource->inCache())
- return false;
-
- if (resource->isPurgeable())
- return true;
-
- if (!resource->isSafeToMakePurgeable())
- return false;
-
- if (!resource->makePurgeable(true))
- return false;
-
- adjustSize(resource->hasClients(), -static_cast<int>(resource->size()));
-
- return true;
-}
-
</del><span class="cx"> void MemoryCache::evict(CachedResource* resource)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(WTF::isMainThread());
</span><span class="lines">@@ -567,12 +521,7 @@
</span><span class="cx"> // Remove from the appropriate LRU list.
</span><span class="cx"> removeFromLRUList(resource);
</span><span class="cx"> removeFromLiveDecodedResourcesList(resource);
</span><del>-
- // If the resource was purged, it means we had already decremented the size when we made the
- // resource purgeable in makeResourcePurgeable(). So adjust the size if we are evicting a
- // resource that was not marked as purgeable.
- if (!MemoryCache::shouldMakeResourcePurgeableOnEviction() || !resource->isPurgeable())
- adjustSize(resource->hasClients(), -static_cast<int>(resource->size()));
</del><ins>+ adjustSize(resource->hasClients(), -static_cast<int>(resource->size()));
</ins><span class="cx"> } else
</span><span class="cx"> #if ENABLE(CACHE_PARTITIONING)
</span><span class="cx"> ASSERT(!resources.get(resource->url()) || resources.get(resource->url())->get(resource->cachePartition()) != resource);
</span><span class="lines">@@ -892,15 +841,10 @@
</span><span class="cx">
</span><span class="cx"> void MemoryCache::TypeStatistic::addResource(CachedResource* o)
</span><span class="cx"> {
</span><del>- bool purged = o->wasPurged();
- bool purgeable = o->isPurgeable() && !purged;
- int pageSize = (o->encodedSize() + o->overheadSize() + 4095) & ~4095;
</del><span class="cx"> count++;
</span><del>- size += purged ? 0 : o->size();
</del><ins>+ size += o->size();
</ins><span class="cx"> liveSize += o->hasClients() ? o->size() : 0;
</span><span class="cx"> decodedSize += o->decodedSize();
</span><del>- purgeableSize += purgeable ? pageSize : 0;
- purgedSize += purged ? pageSize : 0;
</del><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><span class="cx"> // Only the data inside the resource was mapped, not the entire resource.
</span><span class="cx"> mappedSize += o->isUsingDiskImageCache() ? o->resourceBuffer()->sharedBuffer()->size() : 0;
</span><span class="lines">@@ -1001,29 +945,29 @@
</span><span class="cx"> {
</span><span class="cx"> Statistics s = getStatistics();
</span><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><del>- printf("%-13s %-13s %-13s %-13s %-13s %-13s %-13s %-13s %-13s\n", "", "Count", "Size", "LiveSize", "DecodedSize", "PurgeableSize", "PurgedSize", "Mapped", "\"Real\"");
- printf("%-13s %-13s %-13s %-13s %-13s %-13s %-13s %-13s %-13s\n", "-------------", "-------------", "-------------", "-------------", "-------------", "-------------", "-------------", "-------------", "-------------");
- printf("%-13s %13d %13d %13d %13d %13d %13d %13d %13d\n", "Images", s.images.count, s.images.size, s.images.liveSize, s.images.decodedSize, s.images.purgeableSize, s.images.purgedSize, s.images.mappedSize, s.images.size - s.images.mappedSize);
-#else
- printf("%-13s %-13s %-13s %-13s %-13s %-13s %-13s\n", "", "Count", "Size", "LiveSize", "DecodedSize", "PurgeableSize", "PurgedSize");
</del><ins>+ printf("%-13s %-13s %-13s %-13s %-13s %-13s %-13s\n", "", "Count", "Size", "LiveSize", "DecodedSize", "Mapped", "\"Real\"");
</ins><span class="cx"> printf("%-13s %-13s %-13s %-13s %-13s %-13s %-13s\n", "-------------", "-------------", "-------------", "-------------", "-------------", "-------------", "-------------");
</span><del>- printf("%-13s %13d %13d %13d %13d %13d %13d\n", "Images", s.images.count, s.images.size, s.images.liveSize, s.images.decodedSize, s.images.purgeableSize, s.images.purgedSize);
</del><ins>+ printf("%-13s %13d %13d %13d %13d %13d %13d\n", "Images", s.images.count, s.images.size, s.images.liveSize, s.images.decodedSize, s.images.mappedSize, s.images.size - s.images.mappedSize);
+#else
+ printf("%-13s %-13s %-13s %-13s %-13s\n", "", "Count", "Size", "LiveSize", "DecodedSize");
+ printf("%-13s %-13s %-13s %-13s %-13s\n", "-------------", "-------------", "-------------", "-------------", "-------------");
+ printf("%-13s %13d %13d %13d %13d\n", "Images", s.images.count, s.images.size, s.images.liveSize, s.images.decodedSize);
</ins><span class="cx"> #endif
</span><del>- printf("%-13s %13d %13d %13d %13d %13d %13d\n", "CSS", s.cssStyleSheets.count, s.cssStyleSheets.size, s.cssStyleSheets.liveSize, s.cssStyleSheets.decodedSize, s.cssStyleSheets.purgeableSize, s.cssStyleSheets.purgedSize);
</del><ins>+ printf("%-13s %13d %13d %13d %13d\n", "CSS", s.cssStyleSheets.count, s.cssStyleSheets.size, s.cssStyleSheets.liveSize, s.cssStyleSheets.decodedSize);
</ins><span class="cx"> #if ENABLE(XSLT)
</span><del>- printf("%-13s %13d %13d %13d %13d %13d %13d\n", "XSL", s.xslStyleSheets.count, s.xslStyleSheets.size, s.xslStyleSheets.liveSize, s.xslStyleSheets.decodedSize, s.xslStyleSheets.purgeableSize, s.xslStyleSheets.purgedSize);
</del><ins>+ printf("%-13s %13d %13d %13d %13d\n", "XSL", s.xslStyleSheets.count, s.xslStyleSheets.size, s.xslStyleSheets.liveSize, s.xslStyleSheets.decodedSize);
</ins><span class="cx"> #endif
</span><del>- printf("%-13s %13d %13d %13d %13d %13d %13d\n", "JavaScript", s.scripts.count, s.scripts.size, s.scripts.liveSize, s.scripts.decodedSize, s.scripts.purgeableSize, s.scripts.purgedSize);
- printf("%-13s %13d %13d %13d %13d %13d %13d\n", "Fonts", s.fonts.count, s.fonts.size, s.fonts.liveSize, s.fonts.decodedSize, s.fonts.purgeableSize, s.fonts.purgedSize);
- printf("%-13s %-13s %-13s %-13s %-13s %-13s %-13s\n\n", "-------------", "-------------", "-------------", "-------------", "-------------", "-------------", "-------------");
</del><ins>+ printf("%-13s %13d %13d %13d %13d\n", "JavaScript", s.scripts.count, s.scripts.size, s.scripts.liveSize, s.scripts.decodedSize);
+ printf("%-13s %13d %13d %13d %13d\n", "Fonts", s.fonts.count, s.fonts.size, s.fonts.liveSize, s.fonts.decodedSize);
+ printf("%-13s %-13s %-13s %-13s %-13s\n\n", "-------------", "-------------", "-------------", "-------------", "-------------");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MemoryCache::dumpLRULists(bool includeLive) const
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><del>- printf("LRU-SP lists in eviction order (Kilobytes decoded, Kilobytes encoded, Access count, Referenced, isPurgeable, wasPurged, isMemoryMapped):\n");
</del><ins>+ printf("LRU-SP lists in eviction order (Kilobytes decoded, Kilobytes encoded, Access count, Referenced, isMemoryMapped):\n");
</ins><span class="cx"> #else
</span><del>- printf("LRU-SP lists in eviction order (Kilobytes decoded, Kilobytes encoded, Access count, Referenced, isPurgeable, wasPurged):\n");
</del><ins>+ printf("LRU-SP lists in eviction order (Kilobytes decoded, Kilobytes encoded, Access count, Referenced):\n");
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> int size = m_allResources.size();
</span><span class="lines">@@ -1034,9 +978,9 @@
</span><span class="cx"> CachedResource* prev = current->m_prevInAllResourcesList;
</span><span class="cx"> if (includeLive || !current->hasClients())
</span><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><del>- printf("(%.1fK, %.1fK, %uA, %dR, %d, %d, %d); ", current->decodedSize() / 1024.0f, (current->encodedSize() + current->overheadSize()) / 1024.0f, current->accessCount(), current->hasClients(), current->isPurgeable(), current->wasPurged(), current->isUsingDiskImageCache());
</del><ins>+ printf("(%.1fK, %.1fK, %uA, %dR, %d); ", current->decodedSize() / 1024.0f, (current->encodedSize() + current->overheadSize()) / 1024.0f, current->accessCount(), current->hasClients(), current->isUsingDiskImageCache());
</ins><span class="cx"> #else
</span><del>- printf("(%.1fK, %.1fK, %uA, %dR, %d, %d); ", current->decodedSize() / 1024.0f, (current->encodedSize() + current->overheadSize()) / 1024.0f, current->accessCount(), current->hasClients(), current->isPurgeable(), current->wasPurged());
</del><ins>+ printf("(%.1fK, %.1fK, %uA, %dR); ", current->decodedSize() / 1024.0f, (current->encodedSize() + current->overheadSize()) / 1024.0f, current->accessCount(), current->hasClients());
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> current = prev;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheMemoryCacheh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/MemoryCache.h (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/MemoryCache.h 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/loader/cache/MemoryCache.h 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -61,22 +61,6 @@
</span><span class="cx"> // -------|-----+++++++++++++++|
</span><span class="cx"> // -------|-----+++++++++++++++|+++++
</span><span class="cx">
</span><del>-// The behavior of the cache changes in the following way if shouldMakeResourcePurgeableOnEviction
-// returns true.
-//
-// 1. Dead resources in the cache are kept in non-purgeable memory.
-// 2. When we prune dead resources, instead of freeing them, we mark their memory as purgeable and
-// keep the resources until the kernel reclaims the purgeable memory.
-//
-// By leaving the in-cache dead resources in dirty resident memory, we decrease the likelihood of
-// the kernel claiming that memory and forcing us to refetch the resource (for example when a user
-// presses back).
-//
-// And by having an unbounded number of resource objects using purgeable memory, we can use as much
-// memory as is available on the machine. The trade-off here is that the CachedResource object (and
-// its member variables) are allocated in non-purgeable TC-malloc'd memory so we would see slightly
-// more memory use due to this.
-
</del><span class="cx"> class MemoryCache {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(MemoryCache); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><span class="lines">@@ -101,14 +85,21 @@
</span><span class="cx"> int size;
</span><span class="cx"> int liveSize;
</span><span class="cx"> int decodedSize;
</span><del>- int purgeableSize;
- int purgedSize;
</del><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><span class="cx"> int mappedSize;
</span><del>- TypeStatistic() : count(0), size(0), liveSize(0), decodedSize(0), purgeableSize(0), purgedSize(0), mappedSize(0) { }
-#else
- TypeStatistic() : count(0), size(0), liveSize(0), decodedSize(0), purgeableSize(0), purgedSize(0) { }
</del><span class="cx"> #endif
</span><ins>+
+ TypeStatistic()
+ : count(0)
+ , size(0)
+ , liveSize(0)
+ , decodedSize(0)
+#if ENABLE(DISK_IMAGE_CACHE)
+ , mappedSize(0)
+#endif
+ {
+ }
+
</ins><span class="cx"> void addResource(CachedResource*);
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -167,8 +158,6 @@
</span><span class="cx"> void addToLiveResourcesSize(CachedResource*);
</span><span class="cx"> void removeFromLiveResourcesSize(CachedResource*);
</span><span class="cx">
</span><del>- static bool shouldMakeResourcePurgeableOnEviction();
-
</del><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><span class="cx"> void flushCachedImagesToDisk(); // Flush encoded data from resources still referenced by web pages.
</span><span class="cx"> #endif
</span><span class="lines">@@ -222,7 +211,6 @@
</span><span class="cx"> unsigned liveCapacity() const;
</span><span class="cx"> unsigned deadCapacity() const;
</span><span class="cx">
</span><del>- bool makeResourcePurgeable(CachedResource*);
</del><span class="cx"> void evict(CachedResource*);
</span><span class="cx">
</span><span class="cx"> CachedResource* resourceForRequestImpl(const ResourceRequest&, CachedResourceMap&);
</span><span class="lines">@@ -258,15 +246,6 @@
</span><span class="cx"> SessionCachedResourceMap m_sessionResources;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-inline bool MemoryCache::shouldMakeResourcePurgeableOnEviction()
-{
-#if PLATFORM(IOS)
- return true;
-#else
- return false;
-#endif
-}
-
</del><span class="cx"> // Function to obtain the global cache.
</span><span class="cx"> MemoryCache* memoryCache();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformPurgePriorityh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/PurgePriority.h (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PurgePriority.h 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/platform/PurgePriority.h 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -1,39 +0,0 @@
</span><del>-/*
- * Copyright (C) 2010 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. AND ITS CONTRIBUTORS ``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 ITS 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 PurgePriority_h
-#define PurgePriority_h
-
-namespace WebCore {
-
-enum PurgePriority {
- PurgeLast,
- PurgeMiddle,
- PurgeFirst,
- PurgeDefault = PurgeMiddle
-};
-
-}
-
-#endif // PurgePriority_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformPurgeableBufferh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/PurgeableBuffer.h (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/PurgeableBuffer.h 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/platform/PurgeableBuffer.h 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -1,77 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008, 2010 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 PurgeableBuffer_h
-#define PurgeableBuffer_h
-
-#include "PurgePriority.h"
-#include <wtf/PassOwnPtr.h>
-#include <wtf/Vector.h>
-
-namespace WebCore {
-
- class PurgeableBuffer {
- WTF_MAKE_NONCOPYABLE(PurgeableBuffer);
- public:
- static PassOwnPtr<PurgeableBuffer> createUninitialized(size_t, char*& data);
- static PassOwnPtr<PurgeableBuffer> create(const char* data, size_t);
-
- ~PurgeableBuffer();
-
- // Call makePurgeable(false) and check the return value before accessing the data.
- const char* data() const;
- size_t size() const { return m_size; }
-
- PurgePriority purgePriority() const { return m_purgePriority; }
- void setPurgePriority(PurgePriority priority) { m_purgePriority = priority; }
-
- bool isPurgeable() const { return m_state != NonVolatile; }
- bool wasPurged() const;
-
- bool makePurgeable(bool purgeable);
-
- private:
- PurgeableBuffer(char* data, size_t);
-
- char* m_data;
- size_t m_size;
- PurgePriority m_purgePriority;
-
- enum State { NonVolatile, Volatile, Purged };
- mutable State m_state;
- };
-
-#if !ENABLE(PURGEABLE_MEMORY)
- inline PassOwnPtr<PurgeableBuffer> PurgeableBuffer::createUninitialized(size_t, char*&) { return nullptr; }
- inline PassOwnPtr<PurgeableBuffer> PurgeableBuffer::create(const char*, size_t) { return nullptr; }
- inline PurgeableBuffer::~PurgeableBuffer() { }
- inline const char* PurgeableBuffer::data() const { return 0; }
- inline bool PurgeableBuffer::wasPurged() const { return false; }
- inline bool PurgeableBuffer::makePurgeable(bool) { return false; }
-#endif
-
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformSharedBuffercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SharedBuffer.cpp (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SharedBuffer.cpp 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/platform/SharedBuffer.cpp 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -27,7 +27,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SharedBuffer.h"
</span><span class="cx">
</span><del>-#include "PurgeableBuffer.h"
</del><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><span class="cx"> #include <wtf/unicode/UTF8.h>
</span><span class="cx">
</span><span class="lines">@@ -66,7 +65,6 @@
</span><span class="cx"> SharedBuffer::SharedBuffer()
</span><span class="cx"> : m_size(0)
</span><span class="cx"> , m_buffer(adoptRef(new DataBuffer))
</span><del>- , m_shouldUsePurgeableMemory(false)
</del><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><span class="cx"> , m_isMemoryMapped(false)
</span><span class="cx"> , m_diskImageCacheId(DiskImageCache::invalidDiskCacheId)
</span><span class="lines">@@ -79,7 +77,6 @@
</span><span class="cx"> SharedBuffer::SharedBuffer(unsigned size)
</span><span class="cx"> : m_size(size)
</span><span class="cx"> , m_buffer(adoptRef(new DataBuffer))
</span><del>- , m_shouldUsePurgeableMemory(false)
</del><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><span class="cx"> , m_isMemoryMapped(false)
</span><span class="cx"> , m_diskImageCacheId(DiskImageCache::invalidDiskCacheId)
</span><span class="lines">@@ -92,7 +89,6 @@
</span><span class="cx"> SharedBuffer::SharedBuffer(const char* data, unsigned size)
</span><span class="cx"> : m_size(0)
</span><span class="cx"> , m_buffer(adoptRef(new DataBuffer))
</span><del>- , m_shouldUsePurgeableMemory(false)
</del><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><span class="cx"> , m_isMemoryMapped(false)
</span><span class="cx"> , m_diskImageCacheId(DiskImageCache::invalidDiskCacheId)
</span><span class="lines">@@ -106,7 +102,6 @@
</span><span class="cx"> SharedBuffer::SharedBuffer(const unsigned char* data, unsigned size)
</span><span class="cx"> : m_size(0)
</span><span class="cx"> , m_buffer(adoptRef(new DataBuffer))
</span><del>- , m_shouldUsePurgeableMemory(false)
</del><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><span class="cx"> , m_isMemoryMapped(false)
</span><span class="cx"> , m_diskImageCacheId(DiskImageCache::invalidDiskCacheId)
</span><span class="lines">@@ -137,22 +132,11 @@
</span><span class="cx"> return buffer.release();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassRefPtr<SharedBuffer> SharedBuffer::adoptPurgeableBuffer(PassOwnPtr<PurgeableBuffer> purgeableBuffer)
-{
- ASSERT(!purgeableBuffer->isPurgeable());
- RefPtr<SharedBuffer> buffer = create();
- buffer->m_purgeableBuffer = purgeableBuffer;
- return buffer.release();
-}
-
</del><span class="cx"> unsigned SharedBuffer::size() const
</span><span class="cx"> {
</span><span class="cx"> if (hasPlatformData())
</span><span class="cx"> return platformDataSize();
</span><span class="cx">
</span><del>- if (m_purgeableBuffer)
- return m_purgeableBuffer->size();
-
</del><span class="cx"> return m_size;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -216,44 +200,6 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-// Try to create a PurgeableBuffer. We can fail to create one for any of the
-// following reasons:
-// - shouldUsePurgeableMemory is set to false.
-// - the size of the buffer is less than the minimum size required by
-// PurgeableBuffer (currently 16k).
-// - PurgeableBuffer::createUninitialized() call fails.
-void SharedBuffer::createPurgeableBuffer() const
-{
- if (m_purgeableBuffer)
- return;
-
- if (hasPlatformData())
- return;
-
-#if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
- if (singleDataArrayBuffer())
- return;
-#endif
-
- if (!m_buffer->hasOneRef())
- return;
-
- if (!m_shouldUsePurgeableMemory)
- return;
-
- char* destination = 0;
- m_purgeableBuffer = PurgeableBuffer::createUninitialized(m_size, destination);
- if (!m_purgeableBuffer)
- return;
- unsigned bufferSize = m_buffer->data.size();
- if (bufferSize) {
- memcpy(destination, m_buffer->data.data(), bufferSize);
- destination += bufferSize;
- (const_cast<SharedBuffer*>(this))->clearDataBuffer();
- }
- copyBufferAndClear(destination, m_size - bufferSize);
-}
-
</del><span class="cx"> const char* SharedBuffer::data() const
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><span class="lines">@@ -269,11 +215,6 @@
</span><span class="cx"> return buffer;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- createPurgeableBuffer();
-
- if (m_purgeableBuffer)
- return m_purgeableBuffer->data();
-
</del><span class="cx"> return this->buffer().data();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -316,7 +257,6 @@
</span><span class="cx">
</span><span class="cx"> void SharedBuffer::append(const char* data, unsigned length)
</span><span class="cx"> {
</span><del>- ASSERT(!m_purgeableBuffer);
</del><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><span class="cx"> ASSERT(!isMemoryMapped());
</span><span class="cx"> #endif
</span><span class="lines">@@ -386,13 +326,12 @@
</span><span class="cx">
</span><span class="cx"> m_size = 0;
</span><span class="cx"> clearDataBuffer();
</span><del>- m_purgeableBuffer.clear();
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> PassRefPtr<SharedBuffer> SharedBuffer::copy() const
</span><span class="cx"> {
</span><span class="cx"> RefPtr<SharedBuffer> clone(adoptRef(new SharedBuffer));
</span><del>- if (m_purgeableBuffer || hasPlatformData()) {
</del><ins>+ if (hasPlatformData()) {
</ins><span class="cx"> clone->append(data(), size());
</span><span class="cx"> return clone;
</span><span class="cx"> }
</span><span class="lines">@@ -410,12 +349,6 @@
</span><span class="cx"> return clone;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PassOwnPtr<PurgeableBuffer> SharedBuffer::releasePurgeableBuffer()
-{
- ASSERT(hasOneRef());
- return m_purgeableBuffer.release();
-}
-
</del><span class="cx"> void SharedBuffer::duplicateDataBufferIfNecessary() const
</span><span class="cx"> {
</span><span class="cx"> if (m_buffer->hasOneRef() || m_size <= m_buffer->data.capacity())
</span><span class="lines">@@ -486,7 +419,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (hasPlatformData() || m_purgeableBuffer) {
</del><ins>+ if (hasPlatformData()) {
</ins><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(position < size());
</span><span class="cx"> someData = data() + position;
</span><span class="cx"> return totalSize - position;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSharedBufferh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SharedBuffer.h (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SharedBuffer.h 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/platform/SharedBuffer.h 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -49,8 +49,6 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class PurgeableBuffer;
-
</del><span class="cx"> class SharedBuffer : public RefCounted<SharedBuffer> {
</span><span class="cx"> public:
</span><span class="cx"> static PassRefPtr<SharedBuffer> create() { return adoptRef(new SharedBuffer); }
</span><span class="lines">@@ -62,10 +60,6 @@
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<SharedBuffer> adoptVector(Vector<char>& vector);
</span><span class="cx">
</span><del>- // The buffer must be in non-purgeable state before adopted to a SharedBuffer.
- // It will stay that way until released.
- static PassRefPtr<SharedBuffer> adoptPurgeableBuffer(PassOwnPtr<PurgeableBuffer>);
-
</del><span class="cx"> ~SharedBuffer();
</span><span class="cx">
</span><span class="cx"> #if USE(FOUNDATION)
</span><span class="lines">@@ -110,11 +104,6 @@
</span><span class="cx">
</span><span class="cx"> PassRefPtr<SharedBuffer> copy() const;
</span><span class="cx">
</span><del>- bool hasPurgeableBuffer() const { return m_purgeableBuffer.get(); }
-
- // Ensure this buffer has no other clients before calling this.
- PassOwnPtr<PurgeableBuffer> releasePurgeableBuffer();
-
</del><span class="cx"> // Return the number of consecutive bytes after "position". "data"
</span><span class="cx"> // points to the first byte.
</span><span class="cx"> // Return 0 when no more data left.
</span><span class="lines">@@ -129,8 +118,6 @@
</span><span class="cx"> // }
</span><span class="cx"> unsigned getSomeData(const char*& data, unsigned position = 0) const;
</span><span class="cx">
</span><del>- void shouldUsePurgeableMemory(bool use) { m_shouldUsePurgeableMemory = use; }
-
</del><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><span class="cx"> enum MemoryMappingState { QueuedForMapping, PreviouslyQueuedForMapping, SuccessAlreadyMapped, FailureCacheFull };
</span><span class="cx">
</span><span class="lines">@@ -155,8 +142,6 @@
</span><span class="cx"> void setMemoryMappedNotificationCallback(MemoryMappedNotifyCallback, MemoryMappedNotifyCallbackData);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- void createPurgeableBuffer() const;
-
</del><span class="cx"> void tryReplaceContentsWithPlatformBuffer(SharedBuffer*);
</span><span class="cx"> bool hasPlatformData() const;
</span><span class="cx">
</span><span class="lines">@@ -173,8 +158,6 @@
</span><span class="cx"> // Calling this function will force internal segmented buffers
</span><span class="cx"> // to be merged into a flat buffer. Use getSomeData() whenever possible
</span><span class="cx"> // for better performance.
</span><del>- // As well, be aware that this method does *not* return any purgeable
- // memory, which can be a source of bugs.
</del><span class="cx"> const Vector<char>& buffer() const;
</span><span class="cx">
</span><span class="cx"> void clearPlatformData();
</span><span class="lines">@@ -190,8 +173,6 @@
</span><span class="cx"> unsigned m_size;
</span><span class="cx"> mutable RefPtr<DataBuffer> m_buffer;
</span><span class="cx">
</span><del>- bool m_shouldUsePurgeableMemory;
- mutable OwnPtr<PurgeableBuffer> m_purgeableBuffer;
</del><span class="cx"> #if USE(NETWORK_CFDATA_ARRAY_CALLBACK)
</span><span class="cx"> explicit SharedBuffer(CFArrayRef);
</span><span class="cx"> mutable Vector<RetainPtr<CFDataRef>> m_dataArray;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcfSharedBufferCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/platform/cf/SharedBufferCF.cpp 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "SharedBuffer.h"
</span><span class="cx">
</span><del>-#include "PurgeableBuffer.h"
</del><span class="cx"> #include <wtf/cf/TypeCasts.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><span class="lines">@@ -40,7 +39,6 @@
</span><span class="cx"> SharedBuffer::SharedBuffer(CFDataRef cfData)
</span><span class="cx"> : m_size(0)
</span><span class="cx"> , m_buffer(adoptRef(new DataBuffer))
</span><del>- , m_shouldUsePurgeableMemory(false)
</del><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><span class="cx"> , m_isMemoryMapped(false)
</span><span class="cx"> , m_diskImageCacheId(DiskImageCache::invalidDiskCacheId)
</span><span class="lines">@@ -130,7 +128,6 @@
</span><span class="cx"> SharedBuffer::SharedBuffer(CFArrayRef cfDataArray)
</span><span class="cx"> : m_size(0)
</span><span class="cx"> , m_buffer(adoptRef(new DataBuffer))
</span><del>- , m_shouldUsePurgeableMemory(false)
</del><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE)
</span><span class="cx"> , m_isMemoryMapped(false)
</span><span class="cx"> , m_diskImageCacheId(DiskImageCache::invalidDiskCacheId)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmacPurgeableBufferMaccpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/mac/PurgeableBufferMac.cpp (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/PurgeableBufferMac.cpp 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/platform/mac/PurgeableBufferMac.cpp 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -1,159 +0,0 @@
</span><del>-/*
- * Copyright (C) 2008 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 "config.h"
-
-#if ENABLE(PURGEABLE_MEMORY)
-
-#include "PurgeableBuffer.h"
-
-#include <mach/mach.h>
-#include <wtf/Assertions.h>
-#include <wtf/VMTags.h>
-
-namespace WebCore {
-
-// Purgeable buffers are allocated in multiples of the page size (4KB in common CPUs) so
-// it does not make sense for very small buffers. Set our minimum size to 16KB.
-static const size_t minPurgeableBufferSize = 4 * 4096;
-
-PurgeableBuffer::PurgeableBuffer(char* data, size_t size)
- : m_data(data)
- , m_size(size)
- , m_purgePriority(PurgeDefault)
- , m_state(NonVolatile)
-{
-}
-
-PurgeableBuffer::~PurgeableBuffer()
-{
- vm_deallocate(mach_task_self(), reinterpret_cast<vm_address_t>(m_data), m_size);
-}
-
-PassOwnPtr<PurgeableBuffer> PurgeableBuffer::createUninitialized(size_t size, char*& data)
-{
- if (size < minPurgeableBufferSize)
- return nullptr;
-
- vm_address_t buffer = 0;
- kern_return_t ret = vm_allocate(mach_task_self(), &buffer, size, VM_FLAGS_PURGABLE | VM_FLAGS_ANYWHERE | VM_TAG_FOR_WEBCORE_PURGEABLE_MEMORY);
-
- ASSERT(ret == KERN_SUCCESS);
- if (ret != KERN_SUCCESS)
- return nullptr;
-
- data = reinterpret_cast<char*>(buffer);
- return adoptPtr(new PurgeableBuffer(data, size));
-}
-
-PassOwnPtr<PurgeableBuffer> PurgeableBuffer::create(const char* data, size_t size)
-{
- char* destination;
- OwnPtr<PurgeableBuffer> purgeableBuffer = PurgeableBuffer::createUninitialized(size, destination);
- if (!purgeableBuffer)
- return nullptr;
- memcpy(destination, data, size);
- return purgeableBuffer.release();
-}
-
-bool PurgeableBuffer::makePurgeable(bool purgeable)
-{
- if (purgeable) {
- if (m_state != NonVolatile)
- return true;
-
- int volatileGroup;
- if (m_purgePriority == PurgeFirst)
- volatileGroup = VM_VOLATILE_GROUP_0;
- else if (m_purgePriority == PurgeMiddle)
- volatileGroup = VM_VOLATILE_GROUP_4;
- else
- volatileGroup = VM_VOLATILE_GROUP_7;
-
- int state = VM_PURGABLE_VOLATILE | volatileGroup;
- // So apparently "purgeable" is the correct spelling and the API here is misspelled.
- kern_return_t ret = vm_purgable_control(mach_task_self(), reinterpret_cast<vm_address_t>(m_data), VM_PURGABLE_SET_STATE, &state);
-
- if (ret != KERN_SUCCESS) {
- // If that failed we have no clue what state we are in so assume purged.
- m_state = Purged;
- return true;
- }
-
- m_state = Volatile;
- return true;
- }
-
- if (m_state == NonVolatile)
- return true;
- if (m_state == Purged)
- return false;
-
- int state = VM_PURGABLE_NONVOLATILE;
- kern_return_t ret = vm_purgable_control(mach_task_self(), reinterpret_cast<vm_address_t>(m_data), VM_PURGABLE_SET_STATE, &state);
-
- if (ret != KERN_SUCCESS) {
- // If that failed we have no clue what state we are in so assume purged.
- m_state = Purged;
- return false;
- }
-
- m_state = state & VM_PURGABLE_EMPTY ? Purged : NonVolatile;
- return m_state == NonVolatile;
-}
-
-bool PurgeableBuffer::wasPurged() const
-{
- if (m_state == NonVolatile)
- return false;
- if (m_state == Purged)
- return true;
-
- int state;
- kern_return_t ret = vm_purgable_control(mach_task_self(), reinterpret_cast<vm_address_t>(m_data), VM_PURGABLE_GET_STATE, &state);
-
- if (ret != KERN_SUCCESS) {
- // If that failed we have no clue what state we are in so assume purged.
- m_state = Purged;
- return true;
- }
-
- if (state & VM_PURGABLE_EMPTY) {
- m_state = Purged;
- return true;
- }
-
- return false;
-}
-
-const char* PurgeableBuffer::data() const
-{
- ASSERT(m_state == NonVolatile);
- return m_data;
-}
-
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformmacSharedBufferMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mac/SharedBufferMac.mm (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mac/SharedBufferMac.mm 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/platform/mac/SharedBufferMac.mm 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -152,12 +152,6 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> data(); // Force data into m_buffer from segments or data array.
</span><del>- if (hasPurgeableBuffer()) {
- RefPtr<SharedBuffer::DataBuffer> copiedBuffer = adoptRef(new DataBuffer);
- copiedBuffer->data.append(data(), size());
- return adoptCF((CFDataRef)adoptNS([[WebCoreSharedBufferData alloc] initWithSharedBufferDataBuffer:copiedBuffer.get()]).leakRef());
- }
-
</del><span class="cx"> return adoptCF((CFDataRef)adoptNS([[WebCoreSharedBufferData alloc] initWithSharedBufferDataBuffer:m_buffer.get()]).leakRef());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformsoupSharedBufferSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/soup/SharedBufferSoup.cpp (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/soup/SharedBufferSoup.cpp 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebCore/platform/soup/SharedBufferSoup.cpp 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -22,7 +22,6 @@
</span><span class="cx">
</span><span class="cx"> #include "SharedBuffer.h"
</span><span class="cx">
</span><del>-#include "PurgeableBuffer.h"
</del><span class="cx"> #include <libsoup/soup.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-08-19 Pratik Solanki <psolanki@apple.com>
+
+ Remove PurgeableBuffer since it is not very useful any more
+ https://bugs.webkit.org/show_bug.cgi?id=135939
+
+ Reviewed by Andreas Kling.
+
+ * Misc/WebCache.mm:
+ (+[WebCache statistics]):
+
</ins><span class="cx"> 2014-08-19 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove ENABLE(SUBPIXEL_LAYOUT).
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebCachemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebCache.mm (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebCache.mm 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebKit/mac/Misc/WebCache.mm 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -108,26 +108,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> [NSNumber numberWithInt:s.scripts.decodedSize], @"JavaScript",
</span><span class="cx"> nil],
</span><del>- [NSDictionary dictionaryWithObjectsAndKeys:
- [NSNumber numberWithInt:s.images.purgeableSize], @"Images",
- [NSNumber numberWithInt:s.cssStyleSheets.purgeableSize] ,@"CSS",
-#if ENABLE(XSLT)
- [NSNumber numberWithInt:s.xslStyleSheets.purgeableSize], @"XSL",
-#else
- [NSNumber numberWithInt:0], @"XSL",
-#endif
- [NSNumber numberWithInt:s.scripts.purgeableSize], @"JavaScript",
- nil],
- [NSDictionary dictionaryWithObjectsAndKeys:
- [NSNumber numberWithInt:s.images.purgedSize], @"Images",
- [NSNumber numberWithInt:s.cssStyleSheets.purgedSize] ,@"CSS",
-#if ENABLE(XSLT)
- [NSNumber numberWithInt:s.xslStyleSheets.purgedSize], @"XSL",
-#else
- [NSNumber numberWithInt:0], @"XSL",
-#endif
- [NSNumber numberWithInt:s.scripts.purgedSize], @"JavaScript",
- nil],
</del><span class="cx"> #if ENABLE(DISK_IMAGE_CACHE) && PLATFORM(IOS)
</span><span class="cx"> [NSDictionary dictionaryWithObjectsAndKeys:
</span><span class="cx"> [NSNumber numberWithInt:s.images.mappedSize], @"Images",
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebKit/win/ChangeLog 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-08-19 Pratik Solanki <psolanki@apple.com>
+
+ Remove PurgeableBuffer since it is not very useful any more
+ https://bugs.webkit.org/show_bug.cgi?id=135939
+
+ Reviewed by Andreas Kling.
+
+ * WebCache.cpp:
+ (WebCache::statistics):
+
</ins><span class="cx"> 2014-08-18 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r172736.
</span></span></pre></div>
<a id="trunkSourceWebKitwinWebCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/WebCache.cpp (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/WebCache.cpp 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebKit/win/WebCache.cpp 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -202,52 +202,6 @@
</span><span class="cx"> propBag->setDictionary(dictionary.get());
</span><span class="cx"> s[3] = propBag.leakRef();
</span><span class="cx">
</span><del>- // Purgable Sizes.
- dictionary = adoptCF(CFDictionaryCreateMutable(0, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
-
- value = adoptCF(CFNumberCreate(0, kCFNumberIntType, &stat.images.purgeableSize));
- CFDictionaryAddValue(dictionary.get(), imagesKey, value.get());
-
- value = adoptCF(CFNumberCreate(0, kCFNumberIntType, &stat.cssStyleSheets.purgeableSize));
- CFDictionaryAddValue(dictionary.get(), stylesheetsKey, value.get());
-
-#if ENABLE(XSLT)
- value = adoptCF(CFNumberCreate(0, kCFNumberIntType, &stat.xslStyleSheets.purgeableSize));
-#else
- value = adoptCF(CFNumberCreate(0, kCFNumberIntType, &zero));
-#endif
- CFDictionaryAddValue(dictionary.get(), xslKey, value.get());
-
- value = adoptCF(CFNumberCreate(0, kCFNumberIntType, &stat.scripts.purgeableSize));
- CFDictionaryAddValue(dictionary.get(), scriptsKey, value.get());
-
- propBag = CFDictionaryPropertyBag::createInstance();
- propBag->setDictionary(dictionary.get());
- s[4] = propBag.leakRef();
-
- // Purged Sizes.
- dictionary = adoptCF(CFDictionaryCreateMutable(0, 0, &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks));
-
- value = adoptCF(CFNumberCreate(0, kCFNumberIntType, &stat.images.purgedSize));
- CFDictionaryAddValue(dictionary.get(), imagesKey, value.get());
-
- value = adoptCF(CFNumberCreate(0, kCFNumberIntType, &stat.cssStyleSheets.purgedSize));
- CFDictionaryAddValue(dictionary.get(), stylesheetsKey, value.get());
-
-#if ENABLE(XSLT)
- value = adoptCF(CFNumberCreate(0, kCFNumberIntType, &stat.xslStyleSheets.purgedSize));
-#else
- value = adoptCF(CFNumberCreate(0, kCFNumberIntType, &zero));
-#endif
- CFDictionaryAddValue(dictionary.get(), xslKey, value.get());
-
- value = adoptCF(CFNumberCreate(0, kCFNumberIntType, &stat.scripts.purgedSize));
- CFDictionaryAddValue(dictionary.get(), scriptsKey, value.get());
-
- propBag = CFDictionaryPropertyBag::createInstance();
- propBag->setDictionary(dictionary.get());
- s[5] = propBag.leakRef();
-
</del><span class="cx"> return S_OK;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebKit2/ChangeLog 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-08-19 Pratik Solanki <psolanki@apple.com>
+
+ Remove PurgeableBuffer since it is not very useful any more
+ https://bugs.webkit.org/show_bug.cgi?id=135939
+
+ Reviewed by Andreas Kling.
+
+ * WebProcess/WebProcess.cpp:
+ (WebKit::getWebCoreMemoryCacheStatistics):
+
</ins><span class="cx"> 2014-08-19 Peyton Randolph <prandolph@apple.com>
</span><span class="cx">
</span><span class="cx"> Expose injected bundle SPI to get a node's URL element, get the visible selection range of that
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebProcess.cpp (172789 => 172790)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-08-19 23:53:33 UTC (rev 172789)
+++ trunk/Source/WebKit2/WebProcess/WebProcess.cpp 2014-08-19 23:55:36 UTC (rev 172790)
</span><span class="lines">@@ -885,20 +885,6 @@
</span><span class="cx"> decodedSizes.set(xslString, memoryCacheStatistics.xslStyleSheets.decodedSize);
</span><span class="cx"> decodedSizes.set(javaScriptString, memoryCacheStatistics.scripts.decodedSize);
</span><span class="cx"> result.append(decodedSizes);
</span><del>-
- HashMap<String, uint64_t> purgeableSizes;
- purgeableSizes.set(imagesString, memoryCacheStatistics.images.purgeableSize);
- purgeableSizes.set(cssString, memoryCacheStatistics.cssStyleSheets.purgeableSize);
- purgeableSizes.set(xslString, memoryCacheStatistics.xslStyleSheets.purgeableSize);
- purgeableSizes.set(javaScriptString, memoryCacheStatistics.scripts.purgeableSize);
- result.append(purgeableSizes);
-
- HashMap<String, uint64_t> purgedSizes;
- purgedSizes.set(imagesString, memoryCacheStatistics.images.purgedSize);
- purgedSizes.set(cssString, memoryCacheStatistics.cssStyleSheets.purgedSize);
- purgedSizes.set(xslString, memoryCacheStatistics.xslStyleSheets.purgedSize);
- purgedSizes.set(javaScriptString, memoryCacheStatistics.scripts.purgedSize);
- result.append(purgedSizes);
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebProcess::getWebCoreStatistics(uint64_t callbackID)
</span></span></pre>
</div>
</div>
</body>
</html>