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

Commit 78df96a8 authored by Nader Jawad's avatar Nader Jawad Committed by Automerger Merge Worker
Browse files

Skip TransformCanvas calls for FunctorDrawables am: 2d25d692 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16224979

Change-Id: I9c030b7439aa394a8bc9c5218c09e2a50cffba29
parents b5217cf7 2d25d692

libs/hwui/pipeline/skia/FunctorDrawable.h

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ namespace skiapipeline { 
 */

class FunctorDrawable : public SkDrawable {

public:

    constexpr static const char* const TYPE_NAME = "FunctorDrawable";



    FunctorDrawable(int functor, SkCanvas* canvas)

            : mBounds(canvas->getLocalClipBounds())

            , mWebViewHandle(WebViewFunctorManager::instance().handleFor(functor)) {}
@@ -48,6 +50,8 @@ public: 
        mWebViewHandle->onRemovedFromTree();

    }



    const char* getTypeName() const override { return TYPE_NAME; }



protected:

    virtual SkRect onGetBounds() override { return mBounds; }

libs/hwui/pipeline/skia/TransformCanvas.cpp

+13 −1
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
 * limitations under the License.

 */

#include "TransformCanvas.h"



#include "FunctorDrawable.h"

#include "HolePunch.h"

#include "SkData.h"

#include "SkDrawable.h"
@@ -35,8 +37,18 @@ void TransformCanvas::onDrawAnnotation(const SkRect& rect, const char* key, SkDa 
}



void TransformCanvas::onDrawDrawable(SkDrawable* drawable, const SkMatrix* matrix) {

    // TransformCanvas filters all drawing commands while maintaining the current

    // clip stack and transformation. We need to draw most SkDrawables, since their

    // draw calls may call methods that affect the clip stack and transformation. (Any

    // actual draw commands will then be filtered out.) But FunctorDrawables are used

    // as leaf nodes which issue self-contained OpenGL/Vulkan commands. These won't

    // affect the clip stack + transformation, and in some cases cause problems (e.g. if

    // the surface only has an alpha channel). See b/203960959

    const auto* drawableName = drawable->getTypeName();

    if (drawableName == nullptr || strcmp(drawableName, FunctorDrawable::TYPE_NAME) != 0) {

        drawable->draw(this, matrix);

    }

}



bool TransformCanvas::onFilter(SkPaint& paint) const {

    return false;