Changeset 69689 in webkit

Timestamp:

Oct 13, 2010 1:18:09 PM (14 years ago)

Author:

andersca@apple.com

Message:

Send over find indicator information to the UI process
​https://bugs.webkit.org/show_bug.cgi?id=47612

Reviewed by Sam Weinig.

WebCore:

Export symbols needed by WebKit2.

• WebCore.exp.in:

WebKit2:

• UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::setFindIndicator):
Add stub.

• UIProcess/WebPageProxy.messages.in:

Add SetFindIndicator.

• WebProcess/WebPage/FindController.cpp:

(WebKit::FindController::FindController):
Initialize m_isShowingFindIndicator.

(WebKit::FindController::findString):
Update the find indicator if needed.

(WebKit::FindController::updateFindIndicator):
Compute find indicator information, paint the find indicator text into a
backing store and send it over.

(WebKit::FindController::resetFindIndicator):
Send a SetFindIndicator message with a null backing store.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (4 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/WebPageProxy.cpp (modified) (1 diff)
• WebKit2/UIProcess/WebPageProxy.h (modified) (2 diffs)
• WebKit2/UIProcess/WebPageProxy.messages.in (modified) (1 diff)
• WebKit2/WebProcess/WebPage/FindController.cpp (modified) (5 diffs)
• WebKit2/WebProcess/WebPage/FindController.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-13  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Send over find indicator information to the UI process
+        https://bugs.webkit.org/show_bug.cgi?id=47612
+
+        Export symbols needed by WebKit2.
+
+        * WebCore.exp.in:
+
 2010-10-13  Gavin Barraclough  <barraclough@apple.com>
 

trunk/WebCore/WebCore.exp.in

@@ -352 +352 @@
 __ZN7WebCore15GraphicsContext4clipERKNS_9FloatRectE
 __ZN7WebCore15GraphicsContext4saveEv
+__ZN7WebCore15GraphicsContext7restoreEv
 __ZN7WebCore15GraphicsContext8fillRectERKNS_9FloatRectERKNS_5ColorENS_10ColorSpaceE
-__ZN7WebCore15GraphicsContext7restoreEv
 __ZN7WebCore15GraphicsContext9translateEff
 __ZN7WebCore15GraphicsContextC1EP9CGContext
@@ -408 +408 @@
 __ZN7WebCore16createFullMarkupEPKNS_5RangeE
 __ZN7WebCore16enclosingIntRectERK7_NSRect
+__ZN7WebCore16enclosingIntRectERKNS_9FloatRectE
 __ZN7WebCore16isEndOfParagraphERKNS_15VisiblePositionE
 __ZN7WebCore16jsStringSlowCaseEPN3JSC9ExecStateERNS0_9WeakGCMapIPN3WTF10StringImplEPNS0_8JSStringEEES6_
@@ -550 +551 @@
 __ZN7WebCore4Font18shouldUseSmoothingEv
 __ZN7WebCore4Font21setShouldUseSmoothingEb
-__ZN7WebCore4FontaSERKS0_
 __ZN7WebCore4FontC1ERKNS_16FontPlatformDataEbNS_17FontSmoothingModeE
 __ZN7WebCore4FontC1Ev
+__ZN7WebCore4FontaSERKS0_
 __ZN7WebCore4Icon18createIconForFilesERKN3WTF6VectorINS1_6StringELm0EEE
 __ZN7WebCore4IconD1Ev
@@ -687 +688 @@
 __ZN7WebCore7nsColorERKNS_5ColorE
 __ZN7WebCore8Document11createRangeEv
+__ZN7WebCore8Document12updateLayoutEv
 __ZN7WebCore8Document13svgExtensionsEv
 __ZN7WebCore8Document14setFocusedNodeEN3WTF10PassRefPtrINS_4NodeEEE

trunk/WebKit2/ChangeLog

@@ -11 +11 @@
         (WebKit::WebFrameLoaderClient::dispatchDidLoadResourceByXMLHttpRequest):
         * WebProcess/WebCoreSupport/WebFrameLoaderClient.h:
+
+2010-10-13  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Sam Weinig.
+
+        Send over find indicator information to the UI process
+        https://bugs.webkit.org/show_bug.cgi?id=47612
+
+        * UIProcess/WebPageProxy.cpp:
+        (WebKit::WebPageProxy::setFindIndicator):
+        Add stub.
+
+        * UIProcess/WebPageProxy.messages.in:
+        Add SetFindIndicator.
+
+        * WebProcess/WebPage/FindController.cpp:
+        (WebKit::FindController::FindController):
+        Initialize m_isShowingFindIndicator.
+
+        (WebKit::FindController::findString):
+        Update the find indicator if needed.
+
+        (WebKit::FindController::updateFindIndicator):
+        Compute find indicator information, paint the find indicator text into a 
+        backing store and send it over.
+
+        (WebKit::FindController::resetFindIndicator):
+        Send a SetFindIndicator message with a null backing store.
 
 2010-10-13  Anders Carlsson  <andersca@apple.com>

trunk/WebKit2/UIProcess/WebPageProxy.cpp

@@ -957 +957 @@
 }
 
