Diff
Modified: trunk/Source/WebCore/ChangeLog (131230 => 131231)
--- trunk/Source/WebCore/ChangeLog 2012-10-12 22:04:55 UTC (rev 131230)
+++ trunk/Source/WebCore/ChangeLog 2012-10-12 22:16:33 UTC (rev 131231)
@@ -1,3 +1,36 @@
+2012-10-12 Levi Weintraub <[email protected]>
+
+ Remove unnecessary mode identifiers added in r131111
+ https://bugs.webkit.org/show_bug.cgi?id=99208
+
+ Reviewed by Emil A Eklund.
+
+ Removing unnecessary mode identifiers from coordinate conversion methods. These
+ were added in http://trac.webkit.org/changeset/131111
+
+ No new tests. No change in behavior.
+
+ * rendering/RenderBox.h:
+ (RenderBox):
+ * rendering/RenderBoxModelObject.h:
+ (RenderBoxModelObject):
+ * rendering/RenderInline.h:
+ (RenderInline):
+ * rendering/RenderObject.h:
+ (RenderObject):
+ * rendering/RenderView.h:
+ (RenderView):
+ * rendering/svg/RenderSVGForeignObject.h:
+ (RenderSVGForeignObject):
+ * rendering/svg/RenderSVGInline.h:
+ (RenderSVGInline):
+ * rendering/svg/RenderSVGModelObject.h:
+ (RenderSVGModelObject):
+ * rendering/svg/RenderSVGRoot.h:
+ (RenderSVGRoot):
+ * rendering/svg/RenderSVGText.h:
+ (RenderSVGText):
+
2012-10-12 Sheriff Bot <[email protected]>
Unreviewed, rolling out r131224.
Modified: trunk/Source/WebCore/rendering/RenderBox.h (131230 => 131231)
--- trunk/Source/WebCore/rendering/RenderBox.h 2012-10-12 22:04:55 UTC (rev 131230)
+++ trunk/Source/WebCore/rendering/RenderBox.h 2012-10-12 22:16:33 UTC (rev 131231)
@@ -574,9 +574,9 @@
virtual bool shouldComputeSizeAsReplaced() const { return isReplaced() && !isInlineBlockOrInlineTable(); }
- virtual void mapLocalToContainer(RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags mode = ApplyContainerFlip | SnapOffsetForTransforms, bool* wasFixed = 0) const OVERRIDE;
+ virtual void mapLocalToContainer(RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip | SnapOffsetForTransforms, bool* wasFixed = 0) const OVERRIDE;
virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject*, RenderGeometryMap&) const OVERRIDE;
- virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags mode, TransformState&) const;
+ virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) const;
void paintRootBoxFillLayers(const PaintInfo&);
Modified: trunk/Source/WebCore/rendering/RenderBoxModelObject.h (131230 => 131231)
--- trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2012-10-12 22:04:55 UTC (rev 131230)
+++ trunk/Source/WebCore/rendering/RenderBoxModelObject.h 2012-10-12 22:16:33 UTC (rev 131231)
@@ -158,7 +158,7 @@
virtual LayoutUnit lineHeight(bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const = 0;
virtual LayoutUnit baselinePosition(FontBaseline, bool firstLine, LineDirectionMode, LinePositionMode = PositionOnContainingLine) const = 0;
- virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags mode, TransformState&) const OVERRIDE;
+ virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) const OVERRIDE;
void highQualityRepaintTimerFired(Timer<RenderBoxModelObject>*);
Modified: trunk/Source/WebCore/rendering/RenderInline.h (131230 => 131231)
--- trunk/Source/WebCore/rendering/RenderInline.h 2012-10-12 22:04:55 UTC (rev 131230)
+++ trunk/Source/WebCore/rendering/RenderInline.h 2012-10-12 22:16:33 UTC (rev 131231)
@@ -135,7 +135,7 @@
virtual LayoutRect rectWithOutlineForRepaint(RenderLayerModelObject* repaintContainer, LayoutUnit outlineWidth) const OVERRIDE;
virtual void computeRectForRepaint(RenderLayerModelObject* repaintContainer, LayoutRect&, bool fixed) const OVERRIDE;
- virtual void mapLocalToContainer(RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags mode = ApplyContainerFlip | SnapOffsetForTransforms, bool* wasFixed = 0) const OVERRIDE;
+ virtual void mapLocalToContainer(RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip | SnapOffsetForTransforms, bool* wasFixed = 0) const OVERRIDE;
virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE;
virtual VisiblePosition positionForPoint(const LayoutPoint&);
Modified: trunk/Source/WebCore/rendering/RenderObject.h (131230 => 131231)
--- trunk/Source/WebCore/rendering/RenderObject.h 2012-10-12 22:04:55 UTC (rev 131230)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2012-10-12 22:16:33 UTC (rev 131231)
@@ -708,8 +708,8 @@
// Convert the given local point to absolute coordinates
// FIXME: Temporary. If UseTransforms is true, take transforms into account. Eventually localToAbsolute() will always be transform-aware.
- FloatPoint localToAbsolute(const FloatPoint& localPoint = FloatPoint(), MapCoordinatesFlags mode = 0) const;
- FloatPoint absoluteToLocal(const FloatPoint&, MapCoordinatesFlags mode = 0) const;
+ FloatPoint localToAbsolute(const FloatPoint& localPoint = FloatPoint(), MapCoordinatesFlags = 0) const;
+ FloatPoint absoluteToLocal(const FloatPoint&, MapCoordinatesFlags = 0) const;
// Convert a local quad to absolute coordinates, taking transforms into account.
FloatQuad localToAbsoluteQuad(const FloatQuad& quad, MapCoordinatesFlags mode = 0, bool* wasFixed = 0) const
@@ -718,8 +718,8 @@
}
// Convert a local quad into the coordinate system of container, taking transforms into account.
- FloatQuad localToContainerQuad(const FloatQuad&, RenderLayerModelObject* repaintContainer, MapCoordinatesFlags mode = 0, bool* wasFixed = 0) const;
- FloatPoint localToContainerPoint(const FloatPoint&, RenderLayerModelObject* repaintContainer, MapCoordinatesFlags mode = 0, bool* wasFixed = 0) const;
+ FloatQuad localToContainerQuad(const FloatQuad&, RenderLayerModelObject* repaintContainer, MapCoordinatesFlags = 0, bool* wasFixed = 0) const;
+ FloatPoint localToContainerPoint(const FloatPoint&, RenderLayerModelObject* repaintContainer, MapCoordinatesFlags = 0, 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.
@@ -917,8 +917,8 @@
// 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(RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags mode = ApplyContainerFlip, bool* wasFixed = 0) const;
- virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags mode, TransformState&) const;
+ virtual void mapLocalToContainer(RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip, bool* wasFixed = 0) const;
+ virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) const;
// Pushes state onto RenderGeometryMap about how to map coordinates from this renderer to its container, or ancestorToStopAt (whichever is encountered first).
// Returns the renderer which was mapped to (container or ancestorToStopAt).
Modified: trunk/Source/WebCore/rendering/RenderView.h (131230 => 131231)
--- trunk/Source/WebCore/rendering/RenderView.h 2012-10-12 22:04:55 UTC (rev 131230)
+++ trunk/Source/WebCore/rendering/RenderView.h 2012-10-12 22:16:33 UTC (rev 131231)
@@ -206,9 +206,9 @@
bool hasRenderCounters() { return m_renderCounterCount; }
protected:
- virtual void mapLocalToContainer(RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags mode = ApplyContainerFlip | SnapOffsetForTransforms, bool* wasFixed = 0) const OVERRIDE;
+ virtual void mapLocalToContainer(RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip | SnapOffsetForTransforms, bool* wasFixed = 0) const OVERRIDE;
virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE;
- virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags mode, TransformState&) const;
+ virtual void mapAbsoluteToLocalPoint(MapCoordinatesFlags, TransformState&) const;
virtual bool requiresColumns(int desiredColumnCount) const OVERRIDE;
private:
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h (131230 => 131231)
--- trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h 2012-10-12 22:04:55 UTC (rev 131230)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGForeignObject.h 2012-10-12 22:16:33 UTC (rev 131231)
@@ -54,7 +54,7 @@
virtual bool nodeAtPoint(const HitTestRequest&, HitTestResult&, const HitTestLocation& locationInContainer, const LayoutPoint& accumulatedOffset, HitTestAction) OVERRIDE;
virtual bool isSVGForeignObject() const { return true; }
- virtual void mapLocalToContainer(RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags mode = ApplyContainerFlip | SnapOffsetForTransforms, bool* wasFixed = 0) const OVERRIDE;
+ virtual void mapLocalToContainer(RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip | SnapOffsetForTransforms, bool* wasFixed = 0) const OVERRIDE;
virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE;
virtual void setNeedsTransformUpdate() { m_needsTransformUpdate = true; }
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGInline.h (131230 => 131231)
--- trunk/Source/WebCore/rendering/svg/RenderSVGInline.h 2012-10-12 22:04:55 UTC (rev 131230)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGInline.h 2012-10-12 22:16:33 UTC (rev 131231)
@@ -47,7 +47,7 @@
virtual LayoutRect clippedOverflowRectForRepaint(RenderLayerModelObject* repaintContainer) const OVERRIDE;
virtual void computeFloatRectForRepaint(RenderLayerModelObject* repaintContainer, FloatRect&, bool fixed = false) const OVERRIDE;
- virtual void mapLocalToContainer(RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags mode = ApplyContainerFlip | SnapOffsetForTransforms, bool* wasFixed = 0) const OVERRIDE;
+ virtual void mapLocalToContainer(RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip | SnapOffsetForTransforms, bool* wasFixed = 0) const OVERRIDE;
virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE;
virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const;
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.h (131230 => 131231)
--- trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.h 2012-10-12 22:04:55 UTC (rev 131230)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGModelObject.h 2012-10-12 22:16:33 UTC (rev 131231)
@@ -58,7 +58,7 @@
virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint& accumulatedOffset) const;
virtual void absoluteQuads(Vector<FloatQuad>&, bool* wasFixed) const;
- virtual void mapLocalToContainer(RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags mode = ApplyContainerFlip | SnapOffsetForTransforms, bool* wasFixed = 0) const OVERRIDE;
+ virtual void mapLocalToContainer(RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip | SnapOffsetForTransforms, bool* wasFixed = 0) const OVERRIDE;
virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE;
virtual void styleWillChange(StyleDifference, const RenderStyle* newStyle);
virtual void styleDidChange(StyleDifference, const RenderStyle* oldStyle);
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h (131230 => 131231)
--- trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h 2012-10-12 22:04:55 UTC (rev 131230)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGRoot.h 2012-10-12 22:16:33 UTC (rev 131231)
@@ -95,7 +95,7 @@
virtual LayoutRect clippedOverflowRectForRepaint(RenderLayerModelObject* repaintContainer) const OVERRIDE;
virtual void computeFloatRectForRepaint(RenderLayerModelObject* repaintContainer, FloatRect& repaintRect, bool fixed) const OVERRIDE;
- virtual void mapLocalToContainer(RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags mode = ApplyContainerFlip | SnapOffsetForTransforms, bool* wasFixed = 0) const OVERRIDE;
+ virtual void mapLocalToContainer(RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip | SnapOffsetForTransforms, bool* wasFixed = 0) const OVERRIDE;
virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE;
virtual bool canBeSelectionLeaf() const { return false; }
Modified: trunk/Source/WebCore/rendering/svg/RenderSVGText.h (131230 => 131231)
--- trunk/Source/WebCore/rendering/svg/RenderSVGText.h 2012-10-12 22:04:55 UTC (rev 131230)
+++ trunk/Source/WebCore/rendering/svg/RenderSVGText.h 2012-10-12 22:16:33 UTC (rev 131231)
@@ -75,7 +75,7 @@
virtual void computeRectForRepaint(RenderLayerModelObject* repaintContainer, LayoutRect&, bool fixed = false) const OVERRIDE;
virtual void computeFloatRectForRepaint(RenderLayerModelObject* repaintContainer, FloatRect&, bool fixed = false) const OVERRIDE;
- virtual void mapLocalToContainer(RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags mode = ApplyContainerFlip | SnapOffsetForTransforms, bool* wasFixed = 0) const OVERRIDE;
+ virtual void mapLocalToContainer(RenderLayerModelObject* repaintContainer, TransformState&, MapCoordinatesFlags = ApplyContainerFlip | SnapOffsetForTransforms, bool* wasFixed = 0) const OVERRIDE;
virtual const RenderObject* pushMappingToContainer(const RenderLayerModelObject* ancestorToStopAt, RenderGeometryMap&) const OVERRIDE;
virtual void addChild(RenderObject* child, RenderObject* beforeChild = 0);
virtual void removeChild(RenderObject*) OVERRIDE;
