aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gyp/common_conditions.gypi1
-rw-r--r--include/core/SkPaint.h17
-rw-r--r--src/core/SkPaint.cpp33
-rw-r--r--src/core/SkScalerContext.h3
-rw-r--r--src/ports/SkFontHost_FreeType.cpp25
5 files changed, 2 insertions, 77 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index e046b133d8..211aa128c3 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -3,7 +3,6 @@
{
'defines': [
'SK_ALLOW_STATIC_GLOBAL_INITIALIZERS=<(skia_static_initializers)',
-# 'SK_SUPPORT_HINTING_SCALE_FACTOR',
],
'conditions' : [
[ 'skia_gpu == 1',
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index fa0c61e4ea..52321ddaf6 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -717,20 +717,6 @@ public:
*/
void setTextSkewX(SkScalar skewX);
-#ifdef SK_SUPPORT_HINTING_SCALE_FACTOR
- /** Return the paint's scale factor used for correctly rendering
- glyphs in high DPI mode without text subpixel positioning.
- @return the scale factor used for rendering glyphs in high DPI mode.
- */
- SkScalar getHintingScaleFactor() const { return fHintingScaleFactor; }
-
- /** Set the paint's scale factor used for correctly rendering
- glyphs in high DPI mode without text subpixel positioning.
- @param the scale factor used for rendering glyphs in high DPI mode.
- */
- void setHintingScaleFactor(SkScalar hintingScaleFactor);
-#endif
-
/** Describes how to interpret the text parameters that are passed to paint
methods like measureText() and getTextWidths().
*/
@@ -998,9 +984,6 @@ private:
SkScalar fTextSize;
SkScalar fTextScaleX;
SkScalar fTextSkewX;
-#ifdef SK_SUPPORT_HINTING_SCALE_FACTOR
- SkScalar fHintingScaleFactor;
-#endif
SkPathEffect* fPathEffect;
SkShader* fShader;
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index 372e68051e..df8b292ced 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -70,9 +70,6 @@ SkPaint::SkPaint() {
fTextSize = SkPaintDefaults_TextSize;
fTextScaleX = SK_Scalar1;
-#ifdef SK_SUPPORT_HINTING_SCALE_FACTOR
- fHintingScaleFactor = SK_Scalar1;
-#endif
fColor = SK_ColorBLACK;
fMiterLimit = SkPaintDefaults_MiterLimit;
fFlags = SkPaintDefaults_Flags;
@@ -389,13 +386,6 @@ void SkPaint::setTextSkewX(SkScalar skewX) {
fTextSkewX = skewX;
}
-#ifdef SK_SUPPORT_HINTING_SCALE_FACTOR
-void SkPaint::setHintingScaleFactor(SkScalar hintingScaleFactor) {
- GEN_ID_INC_EVAL(hintingScaleFactor != fHintingScaleFactor);
- fHintingScaleFactor = hintingScaleFactor;
-}
-#endif
-
void SkPaint::setTextEncoding(TextEncoding encoding) {
if ((unsigned)encoding <= kGlyphID_TextEncoding) {
GEN_ID_INC_EVAL((unsigned)encoding != fTextEncoding);
@@ -1594,9 +1584,6 @@ void SkScalerContext::MakeRec(const SkPaint& paint,
rec->fTextSize = paint.getTextSize();
rec->fPreScaleX = paint.getTextScaleX();
rec->fPreSkewX = paint.getTextSkewX();
-#ifdef SK_SUPPORT_HINTING_SCALE_FACTOR
- rec->fHintingScaleFactor = paint.getHintingScaleFactor();
-#endif
if (deviceMatrix) {
rec->fPost2x2[0][0] = sk_relax(deviceMatrix->getScaleX());
@@ -2058,12 +2045,8 @@ void SkPaint::flatten(SkFlattenableWriteBuffer& buffer) const {
ptr = write_scalar(ptr, this->getTextSize());
ptr = write_scalar(ptr, this->getTextScaleX());
ptr = write_scalar(ptr, this->getTextSkewX());
-#ifdef SK_SUPPORT_HINTING_SCALE_FACTOR
- ptr = write_scalar(ptr, this->getHintingScaleFactor());
-#else
- // Dummy value.
+ // Dummy value for obsolete hinting scale factor. TODO: remove with next picture version
ptr = write_scalar(ptr, SK_Scalar1);
-#endif
ptr = write_scalar(ptr, this->getStrokeWidth());
ptr = write_scalar(ptr, this->getStrokeMiter());
*ptr++ = this->getColor();
@@ -2080,12 +2063,8 @@ void SkPaint::flatten(SkFlattenableWriteBuffer& buffer) const {
buffer.writeScalar(fTextSize);
buffer.writeScalar(fTextScaleX);
buffer.writeScalar(fTextSkewX);
-#ifdef SK_SUPPORT_HINTING_SCALE_FACTOR
- buffer.writeScalar(fHintingScaleFactor);
-#else
- // Dummy value.
+ // Dummy value for obsolete hinting scale factor. TODO: remove with next picture version
buffer.writeScalar(SK_Scalar1);
-#endif
buffer.writeScalar(fWidth);
buffer.writeScalar(fMiterLimit);
buffer.writeColor(fColor);
@@ -2131,12 +2110,8 @@ void SkPaint::unflatten(SkFlattenableReadBuffer& buffer) {
this->setTextSize(read_scalar(pod));
this->setTextScaleX(read_scalar(pod));
this->setTextSkewX(read_scalar(pod));
-#ifdef SK_SUPPORT_HINTING_SCALE_FACTOR
- this->setHintingScaleFactor(read_scalar(pod));
-#else
// Skip the hinting scalar factor, which is not supported.
read_scalar(pod);
-#endif
this->setStrokeWidth(read_scalar(pod));
this->setStrokeMiter(read_scalar(pod));
this->setColor(*pod++);
@@ -2163,12 +2138,8 @@ void SkPaint::unflatten(SkFlattenableReadBuffer& buffer) {
this->setTextSize(buffer.readScalar());
this->setTextScaleX(buffer.readScalar());
this->setTextSkewX(buffer.readScalar());
-#ifdef SK_SUPPORT_HINTING_SCALE_FACTOR
- this->setHintingScaleFactor(buffer.readScalar());
-#else
// Skip the hinting scalar factor, which is not supported.
buffer.readScalar();
-#endif
this->setStrokeWidth(buffer.readScalar());
this->setStrokeMiter(buffer.readScalar());
this->setColor(buffer.readColor());
diff --git a/src/core/SkScalerContext.h b/src/core/SkScalerContext.h
index 52707a387c..2820b5ac2d 100644
--- a/src/core/SkScalerContext.h
+++ b/src/core/SkScalerContext.h
@@ -34,9 +34,6 @@ struct SkScalerContextRec {
SkScalar fTextSize, fPreScaleX, fPreSkewX;
SkScalar fPost2x2[2][2];
SkScalar fFrameWidth, fMiterLimit;
-#ifdef SK_SUPPORT_HINTING_SCALE_FACTOR
- SkScalar fHintingScaleFactor;
-#endif
//These describe the parameters to create (uniquely identify) the pre-blend.
uint32_t fLumBits;
diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp
index 3a8a1ae207..8d6c4d0cb3 100644
--- a/src/ports/SkFontHost_FreeType.cpp
+++ b/src/ports/SkFontHost_FreeType.cpp
@@ -794,34 +794,9 @@ SkScalerContext_FreeType::SkScalerContext_FreeType(SkTypeface* typeface,
fMatrix22.xx = fMatrix22.yy = SK_Fixed1;
fMatrix22.xy = fMatrix22.yx = 0;
}
-
-#ifdef SK_SUPPORT_HINTING_SCALE_FACTOR
- if (fRec.getHinting() == SkPaint::kNo_Hinting) {
- fScale.set(sx, sy);
- fScaleX = SkScalarToFixed(sx);
- fScaleY = SkScalarToFixed(sy);
- } else {
- SkScalar hintingScaleFactor = fRec.fHintingScaleFactor;
-
- fScale.set(sx / hintingScaleFactor, sy / hintingScaleFactor);
- fScaleX = SkScalarToFixed(fScale.fX);
- fScaleY = SkScalarToFixed(fScale.fY);
-
- fMatrix22.xx *= hintingScaleFactor;
- fMatrix22.xy *= hintingScaleFactor;
- fMatrix22.yx *= hintingScaleFactor;
- fMatrix22.yy *= hintingScaleFactor;
-
- fMatrix22Scalar.setScaleX(fMatrix22Scalar.getScaleX() * hintingScaleFactor);
- fMatrix22Scalar.setSkewX(fMatrix22Scalar..getSkewX() * hintingScaleFactor);
- fMatrix22Scalar.setSkewY(fMatrix22Scalar..getSkewY() * hintingScaleFactor);
- fMatrix22Scalar.setScaleY(fMatrix22Scalar..getScaleY() * hintingScaleFactor);
- }
-#else
fScale.set(sx, sy);
fScaleX = SkScalarToFixed(sx);
fScaleY = SkScalarToFixed(sy);
-#endif
fLCDIsVert = SkToBool(fRec.fFlags & SkScalerContext::kLCD_Vertical_Flag);
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-04 07:38:51 +0000