<!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>[172513] 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/172513">172513</a></dd>

<dt>Author</dt> <dd>mmaxfield@apple.com</dd>

<dt>Date</dt> <dd>2014-08-12 20:53:47 -0700 (Tue, 12 Aug 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>Elements whose contents start with an astral Unicode symbol disappear when CSS `::first-letter` is applied to them

https://bugs.webkit.org/show_bug.cgi?id=135756

Reviewed by Darin Adler.

Source/WebCore:

The previous code assumed that all &quot;characters&quot; are exactly 1 16-bit code unit wide. Instead, use numCharactersInGraphemeClusters().

This patch also modifies the signature of numCharactersInGraphemeClusters() to take a StringView instead

of a string, which will avoid a copy.

Test: css1/pseudo/firstletter-surrogate.html

* platform/text/TextBreakIterator.cpp:

(WebCore::numCharactersInGraphemeClusters): Update numCharactersInGraphemeClusters() to take a StringView.

* platform/text/TextBreakIterator.h: Ditto.

* rendering/RenderBlock.cpp:

(WebCore::RenderBlock::createFirstLetterRenderer): Use numCharactersInGraphemeClusters() to determine the length

of the first letter, rather than assuming it has length of 1 code unit

(WebCore::RenderBlock::updateFirstLetter): Add a FIXME comment.

Source/WTF:

Add a method to StringView which passes through contains() to find().

* wtf/text/StringView.h:

(WTF::StringView::contains):

LayoutTests:

Make sure the pseudoclass matches manually wrapping a &lt;span&gt; around the character.

* css1/pseudo/firstletter-surrogate-expected.html: Added.

* css1/pseudo/firstletter-surrogate.html: Added.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>

<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>

<li><a href="#trunkSourceWTFwtftextStringViewh">trunk/Source/WTF/wtf/text/StringView.h</a></li>

<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>

<li><a href="#trunkSourceWebCoreplatformtextTextBreakIteratorcpp">trunk/Source/WebCore/platform/text/TextBreakIterator.cpp</a></li>

<li><a href="#trunkSourceWebCoreplatformtextTextBreakIteratorh">trunk/Source/WebCore/platform/text/TextBreakIterator.h</a></li>

<li><a href="#trunkSourceWebCorerenderingRenderBlockcpp">trunk/Source/WebCore/rendering/RenderBlock.cpp</a></li>

</ul>

<h3>Added Paths</h3>

<ul>

<li><a href="#trunkLayoutTestscss1pseudofirstlettersurrogateexpectedhtml">trunk/LayoutTests/css1/pseudo/firstletter-surrogate-expected.html</a></li>

<li><a href="#trunkLayoutTestscss1pseudofirstlettersurrogatehtml">trunk/LayoutTests/css1/pseudo/firstletter-surrogate.html</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkLayoutTestsChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (172512 => 172513)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/ChangeLog        2014-08-13 03:02:35 UTC (rev 172512)

+++ trunk/LayoutTests/ChangeLog        2014-08-13 03:53:47 UTC (rev 172513)

</span><span class="lines">@@ -1,3 +1,15 @@

</span><ins>+2014-08-11  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;

+

+        Elements whose contents start with an astral Unicode symbol disappear when CSS `::first-letter` is applied to them

+        https://bugs.webkit.org/show_bug.cgi?id=135756

+

+        Reviewed by Darin Adler.

+

+        Make sure the pseudoclass matches manually wrapping a &lt;span&gt; around the character.

+

+        * css1/pseudo/firstletter-surrogate-expected.html: Added.

+        * css1/pseudo/firstletter-surrogate.html: Added.

+

</ins><span class="cx"> 2014-08-12  Commit Queue  &lt;commit-queue@webkit.org&gt;

</span><span class="cx"> 

<span class="cx">         Unreviewed, rolling out r172494.

</span></span></pre></div>

<a id="trunkLayoutTestscss1pseudofirstlettersurrogateexpectedhtml"></a>

<div class="addfile"><h4>Added: trunk/LayoutTests/css1/pseudo/firstletter-surrogate-expected.html (0 => 172513)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/css1/pseudo/firstletter-surrogate-expected.html                                (rev 0)

+++ trunk/LayoutTests/css1/pseudo/firstletter-surrogate-expected.html        2014-08-13 03:53:47 UTC (rev 172513)

</span><span class="lines">@@ -0,0 +1,3 @@

</span><ins>+This test makes sure that the ::first-letter pseudoclass works with first

+letters that require surrogates when written in UTF-16.

+&lt;p&gt;&lt;span style=&quot;background: red;&quot;&gt;&amp;#x1D306;&lt;/span&gt;Lorem ipsum (1)&lt;/p&gt;

</ins></span></pre></div>

<a id="trunkLayoutTestscss1pseudofirstlettersurrogatehtml"></a>

<div class="addfile"><h4>Added: trunk/LayoutTests/css1/pseudo/firstletter-surrogate.html (0 => 172513)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/LayoutTests/css1/pseudo/firstletter-surrogate.html                                (rev 0)

+++ trunk/LayoutTests/css1/pseudo/firstletter-surrogate.html        2014-08-13 03:53:47 UTC (rev 172513)

</span><span class="lines">@@ -0,0 +1,8 @@

</span><ins>+&lt;style&gt;

+p::first-letter {

+    background: red;

+}

+&lt;/style&gt;

+This test makes sure that the ::first-letter pseudoclass works with first

+letters that require surrogates when written in UTF-16.

+&lt;p&gt;&amp;#x1D306;Lorem ipsum (1)&lt;/p&gt;

</ins></span></pre></div>

<a id="trunkSourceWTFChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (172512 => 172513)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WTF/ChangeLog        2014-08-13 03:02:35 UTC (rev 172512)

+++ trunk/Source/WTF/ChangeLog        2014-08-13 03:53:47 UTC (rev 172513)

</span><span class="lines">@@ -1,3 +1,15 @@

</span><ins>+2014-08-12  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;

+

+        Elements whose contents start with an astral Unicode symbol disappear when CSS `::first-letter` is applied to them

+        https://bugs.webkit.org/show_bug.cgi?id=135756

+

+        Reviewed by Darin Adler.

+

+        Add a method to StringView which passes through contains() to find().

+

+        * wtf/text/StringView.h:

+        (WTF::StringView::contains):

+

</ins><span class="cx"> 2014-08-12  Pratik Solanki  &lt;psolanki@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         Enable didReceiveDataArray callback on Mac

</span></span></pre></div>

<a id="trunkSourceWTFwtftextStringViewh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/text/StringView.h (172512 => 172513)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WTF/wtf/text/StringView.h        2014-08-13 03:02:35 UTC (rev 172512)

+++ trunk/Source/WTF/wtf/text/StringView.h        2014-08-13 03:53:47 UTC (rev 172513)

</span><span class="lines">@@ -179,6 +179,8 @@

</span><span class="cx">         return WTF::find(characters16(), length(), character, start);

</span><span class="cx">     }

