Merge WebKit at r75315: Initial merge by git.

Change-Id: I570314b346ce101c935ed22a626b48c2af266b84

1 files changed, 0 insertions, 74 deletions

diff --git a/WebCore/rendering/SVGMarkerLayoutInfo.h b/WebCore/rendering/SVGMarkerLayoutInfo.h
deleted file mode 100644
index 8f59703..0000000
--- a/WebCore/rendering/SVGMarkerLayoutInfo.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-    Copyright (C) Research In Motion Limited 2010. All rights reserved.
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Library General Public
-    License as published by the Free Software Foundation; either
-    version 2 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Library General Public License for more details.
-
-    You should have received a copy of the GNU Library General Public License
-    aint with this library; see the file COPYING.LIB.  If not, write to
-    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-    Boston, MA 02110-1301, USA.
-*/
-
-#ifndef SVGMarkerLayoutInfo_h
-#define SVGMarkerLayoutInfo_h
-
-#if ENABLE(SVG)
-#include "RenderObject.h"
-#include "SVGMarkerData.h"
-#include <wtf/Noncopyable.h>
-
-namespace WebCore {
-
-class Path;
-class RenderSVGResourceMarker;
-
-struct MarkerLayout {
-    MarkerLayout(RenderSVGResourceMarker* markerObj = 0, AffineTransform matrixObj = AffineTransform())
-        : marker(markerObj)
-        , matrix(matrixObj)
-    {
-        ASSERT(marker);
-    }
-
-    RenderSVGResourceMarker* marker;
-    AffineTransform matrix;
-};
-
-class SVGMarkerLayoutInfo : public Noncopyable {
-public:
-    SVGMarkerLayoutInfo();
-    ~SVGMarkerLayoutInfo();
-
-    FloatRect calculateBoundaries(RenderSVGResourceMarker* startMarker, RenderSVGResourceMarker* midMarker, RenderSVGResourceMarker* endMarker, float strokeWidth, const Path&);
-    void drawMarkers(PaintInfo&);
-
-    // Used by static inline helper functions in SVGMarkerLayoutInfo.cpp
-    SVGMarkerData& markerData() { return m_markerData; }
-    RenderSVGResourceMarker* midMarker() const { return m_midMarker; }
-    int& elementIndex() { return m_elementIndex; }
-    void addLayoutedMarker(RenderSVGResourceMarker*, const FloatPoint& origin, float angle);
-
-private:
-    RenderSVGResourceMarker* m_midMarker;
-
-    // Used while layouting markers
-    int m_elementIndex;
-    SVGMarkerData m_markerData;
-    float m_strokeWidth;
-
-    // Holds the final computed result
-    Vector<MarkerLayout> m_layout;
-};
-
-}
-
-#endif
-#endif