Changeset 109332 in webkit

Timestamp:

Mar 1, 2012, 3:43:41 AM (15 years ago)

Author:

Carlos Garcia Campos

Message:

Merging r109228

Location:

releases/WebKitGTK/webkit-1.8/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/gtk/tests/TestWebKitFindController.cpp (modified) (1 diff)
• WebProcess/WebPage/FindController.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-1.8/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-02-29  Sergio Villar Senin  <svillar@igalia.com>
+
+        DidFindString should be emitted even if FindOptionsShowOverlay is not enabled
+        https://bugs.webkit.org/show_bug.cgi?id=76522
+
+        Reviewed by Darin Adler.
+
+        DidFindString message should be issued always even if neither
+        FindOptionsShowOverlay or FindOptionsShowHighlight are
+        provided. The difference is that if any of those flags are present
+        the find operation will look for all the appearances of the text
+        in the web view, otherwise it will just look and report the next
+        occurrence.
+
+        This patch removes the temporary workaround added in r109222 to
+        the WebKitFindController unit tests.
+
+        * UIProcess/API/gtk/tests/TestWebKitFindController.cpp:
+        * WebProcess/WebPage/FindController.cpp:
+        (WebKit::FindController::findString):
+
 2012-01-19  Sergio Villar Senin  <svillar@igalia.com>
 

releases/WebKitGTK/webkit-1.8/Source/WebKit2/UIProcess/API/gtk/tests/TestWebKitFindController.cpp

@@ -46 +46 @@
     void find(const char* searchText, guint32 findOptions, guint maxMatchCount)
     {
-        // Due to http://weakit.org/b/76522 we have to artificially
-        // add here the show overlay option (that we do not even
-        // expose in the API) to get the DidFindString messsage
-        // issued. Remove this once 76522 is fixed.
-        findOptions = findOptions | 1 << 5;
-
         g_signal_connect(m_findController.get(), "found-text", G_CALLBACK(foundTextCallback), this);
         g_signal_connect(m_findController.get(), "failed-to-find-text", G_CALLBACK(failedToFindTextCallback), this);

releases/WebKitGTK/webkit-1.8/Source/WebKit2/WebProcess/WebPage/FindController.cpp

@@ -110 +110 @@
     } else {
         shouldShowOverlay = options & FindOptionsShowOverlay;
-
-        if (shouldShowOverlay) {
-            bool shouldShowHighlight = options & FindOptionsShowHighlight;
+        bool shouldShowHighlight = options & FindOptionsShowHighlight;
+        unsigned matchCount = 1;
+
+        if (shouldShowOverlay || shouldShowHighlight) {
 
             if (maxMatchCount == numeric_limits<unsigned>::max())
                 --maxMatchCount;
-            
-            unsigned matchCount = m_webPage->corePage()->markAllMatchesForText(string, core(options), shouldShowHighlight, maxMatchCount + 1);
+
+            matchCount = m_webPage->corePage()->markAllMatchesForText(string, core(options), shouldShowHighlight, maxMatchCount + 1);
 
             // Check if we have more matches than allowed.
@@ -124 +125 @@
                 matchCount = static_cast<unsigned>(kWKMoreThanMaximumMatchCount);
             }
-
-            m_webPage->send(Messages::WebPageProxy::DidFindString(string, matchCount));
-        }
+        }
+
+        m_webPage->send(Messages::WebPageProxy::DidFindString(string, matchCount));
 
         if (!(options & FindOptionsShowFindIndicator) || !updateFindIndicator(selectedFrame, shouldShowOverlay)) {