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

Commit 8fabc163 authored by android-build-team Robot's avatar android-build-team Robot Committed by Android (Google) Code Review
Browse files

Merge "don't reference (dead) DevKern"

parents c653803f 441e02e9

core/jni/android/graphics/Paint.cpp

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ namespace PaintGlue { 
        static_assert(1 <<  5 == SkPaint::kFakeBoldText_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 <<  8 == SkPaint::kDevKernText_Flag,           "paint_flags_mismatch");

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



        Paint* obj = new Paint();

libs/hwui/hwui/MinikinSkia.cpp

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

    // select only flags that might affect text layout

    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::kVerticalText_Flag);

    flags |= (hinting << 16);