Changeset 88204 in webkit

Timestamp:

Jun 6, 2011, 5:07:10 PM (15 years ago)

Author:

sullivan@apple.com

Message:

<​https://bugs.webkit.org/show_bug.cgi?id=62165>
<rdar://problem/9555835>
WebKit2 find-on-page callback doesn’t handle kWKMoreThanMaximumMatchCount on PDF pages

Reviewed by Dan Bernstein.

• UIProcess/API/mac/PDFViewController.mm:

(WebKit::PDFViewController::findString):
Return kWKMoreThanMaximumMatchCount when appropriate, a la FindController::countStringMatches().
Also, skip counting all the matches if maxMatchCount is 0, to avoid (perhaps slowly) computing a
number that would be ignored.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/mac/PDFViewController.mm (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-06-06  John Sullivan  <sullivan@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        <https://bugs.webkit.org/show_bug.cgi?id=62165>
+        <rdar://problem/9555835>
+        WebKit2 find-on-page callback doesn’t handle kWKMoreThanMaximumMatchCount on PDF pages
+
+        * UIProcess/API/mac/PDFViewController.mm:
+        (WebKit::PDFViewController::findString):
+        Return kWKMoreThanMaximumMatchCount when appropriate, a la FindController::countStringMatches().
+        Also, skip counting all the matches if maxMatchCount is 0, to avoid (perhaps slowly) computing a
+        number that would be ignored.
+
 2011-06-06  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/UIProcess/API/mac/PDFViewController.mm

@@ -610 +610 @@
 
     PDFSelection *selection = [m_wkPDFView.get() _nextMatchFor:string direction:forward caseSensitive:caseFlag wrap:wrapFlag fromSelection:[m_pdfView currentSelection] startInSelection:NO];
-    NSUInteger matchCount = [m_wkPDFView.get() _countMatches:string caseSensitive:caseFlag];
-    if (matchCount > maxMatchCount)
-        matchCount = maxMatchCount;
-
     if (!selection) {
         page()->didFailToFindString(string);
         return;
+    }
+
+    NSUInteger matchCount;
+    if (!maxMatchCount) {
+        // If the max was zero, any result means we exceeded the max. We can skip computing the actual count.
+        matchCount = static_cast<unsigned>(kWKMoreThanMaximumMatchCount);
+    } else {
+        matchCount = [m_wkPDFView.get() _countMatches:string caseSensitive:caseFlag];
+        if (matchCount > maxMatchCount)
+            matchCount = static_cast<unsigned>(kWKMoreThanMaximumMatchCount);
     }