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