diff options
author | fmalita <fmalita@chromium.org> | 2016-07-19 05:14:41 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-07-19 05:14:41 -0700 |
commit | fd75dd4086971783053facde4ec6abee55afb780 (patch) | |
tree | b4101b9db1d5b74d72a6b9441aced0b802f2e5b5 | |
parent | 5139e501c5ac3a511e35c78395c907a176113451 (diff) |
Delete SkXMLPullParser
Unused & not being built.
R=reed@google.com,robertphillips@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2163463002
Review-Url: https://codereview.chromium.org/2163463002
-rw-r--r-- | gyp/xml.gyp | 5 | ||||
-rw-r--r-- | include/xml/SkXMLParser.h | 68 | ||||
-rw-r--r-- | src/xml/SkXMLPullParser.cpp | 137 |
3 files changed, 0 insertions, 210 deletions
diff --git a/gyp/xml.gyp b/gyp/xml.gyp index 6529d0c471..a3178a00a1 100644 --- a/gyp/xml.gyp +++ b/gyp/xml.gyp @@ -24,13 +24,8 @@ '<(skia_src_path)/xml/SkDOM.cpp', '<(skia_src_path)/xml/SkXMLParser.cpp', - '<(skia_src_path)/xml/SkXMLPullParser.cpp', '<(skia_src_path)/xml/SkXMLWriter.cpp', ], - 'sources!': [ - # time to kill this? - '<(skia_src_path)/xml/SkXMLPullParser.cpp', #if 0 around class decl in header - ], 'direct_dependent_settings': { 'include_dirs': [ '../include/xml', diff --git a/include/xml/SkXMLParser.h b/include/xml/SkXMLParser.h index 1a90bf71e7..2974fb57cf 100644 --- a/include/xml/SkXMLParser.h +++ b/include/xml/SkXMLParser.h @@ -84,72 +84,4 @@ private: void reportError(void* parser); }; -#if 0 -class SkXMLPullParser { -public: - SkXMLPullParser(); - explicit SkXMLPullParser(SkStream*); - virtual ~SkXMLPullParser(); - - SkStream* getStream() const { return fStream; } - SkStream* setStream(SkStream* stream); - - enum EventType { - ERROR = -1, - START_DOCUMENT, - END_DOCUMENT, - START_TAG, - END_TAG, - TEXT, - CDSECT, - ENTITY_REF, - IGNORABLE_WHITESPACE, - PROCESSING_INSTRUCTION, - COMMENT, - DOCDECL - }; - - EventType nextToken(); - EventType getEventType() const { return fCurr.fEventType; } - - struct AttrInfo { - const char* fName; - const char* fValue; - }; - - int getDepth() const { return fDepth; } - const char* getName(); - int getAttributeCount(); - void getAttributeInfo(int, AttrInfo*); - const char* getText(); - bool isWhitespace(); - -protected: - virtual bool onEntityReplacement(const char name[], - SkString* replacement); - -public: - struct Curr { - EventType fEventType; - const char* fName; - AttrInfo* fAttrInfos; - int fAttrInfoCount; - bool fIsWhitespace; - }; - -private: - // implemented in the porting layer - bool onInit(); // return false on failure - EventType onNextToken(); - void onExit(); - - SkStream* fStream; - Curr fCurr; - int fDepth; - - struct Impl; - Impl* fImpl; -}; -#endif - #endif diff --git a/src/xml/SkXMLPullParser.cpp b/src/xml/SkXMLPullParser.cpp deleted file mode 100644 index 3e831a12ee..0000000000 --- a/src/xml/SkXMLPullParser.cpp +++ /dev/null @@ -1,137 +0,0 @@ -/* - * Copyright 2011 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ -#include "SkXMLParser.h" -#include "SkStream.h" - -static void reset(SkXMLPullParser::Curr* curr) -{ - curr->fEventType = SkXMLPullParser::ERROR; - curr->fName = ""; - curr->fAttrInfoCount = 0; - curr->fIsWhitespace = false; -} - -SkXMLPullParser::SkXMLPullParser() : fStream(nullptr) -{ - fCurr.fEventType = ERROR; - fDepth = -1; -} - -SkXMLPullParser::SkXMLPullParser(SkStream* stream) : fStream(nullptr) -{ - fCurr.fEventType = ERROR; - fDepth = 0; - - this->setStream(stream); -} - -SkXMLPullParser::~SkXMLPullParser() -{ - this->setStream(nullptr); -} - -SkStream* SkXMLPullParser::setStream(SkStream* stream) -{ - if (fStream && !stream) - this->onExit(); - - SkRefCnt_SafeAssign(fStream, stream); - - if (fStream) - { - fCurr.fEventType = START_DOCUMENT; - this->onInit(); - } - else - { - fCurr.fEventType = ERROR; - } - fDepth = 0; - - return fStream; -} - -SkXMLPullParser::EventType SkXMLPullParser::nextToken() -{ - switch (fCurr.fEventType) { - case ERROR: - case END_DOCUMENT: - break; - case END_TAG: - fDepth -= 1; - // fall through - default: - reset(&fCurr); - fCurr.fEventType = this->onNextToken(); - break; - } - - switch (fCurr.fEventType) { - case START_TAG: - fDepth += 1; - break; - default: - break; - } - - return fCurr.fEventType; -} - -const char* SkXMLPullParser::getName() -{ - switch (fCurr.fEventType) { - case START_TAG: - case END_TAG: - return fCurr.fName; - default: - return nullptr; - } -} - -const char* SkXMLPullParser::getText() -{ - switch (fCurr.fEventType) { - case TEXT: - case IGNORABLE_WHITESPACE: - return fCurr.fName; - default: - return nullptr; - } -} - -bool SkXMLPullParser::isWhitespace() -{ - switch (fCurr.fEventType) { - case IGNORABLE_WHITESPACE: - return true; - case TEXT: - case CDSECT: - return fCurr.fIsWhitespace; - default: - return false; // unknown/illegal - } -} - -int SkXMLPullParser::getAttributeCount() -{ - return fCurr.fAttrInfoCount; -} - -void SkXMLPullParser::getAttributeInfo(int index, AttrInfo* info) -{ - SkASSERT((unsigned)index < (unsigned)fCurr.fAttrInfoCount); - - if (info) - *info = fCurr.fAttrInfos[index]; -} - -bool SkXMLPullParser::onEntityReplacement(const char name[], - SkString* replacement) -{ - // TODO: std 5 entities here - return false; -} |