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

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

Merge "Revert "Test aggressive throttling"" into jb-mr1-dev

parents 4046e012 55bc7efa

core/java/android/webkit/JWebCoreJavaBridge.java

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ final class JWebCoreJavaBridge extends Handler { 
    private void fireSharedTimer() { 

        // clear the flag so that sharedTimerFired() can set a new timer

        mHasInstantTimer = false;

        removeMessages(TIMER_MESSAGE);

        sharedTimerFired();

    }

core/java/android/webkit/WebViewCore.java

+0 −8
Original line number Diff line number Diff line
@@ -2198,19 +2198,11 @@ public final class WebViewCore { 
                mEventHub.sendMessage(Message.obtain(null, EventHub.WEBKIT_DRAW));

            }

            m_skipDrawFlag = false;

            m_skipDrawFlagLock.notify();

        }

    }



    private void webkitDraw() {

        synchronized (m_skipDrawFlagLock) {

            if (m_skipDrawFlag) {

                try {

                    // Aggressively throttle webkit to give the UI more CPU

                    // to catch up with

                    m_skipDrawFlagLock.wait(50);

                } catch (InterruptedException e) {}

            }

            if (m_skipDrawFlag) {

                m_drawWasSkipped = true;

                return;