Improve the find word boundary performance

kyungtae · webkit-commit-queue · commit 207062b9f840 · 2013-12-13T04:59:44.000Z
https://bugs.webkit.org/show_bug.cgi?id=125619 In endWordBoundary case, the textBreakPrevious call in findWordBoundary is unnecessary. So use separate function for endWordBoundary can improve the performance. Patch by KyungTae Kim <ktf.kim@samsung.com> on 2013-12-12 Reviewed by Darin Adler. No tests because no operation changes. * editing/VisibleUnits.cpp: Use findEndWordBoundary in endWordBoundary (WebCore::endWordBoundary): * platform/text/TextBoundaries.cpp: Add findEndWordBoundary function (WebCore::findEndWordBoundary): * platform/text/TextBoundaries.h: * platform/text/mac/TextBoundaries.mm: Add findEndWordBoundary function (WebCore::findEndWordBoundary): Canonical link: https://commits.webkit.org/143697@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@160526 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,23 @@
+2013-12-12  KyungTae Kim  <ktf.kim@samsung.com>
+
+        Improve the find word boundary performance
+        https://bugs.webkit.org/show_bug.cgi?id=125619
+
+        In endWordBoundary case, the textBreakPrevious call in findWordBoundary is unnecessary.
+        So use separate function for endWordBoundary can improve the performance.
+
+        Reviewed by Darin Adler.
+
+        No tests because no operation changes.
+
+        * editing/VisibleUnits.cpp: Use findEndWordBoundary in endWordBoundary
+        (WebCore::endWordBoundary):
+        * platform/text/TextBoundaries.cpp: Add findEndWordBoundary function
+        (WebCore::findEndWordBoundary):
+        * platform/text/TextBoundaries.h:
+        * platform/text/mac/TextBoundaries.mm: Add findEndWordBoundary function
+        (WebCore::findEndWordBoundary):
+
 2013-12-12  Benjamin Poulain  <bpoulain@apple.com>
 
         Fix a silly mistake of r160467
diff --git a/Source/WebCore/editing/VisibleUnits.cpp b/Source/WebCore/editing/VisibleUnits.cpp
@@ -650,8 +650,8 @@ static unsigned endWordBoundary(const UChar* characters, unsigned length, unsign
         return length;
     }
     needMoreContext = false;
-    int start, end;
-    findWordBoundary(characters, length, offset, &start, &end);
+    int end;
+    findEndWordBoundary(characters, length, offset, &end);
     return end;
 }
 
diff --git a/Source/WebCore/platform/text/TextBoundaries.cpp b/Source/WebCore/platform/text/TextBoundaries.cpp
@@ -97,6 +97,14 @@ void findWordBoundary(const UChar* chars, int len, int position, int* start, int
     *start = textBreakPrevious(it);
 }
 
+void findEndWordBoundary(const UChar* chars, int len, int position, int* end)
+{
+    TextBreakIterator* it = wordBreakIterator(chars, len);
+    *end = textBreakFollowing(it, position);
+    if (*end < 0)
+        *end = textBreakLast(it);
+}
+
 #endif // !PLATFORM(MAC)
 
 } // namespace WebCore
diff --git a/Source/WebCore/platform/text/TextBoundaries.h b/Source/WebCore/platform/text/TextBoundaries.h
@@ -45,6 +45,7 @@ namespace WebCore {
     int startOfLastWordBoundaryContext(const UChar* characters, int length);
 
     void findWordBoundary(const UChar*, int len, int position, int* start, int* end);
+    void findEndWordBoundary(const UChar*, int len, int position, int* end);
     int findNextWordFromIndex(const UChar*, int len, int position, bool forward);
 
 }
diff --git a/Source/WebCore/platform/text/mac/TextBoundaries.mm b/Source/WebCore/platform/text/mac/TextBoundaries.mm
@@ -40,6 +40,17 @@ void findWordBoundary(const UChar* chars, int len, int position, int* start, int
     *end = range.location + range.length;
 }
 
+void findEndWordBoundary(const UChar* chars, int len, int position, int* end)
+{
+    NSString* string = [[NSString alloc] initWithCharactersNoCopy:const_cast<unichar*>(chars)
+        length:len freeWhenDone:NO];
+    NSAttributedString* attr = [[NSAttributedString alloc] initWithString:string];
+    NSRange range = [attr doubleClickAtIndex:(position >= len) ? len - 1 : position];
+    [attr release];
+    [string release];
+    *end = range.location + range.length;
+}
+
 int findNextWordFromIndex(const UChar* chars, int len, int position, bool forward)
 {   
     NSString* string = [[NSString alloc] initWithCharactersNoCopy:const_cast<unichar*>(chars)

Original file line number	Diff line number	Diff line change
`@@ -650,8 +650,8 @@ static unsigned endWordBoundary(const UChar* characters, unsigned length, unsign`
`650`	`650`	`return length;`
`651`	`651`	`}`
`652`	`652`	`needMoreContext = false;`
`653`		`- int start, end;`
`654`		`- findWordBoundary(characters, length, offset, &start, &end);`
	`653`	`+ int end;`
	`654`	`+ findEndWordBoundary(characters, length, offset, &end);`
`655`	`655`	`return end;`
`656`	`656`	`}`
`657`	`657`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ namespace WebCore {`
`45`	`45`	`int startOfLastWordBoundaryContext(const UChar* characters, int length);`
`46`	`46`
`47`	`47`	`void findWordBoundary(const UChar, int len, int position, int start, int* end);`
	`48`	`+ void findEndWordBoundary(const UChar, int len, int position, int end);`
`48`	`49`	`int findNextWordFromIndex(const UChar*, int len, int position, bool forward);`
`49`	`50`
`50`	`51`	`}`