Bug 201144 – Don't compute upconverted characters twice in buildQuery() in DataDetection.mm

• Component: HTML Editing
• Status: RESOLVED FIXED

[David Kilzer (:ddkilzer)]

Currently upconverted characters (and string length) are computed twice in buildQuery() in DataDetection.mm:

    for (TextIterator iterator(contextRange); !iterator.atEnd(); iterator.advance(), iteratorCount++) {
        size_t currentTextLength = iterator.text().length();
        [...]
        const UniChar* currentCharPtr = iterator.text().upconvertedCharacters();
        [...]
        RetainPtr<CFStringRef> currentText = adoptCF(CFStringCreateWithCharacters(kCFAllocatorDefault, iterator.text().upconvertedCharacters(), iterator.text().length()));
        [...]
    }

<https://trac.webkit.org/browser/webkit/trunk/Source/WebCore/editing/cocoa/DataDetection.mm#L365>

There's no need to compute these twice, so we can extract the common code.

<rdar://problem/54689399>

[David Kilzer (:ddkilzer)]

Created attachment 377260 [details]
Patch v1

[Brent Fulgham]

Comment on attachment 377260 [details]
Patch v1

r=me

[WebKit Commit Bot]

Comment on attachment 377260 [details]
Patch v1

Clearing flags on attachment: 377260

Committed r249115: <https://trac.webkit.org/changeset/249115>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.