Changeset 150770 in webkit

Timestamp:

May 27, 2013 12:27:06 PM (11 years ago)

Author:

commit-queue@webkit.org

Message:

[BlackBerry] Find-on-page should be able to convert the active match to selection when clearing all matches
​https://bugs.webkit.org/show_bug.cgi?id=116837

Patch by Andy Chen <​andchen@blackberry.com> on 2013-05-27
Reviewed by Rob Buis.

PR 291903
Internally reviewed by Mike Fenton.

• Api/WebPage.cpp:

(BlackBerry::WebKit::WebPage::findNextString):

• Api/WebPage.h:
• WebKitSupport/InPageSearchManager.cpp:

(BlackBerry::WebKit::InPageSearchManager::findNextString):
(BlackBerry::WebKit::InPageSearchManager::clearTextMatches):

• WebKitSupport/InPageSearchManager.h:

(InPageSearchManager):

Location:

trunk

Files:

• Source/WebKit/blackberry/Api/WebPage.cpp (modified) (2 diffs)
• Source/WebKit/blackberry/Api/WebPage.h (modified) (1 diff)
• Source/WebKit/blackberry/ChangeLog (modified) (1 diff)
• Source/WebKit/blackberry/WebKitSupport/InPageSearchManager.cpp (modified) (3 diffs)
• Source/WebKit/blackberry/WebKitSupport/InPageSearchManager.h (modified) (2 diffs)
• Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/WebPage.cpp

@@ -4709 +4709 @@
 }
 
-bool WebPage::findNextString(const char* text, bool forward, bool caseSensitive, bool wrap, bool highlightAllMatches)
+bool WebPage::findNextString(const char* text, bool forward, bool caseSensitive, bool wrap, bool highlightAllMatches, bool selectActiveMatchOnClear)
 {
     WebCore::FindOptions findOptions = WebCore::StartInSelection;
@@ -4720 +4720 @@
     // within the current frame as opposed to the entire Document, so we have to
     // provide our own wrapping code to wrap at the whole Document level.
-    return d->m_inPageSearchManager->findNextString(String::fromUTF8(text), findOptions, wrap, highlightAllMatches);
+    return d->m_inPageSearchManager->findNextString(String::fromUTF8(text), findOptions, wrap, highlightAllMatches, selectActiveMatchOnClear);
 }
 

trunk/Source/WebKit/blackberry/Api/WebPage.h

@@ -231 +231 @@
     // Find the next utf8 string in the given direction.
     // Case sensitivity, wrapping, and highlighting all matches are also toggleable.
-    bool findNextString(const char*, bool forward, bool caseSensitive, bool wrap, bool highlightAllMatches);
+    bool findNextString(const char*, bool forward, bool caseSensitive, bool wrap, bool highlightAllMatches, bool selectActiveMatchOnClear);
 
     JSGlobalContextRef globalContext() const;

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-05-27  Andy Chen  <andchen@blackberry.com>
+
+        [BlackBerry] Find-on-page should be able to convert the active match to selection when clearing all matches
+        https://bugs.webkit.org/show_bug.cgi?id=116837
+
+        Reviewed by Rob Buis.
+
+        PR 291903
+        Internally reviewed by Mike Fenton.
+
+        * Api/WebPage.cpp:
+        (BlackBerry::WebKit::WebPage::findNextString):
+        * Api/WebPage.h:
+        * WebKitSupport/InPageSearchManager.cpp:
+        (BlackBerry::WebKit::InPageSearchManager::findNextString):
+        (BlackBerry::WebKit::InPageSearchManager::clearTextMatches):
+        * WebKitSupport/InPageSearchManager.h:
+        (InPageSearchManager):
+
 2013-05-27  Eli Fidler  <efidler@rim.com>
 

trunk/Source/WebKit/blackberry/WebKitSupport/InPageSearchManager.cpp

@@ -85 +85 @@
 }
 
-bool InPageSearchManager::findNextString(const String& text, FindOptions findOptions, bool wrap, bool highlightAllMatches)
+bool InPageSearchManager::findNextString(const String& text, FindOptions findOptions, bool wrap, bool highlightAllMatches, bool selectActiveMatchOnClear)
 {
     bool highlightAllMatchesStateChanged = m_highlightAllMatches != highlightAllMatches;
@@ -91 +91 @@
 
     if (!text.length()) {
-        clearTextMatches();
+        clearTextMatches(selectActiveMatchOnClear);
         cancelPendingScopingEffort();
         m_activeSearchString = String();
@@ -232 +232 @@
 }
 
-void InPageSearchManager::clearTextMatches()
-{
+void InPageSearchManager::clearTextMatches(bool selectActiveMatchOnClear)
+{
+    if (selectActiveMatchOnClear && m_activeMatch.get()) {
+        VisibleSelection selection(m_activeMatch.get());
+        m_activeMatch->ownerDocument()->frame()->selection()->setSelection(selection);
+    }
     m_webPage->m_page->unmarkAllTextMatches();
     m_activeMatch = 0;

trunk/Source/WebKit/blackberry/WebKitSupport/InPageSearchManager.h

@@ -40 +40 @@
     ~InPageSearchManager();
 
-    bool findNextString(const String&, WebCore::FindOptions, bool wrap, bool highlightAllMatches);
+    bool findNextString(const String&, WebCore::FindOptions, bool wrap, bool highlightAllMatches, bool selectActiveMatchOnClear);
     void frameUnloaded(const WebCore::Frame*);
 
@@ -47 +47 @@
     friend class DeferredScopeStringMatches;
 
-    void clearTextMatches();
+    void clearTextMatches(bool selectActiveMatchOnClear = false);
     void setActiveMatchAndMarker(PassRefPtr<WebCore::Range>);
     bool findAndMarkText(const String&, WebCore::Range*, WebCore::Frame*, const WebCore::FindOptions&, bool /* isNewSearch */, bool /* startFromSelection */);

trunk/Tools/DumpRenderTree/blackberry/TestRunnerBlackBerry.cpp

@@ -618 +618 @@
     // Our layout tests assume find will wrap and highlight all matches.
     BlackBerry::WebKit::DumpRenderTree::currentInstance()->page()->findNextString(nameStr.utf8().data(),
-        !(options & WebCore::Backwards), !(options & WebCore::CaseInsensitive), true /* wrap */, true /* highlightAllMatches */);
+        !(options & WebCore::Backwards), !(options & WebCore::CaseInsensitive), true /* wrap */, true /* highlightAllMatches */, false /* selectActiveMatchOnClear */);
 
     return mainFrame->page()->findString(nameStr, options);