[SkSVGDevice] Initial text support

src/xml/SkXMLWriter.cpp

 
 /*
  * 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.
  */
 
 
 #include "SkXMLWriter.h"
@@ skipping 33 matching lines @@
     this->addAttribute(name, tmp.c_str());
 }
 
 void SkXMLWriter::addScalarAttribute(const char name[], SkScalar value)
 {
     SkString    tmp;
     tmp.appendScalar(value);
     this->addAttribute(name, tmp.c_str());
 }
 
+void SkXMLWriter::addText(const SkString& text)
+{
+    if (fElems.isEmpty()) {
+        return;
+    }
+
+    this->onAddText(text);
+
+    fElems.top()->fHasText = true;
+}
+
 void SkXMLWriter::doEnd(Elem* elem)
 {
     delete elem;
 }
 
 bool SkXMLWriter::doStart(const char name[], size_t length)
 {
     int level = fElems.count();
     bool firstChild = level > 0 && !fElems[level-1]->fHasChildren;
     if (firstChild)
         fElems[level-1]->fHasChildren = true;
     Elem** elem = fElems.push();
-    *elem = new Elem;
-    (*elem)->fName.set(name, length);
-    (*elem)->fHasChildren = 0;
+    *elem = new Elem(name, length);
     return firstChild;
 }
 
 SkXMLWriter::Elem* SkXMLWriter::getEnd()
 {
     Elem* elem;
     fElems.pop(&elem);
     return elem;
 }
 
@@ skipping 126 matching lines @@
 {
 }
 
 SkXMLStreamWriter::~SkXMLStreamWriter()
 {
     this->flush();
 }
 
 void SkXMLStreamWriter::onAddAttributeLen(const char name[], const char value[], size_t length)
 {
-    SkASSERT(!fElems.top()->fHasChildren);
+    SkASSERT(!fElems.top()->fHasChildren && !fElems.top()->fHasText);
     fStream.writeText(" ");
     fStream.writeText(name);
     fStream.writeText("=\"");
     fStream.write(value, length);
     fStream.writeText("\"");
 }
 
+void SkXMLStreamWriter::onAddText(const SkString& text)
+{
+    Elem* elem = fElems.top();
+
+    if (!elem->fHasChildren && !elem->fHasText) {
+        fStream.writeText(">");
+        fStream.newline();
+    }
+
+    tab(fStream, fElems.count() + 1);
+    fStream.writeText(text.c_str());
+    fStream.newline();
+}
+
 void SkXMLStreamWriter::onEndElement()
 {
     Elem* elem = getEnd();
-    if (elem->fHasChildren)
+    if (elem->fHasChildren || elem->fHasText)
     {
         tab(fStream, fElems.count());
         fStream.writeText("</");
         fStream.writeText(elem->fName.c_str());
         fStream.writeText(">");
+    } else {
+        fStream.writeText("/>");
     }
-    else
-        fStream.writeText("/>");
     fStream.newline();
     doEnd(elem);
 }
 
 void SkXMLStreamWriter::onStartElementLen(const char name[], size_t length)
 {
     int level = fElems.count();
     if (this->doStart(name, length))
     {
         // the first child, need to close with >
@@ skipping 22 matching lines @@
 {
 }
 
 SkXMLParserWriter::~SkXMLParserWriter()
 {
     this->flush();
 }
 
 void SkXMLParserWriter::onAddAttributeLen(const char name[], const char value[], size_t length)
 {
-    SkASSERT(fElems.count() == 0 || !fElems.top()->fHasChildren);
+    SkASSERT(fElems.count() == 0 || (!fElems.top()->fHasChildren && !fElems.top()->fHasText));
     SkString str(value, length);
     fParser.addAttribute(name, str.c_str());
 }
 
+void SkXMLParserWriter::onAddText(const SkString& text)
+{
+    fParser.text(text.c_str(), text.size());
+}
+
 void SkXMLParserWriter::onEndElement()
 {
     Elem* elem = this->getEnd();
     fParser.endElement(elem->fName.c_str());
     this->doEnd(elem);
 }
 
 void SkXMLParserWriter::onStartElementLen(const char name[], size_t length)
 {
     (void)this->doStart(name, length);
@@ skipping 30 matching lines @@
                 w.endElement();
             w.endElement();
             w.startElement("elem2");
             w.endElement();
         w.endElement();
     w.endElement();
 #endif
 }
 
 #endif