Changeset 89753 in webkit

Timestamp:

Jun 25, 2011 4:01:15 PM (13 years ago)

Author:

Joseph Pecoraro

Message:

2011-06-25 Joseph Pecoraro <Joseph Pecoraro>

Reviewed by Simon Fraser.

Inspector highlight rect is wrong for contents of transformed iframes
​https://bugs.webkit.org/show_bug.cgi?id=53627

Part 1: Provide FloatQuad versions of convertFromRenderer,
convertToContainingView, and convertChildToSelf, so that we
can get the fully transformed quad of a renderer all the
way up to the root widget.

• page/FrameView.cpp: (WebCore::FrameView::convertFromRenderer): (WebCore::FrameView::convertToContainingView):
• page/FrameView.h:
• platform/ScrollView.h: (WebCore::ScrollView::convertChildToSelf):
• platform/Widget.h:
• platform/Widget.cpp: (WebCore::Widget::convertToContainingView): Provide FloatQuad versions of these already existing functions.

(WebCore::Widget::convertToRootContainingView):
Provide a helper conversion function to recursively
convert a given FloatQuad up to the root widget.

• inspector/DOMNodeHighlighter.cpp: (WebCore::DOMNodeHighlighter::DrawNodeHighlight): Use the new methods to convert the FloatQuad for the highlighted node to the root container, without losing transformation information. Add a FIXME for SVG, which is still broken.

• WebCore.exp.in: Export the new Widget functions so WebKit can link properly.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.exp.in (modified) (1 diff)
• inspector/DOMNodeHighlighter.cpp (modified) (2 diffs)
• page/FrameView.cpp (modified) (1 diff)
• page/FrameView.h (modified) (1 diff)
• platform/ScrollView.h (modified) (2 diffs)
• platform/Widget.cpp (modified) (1 diff)
• platform/Widget.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-25  Joseph Pecoraro  <joepeck@webkit.org>
+
+        Reviewed by Simon Fraser.
+
+        Inspector highlight rect is wrong for contents of transformed iframes
+        https://bugs.webkit.org/show_bug.cgi?id=53627
+
+        Part 1: Provide FloatQuad versions of convertFromRenderer,
+        convertToContainingView, and convertChildToSelf, so that we
+        can get the fully transformed quad of a renderer all the
+        way up to the root widget.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::convertFromRenderer):
+        (WebCore::FrameView::convertToContainingView):
+        * page/FrameView.h:
+        * platform/ScrollView.h:
+        (WebCore::ScrollView::convertChildToSelf):
+        * platform/Widget.h:
+        * platform/Widget.cpp:
+        (WebCore::Widget::convertToContainingView):
+        Provide FloatQuad versions of these already existing functions.
+
+        (WebCore::Widget::convertToRootContainingView):
+        Provide a helper conversion function to recursively
+        convert a given FloatQuad up to the root widget.
+
+        * inspector/DOMNodeHighlighter.cpp:
+        (WebCore::DOMNodeHighlighter::DrawNodeHighlight):
+        Use the new methods to convert the FloatQuad for the highlighted
+        node to the root container, without losing transformation
+        information. Add a FIXME for SVG, which is still broken.
+
+        * WebCore.exp.in:
+        Export the new Widget functions so WebKit can link properly.
+
 2011-06-25  Dirk Schulze  <krit@webkit.org>
 

trunk/Source/WebCore/WebCore.exp.in

@@ -1275 +1275 @@
 __ZNK7WebCore6Widget23convertToContainingViewERKNS_7IntRectE
 __ZNK7WebCore6Widget23convertToContainingViewERKNS_8IntPointE
+__ZNK7WebCore6Widget23convertToContainingViewERKNS_9FloatQuadE
 __ZNK7WebCore6Widget25convertFromContainingViewERKNS_7IntRectE
 __ZNK7WebCore6Widget25convertFromContainingViewERKNS_8IntPointE
 __ZNK7WebCore6Widget25convertToContainingWindowERKNS_7IntRectE
 __ZNK7WebCore6Widget25convertToContainingWindowERKNS_8IntPointE
+__ZNK7WebCore6Widget27convertToRootContainingViewERKNS_9FloatQuadE
 __ZNK7WebCore6Widget9frameRectEv
 __ZNK7WebCore7Element10screenRectEv

trunk/Source/WebCore/inspector/DOMNodeHighlighter.cpp

@@ -268 +268 @@
                           borderBox.width() + renderBox->marginLeft() + renderBox->marginRight(), borderBox.height() + renderBox->marginTop() + renderBox->marginBottom());
 
