Revert "Making fontStyle and fixedPitch fields "virtual""

This reverts commit d1e1390. Reason for revert: Breaking the tree Original change's description: > Making fontStyle and fixedPitch fields "virtual" > > Change-Id: Ia8483ec76d887bdf384db4a534e9f0ec1effa49c > Reviewed-on: https://skia-review.googlesource.com/c/skia/+/923296 > Reviewed-by: Ben Wagner <[email protected]> > Commit-Queue: Julia Lavrova <[email protected]> Change-Id: I7517aea65e28c428527f2418ce0dd791e942c1f2 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://skia-review.googlesource.com/c/skia/+/923396 Bot-Commit: Rubber Stamper <[email protected]> Auto-Submit: Julia Lavrova <[email protected]> Reviewed-by: Ben Wagner <[email protected]> Commit-Queue: Ben Wagner <[email protected]>
google · Nov 21, 2024 · e4528e2 · e4528e2
1 parent d1e1390
commit e4528e2
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 42 deletions.
diff --git a/include/core/SkTypeface.h b/include/core/SkTypeface.h
@@ -53,18 +53,20 @@ typedef uint32_t SkFontTableTag;
 class SK_API SkTypeface : public SkWeakRefCnt {
 public:
     /** Returns the typeface's intrinsic style attributes. */
-    SkFontStyle fontStyle() const;
+    SkFontStyle fontStyle() const {
+        return fStyle;
+    }
 
     /** Returns true if style() has the kBold bit set. */
-    bool isBold() const;
+    bool isBold() const { return fStyle.weight() >= SkFontStyle::kSemiBold_Weight; }
 
     /** Returns true if style() has the kItalic bit set. */
-    bool isItalic() const;
+    bool isItalic() const { return fStyle.slant() != SkFontStyle::kUpright_Slant; }
 
     /** Returns true if the typeface claims to be fixed-pitch.
      *  This is a style bit, advance widths may vary even if this returns true.
      */
-    bool isFixedPitch() const;
+    bool isFixedPitch() const { return fIsFixedPitch; }
 
     /** Copy into 'coordinates' (allocated by the caller) the design variation coordinates.
      *
@@ -361,10 +363,6 @@ class SK_API SkTypeface : public SkWeakRefCnt {
     /** Sets the font style. If used, must be called in the constructor. */
     void setFontStyle(SkFontStyle style) { fStyle = style; }
 
-    virtual SkFontStyle onGetFontStyle() const; // TODO: = 0;
-
-    virtual bool onGetFixedPitch() const; // TODO: = 0;
-
     // Must return a valid scaler context. It can not return nullptr.
     virtual std::unique_ptr<SkScalerContext> onCreateScalerContext(const SkScalerContextEffects&,
                                                                    const SkDescriptor*) const = 0;

diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp
@@ -480,30 +480,6 @@ int SkTypeface::onGetResourceName(SkString* resourceName) const {
     return 0;
 }
 
-SkFontStyle SkTypeface::fontStyle() const {
-    return this->onGetFontStyle();
-}
-
-SkFontStyle SkTypeface::onGetFontStyle() const {
-    return fStyle;
-}
-
-bool SkTypeface::isBold() const {
-    return this->onGetFontStyle().weight() >= SkFontStyle::kSemiBold_Weight;
-}
-
-bool SkTypeface::isItalic() const {
-    return this->onGetFontStyle().slant() != SkFontStyle::kUpright_Slant;
-}
-
-bool SkTypeface::isFixedPitch() const {
-    return this->onGetFixedPitch();
-}
-
-bool SkTypeface::onGetFixedPitch() const {
-    return fIsFixedPitch;
-}
-
 void SkTypeface::getGlyphToUnicodeMap(SkUnichar* dst) const {
     sk_bzero(dst, sizeof(SkUnichar) * this->countGlyphs());
 }

diff --git a/src/ports/SkTypeface_proxy.cpp b/src/ports/SkTypeface_proxy.cpp
@@ -35,14 +35,6 @@ int SkTypeface_proxy::onGetVariationDesignParameters(SkFontParameters::Variation
     return fProxy->onGetVariationDesignParameters(parameters, parameterCount);
 }
 
-SkFontStyle SkTypeface_proxy::onGetFontStyle() const {
-    return fProxy->onGetFontStyle();
-}
-
-bool SkTypeface_proxy::onGetFixedPitch() const {
-    return fProxy->onGetFixedPitch();
-}
-
 void SkTypeface_proxy::onGetFamilyName(SkString* familyName) const {
     fProxy->onGetFamilyName(familyName);
 }

diff --git a/src/ports/SkTypeface_proxy.h b/src/ports/SkTypeface_proxy.h
@@ -54,8 +54,6 @@ class SkTypeface_proxy : public SkTypeface {
                                      int coordinateCount) const override;
     int onGetVariationDesignParameters(SkFontParameters::Variation::Axis parameters[],
                                        int parameterCount) const override;
-    SkFontStyle onGetFontStyle() const override;
-    bool onGetFixedPitch() const override;
     void onGetFamilyName(SkString* familyName) const override;
     bool onGetPostScriptName(SkString* postScriptName) const override;
     int onGetResourceName(SkString* resourceName) const override;