SkShaper: optionally disable harfbuzz
also, re-enable warnings.
motivation: used by me for PDF testing.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2201153002
Review-Url: https://codereview.chromium.org/2201153002
diff --git a/tools/SkShaper.h b/tools/SkShaper.h
index 5aa93a7..bc78be7 100644
--- a/tools/SkShaper.h
+++ b/tools/SkShaper.h
@@ -17,8 +17,10 @@
class SkTextBlobBuilder;
/**
- Shapes text using harfbuzz and places the shaped text into a
+ Shapes text using HarfBuzz and places the shaped text into a
TextBlob.
+
+ If compiled without HarfBuzz, fall back on SkPaint::textToGlyphs.
*/
class SkShaper {
public:
diff --git a/tools/SkShaper.cpp b/tools/SkShaper_harfbuzz.cpp
similarity index 92%
rename from tools/SkShaper.cpp
rename to tools/SkShaper_harfbuzz.cpp
index 44dd8fc..29dd1b0 100644
--- a/tools/SkShaper.cpp
+++ b/tools/SkShaper_harfbuzz.cpp
@@ -23,7 +23,7 @@
size_t size = asset->getLength();
std::unique_ptr<hb_blob_t, HBFBlobDel> blob;
if (const void* base = asset->getMemoryBase()) {
- blob.reset(hb_blob_create((char*)base, size,
+ blob.reset(hb_blob_create((char*)base, SkToUInt(size),
HB_MEMORY_MODE_READONLY, asset.release(),
[](void* p) { delete (SkStreamAsset*)p; }));
} else {
@@ -31,7 +31,7 @@
SkAutoMalloc autoMalloc(size);
asset->read(autoMalloc.get(), size);
void* ptr = autoMalloc.get();
- blob.reset(hb_blob_create((char*)autoMalloc.release(), size,
+ blob.reset(hb_blob_create((char*)autoMalloc.release(), SkToUInt(size),
HB_MEMORY_MODE_READONLY, ptr, sk_free));
}
SkASSERT(blob);
@@ -116,8 +116,8 @@
for (unsigned i = 0; i < len; i++) {
runBuffer.glyphs[i] = info[i].codepoint;
reinterpret_cast<SkPoint*>(runBuffer.pos)[i] =
- SkPoint::Make(x + pos[i].x_offset * textSizeX,
- y - pos[i].y_offset * textSizeY);
+ SkPoint::Make(SkDoubleToScalar(x + pos[i].x_offset * textSizeX),
+ SkDoubleToScalar(y - pos[i].y_offset * textSizeY));
x += pos[i].x_advance * textSizeX;
y += pos[i].y_advance * textSizeY;
}
diff --git a/tools/SkShaper_primitive.cpp b/tools/SkShaper_primitive.cpp
new file mode 100644
index 0000000..65081b3
--- /dev/null
+++ b/tools/SkShaper_primitive.cpp
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2016 Google Inc.
+ *
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+#include "SkShaper.h"
+#include "SkStream.h"
+#include "SkTextBlob.h"
+#include "SkTypeface.h"
+
+struct SkShaper::Impl {
+ sk_sp<SkTypeface> fTypeface;
+};
+
+SkShaper::SkShaper(sk_sp<SkTypeface> tf) : fImpl(new Impl) {
+ fImpl->fTypeface = tf ? std::move(tf) : SkTypeface::MakeDefault();
+}
+
+SkShaper::~SkShaper() {}
+
+bool SkShaper::good() const { return true; }
+
+SkScalar SkShaper::shape(SkTextBlobBuilder* builder,
+ const SkPaint& srcPaint,
+ const char* utf8text,
+ size_t textBytes,
+ SkPoint point) const {
+ SkPaint paint(srcPaint);
+ paint.setTypeface(fImpl->fTypeface);
+ paint.setTextEncoding(SkPaint::kUTF8_TextEncoding);
+ int glyphCount = paint.countText(utf8text, textBytes);
+ if (glyphCount <= 0) {
+ return 0;
+ }
+ SkRect bounds;
+ (void)paint.measureText(utf8text, textBytes, &bounds);
+ paint.setTextEncoding(SkPaint::kGlyphID_TextEncoding);
+ const SkTextBlobBuilder::RunBuffer& runBuffer = builder->allocRunPosH(
+ paint, glyphCount, point.y(), &bounds);
+ paint.setTextEncoding(SkPaint::kUTF8_TextEncoding);
+ (void)paint.textToGlyphs(utf8text, textBytes, runBuffer.glyphs);
+ (void)paint.getTextWidths(utf8text, textBytes, runBuffer.pos);
+ SkScalar x = point.x();
+ for (int i = 0; i < glyphCount; ++i) {
+ SkScalar w = runBuffer.pos[i];
+ runBuffer.pos[i] = x;
+ x += w;
+ }
+ return (SkScalar)x;
+}
diff --git a/tools/using_skia_and_harfbuzz.cpp b/tools/using_skia_and_harfbuzz.cpp
index 7821034..f17a26d 100644
--- a/tools/using_skia_and_harfbuzz.cpp
+++ b/tools/using_skia_and_harfbuzz.cpp
@@ -134,7 +134,7 @@
glyph_paint.setColor(SK_ColorBLACK);
glyph_paint.setFlags(SkPaint::kAntiAlias_Flag |
SkPaint::kSubpixelText_Flag);
- glyph_paint.setTextSize(config->font_size.value);
+ glyph_paint.setTextSize(SkDoubleToScalar(config->font_size.value));
}
void WriteLine(const SkShaper& shaper, const char *text, size_t textBytes) {
@@ -142,8 +142,9 @@
if (pageCanvas) {
document->endPage();
}
- pageCanvas = document->beginPage(config->page_width.value,
- config->page_height.value);
+ pageCanvas = document->beginPage(
+ SkDoubleToScalar(config->page_width.value),
+ SkDoubleToScalar(config->page_height.value));
pageCanvas->drawPaint(white_paint);
current_x = config->left_margin.value;
current_y = config->line_spacing_ratio.value * config->font_size.value;
@@ -151,8 +152,9 @@
SkTextBlobBuilder textBlobBuilder;
shaper.shape(&textBlobBuilder, glyph_paint, text, textBytes, SkPoint{0, 0});
sk_sp<const SkTextBlob> blob(textBlobBuilder.build());
- pageCanvas->drawTextBlob(blob.get(), current_x, current_y, glyph_paint);
-
+ pageCanvas->drawTextBlob(
+ blob.get(), SkDoubleToScalar(current_x),
+ SkDoubleToScalar(current_y), glyph_paint);
// Advance to the next line.
current_y += config->line_spacing_ratio.value * config->font_size.value;
}