diff options
| author |  fmalita <fmalita@chromium.org> | 2016-07-18 10:56:43 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-07-18 10:56:43 -0700 |
| commit | a427cc4d6b025b38b5bacd97f98325f9770e1769 (patch) | |
| tree | 77e488022315350380d766324d4624d4bc0e4acc | |
| parent | 54f30c13fc0a5d89797fc9be5f0fb1050d96b6f4 (diff) | |
Remove SkDOM::build(const char doc[], size_t len)
This flavor is unused, and we have the more general SkStream API.
R=stephana@google.com,reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2154733003
Review-Url: https://codereview.chromium.org/2154733003
| -rw-r--r-- | include/xml/SkDOM.h | 1 | ||||
| -rw-r--r-- | src/xml/SkDOM.cpp | 5 | ||||
| -rw-r--r-- | tests/SkDOMTest.cpp | 5 |
3 files changed, 4 insertions, 7 deletions
diff --git a/include/xml/SkDOM.h b/include/xml/SkDOM.h index 2a6ccc4f63..10ca3e78f8 100644 --- a/include/xml/SkDOM.h +++ b/include/xml/SkDOM.h @@ -32,7 +32,6 @@ public: /** Returns null on failure */ - const Node* build(const char doc[], size_t len); const Node* build(SkStream&); const Node* copy(const SkDOM& dom, const Node* node); diff --git a/src/xml/SkDOM.cpp b/src/xml/SkDOM.cpp index 78cf6f07e9..38ba669bb7 100644 --- a/src/xml/SkDOM.cpp +++ b/src/xml/SkDOM.cpp @@ -323,11 +323,6 @@ const SkDOM::Node* SkDOM::build(SkStream& docStream) { 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) diff --git a/tests/SkDOMTest.cpp b/tests/SkDOMTest.cpp index 34bd8dd8b3..a7fbda7f21 100644 --- a/tests/SkDOMTest.cpp +++ b/tests/SkDOMTest.cpp @@ -5,6 +5,7 @@ * found in the LICENSE file. */ +#include "SkStream.h" #include "Test.h" #if defined(SK_XML) @@ -24,10 +25,12 @@ DEF_TEST(SkDOM_test, r) { "</root>" ; + SkMemoryStream docStream(gDoc, sizeof(gDoc) - 1); + SkDOM dom; REPORTER_ASSERT(r, !dom.getRootNode()); - const SkDOM::Node* root = dom.build(gDoc, sizeof(gDoc) - 1); + const SkDOM::Node* root = dom.build(docStream); REPORTER_ASSERT(r, root && dom.getRootNode() == root); const char* v = dom.findAttr(root, "a"); |