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/convexpolyclip.cpp b/gm/convexpolyclip.cpp
index 2ab41ca..4d702ad 100644
--- a/gm/convexpolyclip.cpp
+++ b/gm/convexpolyclip.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
+#include "ToolUtils.h"
#include "gm.h"
-#include "sk_tool_utils.h"
#include "SkBitmap.h"
#include "SkFont.h"
@@ -26,12 +26,13 @@
SkScalar radius = 3 * SkMaxScalar(wScalar, hScalar);
- SkColor colors[] = { SK_ColorDKGRAY,
- sk_tool_utils::color_to_565(0xFF222255),
- sk_tool_utils::color_to_565(0xFF331133),
- sk_tool_utils::color_to_565(0xFF884422),
- sk_tool_utils::color_to_565(0xFF000022), SK_ColorWHITE,
- sk_tool_utils::color_to_565(0xFFAABBCC) };
+ SkColor colors[] = {SK_ColorDKGRAY,
+ ToolUtils::color_to_565(0xFF222255),
+ ToolUtils::color_to_565(0xFF331133),
+ ToolUtils::color_to_565(0xFF884422),
+ ToolUtils::color_to_565(0xFF000022),
+ SK_ColorWHITE,
+ ToolUtils::color_to_565(0xFFAABBCC)};
SkScalar pos[] = {0,
SK_Scalar1 / 6,
@@ -57,7 +58,7 @@
mat.postScale(SK_Scalar1 / 3, SK_Scalar1 / 3);
}
- SkFont font(sk_tool_utils::create_portable_typeface(), wScalar / 2.2f);
+ SkFont font(ToolUtils::create_portable_typeface(), wScalar / 2.2f);
paint.setShader(nullptr);
paint.setColor(SK_ColorLTGRAY);
@@ -150,7 +151,7 @@
canvas->drawBitmapRect(fBmp, SkRect::MakeIWH(size.fWidth, size.fHeight), &bgPaint);
constexpr char kTxt[] = "Clip Me!";
- SkFont font(sk_tool_utils::create_portable_typeface(), 23);
+ SkFont font(ToolUtils::create_portable_typeface(), 23);
SkScalar textW = font.measureText(kTxt, SK_ARRAY_COUNT(kTxt)-1, kUTF8_SkTextEncoding);
SkPaint txtPaint;
txtPaint.setColor(SK_ColorDKGRAY);