Changeset 90734 in webkit

Timestamp:

Jul 11, 2011 4:55:04 AM (13 years ago)

Author:

pfeldman@chromium.org

Message:

Web Inspector: [REGRESSION r89753-89754] highlight does not respect scroller location.
​https://bugs.webkit.org/show_bug.cgi?id=63982

Rolling out 89760, 89756, 89754, 89753 for breaking inspector highlight.

Reviewed by Yury Semikhatsky.

• WebCore.exp.in:
• inspector/DOMNodeHighlighter.cpp:

(WebCore::DOMNodeHighlighter::drawNodeHighlight):

• page/FrameView.cpp:
• page/FrameView.h:
• platform/ScrollView.h:
• platform/Widget.cpp:
• platform/Widget.h:
• rendering/RenderBox.cpp:

(WebCore::RenderBox::mapLocalToContainer):

• rendering/RenderBox.h:
• rendering/RenderInline.cpp:

(WebCore::RenderInline::mapLocalToContainer):

• rendering/RenderInline.h:
• rendering/RenderObject.cpp:

(WebCore::RenderObject::mapLocalToContainer):
(WebCore::RenderObject::localToContainerQuad):

• rendering/RenderObject.h:

(WebCore::RenderObject::localToAbsoluteQuad):

• rendering/RenderView.cpp:

(WebCore::RenderView::mapLocalToContainer):

• rendering/RenderView.h:
• rendering/svg/RenderSVGForeignObject.cpp:

(WebCore::RenderSVGForeignObject::mapLocalToContainer):

• rendering/svg/RenderSVGForeignObject.h:
• rendering/svg/RenderSVGInline.cpp:

(WebCore::RenderSVGInline::mapLocalToContainer):

• rendering/svg/RenderSVGInline.h:
• rendering/svg/RenderSVGModelObject.cpp:

(WebCore::RenderSVGModelObject::mapLocalToContainer):

• rendering/svg/RenderSVGModelObject.h:
• rendering/svg/RenderSVGRoot.cpp:

(WebCore::RenderSVGRoot::mapLocalToContainer):

• rendering/svg/RenderSVGRoot.h:
• rendering/svg/RenderSVGText.cpp:

(WebCore::RenderSVGText::mapLocalToContainer):

• rendering/svg/RenderSVGText.h:
• rendering/svg/SVGRenderSupport.cpp:

(WebCore::SVGRenderSupport::mapLocalToContainer):

• rendering/svg/SVGRenderSupport.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• WebCore.exp.in (modified) (1 diff)
• inspector/DOMNodeHighlighter.cpp (modified) (4 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)
• rendering/RenderBox.cpp (modified) (3 diffs)
• rendering/RenderBox.h (modified) (1 diff)
• rendering/RenderInline.cpp (modified) (2 diffs)
• rendering/RenderInline.h (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (3 diffs)
• rendering/RenderObject.h (modified) (2 diffs)
• rendering/RenderView.cpp (modified) (1 diff)
• rendering/RenderView.h (modified) (1 diff)
• rendering/svg/RenderSVGForeignObject.cpp (modified) (1 diff)
• rendering/svg/RenderSVGForeignObject.h (modified) (1 diff)
• rendering/svg/RenderSVGInline.cpp (modified) (1 diff)
• rendering/svg/RenderSVGInline.h (modified) (1 diff)
• rendering/svg/RenderSVGModelObject.cpp (modified) (1 diff)
• rendering/svg/RenderSVGModelObject.h (modified) (1 diff)
• rendering/svg/RenderSVGRoot.cpp (modified) (2 diffs)
• rendering/svg/RenderSVGRoot.h (modified) (1 diff)
• rendering/svg/RenderSVGText.cpp (modified) (1 diff)
• rendering/svg/RenderSVGText.h (modified) (1 diff)
• rendering/svg/SVGRenderSupport.cpp (modified) (1 diff)
• rendering/svg/SVGRenderSupport.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-11  Pavel Feldman  <pfeldman@google.com>
+
+        Web Inspector: [REGRESSION r89753-89754] highlight does not respect scroller location.
+        https://bugs.webkit.org/show_bug.cgi?id=63982
+
+        Rolling out 89760, 89756, 89754, 89753 for breaking inspector highlight.
+
+        Reviewed by Yury Semikhatsky.
+
+        * WebCore.exp.in:
+        * inspector/DOMNodeHighlighter.cpp:
+        (WebCore::DOMNodeHighlighter::drawNodeHighlight):
+        * page/FrameView.cpp:
+        * page/FrameView.h:
+        * platform/ScrollView.h:
+        * platform/Widget.cpp:
+        * platform/Widget.h:
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::mapLocalToContainer):
+        * rendering/RenderBox.h:
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::mapLocalToContainer):
+        * rendering/RenderInline.h:
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::mapLocalToContainer):
+        (WebCore::RenderObject::localToContainerQuad):
+        * rendering/RenderObject.h:
+        (WebCore::RenderObject::localToAbsoluteQuad):
+        * rendering/RenderView.cpp:
+        (WebCore::RenderView::mapLocalToContainer):
+        * rendering/RenderView.h:
+        * rendering/svg/RenderSVGForeignObject.cpp:
+        (WebCore::RenderSVGForeignObject::mapLocalToContainer):
+        * rendering/svg/RenderSVGForeignObject.h:
+        * rendering/svg/RenderSVGInline.cpp:
+        (WebCore::RenderSVGInline::mapLocalToContainer):
+        * rendering/svg/RenderSVGInline.h:
+        * rendering/svg/RenderSVGModelObject.cpp:
+        (WebCore::RenderSVGModelObject::mapLocalToContainer):
+        * rendering/svg/RenderSVGModelObject.h:
+        * rendering/svg/RenderSVGRoot.cpp:
+        (WebCore::RenderSVGRoot::mapLocalToContainer):
+        * rendering/svg/RenderSVGRoot.h:
+        * rendering/svg/RenderSVGText.cpp:
+        (WebCore::RenderSVGText::mapLocalToContainer):
+        * rendering/svg/RenderSVGText.h:
+        * rendering/svg/SVGRenderSupport.cpp:
+        (WebCore::SVGRenderSupport::mapLocalToContainer):
+        * rendering/svg/SVGRenderSupport.h:
+
 2011-07-11  Mustafizur Rahaman  <mustaf.here@gmail.com>
 

