Merge f735319 into 8689a11

Author: samizdatco

modules/skparagraph/include/ParagraphStyle.h

@@ -84,7 +84,9 @@ struct ParagraphStyle {
                this->fEllipsisUtf16 == rhs.fEllipsisUtf16 &&
                this->fTextDirection == rhs.fTextDirection && this->fTextAlign == rhs.fTextAlign &&
                this->fDefaultTextStyle == rhs.fDefaultTextStyle &&
-               this->fReplaceTabCharacters == rhs.fReplaceTabCharacters;
+               this->fReplaceTabCharacters == rhs.fReplaceTabCharacters &&
+               this->fFakeMissingFontStyles == rhs.fFakeMissingFontStyles;
+
     }
 
     const StrutStyle& getStrutStyle() const { return fStrutStyle; }
@@ -121,6 +123,9 @@ struct ParagraphStyle {
     bool hintingIsOn() const { return fHintingIsOn; }
     void turnHintingOff() { fHintingIsOn = false; }
 
+    bool fakeMissingFontStyles() const { return fFakeMissingFontStyles; }
+    void setFakeMissingFontStyles(bool value) { fFakeMissingFontStyles = value; }
+
     bool getReplaceTabCharacters() const { return fReplaceTabCharacters; }
     void setReplaceTabCharacters(bool value) { fReplaceTabCharacters = value; }
 
@@ -139,6 +144,7 @@ struct ParagraphStyle {
     TextHeightBehavior fTextHeightBehavior;
     bool fHintingIsOn;
     bool fReplaceTabCharacters;
+    bool fFakeMissingFontStyles;
     bool fApplyRoundingHack = true;
 };
 }  // namespace textlayout

modules/skparagraph/src/OneLineShaper.cpp

@@ -657,17 +657,19 @@ bool OneLineShaper::shape() {
                 font.setHinting(block.fStyle.getFontHinting());
                 font.setSubpixel(block.fStyle.getSubpixel());
 
-                // Apply fake bold and/or italic settings to the font if the
-                // typeface's attributes do not match the intended font style.
-                int wantedWeight = block.fStyle.getFontStyle().weight();
-                bool fakeBold =
-                    wantedWeight >= SkFontStyle::kSemiBold_Weight &&
-                    wantedWeight - font.getTypeface()->fontStyle().weight() >= 200;
-                bool fakeItalic =
-                    block.fStyle.getFontStyle().slant() == SkFontStyle::kItalic_Slant &&
-                    font.getTypeface()->fontStyle().slant() != SkFontStyle::kItalic_Slant;
-                font.setEmbolden(fakeBold);
-                font.setSkewX(fakeItalic ? -SK_Scalar1 / 4 : 0);
+                if (fParagraph->paragraphStyle().fakeMissingFontStyles()) {
+                  // Apply fake bold and/or italic settings to the font if the
+                  // typeface's attributes do not match the intended font style.
+                  int wantedWeight = block.fStyle.getFontStyle().weight();
+                  bool fakeBold =
+                      wantedWeight >= SkFontStyle::kSemiBold_Weight &&
+                      wantedWeight - font.getTypeface()->fontStyle().weight() >= 200;
+                  bool fakeItalic =
+                      block.fStyle.getFontStyle().slant() == SkFontStyle::kItalic_Slant &&
+                      font.getTypeface()->fontStyle().slant() != SkFontStyle::kItalic_Slant;
+                  font.setEmbolden(fakeBold);
+                  font.setSkewX(fakeItalic ? -SK_Scalar1 / 4 : 0);
+                }
 
                 // Walk through all the currently unresolved blocks
                 // (ignoring those that appear later)

modules/skparagraph/src/ParagraphStyle.cpp

@@ -27,6 +27,7 @@ ParagraphStyle::ParagraphStyle() {
     fTextHeightBehavior = TextHeightBehavior::kAll;
     fHintingIsOn = true;
     fReplaceTabCharacters = false;
+    fFakeMissingFontStyles = true;
 }
 
 TextAlign ParagraphStyle::effective_align() const {