</span><span class="cx"> 

</span><ins>+    bool contains(UChar c) const { return find(c) != notFound; }

+

</ins><span class="cx"> #if USE(CF)

<span class="cx">     // This function converts null strings to empty strings.

</span><span class="cx">     WTF_EXPORT_STRING_API RetainPtr&lt;CFStringRef&gt; createCFStringWithoutCopying() const;

</span></span></pre></div>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172512 => 172513)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-08-13 03:02:35 UTC (rev 172512)

+++ trunk/Source/WebCore/ChangeLog        2014-08-13 03:53:47 UTC (rev 172513)

</span><span class="lines">@@ -1,3 +1,25 @@

</span><ins>+2014-08-11  Myles C. Maxfield  &lt;mmaxfield@apple.com&gt;

+

+        Elements whose contents start with an astral Unicode symbol disappear when CSS `::first-letter` is applied to them

+        https://bugs.webkit.org/show_bug.cgi?id=135756

+

+        Reviewed by Darin Adler.

+

+        The previous code assumed that all &quot;characters&quot; are exactly 1 16-bit code unit wide. Instead, use numCharactersInGraphemeClusters().

+

+        This patch also modifies the signature of numCharactersInGraphemeClusters() to take a StringView instead

+        of a string, which will avoid a copy.

+

+        Test: css1/pseudo/firstletter-surrogate.html

+

+        * platform/text/TextBreakIterator.cpp:

+        (WebCore::numCharactersInGraphemeClusters): Update numCharactersInGraphemeClusters() to take a StringView.

+        * platform/text/TextBreakIterator.h: Ditto.

