diff options
author | 2012-08-23 18:14:13 +0000 | |
---|---|---|
committer | 2012-08-23 18:14:13 +0000 | |
commit | d6176b0dcacb124539e0cfd051e6d93a9782f020 (patch) | |
tree | 9e6f4b465e54c9b26e1ba70cd8890b55abb08464 /src/views/SkViewPriv.cpp | |
parent | fbfcd5602128ec010c82cb733c9cdc0a3254f9f3 (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/views/SkViewPriv.cpp')
-rw-r--r-- | src/views/SkViewPriv.cpp | 98 |
1 files changed, 49 insertions, 49 deletions
diff --git a/src/views/SkViewPriv.cpp b/src/views/SkViewPriv.cpp index ad15f3fdb4..ba40c1e360 100644 --- a/src/views/SkViewPriv.cpp +++ b/src/views/SkViewPriv.cpp @@ -11,94 +11,94 @@ void SkView::Artist::draw(SkView* view, SkCanvas* canvas) { - SkASSERT(view && canvas); - this->onDraw(view, canvas); + SkASSERT(view && canvas); + this->onDraw(view, canvas); } void SkView::Artist::inflate(const SkDOM& dom, const SkDOM::Node* node) { - SkASSERT(&dom && node); - this->onInflate(dom, node); + SkASSERT(&dom && node); + this->onInflate(dom, node); } void SkView::Artist::onInflate(const SkDOM& dom, const SkDOM::Node* node) { - // subclass should override this as needed + // subclass should override this as needed } SkView::Artist* SkView::getArtist() const { - Artist_SkTagList* rec = (Artist_SkTagList*)this->findTagList(kViewArtist_SkTagList); - SkASSERT(rec == NULL || rec->fArtist != NULL); + Artist_SkTagList* rec = (Artist_SkTagList*)this->findTagList(kViewArtist_SkTagList); + SkASSERT(rec == NULL || rec->fArtist != NULL); - return rec ? rec->fArtist : NULL; + return rec ? rec->fArtist : NULL; } SkView::Artist* SkView::setArtist(Artist* obj) { - if (obj == NULL) - { - this->removeTagList(kViewArtist_SkTagList); - } - else // add/replace - { - Artist_SkTagList* rec = (Artist_SkTagList*)this->findTagList(kViewArtist_SkTagList); - - if (rec) - SkRefCnt_SafeAssign(rec->fArtist, obj); - else - this->addTagList(new Artist_SkTagList(obj)); - } - return obj; + if (obj == NULL) + { + this->removeTagList(kViewArtist_SkTagList); + } + else // add/replace + { + Artist_SkTagList* rec = (Artist_SkTagList*)this->findTagList(kViewArtist_SkTagList); + + if (rec) + SkRefCnt_SafeAssign(rec->fArtist, obj); + else + this->addTagList(new Artist_SkTagList(obj)); + } + return obj; } //////////////////////////////////////////////////////////////////////////////// void SkView::Layout::layoutChildren(SkView* parent) { - SkASSERT(parent); - if (parent->width() > 0 && parent->height() > 0) - this->onLayoutChildren(parent); + SkASSERT(parent); + if (parent->width() > 0 && parent->height() > 0) + this->onLayoutChildren(parent); } void SkView::Layout::inflate(const SkDOM& dom, const SkDOM::Node* node) { - SkASSERT(&dom && node); - this->onInflate(dom, node); + SkASSERT(&dom && node); + this->onInflate(dom, node); } void SkView::Layout::onInflate(const SkDOM& dom, const SkDOM::Node* node) { - // subclass should override this as needed + // subclass should override this as needed } SkView::Layout* SkView::getLayout() const { - Layout_SkTagList* rec = (Layout_SkTagList*)this->findTagList(kViewLayout_SkTagList); - SkASSERT(rec == NULL || rec->fLayout != NULL); + Layout_SkTagList* rec = (Layout_SkTagList*)this->findTagList(kViewLayout_SkTagList); + SkASSERT(rec == NULL || rec->fLayout != NULL); - return rec ? rec->fLayout : NULL; + return rec ? rec->fLayout : NULL; } SkView::Layout* SkView::setLayout(Layout* obj, bool invokeLayoutNow) { - if (obj == NULL) - { - this->removeTagList(kViewLayout_SkTagList); - } - else // add/replace - { - Layout_SkTagList* rec = (Layout_SkTagList*)this->findTagList(kViewLayout_SkTagList); - - if (rec) - SkRefCnt_SafeAssign(rec->fLayout, obj); - else - this->addTagList(new Layout_SkTagList(obj)); - } - - if (invokeLayoutNow) - this->invokeLayout(); - - return obj; + if (obj == NULL) + { + this->removeTagList(kViewLayout_SkTagList); + } + else // add/replace + { + Layout_SkTagList* rec = (Layout_SkTagList*)this->findTagList(kViewLayout_SkTagList); + + if (rec) + SkRefCnt_SafeAssign(rec->fLayout, obj); + else + this->addTagList(new Layout_SkTagList(obj)); + } + + if (invokeLayoutNow) + this->invokeLayout(); + + return obj; } |