Merge WebKit at r65072 : Initial merge by git.

Change-Id: Ibcf418498376b2660aacb7f8d46ea7085ef91585

1 files changed, 106 insertions, 0 deletions

diff --git a/WebCore/svg/SVGPathByteStreamSource.h b/WebCore/svg/SVGPathByteStreamSource.h
new file mode 100644
index 0000000..2537ad2
--- /dev/null
+++ b/WebCore/svg/SVGPathByteStreamSource.h
@@ -0,0 +1,106 @@
+/*
+ * 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
+ * along 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 SVGPathByteStreamSource_h
+#define SVGPathByteStreamSource_h
+
+#if ENABLE(SVG)
+#include "FloatPoint.h"
+#include "SVGPathByteStream.h"
+#include "SVGPathSource.h"
+#include <wtf/PassOwnPtr.h>
+
+namespace WebCore {
+
+class SVGPathByteStreamSource : public SVGPathSource {
+public:
+    static PassOwnPtr<SVGPathByteStreamSource> create(SVGPathByteStream* stream)
+    {
+        return adoptPtr(new SVGPathByteStreamSource(stream));
+    }
+
+    virtual ~SVGPathByteStreamSource();
+
+    virtual bool hasMoreData() const;
+    virtual bool moveToNextToken() { return true; }
+    virtual bool parseSVGSegmentType(SVGPathSegType&);
+    virtual SVGPathSegType nextCommand(SVGPathSegType);
+
+    virtual bool parseMoveToSegment(FloatPoint&);
+    virtual bool parseLineToSegment(FloatPoint&);
+    virtual bool parseLineToHorizontalSegment(float&);
+    virtual bool parseLineToVerticalSegment(float&);
+    virtual bool parseCurveToCubicSegment(FloatPoint&, FloatPoint&, FloatPoint&);
+    virtual bool parseCurveToCubicSmoothSegment(FloatPoint&, FloatPoint&);
+    virtual bool parseCurveToQuadraticSegment(FloatPoint&, FloatPoint&);
+    virtual bool parseCurveToQuadraticSmoothSegment(FloatPoint&);
+    virtual bool parseArcToSegment(float&, float&, float&, bool&, bool&, FloatPoint&);
+
+private:
+    SVGPathByteStreamSource(SVGPathByteStream*);
+
+#if COMPILER(MSVC)
+#pragma warning(disable: 4701)
+#endif
+    template<typename DataType, typename ByteType>
+    DataType readType()
+    {
+        ByteType data;
+        size_t typeSize = sizeof(ByteType);
+
+        for (size_t i = 0; i < typeSize; ++i) {
+            ASSERT(m_streamCurrent < m_streamEnd);
+            data.bytes[i] = *m_streamCurrent;
+            ++m_streamCurrent;
+        }
+
+        return data.value;
+    }
+
+    bool readFlag()
+    {
+        return readType<bool, BoolByte>();
+    }
+
+    float readFloat()
+    {
+        return readType<float, FloatByte>();
+    }
+
+    unsigned short readSVGSegmentType()
+    {
+        return readType<unsigned short, UnsignedShortByte>();
+    }
+
+    FloatPoint readFloatPoint()
+    {
+        float x = readType<float, FloatByte>();
+        float y = readType<float, FloatByte>();
+        return FloatPoint(x, y);
+    }
+
+    SVGPathByteStream* m_stream;
+    SVGPathByteStream::DataIterator m_streamCurrent;
+    SVGPathByteStream::DataIterator m_streamEnd;
+};
+
+} // namespace WebCore
+
+#endif // ENABLE(SVG)
+#endif // SVGPathByteStreamSource_h