commit 13cba49982ea3a4032dc78f2b61d7c1968d4b8eb
author halcanary <halcanary@google.com> Wed Aug 03 10:43:55 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed Aug 03 10:43:55 2016 -0700
tree 506ff4cd66448e3ef1ccae3e76a75914023e8edf
parent bc20a701d8bd3df9d8cf8a20eeb17c3f90c99364

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

tools/using_skia_and_harfbuzz.cpp

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;
     }