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/bmpfilterqualityrepeat.cpp b/gm/bmpfilterqualityrepeat.cpp
index ba41c3a..ee4529f 100644
--- a/gm/bmpfilterqualityrepeat.cpp
+++ b/gm/bmpfilterqualityrepeat.cpp
@@ -5,8 +5,8 @@
* found in the LICENSE file.
*/
+#include "ToolUtils.h"
#include "gm.h"
-#include "sk_tool_utils.h"
#include "SkShader.h"
@@ -15,7 +15,7 @@
// the bmp filter respects the repeat mode at the tile seams.
class BmpFilterQualityRepeat : public skiagm::GM {
public:
- BmpFilterQualityRepeat() { this->setBGColor(sk_tool_utils::color_to_565(0xFFCCBBAA)); }
+ BmpFilterQualityRepeat() { this->setBGColor(ToolUtils::color_to_565(0xFFCCBBAA)); }
protected:
@@ -26,11 +26,11 @@
colorBmp.allocN32Pixels(20, 20, true);
colorBmp.eraseColor(0xFFFF0000);
canvas.drawBitmap(colorBmp, 0, 0);
- colorBmp.eraseColor(sk_tool_utils::color_to_565(0xFF008200));
+ colorBmp.eraseColor(ToolUtils::color_to_565(0xFF008200));
canvas.drawBitmap(colorBmp, 20, 0);
- colorBmp.eraseColor(sk_tool_utils::color_to_565(0xFFFF9000));
+ colorBmp.eraseColor(ToolUtils::color_to_565(0xFFFF9000));
canvas.drawBitmap(colorBmp, 0, 20);
- colorBmp.eraseColor(sk_tool_utils::color_to_565(0xFF2000FF));
+ colorBmp.eraseColor(ToolUtils::color_to_565(0xFF2000FF));
canvas.drawBitmap(colorBmp, 20, 20);
}
@@ -68,7 +68,7 @@
SkPaint bmpPaint(textPaint);
- SkFont font(sk_tool_utils::create_portable_typeface());
+ SkFont font(ToolUtils::create_portable_typeface());
SkAutoCanvasRestore acr(canvas, true);