Remove dead code from AssetStreamAdapter.
After "Use at least SkStreamAsset for SkTypefaces." there is now dead
code in AssetStreamAdapter. Remove the code and update the users.
Change-Id: I17a9d82dd6ca4d87a951c1570dc91de7f2fc54f2
diff --git a/core/jni/android/graphics/Utils.cpp b/core/jni/android/graphics/Utils.cpp
index a134d4b..3c471bd 100644
--- a/core/jni/android/graphics/Utils.cpp
+++ b/core/jni/android/graphics/Utils.cpp
@@ -19,21 +19,11 @@
using namespace android;
-AssetStreamAdaptor::AssetStreamAdaptor(Asset* asset, OwnAsset ownAsset,
- HasMemoryBase hasMemoryBase)
+AssetStreamAdaptor::AssetStreamAdaptor(Asset* asset)
: fAsset(asset)
- , fMemoryBase(kYes_HasMemoryBase == hasMemoryBase ?
- asset->getBuffer(false) : NULL)
- , fOwnAsset(ownAsset)
{
}
-AssetStreamAdaptor::~AssetStreamAdaptor() {
- if (kYes_OwnAsset == fOwnAsset) {
- delete fAsset;
- }
-}
-
bool AssetStreamAdaptor::rewind() {
off64_t pos = fAsset->seek(0, SEEK_SET);
if (pos == (off64_t)-1) {