Changeset 105855 in webkit

Timestamp:

Jan 25, 2012 12:54:19 AM (12 years ago)

Author:

sergio@webkit.org

Message:

[WK2] FindController should not assume that ports do not want to highlight text matches
​https://bugs.webkit.org/show_bug.cgi?id=76921

Reviewed by Darin Adler.

FindController must obey the FindOptionsShowHighlight flag instead
of assuming that ports do not want to highlight search matches.

• Shared/API/c/WKFindOptions.h: added kWKFindOptionsShowHighlight.
• Shared/API/c/WKSharedAPICast.h:

(WebKit::toFindOptions): Ditto.

• Shared/WebFindOptions.h: added FindOptionsShowHighlight.
• WebProcess/WebPage/FindController.cpp:

(WebKit::FindController::findString):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• Shared/API/c/WKFindOptions.h (modified) (1 diff)
• Shared/API/c/WKSharedAPICast.h (modified) (1 diff)
• Shared/WebFindOptions.h (modified) (1 diff)
• WebProcess/WebPage/FindController.cpp (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-01-24  Sergio Villar Senin  <svillar@igalia.com>
+
+        [WK2] FindController should not assume that ports do not want to highlight text matches
+        https://bugs.webkit.org/show_bug.cgi?id=76921
+
+        Reviewed by Darin Adler.
+
+        FindController must obey the FindOptionsShowHighlight flag instead
+        of assuming that ports do not want to highlight search matches.
+
+        * Shared/API/c/WKFindOptions.h: added kWKFindOptionsShowHighlight.
+        * Shared/API/c/WKSharedAPICast.h:
+        (WebKit::toFindOptions): Ditto.
+        * Shared/WebFindOptions.h: added FindOptionsShowHighlight.
+        * WebProcess/WebPage/FindController.cpp:
+        (WebKit::FindController::findString):
+
 2012-01-25  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebKit2/Shared/API/c/WKFindOptions.h

@@ -38 +38 @@
     kWKFindOptionsWrapAround = 1 << 4,
     kWKFindOptionsShowOverlay = 1 << 5,
-    kWKFindOptionsShowFindIndicator = 1 << 6
+    kWKFindOptionsShowFindIndicator = 1 << 6,
+    kWKFindOptionsShowHighlight = 1 << 7
 };
 typedef uint32_t WKFindOptions;

trunk/Source/WebKit2/Shared/API/c/WKSharedAPICast.h

@@ -689 +689 @@
     if (wkFindOptions & kWKFindOptionsShowFindIndicator)
         findOptions |= FindOptionsShowFindIndicator;
+    if (wkFindOptions & kWKFindOptionsShowHighlight)
+        findOptions |= FindOptionsShowHighlight;
 
     return static_cast<FindOptions>(findOptions);

trunk/Source/WebKit2/Shared/WebFindOptions.h

@@ -36 +36 @@
     FindOptionsWrapAround = 1 << 4,
     FindOptionsShowOverlay = 1 << 5,
-    FindOptionsShowFindIndicator = 1 << 6
+    FindOptionsShowFindIndicator = 1 << 6,
+    FindOptionsShowHighlight = 1 << 7
 };
 

trunk/Source/WebKit2/WebProcess/WebPage/FindController.cpp

@@ -112 +112 @@
 
         if (shouldShowOverlay) {
+            bool shouldShowHighlight = options & FindOptionsShowHighlight;
+
             if (maxMatchCount == numeric_limits<unsigned>::max())
                 --maxMatchCount;
             
-            unsigned matchCount = m_webPage->corePage()->markAllMatchesForText(string, core(options), false, maxMatchCount + 1);
+            unsigned matchCount = m_webPage->corePage()->markAllMatchesForText(string, core(options), shouldShowHighlight, maxMatchCount + 1);
 
             // Check if we have more matches than allowed.