Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 441e02e9 authored by Mike Reed's avatar Mike Reed
Browse files

don't reference (dead) DevKern 

This field is not respected in Android, so we want to remove it from Skia.

Test: make

Change-Id: If410265a31c04f283098ac55727c4a12bf717ac1
parent f4c79874

core/jni/android/graphics/Paint.cpp

+0 −1
Original line number Original line Diff line number Diff line
@@ -93,7 +93,6 @@ namespace PaintGlue { 
        static_assert(1 <<  5 == SkPaint::kFakeBoldText_Flag,          "paint_flags_mismatch");

        static_assert(1 <<  5 == SkPaint::kFakeBoldText_Flag,          "paint_flags_mismatch");

        static_assert(1 <<  6 == SkPaint::kLinearText_Flag,            "paint_flags_mismatch");

        static_assert(1 <<  6 == SkPaint::kLinearText_Flag,            "paint_flags_mismatch");

        static_assert(1 <<  7 == SkPaint::kSubpixelText_Flag,          "paint_flags_mismatch");

        static_assert(1 <<  7 == SkPaint::kSubpixelText_Flag,          "paint_flags_mismatch");

        static_assert(1 <<  8 == SkPaint::kDevKernText_Flag,           "paint_flags_mismatch");

        static_assert(1 << 10 == SkPaint::kEmbeddedBitmapText_Flag,    "paint_flags_mismatch");

        static_assert(1 << 10 == SkPaint::kEmbeddedBitmapText_Flag,    "paint_flags_mismatch");





        Paint* obj = new Paint();

        Paint* obj = new Paint();

libs/hwui/hwui/MinikinSkia.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -135,7 +135,7 @@ uint32_t MinikinFontSkia::packPaintFlags(const SkPaint* paint) { 
    SkPaint::Hinting hinting = paint->getHinting();

    SkPaint::Hinting hinting = paint->getHinting();

    // select only flags that might affect text layout

    // select only flags that might affect text layout

    flags &= (SkPaint::kAntiAlias_Flag | SkPaint::kFakeBoldText_Flag | SkPaint::kLinearText_Flag |

    flags &= (SkPaint::kAntiAlias_Flag | SkPaint::kFakeBoldText_Flag | SkPaint::kLinearText_Flag |

              SkPaint::kSubpixelText_Flag | SkPaint::kDevKernText_Flag |

              SkPaint::kSubpixelText_Flag |

              SkPaint::kEmbeddedBitmapText_Flag | SkPaint::kAutoHinting_Flag |

              SkPaint::kEmbeddedBitmapText_Flag | SkPaint::kAutoHinting_Flag |

              SkPaint::kVerticalText_Flag);

              SkPaint::kVerticalText_Flag);

    flags |= (hinting << 16);

    flags |= (hinting << 16);