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>
diff --git a/gm/linepaths.cpp b/gm/linepaths.cpp
index e3f386d..f6424a7 100644
--- a/gm/linepaths.cpp
+++ b/gm/linepaths.cpp
@@ -5,12 +5,12 @@
* found in the LICENSE file.
*/
-#include "gm.h"
-#include "sk_tool_utils.h"
#include "SkCanvas.h"
-#include "SkPath.h"
#include "SkPaint.h"
+#include "SkPath.h"
#include "SkRandom.h"
+#include "ToolUtils.h"
+#include "gm.h"
static void drawPath(SkPath& path,SkCanvas* canvas,SkColor color,
const SkRect& clip,SkPaint::Cap cap, SkPaint::Join join,
@@ -77,7 +77,7 @@
titlePaint.setColor(SK_ColorBLACK);
titlePaint.setAntiAlias(true);
- SkFont font(sk_tool_utils::create_portable_typeface(), 15.0f);
+ SkFont font(ToolUtils::create_portable_typeface(), 15.0f);
const char titleNoClose[] = "Line Drawn Into Rectangle Clips With "
"Indicated Style, Fill and Linecaps, with stroke width 10";
@@ -106,7 +106,7 @@
canvas->translate(rect.width() + 40 * SK_Scalar1, 0);
}
- SkColor color = sk_tool_utils::color_to_565(0xff007000);
+ SkColor color = ToolUtils::color_to_565(0xff007000);
drawPath(path.fPath, canvas, color, rect,
gCaps[cap].fCap, gCaps[cap].fJoin, gStyles[style].fStyle,
gFills[fill].fFill, SK_Scalar1*10);