Title: [204027] trunk/Source/WebCore
- Revision
- 204027
- Author
- mmaxfi...@apple.com
- Date
- 2016-08-02 09:57:20 -0700 (Tue, 02 Aug 2016)
Log Message
[macOS] Guard workaround in r203314 for only OSes which need it
https://bugs.webkit.org/show_bug.cgi?id=160440
Reviewed by Simon Fraser.
The workarond introduced in r203314 only needs to be applied on
certain OSes.
No new tests because there is no behavior change.
* platform/text/mac/TextBoundaries.mm:
(WebCore::findNextWordFromIndex):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (204026 => 204027)
--- trunk/Source/WebCore/ChangeLog 2016-08-02 15:46:10 UTC (rev 204026)
+++ trunk/Source/WebCore/ChangeLog 2016-08-02 16:57:20 UTC (rev 204027)
@@ -1,3 +1,18 @@
+2016-08-02 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ [macOS] Guard workaround in r203314 for only OSes which need it
+ https://bugs.webkit.org/show_bug.cgi?id=160440
+
+ Reviewed by Simon Fraser.
+
+ The workarond introduced in r203314 only needs to be applied on
+ certain OSes.
+
+ No new tests because there is no behavior change.
+
+ * platform/text/mac/TextBoundaries.mm:
+ (WebCore::findNextWordFromIndex):
+
2016-08-02 Youenn Fablet <you...@apple.com>
Remove CachedResourceRequest initiatingDocumentLoader
Modified: trunk/Source/WebCore/platform/text/mac/TextBoundaries.mm (204026 => 204027)
--- trunk/Source/WebCore/platform/text/mac/TextBoundaries.mm 2016-08-02 15:46:10 UTC (rev 204026)
+++ trunk/Source/WebCore/platform/text/mac/TextBoundaries.mm 2016-08-02 16:57:20 UTC (rev 204027)
@@ -232,9 +232,9 @@
int findNextWordFromIndex(StringView text, int position, bool forward)
{
#if USE(APPKIT)
+#if __MAC_OS_X_VERSION_MIN_REQUIRED < 101200
if (!text.length())
return 0;
- // FIXME: Remove when <rdar://problem/27380532> is fixed.
if (!text.is8Bit() && !forward) {
int chunkSize = 256;
int decrement = chunkSize / 2;
@@ -257,6 +257,7 @@
}
return 0;
}
+#endif
NSAttributedString *attributedString = [[NSAttributedString alloc] initWithString:text.createNSStringWithoutCopying().get()];
int result = [attributedString nextWordFromIndex:position forward:forward];
[attributedString release];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
