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

Commit e3a40ea4 authored by Ben Wagner's avatar Ben Wagner
Browse files

Use static_assert instead of SK_COMPILE_ASSERT. 

Now that static_assert is allowed, there is no need to use a non-
standard compile time assertion.

Change-Id: I0b294efcf494983f8241e9d5a2c476e2f2a9fff0
parent e264f9a5

core/jni/android/graphics/Paint.cpp

+9 −9
Original line number Diff line number Diff line
@@ -112,15 +112,15 @@ 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);

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

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

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

        static_assert(1 <<  4 == SkPaint::kStrikeThruText_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 <<  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();

        defaultSettingsForAndroid(obj);

core/jni/android/graphics/PorterDuff.cpp

+20 −20
Original line number Diff line number Diff line
@@ -33,24 +33,24 @@ public: 


    static jlong CreateXfermode(JNIEnv* env, jobject, jint modeHandle) {

        // validate that the Java enum values match our expectations

        SK_COMPILE_ASSERT(0  == SkXfermode::kClear_Mode,    xfermode_mismatch);

        SK_COMPILE_ASSERT(1  == SkXfermode::kSrc_Mode,      xfermode_mismatch);

        SK_COMPILE_ASSERT(2  == SkXfermode::kDst_Mode,      xfermode_mismatch);

        SK_COMPILE_ASSERT(3  == SkXfermode::kSrcOver_Mode,  xfermode_mismatch);

        SK_COMPILE_ASSERT(4  == SkXfermode::kDstOver_Mode,  xfermode_mismatch);

        SK_COMPILE_ASSERT(5  == SkXfermode::kSrcIn_Mode,    xfermode_mismatch);

        SK_COMPILE_ASSERT(6  == SkXfermode::kDstIn_Mode,    xfermode_mismatch);

        SK_COMPILE_ASSERT(7  == SkXfermode::kSrcOut_Mode,   xfermode_mismatch);

        SK_COMPILE_ASSERT(8  == SkXfermode::kDstOut_Mode,   xfermode_mismatch);

        SK_COMPILE_ASSERT(9  == SkXfermode::kSrcATop_Mode,  xfermode_mismatch);

        SK_COMPILE_ASSERT(10 == SkXfermode::kDstATop_Mode,  xfermode_mismatch);

        SK_COMPILE_ASSERT(11 == SkXfermode::kXor_Mode,      xfermode_mismatch);

        SK_COMPILE_ASSERT(16 == SkXfermode::kDarken_Mode,   xfermode_mismatch);

        SK_COMPILE_ASSERT(17 == SkXfermode::kLighten_Mode,  xfermode_mismatch);

        SK_COMPILE_ASSERT(13 == SkXfermode::kModulate_Mode, xfermode_mismatch);

        SK_COMPILE_ASSERT(14 == SkXfermode::kScreen_Mode,   xfermode_mismatch);

        SK_COMPILE_ASSERT(12 == SkXfermode::kPlus_Mode,     xfermode_mismatch);

        SK_COMPILE_ASSERT(15 == SkXfermode::kOverlay_Mode,  xfermode_mismatch);

        static_assert(0  == SkXfermode::kClear_Mode,    "xfermode_mismatch");

        static_assert(1  == SkXfermode::kSrc_Mode,      "xfermode_mismatch");

        static_assert(2  == SkXfermode::kDst_Mode,      "xfermode_mismatch");

        static_assert(3  == SkXfermode::kSrcOver_Mode,  "xfermode_mismatch");

        static_assert(4  == SkXfermode::kDstOver_Mode,  "xfermode_mismatch");

        static_assert(5  == SkXfermode::kSrcIn_Mode,    "xfermode_mismatch");

        static_assert(6  == SkXfermode::kDstIn_Mode,    "xfermode_mismatch");

        static_assert(7  == SkXfermode::kSrcOut_Mode,   "xfermode_mismatch");

        static_assert(8  == SkXfermode::kDstOut_Mode,   "xfermode_mismatch");

        static_assert(9  == SkXfermode::kSrcATop_Mode,  "xfermode_mismatch");

        static_assert(10 == SkXfermode::kDstATop_Mode,  "xfermode_mismatch");

        static_assert(11 == SkXfermode::kXor_Mode,      "xfermode_mismatch");

        static_assert(16 == SkXfermode::kDarken_Mode,   "xfermode_mismatch");

        static_assert(17 == SkXfermode::kLighten_Mode,  "xfermode_mismatch");

        static_assert(13 == SkXfermode::kModulate_Mode, "xfermode_mismatch");

        static_assert(14 == SkXfermode::kScreen_Mode,   "xfermode_mismatch");

        static_assert(12 == SkXfermode::kPlus_Mode,     "xfermode_mismatch");

        static_assert(15 == SkXfermode::kOverlay_Mode,  "xfermode_mismatch");



        SkXfermode::Mode mode = static_cast<SkXfermode::Mode>(modeHandle);

        return reinterpret_cast<jlong>(SkXfermode::Create(mode));

libs/hwui/SkiaCanvas.cpp

+1 −1
Original line number Diff line number Diff line
@@ -702,7 +702,7 @@ void SkiaCanvas::drawText(const uint16_t* text, const float* positions, int coun 
    SkPaint paintCopy(paint);

    paintCopy.setTextAlign(SkPaint::kLeft_Align);



    SK_COMPILE_ASSERT(sizeof(SkPoint) == sizeof(float)*2, SkPoint_is_no_longer_2_floats);

    static_assert(sizeof(SkPoint) == sizeof(float)*2, "SkPoint is no longer two floats");

    mCanvas->drawPosText(text, count << 1, reinterpret_cast<const SkPoint*>(positions), paintCopy);

}

libs/hwui/SkiaCanvasProxy.cpp

+4 −4
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ void SkiaCanvasProxy::onDrawPoints(PointMode pointMode, size_t count, const SkPo 
    }



    // convert the SkPoints into floats

    SK_COMPILE_ASSERT(sizeof(SkPoint) == sizeof(float)*2, SkPoint_is_no_longer_2_floats);

    static_assert(sizeof(SkPoint) == sizeof(float)*2, "SkPoint is no longer two floats");

    const size_t floatCount = count << 1;

    const float* floatArray = &pts[0].fX;
@@ -154,7 +154,7 @@ void SkiaCanvasProxy::onDrawVertices(VertexMode mode, int vertexCount, const SkP 
        return;

    }

    // convert the SkPoints into floats

    SK_COMPILE_ASSERT(sizeof(SkPoint) == sizeof(float)*2, SkPoint_is_no_longer_2_floats);

    static_assert(sizeof(SkPoint) == sizeof(float)*2, "SkPoint is no longer two floats");

    const int floatCount = vertexCount << 1;

    const float* vArray = &vertices[0].fX;

    const float* tArray = (texs) ? &texs[0].fX : NULL;
@@ -286,7 +286,7 @@ void SkiaCanvasProxy::onDrawText(const void* text, size_t byteLength, SkScalar x 
        }

    }



    SK_COMPILE_ASSERT(sizeof(SkPoint) == sizeof(float)*2, SkPoint_is_no_longer_2_floats);

    static_assert(sizeof(SkPoint) == sizeof(float)*2, "SkPoint is no longer two floats");

    mCanvas->drawText(glyphs.glyphIDs, &pointStorage[0].fX, glyphs.count, glyphs.paint,

                      x, y, bounds.fLeft, bounds.fTop, bounds.fRight, bounds.fBottom, 0);

}
@@ -322,7 +322,7 @@ void SkiaCanvasProxy::onDrawPosText(const void* text, size_t byteLength, const S 
    glyphs.paint.measureText(glyphs.glyphIDs, glyphs.count << 1, &bounds);

    bounds.offset(x, y);



    SK_COMPILE_ASSERT(sizeof(SkPoint) == sizeof(float)*2, SkPoint_is_no_longer_2_floats);

    static_assert(sizeof(SkPoint) == sizeof(float)*2, "SkPoint is no longer two floats");

    mCanvas->drawText(glyphs.glyphIDs, &posArray[0].fX, glyphs.count, glyphs.paint, x, y,

                      bounds.fLeft, bounds.fTop, bounds.fRight, bounds.fBottom, 0);

}