commit 4be07ade3658da9345067780520ddbd266900ee4
author John Reck <jreck@google.com> Wed Sep 19 17:06:50 2012 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Sep 19 17:06:50 2012 -0700
tree 991bc8e10c6d8f5debc7068cb8aff583c50217d3
parent 4046e012887fff1f36dfd3eddc6f354d4c2497fc
parent 55bc7efaf9ec91c226bd0d5fe5904f2efa9322d7

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

core/java/android/webkit/JWebCoreJavaBridge.java

diff --git a/core/java/android/webkit/JWebCoreJavaBridge.java b/core/java/android/webkit/JWebCoreJavaBridge.java
index d9aeb70..e6eaa14 100644
--- a/core/java/android/webkit/JWebCoreJavaBridge.java
+++ b/core/java/android/webkit/JWebCoreJavaBridge.java
@@ -89,7 +89,6 @@
     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

diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index 2d834ff..ddc0319 100644
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@@ -2198,20 +2198,12 @@
                 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;
             }