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/DM.cpp

diff --git a/dm/DM.cpp b/dm/DM.cpp
index 2587b0d..403252b 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -12,7 +12,6 @@
 #include "OverwriteLine.h"
 #include "ProcStats.h"
 #include "SkBBHFactory.h"
-#include "SkBitmapRegionDecoderPriv.h"
 #include "SkChecksum.h"
 #include "SkCodec.h"
 #include "SkCommonFlags.h"
@@ -285,7 +284,7 @@
     }
 
     if (1 != sampleSize) {
-        folder.appendf("_%.3f", get_scale_from_sample_size(sampleSize));
+        folder.appendf("_%.3f", 1.0f / (float) sampleSize);
     }
 
     AndroidCodecSrc* src = new AndroidCodecSrc(path, mode, dstColorType, sampleSize);
@@ -441,7 +440,7 @@
     }
 
     if (1 != sampleSize) {
-        folder.appendf("_%.3f", get_scale_from_sample_size(sampleSize));
+        folder.appendf("_%.3f", 1.0f / (float) sampleSize);
     }
 
     BRDSrc* src = new BRDSrc(path, strategy, mode, dstColorType, sampleSize);