add length parameter to addText, to match attr values

include/xml/SkXMLWriter.h

-
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-
 #ifndef SkXMLWriter_DEFINED
 #define SkXMLWriter_DEFINED
 
 #include "SkTDArray.h"
 #include "SkString.h"
 #include "SkDOM.h"
 
 class SkWStream;
 class SkXMLParser;
 
 class SkXMLWriter {
 public:
             SkXMLWriter(bool doEscapeMarkup = true);
     virtual ~SkXMLWriter();
 
     void    addS32Attribute(const char name[], int32_t value);
     void    addAttribute(const char name[], const char value[]);
     void    addAttributeLen(const char name[], const char value[], size_t length);
     void    addHexAttribute(const char name[], uint32_t value, int minDigits = 0);
     void    addScalarAttribute(const char name[], SkScalar value);
-    void    addText(const char text[]);
+    void    addText(const char text[], size_t length);
+    void    addText(const char cstr[]);

[f(malita), 2015/02/05 02:16:17]

Is there any value in keeping this variant around? SkSVGDevice is the only user
atm.

[reed1, 2015/02/05 02:17:45]

Good point. Will remove.

     void    endElement() { this->onEndElement(); }
     void    startElement(const char elem[]);
     void    startElementLen(const char elem[], size_t length);
     void    writeDOM(const SkDOM&, const SkDOM::Node*, bool skipRoot);
     void    flush();
     virtual void writeHeader();
 
 protected:
     virtual void onStartElementLen(const char elem[], size_t length) = 0;
     virtual void onAddAttributeLen(const char name[], const char value[], size_t length) = 0;
-    virtual void onAddText(const char text[]) = 0;
+    virtual void onAddText(const char text[], size_t length) = 0;
     virtual void onEndElement() = 0;
 
     struct Elem {
         Elem(const char name[], size_t len)
             : fName(name, len)
             , fHasChildren(false)
             , fHasText(false) {}
 
         SkString    fName;
         bool        fHasChildren;
@@ skipping 10 matching lines @@
     // illegal
     SkXMLWriter& operator=(const SkXMLWriter&);
 };
 
 class SkXMLStreamWriter : public SkXMLWriter {
 public:
     SkXMLStreamWriter(SkWStream*);
     virtual ~SkXMLStreamWriter();
     virtual void    writeHeader();
     SkDEBUGCODE(static void UnitTest();)
+
 protected:
-    virtual void onStartElementLen(const char elem[], size_t length);
-    virtual void onEndElement();
-    virtual void onAddAttributeLen(const char name[], const char value[], size_t length);
-    virtual void onAddText(const char text[]) SK_OVERRIDE;
+    void onStartElementLen(const char elem[], size_t length) SK_OVERRIDE;
+    void onEndElement() SK_OVERRIDE;
+    void onAddAttributeLen(const char name[], const char value[], size_t length) SK_OVERRIDE;
+    void onAddText(const char text[], size_t length) SK_OVERRIDE;
 
 private:
     SkWStream&      fStream;
 };
 
 class SkXMLParserWriter : public SkXMLWriter {
 public:
     SkXMLParserWriter(SkXMLParser*);
     virtual ~SkXMLParserWriter();
 protected:
     virtual void onStartElementLen(const char elem[], size_t length);
     virtual void onEndElement();
     virtual void onAddAttributeLen(const char name[], const char value[], size_t length);
-    virtual void onAddText(const char text[]) SK_OVERRIDE;
+    virtual void onAddText(const char text[], size_t length) SK_OVERRIDE;
 private:
     SkXMLParser&        fParser;
 };
 
 
 #endif