<!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>[213093] 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/213093">213093</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2017-02-27 14:39:31 -0800 (Mon, 27 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use RAII for ICU breaking iterators
https://bugs.webkit.org/show_bug.cgi?id=168203
Reviewed by Simon Fraser.
Source/WebCore:
No new tests because there is no behavior change.
* platform/graphics/ComplexTextController.cpp:
(WebCore::ComplexTextController::offsetForPosition):
* rendering/RenderText.cpp:
(WebCore::RenderText::previousOffset):
(WebCore::RenderText::nextOffset):
Source/WTF:
* wtf/text/TextBreakIterator.h:
(WTF::CachedTextBreakIterator::CachedTextBreakIterator):
(WTF::CachedTextBreakIterator::~CachedTextBreakIterator):
(WTF::CachedTextBreakIterator::preceding):
(WTF::CachedTextBreakIterator::following):
(WTF::CachedTextBreakIterator::isBoundary):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextTextBreakIteratorh">trunk/Source/WTF/wtf/text/TextBreakIterator.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsComplexTextControllercpp">trunk/Source/WebCore/platform/graphics/ComplexTextController.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderTextcpp">trunk/Source/WebCore/rendering/RenderText.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (213092 => 213093)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2017-02-27 22:36:48 UTC (rev 213092)
+++ trunk/Source/WTF/ChangeLog 2017-02-27 22:39:31 UTC (rev 213093)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-02-27 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Use RAII for ICU breaking iterators
+ https://bugs.webkit.org/show_bug.cgi?id=168203
+
+ Reviewed by Simon Fraser.
+
+ * wtf/text/TextBreakIterator.h:
+ (WTF::CachedTextBreakIterator::CachedTextBreakIterator):
+ (WTF::CachedTextBreakIterator::~CachedTextBreakIterator):
+ (WTF::CachedTextBreakIterator::preceding):
+ (WTF::CachedTextBreakIterator::following):
+ (WTF::CachedTextBreakIterator::isBoundary):
+
</ins><span class="cx"> 2017-02-24 Jer Noble <jer.noble@apple.com>
</span><span class="cx">
</span><span class="cx"> Add public method to MediaTime for doing timeScale conversion.
</span></span></pre></div>
<a id="trunkSourceWTFwtftextTextBreakIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/TextBreakIterator.h (213092 => 213093)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/TextBreakIterator.h 2017-02-27 22:36:48 UTC (rev 213092)
+++ trunk/Source/WTF/wtf/text/TextBreakIterator.h 2017-02-27 22:39:31 UTC (rev 213093)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> private:
</span><span class="cx"> friend class TextBreakIteratorCache;
</span><span class="cx">
</span><del>- // Use TextBreakIteratorCache instead of constructing one of these directly.
</del><ins>+ // Use CachedTextBreakIterator instead of constructing one of these directly.
</ins><span class="cx"> WTF_EXPORT TextBreakIterator(StringView, Mode, const AtomicString& locale);
</span><span class="cx">
</span><span class="cx"> void setText(StringView string)
</span><span class="lines">@@ -105,8 +105,14 @@
</span><span class="cx"> AtomicString m_locale;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+class CachedTextBreakIterator;
+
</ins><span class="cx"> class TextBreakIteratorCache {
</span><del>-public:
</del><ins>+// Use CachedTextBreakIterator instead of dealing with the cache directly.
+private:
+ friend class NeverDestroyed<TextBreakIteratorCache>;
+ friend class CachedTextBreakIterator;
+
</ins><span class="cx"> static TextBreakIteratorCache& singleton()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<TextBreakIteratorCache> cache;
</span><span class="lines">@@ -139,17 +145,53 @@
</span><span class="cx"> m_unused.remove(0);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-private:
- friend class NeverDestroyed<TextBreakIteratorCache>;
-
</del><span class="cx"> TextBreakIteratorCache()
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static constexpr int capacity = 2;
</span><ins>+ // FIXME: Break this up into different Vectors per mode.
</ins><span class="cx"> Vector<TextBreakIterator, capacity> m_unused;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+// RAII for TextBreakIterator and TextBreakIteratorCache.
+class CachedTextBreakIterator {
+public:
+ CachedTextBreakIterator(StringView string, TextBreakIterator::Mode mode, const AtomicString& locale)
+ : m_backing(TextBreakIteratorCache::singleton().take(string, mode, locale))
+ {
+ }
+
+ ~CachedTextBreakIterator()
+ {
+ TextBreakIteratorCache::singleton().put(WTFMove(m_backing));
+ }
+
+ CachedTextBreakIterator() = delete;
+ CachedTextBreakIterator(const CachedTextBreakIterator&) = delete;
+ CachedTextBreakIterator(CachedTextBreakIterator&&) = default;
+ CachedTextBreakIterator& operator=(const CachedTextBreakIterator&) = delete;
+ CachedTextBreakIterator& operator=(CachedTextBreakIterator&&) = default;
+
+ std::optional<unsigned> preceding(unsigned location) const
+ {
+ return m_backing.preceding(location);
+ }
+
+ std::optional<unsigned> following(unsigned location) const
+ {
+ return m_backing.following(location);
+ }
+
+ bool isBoundary(unsigned location) const
+ {
+ return m_backing.isBoundary(location);
+ }
+
+private:
+ TextBreakIterator m_backing;
+};
+
</ins><span class="cx"> // Note: The returned iterator is good only until you get another iterator, with the exception of acquireLineBreakIterator.
</span><span class="cx">
</span><span class="cx"> enum class LineBreakIteratorMode { Default, Loose, Normal, Strict };
</span><span class="lines">@@ -304,6 +346,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+using WTF::CachedTextBreakIterator;
</ins><span class="cx"> using WTF::LazyLineBreakIterator;
</span><span class="cx"> using WTF::LineBreakIteratorMode;
</span><span class="cx"> using WTF::NonSharedCharacterBreakIterator;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213092 => 213093)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-27 22:36:48 UTC (rev 213092)
+++ trunk/Source/WebCore/ChangeLog 2017-02-27 22:39:31 UTC (rev 213093)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-02-27 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Use RAII for ICU breaking iterators
+ https://bugs.webkit.org/show_bug.cgi?id=168203
+
+ Reviewed by Simon Fraser.
+
+ No new tests because there is no behavior change.
+
+ * platform/graphics/ComplexTextController.cpp:
+ (WebCore::ComplexTextController::offsetForPosition):
+ * rendering/RenderText.cpp:
+ (WebCore::RenderText::previousOffset):
+ (WebCore::RenderText::nextOffset):
+
</ins><span class="cx"> 2017-02-27 Basuke Suzuki <Basuke.Suzuki@am.sony.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo][MiniBrowser] Add ca-bundle to display secure pages
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsComplexTextControllercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/ComplexTextController.cpp (213092 => 213093)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/ComplexTextController.cpp 2017-02-27 22:36:48 UTC (rev 213092)
+++ trunk/Source/WebCore/platform/graphics/ComplexTextController.cpp 2017-02-27 22:39:31 UTC (rev 213093)
</span><span class="lines">@@ -217,7 +217,7 @@
</span><span class="cx"> // could use the glyph's "ligature carets". This is available in CoreText via CTFontGetLigatureCaretPositions().
</span><span class="cx"> unsigned hitIndex = hitGlyphStart + (hitGlyphEnd - hitGlyphStart) * (m_run.ltr() ? x / adjustedAdvance : 1 - x / adjustedAdvance);
</span><span class="cx"> unsigned stringLength = complexTextRun.stringLength();
</span><del>- TextBreakIterator cursorPositionIterator = TextBreakIteratorCache::singleton().take(StringView(complexTextRun.characters(), stringLength), TextBreakIterator::Mode::Cursor, nullAtom);
</del><ins>+ CachedTextBreakIterator cursorPositionIterator(StringView(complexTextRun.characters(), stringLength), TextBreakIterator::Mode::Cursor, nullAtom);
</ins><span class="cx"> unsigned clusterStart;
</span><span class="cx"> if (cursorPositionIterator.isBoundary(hitIndex))
</span><span class="cx"> clusterStart = hitIndex;
</span><span class="lines">@@ -229,8 +229,6 @@
</span><span class="cx">
</span><span class="cx"> unsigned clusterEnd = cursorPositionIterator.following(hitIndex).value_or(stringLength);
</span><span class="cx">
</span><del>- TextBreakIteratorCache::singleton().put(WTFMove(cursorPositionIterator));
-
</del><span class="cx"> float clusterWidth;
</span><span class="cx"> // FIXME: The search stops at the boundaries of complexTextRun. In theory, it should go on into neighboring ComplexTextRuns
</span><span class="cx"> // derived from the same CTLine. In practice, we do not expect there to be more than one CTRun in a CTLine, as no
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderTextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderText.cpp (213092 => 213093)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderText.cpp 2017-02-27 22:36:48 UTC (rev 213092)
+++ trunk/Source/WebCore/rendering/RenderText.cpp 2017-02-27 22:39:31 UTC (rev 213093)
</span><span class="lines">@@ -1505,9 +1505,8 @@
</span><span class="cx"> return current - 1;
</span><span class="cx">
</span><span class="cx"> StringImpl* textImpl = m_text.impl();
</span><del>- TextBreakIterator iterator = TextBreakIteratorCache::singleton().take(StringView(textImpl->characters16(), textImpl->length()), TextBreakIterator::Mode::Cursor, nullAtom);
</del><ins>+ CachedTextBreakIterator iterator(StringView(textImpl->characters16(), textImpl->length()), TextBreakIterator::Mode::Cursor, nullAtom);
</ins><span class="cx"> auto result = iterator.preceding(current).value_or(current - 1);
</span><del>- TextBreakIteratorCache::singleton().put(WTFMove(iterator));
</del><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1679,9 +1678,8 @@
</span><span class="cx"> return current + 1;
</span><span class="cx">
</span><span class="cx"> StringImpl* textImpl = m_text.impl();
</span><del>- TextBreakIterator iterator = TextBreakIteratorCache::singleton().take(StringView(textImpl->characters16(), textImpl->length()), TextBreakIterator::Mode::Cursor, nullAtom);
</del><ins>+ CachedTextBreakIterator iterator(StringView(textImpl->characters16(), textImpl->length()), TextBreakIterator::Mode::Cursor, nullAtom);
</ins><span class="cx"> auto result = iterator.following(current).value_or(current + 1);
</span><del>- TextBreakIteratorCache::singleton().put(WTFMove(iterator));
</del><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>