Merge from Chromium at DEPS revision 257591
This commit was generated by merge_to_master.py.
Change-Id: I834f3ca85c1ef7ec2c1061847a3d92aa461da043
diff --git a/Source/core/svg/SVGPathByteStream.h b/Source/core/svg/SVGPathByteStream.h
index 1fedc1e..05940cf 100644
--- a/Source/core/svg/SVGPathByteStream.h
+++ b/Source/core/svg/SVGPathByteStream.h
@@ -40,7 +40,7 @@
return adoptPtr(new SVGPathByteStream);
}
- PassOwnPtr<SVGPathByteStream> copy()
+ PassOwnPtr<SVGPathByteStream> copy() const
{
return adoptPtr(new SVGPathByteStream(m_data));
}
@@ -48,22 +48,19 @@
typedef Vector<unsigned char> Data;
typedef Data::const_iterator DataIterator;
- DataIterator begin() { return m_data.begin(); }
- DataIterator end() { return m_data.end(); }
+ DataIterator begin() const { return m_data.begin(); }
+ DataIterator end() const { return m_data.end(); }
void append(unsigned char byte) { m_data.append(byte); }
- void append(SVGPathByteStream* other) { m_data.append(other->m_data); }
+ void append(SVGPathByteStream* other) { m_data.appendVector(other->m_data); }
void clear() { m_data.clear(); }
void reserveInitialCapacity(size_t size) { m_data.reserveInitialCapacity(size); }
void shrinkToFit() { m_data.shrinkToFit(); }
bool isEmpty() const { return m_data.isEmpty(); }
unsigned size() const { return m_data.size(); }
- // Only defined to let SVGAnimatedPathAnimator use the standard list code paths - this method is never called.
- void resize(unsigned) { }
-
private:
SVGPathByteStream() { }
- SVGPathByteStream(Data& data)
+ SVGPathByteStream(const Data& data)
: m_data(data)
{
}