Changeset 69877 in webkit

Timestamp:

Oct 15, 2010 2:05:20 PM (14 years ago)

Author:

andersca@apple.com

Message:

Hide the find indicator/overlay when necessary
​https://bugs.webkit.org/show_bug.cgi?id=47737

Reviewed by Sam Weinig.

• WebProcess/WebCoreSupport/WebChromeClient.cpp:

(WebKit::WebChromeClient::invalidateContentsForSlowScroll):
Hide the find indicator.

(WebKit::WebChromeClient::scroll):
Ditto.

• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:

(WebKit::WebFrameLoaderClient::dispatchDidStartProvisionalLoad):
Hide the find indicator and the find overlay.

• WebProcess/WebPage/FindController.cpp:

(WebKit::FindController::findString):
Always hide all previous find matches. Only clear the selection if the string
not found wasn't empty.

(WebKit::FindController::hideFindUI):
Uninstall the page overlay and hide the find indicator.

(WebKit::FindController::hideFindIndicator):
Rename resetFindIndicator to hideFindIndicator.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::uninstallPageOverlay):
Invalidate the entire page.

Location:

trunk/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebCoreSupport/WebChromeClient.cpp (modified) (2 diffs)
• WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp (modified) (1 diff)
• WebProcess/WebPage/FindController.cpp (modified) (5 diffs)
• WebProcess/WebPage/FindController.h (modified) (1 diff)
• WebProcess/WebPage/WebPage.cpp (modified) (1 diff)
• WebProcess/WebPage/WebPage.h (modified) (1 diff)

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-15  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Hide the find indicator/overlay when necessary
+        https://bugs.webkit.org/show_bug.cgi?id=47737
+
+        * WebProcess/WebCoreSupport/WebChromeClient.cpp:
+        (WebKit::WebChromeClient::invalidateContentsForSlowScroll):
+        Hide the find indicator.
+
+        (WebKit::WebChromeClient::scroll):
+        Ditto.
+
+        * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+        (WebKit::WebFrameLoaderClient::dispatchDidStartProvisionalLoad):
+        Hide the find indicator and the find overlay.
+
+        * WebProcess/WebPage/FindController.cpp:
+        (WebKit::FindController::findString):
+        Always hide all previous find matches. Only clear the selection if the string
+        not found wasn't empty.
+
+        (WebKit::FindController::hideFindUI):
+        Uninstall the page overlay and hide the find indicator.
+
+        (WebKit::FindController::hideFindIndicator):
+        Rename resetFindIndicator to hideFindIndicator.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::uninstallPageOverlay):
+        Invalidate the entire page.
+
 2010-10-15  Anders Carlsson  <andersca@apple.com>
 

trunk/WebKit2/WebProcess/WebCoreSupport/WebChromeClient.cpp

@@ -323 +323 @@
 void WebChromeClient::invalidateContentsForSlowScroll(const IntRect& rect, bool immediate)
 {
+    // Hide the find indicator.
+    m_page->findController().hideFindIndicator();
+
     m_page->drawingArea()->invalidateContentsForSlowScroll(rect, immediate);
 }
@@ -328 +331 @@
 void WebChromeClient::scroll(const IntSize& scrollDelta, const IntRect& rectToScroll, const IntRect& clipRect)
 {
+    // Hide the find indicator.
+    m_page->findController().hideFindIndicator();
+
     m_page->drawingArea()->scroll(scrollDelta, rectToScroll, clipRect);
 }

trunk/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp

@@ -290 +290 @@
         return;
 
+    webPage->findController().hideFindUI();
+    
     DocumentLoader* provisionalLoader = m_frame->coreFrame()->loader()->provisionalDocumentLoader();
     const String& url = provisionalLoader->url().string();

trunk/WebKit2/WebProcess/WebPage/FindController.cpp

@@ -59 +59 @@
 void FindController::findString(const String& string, FindDirection findDirection, FindOptions findOptions, unsigned maxNumMatches)
 {
+    m_webPage->corePage()->unmarkAllTextMatches();
+
     TextCaseSensitivity caseSensitivity = findOptions & FindOptionsCaseInsensitive ? TextCaseInsensitive : TextCaseSensitive;
     bool found = m_webPage->corePage()->findString(string, caseSensitivity,
@@ -69 +71 @@
 
     if (!found) {
-        // We didn't find the string, clear all text matches.
-        m_webPage->corePage()->unmarkAllTextMatches();
-
         // And clear the selection.
-        if (selectedFrame)
+        if (!string.isEmpty() && selectedFrame)
             selectedFrame->selection()->clear();
 
-        resetFindIndicator();
+        hideFindIndicator();
     } else {
         shouldShowOverlay = findOptions & FindOptionsShowOverlay;
@@ -90 +89 @@
         if (!(findOptions & FindOptionsShowFindIndicator) || !updateFindIndicator(selectedFrame, shouldShowOverlay)) {
             // Either we shouldn't show the find indicator, or we couldn't update it.
-            resetFindIndicator();
+            hideFindIndicator();
         }
     }
@@ -116 +115 @@
 void FindController::hideFindUI()
 {
-    // FIXME: Implement.
+    if (m_findPageOverlay)
+        m_webPage->uninstallPageOverlay();
+
+    hideFindIndicator();
 }
 
@@ -169 +171 @@
 }
 
-void FindController::resetFindIndicator()
+void FindController::hideFindIndicator()
 {
     if (!m_isShowingFindIndicator)

trunk/WebKit2/WebProcess/WebPage/FindController.h

@@ -51 +51 @@
     void findPageOverlayDestroyed();
 
+    void hideFindIndicator();
+
 private:
     bool updateFindIndicator(WebCore::Frame* selectedFrame, bool isShowingOverlay);
-    void resetFindIndicator();
     
     WebPage* m_webPage;

trunk/WebKit2/WebProcess/WebPage/WebPage.cpp

@@ -425 +425 @@
 {
     m_pageOverlay = 0;
+    m_drawingArea->setNeedsDisplay(IntRect(IntPoint(0, 0), m_viewSize));
 }
 

trunk/WebKit2/WebProcess/WebPage/WebPage.h

@@ -164 +164 @@
     static const WebEvent* currentEvent();
 
+    FindController& findController() { return m_findController; }
+
 private:
     WebPage(uint64_t pageID, const WebPageCreationParameters&);