<!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>[161210] trunk/Source/WebCore</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/161210">161210</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2014-01-02 10:45:33 -0800 (Thu, 02 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify the insides of DocumentSharedObjectPool and reduce memory usage.
Merging Blink <a href="http://trac.webkit.org/projects/webkit/changeset/164152">r164152</a> by Elliott Sprehn.
Instead of storing an OwnPtr to an object that has a pointer to the
ShareableElementData as well as a pointer into the ShareableElementData
and the length we can just store a RefPtr to the SharableElementData.
This also reduces the memory usage of the pool by 2 pointers per entry.
* dom/DocumentSharedObjectPool.h:
* dom/DocumentSharedObjectPool.cpp:
(WebCore::attributeHash):
(WebCore::hasSameAttributes):
(WebCore::DocumentSharedObjectPool::cachedShareableElementDataWithAttributes):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentSharedObjectPoolcpp">trunk/Source/WebCore/dom/DocumentSharedObjectPool.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumentSharedObjectPoolh">trunk/Source/WebCore/dom/DocumentSharedObjectPool.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (161209 => 161210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-01-02 18:11:51 UTC (rev 161209)
+++ trunk/Source/WebCore/ChangeLog 2014-01-02 18:45:33 UTC (rev 161210)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2014-01-02 Andreas Kling <akling@apple.com>
+
+ Simplify the insides of DocumentSharedObjectPool and reduce memory usage.
+
+ Merging Blink r164152 by Elliott Sprehn.
+
+ Instead of storing an OwnPtr to an object that has a pointer to the
+ ShareableElementData as well as a pointer into the ShareableElementData
+ and the length we can just store a RefPtr to the SharableElementData.
+
+ This also reduces the memory usage of the pool by 2 pointers per entry.
+
+ * dom/DocumentSharedObjectPool.h:
+ * dom/DocumentSharedObjectPool.cpp:
+ (WebCore::attributeHash):
+ (WebCore::hasSameAttributes):
+ (WebCore::DocumentSharedObjectPool::cachedShareableElementDataWithAttributes):
+
</ins><span class="cx"> 2014-01-02 Dirk Schulze <krit@webkit.org>
</span><span class="cx">
</span><span class="cx"> Support <box> values computed style for 'clip-path' property
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentSharedObjectPoolcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentSharedObjectPool.cpp (161209 => 161210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentSharedObjectPool.cpp 2014-01-02 18:11:51 UTC (rev 161209)
+++ trunk/Source/WebCore/dom/DocumentSharedObjectPool.cpp 2014-01-02 18:45:33 UTC (rev 161210)
</span><span class="lines">@@ -31,64 +31,32 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-class ShareableElementDataCacheKey {
-public:
- ShareableElementDataCacheKey(const Attribute* attributes, unsigned attributeCount)
- : m_attributes(attributes)
- , m_attributeCount(attributeCount)
- { }
</del><ins>+inline unsigned attributeHash(const Vector<Attribute>& attributes)
+{
+ return StringHasher::hashMemory(attributes.data(), attributes.size() * sizeof(Attribute));
+}
</ins><span class="cx">
</span><del>- bool operator!=(const ShareableElementDataCacheKey& other) const
- {
- if (m_attributeCount != other.m_attributeCount)
- return true;
- return memcmp(m_attributes, other.m_attributes, sizeof(Attribute) * m_attributeCount);
- }
</del><ins>+inline bool hasSameAttributes(const Vector<Attribute>& attributes, ShareableElementData& elementData)
+{
+ if (attributes.size() != elementData.length())
+ return false;
+ return !memcmp(attributes.data(), elementData.m_attributeArray, attributes.size() * sizeof(Attribute));
+}
</ins><span class="cx">
</span><del>- unsigned hash() const
- {
- return StringHasher::hashMemory(m_attributes, m_attributeCount * sizeof(Attribute));
- }
-
-private:
- const Attribute* m_attributes;
- unsigned m_attributeCount;
-};
-
-class ShareableElementDataCacheEntry {
-public:
- ShareableElementDataCacheEntry(const ShareableElementDataCacheKey& k, ShareableElementData& v)
- : key(k)
- , value(v)
- { }
-
- ShareableElementDataCacheKey key;
- Ref<ShareableElementData> value;
-};
-
</del><span class="cx"> PassRef<ShareableElementData> DocumentSharedObjectPool::cachedShareableElementDataWithAttributes(const Vector<Attribute>& attributes)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!attributes.isEmpty());
</span><span class="cx">
</span><del>- ShareableElementDataCacheKey cacheKey(attributes.data(), attributes.size());
- unsigned cacheHash = cacheKey.hash();
</del><ins>+ auto& cachedData = m_shareableElementDataCache.add(attributeHash(attributes), nullptr).iterator->value;
</ins><span class="cx">
</span><del>- ShareableElementDataCache::iterator cacheIterator = m_shareableElementDataCache.add(cacheHash, nullptr).iterator;
- if (cacheIterator->value && cacheIterator->value->key != cacheKey)
- cacheHash = 0;
</del><ins>+ // FIXME: This prevents sharing when there's a hash collision.
+ if (cachedData && !hasSameAttributes(attributes, *cachedData))
+ return ShareableElementData::createWithAttributes(attributes);
</ins><span class="cx">
</span><del>- RefPtr<ShareableElementData> elementData;
- if (cacheHash && cacheIterator->value)
- elementData = &cacheIterator->value->value.get();
- else
- elementData = ShareableElementData::createWithAttributes(attributes);
</del><ins>+ if (!cachedData)
+ cachedData = ShareableElementData::createWithAttributes(attributes);
</ins><span class="cx">
</span><del>- if (!cacheHash || cacheIterator->value)
- return elementData.releaseNonNull();
-
- cacheIterator->value = adoptPtr(new ShareableElementDataCacheEntry(ShareableElementDataCacheKey(elementData->m_attributeArray, elementData->length()), *elementData));
-
- return elementData.releaseNonNull();
</del><ins>+ return *cachedData;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DocumentSharedObjectPool::DocumentSharedObjectPool()
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentSharedObjectPoolh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/DocumentSharedObjectPool.h (161209 => 161210)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/DocumentSharedObjectPool.h 2014-01-02 18:11:51 UTC (rev 161209)
+++ trunk/Source/WebCore/dom/DocumentSharedObjectPool.h 2014-01-02 18:45:33 UTC (rev 161210)
</span><span class="lines">@@ -29,13 +29,13 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/PassOwnPtr.h>
</span><ins>+#include <wtf/RefPtr.h>
</ins><span class="cx"> #include <wtf/text/StringHash.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class Attribute;
</span><span class="cx"> class ShareableElementData;
</span><del>-class ShareableElementDataCacheEntry;
</del><span class="cx">
</span><span class="cx"> class DocumentSharedObjectPool {
</span><span class="cx"> public:
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> private:
</span><span class="cx"> DocumentSharedObjectPool();
</span><span class="cx">
</span><del>- typedef HashMap<unsigned, OwnPtr<ShareableElementDataCacheEntry>, AlreadyHashed> ShareableElementDataCache;
</del><ins>+ typedef HashMap<unsigned, RefPtr<ShareableElementData>, AlreadyHashed> ShareableElementDataCache;
</ins><span class="cx"> ShareableElementDataCache m_shareableElementDataCache;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>