<!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>[203078] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/203078">203078</a></dd>
<dt>Author</dt> <dd>mmaxfield@apple.com</dd>
<dt>Date</dt> <dd>2016-07-11 12:50:40 -0700 (Mon, 11 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Implement grapheme cluster iterator on StringView
https://bugs.webkit.org/show_bug.cgi?id=159598
Reviewed by Anders Carlsson.
This is in preparation for honoring the second argument to FontFaceSet.load().
Source/WTF:
* wtf/text/StringView.cpp:
(WTF::StringView::GraphemeClusters::Iterator::Impl::Impl):
(WTF::StringView::GraphemeClusters::Iterator::Impl::operator++):
(WTF::StringView::GraphemeClusters::Iterator::Impl::operator*):
(WTF::StringView::GraphemeClusters::Iterator::Impl::operator==):
(WTF::StringView::GraphemeClusters::Iterator::Impl::computeIndexEnd):
(WTF::StringView::GraphemeClusters::Iterator::Iterator):
(WTF::StringView::GraphemeClusters::Iterator::~Iterator):
(WTF::StringView::GraphemeClusters::Iterator::operator*):
(WTF::StringView::GraphemeClusters::Iterator::operator==):
(WTF::StringView::GraphemeClusters::Iterator::operator!=):
* wtf/text/StringView.h:
(WTF::StringView::GraphemeClusters::GraphemeClusters):
* text/TextBreakIterator.cpp:
(WebCore::NonSharedCharacterBreakIterator::NonSharedCharacterBreakIterator):
* text/TextBreakIterator.h:
Tools:
* TestWebKitAPI/Tests/WTF/StringView.cpp:
(TestWebKitAPI::compareLoopIterations):
(TestWebKitAPI::TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtftextStringViewcpp">trunk/Source/WTF/wtf/text/StringView.cpp</a></li>
<li><a href="#trunkSourceWTFwtftextStringViewh">trunk/Source/WTF/wtf/text/StringView.h</a></li>
<li><a href="#trunkSourceWTFwtftextTextBreakIteratorcpp">trunk/Source/WTF/wtf/text/TextBreakIterator.cpp</a></li>
<li><a href="#trunkSourceWTFwtftextTextBreakIteratorh">trunk/Source/WTF/wtf/text/TextBreakIterator.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFStringViewcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/StringView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (203077 => 203078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-07-11 19:43:19 UTC (rev 203077)
+++ trunk/Source/WTF/ChangeLog 2016-07-11 19:50:40 UTC (rev 203078)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-07-11 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Implement grapheme cluster iterator on StringView
+ https://bugs.webkit.org/show_bug.cgi?id=159598
+
+ Reviewed by Anders Carlsson.
+
+ This is in preparation for honoring the second argument to FontFaceSet.load().
+
+ * wtf/text/StringView.cpp:
+ (WTF::StringView::GraphemeClusters::Iterator::Impl::Impl):
+ (WTF::StringView::GraphemeClusters::Iterator::Impl::operator++):
+ (WTF::StringView::GraphemeClusters::Iterator::Impl::operator*):
+ (WTF::StringView::GraphemeClusters::Iterator::Impl::operator==):
+ (WTF::StringView::GraphemeClusters::Iterator::Impl::computeIndexEnd):
+ (WTF::StringView::GraphemeClusters::Iterator::Iterator):
+ (WTF::StringView::GraphemeClusters::Iterator::~Iterator):
+ (WTF::StringView::GraphemeClusters::Iterator::operator*):
+ (WTF::StringView::GraphemeClusters::Iterator::operator==):
+ (WTF::StringView::GraphemeClusters::Iterator::operator!=):
+ * wtf/text/StringView.h:
+ (WTF::StringView::GraphemeClusters::GraphemeClusters):
+ * text/TextBreakIterator.cpp:
+ (WebCore::NonSharedCharacterBreakIterator::NonSharedCharacterBreakIterator):
+ * text/TextBreakIterator.h:
+
</ins><span class="cx"> 2016-07-10 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Move breaking iterator code to WTF
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringView.cpp (203077 => 203078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringView.cpp 2016-07-11 19:43:19 UTC (rev 203077)
+++ trunk/Source/WTF/wtf/text/StringView.cpp 2016-07-11 19:50:40 UTC (rev 203078)
</span><span class="lines">@@ -31,6 +31,8 @@
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Lock.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><ins>+#include <wtf/Optional.h>
+#include <wtf/text/TextBreakIterator.h>
</ins><span class="cx"> #include <wtf/unicode/UTF8.h>
</span><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="lines">@@ -91,6 +93,89 @@
</span><span class="cx"> return findCommon(*this, matchString, start);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+class StringView::GraphemeClusters::Iterator::Impl {
+public:
+ Impl(const StringView& stringView, Optional<NonSharedCharacterBreakIterator>&& iterator, unsigned index)
+ : m_stringView(stringView)
+ , m_iterator(WTFMove(iterator))
+ , m_index(index)
+ , m_indexEnd(computeIndexEnd())
+ {
+ }
+
+ void operator++()
+ {
+ ASSERT(m_indexEnd > m_index);
+ m_index = m_indexEnd;
+ m_indexEnd = computeIndexEnd();
+ }
+
+ StringView operator*() const
+ {
+ if (m_stringView.is8Bit())
+ return StringView(m_stringView.characters8() + m_index, m_indexEnd - m_index);
+ return StringView(m_stringView.characters16() + m_index, m_indexEnd - m_index);
+ }
+
+ bool operator==(const Impl& other) const
+ {
+ ASSERT(&m_stringView == &other.m_stringView);
+ auto result = m_index == other.m_index;
+ ASSERT(!result || m_indexEnd == other.m_indexEnd);
+ return result;
+ }
+
+ unsigned computeIndexEnd()
+ {
+ if (!m_iterator)
+ return 0;
+ if (m_index == m_stringView.length())
+ return m_index;
+ return textBreakFollowing(m_iterator.value(), m_index);
+ }
+
+private:
+ const StringView& m_stringView;
+ Optional<NonSharedCharacterBreakIterator> m_iterator;
+ unsigned m_index;
+ unsigned m_indexEnd;
+};
+
+StringView::GraphemeClusters::Iterator::Iterator(const StringView& stringView, unsigned index)
+ : m_impl(std::make_unique<Impl>(stringView, stringView.isNull() ? Nullopt : Optional<NonSharedCharacterBreakIterator>(NonSharedCharacterBreakIterator(stringView)), index))
+{
+}
+
+StringView::GraphemeClusters::Iterator::~Iterator()
+{
+}
+
+StringView::GraphemeClusters::Iterator::Iterator(Iterator&& other)
+ : m_impl(WTFMove(other.m_impl))
+{
+}
+
+auto StringView::GraphemeClusters::Iterator::operator++() -> Iterator&
+{
+ ++(*m_impl);
+ return *this;
+}
+
+StringView StringView::GraphemeClusters::Iterator::operator*() const
+{
+ return **m_impl;
+}
+
+bool StringView::GraphemeClusters::Iterator::operator==(const Iterator& other) const
+{
+ return *m_impl == *(other.m_impl);
+}
+
+bool StringView::GraphemeClusters::Iterator::operator!=(const Iterator& other) const
+{
+ return !(*this == other);
+}
+
</ins><span class="cx"> #if CHECK_STRINGVIEW_LIFETIME
</span><span class="cx">
</span><span class="cx"> // Manage reference count manually so UnderlyingString does not need to be defined in the header.
</span></span></pre></div>
<a id="trunkSourceWTFwtftextStringViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringView.h (203077 => 203078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/StringView.h 2016-07-11 19:43:19 UTC (rev 203077)
+++ trunk/Source/WTF/wtf/text/StringView.h 2016-07-11 19:50:40 UTC (rev 203078)
</span><span class="lines">@@ -82,6 +82,9 @@
</span><span class="cx"> class CodePoints;
</span><span class="cx"> CodePoints codePoints() const;
</span><span class="cx">
</span><ins>+ class GraphemeClusters;
+ GraphemeClusters graphemeClusters() const;
+
</ins><span class="cx"> bool is8Bit() const;
</span><span class="cx"> const LChar* characters8() const;
</span><span class="cx"> const UChar* characters16() const;
</span><span class="lines">@@ -580,6 +583,18 @@
</span><span class="cx"> return equalIgnoringASCIICaseCommon(a, b);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+class StringView::GraphemeClusters {
+public:
+ explicit GraphemeClusters(const StringView&);
+
+ class Iterator;
+ Iterator begin() const;
+ Iterator end() const;
+
+private:
+ StringView m_stringView;
+};
+
</ins><span class="cx"> class StringView::CodePoints {
</span><span class="cx"> public:
</span><span class="cx"> explicit CodePoints(const StringView&);
</span><span class="lines">@@ -604,6 +619,29 @@
</span><span class="cx"> StringView m_stringView;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+class StringView::GraphemeClusters::Iterator {
+public:
+ WTF_EXPORT_PRIVATE Iterator() = delete;
+ WTF_EXPORT_PRIVATE Iterator(const StringView&, unsigned index);
+ WTF_EXPORT_PRIVATE ~Iterator();
+
+ Iterator(const Iterator&) = delete;
+ WTF_EXPORT_PRIVATE Iterator(Iterator&&);
+ Iterator& operator=(const Iterator&) = delete;
+ Iterator& operator=(Iterator&&) = delete;
+
+ WTF_EXPORT_PRIVATE StringView operator*() const;
+ WTF_EXPORT_PRIVATE Iterator& operator++();
+
+ WTF_EXPORT_PRIVATE bool operator==(const Iterator&) const;
+ WTF_EXPORT_PRIVATE bool operator!=(const Iterator&) const;
+
+private:
+ class Impl;
+
+ std::unique_ptr<Impl> m_impl;
+};
+
</ins><span class="cx"> class StringView::CodePoints::Iterator {
</span><span class="cx"> public:
</span><span class="cx"> Iterator(const StringView&, unsigned index);
</span><span class="lines">@@ -637,6 +675,11 @@
</span><span class="cx"> unsigned m_index;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+inline auto StringView::graphemeClusters() const -> GraphemeClusters
+{
+ return GraphemeClusters(*this);
+}
+
</ins><span class="cx"> inline auto StringView::codePoints() const -> CodePoints
</span><span class="cx"> {
</span><span class="cx"> return CodePoints(*this);
</span><span class="lines">@@ -647,6 +690,21 @@
</span><span class="cx"> return CodeUnits(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+inline StringView::GraphemeClusters::GraphemeClusters(const StringView& stringView)
+ : m_stringView(stringView)
+{
+}
+
+inline auto StringView::GraphemeClusters::begin() const -> Iterator
+{
+ return Iterator(m_stringView, 0);
+}
+
+inline auto StringView::GraphemeClusters::end() const -> Iterator
+{
+ return Iterator(m_stringView, m_stringView.length());
+}
+
</ins><span class="cx"> inline StringView::CodePoints::CodePoints(const StringView& stringView)
</span><span class="cx"> : m_stringView(stringView)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWTFwtftextTextBreakIteratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/TextBreakIterator.cpp (203077 => 203078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/TextBreakIterator.cpp 2016-07-11 19:43:19 UTC (rev 203077)
+++ trunk/Source/WTF/wtf/text/TextBreakIterator.cpp 2016-07-11 19:50:40 UTC (rev 203078)
</span><span class="lines">@@ -819,7 +819,7 @@
</span><span class="cx"> {
</span><span class="cx"> m_iterator = nonSharedCharacterBreakIterator;
</span><span class="cx">
</span><del>- bool createdIterator = m_iterator && compareAndSwapNonSharedCharacterBreakIterator(m_iterator, 0);
</del><ins>+ bool createdIterator = m_iterator && compareAndSwapNonSharedCharacterBreakIterator(m_iterator, nullptr);
</ins><span class="cx"> if (!createdIterator)
</span><span class="cx"> m_iterator = initializeIterator(UBRK_CHARACTER);
</span><span class="cx"> if (!m_iterator)
</span><span class="lines">@@ -834,7 +834,13 @@
</span><span class="cx"> ubrk_close(reinterpret_cast<UBreakIterator*>(m_iterator));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+NonSharedCharacterBreakIterator::NonSharedCharacterBreakIterator(NonSharedCharacterBreakIterator&& other)
+ : m_iterator(nullptr)
+{
+ std::swap(m_iterator, other.m_iterator);
+}
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> // Iterator implemenation.
</span><span class="cx">
</span><span class="cx"> int textBreakFirst(TextBreakIterator* iterator)
</span></span></pre></div>
<a id="trunkSourceWTFwtftextTextBreakIteratorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/TextBreakIterator.h (203077 => 203078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/text/TextBreakIterator.h 2016-07-11 19:43:19 UTC (rev 203077)
+++ trunk/Source/WTF/wtf/text/TextBreakIterator.h 2016-07-11 19:50:40 UTC (rev 203078)
</span><span class="lines">@@ -198,6 +198,8 @@
</span><span class="cx"> WTF_EXPORT_PRIVATE NonSharedCharacterBreakIterator(StringView);
</span><span class="cx"> WTF_EXPORT_PRIVATE ~NonSharedCharacterBreakIterator();
</span><span class="cx">
</span><ins>+ NonSharedCharacterBreakIterator(NonSharedCharacterBreakIterator&&);
+
</ins><span class="cx"> operator TextBreakIterator*() const { return m_iterator; }
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (203077 => 203078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-07-11 19:43:19 UTC (rev 203077)
+++ trunk/Tools/ChangeLog 2016-07-11 19:50:40 UTC (rev 203078)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-07-11 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Implement grapheme cluster iterator on StringView
+ https://bugs.webkit.org/show_bug.cgi?id=159598
+
+ Reviewed by Anders Carlsson.
+
+ This is in preparation for honoring the second argument to FontFaceSet.load().
+
+ * TestWebKitAPI/Tests/WTF/StringView.cpp:
+ (TestWebKitAPI::compareLoopIterations):
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2016-07-11 Nan Wang <n_wang@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: WKWebView should have API to prevent pinch-to-zoom always being allowed
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFStringViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/StringView.cpp (203077 => 203078)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/StringView.cpp 2016-07-11 19:43:19 UTC (rev 203077)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/StringView.cpp 2016-07-11 19:50:40 UTC (rev 203078)
</span><span class="lines">@@ -78,6 +78,14 @@
</span><span class="cx"> SUCCEED();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool compareLoopIterations(StringView::GraphemeClusters graphemeClusters, std::vector<StringView> expected)
+{
+ std::vector<StringView> actual;
+ for (auto graphemeCluster : graphemeClusters)
+ actual.push_back(graphemeCluster);
+ return actual == expected;
+}
+
</ins><span class="cx"> bool compareLoopIterations(StringView::CodePoints codePoints, std::vector<UChar32> expected)
</span><span class="cx"> {
</span><span class="cx"> std::vector<UChar32> actual;
</span><span class="lines">@@ -103,43 +111,86 @@
</span><span class="cx">
</span><span class="cx"> TEST(WTF, StringViewIterators)
</span><span class="cx"> {
</span><del>- compareLoopIterations(StringView().codePoints(), { });
- compareLoopIterations(StringView().codeUnits(), { });
</del><ins>+ EXPECT_TRUE(compareLoopIterations(StringView().codePoints(), { }));
+ EXPECT_TRUE(compareLoopIterations(StringView().codeUnits(), { }));
+ EXPECT_TRUE(compareLoopIterations(StringView().graphemeClusters(), { }));
</ins><span class="cx">
</span><del>- compareLoopIterations(StringView::empty().codePoints(), { });
- compareLoopIterations(StringView::empty().codeUnits(), { });
</del><ins>+ EXPECT_TRUE(compareLoopIterations(StringView::empty().codePoints(), { }));
+ EXPECT_TRUE(compareLoopIterations(StringView::empty().codeUnits(), { }));
+ EXPECT_TRUE(compareLoopIterations(StringView::empty().graphemeClusters(), { }));
</ins><span class="cx">
</span><del>- compareLoopIterations(StringView(String("hello")).codePoints(), {'h', 'e', 'l', 'l', 'o'});
- compareLoopIterations(StringView(String("hello")).codeUnits(), {'h', 'e', 'l', 'l', 'o'});
</del><ins>+ String helo("helo");
+ StringView heloView(helo);
</ins><span class="cx">
</span><ins>+ EXPECT_TRUE(compareLoopIterations(heloView.codePoints(), {'h', 'e', 'l', 'o'}));
+ EXPECT_TRUE(compareLoopIterations(heloView.codeUnits(), {'h', 'e', 'l', 'o'}));
+ EXPECT_TRUE(compareLoopIterations(heloView.graphemeClusters(), {
+ StringView(heloView.characters8(), 1),
+ StringView(heloView.characters8() + 1, 1),
+ StringView(heloView.characters8() + 2, 1),
+ StringView(heloView.characters8() + 3, 1)}));
+
</ins><span class="cx"> StringBuilder b;
</span><span class="cx"> build(b, {0xD800, 0xDD55}); // Surrogates for unicode code point U+10155
</span><span class="cx"> EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).codePoints(), {0x10155}));
</span><span class="cx"> EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).codeUnits(), {0xD800, 0xDD55}));
</span><ins>+ EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).graphemeClusters(), {StringView(b.toString())}));
</ins><span class="cx">
</span><span class="cx"> build(b, {0xD800}); // Leading surrogate only
</span><span class="cx"> EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).codePoints(), {0xD800}));
</span><span class="cx"> EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).codeUnits(), {0xD800}));
</span><ins>+ EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).graphemeClusters(), {StringView(b.toString())}));
</ins><span class="cx">
</span><span class="cx"> build(b, {0xD800, 0xD801}); // Two leading surrogates
</span><span class="cx"> EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).codePoints(), {0xD800, 0xD801}));
</span><span class="cx"> EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).codeUnits(), {0xD800, 0xD801}));
</span><ins>+ EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).graphemeClusters(), {StringView(b.characters16(), 1), StringView(b.characters16() + 1, 1)}));
</ins><span class="cx">
</span><span class="cx"> build(b, {0xDD55}); // Trailing surrogate only
</span><span class="cx"> EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).codePoints(), {0xDD55}));
</span><span class="cx"> EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).codeUnits(), {0xDD55}));
</span><ins>+ EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).graphemeClusters(), {StringView(b.toString())}));
</ins><span class="cx">
</span><span class="cx"> build(b, {0xD800, 'h'}); // Leading surrogate followed by non-surrogate
</span><span class="cx"> EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).codePoints(), {0xD800, 'h'}));
</span><span class="cx"> EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).codeUnits(), {0xD800, 'h'}));
</span><ins>+ EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).graphemeClusters(), {StringView(b.characters16(), 1), StringView(b.characters16() + 1, 1)}));
</ins><span class="cx">
</span><span class="cx"> build(b, {0x0306}); // "COMBINING BREVE"
</span><span class="cx"> EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).codePoints(), {0x0306}));
</span><span class="cx"> EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).codeUnits(), {0x0306}));
</span><ins>+ EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).graphemeClusters(), {StringView(b.toString())}));
</ins><span class="cx">
</span><span class="cx"> build(b, {0x0306, 0xD800, 0xDD55, 'h', 'e', 'l', 'o'}); // Mix of single code unit and multi code unit code points
</span><span class="cx"> EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).codePoints(), {0x0306, 0x10155, 'h', 'e', 'l', 'o'}));
</span><span class="cx"> EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).codeUnits(), {0x0306, 0xD800, 0xDD55, 'h', 'e', 'l', 'o'}));
</span><ins>+ EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).graphemeClusters(), {
+ StringView(b.characters16(), 1),
+ StringView(b.characters16() + 1, 2),
+ StringView(b.characters16() + 3, 1),
+ StringView(b.characters16() + 4, 1),
+ StringView(b.characters16() + 5, 1),
+ StringView(b.characters16() + 6, 1)}));
+
+ build(b, {'e', 0x0301}); // "COMBINING ACUTE"
+ EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).codePoints(), {'e', 0x0301}));
+ EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).codeUnits(), {'e', 0x0301}));
+ EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).graphemeClusters(), {StringView(b.toString())}));
+
+ build(b, {'e', 0x0301, 0x0306, 'a'}); // "COMBINING ACUTE" "COMBINING BREVE"
+ EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).codePoints(), {'e', 0x0301, 0x0306, 'a'}));
+ EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).codeUnits(), {'e', 0x0301, 0x0306, 'a'}));
+ EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).graphemeClusters(), {
+ StringView(b.characters16(), 3),
+ StringView(b.characters16() + 3, 1),
+ }));
+
+ build(b, {0x1112, 0x116f, 0x11b6, 0x1107, 0x1161, 0x11B8}); // Korean combining Jamo
+ EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).codePoints(), {0x1112, 0x116f, 0x11b6, 0x1107, 0x1161, 0x11B8}));
+ EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).codeUnits(), {0x1112, 0x116f, 0x11b6, 0x1107, 0x1161, 0x11B8}));
+ EXPECT_TRUE(compareLoopIterations(StringView(b.toString()).graphemeClusters(), {
+ StringView(b.characters16(), 3),
+ StringView(b.characters16() + 3, 3)}));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> TEST(WTF, StringViewEqualIgnoringASCIICaseBasic)
</span></span></pre>
</div>
</div>
</body>
</html>