<!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>[160526] trunk/Source/WebCore</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/160526">160526</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-12 20:59:44 -0800 (Thu, 12 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>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.
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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingVisibleUnitscpp">trunk/Source/WebCore/editing/VisibleUnits.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextBoundariescpp">trunk/Source/WebCore/platform/text/TextBoundaries.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformtextTextBoundariesh">trunk/Source/WebCore/platform/text/TextBoundaries.h</a></li>
<li><a href="#trunkSourceWebCoreplatformtextmacTextBoundariesmm">trunk/Source/WebCore/platform/text/mac/TextBoundaries.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (160525 => 160526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-13 03:50:46 UTC (rev 160525)
+++ trunk/Source/WebCore/ChangeLog 2013-12-13 04:59:44 UTC (rev 160526)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+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):
+
</ins><span class="cx"> 2013-12-12 Benjamin Poulain <bpoulain@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix a silly mistake of r160467
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingVisibleUnitscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/VisibleUnits.cpp (160525 => 160526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/VisibleUnits.cpp 2013-12-13 03:50:46 UTC (rev 160525)
+++ trunk/Source/WebCore/editing/VisibleUnits.cpp 2013-12-13 04:59:44 UTC (rev 160526)
</span><span class="lines">@@ -650,8 +650,8 @@
</span><span class="cx"> return length;
</span><span class="cx"> }
</span><span class="cx"> needMoreContext = false;
</span><del>- int start, end;
- findWordBoundary(characters, length, offset, &start, &end);
</del><ins>+ int end;
+ findEndWordBoundary(characters, length, offset, &end);
</ins><span class="cx"> return end;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextBoundariescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextBoundaries.cpp (160525 => 160526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextBoundaries.cpp 2013-12-13 03:50:46 UTC (rev 160525)
+++ trunk/Source/WebCore/platform/text/TextBoundaries.cpp 2013-12-13 04:59:44 UTC (rev 160526)
</span><span class="lines">@@ -97,6 +97,14 @@
</span><span class="cx"> *start = textBreakPrevious(it);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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);
+}
+
</ins><span class="cx"> #endif // !PLATFORM(MAC)
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextTextBoundariesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/TextBoundaries.h (160525 => 160526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/TextBoundaries.h 2013-12-13 03:50:46 UTC (rev 160525)
+++ trunk/Source/WebCore/platform/text/TextBoundaries.h 2013-12-13 04:59:44 UTC (rev 160526)
</span><span class="lines">@@ -45,6 +45,7 @@
</span><span class="cx"> int startOfLastWordBoundaryContext(const UChar* characters, int length);
</span><span class="cx">
</span><span class="cx"> void findWordBoundary(const UChar*, int len, int position, int* start, int* end);
</span><ins>+ void findEndWordBoundary(const UChar*, int len, int position, int* end);
</ins><span class="cx"> int findNextWordFromIndex(const UChar*, int len, int position, bool forward);
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformtextmacTextBoundariesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/text/mac/TextBoundaries.mm (160525 => 160526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/text/mac/TextBoundaries.mm 2013-12-13 03:50:46 UTC (rev 160525)
+++ trunk/Source/WebCore/platform/text/mac/TextBoundaries.mm 2013-12-13 04:59:44 UTC (rev 160526)
</span><span class="lines">@@ -40,6 +40,17 @@
</span><span class="cx"> *end = range.location + range.length;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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;
+}
+
</ins><span class="cx"> int findNextWordFromIndex(const UChar* chars, int len, int position, bool forward)
</span><span class="cx"> {
</span><span class="cx"> NSString* string = [[NSString alloc] initWithCharactersNoCopy:const_cast<unichar*>(chars)
</span></span></pre>
</div>
</div>
</body>
</html>