-
-        FloatQuad absContentQuad = renderBox->localToAbsoluteQuad(FloatRect(contentBox));
-        FloatQuad absPaddingQuad = renderBox->localToAbsoluteQuad(FloatRect(paddingBox));
-        FloatQuad absBorderQuad = renderBox->localToAbsoluteQuad(FloatRect(borderBox));
-        FloatQuad absMarginQuad = renderBox->localToAbsoluteQuad(FloatRect(marginBox));
-
-        absContentQuad.move(mainFrameOffset);
-        absPaddingQuad.move(mainFrameOffset);
-        absBorderQuad.move(mainFrameOffset);
-        absMarginQuad.move(mainFrameOffset);
+        FrameView* containingView = containingFrame->view();
+        FloatQuad absContentQuad = containingView->convertFromRenderer(renderer, FloatRect(contentBox));
+        FloatQuad absPaddingQuad = containingView->convertFromRenderer(renderer, FloatRect(paddingBox));
+        FloatQuad absBorderQuad = containingView->convertFromRenderer(renderer, FloatRect(borderBox));
+        FloatQuad absMarginQuad = containingView->convertFromRenderer(renderer, FloatRect(marginBox));
+
+        absContentQuad = containingView->convertToRootContainingView(absContentQuad);
+        absPaddingQuad = containingView->convertToRootContainingView(absPaddingQuad);
+        absBorderQuad = containingView->convertToRootContainingView(absBorderQuad);
+        absMarginQuad = containingView->convertToRootContainingView(absMarginQuad);
 
         titleAnchorBox = absMarginQuad.enclosingBoundingBox();
@@ -283 +283 @@
         drawHighlightForBox(context, absContentQuad, absPaddingQuad, absBorderQuad, absMarginQuad, mode);
     } else if (renderer->isRenderInline() || isSVGRenderer) {
+        // FIXME: Does not handle transformed content correctly.
         // FIXME: We should show margins/padding/border for inlines.
         Vector<FloatQuad> lineBoxQuads;

trunk/Source/WebCore/page/FrameView.cpp

@@ -2807 +2807 @@
 }
 
+FloatQuad FrameView::convertFromRenderer(const RenderObject* renderer, const FloatQuad& rendererQuad) const
+{
+    FloatQuad quad = renderer->localToAbsoluteQuad(rendererQuad);
+
+    IntPoint scroll = scrollPosition();
+    quad.move(-scroll.x(), -scroll.y());
+
+    return quad;
+}
+
+FloatQuad FrameView::convertToContainingView(const FloatQuad& localQuad) const
+{
+    if (const ScrollView* parentScrollView = parent()) {
+        if (parentScrollView->isFrameView()) {
+            const FrameView* parentView = static_cast<const FrameView*>(parentScrollView);
+
+            // Get our renderer in the parent view.
+            RenderPart* renderer = m_frame->ownerRenderer();
+            if (!renderer)
+                return localQuad;
+
+            // Add borders and padding.
+            FloatQuad quad(localQuad);
+            quad.move(renderer->borderLeft() + renderer->paddingLeft(),
+                      renderer->borderTop() + renderer->paddingTop());
+
+            // Apply the parent's transforms and scroll offset.
+            return parentView->convertFromRenderer(renderer, quad);
+        }
+
+        return Widget::convertToContainingView(localQuad);
+    }
+
+    return localQuad;
+}
+
 // Normal delay
 void FrameView::setRepaintThrottlingDeferredRepaintDelay(double p)

trunk/Source/WebCore/page/FrameView.h

@@ -261 +261 @@
     virtual IntPoint convertToRenderer(const RenderObject*, const IntPoint&) const;
 
+    // Conversion with FloatQuads, to keep transformed coordinates.
+    virtual FloatQuad convertFromRenderer(const RenderObject*, const FloatQuad&) const;
+    virtual FloatQuad convertToContainingView(const FloatQuad&) const;
+
     bool isFrameViewScrollCorner(RenderScrollbarPart* scrollCorner) const { return m_scrollCorner == scrollCorner; }
 

trunk/Source/WebCore/platform/ScrollView.h

@@ -28 +28 @@
 #define ScrollView_h
 
+#include "FloatQuad.h"
 #include "IntRect.h"
 #include "Scrollbar.h"
@@ -255 +256 @@
         newPoint.move(-child->location());
         return newPoint;
+    }
+
+    FloatQuad convertChildToSelf(const Widget* child, const FloatQuad& quad) const
+    {
+        IntPoint point = quad.enclosingBoundingBox().location();
+        IntPoint newPoint = convertChildToSelf(child, point);
+
+        FloatQuad newQuad = quad;
+        newQuad.move(newPoint.x(), newPoint.y());
+        return newQuad;
     }
 

trunk/Source/WebCore/platform/Widget.cpp

@@ -169 +169 @@
 }
 
+FloatQuad Widget::convertToContainingView(const FloatQuad& localQuad) const
+{
+    if (const ScrollView* parentScrollView = parent())
+        return parentScrollView->convertChildToSelf(this, localQuad);
+
+    return localQuad;
+}
+
+FloatQuad Widget::convertToRootContainingView(const FloatQuad& localQuad) const
+{
+    if (!parent())
+        return localQuad;
+
+    FloatQuad containingQuad = convertToContainingView(localQuad);
+    return parent()->convertToRootContainingView(containingQuad);
+}
+
 #if !PLATFORM(EFL)
 void Widget::frameRectsChanged()

trunk/Source/WebCore/platform/Widget.h

@@ -28 +28 @@
 #define Widget_h
 
+#include "FloatQuad.h"
 #include "IntRect.h"
 #include <wtf/Forward.h>
@@ -254 +255 @@
     virtual IntPoint convertFromContainingView(const IntPoint&) const;
 
+    // Conversion with FloatQuads, to keep transformed coordinates.
+    virtual FloatQuad convertToContainingView(const FloatQuad&) const;
+    virtual FloatQuad convertToRootContainingView(const FloatQuad&) const;
+
     // A means to access the AX cache when this object can get a pointer to it.
     virtual AXObjectCache* axObjectCache() const { return 0; }