summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrei Popescu <andreip@google.com>2010-03-05 16:26:29 +0000
committerAndrei Popescu <andreip@google.com>2010-03-05 16:28:16 +0000
commit97082a14f6a95eb3ce10c28d178159fbe898bf0c (patch)
tree1d898b7a9c17b809dad7fd5efe5225656020558c
parent1c0c5112e9c2ef9e4b14b57ff15ed03500cbdb57 (diff)
downloadexternal_webkit-97082a14f6a95eb3ce10c28d178159fbe898bf0c.zip
external_webkit-97082a14f6a95eb3ce10c28d178159fbe898bf0c.tar.gz
external_webkit-97082a14f6a95eb3ce10c28d178159fbe898bf0c.tar.bz2
Remove unnecessary call to ChromeClientAndroid::scheduleCompositingLayerSync().
Fix b: 2471383
-rw-r--r--WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp2
-rw-r--r--WebKit/android/jni/WebViewCore.cpp6
2 files changed, 1 insertions, 7 deletions
diff --git a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
index 5e121e6..c258d79 100644
--- a/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
+++ b/WebKit/android/WebCoreSupport/ChromeClientAndroid.cpp
@@ -77,7 +77,7 @@ void ChromeClientAndroid::syncTimerFired(Timer<ChromeClientAndroid>* client)
void ChromeClientAndroid::scheduleCompositingLayerSync()
{
if (!m_syncTimer.isActive())
- m_syncTimer.startOneShot(0.001); // 1ms
+ m_syncTimer.startOneShot(0);
}
void ChromeClientAndroid::setNeedsOneShotDrawingSynchronization()
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index 57bc11c..6cae287 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -1331,12 +1331,6 @@ void WebViewCore::updateCacheOnNodeChange()
void WebViewCore::updateFrameCache()
{
-#if USE(ACCELERATED_COMPOSITING)
- ChromeClientAndroid* chromeC = static_cast<ChromeClientAndroid*>(
- mainFrame()->page()->chrome()->client());
- chromeC->scheduleCompositingLayerSync();
-#endif
-
if (!m_frameCacheOutOfDate) {
DBG_NAV_LOG("!m_frameCacheOutOfDate");
return;