Diff
Modified: trunk/Source/WebCore/ChangeLog (90733 => 90734)
--- trunk/Source/WebCore/ChangeLog 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/ChangeLog 2011-07-11 11:55:04 UTC (rev 90734)
@@ -1,3 +1,53 @@
+2011-07-11 Pavel Feldman <pfeld...@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.h...@gmail.com>
Reviewed by James Robinson.
Modified: trunk/Source/WebCore/WebCore.exp.in (90733 => 90734)
--- trunk/Source/WebCore/WebCore.exp.in 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/WebCore.exp.in 2011-07-11 11:55:04 UTC (rev 90734)
@@ -1275,12 +1275,10 @@
__ZNK7WebCore6Widget14platformWidgetEv
__ZNK7WebCore6Widget23convertToContainingViewERKNS_7IntRectE
__ZNK7WebCore6Widget23convertToContainingViewERKNS_8IntPointE
-__ZNK7WebCore6Widget23convertToContainingViewERKNS_9FloatQuadE
__ZNK7WebCore6Widget25convertFromContainingViewERKNS_7IntRectE
__ZNK7WebCore6Widget25convertFromContainingViewERKNS_8IntPointE
__ZNK7WebCore6Widget25convertToContainingWindowERKNS_7IntRectE
__ZNK7WebCore6Widget25convertToContainingWindowERKNS_8IntPointE
-__ZNK7WebCore6Widget27convertToRootContainingViewERKNS_9FloatQuadE
__ZNK7WebCore6Widget9frameRectEv
__ZNK7WebCore7Element10screenRectEv
__ZNK7WebCore7Element10shadowRootEv
Modified: trunk/Source/WebCore/inspector/DOMNodeHighlighter.cpp (90733 => 90734)
--- trunk/Source/WebCore/inspector/DOMNodeHighlighter.cpp 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/inspector/DOMNodeHighlighter.cpp 2011-07-11 11:55:04 UTC (rev 90734)
@@ -132,7 +132,7 @@
return mainFramePoint - IntPoint();
}
-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;
static const int fontHeightPx = 12;
@@ -266,22 +266,21 @@
LayoutRect marginBox(borderBox.x() - renderBox->marginLeft(), borderBox.y() - renderBox->marginTop(),
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();
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;
renderer->absoluteQuads(lineBoxQuads);
@@ -296,7 +295,7 @@
if (!node->isElementNode())
return;
- Settings* settings = containingFrame->settings();
+ WebCore::Settings* settings = containingFrame->settings();
if (mode == DOMNodeHighlighter::HighlightAll)
drawElementTitle(context, node, boundingBox, titleAnchorBox, overlayRect, settings);
}
Modified: trunk/Source/WebCore/page/FrameView.cpp (90733 => 90734)
--- trunk/Source/WebCore/page/FrameView.cpp 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/page/FrameView.cpp 2011-07-11 11:55:04 UTC (rev 90734)
@@ -2813,45 +2813,6 @@
return parentPoint;
}
-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)
{
Modified: trunk/Source/WebCore/page/FrameView.h (90733 => 90734)
--- trunk/Source/WebCore/page/FrameView.h 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/page/FrameView.h 2011-07-11 11:55:04 UTC (rev 90734)
@@ -260,10 +260,6 @@
virtual IntPoint convertFromRenderer(const RenderObject*, const IntPoint&) const;
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; }
void calculateScrollbarModesForLayout(ScrollbarMode& hMode, ScrollbarMode& vMode);
Modified: trunk/Source/WebCore/platform/ScrollView.h (90733 => 90734)
--- trunk/Source/WebCore/platform/ScrollView.h 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/platform/ScrollView.h 2011-07-11 11:55:04 UTC (rev 90734)
@@ -27,7 +27,6 @@
#ifndef ScrollView_h
#define ScrollView_h
-#include "FloatQuad.h"
#include "IntRect.h"
#include "Scrollbar.h"
#include "ScrollableArea.h"
@@ -257,16 +256,6 @@
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;
- }
-
// Widget override. Handles painting of the contents of the view as well as the scrollbars.
virtual void paint(GraphicsContext*, const IntRect&);
void paintScrollbars(GraphicsContext*, const IntRect&);
Modified: trunk/Source/WebCore/platform/Widget.cpp (90733 => 90734)
--- trunk/Source/WebCore/platform/Widget.cpp 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/platform/Widget.cpp 2011-07-11 11:55:04 UTC (rev 90734)
@@ -168,23 +168,6 @@
return parentPoint;
}
-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()
{
Modified: trunk/Source/WebCore/platform/Widget.h (90733 => 90734)
--- trunk/Source/WebCore/platform/Widget.h 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/platform/Widget.h 2011-07-11 11:55:04 UTC (rev 90734)
@@ -27,7 +27,6 @@
#ifndef Widget_h
#define Widget_h
-#include "FloatQuad.h"
#include "IntRect.h"
#include <wtf/Forward.h>
#include <wtf/RefCounted.h>
@@ -254,10 +253,6 @@
virtual IntPoint convertToContainingView(const IntPoint&) const;
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; }
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (90733 => 90734)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2011-07-11 11:55:04 UTC (rev 90734)
@@ -1203,7 +1203,7 @@
return cb->computeContentBoxLogicalHeight(logicalHeightLength.value());
}
-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)
return;
@@ -1233,8 +1233,6 @@
fixed &= isFixedPos;
} else
fixed |= isFixedPos;
- if (wasFixed)
- *wasFixed = fixed;
LayoutSize containerOffset = offsetFromContainer(o, roundedLayoutPoint(transformState.mappedPoint()));
@@ -1254,7 +1252,7 @@
return;
}
- o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState, wasFixed);
+ o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState);
}
void RenderBox::mapAbsoluteToLocalPoint(bool fixed, bool useTransforms, TransformState& transformState) const
Modified: trunk/Source/WebCore/rendering/RenderBox.h (90733 => 90734)
--- trunk/Source/WebCore/rendering/RenderBox.h 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2011-07-11 11:55:04 UTC (rev 90734)
@@ -428,7 +428,7 @@
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;
void paintRootBoxFillLayers(const PaintInfo&);
Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (90733 => 90734)
--- trunk/Source/WebCore/rendering/RenderInline.cpp 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2011-07-11 11:55:04 UTC (rev 90734)
@@ -1109,7 +1109,7 @@
return offset;
}
-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)
return;
@@ -1152,7 +1152,7 @@
return;
}
- o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState, wasFixed);
+ o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState);
}
void RenderInline::mapAbsoluteToLocalPoint(bool fixed, bool useTransforms, TransformState& transformState) const
Modified: trunk/Source/WebCore/rendering/RenderInline.h (90733 => 90734)
--- trunk/Source/WebCore/rendering/RenderInline.h 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/rendering/RenderInline.h 2011-07-11 11:55:04 UTC (rev 90734)
@@ -130,7 +130,7 @@
virtual IntRect rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth);
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;
virtual VisiblePosition positionForPoint(const LayoutPoint&);
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (90733 => 90734)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2011-07-11 11:55:04 UTC (rev 90734)
@@ -1848,7 +1848,7 @@
return transformState.lastPlanarPoint();
}
-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)
return;
@@ -1869,7 +1869,7 @@
if (o->hasOverflowClip())
transformState.move(-toRenderBox(o)->layer()->scrolledContentOffset());
- o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState, wasFixed);
+ o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState);
}
void RenderObject::mapAbsoluteToLocalPoint(bool fixed, bool useTransforms, TransformState& transformState) const
@@ -1920,12 +1920,12 @@
#endif
}
-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();
return transformState.lastPlanarQuad();
Modified: trunk/Source/WebCore/rendering/RenderObject.h (90733 => 90734)
--- trunk/Source/WebCore/rendering/RenderObject.h 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2011-07-11 11:55:04 UTC (rev 90734)
@@ -579,12 +579,12 @@
FloatPoint absoluteToLocal(const FloatPoint&, bool fixed = false, bool useTransforms = false) const;
// 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,
// different offsets apply at different points, so return the offset that applies to the given point.
@@ -771,7 +771,7 @@
// 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;
bool shouldUseTransformFromContainer(const RenderObject* container) const;
Modified: trunk/Source/WebCore/rendering/RenderView.cpp (90733 => 90734)
--- trunk/Source/WebCore/rendering/RenderView.cpp 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2011-07-11 11:55:04 UTC (rev 90734)
@@ -136,12 +136,11 @@
setNeedsLayout(false);
}
-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)) {
TransformationMatrix t;
Modified: trunk/Source/WebCore/rendering/RenderView.h (90733 => 90734)
--- trunk/Source/WebCore/rendering/RenderView.h 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/rendering/RenderView.h 2011-07-11 11:55:04 UTC (rev 90734)
@@ -164,7 +164,7 @@
IntRect documentRect() const;
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;
private:
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp (90733 => 90734)
--- trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp 2011-07-11 11:55:04 UTC (rev 90734)
@@ -159,12 +159,12 @@
return false;
}
-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);
}
}
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h (90733 => 90734)
--- trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h 2011-07-11 11:55:04 UTC (rev 90734)
@@ -53,7 +53,7 @@
virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const LayoutPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestAction);
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; }
private:
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGInline.cpp (90733 => 90734)
--- trunk/Source/WebCore/rendering/svg/RenderSVGInline.cpp 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGInline.cpp 2011-07-11 11:55:04 UTC (rev 90734)
@@ -77,9 +77,9 @@
SVGRenderSupport::computeRectForRepaint(this, repaintContainer, repaintRect, fixed);
}
-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);
}
void RenderSVGInline::absoluteQuads(Vector<FloatQuad>& quads)
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGInline.h (90733 => 90734)
--- trunk/Source/WebCore/rendering/svg/RenderSVGInline.h 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGInline.h 2011-07-11 11:55:04 UTC (rev 90734)
@@ -47,7 +47,7 @@
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>&);
private:
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp (90733 => 90734)
--- trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp 2011-07-11 11:55:04 UTC (rev 90734)
@@ -53,9 +53,9 @@
SVGRenderSupport::computeRectForRepaint(this, repaintContainer, repaintRect, fixed);
}
-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);
}
// Copied from RenderBox, this method likely requires further refactoring to work easily for both SVG and CSS Box Model content.
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.h (90733 => 90734)
--- trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.h 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.h 2011-07-11 11:55:04 UTC (rev 90734)
@@ -58,7 +58,7 @@
virtual void absoluteRects(Vector<LayoutRect>&, const LayoutPoint& accumulatedOffset);
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);
virtual void updateFromElement();
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp (90733 => 90734)
--- trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2011-07-11 11:55:04 UTC (rev 90734)
@@ -415,14 +415,14 @@
RenderBox::computeRectForRepaint(repaintContainer, repaintRect, fixed);
}
-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.
ASSERT(useTransforms); // mapping a point through SVG w/o respecting trasnforms is useless.
// 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);
}
void RenderSVGRoot::updateCachedBoundaries()
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h (90733 => 90734)
--- trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h 2011-07-11 11:55:04 UTC (rev 90734)
@@ -83,7 +83,7 @@
virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer);
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();
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp (90733 => 90734)
--- trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp 2011-07-11 11:55:04 UTC (rev 90734)
@@ -92,9 +92,9 @@
SVGRenderSupport::computeRectForRepaint(this, repaintContainer, repaintRect, fixed);
}
-void RenderSVGText::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, bool* wasFixed) const
+void RenderSVGText::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);
}
static inline void recursiveUpdateScaledFont(RenderObject* start)
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGText.h (90733 => 90734)
--- trunk/Source/WebCore/rendering/svg/RenderSVGText.h 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGText.h 2011-07-11 11:55:04 UTC (rev 90734)
@@ -65,7 +65,7 @@
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 FloatRect objectBoundingBox() const { return frameRect(); }
virtual FloatRect strokeBoundingBox() const;
Modified: trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp (90733 => 90734)
--- trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp 2011-07-11 11:55:04 UTC (rev 90734)
@@ -70,12 +70,12 @@
object->parent()->computeRectForRepaint(repaintContainer, repaintRect, fixed);
}
-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);
}
bool SVGRenderSupport::prepareToRenderSVGContent(RenderObject* object, PaintInfo& paintInfo)
Modified: trunk/Source/WebCore/rendering/svg/SVGRenderSupport.h (90733 => 90734)
--- trunk/Source/WebCore/rendering/svg/SVGRenderSupport.h 2011-07-11 11:17:53 UTC (rev 90733)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderSupport.h 2011-07-11 11:55:04 UTC (rev 90734)
@@ -63,7 +63,7 @@
// Important functions used by nearly all SVG renderers centralizing coordinate transformations / repaint rect calculations
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.
static void applyStrokeStyleToContext(GraphicsContext*, const RenderStyle*, const RenderObject*);