trunk/Source/WebCore/WebCore.exp.in

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

trunk/Source/WebCore/inspector/DOMNodeHighlighter.cpp

@@ -133 +133 @@
 }
 
-void drawElementTitle(GraphicsContext& context, Node* node, const IntRect& boundingBox, const IntRect& anchorBox, const FloatRect& overlayRect, Settings* settings)
+void drawElementTitle(GraphicsContext& context, Node* node, const IntRect& boundingBox, const IntRect& anchorBox, const FloatRect& overlayRect, WebCore::Settings* settings)
 {
     static const int rectInflatePx = 4;
@@ -267 +267 @@
                           borderBox.width() + renderBox->marginLeft() + renderBox->marginRight(), borderBox.height() + renderBox->marginTop() + renderBox->marginBottom());
 
-        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);
+
+        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);
 
         titleAnchorBox = absMarginQuad.enclosingBoundingBox();
@@ -282 +282 @@
         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;
@@ -297 +296 @@
         return;
 
-    Settings* settings = containingFrame->settings();
+    WebCore::Settings* settings = containingFrame->settings();
     if (mode == DOMNodeHighlighter::HighlightAll)
         drawElementTitle(context, node, boundingBox, titleAnchorBox, overlayRect, settings);

trunk/Source/WebCore/page/FrameView.cpp

@@ -2814 +2814 @@
 }
 
-FloatQuad FrameView::convertFromRenderer(const RenderObject* renderer, const FloatQuad& rendererQuad) const
-{
-    bool wasFixed = false;
-    FloatQuad quad = renderer->localToAbsoluteQuad(rendererQuad, false, &wasFixed);
-
-    if (!wasFixed) {
-        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"
@@ -256 +255 @@
         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>
@@ -255 +254 @@
     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; }

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -1204 +1204 @@
 }
 
-void RenderBox::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, bool* wasFixed) const
+void RenderBox::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState) const
 {
     if (repaintContainer == this)
@@ -1234 +1234 @@
     } else
         fixed |= isFixedPos;
-    if (wasFixed)
-        *wasFixed = fixed;
     
     LayoutSize containerOffset = offsetFromContainer(o, roundedLayoutPoint(transformState.mappedPoint()));
@@ -1255 +1253 @@
     }
     
-    o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState, wasFixed);
+    o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState);
 }
 

trunk/Source/WebCore/rendering/RenderBox.h

@@ -429 +429 @@
     virtual bool shouldComputeSizeAsReplaced() const { return isReplaced() && !isInlineBlockOrInlineTable(); }
 
-    virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState&, bool* wasFixed = 0) const;
+    virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState&) const;
     virtual void mapAbsoluteToLocalPoint(bool fixed, bool useTransforms, TransformState&) const;
 

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -1110 +1110 @@
 }
 
