[SkSVGDevice] Initial text support

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 SkString& text);

[reed1, 2015/02/04 01:05:23]

addText(const char text[], size_t length)

That would be a more consistent signature, since all of the others take text/len
instead of skstring.

[f(malita), 2015/02/04 01:35:25]

Done. I dropped the 'length' param to avoid converting back to an SkString in
SkXMLStreamWriter::onAddText (SkWStream::writeText expects a null-terminated C
string).

Some of the other methods also use C strings - WDYT?

     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 SkString& text) = 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;
+        bool        fHasText;
     };
     void doEnd(Elem* elem);
     bool doStart(const char name[], size_t length);
     Elem* getEnd();
     const char* getHeader();
     SkTDArray<Elem*> fElems;
 
 private:
     bool fDoEscapeMarkup;
     // 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 SkString& text) 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 SkString& text) SK_OVERRIDE;
 private:
     SkXMLParser&        fParser;
 };
 
 
 #endif