+        * rendering/RenderBlock.cpp:

+        (WebCore::RenderBlock::createFirstLetterRenderer): Use numCharactersInGraphemeClusters() to determine the length

+        of the first letter, rather than assuming it has length of 1 code unit

+        (WebCore::RenderBlock::updateFirstLetter): Add a FIXME comment.

+

</ins><span class="cx"> 2014-08-12  Jer Noble  &lt;jer.noble@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         [MSE][Mac] Seeking to the very beginning of a buffered range stalls video playback

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformtextTextBreakIteratorcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextBreakIterator.cpp (172512 => 172513)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/text/TextBreakIterator.cpp        2014-08-13 03:02:35 UTC (rev 172512)

+++ trunk/Source/WebCore/platform/text/TextBreakIterator.cpp        2014-08-13 03:53:47 UTC (rev 172513)

</span><span class="lines">@@ -377,7 +377,7 @@

</span><span class="cx">     return num;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-unsigned numCharactersInGraphemeClusters(const String&amp; s, unsigned numGraphemeClusters)

</del><ins>+unsigned numCharactersInGraphemeClusters(const StringView&amp; s, unsigned numGraphemeClusters)

</ins><span class="cx"> {

</span><span class="cx">     unsigned stringLength = s.length();

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebCoreplatformtextTextBreakIteratorh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextBreakIterator.h (172512 => 172513)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/platform/text/TextBreakIterator.h        2014-08-13 03:02:35 UTC (rev 172512)

+++ trunk/Source/WebCore/platform/text/TextBreakIterator.h        2014-08-13 03:53:47 UTC (rev 172513)

</span><span class="lines">@@ -183,7 +183,7 @@

</span><span class="cx"> unsigned numGraphemeClusters(const String&amp;);

</span><span class="cx"> // Returns the number of characters which will be less than or equal to

<span class="cx"> // the specified grapheme cluster length.

</span><del>-unsigned numCharactersInGraphemeClusters(const String&amp;, unsigned);

</del><ins>+unsigned numCharactersInGraphemeClusters(const StringView&amp;, unsigned);

</ins><span class="cx"> 

</span><span class="cx"> }

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebCorerenderingRenderBlockcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (172512 => 172513)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/rendering/RenderBlock.cpp        2014-08-13 03:02:35 UTC (rev 172512)

+++ trunk/Source/WebCore/rendering/RenderBlock.cpp        2014-08-13 03:53:47 UTC (rev 172513)

</span><span class="lines">@@ -63,6 +63,7 @@

</span><span class="cx"> #include &quot;SVGTextRunRenderingContext.h&quot;

</span><span class="cx"> #include &quot;Settings.h&quot;

</span><span class="cx"> #include &quot;ShadowRoot.h&quot;

</span><ins>+#include &quot;TextBreakIterator.h&quot;

</ins><span class="cx"> #include &quot;TransformState.h&quot;

</span><span class="cx"> #include &lt;wtf/NeverDestroyed.h&gt;

</span><span class="cx"> #include &lt;wtf/StackStats.h&gt;

</span><span class="lines">@@ -3585,8 +3586,8 @@

</span><span class="cx">         while (length &lt; oldText.length() &amp;&amp; shouldSkipForFirstLetter(oldText[length]))

</span><span class="cx">             length++;

</span><span class="cx"> 

<del>-        // Account for first letter.

-        length++;

</del><ins>+        // Account for first grapheme cluster.

+        length += numCharactersInGraphemeClusters(StringView(oldText).substring(length), 1);

</ins><span class="cx">         

</span><span class="cx">         // Keep looking for whitespace and allowed punctuation, but avoid

<span class="cx">         // accumulating just whitespace into the :first-letter.

</span><span class="lines">@@ -3686,6 +3687,8 @@

</span><span class="cx"> {

</span><span class="cx">     RenderObject* firstLetterObj;

</span><span class="cx">     RenderElement* firstLetterContainer;

</span><ins>+    // FIXME: The first letter might be composed of a variety of code units, and therefore might

+    // be contained within multiple RenderElements.

</ins><span class="cx">     getFirstLetter(firstLetterObj, firstLetterContainer);

</span><span class="cx"> 

</span><span class="cx">     if (!firstLetterObj)

</span></span></pre>

</div>

</div>

</body>

</html>