Changeset 112077 in webkit

Timestamp:

Mar 26, 2012 4:56:53 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Assert in GestureTapHighlighter.
​https://bugs.webkit.org/show_bug.cgi?id=82187

Patch by Allan Sandfeld Jensen <​allan.jensen@nokia.com> on 2012-03-26
Reviewed by Kenneth Rohde Christiansen.

Adjust the boundaries of the center-rect before performing the intersection test,
since adjusting the boundary may cause a new intersection.

• page/GestureTapHighlighter.cpp:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/GestureTapHighlighter.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-26  Allan Sandfeld Jensen  <allan.jensen@nokia.com>
+
+        [Qt] Assert in GestureTapHighlighter.
+        https://bugs.webkit.org/show_bug.cgi?id=82187
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Adjust the boundaries of the center-rect before performing the intersection test,
+        since adjusting the boundary may cause a new intersection.
+
+        * page/GestureTapHighlighter.cpp:
+
 2012-03-26  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/page/GestureTapHighlighter.cpp

@@ -96 +96 @@
 inline void shiftXEdgesToContainIfStrikes(LayoutRect& rect, const LayoutRect& other)
 {
+    if (rect.isEmpty())
+        return;
     LayoutUnit leftSide = rect.x();
     LayoutUnit rightSide = rect.maxX();
@@ -157 +159 @@
     // Add the first box, but merge it with the center boxes if it intersects.
     if (rects.size() && !rects.first().isEmpty()) {
+        // Adjust center boxes to boundary of first
+        if (drawableRects.size())
+            shiftXEdgesToContainIfStrikes(drawableRects.last(), rects.first());
         if (drawableRects.size() && drawableRects.last().intersects(rects.first()))
             drawableRects.last().unite(rects.first());
@@ -165 +170 @@
     // Add the last box, but merge it with the center boxes if it intersects.
     if (rects.size() > 1 && !rects.last().isEmpty()) {
+        // Adjust center boxes to boundary of last
+        if (drawableRects.size())
+            shiftXEdgesToContainIfStrikes(drawableRects.last(), rects.last());
         if (drawableRects.size() && drawableRects.last().intersects(rects.last()))
             drawableRects.last().unite(rects.last());
@@ -171 +179 @@
     }
 
-    // Adjust middle to boundaries of first and last.
-    if (drawableRects.size() == 3) {
-        LayoutRect& middle = drawableRects.at(1);
-        shiftXEdgesToContainIfStrikes(middle, drawableRects.at(0));
-        shiftXEdgesToContainIfStrikes(middle, drawableRects.at(2));
-    }
-
     for (size_t i = 0; i < drawableRects.size(); ++i) {
         LayoutRect prev = i ? drawableRects.at(i - 1) : LayoutRect();