Make SkStream *not* ref counted.

samplecode/SampleAnimator.cpp

 
 /*
  * 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 "SampleCode.h"
 #include "SkView.h"
 #include "SkCanvas.h"
@@ skipping 33 matching lines @@
 
 SkAnimatorView::~SkAnimatorView() {
     delete fAnimator;
 }
 
 void SkAnimatorView::setURIBase(const char dir[]) {
     fBaseURI.set(dir);
 }
 
 bool SkAnimatorView::decodeFile(const char path[]) {
-    SkFILEStream* is = new SkFILEStream(path);
-    SkAutoUnref aur(is);
-    return is->isValid() && this->decodeStream(is);
+    SkAutoTDelete<SkStream> is(SkStream::NewFromFile(path));
+    return is.get() != NULL && this->decodeStream(is);
 }
 
 bool SkAnimatorView::decodeMemory(const void* buffer, size_t size) {
-    SkMemoryStream* is = new SkMemoryStream(buffer, size);
-    SkAutoUnref aur(is);
-    return this->decodeStream(is);
+    SkMemoryStream is(buffer, size);
+    return this->decodeStream(&is);
 }
 
 static const SkDOMNode* find_nodeID(const SkDOM& dom,
                         const SkDOMNode* node, const char name[]) {
     if (NULL == node) {
         node = dom.getRootNode();
     }
     do {
         const char* idval = dom.findAttr(node, "id");
         if (idval && !strcmp(idval, name)) {
@@ skipping 92 matching lines @@
     av->setURIBase("/skia/trunk/animations/");
     av->decodeFile("/skia/trunk/animations/checkbox.xml");
 #else
     av->setURIBase("/");
     av->decodeFile("/testanim.txt");
 #endif
     return av;
 }
 
 static SkViewRegister reg(MyFactory);