Changeset 69625 in webkit

Timestamp:

Oct 12, 2010 6:05:41 PM (14 years ago)

Author:

andersca@apple.com

Message:

Paint the find overlay background
​https://bugs.webkit.org/show_bug.cgi?id=47565

Reviewed by Dan Bernstein.

WebCore:

Export symbols required by WebKit2.

• WebCore.exp.in:

WebKit2:

• WebProcess/WebPage/FindController.cpp:

(WebKit::FindController::findString):
Don't show the overlay if we have too many matches.

• WebProcess/WebPage/FindPageOverlay.cpp:

(WebKit::FindPageOverlay::rectsForTextMatches):
Get the rects for all text matches.

(WebKit::FindPageOverlay::drawRect):
Assert that we're only being called if there are any text matches.
Paint the background.

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/WebPage/FindController.cpp (modified) (2 diffs)
• WebKit2/WebProcess/WebPage/FindPageOverlay.cpp (modified) (2 diffs)
• WebKit2/WebProcess/WebPage/FindPageOverlay.h (modified) (2 diffs)
• WebKit2/WebProcess/WebPage/PageOverlay.h (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-10-12  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Paint the find overlay background
+        https://bugs.webkit.org/show_bug.cgi?id=47565
+
+        Export symbols required by WebKit2.
+
+        * WebCore.exp.in:
+
 2010-10-12  James Robinson  <jamesr@chromium.org>
 

trunk/WebCore/WebCore.exp.in

@@ -347 +347 @@
 __ZN7WebCore15FocusController9setActiveEb
 __ZN7WebCore15GraphicsContext12setFillColorERKNS_5ColorENS_10ColorSpaceE
+__ZN7WebCore15GraphicsContext20endTransparencyLayerEv
+__ZN7WebCore15GraphicsContext21setCompositeOperationENS_17CompositeOperatorE
+__ZN7WebCore15GraphicsContext22beginTransparencyLayerEf
 __ZN7WebCore15GraphicsContext4clipERKNS_9FloatRectE
 __ZN7WebCore15GraphicsContext4saveEv
+__ZN7WebCore15GraphicsContext8fillRectERKNS_9FloatRectERKNS_5ColorENS_10ColorSpaceE
 __ZN7WebCore15GraphicsContext7restoreEv
 __ZN7WebCore15GraphicsContext9translateEff
@@ -1059 +1063 @@
 __ZNK7WebCore6Widget25convertFromContainingViewERKNS_8IntPointE
 __ZNK7WebCore6Widget25convertToContainingWindowERKNS_7IntRectE
+__ZNK7WebCore6Widget25convertToContainingWindowERKNS_8IntPointE
 __ZNK7WebCore6Widget9frameRectEv
 __ZNK7WebCore7Element12getAttributeERKNS_13QualifiedNameE

trunk/WebKit2/ChangeLog

@@ +1 @@
+2010-10-12  Anders Carlsson  <andersca@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        Paint the find overlay background
+        https://bugs.webkit.org/show_bug.cgi?id=47565
+
+        * WebProcess/WebPage/FindController.cpp:
+        (WebKit::FindController::findString):
+        Don't show the overlay if we have too many matches.
+
+        * WebProcess/WebPage/FindPageOverlay.cpp:
+        (WebKit::FindPageOverlay::rectsForTextMatches):
+        Get the rects for all text matches.
+
+        (WebKit::FindPageOverlay::drawRect):
+        Assert that we're only being called if there are any text matches.
+        Paint the background.
+
 2010-10-12  Sam Weinig  <sam@webkit.org>
 

trunk/WebKit2/WebProcess/WebPage/FindController.cpp

@@ -53 +53 @@
 void FindController::findString(const String& string, FindDirection findDirection, FindOptions findOptions, unsigned maxNumMatches)
 {
-    bool found = m_webPage->corePage()->findString(string, (findOptions & FindOptionsCaseInsensitive) ? TextCaseInsensitive : TextCaseSensitive,
+    TextCaseSensitivity caseSensitivity = findOptions & FindOptionsCaseInsensitive ? TextCaseInsensitive : TextCaseSensitive;
+    bool found = m_webPage->corePage()->findString(string, caseSensitivity,
                                                    findDirection == FindDirectionForward ? WebCore::FindDirectionForward : WebCore::FindDirectionBackward,
                                                    findOptions & FindOptionsWrapAround);
@@ -69 +70 @@
             selectedFrame->selection()->clear();
     } else {
-        // FIXME: We need to show the find indicator here.
+        shouldShowOverlay = findOptions & FindOptionsShowOverlay;
 
-        shouldShowOverlay = findOptions & FindOptionsShowOverlay;
+        if (shouldShowOverlay) {
+            unsigned numMatches = m_webPage->corePage()->markAllMatchesForText(string, caseSensitivity, false, maxNumMatches);
+
+            // Check if we have more matches than allowed.
+            if (numMatches > maxNumMatches)
+                shouldShowOverlay = false;
+        }
     }
 

trunk/WebKit2/WebProcess/WebPage/FindPageOverlay.cpp

@@ -27 +27 @@
 
 #include "FindController.h"
+#include "WebPage.h"
+#include <WebCore/Frame.h>
+#include <WebCore/FrameView.h>
 #include <WebCore/GraphicsContext.h>
+#include <WebCore/Page.h>
 
 using namespace WebCore;
@@ -48 +52 @@
 }
 
+Vector<IntRect> FindPageOverlay::rectsForTextMatches()
+{
+    Vector<IntRect> rects;
+
+    for (Frame* frame = webPage()->corePage()->mainFrame(); frame; frame = frame->tree()->traverseNext()) {
+        Document* document = frame->document();
+        if (!document)
+            continue;
+
+        IntRect visibleRect = frame->view()->visibleContentRect();
+        Vector<IntRect> frameRects = document->markers()->renderedRectsForMarkers(DocumentMarker::TextMatch);
+        IntPoint frameOffset(-frame->view()->scrollOffset().width(), -frame->view()->scrollOffset().height());
+        frameOffset = frame->view()->convertToContainingWindow(frameOffset);
+
+        for (Vector<IntRect>::iterator it = frameRects.begin(), end = frameRects.end(); it != end; ++it) {
+            it->intersect(visibleRect);
+            it->move(frameOffset.x(), frameOffset.y());
+            rects.append(*it);
+        }
+    }
+
+    return rects;
+}
+
+static const int overlayBackgroundRed = 25;
+static const int overlayBackgroundGreen = 25;
+static const int overlayBackgroundBlue = 25;
+static const int overlayBackgroundAlpha = 63;
+    
+static Color overlayBackgroundColor()
+{
+    return Color(overlayBackgroundRed, overlayBackgroundGreen, overlayBackgroundBlue, overlayBackgroundAlpha);
+}
+    
 void FindPageOverlay::drawRect(GraphicsContext& graphicsContext, const IntRect& dirtyRect)
 {
-    // FIXME: Draw something.
+    Vector<IntRect> rects = rectsForTextMatches();
+    ASSERT(!rects.isEmpty());
+
+    FrameView* frameView = webPage()->corePage()->mainFrame()->view();
+
+    int width = frameView->width();
+    if (frameView->verticalScrollbar())
+        width -= frameView->verticalScrollbar()->width();
+    int height = frameView->height();
+    if (frameView->horizontalScrollbar())
+        height -= frameView->horizontalScrollbar()->height();
+    
+    IntRect paintRect = intersection(dirtyRect, IntRect(0, 0, width, height));
+    if (paintRect.isEmpty())
+        return;
+
+    graphicsContext.beginTransparencyLayer(1);
+    graphicsContext.setCompositeOperation(CompositeCopy);
+
+    // Draw the background.
+    graphicsContext.fillRect(paintRect, overlayBackgroundColor(), sRGBColorSpace);
+
+    // FIXME: Draw the holes.
+
+    graphicsContext.endTransparencyLayer();
 }
 
-
 } // namespace WebKit

trunk/WebKit2/WebProcess/WebPage/FindPageOverlay.h

@@ -29 +29 @@
 #include "PageOverlay.h"
 #include <wtf/PassOwnPtr.h>
+#include <wtf/Vector.h>
 
 namespace WebKit {
@@ -42 +43 @@
     explicit FindPageOverlay(FindController*);
 
+    Vector<WebCore::IntRect> rectsForTextMatches();
+
     // PageOverlay.
     virtual void drawRect(WebCore::GraphicsContext&, const WebCore::IntRect& dirtyRect);

trunk/WebKit2/WebProcess/WebPage/PageOverlay.h

@@ -51 +51 @@
     PageOverlay();
 
+    WebPage* webPage() const { return m_webPage; }
+
 private:
     WebPage* m_webPage;