summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohn Reck <jreck@google.com>2011-06-23 09:39:52 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-06-23 09:39:52 -0700
commit47203d8f33c37d65192797a9570ec7bd6164e7c7 (patch)
treefc28a21aca34f28811927514566f7ba9adb19ddb
parent6e14a866ef4cafafb04d26d54c88fa0d76b87e74 (diff)
parent02dbe7f948b5603841375300ac245a390f829ba0 (diff)
downloadexternal_webkit-47203d8f33c37d65192797a9570ec7bd6164e7c7.zip
external_webkit-47203d8f33c37d65192797a9570ec7bd6164e7c7.tar.gz
external_webkit-47203d8f33c37d65192797a9570ec7bd6164e7c7.tar.bz2
Merge "Remove legacy fps cap"
-rw-r--r--Source/WebCore/platform/graphics/android/GLWebViewState.cpp11
-rw-r--r--Source/WebCore/platform/graphics/android/GLWebViewState.h1
2 files changed, 0 insertions, 12 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
index c2fd9dd..dda5dee 100644
--- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
+++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
@@ -78,7 +78,6 @@ GLWebViewState::GLWebViewState(android::Mutex* buttonMutex)
, m_globalButtonMutex(buttonMutex)
, m_baseLayerUpdate(true)
, m_backgroundColor(SK_ColorWHITE)
- , m_prevDrawTime(0)
, m_displayRings(false)
, m_focusRingTexture(-1)
{
@@ -499,16 +498,6 @@ bool GLWebViewState::drawGL(IntRect& rect, SkRect& viewport, IntRect* invalRect,
{
glFinish();
- double currentTime = WTF::currentTime();
- double delta = currentTime - m_prevDrawTime;
-
- if (delta < FRAMERATE_CAP) {
- unsigned int usecs = (FRAMERATE_CAP - delta) * 1E6;
- usleep(usecs);
- }
-
- m_prevDrawTime = currentTime;
-
m_baseLayerLock.lock();
BaseLayerAndroid* baseLayer = m_currentBaseLayer;
SkSafeRef(baseLayer);
diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.h b/Source/WebCore/platform/graphics/android/GLWebViewState.h
index 980dd3c..33a05c6 100644
--- a/Source/WebCore/platform/graphics/android/GLWebViewState.h
+++ b/Source/WebCore/platform/graphics/android/GLWebViewState.h
@@ -280,7 +280,6 @@ private:
SkRegion m_invalidateRegion;
SkColor m_backgroundColor;
- double m_prevDrawTime;
#ifdef MEASURES_PERF
unsigned int m_totalTimeCounter;