<!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>[195356] 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/195356">195356</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-20 09:59:02 -0800 (Wed, 20 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor AtomicStringKeyedMRUCache to be a generic LRU cache
https://bugs.webkit.org/show_bug.cgi?id=153109
Patch by Said Abou-Hallawa <sabouhallawa@apple.com> on 2016-01-20
Reviewed by Darin Adler.
Source/WebCore:
Replace the template specialization of AtomicStringKeyedMRUCache with
template derived from TinyLRUCachePolicy. Override the functions which
are needed for creating the values and the null value. Also replace the
static function which was returning a NeverDestroyed AtomicStringKeyedMRUCache
with a singleton function 'cache' inside the derived template.
* WebCore.xcodeproj/project.pbxproj:
* platform/text/AtomicStringKeyedMRUCache.h: Removed.
* platform/text/cf/HyphenationCF.cpp:
(WebCore::canHyphenate):
(WebCore::lastHyphenLocation):
(WebCore::AtomicStringKeyedMRUCache<RetainPtr<CFLocaleRef>>::createValueForNullKey): Deleted.
(WebCore::AtomicStringKeyedMRUCache<RetainPtr<CFLocaleRef>>::createValueForKey): Deleted.
(WebCore::cfLocaleCache): Deleted.
* platform/text/hyphen/HyphenationLibHyphen.cpp:
(WebCore::countLeadingSpaces):
(WebCore::lastHyphenLocation):
(WebCore::AtomicStringKeyedMRUCache<RefPtr<HyphenationDictionary>>::createValueForNullKey): Deleted.
(WebCore::AtomicStringKeyedMRUCache<RefPtr<HyphenationDictionary>>::createValueForKey): Deleted.
(WebCore::hyphenDictionaryCache): Deleted.
Source/WTF:
Refactor AtomicStringKeyedMRUCache, move it to WTF project and rename it
to be TinyLRUCache. Define another template and call it TinyLRUCachePolicy.
This one can be overridden for different keys and values. Its function is
creating the cached values.
* WTF.xcodeproj/project.pbxproj:
* wtf/TinyLRUCache.h: Added.
(WebCore::TinyLRUCachePolicy::isKeyNull):
(WebCore::TinyLRUCachePolicy::createValueForNullKey):
(WebCore::TinyLRUCachePolicy::createValueForKey):
(WebCore::TinyLRUCache::get):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFxcodeprojprojectpbxproj">trunk/Source/WTF/WTF.xcodeproj/project.pbxproj</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="#trunkSourceWebCoreplatformtextcfHyphenationCFcpp">trunk/Source/WebCore/platform/text/cf/HyphenationCF.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtexthyphenHyphenationLibHyphencpp">trunk/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWTFwtfTinyLRUCacheh">trunk/Source/WTF/wtf/TinyLRUCache.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformtextAtomicStringKeyedMRUCacheh">trunk/Source/WebCore/platform/text/AtomicStringKeyedMRUCache.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (195355 => 195356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-01-20 17:16:34 UTC (rev 195355)
+++ trunk/Source/WTF/ChangeLog 2016-01-20 17:59:02 UTC (rev 195356)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2016-01-20 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Refactor AtomicStringKeyedMRUCache to be a generic LRU cache
+ https://bugs.webkit.org/show_bug.cgi?id=153109
+
+ Reviewed by Darin Adler.
+
+ Refactor AtomicStringKeyedMRUCache, move it to WTF project and rename it
+ to be TinyLRUCache. Define another template and call it TinyLRUCachePolicy.
+ This one can be overridden for different keys and values. Its function is
+ creating the cached values.
+
+ * WTF.xcodeproj/project.pbxproj:
+ * wtf/TinyLRUCache.h: Added.
+ (WebCore::TinyLRUCachePolicy::isKeyNull):
+ (WebCore::TinyLRUCachePolicy::createValueForNullKey):
+ (WebCore::TinyLRUCachePolicy::createValueForKey):
+ (WebCore::TinyLRUCache::get):
+
</ins><span class="cx"> 2016-01-19 Saam barati <sbarati@apple.com>
</span><span class="cx">
</span><span class="cx"> WTF::Bag should be non-copyable
</span></span></pre></div>
<a id="trunkSourceWTFWTFxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (195355 => 195356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-01-20 17:16:34 UTC (rev 195355)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-01-20 17:59:02 UTC (rev 195356)
</span><span class="lines">@@ -96,6 +96,7 @@
</span><span class="cx"> 2CDED0F318115C85004DBA70 /* RunLoop.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2CDED0F118115C85004DBA70 /* RunLoop.cpp */; };
</span><span class="cx"> 2CDED0F418115C85004DBA70 /* RunLoop.h in Headers */ = {isa = PBXBuildFile; fileRef = 2CDED0F218115C85004DBA70 /* RunLoop.h */; };
</span><span class="cx"> 430B47891AAAAC1A001223DA /* StringCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 430B47871AAAAC1A001223DA /* StringCommon.h */; };
</span><ins>+ 553071CA1C40427200384898 /* TinyLRUCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 553071C91C40427200384898 /* TinyLRUCache.h */; };
</ins><span class="cx"> 70A993FE1AD7151300FA615B /* SymbolRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70A993FC1AD7151300FA615B /* SymbolRegistry.cpp */; };
</span><span class="cx"> 70A993FF1AD7151300FA615B /* SymbolRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 70A993FD1AD7151300FA615B /* SymbolRegistry.h */; };
</span><span class="cx"> 70ECA60D1B02426800449739 /* AtomicStringImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70ECA60A1B02426800449739 /* AtomicStringImpl.cpp */; };
</span><span class="lines">@@ -402,6 +403,7 @@
</span><span class="cx"> 2CDED0F118115C85004DBA70 /* RunLoop.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RunLoop.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 2CDED0F218115C85004DBA70 /* RunLoop.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RunLoop.h; sourceTree = "<group>"; };
</span><span class="cx"> 430B47871AAAAC1A001223DA /* StringCommon.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StringCommon.h; sourceTree = "<group>"; };
</span><ins>+ 553071C91C40427200384898 /* TinyLRUCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TinyLRUCache.h; sourceTree = "<group>"; };
</ins><span class="cx"> 5D247B6214689B8600E78B76 /* libWTF.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libWTF.a; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx"> 5D247B6E14689C4700E78B76 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
</span><span class="cx"> 5D247B7014689C4700E78B76 /* DebugRelease.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = DebugRelease.xcconfig; sourceTree = "<group>"; };
</span><span class="lines">@@ -928,6 +930,7 @@
</span><span class="cx"> A8A47336151A825B004123FF /* ThreadingPthreads.cpp */,
</span><span class="cx"> A8A4733E151A825B004123FF /* ThreadSafeRefCounted.h */,
</span><span class="cx"> A8A4733F151A825B004123FF /* ThreadSpecific.h */,
</span><ins>+ 553071C91C40427200384898 /* TinyLRUCache.h */,
</ins><span class="cx"> 0FED67B51B22D4D80066CE15 /* TinyPtrSet.h */,
</span><span class="cx"> 149EF16216BBFE0D000A4331 /* TriState.h */,
</span><span class="cx"> 83FBA93119DF459700F30ADB /* TypeCasts.h */,
</span><span class="lines">@@ -1230,6 +1233,7 @@
</span><span class="cx"> A8A47416151A825B004123FF /* RandomNumberSeed.h in Headers */,
</span><span class="cx"> 0F87105A16643F190090B0AD /* RawPointer.h in Headers */,
</span><span class="cx"> A8A47417151A825B004123FF /* RedBlackTree.h in Headers */,
</span><ins>+ 553071CA1C40427200384898 /* TinyLRUCache.h in Headers */,
</ins><span class="cx"> 26299B6E17A9E5B800ADEBE5 /* Ref.h in Headers */,
</span><span class="cx"> A8A47418151A825B004123FF /* RefCounted.h in Headers */,
</span><span class="cx"> A8A47419151A825B004123FF /* RefCountedArray.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWTFwtfTinyLRUCachehfromrev195355trunkSourceWebCoreplatformtextAtomicStringKeyedMRUCacheh"></a>
<div class="copfile"><h4>Copied: trunk/Source/WTF/wtf/TinyLRUCache.h (from rev 195355, trunk/Source/WebCore/platform/text/AtomicStringKeyedMRUCache.h) (0 => 195356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/TinyLRUCache.h (rev 0)
+++ trunk/Source/WTF/wtf/TinyLRUCache.h 2016-01-20 17:59:02 UTC (rev 195356)
</span><span class="lines">@@ -0,0 +1,81 @@
</span><ins>+/*
+ * Copyright (C) 2010, 2016 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 TinyLRUCache_h
+#define TinyLRUCache_h
+
+#include <wtf/NeverDestroyed.h>
+#include <wtf/Vector.h>
+
+namespace WebCore {
+
+template<typename KeyType, typename ValueType>
+struct TinyLRUCachePolicy {
+ static bool isKeyNull(const KeyType&) { return false; }
+ static ValueType createValueForNullKey() { return { }; }
+ static ValueType createValueForKey(const KeyType&) { return { }; }
+};
+
+template<typename KeyType, typename ValueType, size_t capacity = 4>
+class TinyLRUCache {
+public:
+ const ValueType& get(const KeyType& key)
+ {
+ if (TinyLRUCachePolicy<KeyType, ValueType>::isKeyNull(key)) {
+ static NeverDestroyed<ValueType> valueForNull = TinyLRUCachePolicy<KeyType, ValueType>::createValueForNullKey();
+ return valueForNull;
+ }
+
+ for (size_t i = 0; i < m_cache.size(); ++i) {
+ if (m_cache[i].first != key)
+ continue;
+
+ if (i == m_cache.size() - 1)
+ return m_cache[i].second;
+
+ // If the entry is not the last one, move it to the end of the cache.
+ Entry entry = WTFMove(m_cache[i]);
+ m_cache.remove(i);
+ m_cache.append(WTFMove(entry));
+ return m_cache[m_cache.size() - 1].second;
+ }
+
+ // m_cache[0] is the LRU entry, so remove it.
+ if (m_cache.size() == capacity)
+ m_cache.remove(0);
+
+ m_cache.append(std::make_pair(key, TinyLRUCachePolicy<KeyType, ValueType>::createValueForKey(key)));
+ return m_cache.last().second;
+ }
+
+private:
+ typedef std::pair<KeyType, ValueType> Entry;
+ typedef Vector<Entry, capacity> Cache;
+ Cache m_cache;
+};
+
+}
+
+#endif // TinyLRUCache_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195355 => 195356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-20 17:16:34 UTC (rev 195355)
+++ trunk/Source/WebCore/ChangeLog 2016-01-20 17:59:02 UTC (rev 195356)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-01-20 Said Abou-Hallawa <sabouhallawa@apple.com>
+
+ Refactor AtomicStringKeyedMRUCache to be a generic LRU cache
+ https://bugs.webkit.org/show_bug.cgi?id=153109
+
+ Reviewed by Darin Adler.
+
+ Replace the template specialization of AtomicStringKeyedMRUCache with
+ template derived from TinyLRUCachePolicy. Override the functions which
+ are needed for creating the values and the null value. Also replace the
+ static function which was returning a NeverDestroyed AtomicStringKeyedMRUCache
+ with a singleton function 'cache' inside the derived template.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ * platform/text/AtomicStringKeyedMRUCache.h: Removed.
+ * platform/text/cf/HyphenationCF.cpp:
+ (WebCore::canHyphenate):
+ (WebCore::lastHyphenLocation):
+ (WebCore::AtomicStringKeyedMRUCache<RetainPtr<CFLocaleRef>>::createValueForNullKey): Deleted.
+ (WebCore::AtomicStringKeyedMRUCache<RetainPtr<CFLocaleRef>>::createValueForKey): Deleted.
+ (WebCore::cfLocaleCache): Deleted.
+ * platform/text/hyphen/HyphenationLibHyphen.cpp:
+ (WebCore::countLeadingSpaces):
+ (WebCore::lastHyphenLocation):
+ (WebCore::AtomicStringKeyedMRUCache<RefPtr<HyphenationDictionary>>::createValueForNullKey): Deleted.
+ (WebCore::AtomicStringKeyedMRUCache<RefPtr<HyphenationDictionary>>::createValueForKey): Deleted.
+ (WebCore::hyphenDictionaryCache): Deleted.
+
</ins><span class="cx"> 2016-01-20 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> Drop support for obsolete Node.isSupported()
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (195355 => 195356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-01-20 17:16:34 UTC (rev 195355)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-01-20 17:59:02 UTC (rev 195356)
</span><span class="lines">@@ -1425,7 +1425,6 @@
</span><span class="cx"> 37C236101097EE7700EF9F72 /* ComplexTextController.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37C2360E1097EE7700EF9F72 /* ComplexTextController.cpp */; };
</span><span class="cx"> 37C236111097EE7700EF9F72 /* ComplexTextController.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C2360F1097EE7700EF9F72 /* ComplexTextController.h */; };
</span><span class="cx"> 37C238221098C84200EF9F72 /* ComplexTextControllerCoreText.mm in Sources */ = {isa = PBXBuildFile; fileRef = 37C238201098C84200EF9F72 /* ComplexTextControllerCoreText.mm */; };
</span><del>- 37C61F0112095C87007A3C67 /* AtomicStringKeyedMRUCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 37C61F0012095C87007A3C67 /* AtomicStringKeyedMRUCache.h */; };
</del><span class="cx"> 37D456FD1A9A50D8003330A1 /* LocalizableStrings.pm in Copy Scripts */ = {isa = PBXBuildFile; fileRef = 37D456FB1A9A50B6003330A1 /* LocalizableStrings.pm */; };
</span><span class="cx"> 37DDCD9413844FD50008B793 /* MIMEHeader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 37DDCD9213844FD50008B793 /* MIMEHeader.cpp */; };
</span><span class="cx"> 37DDCD9513844FD50008B793 /* MIMEHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = 37DDCD9313844FD50008B793 /* MIMEHeader.h */; };
</span><span class="lines">@@ -8820,7 +8819,6 @@
</span><span class="cx"> 37C2360E1097EE7700EF9F72 /* ComplexTextController.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ComplexTextController.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 37C2360F1097EE7700EF9F72 /* ComplexTextController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ComplexTextController.h; sourceTree = "<group>"; };
</span><span class="cx"> 37C238201098C84200EF9F72 /* ComplexTextControllerCoreText.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ComplexTextControllerCoreText.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
</span><del>- 37C61F0012095C87007A3C67 /* AtomicStringKeyedMRUCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AtomicStringKeyedMRUCache.h; sourceTree = "<group>"; };
</del><span class="cx"> 37D456FB1A9A50B6003330A1 /* LocalizableStrings.pm */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; path = LocalizableStrings.pm; sourceTree = "<group>"; };
</span><span class="cx"> 37DDCD9213844FD50008B793 /* MIMEHeader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MIMEHeader.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 37DDCD9313844FD50008B793 /* MIMEHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MIMEHeader.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -21778,7 +21776,6 @@
</span><span class="cx"> 7C74D43018823A4200E5ED57 /* icu */,
</span><span class="cx"> A516E8B2136E04C00076C3C0 /* ios */,
</span><span class="cx"> B2C3D9F90D006C1D00EF6F26 /* mac */,
</span><del>- 37C61F0012095C87007A3C67 /* AtomicStringKeyedMRUCache.h */,
</del><span class="cx"> B2C3D9F20D006C1D00EF6F26 /* BidiContext.cpp */,
</span><span class="cx"> B2C3D9F30D006C1D00EF6F26 /* BidiContext.h */,
</span><span class="cx"> B2C3D9F40D006C1D00EF6F26 /* BidiResolver.h */,
</span><span class="lines">@@ -24650,7 +24647,6 @@
</span><span class="cx"> FD5686CA13AC180200B69C68 /* AsyncAudioDecoder.h in Headers */,
</span><span class="cx"> E1CDE9221501916900862CC5 /* AsyncFileStream.h in Headers */,
</span><span class="cx"> 0FFD4D6118651FA300512F6E /* AsyncScrollingCoordinator.h in Headers */,
</span><del>- 37C61F0112095C87007A3C67 /* AtomicStringKeyedMRUCache.h in Headers */,
</del><span class="cx"> A8C4A80D09D563270003AC8D /* Attr.h in Headers */,
</span><span class="cx"> A8C4A80B09D563270003AC8D /* Attribute.h in Headers */,
</span><span class="cx"> 46233EEE1BA0F187000EBEBB /* AttributeDOMTokenList.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextAtomicStringKeyedMRUCacheh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebCore/platform/text/AtomicStringKeyedMRUCache.h (195355 => 195356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/AtomicStringKeyedMRUCache.h 2016-01-20 17:16:34 UTC (rev 195355)
+++ trunk/Source/WebCore/platform/text/AtomicStringKeyedMRUCache.h 2016-01-20 17:59:02 UTC (rev 195356)
</span><span class="lines">@@ -1,74 +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 AtomicStringKeyedMRUCache_h
-#define AtomicStringKeyedMRUCache_h
-
-#include <wtf/NeverDestroyed.h>
-#include <wtf/text/AtomicString.h>
-
-namespace WebCore {
-
-template<typename T, size_t capacity = 4>
-class AtomicStringKeyedMRUCache {
-public:
- T get(const AtomicString& key)
- {
- if (key.isNull()) {
- static NeverDestroyed<T> valueForNull(createValueForNullKey());
- return valueForNull;
- }
-
- for (size_t i = 0; i < m_cache.size(); ++i) {
- if (m_cache[i].first == key) {
- size_t foundIndex = i;
- if (foundIndex + 1 < m_cache.size()) {
- Entry entry = m_cache[foundIndex];
- m_cache.remove(foundIndex);
- foundIndex = m_cache.size();
- m_cache.append(entry);
- }
- return m_cache[foundIndex].second;
- }
- }
- if (m_cache.size() == capacity)
- m_cache.remove(0);
-
- m_cache.append(std::make_pair(key, createValueForKey(key)));
- return m_cache.last().second;
- }
-
-private:
- T createValueForNullKey();
- T createValueForKey(const AtomicString&);
-
- typedef std::pair<AtomicString, T> Entry;
- typedef Vector<Entry, capacity> Cache;
- Cache m_cache;
-};
-
-}
-
-#endif // AtomicStringKeyedMRUCache_h
</del></span></pre></div>
<a id="trunkSourceWebCoreplatformtextcfHyphenationCFcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/cf/HyphenationCF.cpp (195355 => 195356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/cf/HyphenationCF.cpp 2016-01-20 17:16:34 UTC (rev 195355)
+++ trunk/Source/WebCore/platform/text/cf/HyphenationCF.cpp 2016-01-20 17:59:02 UTC (rev 195356)
</span><span class="lines">@@ -26,47 +26,54 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "Hyphenation.h"
</span><span class="cx">
</span><del>-#include "AtomicStringKeyedMRUCache.h"
</del><span class="cx"> #include "Language.h"
</span><span class="cx"> #include "TextBreakIteratorInternalICU.h"
</span><span class="cx"> #include <wtf/ListHashSet.h>
</span><span class="cx"> #include <wtf/RetainPtr.h>
</span><ins>+#include <wtf/TinyLRUCache.h>
</ins><span class="cx"> #include <wtf/text/StringView.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> template<>
</span><del>-RetainPtr<CFLocaleRef> AtomicStringKeyedMRUCache<RetainPtr<CFLocaleRef>>::createValueForNullKey()
</del><ins>+class TinyLRUCachePolicy<AtomicString, RetainPtr<CFLocaleRef>>
</ins><span class="cx"> {
</span><del>- // CF hyphenation functions use locale (regional formats) language, which doesn't necessarily match primary UI language,
- // so we can't use default locale here. See <rdar://problem/14897664>.
- RetainPtr<CFLocaleRef> locale = adoptCF(CFLocaleCreate(kCFAllocatorDefault, defaultLanguage().createCFString().get()));
</del><ins>+public:
+ static TinyLRUCache<AtomicString, RetainPtr<CFLocaleRef>>& cache()
+ {
+ static NeverDestroyed<TinyLRUCache<AtomicString, RetainPtr<CFLocaleRef>>> cache;
+ return cache;
+ }
</ins><span class="cx">
</span><del>- return CFStringIsHyphenationAvailableForLocale(locale.get()) ? locale : 0;
-}
</del><ins>+ static bool isKeyNull(const AtomicString& localeIdentifier)
+ {
+ return localeIdentifier.isNull();
+ }
</ins><span class="cx">
</span><del>-template<>
-RetainPtr<CFLocaleRef> AtomicStringKeyedMRUCache<RetainPtr<CFLocaleRef>>::createValueForKey(const AtomicString& localeIdentifier)
-{
- RetainPtr<CFLocaleRef> locale = adoptCF(CFLocaleCreate(kCFAllocatorDefault, localeIdentifier.string().createCFString().get()));
</del><ins>+ static RetainPtr<CFLocaleRef> createValueForNullKey()
+ {
+ // CF hyphenation functions use locale (regional formats) language, which doesn't necessarily match primary UI language,
+ // so we can't use default locale here. See <rdar://problem/14897664>.
+ RetainPtr<CFLocaleRef> locale = adoptCF(CFLocaleCreate(kCFAllocatorDefault, defaultLanguage().createCFString().get()));
+ return CFStringIsHyphenationAvailableForLocale(locale.get()) ? locale : nullptr;
+ }
</ins><span class="cx">
</span><del>- return CFStringIsHyphenationAvailableForLocale(locale.get()) ? locale : 0;
-}
</del><ins>+ static RetainPtr<CFLocaleRef> createValueForKey(const AtomicString& localeIdentifier)
+ {
+ RetainPtr<CFLocaleRef> locale = adoptCF(CFLocaleCreate(kCFAllocatorDefault, localeIdentifier.string().createCFString().get()));
</ins><span class="cx">
</span><del>-static AtomicStringKeyedMRUCache<RetainPtr<CFLocaleRef>>& cfLocaleCache()
-{
- static NeverDestroyed<AtomicStringKeyedMRUCache<RetainPtr<CFLocaleRef>>> cache;
- return cache;
-}
</del><ins>+ return CFStringIsHyphenationAvailableForLocale(locale.get()) ? locale : nullptr;
+ }
+};
</ins><span class="cx">
</span><span class="cx"> bool canHyphenate(const AtomicString& localeIdentifier)
</span><span class="cx"> {
</span><del>- return cfLocaleCache().get(localeIdentifier);
</del><ins>+ return TinyLRUCachePolicy<AtomicString, RetainPtr<CFLocaleRef>>::cache().get(localeIdentifier);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> size_t lastHyphenLocation(StringView text, size_t beforeIndex, const AtomicString& localeIdentifier)
</span><span class="cx"> {
</span><del>- RetainPtr<CFLocaleRef> locale = cfLocaleCache().get(localeIdentifier);
</del><ins>+ RetainPtr<CFLocaleRef> locale = TinyLRUCachePolicy<AtomicString, RetainPtr<CFLocaleRef>>::cache().get(localeIdentifier);
</ins><span class="cx"> ASSERT(locale);
</span><span class="cx">
</span><span class="cx"> CFOptionFlags searchAcrossWordBoundaries = 1;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtexthyphenHyphenationLibHyphencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp (195355 => 195356)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp 2016-01-20 17:16:34 UTC (rev 195355)
+++ trunk/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp 2016-01-20 17:59:02 UTC (rev 195356)
</span><span class="lines">@@ -29,11 +29,11 @@
</span><span class="cx">
</span><span class="cx"> #if USE(LIBHYPHEN)
</span><span class="cx">
</span><del>-#include "AtomicStringKeyedMRUCache.h"
</del><span class="cx"> #include "FileSystem.h"
</span><span class="cx"> #include <hyphen.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><ins>+#include <wtf/TinyLRUCache.h>
</ins><span class="cx"> #include <wtf/text/AtomicStringHash.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx"> #include <wtf/text/StringView.h>
</span><span class="lines">@@ -167,23 +167,31 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<>
</span><del>-RefPtr<HyphenationDictionary> AtomicStringKeyedMRUCache<RefPtr<HyphenationDictionary>>::createValueForNullKey()
</del><ins>+class TinyLRUCachePolicy<AtomicString, RefPtr<HyphenationDictionary>>
</ins><span class="cx"> {
</span><del>- return HyphenationDictionary::createNull();
-}
</del><ins>+public:
+ static TinyLRUCache<AtomicString, RefPtr<HyphenationDictionary>>& cache()
+ {
+ static NeverDestroyed<TinyLRUCache<AtomicString, RefPtr<HyphenationDictionary>>> cache;
+ return cache;
+ }
</ins><span class="cx">
</span><del>-template<>
-RefPtr<HyphenationDictionary> AtomicStringKeyedMRUCache<RefPtr<HyphenationDictionary>>::createValueForKey(const AtomicString& dictionaryPath)
-{
- return HyphenationDictionary::create(fileSystemRepresentation(dictionaryPath.string()));
-}
</del><ins>+ static bool isKeyNull(const AtomicString& localeIdentifier)
+ {
+ return localeIdentifier.isNull();
+ }
</ins><span class="cx">
</span><del>-static AtomicStringKeyedMRUCache<RefPtr<HyphenationDictionary>>& hyphenDictionaryCache()
-{
- static NeverDestroyed<AtomicStringKeyedMRUCache<RefPtr<HyphenationDictionary>>> cache;
- return cache;
-}
</del><ins>+ static RefPtr<HyphenationDictionary> createValueForNullKey()
+ {
+ return HyphenationDictionary::createNull();
+ }
</ins><span class="cx">
</span><ins>+ static RefPtr<HyphenationDictionary> createValueForKey(const AtomicString& dictionaryPath)
+ {
+ return HyphenationDictionary::create(fileSystemRepresentation(dictionaryPath.string()));
+ }
+};
+
</ins><span class="cx"> static void countLeadingSpaces(const CString& utf8String, int32_t& pointerOffset, int32_t& characterOffset)
</span><span class="cx"> {
</span><span class="cx"> pointerOffset = 0;
</span><span class="lines">@@ -225,7 +233,7 @@
</span><span class="cx"> String lowercaseLocaleIdentifier = AtomicString(localeIdentifier.string().convertToASCIILowercase());
</span><span class="cx"> ASSERT(availableLocales().contains(lowercaseLocaleIdentifier));
</span><span class="cx"> for (const auto& dictionaryPath : availableLocales().get(lowercaseLocaleIdentifier)) {
</span><del>- RefPtr<HyphenationDictionary> dictionary = hyphenDictionaryCache().get(AtomicString(dictionaryPath));
</del><ins>+ RefPtr<HyphenationDictionary> dictionary = TinyLRUCachePolicy<AtomicString, RefPtr<HyphenationDictionary>>::cache().get(AtomicString(dictionaryPath));
</ins><span class="cx">
</span><span class="cx"> char** replacements = nullptr;
</span><span class="cx"> int* positions = nullptr;
</span></span></pre>
</div>
</div>
</body>
</html>