diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-03-01 07:39:54 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-03-01 07:39:54 -0800 |
| commit | 96468506dc6d0b7d039b7fed0cf189f3b1b980eb (patch) | |
| tree | fa2b53cb534e996409e707282d5f1e730a4208fb /WebCore/platform | |
| parent | 0c912229b5c4e394b86cdf908b92bf72f327d8ab (diff) | |
| parent | 4552e94bc4603208f93db6e2afffbb3ea91d5241 (diff) | |
| download | external_webkit-96468506dc6d0b7d039b7fed0cf189f3b1b980eb.zip external_webkit-96468506dc6d0b7d039b7fed0cf189f3b1b980eb.tar.gz external_webkit-96468506dc6d0b7d039b7fed0cf189f3b1b980eb.tar.bz2 | |
Merge "Fix framerate cap when multiple webviews exist."
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/graphics/android/GLWebViewState.cpp | 7 | ||||
| -rw-r--r-- | WebCore/platform/graphics/android/GLWebViewState.h | 1 |
2 files changed, 4 insertions, 4 deletions
diff --git a/WebCore/platform/graphics/android/GLWebViewState.cpp b/WebCore/platform/graphics/android/GLWebViewState.cpp index 3ca04e9..c65b763 100644 --- a/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -71,6 +71,7 @@ GLWebViewState::GLWebViewState(android::Mutex* buttonMutex) , m_globalButtonMutex(buttonMutex) , m_baseLayerUpdate(true) , m_backgroundColor(SK_ColorWHITE) + , m_prevDrawTime(0) { m_viewport.setEmpty(); m_previousViewport.setEmpty(); @@ -301,19 +302,17 @@ void GLWebViewState::setViewport(SkRect& viewport, float scale) m_tiledPageB->updateBaseTileSize(); } -static double gPrevTime = 0; - bool GLWebViewState::drawGL(IntRect& rect, SkRect& viewport, float scale, SkColor color) { glFinish(); double currentTime = WTF::currentTime(); - double delta = currentTime - gPrevTime; + double delta = currentTime - m_prevDrawTime; if (delta < FRAMERATE_CAP) return true; - gPrevTime = currentTime; + m_prevDrawTime = currentTime; m_baseLayerLock.lock(); BaseLayerAndroid* baseLayer = m_currentBaseLayer; diff --git a/WebCore/platform/graphics/android/GLWebViewState.h b/WebCore/platform/graphics/android/GLWebViewState.h index d265b41..e44ec3c 100644 --- a/WebCore/platform/graphics/android/GLWebViewState.h +++ b/WebCore/platform/graphics/android/GLWebViewState.h @@ -252,6 +252,7 @@ private: IntRect m_invalidateRect; SkColor m_backgroundColor; + double m_prevDrawTime; }; } // namespace WebCore |