commit 698fb3a91cf25a34287675386f10a31a70dfc5e4
author Derek Sollenberger <djsollen@google.com> Fri Mar 11 13:06:27 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 11 13:06:29 2016 +0000
tree 105e53496d260668d1ea3ef12c49b4e9cfdfc80c
parent 439affd23c892af7491fc830068aaa54d075f472
parent 6c9fef5ae06ad826fbfe8a3ae6f1a9621db9de66

Merge "Make reference to data within SkAutoTUnref unambiguous."

core/jni/android/graphics/FontFamily.cpp

diff --git a/core/jni/android/graphics/FontFamily.cpp b/core/jni/android/graphics/FontFamily.cpp
index 2e974a3..c90870d 100644
--- a/core/jni/android/graphics/FontFamily.cpp
+++ b/core/jni/android/graphics/FontFamily.cpp
@@ -146,7 +146,7 @@
     jobject fontRef = MakeGlobalRefOrDie(env, font);
     SkAutoTUnref<SkData> data(SkData::NewWithProc(fontPtr, fontSize,
             release_global_ref, reinterpret_cast<void*>(fontRef)));
-    std::unique_ptr<SkStreamAsset> fontData(new SkMemoryStream(data));
+    std::unique_ptr<SkStreamAsset> fontData(new SkMemoryStream(data.get()));
 
     SkFontMgr::FontParameters params;
     params.setCollectionIndex(ttcIndex);
@@ -192,7 +192,7 @@
     }
 
     SkAutoTUnref<SkData> data(SkData::NewWithProc(buf, asset->getLength(), releaseAsset, asset));
-    SkMemoryStream* stream = new SkMemoryStream(data);
+    SkMemoryStream* stream = new SkMemoryStream(data.get());
     // CreateFromStream takes ownership of stream.
     SkTypeface* face = SkTypeface::CreateFromStream(stream);
     if (face == NULL) {