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

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();
     }
 

core/java/android/webkit/WebViewCore.java

@@ -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;