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

Commit f94d22e8 authored by Huihong Luo's avatar Huihong Luo Committed by Automerger Merge Worker
Browse files

Merge "Add a sys prop to control WebView Overlays support" into sc-dev am: faa7a438 

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

Change-Id: I5adc4c5119948b14bd171525047e90d8446c938f
parents 59dab0cd faa7a438

core/java/android/view/ViewRootImpl.java

+8 −4
Original line number Diff line number Diff line
@@ -1442,8 +1442,10 @@ public final class ViewRootImpl implements ViewParent, 
                    if (mHardwareRendererObserver != null) {

                        mAttachInfo.mThreadedRenderer.addObserver(mHardwareRendererObserver);

                    }

                    if (HardwareRenderer.isWebViewOverlaysEnabled()) {

                        addPrepareSurfaceControlForWebviewCallback();

                        addASurfaceTransactionCallback();

                    }

                    mAttachInfo.mThreadedRenderer.setSurfaceControl(mSurfaceControl);

                }

            }
@@ -7777,8 +7779,10 @@ public final class ViewRootImpl implements ViewParent, 
                }

            }

            if (mAttachInfo.mThreadedRenderer != null) {

                if (HardwareRenderer.isWebViewOverlaysEnabled()) {

                    addPrepareSurfaceControlForWebviewCallback();

                    addASurfaceTransactionCallback();

                }

                mAttachInfo.mThreadedRenderer.setSurfaceControl(mSurfaceControl);

            }

        } else {

graphics/java/android/graphics/HardwareRenderer.java

+5 −0
Original line number Diff line number Diff line
@@ -1304,6 +1304,11 @@ public class HardwareRenderer { 
     */

    public static native void preload();



    /**

     * @hide

     */

    public static native boolean isWebViewOverlaysEnabled();



    /** @hide */

    protected static native void setupShadersDiskCache(String cacheFile, String skiaCacheFile);

libs/hwui/Properties.cpp

+4 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ float Properties::defaultSdrWhitePoint = 200.f; 
bool Properties::useHintManager = true;

int Properties::targetCpuTimePercentage = 70;



bool Properties::enableWebViewOverlays = false;



StretchEffectBehavior Properties::stretchEffectBehavior = StretchEffectBehavior::ShaderHWUI;



bool Properties::load() {
@@ -137,6 +139,8 @@ bool Properties::load() { 
    targetCpuTimePercentage = base::GetIntProperty(PROPERTY_TARGET_CPU_TIME_PERCENTAGE, 70);

    if (targetCpuTimePercentage <= 0 || targetCpuTimePercentage > 100) targetCpuTimePercentage = 70;



    enableWebViewOverlays = base::GetBoolProperty(PROPERTY_WEBVIEW_OVERLAYS_ENABLED, false);



    return (prevDebugLayersUpdates != debugLayersUpdates) || (prevDebugOverdraw != debugOverdraw);

}

libs/hwui/Properties.h

+7 −0
Original line number Diff line number Diff line
@@ -182,6 +182,11 @@ enum DebugLevel { 
 */

#define PROPERTY_REDUCE_OPS_TASK_SPLITTING "renderthread.skia.reduceopstasksplitting"



/**

 * Enable WebView Overlays feature.

 */

#define PROPERTY_WEBVIEW_OVERLAYS_ENABLED "debug.hwui.webview_overlays_enabled"



///////////////////////////////////////////////////////////////////////////////

// Misc

///////////////////////////////////////////////////////////////////////////////
@@ -276,6 +281,8 @@ public: 
    static bool useHintManager;

    static int targetCpuTimePercentage;



    static bool enableWebViewOverlays;



    static StretchEffectBehavior getStretchEffectBehavior() {

        return stretchEffectBehavior;

    }

libs/hwui/WebViewFunctorManager.cpp

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ void WebViewFunctor::drawGl(const DrawGlInfo& drawInfo) { 
            .mergeTransaction = currentFunctor.mergeTransaction,

    };



    if (!drawInfo.isLayer) {

    if (Properties::enableWebViewOverlays && !drawInfo.isLayer) {

        renderthread::CanvasContext* activeContext =

                renderthread::CanvasContext::getActiveContext();

        if (activeContext != nullptr) {