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

Commit e8a866d4 authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Fix issue with bitmap uploading"

parents 6284622c 860d155f

core/jni/android_view_GLRenderer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -146,8 +146,8 @@ static void android_view_GLRenderer_prepareTree(JNIEnv* env, jobject clazz, 
        jlong renderNodePtr) {

    using namespace android::uirenderer;

    RenderNode* renderNode = reinterpret_cast<RenderNode*>(renderNodePtr);

    TreeInfo info = {0};

    renderNode->prepareTree(info);

    TreeInfo ignoredInfo;

    renderNode->prepareTree(ignoredInfo);

}



static void android_view_GLRenderer_invokeFunctor(JNIEnv* env, jobject clazz,

core/jni/android_view_HardwareLayer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -127,8 +127,8 @@ static void android_view_HardwareLayer_updateRenderLayer(JNIEnv* env, jobject cl 
static jboolean android_view_HardwareLayer_flushChanges(JNIEnv* env, jobject clazz,

        jlong layerUpdaterPtr) {

    DeferredLayerUpdater* layer = reinterpret_cast<DeferredLayerUpdater*>(layerUpdaterPtr);

    bool ignoredHasFunctors;

    return layer->apply(&ignoredHasFunctors);

    TreeInfo ignoredInfo;

    return layer->apply(ignoredInfo);

}



static jlong android_view_HardwareLayer_getLayer(JNIEnv* env, jobject clazz,

libs/hwui/DeferredLayerUpdater.cpp

+1 −5
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ void DeferredLayerUpdater::setDisplayList(RenderNode* displayList, 
    }

}



bool DeferredLayerUpdater::apply(bool* hasFunctors) {

bool DeferredLayerUpdater::apply(TreeInfo& info) {

    bool success = true;

    // These properties are applied the same to both layer types

    mLayer->setColorFilter(mColorFilter);
@@ -74,11 +74,7 @@ bool DeferredLayerUpdater::apply(bool* hasFunctors) { 
            success = LayerRenderer::resizeLayer(mLayer, mWidth, mHeight);

        }

        mLayer->setBlend(mBlend);

        TreeInfo info = {0};

        mDisplayList->prepareTree(info);

        if (info.hasFunctors) {

            *hasFunctors = true;

        }

        mLayer->updateDeferred(mDisplayList.get(),

                mDirtyRect.left, mDirtyRect.top, mDirtyRect.right, mDirtyRect.bottom);

        mDirtyRect.setEmpty();

libs/hwui/DeferredLayerUpdater.h

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ public: 


    ANDROID_API void setPaint(const SkPaint* paint);



    ANDROID_API bool apply(bool* hasFunctors);

    ANDROID_API bool apply(TreeInfo& info);



    ANDROID_API Layer* backingLayer() {

        return mLayer;

libs/hwui/DisplayListOp.h

+0 −20
Original line number Diff line number Diff line
@@ -286,12 +286,6 @@ public: 


    int getFlags() const { return mFlags; }

private:

    SaveOp() {}

    DisplayListOp* reinit(int flags) {

        mFlags = flags;

        return this;

    }



    int mFlags;

};
@@ -318,12 +312,6 @@ public: 
    virtual const char* name() { return "RestoreToCount"; }



private:

    RestoreToCountOp() {}

    DisplayListOp* reinit(int count) {

        mCount = count;

        return this;

    }



    int mCount;

};
@@ -514,7 +502,6 @@ public: 
    }



protected:

    ClipOp() {}

    virtual bool isRect() { return false; }



    SkRegion::Op mOp;
@@ -539,13 +526,6 @@ protected: 
    virtual bool isRect() { return true; }



private:

    ClipRectOp() {}

    DisplayListOp* reinit(float left, float top, float right, float bottom, SkRegion::Op op) {

        mOp = op;

        mArea.set(left, top, right, bottom);

        return this;

    }



    Rect mArea;

};