summaryrefslogtreecommitdiffstats
path: root/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
diff options
context:
space:
mode:
authorSteve Block <steveblock@google.com>2011-05-19 14:44:02 +0100
committerSteve Block <steveblock@google.com>2011-05-19 14:54:12 +0100
commit986d9857513804f79bf5b8d2c03daf4caa492e8b (patch)
treea0743c9984379584300a61c412e6ace518c3f12d /Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
parenta299dfda6bbcec93b532b7ad3d118a9609fa9b75 (diff)
downloadexternal_webkit-986d9857513804f79bf5b8d2c03daf4caa492e8b.zip
external_webkit-986d9857513804f79bf5b8d2c03daf4caa492e8b.tar.gz
external_webkit-986d9857513804f79bf5b8d2c03daf4caa492e8b.tar.bz2
Fix some compiler warnings
Change-Id: I4c5fde4898313b26c9a97bd9571b02eaeb35c684
Diffstat (limited to 'Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp')
-rw-r--r--Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp b/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
index 09d80a1..8aa334f 100644
--- a/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
+++ b/Source/WebCore/platform/graphics/android/BaseLayerAndroid.cpp
@@ -138,9 +138,7 @@ bool BaseLayerAndroid::drawBasePictureInGL(SkRect& viewport, float scale, double
// If we have a different scale than the current one, we have to
// decide what to do. The current behaviour is to delay an update,
// so that we do not slow down zooming unnecessarily.
- if (m_glWebViewState->currentScale() != scale
- && (m_glWebViewState->scaleRequestState() == GLWebViewState::kNoScaleRequest
- || m_glWebViewState->futureScale() != scale)
+ if ((m_glWebViewState->currentScale() != scale && (m_glWebViewState->scaleRequestState() == GLWebViewState::kNoScaleRequest || m_glWebViewState->futureScale() != scale))
|| m_glWebViewState->scaleRequestState() == GLWebViewState::kWillScheduleRequest) {
// schedule the new request
@@ -152,9 +150,8 @@ bool BaseLayerAndroid::drawBasePictureInGL(SkRect& viewport, float scale, double
}
// If the viewport has changed since we scheduled the request, we also need to prepare.
- if (((m_glWebViewState->scaleRequestState() == GLWebViewState::kRequestNewScale)
- || (m_glWebViewState->scaleRequestState() == GLWebViewState::kReceivedNewScale))
- && (m_glWebViewState->futureViewport() != viewportTileBounds))
+ if ((m_glWebViewState->scaleRequestState() == GLWebViewState::kRequestNewScale || m_glWebViewState->scaleRequestState() == GLWebViewState::kReceivedNewScale)
+ && m_glWebViewState->futureViewport() != viewportTileBounds)
prepareNextTiledPage = true;
bool zooming = false;