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/samplecode/SampleChineseFling.cpp b/samplecode/SampleChineseFling.cpp
index b123942..d5e2479 100644
--- a/samplecode/SampleChineseFling.cpp
+++ b/samplecode/SampleChineseFling.cpp
@@ -7,7 +7,7 @@
#include "Resources.h"
#include "Sample.h"
-#include "sk_tool_utils.h"
+#include "ToolUtils.h"
#include "SkCanvas.h"
#include "SkFontMetrics.h"
@@ -92,8 +92,13 @@
this->createRandomWord(glyphs);
SkTextBlobBuilder builder;
- sk_tool_utils::add_to_text_blob_w_len(&builder, (const char*) glyphs, kWordLength*4,
- kUTF32_SkTextEncoding, font, 0, 0);
+ ToolUtils::add_to_text_blob_w_len(&builder,
+ (const char*)glyphs,
+ kWordLength * 4,
+ kUTF32_SkTextEncoding,
+ font,
+ 0,
+ 0);
fBlobs.emplace_back(builder.make());
}
@@ -216,9 +221,13 @@
auto currentLineLength = SkTMin(45, paragraphLength - 45);
this->createRandomLine(glyphs, currentLineLength);
- sk_tool_utils::add_to_text_blob_w_len(&builder, (const char*) glyphs,
- currentLineLength*4, kUTF32_SkTextEncoding,
- font, 0, y);
+ ToolUtils::add_to_text_blob_w_len(&builder,
+ (const char*)glyphs,
+ currentLineLength * 4,
+ kUTF32_SkTextEncoding,
+ font,
+ 0,
+ y);
y += fMetrics.fDescent - fMetrics.fAscent + fMetrics.fLeading;
paragraphLength -= 45;
}