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

Commit 240d52cb authored by Derek Sollenberger's avatar Derek Sollenberger Committed by Android (Google) Code Review
Browse files

Merge "Fix DrawFilter's usage in HWUI."

parents 96198845 0b860626

core/jni/android/graphics/Paint.cpp

+10 −0
Original line number Diff line number Diff line
@@ -101,6 +101,16 @@ public: 
    }



    static jlong init(JNIEnv* env, jobject clazz) {

        SK_COMPILE_ASSERT(1 <<  0 == SkPaint::kAntiAlias_Flag,          paint_flags_mismatch);

        SK_COMPILE_ASSERT(1 <<  2 == SkPaint::kDither_Flag,             paint_flags_mismatch);

        SK_COMPILE_ASSERT(1 <<  3 == SkPaint::kUnderlineText_Flag,      paint_flags_mismatch);

        SK_COMPILE_ASSERT(1 <<  4 == SkPaint::kStrikeThruText_Flag,     paint_flags_mismatch);

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

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

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

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

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



        Paint* obj = new Paint();

        defaultSettingsForAndroid(obj);

        return reinterpret_cast<jlong>(obj);

libs/hwui/DisplayListRenderer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -484,7 +484,7 @@ void DisplayListRenderer::drawRects(const float* rects, int count, const SkPaint 
}



void DisplayListRenderer::setDrawFilter(SkDrawFilter* filter) {

    mDrawFilter.reset(filter);

    mDrawFilter.reset(SkSafeRef(filter));

}



void DisplayListRenderer::insertReorderBarrier(bool enableReorder) {

libs/hwui/DisplayListRenderer.h

+2 −1
Original line number Diff line number Diff line
@@ -296,8 +296,9 @@ private: 
        // so that we don't need to modify the paint every time we access it.

        SkTLazy<SkPaint> filteredPaint;

        if (mDrawFilter.get()) {

            paint = filteredPaint.init();

            filteredPaint.set(*paint);

            mDrawFilter->filter(filteredPaint.get(), SkDrawFilter::kPaint_Type);

            paint = filteredPaint.get();

        }



        // compute the hash key for the paint and check the cache.