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/drawbitmaprect.cpp b/gm/drawbitmaprect.cpp
index 5c8eb6d..4d4204c 100644
--- a/gm/drawbitmaprect.cpp
+++ b/gm/drawbitmaprect.cpp
@@ -5,8 +5,6 @@
* found in the LICENSE file.
*/
-#include "gm.h"
-#include "sk_tool_utils.h"
#include "SkBlurMask.h"
#include "SkBlurMaskFilter.h"
#include "SkColorPriv.h"
@@ -16,7 +14,8 @@
#include "SkMathPriv.h"
#include "SkShader.h"
#include "SkSurface.h"
-
+#include "ToolUtils.h"
+#include "gm.h"
static SkBitmap make_chessbm(int w, int h) {
SkBitmap bm;
@@ -35,7 +34,7 @@
static sk_sp<SkImage> makebm(SkCanvas* origCanvas, SkBitmap* resultBM, int w, int h) {
SkImageInfo info = SkImageInfo::MakeN32Premul(w, h);
- auto surface(sk_tool_utils::makeSurface(origCanvas, info));
+ auto surface(ToolUtils::makeSurface(origCanvas, info));
SkCanvas* canvas = surface->getCanvas();
canvas->clear(SK_ColorTRANSPARENT);
@@ -172,7 +171,7 @@
blackPaint.setColor(SK_ColorBLACK);
blackPaint.setAntiAlias(true);
- SkFont font(sk_tool_utils::create_portable_typeface(), titleHeight);
+ SkFont font(ToolUtils::create_portable_typeface(), titleHeight);
SkString title;
title.printf("Bitmap size: %d x %d", gBmpSize, gBmpSize);