Changeset 103677 in webkit

Timestamp:

Dec 25, 2011 9:20:02 PM (12 years ago)

Author:

mitz@apple.com

Message:

../WebCore: WebCore changes for: Find indicators overlap when a match spans multiple text boxes
​https://bugs.webkit.org/show_bug.cgi?id=75220

Reviewed by Darin Adler.

• WebCore.exp.in: Exported new unionRect(const Vector<FloatRect>&) and existing

FloatRect::intersects().

• platform/graphics/FloatRect.cpp:

(WebCore::unionRect): Added.

• platform/graphics/FloatRect.h:

../WebKit2: Find indicators overlap when a match spans multiple text boxes
​https://bugs.webkit.org/show_bug.cgi?id=75220

Reviewed by Darin Adler.

• UIProcess/FindIndicator.cpp:

(WebKit::findIndicatorsForTextRectsOverlap): Added this helper function that checks for
pairwise intersections between all indicator rects.
(WebKit::FindIndicator::FindIndicator): Changed to use a single rect (the union of all text
rects) if any two indicator rects would otherwise overlap. This is similar to what Safari
does, and it eliminates overlapping rects for adjacent text boxes. In rare cases (such as when
a match spans two lines and adjacent text boxes on one of those lines) it results in a find
indicator that is too large and obscures some non-match text.

• UIProcess/FindIndicator.h:

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/WebCore.exp.in (modified) (2 diffs)
• WebCore/platform/graphics/FloatRect.cpp (modified) (1 diff)
• WebCore/platform/graphics/FloatRect.h (modified) (2 diffs)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/UIProcess/FindIndicator.cpp (modified) (2 diffs)
• WebKit2/UIProcess/FindIndicator.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-25  Dan Bernstein  <mitz@apple.com>
+
+        WebCore changes for: Find indicators overlap when a match spans multiple text boxes
+        https://bugs.webkit.org/show_bug.cgi?id=75220
+
+        Reviewed by Darin Adler.
+
+        * WebCore.exp.in: Exported new unionRect(const Vector<FloatRect>&) and existing
+        FloatRect::intersects().
+        * platform/graphics/FloatRect.cpp:
+        (WebCore::unionRect): Added.
+        * platform/graphics/FloatRect.h:
+
 2011-12-25  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -1116 +1116 @@
 __ZN7WebCore9plainTextEPKNS_5RangeENS_20TextIteratorBehaviorE
 __ZN7WebCore9toElementEN3JSC7JSValueE
+__ZN7WebCore9unionRectERKN3WTF6VectorINS_9FloatRectELm0EEE
 __ZNK3JSC8Bindings10RootObject12globalObjectEv
 __ZNK3WTF6String14createCFStringEv
@@ -1424 +1425 @@
 __ZNK7WebCore9DOMWindow27pendingUnloadEventListenersEv
 __ZNK7WebCore9FloatQuad11boundingBoxEv
+__ZNK7WebCore9FloatRect10intersectsERKS0_
 __ZNK7WebCore9FloatRectcv7_NSRectEv
 __ZNK7WebCore9FrameTree12traverseNextEPKNS_5FrameE

trunk/Source/WebCore/platform/graphics/FloatRect.cpp

@@ -138 +138 @@
 }
 
+FloatRect unionRect(const Vector<FloatRect>& rects)
+{
+    FloatRect result;
+
+    size_t count = rects.size();
+    for (size_t i = 0; i < count; ++i)
+        result.unite(rects[i]);
+
+    return result;
+}
+
 void FloatRect::fitToPoints(const FloatPoint& p0, const FloatPoint& p1)
 {

trunk/Source/WebCore/platform/graphics/FloatRect.h

@@ -29 +29 @@
 
 #include "FloatPoint.h"
+#include <wtf/Vector.h>
 
 #if USE(CG) || USE(SKIA_ON_MAC_CHROMIUM)
@@ -240 +241 @@
 }
 
+FloatRect unionRect(const Vector<FloatRect>&);
+
 inline FloatRect& operator+=(FloatRect& a, const FloatRect& b)
 {

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-12-25  Dan Bernstein  <mitz@apple.com>
+
+        Find indicators overlap when a match spans multiple text boxes
+        https://bugs.webkit.org/show_bug.cgi?id=75220
+
+        Reviewed by Darin Adler.
+
+        * UIProcess/FindIndicator.cpp:
+        (WebKit::findIndicatorsForTextRectsOverlap): Added this helper function that checks for
+        pairwise intersections between all indicator rects.
+        (WebKit::FindIndicator::FindIndicator): Changed to use a single rect (the union of all text
+        rects) if any two indicator rects would otherwise overlap. This is similar to what Safari
+        does, and it eliminates overlapping rects for adjacent text boxes. In rare cases (such as when
+        a match spans two lines and adjacent text boxes on one of those lines) it results in a find
+        indicator that is too large and obscures some non-match text.
+        * UIProcess/FindIndicator.h:
+
 2011-12-21  Sam Weinig  <sam@webkit.org>
 

trunk/Source/WebKit2/UIProcess/FindIndicator.cpp

@@ -88 +88 @@
 }
 
+static bool findIndicatorsForTextRectsOverlap(const Vector<FloatRect>& textRects)
+{
+    size_t count = textRects.size();
+    if (count <= 1)
+        return false;
+
+    Vector<FloatRect> indicatorRects;
+    indicatorRects.reserveInitialCapacity(count);
+
+    for (size_t i = 0; i < count; ++i) {
+        FloatRect indicatorRect = textRects[i];
+        indicatorRect.move(-leftBorderThickness, -topBorderThickness);
+        indicatorRect.expand(leftBorderThickness + rightBorderThickness, topBorderThickness + bottomBorderThickness);
+
+        for (size_t j = indicatorRects.size(); j; ) {
+            --j;
+            if (indicatorRect.intersects(indicatorRects[j]))
+                return true;
+        }
+
+        indicatorRects.uncheckedAppend(indicatorRect);
+    }
+
+    return false;
+}
+
 FindIndicator::FindIndicator(const WebCore::FloatRect& selectionRectInWindowCoordinates, const Vector<WebCore::FloatRect>& textRectsInSelectionRectCoordinates, float contentImageScaleFactor, PassRefPtr<ShareableBitmap> contentImage)
     : m_selectionRectInWindowCoordinates(selectionRectInWindowCoordinates)
@@ -94 +120 @@
     , m_contentImage(contentImage)
 {
+    if (findIndicatorsForTextRectsOverlap(m_textRectsInSelectionRectCoordinates)) {
+        m_textRectsInSelectionRectCoordinates[0] = unionRect(m_textRectsInSelectionRectCoordinates);
+        m_textRectsInSelectionRectCoordinates.shrink(1);
+    }
 }
 

trunk/Source/WebKit2/UIProcess/FindIndicator.h

@@ -47 +47 @@
     WebCore::FloatRect frameRect() const;
 
-    const Vector<WebCore::FloatRect>& textRects() const { return m_textRectsInSelectionRectCoordinates; }
-
     ShareableBitmap* contentImage() const { return m_contentImage.get(); }