Dust-off SkXMLParser

src/xml/SkDOM.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 "SkDOM.h"
 #include "SkStream.h"
@@ skipping 292 matching lines @@
     SkDOM::Node*            fRoot;
     bool                    fNeedToFlush;
 
     // state needed for flushAttributes()
     SkTDArray<SkDOM::Attr>  fAttrs;
     char*                   fElemName;
     SkDOM::Type             fElemType;
     int                     fLevel;
 };
 
-const SkDOM::Node* SkDOM::build(const char doc[], size_t len)
-{
+const SkDOM::Node* SkDOM::build(SkStream& docStream) {
     SkDOMParser parser(&fAlloc);
-    if (!parser.parse(doc, len))
+    if (!parser.parse(docStream))
     {
         SkDEBUGCODE(SkDebugf("xml parse error, line %d\n", parser.fParserError.getLineNumber());)
         fRoot = nullptr;
         fAlloc.reset();
         return nullptr;
     }
     fRoot = parser.getRoot();
     return fRoot;
 }
 
+const SkDOM::Node* SkDOM::build(const char doc[], size_t len) {
+    SkMemoryStream docStream(doc, len);
+    return this->build(docStream);
+}
+
 ///////////////////////////////////////////////////////////////////////////
 
 static void walk_dom(const SkDOM& dom, const SkDOM::Node* node, SkXMLParser* parser)
 {
     const char* elem = dom.getName(node);
     if (dom.getType(node) == SkDOM::kText_Type) {
         SkASSERT(dom.countChildren(node) == 0);
         parser->text(elem, SkToInt(strlen(elem)));
         return;
     }
@@ skipping 131 matching lines @@
 void SkDOM::dump(const Node* node, int level) const
 {
     if (node == nullptr)
         node = this->getRootNode();
 
     SkDebugWStream debugStream;
     SkXMLStreamWriter xmlWriter(&debugStream);
     xmlWriter.writeDOM(*this, node, false);
 }
 
-void SkDOM::UnitTest()
-{
-#ifdef SK_SUPPORT_UNITTEST
-    static const char gDoc[] =
-        "<root a='1' b='2'>"
-            "<elem1 c='3' />"
-            "<elem2 d='4' />"
-            "<elem3 e='5'>"
-                "<subelem1/>"
-                "<subelem2 f='6' g='7'/>"
-            "</elem3>"
-            "<elem4 h='8'/>"
-        "</root>"
-        ;
-
-    SkDOM   dom;
-
-    SkASSERT(dom.getRootNode() == nullptr);
-
-    const Node* root = dom.build(gDoc, sizeof(gDoc) - 1);
-    SkASSERT(root && dom.getRootNode() == root);
-
-    const char* v = dom.findAttr(root, "a");
-    SkASSERT(v && !strcmp(v, "1"));
-    v = dom.findAttr(root, "b");
-    SkASSERT(v && !strcmp(v, "2"));
-    v = dom.findAttr(root, "c");
-    SkASSERT(v == nullptr);
-
-    SkASSERT(dom.getFirstChild(root, "elem1"));
-    SkASSERT(!dom.getFirstChild(root, "subelem1"));
-
-    dom.dump();
 #endif
-}
-
-#endif