-void RenderInline::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, bool* wasFixed) const
+void RenderInline::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState) const
 {
     if (repaintContainer == this)
@@ -1153 +1153 @@
     }
 
-    o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState, wasFixed);
+    o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState);
 }
 

trunk/Source/WebCore/rendering/RenderInline.h

@@ -131 +131 @@
     virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& rect, bool fixed);
 
-    virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState&, bool* wasFixed = 0) const;
+    virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState&) const;
     virtual void mapAbsoluteToLocalPoint(bool fixed, bool useTransforms, TransformState&) const;
 

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -1849 +1849 @@
 }
 
-void RenderObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, bool* wasFixed) const
+void RenderObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState) const
 {
     if (repaintContainer == this)
@@ -1870 +1870 @@
         transformState.move(-toRenderBox(o)->layer()->scrolledContentOffset());
 
-    o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState, wasFixed);
+    o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState);
 }
 
@@ -1921 +1921 @@
 }
 
-FloatQuad RenderObject::localToContainerQuad(const FloatQuad& localQuad, RenderBoxModelObject* repaintContainer, bool fixed, bool* wasFixed) const
+FloatQuad RenderObject::localToContainerQuad(const FloatQuad& localQuad, RenderBoxModelObject* repaintContainer, bool fixed) const
 {
     // Track the point at the center of the quad's bounding box. As mapLocalToContainer() calls offsetFromContainer(),
     // it will use that point as the reference point to decide which column's transform to apply in multiple-column blocks.
     TransformState transformState(TransformState::ApplyTransformDirection, localQuad.boundingBox().center(), &localQuad);
-    mapLocalToContainer(repaintContainer, fixed, true, transformState, wasFixed);
+    mapLocalToContainer(repaintContainer, fixed, true, transformState);
     transformState.flatten();
     

trunk/Source/WebCore/rendering/RenderObject.h

@@ -580 +580 @@
 
     // Convert a local quad to absolute coordinates, taking transforms into account.
-    FloatQuad localToAbsoluteQuad(const FloatQuad& quad, bool fixed = false, bool* wasFixed = 0) const
+    FloatQuad localToAbsoluteQuad(const FloatQuad& quad, bool fixed = false) const
     {
-        return localToContainerQuad(quad, 0, fixed, wasFixed);
+        return localToContainerQuad(quad, 0, fixed);
     }
     // Convert a local quad into the coordinate system of container, taking transforms into account.
-    FloatQuad localToContainerQuad(const FloatQuad&, RenderBoxModelObject* repaintContainer, bool fixed = false, bool* wasFixed = 0) const;
+    FloatQuad localToContainerQuad(const FloatQuad&, RenderBoxModelObject* repaintContainer, bool fixed = false) const;
 
     // Return the offset from the container() renderer (excluding transforms). In multi-column layout,
@@ -772 +772 @@
     // Map points and quads through elements, potentially via 3d transforms. You should never need to call these directly; use
     // localToAbsolute/absoluteToLocal methods instead.
-    virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, bool* wasFixed = 0) const;
+    virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&) const;
     virtual void mapAbsoluteToLocalPoint(bool fixed, bool useTransforms, TransformState&) const;
 

trunk/Source/WebCore/rendering/RenderView.cpp

@@ -137 +137 @@
 }
 
-void RenderView::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, bool* wasFixed) const
+void RenderView::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState) const
 {
     // If a container was specified, and was not 0 or the RenderView,
     // then we should have found it by now.
     ASSERT_ARG(repaintContainer, !repaintContainer || repaintContainer == this);
-    ASSERT_UNUSED(wasFixed, !wasFixed || *wasFixed == fixed);
 
     if (!repaintContainer && useTransforms && shouldUseTransformFromContainer(0)) {

trunk/Source/WebCore/rendering/RenderView.h

@@ -165 +165 @@
 
 protected:
-    virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, bool* wasFixed = 0) const;
+    virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&) const;
     virtual void mapAbsoluteToLocalPoint(bool fixed, bool useTransforms, TransformState&) const;
 

trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp

@@ -160 +160 @@
 }
 
-void RenderSVGForeignObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, bool* wasFixed) const
+void RenderSVGForeignObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState) const
 {
     // When crawling up the hierachy starting from foreignObject child content, useTransforms may not be set to true.
     if (!useTransforms)
         useTransforms = true;
-    SVGRenderSupport::mapLocalToContainer(this, repaintContainer, fixed, useTransforms, transformState, wasFixed);
+    SVGRenderSupport::mapLocalToContainer(this, repaintContainer, fixed, useTransforms, transformState);
 }
 

trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h

@@ -54 +54 @@
     virtual bool isSVGForeignObject() const { return true; }
 
-    virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState&, bool* wasFixed = 0) const;
+    virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed , bool useTransforms, TransformState&) const;
     virtual void setNeedsTransformUpdate() { m_needsTransformUpdate = true; }
 

trunk/Source/WebCore/rendering/svg/RenderSVGInline.cpp

@@ -78 +78 @@
 }
 
-void RenderSVGInline::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState& transformState, bool* wasFixed) const
+void RenderSVGInline::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState& transformState) const
 {
-    SVGRenderSupport::mapLocalToContainer(this, repaintContainer, useTransforms, fixed, transformState, wasFixed);
+    SVGRenderSupport::mapLocalToContainer(this, repaintContainer, useTransforms, fixed, transformState);
 }
 

trunk/Source/WebCore/rendering/svg/RenderSVGInline.h

@@ -48 +48 @@
     virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer);
     virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false);
-    virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, bool* wasFixed = 0) const;
+    virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&) const;
     virtual void absoluteQuads(Vector<FloatQuad>&);
 

trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp

@@ -54 +54 @@
 }
 
-void RenderSVGModelObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, bool* wasFixed) const
+void RenderSVGModelObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed , bool useTransforms, TransformState& transformState) const
 {
-    SVGRenderSupport::mapLocalToContainer(this, repaintContainer, fixed, useTransforms, transformState, wasFixed);
+    SVGRenderSupport::mapLocalToContainer(this, repaintContainer, fixed, useTransforms, transformState);
 }
 

trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.h

@@ -59 +59 @@
     virtual void absoluteQuads(Vector<FloatQuad>&);
 
-    virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, bool* wasFixed = 0) const;
+    virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&) const;
     virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle);
     virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);

trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp

@@ -416 +416 @@
 }
 
-void RenderSVGRoot::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, bool* wasFixed) const
+void RenderSVGRoot::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed , bool useTransforms, TransformState& transformState) const
 {
     ASSERT(!fixed); // We should have no fixed content in the SVG rendering tree.
@@ -423 +423 @@
     // Transform to our border box and let RenderBox transform the rest of the way.
     transformState.applyTransform(localToBorderBoxTransform());
-    RenderBox::mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState, wasFixed);
+    RenderBox::mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState);
 }
 

trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h

@@ -84 +84 @@
     virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& repaintRect, bool fixed);
 
-    virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, bool* wasFixed = 0) const;
+    virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&) const;
 
     void calcViewport();

trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp

@@ -93 +93 @@
 }
 
-void RenderSVGText::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, bool* wasFixed) const
-{
-    SVGRenderSupport::mapLocalToContainer(this, repaintContainer, fixed, useTransforms, transformState, wasFixed);
+void RenderSVGText::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState) const
+{
+    SVGRenderSupport::mapLocalToContainer(this, repaintContainer, fixed, useTransforms, transformState);
 }
 

trunk/Source/WebCore/rendering/svg/RenderSVGText.h

@@ -66 +66 @@
     virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false);
 
-    virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, bool* wasFixed = 0) const;
+    virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&) const;
 
     virtual FloatRect objectBoundingBox() const { return frameRect(); }

trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp

@@ -71 +71 @@
 }
 
-void SVGRenderSupport::mapLocalToContainer(const RenderObject* object, RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, bool* wasFixed)
+void SVGRenderSupport::mapLocalToContainer(const RenderObject* object, RenderBoxModelObject* repaintContainer, bool fixed , bool useTransforms, TransformState& transformState)
 {
     ASSERT(!fixed); // We should have no fixed content in the SVG rendering tree.
     ASSERT(useTransforms); // Mapping a point through SVG w/o respecting transforms is useless.
     transformState.applyTransform(object->localToParentTransform());
-    object->parent()->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState, wasFixed);
+    object->parent()->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState);
 }
 

trunk/Source/WebCore/rendering/svg/SVGRenderSupport.h

@@ -64 +64 @@
     static IntRect clippedOverflowRectForRepaint(RenderObject*, RenderBoxModelObject* repaintContainer);
     static void computeRectForRepaint(RenderObject*, RenderBoxModelObject* repaintContainer, IntRect&, bool fixed);
-    static void mapLocalToContainer(const RenderObject*, RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, bool* wasFixed = 0);
+    static void mapLocalToContainer(const RenderObject*, RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&);
 
     // Shared between SVG renderers and resources.