diff options
| author | Derek Sollenberger <djsollen@google.com> | 2011-03-01 13:49:43 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-03-01 13:49:43 -0800 |
| commit | 959e9dbc6321a6dafa3f419e67459e50ea29bc14 (patch) | |
| tree | fc089502785181abef097abbed6261bbe6af3787 /WebCore/platform/graphics/android/GLWebViewState.cpp | |
| parent | 17ed9cd411dd026b58faa85f77cf63c25eee4883 (diff) | |
| parent | 2764765b1eae36aff2deaec49a1589aeb636ee1d (diff) | |
| download | external_webkit-959e9dbc6321a6dafa3f419e67459e50ea29bc14.zip external_webkit-959e9dbc6321a6dafa3f419e67459e50ea29bc14.tar.gz external_webkit-959e9dbc6321a6dafa3f419e67459e50ea29bc14.tar.bz2 | |
am 2764765b: Do not merge: Cherry-pick fix to framerate cap
* commit '2764765b1eae36aff2deaec49a1589aeb636ee1d':
Do not merge: Cherry-pick fix to framerate cap
Diffstat (limited to 'WebCore/platform/graphics/android/GLWebViewState.cpp')
| -rw-r--r-- | WebCore/platform/graphics/android/GLWebViewState.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/WebCore/platform/graphics/android/GLWebViewState.cpp b/WebCore/platform/graphics/android/GLWebViewState.cpp index 57d4c66..0e7f559 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(); @@ -298,19 +299,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; |