aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/xml
diff options
context:
space:
mode:
authorGravatar reed <reed@google.com>2015-02-04 18:29:27 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-02-04 18:29:27 -0800
commite73da40c35672f34ad77beee0c9fcd4761fab108 (patch)
treed825aca21bb88ac2492923497235f512c057ea57 /src/xml
parenta9d9de45c1cd83419b4afc7884359e92bc173009 (diff)
add length parameter to addText, to match attr values
Diffstat (limited to 'src/xml')
-rw-r--r--src/xml/SkXMLWriter.cpp21
1 files changed, 8 insertions, 13 deletions
diff --git a/src/xml/SkXMLWriter.cpp b/src/xml/SkXMLWriter.cpp
index 56e0889388..62e96687fe 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,14 +49,13 @@ 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;
}
@@ -229,8 +226,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) {
@@ -239,7 +235,7 @@ void SkXMLStreamWriter::onAddText(const char text[])
}
tab(fStream, fElems.count() + 1);
- fStream.writeText(text);
+ fStream.write(text, length);
fStream.newline();
}
@@ -302,9 +298,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()