Changeset 117555 in webkit

Timestamp:

May 18, 2012 12:37:01 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Gesture tap highlighter needs to take overflow clip into account.
​https://bugs.webkit.org/show_bug.cgi?id=84989

Patch by Zalan Bujtas <​zbujtas@gmail.com> on 2012-05-18
Reviewed by Kenneth Rohde Christiansen.

.:

• ManualTests/qt/tap-highlighting-overflow-hidden.html: Added.

Source/WebCore:

Apply overflow clip on the focus ring if needed.

Follow up patches are needed to address the following cases.

[Qt] Gesture tap highlighter should take parent iframe's transform into account.
​https://bugs.webkit.org/show_bug.cgi?id=86645

[Qt] Gesture tap highlighter needs to take frame clipping into account.
​https://bugs.webkit.org/show_bug.cgi?id=86646

[Qt] Gesture tap highlighter's overflow clip is not always correct when
nested enclosing containers have transforms.
​https://bugs.webkit.org/show_bug.cgi?id=86641

Manual test: ManualTests/qt/tap-highlighting-overflow-hidden.html

• page/GestureTapHighlighter.cpp:

(WebCore::GestureTapHighlighter::pathForNodeHighlight):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• ManualTests/qt/tap-highlighting-overflow-hidden.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/GestureTapHighlighter.cpp (modified) (5 diffs)

trunk/ChangeLog

@@ +1 @@
+2012-05-18  Zalan Bujtas  <zbujtas@gmail.com>
+
+        [Qt] Gesture tap highlighter needs to take overflow clip into account.
+        https://bugs.webkit.org/show_bug.cgi?id=84989
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        * ManualTests/qt/tap-highlighting-overflow-hidden.html: Added.
+
 2012-05-18  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-05-18  Zalan Bujtas  <zbujtas@gmail.com>
+
+        [Qt] Gesture tap highlighter needs to take overflow clip into account.
+        https://bugs.webkit.org/show_bug.cgi?id=84989
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Apply overflow clip on the focus ring if needed.
+
+        Follow up patches are needed to address the following cases.
+
+        [Qt] Gesture tap highlighter should take parent iframe's transform into account.
+        https://bugs.webkit.org/show_bug.cgi?id=86645
+
+        [Qt] Gesture tap highlighter needs to take frame clipping into account.
+        https://bugs.webkit.org/show_bug.cgi?id=86646
+
+        [Qt] Gesture tap highlighter's overflow clip is not always correct when
+        nested enclosing containers have transforms.
+        https://bugs.webkit.org/show_bug.cgi?id=86641
+
+        Manual test: ManualTests/qt/tap-highlighting-overflow-hidden.html
+
+        * page/GestureTapHighlighter.cpp:
+        (WebCore::GestureTapHighlighter::pathForNodeHighlight):
+
 2012-05-17  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Source/WebCore/page/GestureTapHighlighter.cpp

@@ -40 +40 @@
 #include "RenderBoxModelObject.h"
 #include "RenderInline.h"
+#include "RenderLayer.h"
 #include "RenderObject.h"
 
@@ -135 +136 @@
 }
 
-Path pathForRenderer(RenderObject* o)
+Path absolutePathForRenderer(RenderObject* const o)
 {
     ASSERT(o);
-    Path path;
 
     Vector<IntRect> rects;
-    o->addFocusRingRects(rects, /* acc. offset */ ownerFrameToMainFrameOffset(o));
+    LayoutPoint frameOffset = ownerFrameToMainFrameOffset(o);
+    o->addFocusRingRects(rects, frameOffset);
 
     if (rects.isEmpty())
-        return path;
+        return Path();
 
     // The basic idea is to allow up to three different boxes in order to highlight
@@ -185 +186 @@
     }
 
+    // Clip the overflow rects if needed, before the ring path is formed to
+    // ensure rounded highlight rects. This clipping has the problem with nested
+    // divs with transforms, which could be resolved by proper Path::intersecting.
+    for (int i = drawableRects.size() - 1; i >= 0; --i) {
+        LayoutRect& ringRect = drawableRects.at(i);
+        LayoutPoint ringRectLocation = ringRect.location();
+
+        ringRect.moveBy(-frameOffset);
+
+        RenderLayer* layer = o->enclosingLayer();
+        RenderObject* currentRenderer = o;
+
+        // Check ancestor layers for overflow clip and intersect them.
+        while (layer) {
+            RenderObject* layerRenderer = layer->renderer();
+
+            if (layerRenderer->hasOverflowClip() && layerRenderer != currentRenderer) {
+                ringRect.move(currentRenderer->offsetFromAncestorContainer(layerRenderer));
+                currentRenderer = layerRenderer;
+
+                ASSERT(layerRenderer->isBox());
+                ringRect.intersect(toRenderBox(layerRenderer)->borderBoxRect());
+
+                if (ringRect.isEmpty())
+                    break;
+            }
+            layer = layer->parent();
+        }
+
+        if (ringRect.isEmpty()) {
+            drawableRects.remove(i);
+            continue;
+        }
+        // After clipping, reset the original position so that parents' transforms apply correctly.
+        ringRect.setLocation(ringRectLocation);
+    }
+
+    Path path;
     for (size_t i = 0; i < drawableRects.size(); ++i) {
         LayoutRect prev = i ? drawableRects.at(i - 1) : LayoutRect();
@@ -191 +230 @@
     }
 
+    path.transform(localToAbsoluteTransform(o));
     return path;
 }
@@ -202 +242 @@
     RenderObject* renderer = node->renderer();
 
-    Path path;
     if (!renderer || (!renderer->isBox() && !renderer->isRenderInline()))
-        return path;
-
-    path = pathForRenderer(renderer);
-    path.transform(localToAbsoluteTransform(renderer));
-
-    return path;
+        return Path();
+
+    return absolutePathForRenderer(renderer);
 }