From 2feefdd3d59c87d88949e09aab90989f010d1fa1 Mon Sep 17 00:00:00 2001
From: Brian Osman <brianosman@google.com>
Date: Fri, 8 Dec 2017 13:12:35 -0500
Subject: [PATCH] Remove SkToBool usage

---
 third_party/txt/src/txt/paragraph.cc | 30 +++++++++++++---------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/third_party/txt/src/txt/paragraph.cc b/third_party/txt/src/txt/paragraph.cc
index 468661f2429f4..f72b347b1025d 100644
--- a/third_party/txt/src/txt/paragraph.cc
+++ b/third_party/txt/src/txt/paragraph.cc
@@ -763,8 +763,8 @@ void Paragraph::PaintDecorations(SkCanvas* canvas,
   }
 
   paint.setStrokeWidth(
-      (SkToBool(metrics.fFlags & SkPaint::FontMetrics::FontMetricsFlags::
-                                     kUnderlineThicknessIsValid_Flag))
+      (metrics.fFlags &
+       SkPaint::FontMetrics::FontMetricsFlags::kUnderlineThicknessIsValid_Flag)
           ? metrics.fUnderlineThickness *
                 record.style().decoration_thickness_multiplier
           // Backup value if the fUnderlineThickness metric is not available:
@@ -833,11 +833,10 @@ void Paragraph::PaintDecorations(SkCanvas* canvas,
     double y_offset_original = y_offset;
     // Underline
     if (record.style().decoration & 0x1) {
-      y_offset +=
-          (SkToBool(metrics.fFlags & SkPaint::FontMetrics::FontMetricsFlags::
-                                         kUnderlinePositionIsValid_Flag))
-              ? metrics.fUnderlinePosition
-              : metrics.fUnderlineThickness;
+      y_offset += (metrics.fFlags & SkPaint::FontMetrics::FontMetricsFlags::
+                                        kUnderlinePositionIsValid_Flag)
+                      ? metrics.fUnderlinePosition
+                      : metrics.fUnderlineThickness;
       if (record.style().decoration_style != TextDecorationStyle::kWavy) {
         canvas->drawLine(x, y + y_offset, x + width, y + y_offset, paint);
       } else {
@@ -863,20 +862,19 @@ void Paragraph::PaintDecorations(SkCanvas* canvas,
     }
     // Strikethrough
     if (record.style().decoration & 0x4) {
-      if (SkToBool(metrics.fFlags & SkPaint::FontMetrics::FontMetricsFlags::
-                                        kStrikeoutThicknessIsValid_Flag))
+      if (metrics.fFlags & SkPaint::FontMetrics::FontMetricsFlags::
+                               kStrikeoutThicknessIsValid_Flag)
         paint.setStrokeWidth(metrics.fStrikeoutThickness *
                              record.style().decoration_thickness_multiplier);
       // Make sure the double line is "centered" vertically.
       y_offset += (decoration_count - 1.0) * metrics.fUnderlineThickness *
                   kDoubleDecorationSpacing / -2.0;
-      y_offset +=
-          (SkToBool(metrics.fFlags & SkPaint::FontMetrics::FontMetricsFlags::
-                                         kStrikeoutThicknessIsValid_Flag))
-              ? metrics.fStrikeoutPosition
-              // Backup value if the strikeoutposition metric is not
-              // available:
-              : metrics.fXHeight / -2.0;
+      y_offset += (metrics.fFlags & SkPaint::FontMetrics::FontMetricsFlags::
+                                        kStrikeoutThicknessIsValid_Flag)
+                      ? metrics.fStrikeoutPosition
+                      // Backup value if the strikeoutposition metric is not
+                      // available:
+                      : metrics.fXHeight / -2.0;
       if (record.style().decoration_style != TextDecorationStyle::kWavy) {
         canvas->drawLine(x, y + y_offset, x + width, y + y_offset, paint);
       } else {