<!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>[163715] 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/163715">163715</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-02-08 10:35:17 -0800 (Sat, 08 Feb 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Source/WebCore: More (and more correct) iOS build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/163712">r163712</a>.

* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(AXAttributedStringAppendText):
(-[WebAccessibilityObjectWrapper arrayOfTextForTextMarkers:attributed:]):
* page/ios/FrameIOS.mm:
(WebCore::Frame::wordsInCurrentParagraph):

Source/WebKit/mac: iOS build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/163712">r163712</a>.

* WebCoreSupport/WebEditorClient.h:
* WebCoreSupport/WebEditorClient.mm:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm">trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm</a></li>
<li><a href="#trunkSourceWebCorepageiosFrameIOSmm">trunk/Source/WebCore/page/ios/FrameIOS.mm</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebEditorClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebEditorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163714 => 163715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2014-02-08 18:06:45 UTC (rev 163714)
+++ trunk/Source/WebCore/ChangeLog        2014-02-08 18:35:17 UTC (rev 163715)
</span><span class="lines">@@ -1,8 +1,18 @@
</span><span class="cx"> 2014-02-08  Dan Bernstein  &lt;mitz@apple.com&gt;
</span><span class="cx"> 
</span><del>-        iOS build fix after r163712
</del><ins>+        More (and more correct) iOS build fix after r163712.
</ins><span class="cx"> 
</span><ins>+        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+        (AXAttributedStringAppendText):
+        (-[WebAccessibilityObjectWrapper arrayOfTextForTextMarkers:attributed:]):
</ins><span class="cx">         * page/ios/FrameIOS.mm:
</span><ins>+        (WebCore::Frame::wordsInCurrentParagraph):
+
+2014-02-08  Dan Bernstein  &lt;mitz@apple.com&gt;
+
+        iOS build fix after r163712.
+
+        * page/ios/FrameIOS.mm:
</ins><span class="cx">         (WebCore::Frame::indexCountOfWordPrecedingSelection):
</span><span class="cx">         (WebCore::Frame::wordsInCurrentParagraph):
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (163714 => 163715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm        2014-02-08 18:06:45 UTC (rev 163714)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm        2014-02-08 18:35:17 UTC (rev 163715)
</span><span class="lines">@@ -1530,17 +1530,17 @@
</span><span class="cx">     }
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static void AXAttributedStringAppendText(NSMutableAttributedString* attrString, Node* node, const UChar* chars, int length)
</del><ins>+static void AXAttributedStringAppendText(NSMutableAttributedString* attrString, Node* node, NSString *text)
</ins><span class="cx"> {
</span><span class="cx">     // skip invisible text
</span><span class="cx">     if (!node-&gt;renderer())
</span><span class="cx">         return;
</span><span class="cx">     
</span><span class="cx">     // easier to calculate the range before appending the string
</span><del>-    NSRange attrStringRange = NSMakeRange([attrString length], length);
</del><ins>+    NSRange attrStringRange = NSMakeRange([attrString length], [text length]);
</ins><span class="cx">     
</span><span class="cx">     // append the string from this node
</span><del>-    [[attrString mutableString] appendString:[NSString stringWithCharacters:chars length:length]];
</del><ins>+    [[attrString mutableString] appendString:text];
</ins><span class="cx">     
</span><span class="cx">     // set new attributes
</span><span class="cx">     AXAttributeStringSetStyle(attrString, node-&gt;renderer(), attrStringRange);
</span><span class="lines">@@ -1602,7 +1602,7 @@
</span><span class="cx">                 if (!listMarkerText.isEmpty()) 
</span><span class="cx">                     [array addObject:[NSString stringWithCharacters:listMarkerText.deprecatedCharacters() length:listMarkerText.length()]];
</span><span class="cx">                 // There was not an element representation, so just return the text.
</span><del>-                [array addObject:[NSString stringWithCharacters:it.characters() length:it.length()]];
</del><ins>+                [array addObject:adoptNS([it.text().createNSStringWithoutCopying() copy]).get()];
</ins><span class="cx">             }
</span><span class="cx">             else
</span><span class="cx">             {
</span><span class="lines">@@ -1610,13 +1610,13 @@
</span><span class="cx"> 
</span><span class="cx">                 if (!listMarkerText.isEmpty()) {
</span><span class="cx">                     NSMutableAttributedString* attrString = [[NSMutableAttributedString alloc] init];
</span><del>-                    AXAttributedStringAppendText(attrString, node, listMarkerText.deprecatedCharacters(), listMarkerText.length());
</del><ins>+                    AXAttributedStringAppendText(attrString, node, listMarkerText);
</ins><span class="cx">                     [array addObject:attrString];
</span><span class="cx">                     [attrString release];
</span><span class="cx">                 }
</span><span class="cx">                 
</span><span class="cx">                 NSMutableAttributedString *attrString = [[NSMutableAttributedString alloc] init];
</span><del>-                AXAttributedStringAppendText(attrString, node, it.characters(), it.length());
</del><ins>+                AXAttributedStringAppendText(attrString, node, it.text().createNSStringWithoutCopying().get());
</ins><span class="cx">                 [array addObject:attrString];
</span><span class="cx">                 [attrString release];
</span><span class="cx">             }
</span></span></pre></div>
<a id="trunkSourceWebCorepageiosFrameIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ios/FrameIOS.mm (163714 => 163715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ios/FrameIOS.mm        2014-02-08 18:06:45 UTC (rev 163714)
+++ trunk/Source/WebCore/page/ios/FrameIOS.mm        2014-02-08 18:35:17 UTC (rev 163715)
</span><span class="lines">@@ -191,14 +191,14 @@
</span><span class="cx">                 if (isSpaceOrNewline(text[i]) || text[i] == 0xA0) {
</span><span class="cx">                     int wordLength = i - startOfWordBoundary;
</span><span class="cx">                     if (wordLength &gt; 0) {
</span><del>-                        RetainPtr&lt;NSString&gt; chunk = text.substring(startOfWordBoundary, wordLength).createNSStringWithoutCopying();
</del><ins>+                        RetainPtr&lt;NSString&gt; chunk = text.substring(startOfWordBoundary, wordLength).createNSString();
</ins><span class="cx">                         [words addObject:chunk.get()];
</span><span class="cx">                     }
</span><span class="cx">                     startOfWordBoundary += wordLength + 1;
</span><span class="cx">                 }
</span><span class="cx">             }
</span><span class="cx">             if (startOfWordBoundary &lt; length) {
</span><del>-                RetainPtr&lt;NSString&gt; chunk = text.substring(startOfWordBoundary, length - startOfWordBoundary).createNSStringWithoutCopying();
</del><ins>+                RetainPtr&lt;NSString&gt; chunk = text.substring(startOfWordBoundary, length - startOfWordBoundary).createNSString();
</ins><span class="cx">                 [words addObject:chunk.get()];
</span><span class="cx">             }
</span><span class="cx">         }
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (163714 => 163715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog        2014-02-08 18:06:45 UTC (rev 163714)
+++ trunk/Source/WebKit/mac/ChangeLog        2014-02-08 18:35:17 UTC (rev 163715)
</span><span class="lines">@@ -1,3 +1,10 @@
</span><ins>+2014-02-08  Dan Bernstein  &lt;mitz@apple.com&gt;
+
+        iOS build fix after r163712.
+
+        * WebCoreSupport/WebEditorClient.h:
+        * WebCoreSupport/WebEditorClient.mm:
+
</ins><span class="cx"> 2014-02-08  Darin Adler  &lt;darin@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Change TextIterator to use StringView, preparing to wean it from deprecatedCharacters
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebEditorClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h (163714 => 163715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h        2014-02-08 18:06:45 UTC (rev 163714)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.h        2014-02-08 18:35:17 UTC (rev 163715)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #import &lt;wtf/Forward.h&gt;
</span><span class="cx"> #import &lt;wtf/RetainPtr.h&gt;
</span><span class="cx"> #import &lt;wtf/Vector.h&gt;
</span><ins>+#import &lt;wtf/text/StringView.h&gt;
</ins><span class="cx"> 
</span><span class="cx"> @class WebView;
</span><span class="cx"> @class WebEditorUndoTarget;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebEditorClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm (163714 => 163715)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm        2014-02-08 18:06:45 UTC (rev 163714)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebEditorClient.mm        2014-02-08 18:35:17 UTC (rev 163715)
</span><span class="lines">@@ -71,7 +71,6 @@
</span><span class="cx"> #import &lt;wtf/MainThread.h&gt;
</span><span class="cx"> #import &lt;wtf/PassRefPtr.h&gt;
</span><span class="cx"> #import &lt;wtf/RunLoop.h&gt;
</span><del>-#import &lt;wtf/text/StringView.h&gt;
</del><span class="cx"> #import &lt;wtf/text/WTFString.h&gt;
</span><span class="cx"> 
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre>
</div>
</div>

</body>
</html>