Diff
Modified: trunk/Source/WebCore/ChangeLog (92433 => 92434)
--- trunk/Source/WebCore/ChangeLog 2011-08-05 00:03:14 UTC (rev 92433)
+++ trunk/Source/WebCore/ChangeLog 2011-08-05 00:19:41 UTC (rev 92434)
@@ -1,3 +1,51 @@
+2011-08-04 Simon Fraser <simon.fra...@apple.com>
+
+ Add code to determine whether a Range in inside fixed position content
+ https://bugs.webkit.org/show_bug.cgi?id=65720
+
+ Reviewed by Dan Bernstein.
+
+ Add an out param for various coordinate mapping functions
+ that tells us whether the point or rectangle being
+ mapped is inside fixed-position content.
+
+ This brings back some of the changes from r89754.
+
+ No behavior changes, so no tests.
+
+ * 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-08-04 Mark Pilgrim <pilg...@chromium.org>
Remove LegacyDefaultOptionalArguments flag from DOM-related files except Document.idl
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (92433 => 92434)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2011-08-05 00:03:14 UTC (rev 92433)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2011-08-05 00:19:41 UTC (rev 92434)
@@ -1208,7 +1208,7 @@
return cb->computeContentBoxLogicalHeight(logicalHeightLength.value());
}
-void RenderBox::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState) const
+void RenderBox::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, bool* wasFixed) const
{
if (repaintContainer == this)
return;
@@ -1238,6 +1238,8 @@
fixed &= isFixedPos;
} else
fixed |= isFixedPos;
+ if (wasFixed)
+ *wasFixed = fixed;
LayoutSize containerOffset = offsetFromContainer(o, roundedLayoutPoint(transformState.mappedPoint()));
@@ -1257,7 +1259,7 @@
return;
}
- o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState);
+ o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState, wasFixed);
}
void RenderBox::mapAbsoluteToLocalPoint(bool fixed, bool useTransforms, TransformState& transformState) const
Modified: trunk/Source/WebCore/rendering/RenderBox.h (92433 => 92434)
--- trunk/Source/WebCore/rendering/RenderBox.h 2011-08-05 00:03:14 UTC (rev 92433)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2011-08-05 00:19:41 UTC (rev 92434)
@@ -433,7 +433,7 @@
virtual bool shouldComputeSizeAsReplaced() const { return isReplaced() && !isInlineBlockOrInlineTable(); }
- virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState&) const;
+ virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState&, bool* wasFixed = 0) const;
virtual void mapAbsoluteToLocalPoint(bool fixed, bool useTransforms, TransformState&) const;
void paintRootBoxFillLayers(const PaintInfo&);
Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (92433 => 92434)
--- trunk/Source/WebCore/rendering/RenderInline.cpp 2011-08-05 00:03:14 UTC (rev 92433)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2011-08-05 00:19:41 UTC (rev 92434)
@@ -1114,7 +1114,7 @@
return offset;
}
-void RenderInline::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState) const
+void RenderInline::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, bool* wasFixed) const
{
if (repaintContainer == this)
return;
@@ -1157,7 +1157,7 @@
return;
}
- o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState);
+ o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState, wasFixed);
}
void RenderInline::mapAbsoluteToLocalPoint(bool fixed, bool useTransforms, TransformState& transformState) const
Modified: trunk/Source/WebCore/rendering/RenderInline.h (92433 => 92434)
--- trunk/Source/WebCore/rendering/RenderInline.h 2011-08-05 00:03:14 UTC (rev 92433)
+++ trunk/Source/WebCore/rendering/RenderInline.h 2011-08-05 00:19:41 UTC (rev 92434)
@@ -130,7 +130,7 @@
virtual IntRect rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, int outlineWidth) const;
virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed) const;
- virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState&) const;
+ virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState&, bool* wasFixed = 0) const;
virtual void mapAbsoluteToLocalPoint(bool fixed, bool useTransforms, TransformState&) const;
virtual VisiblePosition positionForPoint(const LayoutPoint&);
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (92433 => 92434)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2011-08-05 00:03:14 UTC (rev 92433)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2011-08-05 00:19:41 UTC (rev 92434)
@@ -1839,7 +1839,7 @@
return transformState.lastPlanarPoint();
}
-void RenderObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState) const
+void RenderObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, bool* wasFixed) const
{
if (repaintContainer == this)
return;
@@ -1860,7 +1860,7 @@
if (o->hasOverflowClip())
transformState.move(-toRenderBox(o)->layer()->scrolledContentOffset());
- o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState);
+ o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState, wasFixed);
}
void RenderObject::mapAbsoluteToLocalPoint(bool fixed, bool useTransforms, TransformState& transformState) const
@@ -1911,12 +1911,12 @@
#endif
}
-FloatQuad RenderObject::localToContainerQuad(const FloatQuad& localQuad, RenderBoxModelObject* repaintContainer, bool fixed) const
+FloatQuad RenderObject::localToContainerQuad(const FloatQuad& localQuad, RenderBoxModelObject* repaintContainer, bool fixed, bool* wasFixed) 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);
+ mapLocalToContainer(repaintContainer, fixed, true, transformState, wasFixed);
transformState.flatten();
return transformState.lastPlanarQuad();
Modified: trunk/Source/WebCore/rendering/RenderObject.h (92433 => 92434)
--- trunk/Source/WebCore/rendering/RenderObject.h 2011-08-05 00:03:14 UTC (rev 92433)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2011-08-05 00:19:41 UTC (rev 92434)
@@ -588,12 +588,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) const
+ FloatQuad localToAbsoluteQuad(const FloatQuad& quad, bool fixed = false, bool* wasFixed = 0) const
{
- return localToContainerQuad(quad, 0, fixed);
+ return localToContainerQuad(quad, 0, fixed, wasFixed);
}
// Convert a local quad into the coordinate system of container, taking transforms into account.
- FloatQuad localToContainerQuad(const FloatQuad&, RenderBoxModelObject* repaintContainer, bool fixed = false) const;
+ FloatQuad localToContainerQuad(const FloatQuad&, RenderBoxModelObject* repaintContainer, bool fixed = false, bool* wasFixed = 0) 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.
@@ -785,7 +785,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&) const;
+ virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, bool* wasFixed = 0) const;
virtual void mapAbsoluteToLocalPoint(bool fixed, bool useTransforms, TransformState&) const;
bool shouldUseTransformFromContainer(const RenderObject* container) const;
Modified: trunk/Source/WebCore/rendering/RenderView.cpp (92433 => 92434)
--- trunk/Source/WebCore/rendering/RenderView.cpp 2011-08-05 00:03:14 UTC (rev 92433)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2011-08-05 00:19:41 UTC (rev 92434)
@@ -137,11 +137,13 @@
setNeedsLayout(false);
}
-void RenderView::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState) const
+void RenderView::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, bool* wasFixed) 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(!wasFixed || *wasFixed == fixed);
+ UNUSED_PARAM(fixed);
if (!repaintContainer && useTransforms && shouldUseTransformFromContainer(0)) {
TransformationMatrix t;
Modified: trunk/Source/WebCore/rendering/RenderView.h (92433 => 92434)
--- trunk/Source/WebCore/rendering/RenderView.h 2011-08-05 00:03:14 UTC (rev 92433)
+++ trunk/Source/WebCore/rendering/RenderView.h 2011-08-05 00:19:41 UTC (rev 92434)
@@ -174,7 +174,7 @@
#endif
protected:
- virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&) const;
+ virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, bool* wasFixed = 0) const;
virtual void mapAbsoluteToLocalPoint(bool fixed, bool useTransforms, TransformState&) const;
private:
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp (92433 => 92434)
--- trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp 2011-08-05 00:03:14 UTC (rev 92433)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp 2011-08-05 00:19:41 UTC (rev 92434)
@@ -159,12 +159,12 @@
return false;
}
-void RenderSVGForeignObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState) const
+void RenderSVGForeignObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, bool* wasFixed) 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);
+ SVGRenderSupport::mapLocalToContainer(this, repaintContainer, fixed, useTransforms, transformState, wasFixed);
}
}
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h (92433 => 92434)
--- trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h 2011-08-05 00:03:14 UTC (rev 92433)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h 2011-08-05 00:19:41 UTC (rev 92434)
@@ -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&) const;
+ virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState&, bool* wasFixed = 0) const;
virtual void setNeedsTransformUpdate() { m_needsTransformUpdate = true; }
private:
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGInline.cpp (92433 => 92434)
--- trunk/Source/WebCore/rendering/svg/RenderSVGInline.cpp 2011-08-05 00:03:14 UTC (rev 92433)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGInline.cpp 2011-08-05 00:19:41 UTC (rev 92434)
@@ -77,9 +77,9 @@
SVGRenderSupport::computeRectForRepaint(this, repaintContainer, repaintRect, fixed);
}
-void RenderSVGInline::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState& transformState) const
+void RenderSVGInline::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState& transformState, bool* wasFixed) const
{
- SVGRenderSupport::mapLocalToContainer(this, repaintContainer, useTransforms, fixed, transformState);
+ SVGRenderSupport::mapLocalToContainer(this, repaintContainer, useTransforms, fixed, transformState, wasFixed);
}
void RenderSVGInline::absoluteQuads(Vector<FloatQuad>& quads)
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGInline.h (92433 => 92434)
--- trunk/Source/WebCore/rendering/svg/RenderSVGInline.h 2011-08-05 00:03:14 UTC (rev 92433)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGInline.h 2011-08-05 00:19:41 UTC (rev 92434)
@@ -47,7 +47,7 @@
virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) const;
- virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&) const;
+ virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, bool* wasFixed = 0) const;
virtual void absoluteQuads(Vector<FloatQuad>&);
private:
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp (92433 => 92434)
--- trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp 2011-08-05 00:03:14 UTC (rev 92433)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp 2011-08-05 00:19:41 UTC (rev 92434)
@@ -53,9 +53,9 @@
SVGRenderSupport::computeRectForRepaint(this, repaintContainer, repaintRect, fixed);
}
-void RenderSVGModelObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed , bool useTransforms, TransformState& transformState) const
+void RenderSVGModelObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, bool* wasFixed) const
{
- SVGRenderSupport::mapLocalToContainer(this, repaintContainer, fixed, useTransforms, transformState);
+ SVGRenderSupport::mapLocalToContainer(this, repaintContainer, fixed, useTransforms, transformState, wasFixed);
}
// 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 (92433 => 92434)
--- trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.h 2011-08-05 00:03:14 UTC (rev 92433)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.h 2011-08-05 00:19:41 UTC (rev 92434)
@@ -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&) const;
+ virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, bool* wasFixed = 0) 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 (92433 => 92434)
--- trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2011-08-05 00:03:14 UTC (rev 92433)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2011-08-05 00:19:41 UTC (rev 92434)
@@ -415,14 +415,14 @@
RenderBox::computeRectForRepaint(repaintContainer, repaintRect, fixed);
}
-void RenderSVGRoot::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed , bool useTransforms, TransformState& transformState) const
+void RenderSVGRoot::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, bool* wasFixed) 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);
+ RenderBox::mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState, wasFixed);
}
void RenderSVGRoot::updateCachedBoundaries()
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h (92433 => 92434)
--- trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h 2011-08-05 00:03:14 UTC (rev 92433)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h 2011-08-05 00:19:41 UTC (rev 92434)
@@ -83,7 +83,7 @@
virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect& repaintRect, bool fixed) const;
- virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&) const;
+ virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, bool* wasFixed = 0) const;
void calcViewport();
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp (92433 => 92434)
--- trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp 2011-08-05 00:03:14 UTC (rev 92433)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp 2011-08-05 00:19:41 UTC (rev 92434)
@@ -92,9 +92,9 @@
SVGRenderSupport::computeRectForRepaint(this, repaintContainer, repaintRect, fixed);
}
-void RenderSVGText::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState) const
+void RenderSVGText::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, bool* wasFixed) const
{
- SVGRenderSupport::mapLocalToContainer(this, repaintContainer, fixed, useTransforms, transformState);
+ SVGRenderSupport::mapLocalToContainer(this, repaintContainer, fixed, useTransforms, transformState, wasFixed);
}
static inline void recursiveUpdateScaledFont(RenderObject* start)
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGText.h (92433 => 92434)
--- trunk/Source/WebCore/rendering/svg/RenderSVGText.h 2011-08-05 00:03:14 UTC (rev 92433)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGText.h 2011-08-05 00:19:41 UTC (rev 92434)
@@ -65,7 +65,7 @@
virtual IntRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, IntRect&, bool fixed = false) const;
- virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&) const;
+ virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, bool* wasFixed = 0) const;
virtual FloatRect objectBoundingBox() const { return frameRect(); }
virtual FloatRect strokeBoundingBox() const;
Modified: trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp (92433 => 92434)
--- trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp 2011-08-05 00:03:14 UTC (rev 92433)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp 2011-08-05 00:19:41 UTC (rev 92434)
@@ -70,12 +70,12 @@
object->parent()->computeRectForRepaint(repaintContainer, repaintRect, fixed);
}
-void SVGRenderSupport::mapLocalToContainer(const RenderObject* object, RenderBoxModelObject* repaintContainer, bool fixed , bool useTransforms, TransformState& transformState)
+void SVGRenderSupport::mapLocalToContainer(const RenderObject* object, RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, bool* wasFixed)
{
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);
+ object->parent()->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState, wasFixed);
}
bool SVGRenderSupport::prepareToRenderSVGContent(RenderObject* object, PaintInfo& paintInfo)
Modified: trunk/Source/WebCore/rendering/svg/SVGRenderSupport.h (92433 => 92434)
--- trunk/Source/WebCore/rendering/svg/SVGRenderSupport.h 2011-08-05 00:03:14 UTC (rev 92433)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderSupport.h 2011-08-05 00:19:41 UTC (rev 92434)
@@ -63,7 +63,7 @@
// Important functions used by nearly all SVG renderers centralizing coordinate transformations / repaint rect calculations
static IntRect clippedOverflowRectForRepaint(const RenderObject*, RenderBoxModelObject* repaintContainer);
static void computeRectForRepaint(const RenderObject*, RenderBoxModelObject* repaintContainer, IntRect&, bool fixed);
- static void mapLocalToContainer(const RenderObject*, RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&);
+ static void mapLocalToContainer(const RenderObject*, RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, bool* wasFixed = 0);
// Shared between SVG renderers and resources.
static void applyStrokeStyleToContext(GraphicsContext*, const RenderStyle*, const RenderObject*);
