Diff
Modified: trunk/Source/WebCore/ChangeLog (124661 => 124662)
--- trunk/Source/WebCore/ChangeLog 2012-08-03 22:06:54 UTC (rev 124661)
+++ trunk/Source/WebCore/ChangeLog 2012-08-03 22:23:42 UTC (rev 124662)
@@ -1,3 +1,65 @@
+2012-08-03 Levi Weintraub <[email protected]>
+
+ Switch mapLocalToContainer to use a flag instead of boolean parameters
+ https://bugs.webkit.org/show_bug.cgi?id=92927
+
+ Reviewed by Dirk Schulze.
+
+ Changing mapLocalToContainer to use a uint flag to set the mode of operation. This removes
+ simplifies the contract, removes boolean arguments and paves the way for an additional mode
+ for sub-pixel layout support. See https://bugs.webkit.org/show_bug.cgi?id=89238 for the
+ sub-pixel use case. Other than the new MapLocalToContainerMode enum and MapLocalToContainerFlags
+ typedef, this change is purely mechanical.
+
+ No new tests as this doesn't change current behavior.
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::selectionGapRectsForRepaint):
+ * rendering/RenderBox.cpp:
+ (WebCore::RenderBox::mapLocalToContainer):
+ * rendering/RenderBox.h:
+ (RenderBox):
+ * rendering/RenderGeometryMap.cpp:
+ (WebCore::RenderGeometryMap::mapToAbsolute):
+ * rendering/RenderInline.cpp:
+ (WebCore::RenderInline::mapLocalToContainer):
+ * rendering/RenderInline.h:
+ (RenderInline):
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::localToAbsolute):
+ (WebCore::RenderObject::mapLocalToContainer):
+ (WebCore::RenderObject::localToContainerQuad):
+ (WebCore::RenderObject::localToContainerPoint):
+ * rendering/RenderObject.h:
+ (RenderObject): Adding the MapLocalToContainerMode enum and MapLocalToContainerFlags unsigned
+ int, and removing the old ApplyContainerFlipOrNot enum.
+ * rendering/RenderView.cpp:
+ (WebCore::RenderView::mapLocalToContainer):
+ * rendering/RenderView.h:
+ (RenderView):
+ * rendering/svg/RenderSVGForeignObject.cpp:
+ (WebCore::RenderSVGForeignObject::mapLocalToContainer):
+ * rendering/svg/RenderSVGForeignObject.h:
+ (RenderSVGForeignObject):
+ * rendering/svg/RenderSVGInline.cpp:
+ (WebCore::RenderSVGInline::mapLocalToContainer):
+ * rendering/svg/RenderSVGInline.h:
+ (RenderSVGInline):
+ * rendering/svg/RenderSVGModelObject.cpp:
+ (WebCore::RenderSVGModelObject::mapLocalToContainer):
+ * rendering/svg/RenderSVGModelObject.h:
+ (RenderSVGModelObject):
+ * rendering/svg/RenderSVGRoot.cpp:
+ (WebCore::RenderSVGRoot::mapLocalToContainer):
+ * rendering/svg/RenderSVGRoot.h:
+ (RenderSVGRoot):
+ * rendering/svg/RenderSVGText.cpp:
+ (WebCore::RenderSVGText::mapLocalToContainer):
+ * rendering/svg/RenderSVGText.h:
+ (RenderSVGText):
+ * rendering/svg/SVGRenderSupport.cpp:
+ (WebCore::SVGRenderSupport::mapLocalToContainer):
+
2012-08-03 Emil A Eklund <[email protected]>
Remove dependency on LayoutTypes.h from transformation code
Modified: trunk/Source/WebCore/rendering/RenderBlock.cpp (124661 => 124662)
--- trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-08-03 22:06:54 UTC (rev 124661)
+++ trunk/Source/WebCore/rendering/RenderBlock.cpp 2012-08-03 22:23:42 UTC (rev 124662)
@@ -3203,7 +3203,7 @@
// FIXME: this is broken with transforms
TransformState transformState(TransformState::ApplyTransformDirection, FloatPoint());
- mapLocalToContainer(repaintContainer, false, false, transformState);
+ mapLocalToContainer(repaintContainer, transformState);
LayoutPoint offsetFromRepaintContainer = roundedLayoutPoint(transformState.mappedPoint());
if (hasOverflowClip())
Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (124661 => 124662)
--- trunk/Source/WebCore/rendering/RenderBox.cpp 2012-08-03 22:06:54 UTC (rev 124661)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp 2012-08-03 22:23:42 UTC (rev 124662)
@@ -1252,7 +1252,7 @@
return cb->computeContentBoxLogicalHeight(logicalHeightLength.value());
}
-void RenderBox::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, ApplyContainerFlipOrNot, bool* wasFixed) const
+void RenderBox::mapLocalToContainer(RenderBoxModelObject* repaintContainer, TransformState& transformState, MapLocalToContainerFlags mode, bool* wasFixed) const
{
if (repaintContainer == this)
return;
@@ -1278,17 +1278,17 @@
// If this box has a transform, it acts as a fixed position container for fixed descendants,
// and may itself also be fixed position. So propagate 'fixed' up only if this box is fixed position.
if (hasTransform && !isFixedPos)
- fixed = false;
+ mode &= ~IsFixed;
else if (isFixedPos)
- fixed = true;
+ mode |= IsFixed;
if (wasFixed)
- *wasFixed = fixed;
+ *wasFixed = mode & IsFixed;
LayoutSize containerOffset = offsetFromContainer(o, roundedLayoutPoint(transformState.mappedPoint()));
- bool preserve3D = useTransforms && (o->style()->preserves3D() || style()->preserves3D());
- if (useTransforms && shouldUseTransformFromContainer(o)) {
+ bool preserve3D = mode & UseTransforms && (o->style()->preserves3D() || style()->preserves3D());
+ if (mode & UseTransforms && shouldUseTransformFromContainer(o)) {
TransformationMatrix t;
getTransformFromContainer(o, containerOffset, t);
transformState.applyTransform(t, preserve3D ? TransformState::AccumulateTransform : TransformState::FlattenTransform);
@@ -1303,15 +1303,16 @@
return;
}
+ mode &= ~ApplyContainerFlip;
if (o->isRenderFlowThread()) {
// Transform from render flow coordinates into region coordinates.
RenderRegion* region = toRenderFlowThread(o)->mapFromFlowToRegion(transformState);
if (region)
- region->mapLocalToContainer(region->containerForRepaint(), fixed, useTransforms, transformState, DoNotApplyContainerFlip, wasFixed);
+ region->mapLocalToContainer(region->containerForRepaint(), transformState, mode, wasFixed);
return;
}
- o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState, DoNotApplyContainerFlip, wasFixed);
+ o->mapLocalToContainer(repaintContainer, transformState, mode, wasFixed);
}
const RenderObject* RenderBox::pushMappingToContainer(const RenderBoxModelObject* ancestorToStopAt, RenderGeometryMap& geometryMap) const
Modified: trunk/Source/WebCore/rendering/RenderBox.h (124661 => 124662)
--- trunk/Source/WebCore/rendering/RenderBox.h 2012-08-03 22:06:54 UTC (rev 124661)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2012-08-03 22:23:42 UTC (rev 124662)
@@ -518,7 +518,7 @@
virtual bool shouldComputeSizeAsReplaced() const { return isReplaced() && !isInlineBlockOrInlineTable(); }
- virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState&, ApplyContainerFlipOrNot = ApplyContainerFlip, bool* wasFixed = 0) const;
+ virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, TransformState&, MapLocalToContainerFlags mode = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE;
virtual const RenderObject* pushMappingToContainer(const RenderBoxModelObject*, RenderGeometryMap&) const;
virtual void mapAbsoluteToLocalPoint(bool fixed, bool useTransforms, TransformState&) const;
Modified: trunk/Source/WebCore/rendering/RenderGeometryMap.cpp (124661 => 124662)
--- trunk/Source/WebCore/rendering/RenderGeometryMap.cpp 2012-08-03 22:06:54 UTC (rev 124661)
+++ trunk/Source/WebCore/rendering/RenderGeometryMap.cpp 2012-08-03 22:23:42 UTC (rev 124662)
@@ -92,8 +92,7 @@
{
// If the mapping includes something like columns, we have to go via renderers.
if (hasNonUniformStep()) {
- bool fixed = false;
- m_mapping.last().m_renderer->mapLocalToContainer(0, fixed, true, transformState, RenderObject::ApplyContainerFlip);
+ m_mapping.last().m_renderer->mapLocalToContainer(0, transformState, UseTransforms | ApplyContainerFlip);
return;
}
Modified: trunk/Source/WebCore/rendering/RenderInline.cpp (124661 => 124662)
--- trunk/Source/WebCore/rendering/RenderInline.cpp 2012-08-03 22:06:54 UTC (rev 124661)
+++ trunk/Source/WebCore/rendering/RenderInline.cpp 2012-08-03 22:23:42 UTC (rev 124662)
@@ -1114,7 +1114,7 @@
return offset;
}
-void RenderInline::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, ApplyContainerFlipOrNot applyContainerFlip, bool* wasFixed) const
+void RenderInline::mapLocalToContainer(RenderBoxModelObject* repaintContainer, TransformState& transformState, MapLocalToContainerFlags mode, bool* wasFixed) const
{
if (repaintContainer == this)
return;
@@ -1135,18 +1135,18 @@
if (!o)
return;
- if (applyContainerFlip && o->isBox()) {
+ if (mode & ApplyContainerFlip && o->isBox()) {
if (o->style()->isFlippedBlocksWritingMode()) {
IntPoint centerPoint = roundedIntPoint(transformState.mappedPoint());
transformState.move(toRenderBox(o)->flipForWritingModeIncludingColumns(centerPoint) - centerPoint);
}
- applyContainerFlip = DoNotApplyContainerFlip;
+ mode &= ~ApplyContainerFlip;
}
LayoutSize containerOffset = offsetFromContainer(o, roundedLayoutPoint(transformState.mappedPoint()));
- bool preserve3D = useTransforms && (o->style()->preserves3D() || style()->preserves3D());
- if (useTransforms && shouldUseTransformFromContainer(o)) {
+ bool preserve3D = mode & UseTransforms && (o->style()->preserves3D() || style()->preserves3D());
+ if (mode & UseTransforms && shouldUseTransformFromContainer(o)) {
TransformationMatrix t;
getTransformFromContainer(o, containerOffset, t);
transformState.applyTransform(t, preserve3D ? TransformState::AccumulateTransform : TransformState::FlattenTransform);
@@ -1161,7 +1161,7 @@
return;
}
- o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState, applyContainerFlip, wasFixed);
+ o->mapLocalToContainer(repaintContainer, transformState, mode, wasFixed);
}
const RenderObject* RenderInline::pushMappingToContainer(const RenderBoxModelObject* ancestorToStopAt, RenderGeometryMap& geometryMap) const
Modified: trunk/Source/WebCore/rendering/RenderInline.h (124661 => 124662)
--- trunk/Source/WebCore/rendering/RenderInline.h 2012-08-03 22:06:54 UTC (rev 124661)
+++ trunk/Source/WebCore/rendering/RenderInline.h 2012-08-03 22:23:42 UTC (rev 124662)
@@ -135,7 +135,7 @@
virtual LayoutRect rectWithOutlineForRepaint(RenderBoxModelObject* repaintContainer, LayoutUnit outlineWidth) const;
virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, LayoutRect&, bool fixed) const;
- virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState&, ApplyContainerFlipOrNot = ApplyContainerFlip, bool* wasFixed = 0) const;
+ virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, TransformState&, MapLocalToContainerFlags mode = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE;
virtual const RenderObject* pushMappingToContainer(const RenderBoxModelObject* ancestorToStopAt, RenderGeometryMap&) const;
virtual VisiblePosition positionForPoint(const LayoutPoint&);
Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (124661 => 124662)
--- trunk/Source/WebCore/rendering/RenderObject.cpp 2012-08-03 22:06:54 UTC (rev 124661)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2012-08-03 22:23:42 UTC (rev 124662)
@@ -1987,7 +1987,12 @@
FloatPoint RenderObject::localToAbsolute(const FloatPoint& localPoint, bool fixed, bool useTransforms) const
{
TransformState transformState(TransformState::ApplyTransformDirection, localPoint);
- mapLocalToContainer(0, fixed, useTransforms, transformState);
+ MapLocalToContainerFlags mode = ApplyContainerFlip;
+ if (fixed)
+ mode |= IsFixed;
+ if (useTransforms)
+ mode |= UseTransforms;
+ mapLocalToContainer(0, transformState, mode);
transformState.flatten();
return transformState.lastPlanarPoint();
@@ -2002,7 +2007,7 @@
return transformState.lastPlanarPoint();
}
-void RenderObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, ApplyContainerFlipOrNot applyContainerFlip, bool* wasFixed) const
+void RenderObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, TransformState& transformState, MapLocalToContainerFlags mode, bool* wasFixed) const
{
if (repaintContainer == this)
return;
@@ -2013,10 +2018,10 @@
// FIXME: this should call offsetFromContainer to share code, but I'm not sure it's ever called.
LayoutPoint centerPoint = roundedLayoutPoint(transformState.mappedPoint());
- if (applyContainerFlip && o->isBox()) {
+ if (mode & ApplyContainerFlip && o->isBox()) {
if (o->style()->isFlippedBlocksWritingMode())
transformState.move(toRenderBox(o)->flipForWritingModeIncludingColumns(roundedLayoutPoint(transformState.mappedPoint())) - centerPoint);
- applyContainerFlip = DoNotApplyContainerFlip;
+ mode &= ~ApplyContainerFlip;
}
LayoutSize columnOffset;
@@ -2027,7 +2032,7 @@
if (o->hasOverflowClip())
transformState.move(-toRenderBox(o)->scrolledContentOffset());
- o->mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState, applyContainerFlip, wasFixed);
+ o->mapLocalToContainer(repaintContainer, transformState, mode, wasFixed);
}
const RenderObject* RenderObject::pushMappingToContainer(const RenderBoxModelObject* ancestorToStopAt, RenderGeometryMap& geometryMap) const
@@ -2101,7 +2106,10 @@
// 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, ApplyContainerFlip, wasFixed);
+ MapLocalToContainerFlags mode = ApplyContainerFlip | UseTransforms;
+ if (fixed)
+ mode |= IsFixed;
+ mapLocalToContainer(repaintContainer, transformState, mode, wasFixed);
transformState.flatten();
return transformState.lastPlanarQuad();
@@ -2110,7 +2118,10 @@
FloatPoint RenderObject::localToContainerPoint(const FloatPoint& localPoint, RenderBoxModelObject* repaintContainer, bool fixed, bool* wasFixed) const
{
TransformState transformState(TransformState::ApplyTransformDirection, localPoint);
- mapLocalToContainer(repaintContainer, fixed, true, transformState, ApplyContainerFlip, wasFixed);
+ MapLocalToContainerFlags mode = ApplyContainerFlip | UseTransforms;
+ if (fixed)
+ mode |= IsFixed;
+ mapLocalToContainer(repaintContainer, transformState, mode, wasFixed);
transformState.flatten();
return transformState.lastPlanarPoint();
Modified: trunk/Source/WebCore/rendering/RenderObject.h (124661 => 124662)
--- trunk/Source/WebCore/rendering/RenderObject.h 2012-08-03 22:06:54 UTC (rev 124661)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2012-08-03 22:23:42 UTC (rev 124662)
@@ -107,6 +107,13 @@
DoNotPlaceGeneratedRunIn
};
+enum MapLocalToContainerMode {
+ IsFixed = 1 << 0,
+ UseTransforms = 1 << 1,
+ ApplyContainerFlip = 1 << 2
+};
+typedef unsigned MapLocalToContainerFlags;
+
const int caretWidth = 1;
#if ENABLE(DASHBOARD_SUPPORT) || ENABLE(WIDGET_REGION)
@@ -878,8 +885,7 @@
// Map points and quads through elements, potentially via 3d transforms. You should never need to call these directly; use
// localToAbsolute/absoluteToLocal methods instead.
- enum ApplyContainerFlipOrNot { DoNotApplyContainerFlip, ApplyContainerFlip };
- virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, ApplyContainerFlipOrNot = ApplyContainerFlip, bool* wasFixed = 0) const;
+ virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, TransformState&, MapLocalToContainerFlags mode = ApplyContainerFlip, bool* wasFixed = 0) const;
virtual void mapAbsoluteToLocalPoint(bool fixed, bool useTransforms, TransformState&) const;
// Pushes state onto RenderGeometryMap about how to map coordinates from this renderer to its container, or ancestorToStopAt (whichever is encountered first).
Modified: trunk/Source/WebCore/rendering/RenderView.cpp (124661 => 124662)
--- trunk/Source/WebCore/rendering/RenderView.cpp 2012-08-03 22:06:54 UTC (rev 124661)
+++ trunk/Source/WebCore/rendering/RenderView.cpp 2012-08-03 22:23:42 UTC (rev 124662)
@@ -165,20 +165,20 @@
setNeedsLayout(false);
}
-void RenderView::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, ApplyContainerFlipOrNot, bool* wasFixed) const
+void RenderView::mapLocalToContainer(RenderBoxModelObject* repaintContainer, TransformState& transformState, MapLocalToContainerFlags mode, 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_UNUSED(wasFixed, !wasFixed || *wasFixed == fixed);
+ ASSERT_UNUSED(wasFixed, !wasFixed || *wasFixed == (mode & IsFixed));
- if (!repaintContainer && useTransforms && shouldUseTransformFromContainer(0)) {
+ if (!repaintContainer && mode & UseTransforms && shouldUseTransformFromContainer(0)) {
TransformationMatrix t;
getTransformFromContainer(0, LayoutSize(), t);
transformState.applyTransform(t);
}
- if (fixed && m_frameView)
+ if (mode & IsFixed && m_frameView)
transformState.move(m_frameView->scrollOffsetForFixedPosition());
}
Modified: trunk/Source/WebCore/rendering/RenderView.h (124661 => 124662)
--- trunk/Source/WebCore/rendering/RenderView.h 2012-08-03 22:06:54 UTC (rev 124661)
+++ trunk/Source/WebCore/rendering/RenderView.h 2012-08-03 22:23:42 UTC (rev 124662)
@@ -206,7 +206,7 @@
bool hasRenderCounters() { return m_renderCounterCount; }
protected:
- virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, ApplyContainerFlipOrNot = ApplyContainerFlip, bool* wasFixed = 0) const;
+ virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, TransformState&, MapLocalToContainerFlags mode = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE;
virtual const RenderObject* pushMappingToContainer(const RenderBoxModelObject* ancestorToStopAt, RenderGeometryMap&) const;
virtual void mapAbsoluteToLocalPoint(bool fixed, bool useTransforms, TransformState&) const;
virtual bool requiresColumns(int desiredColumnCount) const OVERRIDE;
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp (124661 => 124662)
--- trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp 2012-08-03 22:06:54 UTC (rev 124661)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.cpp 2012-08-03 22:23:42 UTC (rev 124662)
@@ -190,7 +190,7 @@
return false;
}
-void RenderSVGForeignObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool /* fixed */, bool /* useTransforms */, TransformState& transformState, ApplyContainerFlipOrNot, bool* wasFixed) const
+void RenderSVGForeignObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, TransformState& transformState, MapLocalToContainerFlags, bool* wasFixed) const
{
SVGRenderSupport::mapLocalToContainer(this, repaintContainer, transformState, wasFixed);
}
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h (124661 => 124662)
--- trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h 2012-08-03 22:06:54 UTC (rev 124661)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h 2012-08-03 22:23:42 UTC (rev 124662)
@@ -54,7 +54,7 @@
virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestPoint& pointInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE;
virtual bool isSVGForeignObject() const { return true; }
- virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState&, ApplyContainerFlipOrNot = ApplyContainerFlip, bool* wasFixed = 0) const;
+ virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, TransformState&, MapLocalToContainerFlags mode = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE;
virtual const RenderObject* pushMappingToContainer(const RenderBoxModelObject* ancestorToStopAt, RenderGeometryMap&) const;
virtual void setNeedsTransformUpdate() { m_needsTransformUpdate = true; }
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGInline.cpp (124661 => 124662)
--- trunk/Source/WebCore/rendering/svg/RenderSVGInline.cpp 2012-08-03 22:06:54 UTC (rev 124661)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGInline.cpp 2012-08-03 22:23:42 UTC (rev 124662)
@@ -79,7 +79,7 @@
SVGRenderSupport::computeFloatRectForRepaint(this, repaintContainer, repaintRect, fixed);
}
-void RenderSVGInline::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool /* useTransforms */, bool /* fixed */, TransformState& transformState, ApplyContainerFlipOrNot, bool* wasFixed) const
+void RenderSVGInline::mapLocalToContainer(RenderBoxModelObject* repaintContainer, TransformState& transformState, MapLocalToContainerFlags, bool* wasFixed) const
{
SVGRenderSupport::mapLocalToContainer(this, repaintContainer, transformState, wasFixed);
}
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGInline.h (124661 => 124662)
--- trunk/Source/WebCore/rendering/svg/RenderSVGInline.h 2012-08-03 22:06:54 UTC (rev 124661)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGInline.h 2012-08-03 22:23:42 UTC (rev 124662)
@@ -47,7 +47,7 @@
virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
virtual void computeFloatRectForRepaint(RenderBoxModelObject* repaintContainer, FloatRect&, bool fixed = false) const;
- virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, ApplyContainerFlipOrNot = ApplyContainerFlip, bool* wasFixed = 0) const;
+ virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, TransformState&, MapLocalToContainerFlags mode = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE;
virtual const RenderObject* pushMappingToContainer(const RenderBoxModelObject* ancestorToStopAt, RenderGeometryMap&) const;
virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const;
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp (124661 => 124662)
--- trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp 2012-08-03 22:06:54 UTC (rev 124661)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.cpp 2012-08-03 22:23:42 UTC (rev 124662)
@@ -55,7 +55,7 @@
SVGRenderSupport::computeFloatRectForRepaint(this, repaintContainer, repaintRect, fixed);
}
-void RenderSVGModelObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool /* fixed */, bool /* useTransforms */, TransformState& transformState, ApplyContainerFlipOrNot, bool* wasFixed) const
+void RenderSVGModelObject::mapLocalToContainer(RenderBoxModelObject* repaintContainer, TransformState& transformState, MapLocalToContainerFlags, bool* wasFixed) const
{
SVGRenderSupport::mapLocalToContainer(this, repaintContainer, transformState, wasFixed);
}
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.h (124661 => 124662)
--- trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.h 2012-08-03 22:06:54 UTC (rev 124661)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.h 2012-08-03 22:23:42 UTC (rev 124662)
@@ -58,7 +58,7 @@
virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const;
virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const;
- virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, ApplyContainerFlipOrNot = ApplyContainerFlip, bool* wasFixed = 0) const;
+ virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, TransformState&, MapLocalToContainerFlags mode = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE;
virtual const RenderObject* pushMappingToContainer(const RenderBoxModelObject* ancestorToStopAt, RenderGeometryMap&) const;
virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle);
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp (124661 => 124662)
--- trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2012-08-03 22:06:54 UTC (rev 124661)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp 2012-08-03 22:23:42 UTC (rev 124662)
@@ -395,12 +395,12 @@
// This method expects local CSS box coordinates.
// Callers with local SVG viewport coordinates should first apply the localToBorderBoxTransform
// to convert from SVG viewport coordinates to local CSS box coordinates.
-void RenderSVGRoot::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool fixed, bool useTransforms, TransformState& transformState, ApplyContainerFlipOrNot, bool* wasFixed) const
+void RenderSVGRoot::mapLocalToContainer(RenderBoxModelObject* repaintContainer, TransformState& transformState, MapLocalToContainerFlags mode, 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.
+ ASSERT(mode & ~IsFixed); // We should have no fixed content in the SVG rendering tree.
+ ASSERT(mode & UseTransforms); // mapping a point through SVG w/o respecting trasnforms is useless.
- RenderReplaced::mapLocalToContainer(repaintContainer, fixed, useTransforms, transformState, ApplyContainerFlip, wasFixed);
+ RenderReplaced::mapLocalToContainer(repaintContainer, transformState, mode | ApplyContainerFlip, wasFixed);
}
const RenderObject* RenderSVGRoot::pushMappingToContainer(const RenderBoxModelObject* ancestorToStopAt, RenderGeometryMap& geometryMap) const
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h (124661 => 124662)
--- trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h 2012-08-03 22:06:54 UTC (rev 124661)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h 2012-08-03 22:23:42 UTC (rev 124662)
@@ -95,7 +95,7 @@
virtual LayoutRect clippedOverflowRectForRepaint(RenderBoxModelObject* repaintContainer) const;
virtual void computeFloatRectForRepaint(RenderBoxModelObject* repaintContainer, FloatRect& repaintRect, bool fixed) const;
- virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, ApplyContainerFlipOrNot = ApplyContainerFlip, bool* wasFixed = 0) const;
+ virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, TransformState&, MapLocalToContainerFlags mode = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE;
virtual const RenderObject* pushMappingToContainer(const RenderBoxModelObject* ancestorToStopAt, RenderGeometryMap&) const;
virtual bool canBeSelectionLeaf() const { return false; }
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp (124661 => 124662)
--- trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp 2012-08-03 22:06:54 UTC (rev 124661)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGText.cpp 2012-08-03 22:23:42 UTC (rev 124662)
@@ -111,7 +111,7 @@
SVGRenderSupport::computeFloatRectForRepaint(this, repaintContainer, repaintRect, fixed);
}
-void RenderSVGText::mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool /* fixed */, bool /* useTransforms */, TransformState& transformState, ApplyContainerFlipOrNot, bool* wasFixed) const
+void RenderSVGText::mapLocalToContainer(RenderBoxModelObject* repaintContainer, TransformState& transformState, MapLocalToContainerFlags, bool* wasFixed) const
{
SVGRenderSupport::mapLocalToContainer(this, repaintContainer, transformState, wasFixed);
}
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGText.h (124661 => 124662)
--- trunk/Source/WebCore/rendering/svg/RenderSVGText.h 2012-08-03 22:06:54 UTC (rev 124661)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGText.h 2012-08-03 22:23:42 UTC (rev 124662)
@@ -75,7 +75,7 @@
virtual void computeRectForRepaint(RenderBoxModelObject* repaintContainer, LayoutRect&, bool fixed = false) const;
virtual void computeFloatRectForRepaint(RenderBoxModelObject* repaintContainer, FloatRect&, bool fixed = false) const;
- virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, bool useTransforms, bool fixed, TransformState&, ApplyContainerFlipOrNot = ApplyContainerFlip, bool* wasFixed = 0) const;
+ virtual void mapLocalToContainer(RenderBoxModelObject* repaintContainer, TransformState&, MapLocalToContainerFlags mode = ApplyContainerFlip, bool* wasFixed = 0) const OVERRIDE;
virtual const RenderObject* pushMappingToContainer(const RenderBoxModelObject* ancestorToStopAt, RenderGeometryMap&) const;
virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0);
virtual void removeChild(RenderObject*) OVERRIDE;
Modified: trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp (124661 => 124662)
--- trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp 2012-08-03 22:06:54 UTC (rev 124661)
+++ trunk/Source/WebCore/rendering/svg/SVGRenderSupport.cpp 2012-08-03 22:23:42 UTC (rev 124662)
@@ -83,7 +83,7 @@
if (parent->isSVGRoot())
transformState.applyTransform(toRenderSVGRoot(parent)->localToBorderBoxTransform());
- parent->mapLocalToContainer(repaintContainer, false, true, transformState, RenderObject::DoNotApplyContainerFlip, wasFixed);
+ parent->mapLocalToContainer(repaintContainer, transformState, UseTransforms, wasFixed);
}
const RenderObject* SVGRenderSupport::pushMappingToContainer(const RenderObject* object, const RenderBoxModelObject* ancestorToStopAt, RenderGeometryMap& geometryMap)
