Fix some compiler warnings

Change-Id: I4c5fde4898313b26c9a97bd9571b02eaeb35c684

3 files changed, 7 insertions, 12 deletions

diff --git a/Source/WebCore/html/HTMLMetaElement.cpp b/Source/WebCore/html/HTMLMetaElement.cpp
index 4863f3b..d8d9fb3 100644
--- a/Source/WebCore/html/HTMLMetaElement.cpp
+++ b/Source/WebCore/html/HTMLMetaElement.cpp
@@ -83,11 +83,9 @@ void HTMLMetaElement::process()
         updateViewport = true;
     } else if (equalIgnoringCase(name(), "format-detection"))
         document()->processMetadataSettings(m_content);
-    else if ((equalIgnoringCase(name(), "HandheldFriendly")
-            && equalIgnoringCase(m_content, "true") ||
-            equalIgnoringCase(name(), "MobileOptimized"))
-            && document()->settings()
-            && document()->settings()->viewportWidth() == -1) {
+    else if (((equalIgnoringCase(name(), "HandheldFriendly") && equalIgnoringCase(m_content, "true")) || equalIgnoringCase(name(), "MobileOptimized"))
+        && document()->settings()
+        && document()->settings()->viewportWidth() == -1) {
         // fit mobile sites directly in the screen
         document()->settings()->setMetadataSettings("width", "device-width");
         updateViewport = true;
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;
diff --git a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
index 4acd563..f46d335 100644
--- a/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
+++ b/Source/WebCore/platform/graphics/android/GLWebViewState.cpp
@@ -307,7 +307,7 @@ void GLWebViewState::paintExtras()
 {
     if (m_displayRings) {
         // TODO: handles correctly the multi-rings case
-        for (int i=0; i<m_rings.size(); i++) {
+        for (size_t i = 0; i < m_rings.size(); i++) {
             IntRect rect = m_rings.at(i);
             drawFocusRing(rect);
         }