commit ea3f014e2b6d18a9f81c1cc369207adeadd1d88c
author Mike Klein <mtklein@google.com> Wed Mar 20 11:12:10 2019 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Mar 20 18:05:42 2019 +0000
tree 1fae93fb49d981f6857cedeaa7f7d83d1b97820a
parent 8d1956edd8647abb9d9998253ad93f37e8e0c10f

sk_tool_utils -> ToolUtils, and git clang-format

sk_tool_utils doesn't really fit the naming convention
the rest of code under tools/ tends to use.

Change-Id: I45326a174101c6eb4b6149e9c742f658f2fd23b1
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/202313
Auto-Submit: Mike Klein <mtklein@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>

dm/DM.cpp

diff --git a/dm/DM.cpp b/dm/DM.cpp
index fd1409a..8ca0de9 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -40,8 +40,8 @@
 #include "SkTypeface_win.h"
 #include "Test.h"
 #include "TestFontMgr.h"
+#include "ToolUtils.h"
 #include "ios_utils.h"
-#include "sk_tool_utils.h"
 
 #include <vector>
 
@@ -1401,8 +1401,8 @@
         if (bitmap) {
             result.gamut         = identify_gamut               (bitmap->colorSpace());
             result.transferFn    = identify_transfer_fn         (bitmap->colorSpace());
-            result.colorType     = sk_tool_utils::colortype_name(bitmap->colorType ());
-            result.alphaType     = sk_tool_utils::alphatype_name(bitmap->alphaType ());
+            result.colorType     = ToolUtils::colortype_name(bitmap->colorType());
+            result.alphaType     = ToolUtils::alphatype_name(bitmap->alphaType());
             result.colorDepth    = color_depth                  (bitmap->colorType());
         }
         JsonWriter::AddBitmapResult(result);
@@ -1518,7 +1518,7 @@
     CommandLineFlags::Parse(argc, argv);
 
     if (!FLAGS_nativeFonts) {
-        gSkFontMgr_DefaultFactory = &sk_tool_utils::MakePortableFontMgr;
+        gSkFontMgr_DefaultFactory = &ToolUtils::MakePortableFontMgr;
     }
 
 #if defined(SK_BUILD_FOR_WIN)