Changeset 70510 in webkit

Timestamp:

Oct 25, 2010 6:51:53 PM (14 years ago)

Author:

andersca@apple.com

Message:

WebKit2 callbacks for findString() and countMatchesForString() should report whether the match count was exceeded
​https://bugs.webkit.org/show_bug.cgi?id=48285
<rdar://problem/8576318>

Reviewed by Sam Weinig.

• UIProcess/API/C/WKPage.h:

Add a kWKMoreThanMaximumMatchCount constant.

• WebProcess/WebPage/FindController.cpp:

(WebKit::FindController::findString):
If we get back more matches than allowed, send kWKMoreThanMaximumMatchCount as the match constant.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/C/WKPage.h (modified) (1 diff)
• WebProcess/WebPage/FindController.cpp (modified) (2 diffs)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-25  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        WebKit2 callbacks for findString() and countMatchesForString() should report whether the match count was exceeded
+        https://bugs.webkit.org/show_bug.cgi?id=48285
+        <rdar://problem/8576318>
+
+        * UIProcess/API/C/WKPage.h:
+        Add a kWKMoreThanMaximumMatchCount constant.
+
+        * WebProcess/WebPage/FindController.cpp:
+        (WebKit::FindController::findString):
+        If we get back more matches than allowed, send kWKMoreThanMaximumMatchCount as the match constant.
+
 2010-10-25  Dan Bernstein  <mitz@apple.com>
 

trunk/WebKit2/UIProcess/API/C/WKPage.h

@@ -179 +179 @@
 typedef struct WKPageFindClient WKPageFindClient;
 
+enum {
+    kWKMoreThanMaximumMatchCount = -1
+};
+
 WK_EXPORT WKTypeID WKPageGetTypeID();
 

trunk/WebKit2/WebProcess/WebPage/FindController.cpp

@@ -28 +28 @@
 #include "BackingStore.h"
 #include "FindPageOverlay.h"
+#include "WKPage.h"
 #include "WebPage.h"
 #include "WebPageProxyMessages.h"
@@ -90 +91 @@
 
         if (shouldShowOverlay) {
-            unsigned matchCount = m_webPage->corePage()->markAllMatchesForText(string, caseSensitivity, false, maxMatchCount);
+            unsigned matchCount = m_webPage->corePage()->markAllMatchesForText(string, caseSensitivity, false, maxMatchCount + 1);
 
             // Check if we have more matches than allowed.
-            if (matchCount > maxMatchCount)
+            if (matchCount > maxMatchCount) {
                 shouldShowOverlay = false;
+                matchCount = static_cast<unsigned>(kWKMoreThanMaximumMatchCount);
+            }
 
             WebProcess::shared().connection()->send(Messages::WebPageProxy::DidFindString(string, matchCount), m_webPage->pageID());