diff options
| -rw-r--r-- | core/java/android/webkit/JWebCoreJavaBridge.java | 1 | ||||
| -rw-r--r-- | core/java/android/webkit/WebViewCore.java | 8 | ||||
| -rw-r--r-- | docs/html/index.jd | 11 |
3 files changed, 14 insertions, 6 deletions
diff --git a/core/java/android/webkit/JWebCoreJavaBridge.java b/core/java/android/webkit/JWebCoreJavaBridge.java index e6eaa14..d9aeb70 100644 --- a/core/java/android/webkit/JWebCoreJavaBridge.java +++ b/core/java/android/webkit/JWebCoreJavaBridge.java @@ -89,6 +89,7 @@ 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 40229af..59036e7 100644 --- a/core/java/android/webkit/WebViewCore.java +++ b/core/java/android/webkit/WebViewCore.java @@ -2197,12 +2197,20 @@ 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; } diff --git a/docs/html/index.jd b/docs/html/index.jd index 8930c7f..1d47ed7 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -43,11 +43,11 @@ that are beautiful and easy to use.</p> <img src="{@docRoot}images/home/google-io.png"> </div> <div class="content-right col-5"> - <h1>Watch Android at <br/>Google I/O!</h1> - <p>See the keynote and more than 40 Android developer sessions streamed live from Moscone Center in San Francisco.</p> - <p>Begins June 27, 9AM PDT (UTC-7).</p> - <p><a href="https://developers.google.com/events/io/sessions#android" -class="button">See the Android Sessions</a></p> + <h1>Android videos<br/> from Google I/O!</h1> + <p>If you couldn't make it to Google I/O this year or want to review some of the material, + all of the Android sessions are now available for viewing online.</p> + <p><a href="http://www.youtube.com/playlist?list=PL4C6BCDE45E05F49E&feature=plcp" +class="button">Watch the Android sessions</a></p> </div> </li> <li class="item carousel-home"> @@ -68,7 +68,6 @@ class="button">See the Android Sessions</a></p> <!-- /End slideshow --> - </div> <div class="wrap" style="padding-bottom:20px"> <!-- Section links --> |