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

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

Merge "Fix contants; RT-enable WebView pt2"

parents deb47ef2 cd028f33

core/java/android/view/ThreadedRenderer.java

+2 −2
Original line number Diff line number Diff line
@@ -64,9 +64,9 @@ public class ThreadedRenderer extends HardwareRenderer { 


    // Keep in sync with DrawFrameTask.h SYNC_* flags

    // Nothing interesting to report

    private static final int SYNC_OK = 0x0;

    private static final int SYNC_OK = 0;

    // Needs a ViewRoot invalidate

    private static final int SYNC_INVALIDATE_REQUIRED = 0x1;

    private static final int SYNC_INVALIDATE_REQUIRED = 1 << 0;



    private static final String[] VISUALIZERS = {

        PROFILE_PROPERTY_VISUALIZE_BARS,

libs/hwui/renderthread/CanvasContext.cpp

+1 −3
Original line number Diff line number Diff line
@@ -148,9 +148,7 @@ void CanvasContext::prepareTree(TreeInfo& info) { 
    info.out.canDrawThisFrame = !runningBehind;



    if (info.out.hasAnimations || !info.out.canDrawThisFrame) {

        if (info.out.hasFunctors) {

            info.out.requiresUiRedraw = true;

        } else if (!info.out.requiresUiRedraw) {

        if (!info.out.requiresUiRedraw) {

            // If animationsNeedsRedraw is set don't bother posting for an RT anim

            // as we will just end up fighting the UI thread.

            mRenderThread.postFrameCallback(this);

libs/hwui/renderthread/DrawFrameTask.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ class RenderThread; 


enum SyncResult {

    kSync_OK = 0,

    kSync_UIRedrawRequired = 1 << 1,

    kSync_UIRedrawRequired = 1 << 0,

};



/*