+void WebPageProxy::setFindIndicator(const FloatRect& selectionRect, const Vector<FloatRect>& textRects, const SharedMemory::Handle& contentImageHandle)
+{
+    // FIXME: Implement.
+}
+
 void WebPageProxy::registerEditCommand(PassRefPtr<WebEditCommandProxy> commandProxy, UndoOrRedo undoOrRedo)
 {

trunk/WebKit2/UIProcess/WebPageProxy.h

@@ -31 +31 @@
 #include "FindOptions.h"
 #include "GenericCallback.h"
+#include "SharedMemory.h"
 #include "WKBase.h"
 #include "WebEvent.h"
@@ -282 +283 @@
     // Find.
     void didCountStringMatches(const String&, uint32_t numMatches);
+    void setFindIndicator(const WebCore::FloatRect& selectionRect, const Vector<WebCore::FloatRect>& textRects, const SharedMemory::Handle& contentImageHandle);
 
     void takeFocus(bool direction);

trunk/WebKit2/UIProcess/WebPageProxy.messages.in

@@ -94 +94 @@
     # Find.
     DidCountStringMatches(WTF::String string, uint32_t numMatches)
+    SetFindIndicator(WebCore::FloatRect selectionRect, Vector<WebCore::FloatRect> textRects, WebKit::SharedMemory::Handle contentImageHandle)
 
 #if USE(ACCELERATED_COMPOSITING)

trunk/WebKit2/WebProcess/WebPage/FindController.cpp

@@ -26 +26 @@
 #include "FindController.h"
 
+#include "BackingStore.h"
 #include "FindPageOverlay.h"
 #include "WebPage.h"
+#include "WebPageProxyMessages.h"
+#include "WebProcess.h"
 #include <WebCore/Frame.h>
+#include <WebCore/FrameView.h>
+#include <WebCore/GraphicsContext.h>
 #include <WebCore/Page.h>
 
@@ -38 +43 @@
     : m_webPage(webPage)
     , m_findPageOverlay(0)
+    , m_isShowingFindIndicator(false)
 {
 }
@@ -69 +75 @@
         if (selectedFrame)
             selectedFrame->selection()->clear();
+
+        resetFindIndicator();
     } else {
         shouldShowOverlay = findOptions & FindOptionsShowOverlay;
@@ -78 +86 @@
             if (numMatches > maxNumMatches)
                 shouldShowOverlay = false;
+        }
+
+        if (!(findOptions & FindOptionsShowFindIndicator) || !updateFindIndicator(selectedFrame)) {
+            // Either we shouldn't show the find indicator, or we couldn't update it.
+            resetFindIndicator();
         }
     }
@@ -112 +125 @@
 }
 
+bool FindController::updateFindIndicator(Frame* selectedFrame)
+{
+    if (!selectedFrame)
+        return false;
+
+    IntRect selectionRect = enclosingIntRect(selectedFrame->selection()->bounds());
+    Vector<FloatRect> textRects;
+    selectedFrame->selection()->getClippedVisibleTextRectangles(textRects);
+
+    // Create a backing store and paint the find indicator text into it.
+    RefPtr<BackingStore> findIndicatorTextBackingStore = BackingStore::createSharable(selectionRect.size());
+    OwnPtr<GraphicsContext> graphicsContext = findIndicatorTextBackingStore->createGraphicsContext();
+
+    graphicsContext->translate(-selectionRect.x(), -selectionRect.y());
+    selectedFrame->view()->setPaintBehavior(PaintBehaviorSelectionOnly | PaintBehaviorForceBlackText | PaintBehaviorFlattenCompositingLayers);
+    selectedFrame->document()->updateLayout();
+    
+    graphicsContext->clip(selectionRect);
+    selectedFrame->view()->paint(graphicsContext.get(), selectionRect);
+    selectedFrame->view()->setPaintBehavior(PaintBehaviorNormal);
+    
+    SharedMemory::Handle handle;
+    if (!findIndicatorTextBackingStore->createHandle(handle))
+        return false;
+
+    // We want the selection rect in window coordinates.
+    IntRect selectionRectInWindowCoordinates = selectedFrame->view()->contentsToWindow(selectionRect);
+
+    // We want the text rects in selection rect coordinates.
+    Vector<FloatRect> textRectsInSelectionRectCoordinates;
+    
+    for (size_t i = 0; i < textRects.size(); ++i) {
+        IntRect textRectInSelectionRectCoordinates = selectedFrame->view()->contentsToWindow(enclosingIntRect(textRects[i]));
+        textRectInSelectionRectCoordinates.move(-selectionRectInWindowCoordinates.x(), -selectionRectInWindowCoordinates.y());
+
+        textRectsInSelectionRectCoordinates.append(textRectInSelectionRectCoordinates);
+    }            
+    
+    WebProcess::shared().connection()->send(Messages::WebPageProxy::SetFindIndicator(selectionRectInWindowCoordinates, textRectsInSelectionRectCoordinates, handle), m_webPage->pageID());
+    m_isShowingFindIndicator = true;
+
+    return true;
+}
+
+void FindController::resetFindIndicator()
+{
+    if (!m_isShowingFindIndicator)
+        return;
+
+    SharedMemory::Handle handle;
+    WebProcess::shared().connection()->send(Messages::WebPageProxy::SetFindIndicator(FloatRect(), Vector<FloatRect>(), handle), m_webPage->pageID());
+    m_isShowingFindIndicator = false;
+}
+
+
 } // namespace WebKit

trunk/WebKit2/WebProcess/WebPage/FindController.h

@@ -52 +52 @@
 
 private:
+    bool updateFindIndicator(WebCore::Frame* selectedFrame);
+    void resetFindIndicator();
+    
     WebPage* m_webPage;
     FindPageOverlay* m_findPageOverlay;
+
+    // Whether the UI process is showing the find indicator. Note that this can be true even if
+    // the find indicator isn't showing, but it will never be false when it is showing.
+    bool m_isShowingFindIndicator;
 };