aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/xml
diff options
context:
space:
mode:
authorGravatar rmistry@google.com <rmistry@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-08-23 18:14:13 +0000
committerGravatar rmistry@google.com <rmistry@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81>2012-08-23 18:14:13 +0000
commitd6176b0dcacb124539e0cfd051e6d93a9782f020 (patch)
tree9e6f4b465e54c9b26e1ba70cd8890b55abb08464 /src/xml
parentfbfcd5602128ec010c82cb733c9cdc0a3254f9f3 (diff)
Result of running tools/sanitize_source_files.py (which was added in https://codereview.appspot.com/6465078/)
This CL is part II of IV (I broke down the 1280 files into 4 CLs). Review URL: https://codereview.appspot.com/6474054 git-svn-id: http://skia.googlecode.com/svn/trunk@5263 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/xml')
-rw-r--r--src/xml/SkDOM.cpp10
-rw-r--r--src/xml/SkJSDisplayable.cpp6
-rw-r--r--src/xml/SkXMLParser.cpp2
-rw-r--r--src/xml/SkXMLPullParser.cpp10
-rw-r--r--src/xml/SkXMLWriter.cpp2
5 files changed, 15 insertions, 15 deletions
diff --git a/src/xml/SkDOM.cpp b/src/xml/SkDOM.cpp
index 474c2915bb..bdfdd86bdc 100644
--- a/src/xml/SkDOM.cpp
+++ b/src/xml/SkDOM.cpp
@@ -19,10 +19,10 @@ bool SkXMLParser::parse(const SkDOM& dom, const SkDOMNode* node)
if (this->startElement(elemName))
return false;
-
+
SkDOM::AttrIter iter(dom, node);
const char* name, *value;
-
+
while ((name = iter.next(&value)) != NULL)
if (this->addAttribute(name, value))
return false;
@@ -32,7 +32,7 @@ bool SkXMLParser::parse(const SkDOM& dom, const SkDOMNode* node)
if (!this->parse(dom, node))
return false;
} while ((node = dom.getNextSibling(node)) != NULL);
-
+
return !this->endElement(elemName);
}
@@ -312,7 +312,7 @@ static void walk_dom(const SkDOM& dom, const SkDOM::Node* node, SkXMLParser* par
const char* elem = dom.getName(node);
parser->startElement(elem);
-
+
SkDOM::AttrIter iter(dom, node);
const char* name;
const char* value;
@@ -467,7 +467,7 @@ void SkDOM::dump(const Node* node, int level) const
void SkDOM::UnitTest()
{
#ifdef SK_SUPPORT_UNITTEST
- static const char gDoc[] =
+ static const char gDoc[] =
"<root a='1' b='2'>"
"<elem1 c='3' />"
"<elem2 d='4' />"
diff --git a/src/xml/SkJSDisplayable.cpp b/src/xml/SkJSDisplayable.cpp
index 0e14fde52e..502779743f 100644
--- a/src/xml/SkJSDisplayable.cpp
+++ b/src/xml/SkJSDisplayable.cpp
@@ -83,7 +83,7 @@ JSBool SkJSDisplayable::Draw(JSContext *cx, JSObject *obj, uintN argc,
}
-JSFunctionSpec SkJSDisplayable_methods[] =
+JSFunctionSpec SkJSDisplayable_methods[] =
{
{ "draw", SkJSDisplayable::Draw, 1, 0, 0 },
{ 0 }
@@ -219,7 +219,7 @@ JSBool SkJSDisplayable::GetProperty(JSContext *cx, JSObject *obj, jsval id,
jsval *vp)
{
if (JSVAL_IS_INT(id) == 0)
- return JS_TRUE;
+ return JS_TRUE;
SkJSDisplayable *p = (SkJSDisplayable *) JS_GetPrivate(cx, obj);
SkDisplayable* displayable = p->fDisplayable;
SkDisplayTypes displayableType = displayable->getType();
@@ -295,7 +295,7 @@ JSBool SkJSDisplayable::GetProperty(JSContext *cx, JSObject *obj, jsval id,
JSBool SkJSDisplayable::SetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp) {
if (JSVAL_IS_INT(id) == 0)
- return JS_TRUE;
+ return JS_TRUE;
SkJSDisplayable *p = (SkJSDisplayable *) JS_GetPrivate(cx, obj);
SkDisplayable* displayable = p->fDisplayable;
SkDisplayTypes displayableType = displayable->getType();
diff --git a/src/xml/SkXMLParser.cpp b/src/xml/SkXMLParser.cpp
index 17329be1cc..63929a94e2 100644
--- a/src/xml/SkXMLParser.cpp
+++ b/src/xml/SkXMLParser.cpp
@@ -74,7 +74,7 @@ bool SkXMLParser::endElement(const char elem[])
return this->onEndElement(elem);
}
-bool SkXMLParser::text(const char text[], int len)
+bool SkXMLParser::text(const char text[], int len)
{
return this->onText(text, len);
}
diff --git a/src/xml/SkXMLPullParser.cpp b/src/xml/SkXMLPullParser.cpp
index 03fed42343..4080aeb1ec 100644
--- a/src/xml/SkXMLPullParser.cpp
+++ b/src/xml/SkXMLPullParser.cpp
@@ -26,7 +26,7 @@ SkXMLPullParser::SkXMLPullParser(SkStream* stream) : fStream(NULL)
{
fCurr.fEventType = ERROR;
fDepth = 0;
-
+
this->setStream(stream);
}
@@ -65,12 +65,12 @@ SkXMLPullParser::EventType SkXMLPullParser::nextToken()
case END_TAG:
fDepth -= 1;
// fall through
- default:
+ default:
reset(&fCurr);
fCurr.fEventType = this->onNextToken();
break;
}
-
+
switch (fCurr.fEventType) {
case START_TAG:
fDepth += 1;
@@ -125,11 +125,11 @@ int SkXMLPullParser::getAttributeCount()
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)
{
diff --git a/src/xml/SkXMLWriter.cpp b/src/xml/SkXMLWriter.cpp
index 935745dc95..451d1d5241 100644
--- a/src/xml/SkXMLWriter.cpp
+++ b/src/xml/SkXMLWriter.cpp
@@ -69,7 +69,7 @@ bool SkXMLWriter::doStart(const char name[], size_t length)
return firstChild;
}
-SkXMLWriter::Elem* SkXMLWriter::getEnd()
+SkXMLWriter::Elem* SkXMLWriter::getEnd()
{
Elem* elem;
fElems.pop(&elem);