Revert "Test aggressive throttling"

Bug: 7182109
This reverts commit c7c85b34dad5ee722bd9f14318c1e0e4237d529e.

Change-Id: Ibc8837b97450ec6e77a0e9dd509280ff780bb22b

2 files changed, 0 insertions, 9 deletions

diff --git a/core/java/android/webkit/JWebCoreJavaBridge.java b/core/java/android/webkit/JWebCoreJavaBridge.java
index d9aeb705edbf..e6eaa141d8e5 100644
--- a/core/java/android/webkit/JWebCoreJavaBridge.java
+++ b/core/java/android/webkit/JWebCoreJavaBridge.java
@@ -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();
     }
 
diff --git a/core/java/android/webkit/WebViewCore.java b/core/java/android/webkit/WebViewCore.java
index 2d834fff50cd..ddc0319f514f 100644
--- a/core/java/android/webkit/WebViewCore.java
+++ b/core/java/android/webkit/WebViewCore.java
@@ -2198,20 +2198,12 @@ 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;
             }