commit 4b0778ec491513d1dab752fddb7520aac19ad47b
author msarett <msarett@google.com> Fri Nov 13 09:59:11 2015 -0800
committer Commit bot <commit-bot@chromium.org> Fri Nov 13 09:59:11 2015 -0800
tree eaf44cd5c02fb693cececa29a2e3e05cdf6855e1
parent e659a581f63fdccb64dce2dc8a478cf56831feea

Remove dependency on src/android from dm and nanobench

BUG=skia:

Review URL: https://codereview.chromium.org/1443033002

dm/DMSrcSink.cpp

diff --git a/dm/DMSrcSink.cpp b/dm/DMSrcSink.cpp
index c9178c0..75f954f 100644
--- a/dm/DMSrcSink.cpp
+++ b/dm/DMSrcSink.cpp
@@ -8,7 +8,6 @@
 #include "DMSrcSink.h"
 #include "SamplePipeControllers.h"
 #include "SkAndroidCodec.h"
-#include "SkBitmapRegionDecoderPriv.h"
 #include "SkCodec.h"
 #include "SkCommonFlags.h"
 #include "SkData.h"
@@ -228,7 +227,7 @@
     if (1 == fSampleSize) {
         return SkOSPath::Basename(fPath.c_str());
     }
-    return get_scaled_name(fPath, get_scale_from_sample_size(fSampleSize));
+    return get_scaled_name(fPath, 1.0f / (float) fSampleSize);
 }
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
@@ -761,7 +760,7 @@
     if (1 == fSampleSize) {
         return SkOSPath::Basename(fPath.c_str());
     }
-    return get_scaled_name(fPath, get_scale_from_sample_size(fSampleSize));
+    return get_scaled_name(fPath, 1.0f / (float) fSampleSize);
 }
 
 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/