Index: src/xml/SkXMLWriter.cpp |
diff --git a/src/xml/SkXMLWriter.cpp b/src/xml/SkXMLWriter.cpp |
index 56e08893883c67c8a508d583a90691ce9eeb9875..c1d87dd090ec0e57db6a2dfc87b2789c6b954bcd 100644 |
--- a/src/xml/SkXMLWriter.cpp |
+++ b/src/xml/SkXMLWriter.cpp |
@@ -1,4 +1,3 @@ |
- |
/* |
* Copyright 2006 The Android Open Source Project |
* |
@@ -6,7 +5,6 @@ |
* found in the LICENSE file. |
*/ |
- |
#include "SkXMLWriter.h" |
#include "SkStream.h" |
@@ -51,17 +49,20 @@ void SkXMLWriter::addScalarAttribute(const char name[], SkScalar value) |
this->addAttribute(name, tmp.c_str()); |
} |
-void SkXMLWriter::addText(const char text[]) |
-{ |
+void SkXMLWriter::addText(const char text[], size_t length) { |
if (fElems.isEmpty()) { |
return; |
} |
- |
- this->onAddText(text); |
- |
+ |
+ this->onAddText(text, length); |
+ |
fElems.top()->fHasText = true; |
} |
+void SkXMLWriter::addText(const char cstr[]) { |
+ this->addText(cstr, strlen(cstr)); |
+} |
+ |
void SkXMLWriter::doEnd(Elem* elem) |
{ |
delete elem; |
@@ -229,8 +230,7 @@ void SkXMLStreamWriter::onAddAttributeLen(const char name[], const char value[], |
fStream.writeText("\""); |
} |
-void SkXMLStreamWriter::onAddText(const char text[]) |
-{ |
+void SkXMLStreamWriter::onAddText(const char text[], size_t length) { |
Elem* elem = fElems.top(); |
if (!elem->fHasChildren && !elem->fHasText) { |
@@ -302,9 +302,8 @@ void SkXMLParserWriter::onAddAttributeLen(const char name[], const char value[], |
fParser.addAttribute(name, str.c_str()); |
} |
-void SkXMLParserWriter::onAddText(const char text[]) |
-{ |
- fParser.text(text, SkToInt(strlen(text))); |
+void SkXMLParserWriter::onAddText(const char text[], size_t length) { |
+ fParser.text(text, SkToInt(length)); |
} |
void SkXMLParserWriter::onEndElement() |