Adding code to calculate Underline Thickness from Font Metrics, this will be useful when Skia is us…

src/core/SkPaint.cpp

 
 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPaint.h"
 #include "SkAnnotation.h"
@@ skipping 1278 matching lines @@
     if (scale) {
         metrics->fTop = SkScalarMul(metrics->fTop, scale);
         metrics->fAscent = SkScalarMul(metrics->fAscent, scale);
         metrics->fDescent = SkScalarMul(metrics->fDescent, scale);
         metrics->fBottom = SkScalarMul(metrics->fBottom, scale);
         metrics->fLeading = SkScalarMul(metrics->fLeading, scale);
         metrics->fAvgCharWidth = SkScalarMul(metrics->fAvgCharWidth, scale);
         metrics->fXMin = SkScalarMul(metrics->fXMin, scale);
         metrics->fXMax = SkScalarMul(metrics->fXMax, scale);
         metrics->fXHeight = SkScalarMul(metrics->fXHeight, scale);
+        metrics->fUnderlineThickness = SkScalarMul(metrics->fUnderlineThickness, scale);
+        metrics->fUnderlinePosition = SkScalarMul(metrics->fUnderlinePosition, scale);
     }
     return metrics->fDescent - metrics->fAscent + metrics->fLeading;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static void set_bounds(const SkGlyph& g, SkRect* bounds, SkScalar scale) {
     bounds->set(g.fLeft * scale,
                 g.fTop * scale,
                 (g.fLeft + g.fWidth) * scale,
@@ skipping 941 matching lines @@
         this->getMaskFilter()->computeFastBounds(*storage, storage);
     }
 
     if (this->getImageFilter()) {
         this->getImageFilter()->computeFastBounds(*storage, storage);
     }
 
     return *storage;
 }
 
+void SkPaint::FontMetrics::setFontMetricsFlag(FontMetrics::FontMetricsFlags flag)
+{

[bungeman-skia, 2014/02/19 15:39:17]

Style nit: we usually put this '{' at the end of the line above.

[h.joshi, 2014/02/19 17:12:03]

Will make changes
On 2014/02/19 15:39:17, bungeman1 wrote:

+    this->fFontMetricsFlag = this->fFontMetricsFlag | flag;

[bungeman-skia, 2014/02/19 15:39:17]

This might be clearer like

fFontMetricsFlag |= flag;

[h.joshi, 2014/02/19 17:12:03]

Will make changes
On 2014/02/19 15:39:17, bungeman1 wrote:

+}
+
+void SkPaint::FontMetrics::unsetFontMetricsFlag(FontMetrics::FontMetricsFlags flag)
+{
+    this->fFontMetricsFlag = this->fFontMetricsFlag ^ flag;

[bungeman-skia, 2014/02/19 15:39:17]

This will toggle, not unset. Also, since members begin with the 'f' prefix in
Skia, the 'this->' is unnecessary.

fFontMetricsFlag &= ~flag;

[h.joshi, 2014/02/19 17:12:03]

Will make changes
On 2014/02/19 15:39:17, bungeman1 wrote:

+}
+
+bool SkPaint::FontMetrics::checkFontMetricsFlag(FontMetrics::FontMetricsFlags flag) const
+{
+   return SkToBool(this->fFontMetricsFlag & flag);
+}
+
 #ifdef SK_DEVELOPER
 void SkPaint::toString(SkString* str) const {
     str->append("<dl><dt>SkPaint:</dt><dd><dl>");
 
     SkTypeface* typeface = this->getTypeface();
     if (NULL != typeface) {
         SkDynamicMemoryWStream ostream;
         typeface->serialize(&ostream);
         SkAutoTUnref<SkData> data(ostream.copyToData());
 
@@ skipping 273 matching lines @@
             case SkXfermode::kPlus_Mode:
                 return 0 == this->getAlpha();
             case SkXfermode::kDst_Mode:
                 return true;
             default:
                 break;
         }
     }
     return false;
 }