Title: [153893] trunk/Source/WebCore
- Revision
- 153893
- Author
- [email protected]
- Date
- 2013-08-09 08:00:02 -0700 (Fri, 09 Aug 2013)
Log Message
[Qt][WK2] Composited and transformed links asserts in tap highlight
https://bugs.webkit.org/show_bug.cgi?id=94345
Reviewed by Jocelyn Turcotte.
Use a mapping that does not assert when hitting transforms. We still skip
transforms that produces non-rectangular areas.
* page/GestureTapHighlighter.cpp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (153892 => 153893)
--- trunk/Source/WebCore/ChangeLog 2013-08-09 14:41:25 UTC (rev 153892)
+++ trunk/Source/WebCore/ChangeLog 2013-08-09 15:00:02 UTC (rev 153893)
@@ -1,3 +1,15 @@
+2013-08-08 Allan Sandfeld Jensen <[email protected]>
+
+ [Qt][WK2] Composited and transformed links asserts in tap highlight
+ https://bugs.webkit.org/show_bug.cgi?id=94345
+
+ Reviewed by Jocelyn Turcotte.
+
+ Use a mapping that does not assert when hitting transforms. We still skip
+ transforms that produces non-rectangular areas.
+
+ * page/GestureTapHighlighter.cpp:
+
2013-08-09 Gabor Abraham <[email protected]>
Buildfix. Fix warning after r153887:
Modified: trunk/Source/WebCore/page/GestureTapHighlighter.cpp (153892 => 153893)
--- trunk/Source/WebCore/page/GestureTapHighlighter.cpp 2013-08-09 14:41:25 UTC (rev 153892)
+++ trunk/Source/WebCore/page/GestureTapHighlighter.cpp 2013-08-09 15:00:02 UTC (rev 153893)
@@ -199,8 +199,7 @@
drawableRects.append(last);
// 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.
+ // ensure rounded highlight rects.
for (int i = drawableRects.size() - 1; i >= 0; --i) {
LayoutRect& ringRect = drawableRects.at(i);
LayoutPoint ringRectLocation = ringRect.location();
@@ -220,7 +219,12 @@
currentRenderer->container(layerRenderer, &containerSkipped);
if (containerSkipped)
continue;
- ringRect.move(currentRenderer->offsetFromAncestorContainer(layerRenderer));
+ FloatQuad ringQuad = currentRenderer->localToContainerQuad(FloatQuad(ringRect), layerRenderer);
+ // Ignore quads that are not rectangular, since we can not currently highlight them nicely.
+ if (ringQuad.isRectilinear())
+ ringRect = ringQuad.enclosingBoundingBox();
+ else
+ ringRect = LayoutRect();
currentRenderer = layerRenderer;
ASSERT(layerRenderer->isBox());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes