sprinkle more tracing in GM, tests, and ok, and add TRACE_FUNC

Change-Id: I562d438bd65e9fd900cfc6831f971b4af25c8ae6
Reviewed-on: https://skia-review.googlesource.com/26361
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>

2 files changed, 4 insertions, 2 deletions

diff --git a/tools/ok_test.cpp b/tools/ok_test.cpp
index f5c4f22489..7c020d88e1 100644
--- a/tools/ok_test.cpp
+++ b/tools/ok_test.cpp
@@ -32,7 +32,6 @@ struct TestStream : Stream {
         SkISize     size() override { return {0,0}; }
 
         Status draw(SkCanvas*) override {
-
             struct : public skiatest::Reporter {
                 Status status = Status::OK;
                 bool extended, verbose_;
@@ -54,7 +53,7 @@ struct TestStream : Stream {
             factory = &a_real_factory;
         #endif
 
-            test.proc(&reporter, factory);
+            test.run(&reporter, factory);
             return reporter.status;
         }
     };
diff --git a/tools/ok_vias.cpp b/tools/ok_vias.cpp
index 35e6f1fcab..c3c0bad2d8 100644
--- a/tools/ok_vias.cpp
+++ b/tools/ok_vias.cpp
@@ -10,6 +10,7 @@
 #include "SkOSFile.h"
 #include "SkPictureRecorder.h"
 #include "SkPngEncoder.h"
+#include "SkTraceEvent.h"
 #include "ProcStats.h"
 #include "Timer.h"
 #include "ok.h"
@@ -42,6 +43,7 @@ struct ViaPic : Dst {
     }
 
     Status draw(Src* src) override {
+        TRACE_EVENT0("ok", TRACE_FUNC);
         SkRTreeFactory factory;
         SkPictureRecorder rec;
         rec.beginRecording(SkRect::MakeSize(SkSize::Make(src->size())),
@@ -76,6 +78,7 @@ struct Png : Dst {
     }
 
     Status draw(Src* src) override {
+        TRACE_EVENT0("ok", TRACE_FUNC);
         for (auto status = target->draw(src); status != Status::OK; ) {
             return status;
         }