Title: [161795] trunk/Source/WebCore
- Revision
- 161795
- Author
- [email protected]
- Date
- 2014-01-11 20:13:43 -0800 (Sat, 11 Jan 2014)
Log Message
[iOS] Fix build failure in WebCore::findEndWordBoundary()
Filed Bug 126830 for the proper fix:
<http://webkit.org/b/126830>
* editing/VisibleUnits.cpp:
(WebCore::endWordBoundary): Switch back to using
WebCore::findWordBoundary() on iOS.
* platform/text/mac/TextBoundaries.mm:
(WebCore::findEndWordBoundary): Add FIXME for iOS implementation
that doesn't use NSAttributedString.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (161794 => 161795)
--- trunk/Source/WebCore/ChangeLog 2014-01-12 03:53:39 UTC (rev 161794)
+++ trunk/Source/WebCore/ChangeLog 2014-01-12 04:13:43 UTC (rev 161795)
@@ -1,3 +1,18 @@
+2014-01-11 David Kilzer <[email protected]>
+
+ [iOS] Fix build failure in WebCore::findEndWordBoundary()
+
+ Filed Bug 126830 for the proper fix:
+ <http://webkit.org/b/126830>
+
+ * editing/VisibleUnits.cpp:
+ (WebCore::endWordBoundary): Switch back to using
+ WebCore::findWordBoundary() on iOS.
+
+ * platform/text/mac/TextBoundaries.mm:
+ (WebCore::findEndWordBoundary): Add FIXME for iOS implementation
+ that doesn't use NSAttributedString.
+
2014-01-11 Andy Estes <[email protected]>
[iOS] Move text autosizing code from RenderBlock to RenderBlockFlow
Modified: trunk/Source/WebCore/editing/VisibleUnits.cpp (161794 => 161795)
--- trunk/Source/WebCore/editing/VisibleUnits.cpp 2014-01-12 03:53:39 UTC (rev 161794)
+++ trunk/Source/WebCore/editing/VisibleUnits.cpp 2014-01-12 04:13:43 UTC (rev 161795)
@@ -658,8 +658,14 @@
return length;
}
needMoreContext = false;
+#if PLATFORM(IOS)
+ // FIXME: Bug 126830: [iOS] Implement WebCore::findEndWordBoundary()
+ int start, end;
+ findWordBoundary(characters, length, offset, &start, &end);
+#else
int end;
findEndWordBoundary(characters, length, offset, &end);
+#endif
return end;
}
Modified: trunk/Source/WebCore/platform/text/mac/TextBoundaries.mm (161794 => 161795)
--- trunk/Source/WebCore/platform/text/mac/TextBoundaries.mm 2014-01-12 03:53:39 UTC (rev 161794)
+++ trunk/Source/WebCore/platform/text/mac/TextBoundaries.mm 2014-01-12 04:13:43 UTC (rev 161795)
@@ -247,6 +247,7 @@
void findEndWordBoundary(const UChar* chars, int len, int position, int* end)
{
+#if !PLATFORM(IOS)
NSString* string = [[NSString alloc] initWithCharactersNoCopy:const_cast<unichar*>(chars)
length:len freeWhenDone:NO];
NSAttributedString* attr = [[NSAttributedString alloc] initWithString:string];
@@ -254,6 +255,13 @@
[attr release];
[string release];
*end = range.location + range.length;
+#else
+ // FIXME: Bug 126830: [iOS] Implement WebCore::findEndWordBoundary()
+ UNUSED_PARAM(chars);
+ UNUSED_PARAM(len);
+ UNUSED_PARAM(position);
+ UNUSED_PARAM(end);
+#endif
}
int findNextWordFromIndex(const UChar* chars, int len, int position, bool forward)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
