diff options
| author | Teng-Hui Zhu <ztenghui@google.com> | 2011-08-17 11:56:36 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-17 11:56:36 -0700 |
| commit | bd7e9ea6769039d66b97b4286e096416b53bdc4a (patch) | |
| tree | fccfe2fcc6e355d5ba0fce662298b5afc099f010 /Source/WebCore/platform/graphics/android/GLWebViewState.cpp | |
| parent | 345c04734e2d397a46a45343fe387cd11fd8197e (diff) | |
| parent | 9b5a4abb0835d28669d8db5f31c118bba068a89e (diff) | |
| download | external_webkit-bd7e9ea6769039d66b97b4286e096416b53bdc4a.zip external_webkit-bd7e9ea6769039d66b97b4286e096416b53bdc4a.tar.gz external_webkit-bd7e9ea6769039d66b97b4286e096416b53bdc4a.tar.bz2 | |
Merge "Fix Gmail blank page"
Diffstat (limited to 'Source/WebCore/platform/graphics/android/GLWebViewState.cpp')
| -rw-r--r-- | Source/WebCore/platform/graphics/android/GLWebViewState.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp index f16a342..9978327 100644 --- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp +++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp @@ -65,8 +65,8 @@ using namespace android; GLWebViewState::GLWebViewState(android::Mutex* buttonMutex) : m_scaleRequestState(kNoScaleRequest) - , m_currentScale(1) - , m_futureScale(1) + , m_currentScale(-1) + , m_futureScale(-1) , m_updateTime(-1) , m_transitionTime(-1) , m_baseLayer(0) |