<!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>[163294] 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/163294">163294</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2014-02-03 00:41:24 -0800 (Mon, 03 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>More iOS build fixing.
Source/WebCore:
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper arrayOfTextForTextMarkers:attributed:]):
* html/parser/HTMLTreeBuilder.cpp:
(WebCore::HTMLTreeBuilder::linkifyPhoneNumbers):
* page/ios/FrameIOS.mm:
(WebCore::Frame::interpretationsForCurrentRoot):
Source/WebKit/ios:
* Misc/WebNSStringDrawing.mm:
(-[NSString __web_drawAtPoint:forWidth:withFont:ellipsis:letterSpacing:includeEmoji:measureOnly:renderedStringOut:drawUnderline:]):
(-[NSString __web_drawInRect:withFont:ellipsis:alignment:letterSpacing:lineSpacing:includeEmoji:truncationRect:measureOnly:renderedStringOut:drawUnderline:]):</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="#trunkSourceWebCorehtmlparserHTMLTreeBuildercpp">trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp</a></li>
<li><a href="#trunkSourceWebCorepageiosFrameIOSmm">trunk/Source/WebCore/page/ios/FrameIOS.mm</a></li>
<li><a href="#trunkSourceWebKitiosChangeLog">trunk/Source/WebKit/ios/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitiosMiscWebNSStringDrawingmm">trunk/Source/WebKit/ios/Misc/WebNSStringDrawing.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163293 => 163294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-03 08:27:26 UTC (rev 163293)
+++ trunk/Source/WebCore/ChangeLog 2014-02-03 08:41:24 UTC (rev 163294)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-02-03 Dan Bernstein <mitz@apple.com>
+
+ More iOS build fixing.
+
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper arrayOfTextForTextMarkers:attributed:]):
+ * html/parser/HTMLTreeBuilder.cpp:
+ (WebCore::HTMLTreeBuilder::linkifyPhoneNumbers):
+ * page/ios/FrameIOS.mm:
+ (WebCore::Frame::interpretationsForCurrentRoot):
+
</ins><span class="cx"> 2014-02-03 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Try to fix iOS build.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (163293 => 163294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2014-02-03 08:27:26 UTC (rev 163293)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2014-02-03 08:41:24 UTC (rev 163294)
</span><span class="lines">@@ -1602,7 +1602,7 @@
</span><span class="cx"> String listMarkerText = m_object->listMarkerTextForNodeAndPosition(node, VisiblePosition(it.range()->startPosition()));
</span><span class="cx">
</span><span class="cx"> if (!listMarkerText.isEmpty())
</span><del>- [array addObject:[NSString stringWithCharacters:listMarkerText.characters() length:listMarkerText.length()]];
</del><ins>+ [array addObject:[NSString stringWithCharacters:listMarkerText.deprecatedCharacters() length:listMarkerText.length()]];
</ins><span class="cx"> // There was not an element representation, so just return the text.
</span><span class="cx"> [array addObject:[NSString stringWithCharacters:it.characters() length:it.length()]];
</span><span class="cx"> }
</span><span class="lines">@@ -1612,7 +1612,7 @@
</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.characters(), listMarkerText.length());
</del><ins>+ AXAttributedStringAppendText(attrString, node, listMarkerText.deprecatedCharacters(), listMarkerText.length());
</ins><span class="cx"> [array addObject:attrString];
</span><span class="cx"> [attrString release];
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserHTMLTreeBuildercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp (163293 => 163294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2014-02-03 08:27:26 UTC (rev 163293)
+++ trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp 2014-02-03 08:41:24 UTC (rev 163294)
</span><span class="lines">@@ -2397,7 +2397,7 @@
</span><span class="cx"> int relativeEndPosition = 0;
</span><span class="cx">
</span><span class="cx"> // While there's a phone number in the rest of the string...
</span><del>- while ((scannerPosition < length) && DDDFAScannerFirstResultInUnicharArray(phoneNumbersScanner, &string.characters()[scannerPosition], length - scannerPosition, &relativeStartPosition, &relativeEndPosition)) {
</del><ins>+ while ((scannerPosition < length) && DDDFAScannerFirstResultInUnicharArray(phoneNumbersScanner, &string.deprecatedCharacters()[scannerPosition], length - scannerPosition, &relativeStartPosition, &relativeEndPosition)) {
</ins><span class="cx"> // The convention in the Data Detectors framework is that the end position is the first character NOT in the phone number
</span><span class="cx"> // (that is, the length of the range is relativeEndPosition - relativeStartPosition). So substract 1 to get the same
</span><span class="cx"> // convention as the old WebCore phone number parser (so that the rest of the code is still valid if we want to go back
</span></span></pre></div>
<a id="trunkSourceWebCorepageiosFrameIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ios/FrameIOS.mm (163293 => 163294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ios/FrameIOS.mm 2014-02-03 08:27:26 UTC (rev 163293)
+++ trunk/Source/WebCore/page/ios/FrameIOS.mm 2014-02-03 08:41:24 UTC (rev 163294)
</span><span class="lines">@@ -819,7 +819,7 @@
</span><span class="cx"> RefPtr<Range> precedingTextRange = Range::create(*document(), precedingTextStartPosition, createLegacyEditingPosition(node, marker->startOffset()));
</span><span class="cx"> String precedingText = plainText(precedingTextRange.get());
</span><span class="cx"> if (unsigned length = precedingText.length()) {
</span><del>- const UChar* characters = precedingText.characters();
</del><ins>+ const UChar* characters = precedingText.deprecatedCharacters();
</ins><span class="cx"> for (size_t i = 0; i < interpretationsCount; ++i)
</span><span class="cx"> interpretations.at(i).append(characters, length);
</span><span class="cx"> }
</span><span class="lines">@@ -829,7 +829,7 @@
</span><span class="cx"> String visibleTextForMarker = plainText(rangeForMarker.get());
</span><span class="cx"> size_t interpretationsCountForCurrentMarker = marker->alternatives().size() + 1;
</span><span class="cx"> unsigned visibleTextForMarkerLength = visibleTextForMarker.length();
</span><del>- const UChar* visibleTextForMarkerCharacters = visibleTextForMarker.characters();
</del><ins>+ const UChar* visibleTextForMarkerCharacters = visibleTextForMarker.deprecatedCharacters();
</ins><span class="cx"> for (size_t i = 0; i < interpretationsCount; ++i) {
</span><span class="cx"> // Determine text for the ith interpretation. It will either be the visible text, or one of its
</span><span class="cx"> // alternatives stored in the marker.
</span><span class="lines">@@ -839,7 +839,7 @@
</span><span class="cx"> interpretations.at(i).append(visibleTextForMarkerCharacters, visibleTextForMarkerLength);
</span><span class="cx"> else {
</span><span class="cx"> const String& alternative = marker->alternatives().at(i % marker->alternatives().size());
</span><del>- interpretations.at(i).append(alternative.characters(), alternative.length());
</del><ins>+ interpretations.at(i).append(alternative.deprecatedCharacters(), alternative.length());
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -852,7 +852,7 @@
</span><span class="cx"> // Finally, add any text after the last marker.
</span><span class="cx"> RefPtr<Range> afterLastMarkerRange = Range::create(*document(), precedingTextStartPosition, createLegacyEditingPosition(root, rootChildCount));
</span><span class="cx"> String textAfterLastMarker = plainText(afterLastMarkerRange.get());
</span><del>- const UChar* textAfterLastMarkerCharacters = textAfterLastMarker.characters();
</del><ins>+ const UChar* textAfterLastMarkerCharacters = textAfterLastMarker.deprecatedCharacters();
</ins><span class="cx"> if (unsigned length = textAfterLastMarker.length()) {
</span><span class="cx"> for (size_t i = 0; i < interpretationsCount; ++i)
</span><span class="cx"> interpretations.at(i).append(textAfterLastMarkerCharacters, length);
</span></span></pre></div>
<a id="trunkSourceWebKitiosChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/ChangeLog (163293 => 163294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/ChangeLog 2014-02-03 08:27:26 UTC (rev 163293)
+++ trunk/Source/WebKit/ios/ChangeLog 2014-02-03 08:41:24 UTC (rev 163294)
</span><span class="lines">@@ -1,3 +1,11 @@
</span><ins>+2014-02-03 Dan Bernstein <mitz@apple.com>
+
+ More iOS build fixing.
+
+ * Misc/WebNSStringDrawing.mm:
+ (-[NSString __web_drawAtPoint:forWidth:withFont:ellipsis:letterSpacing:includeEmoji:measureOnly:renderedStringOut:drawUnderline:]):
+ (-[NSString __web_drawInRect:withFont:ellipsis:alignment:letterSpacing:lineSpacing:includeEmoji:truncationRect:measureOnly:renderedStringOut:drawUnderline:]):
+
</ins><span class="cx"> 2014-01-31 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Remove inline member functions of FrameSelection that access m_selection
</span></span></pre></div>
<a id="trunkSourceWebKitiosMiscWebNSStringDrawingmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ios/Misc/WebNSStringDrawing.mm (163293 => 163294)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ios/Misc/WebNSStringDrawing.mm 2014-02-03 08:27:26 UTC (rev 163293)
+++ trunk/Source/WebKit/ios/Misc/WebNSStringDrawing.mm 2014-02-03 08:41:24 UTC (rev 163294)
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx">
</span><span class="cx"> String fullString(self);
</span><span class="cx"> UCharDirection base = U_LEFT_TO_RIGHT;
</span><del>- bool stringNeedsBidi = needsBidiLayout(fullString.characters(), fullString.length(), base);
</del><ins>+ bool stringNeedsBidi = needsBidiLayout(fullString.deprecatedCharacters(), fullString.length(), base);
</ins><span class="cx"> float stringWidth;
</span><span class="cx"> String s = (width >= FLT_MAX && !measureOnly) ? fullString : applyEllipsisStyle(fullString, ellipsisStyle, width, renderer, shouldDisableWordRounding() ? StringTruncator::DisableRoundingHacks : StringTruncator::EnableRoundingHacks, &stringWidth);
</span><span class="cx">
</span><span class="lines">@@ -284,9 +284,9 @@
</span><span class="cx"> // FIXME: For proper bidi rendering, we need to pass the whole string, rather than the truncated string.
</span><span class="cx"> // Otherwise, weak/neutral characters on either side of the ellipsis may pick up the wrong direction
</span><span class="cx"> // if there are strong characters ellided.
</span><del>- stringWidth = drawAtPoint(s.characters(), s.length(), point, renderer, &context, drawUnderline, &status);
</del><ins>+ stringWidth = drawAtPoint(s.deprecatedCharacters(), s.length(), point, renderer, &context, drawUnderline, &status);
</ins><span class="cx"> } else {
</span><del>- stringWidth = drawAtPoint(s.characters(), s.length(), point, renderer, &context, drawUnderline);
</del><ins>+ stringWidth = drawAtPoint(s.deprecatedCharacters(), s.length(), point, renderer, &context, drawUnderline);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -396,7 +396,7 @@
</span><span class="cx"> float maxLineWidth = 0;
</span><span class="cx"> cursor.y += ascent;
</span><span class="cx">
</span><del>- const UniChar *buffer = drawString.characters();
</del><ins>+ const UniChar *buffer = drawString.deprecatedCharacters();
</ins><span class="cx"> const UniChar *startOfLine = buffer;
</span><span class="cx">
</span><span class="cx"> BOOL lastLine = NO;
</span><span class="lines">@@ -610,9 +610,9 @@
</span><span class="cx"> // FIXME: For proper bidi rendering, we need to pass the whole string, rather than the truncated string.
</span><span class="cx"> // Otherwise, weak/neutral characters on either side of the ellipsis may pick up the wrong direction
</span><span class="cx"> // if there are strong characters ellided.
</span><del>- lineWidth = drawAtPoint(ellipsisResult.characters(), ellipsisResult.length(), textPoint, renderer, &context, drawUnderline, paragraphNeedsBidi ? &status : 0);
</del><ins>+ lineWidth = drawAtPoint(ellipsisResult.deprecatedCharacters(), ellipsisResult.length(), textPoint, renderer, &context, drawUnderline, paragraphNeedsBidi ? &status : 0);
</ins><span class="cx"> if (!renderedString.isNull())
</span><del>- renderedString.append(ellipsisResult.characters(), ellipsisResult.length());
</del><ins>+ renderedString.append(ellipsisResult.deprecatedCharacters(), ellipsisResult.length());
</ins><span class="cx">
</span><span class="cx"> if (truncationRect) {
</span><span class="cx"> if (ellipsisResult == lastLine && !droppingLines) {
</span></span></pre>
</div>
</div>
</body>
</html>