Revert of Sketch DM refactor.

bench/nanobench.cpp

Index: bench/nanobench.cpp
diff --git a/bench/nanobench.cpp b/bench/nanobench.cpp
index 12686e3a8476f53123ebaff725f35a3dc5ba0c7d..36a9177e576e38e2a47ba702e42644b86f6f6213 100644
--- a/bench/nanobench.cpp
+++ b/bench/nanobench.cpp
@@ -77,7 +77,14 @@
 
 static SkString humanize(double ms) {
     if (FLAGS_verbose) return SkStringPrintf("%llu", (uint64_t)(ms*1e6));
-    return HumanizeMs(ms);
+    if (ms > 1e+3)     return SkStringPrintf("%.3gs",  ms/1e3);
+    if (ms < 1e-3)     return SkStringPrintf("%.3gns", ms*1e6);
+#ifdef SK_BUILD_FOR_WIN
+    if (ms < 1)        return SkStringPrintf("%.3gus", ms*1e3);
+#else
+    if (ms < 1)        return SkStringPrintf("%.3gµs", ms*1e3);
+#endif
+    return SkStringPrintf("%.3gms", ms);
 }
 #define HUMANIZE(ms) humanize(ms).c_str()
 
@@ -541,7 +548,7 @@
                         static const int kFlags = SkPictureRecorder::kComputeSaveLayerInfo_RecordFlag;
                         pic->playback(recorder.beginRecording(pic->cullRect().width(),
                                                               pic->cullRect().height(),
-                                                              &factory,
+                                                              &factory, 
                                                               fUseMPDs[fCurrentUseMPD] ? kFlags : 0));
                         pic.reset(recorder.endRecording());
                     }