Changeset 149816 in webkit

Timestamp:

May 9, 2013 9:09:31 AM (11 years ago)

Author:

zhajiang@rim.com

Message:

Fix some compiler warnings (miscellaneous)
​https://bugs.webkit.org/show_bug.cgi?id=80790

Patch by Jacky Jiang <​zhajiang@blackberry.com> on 2013-05-09.
Reviewed by Rob Buis.

Fix the following warnings for BlackBerry:
InRegionScroller.cpp:286:39: warning: suggest parentheses around
assignment used as truth value [-Wparentheses].
InRegionScroller.cpp:349:39: warning: suggest parentheses around
assignment used as truth value [-Wparentheses].
InRegionScroller.cpp:456:82: warning: suggest parentheses around '&&'

within '

' [-Wparentheses].

InRegionScrollableArea.cpp:134:16: warning: suggest explicit braces to
avoid ambiguous 'else' [-Wparentheses].
SelectionHandler.cpp:390:109: warning: suggest parentheses around '&&'

within '

' [-Wparentheses].

SelectionOverlay.cpp:56:47: warning: comparison between signed and
unsigned integer expressions [-Wsign-compare].

• Api/InRegionScroller.cpp:

(BlackBerry::WebKit::InRegionScrollerPrivate::calculateInRegionScrollableAreasForPoint):
(BlackBerry::WebKit::InRegionScrollerPrivate::firstScrollableInRegionForNode):
(BlackBerry::WebKit::InRegionScrollerPrivate::canScrollRenderBox):

• WebKitSupport/InRegionScrollableArea.cpp:

(BlackBerry::WebKit::InRegionScrollableArea::InRegionScrollableArea):

• WebKitSupport/SelectionHandler.cpp:

(BlackBerry::WebKit::SelectionHandler::extendSelectionToFieldBoundary):

• WebKitSupport/SelectionOverlay.cpp:

(BlackBerry::WebKit::SelectionOverlay::draw):

Location:

trunk/Source/WebKit/blackberry

Files:

• Api/InRegionScroller.cpp (modified) (3 diffs)
• ChangeLog (modified) (1 diff)
• WebKitSupport/InRegionScrollableArea.cpp (modified) (1 diff)
• WebKitSupport/SelectionHandler.cpp (modified) (1 diff)
• WebKitSupport/SelectionOverlay.cpp (modified) (1 diff)

trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp

@@ -284 +284 @@
         }
 
-    } while (layer = parentLayer(layer));
+    } while ((layer = parentLayer(layer)));
 
     if (m_activeInRegionScrollableAreas.empty())
@@ -347 +347 @@
         }
 
-    } while (layer = parentLayer(layer));
+    } while ((layer = parentLayer(layer)));
     return 0;
 }
@@ -453 +453 @@
         return false;
 
-    if (box->scrollsOverflowX() && (box->scrollWidth() != box->clientWidth())
-        || box->scrollsOverflowY() && (box->scrollHeight() != box->clientHeight()))
+    if ((box->scrollsOverflowX() && (box->scrollWidth() != box->clientWidth()))
+        || (box->scrollsOverflowY() && (box->scrollHeight() != box->clientHeight())))
         return true;
 

trunk/Source/WebKit/blackberry/ChangeLog

@@ +1 @@
+2013-05-09  Jacky Jiang  <zhajiang@blackberry.com>
+
+        Fix some compiler warnings (miscellaneous)
+        https://bugs.webkit.org/show_bug.cgi?id=80790
+
+        Reviewed by Rob Buis.
+
+        Fix the following warnings for BlackBerry:
+        InRegionScroller.cpp:286:39: warning: suggest parentheses around
+        assignment used as truth value [-Wparentheses].
+        InRegionScroller.cpp:349:39: warning: suggest parentheses around
+        assignment used as truth value [-Wparentheses].
+        InRegionScroller.cpp:456:82: warning: suggest parentheses around '&&'
+        within '||' [-Wparentheses].
+        InRegionScrollableArea.cpp:134:16: warning: suggest explicit braces to
+        avoid ambiguous 'else' [-Wparentheses].
+        SelectionHandler.cpp:390:109: warning: suggest parentheses around '&&'
+        within '||' [-Wparentheses].
+        SelectionOverlay.cpp:56:47: warning: comparison between signed and
+        unsigned integer expressions [-Wsign-compare].
+
+
+        * Api/InRegionScroller.cpp:
+        (BlackBerry::WebKit::InRegionScrollerPrivate::calculateInRegionScrollableAreasForPoint):
+        (BlackBerry::WebKit::InRegionScrollerPrivate::firstScrollableInRegionForNode):
+        (BlackBerry::WebKit::InRegionScrollerPrivate::canScrollRenderBox):
+        * WebKitSupport/InRegionScrollableArea.cpp:
+        (BlackBerry::WebKit::InRegionScrollableArea::InRegionScrollableArea):
+        * WebKitSupport/SelectionHandler.cpp:
+        (BlackBerry::WebKit::SelectionHandler::extendSelectionToFieldBoundary):
+        * WebKitSupport/SelectionOverlay.cpp:
+        (BlackBerry::WebKit::SelectionOverlay::draw):
+
 2013-05-09  Mike Fenton  <mifenton@rim.com>
 

trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp

@@ -132 +132 @@
             m_forceContentToBeVerticallyScrollable = m_scrollsVertically;
             // Force content to be scrollable even if it doesn't need to scroll in either direction.
-            if (!m_scrollsHorizontally && !m_scrollsVertically)
+            if (!m_scrollsHorizontally && !m_scrollsVertically) {
                 if (box->scrollsOverflowY())
                     m_forceContentToBeVerticallyScrollable = true;
                 else if (box->scrollsOverflowX()) // If it's already forced scrollable vertically, don't force it to scroll horizontally
                     m_forceContentToBeHorizontallyScrollable = true;
+            }
             m_supportsCompositedScrolling = true;
             ASSERT(m_layer->backing()->hasScrollingLayer());

trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp

@@ -387 +387 @@
     // Prevent incorrect movement, handles can only extend the selection this way
     // to prevent inversion of the handles.
-    if (isStartHandle && (character == KEYCODE_RIGHT || character == KEYCODE_DOWN)
-        || !isStartHandle && (character == KEYCODE_LEFT || character == KEYCODE_UP))
+    if ((isStartHandle && (character == KEYCODE_RIGHT || character == KEYCODE_DOWN))
+        || (!isStartHandle && (character == KEYCODE_LEFT || character == KEYCODE_UP)))
         character = 0;
 

trunk/Source/WebKit/blackberry/WebKitSupport/SelectionOverlay.cpp

@@ -54 +54 @@
     m_selection = selection;
 
-    while (m_layers.size() < m_selection.size())
+    while (m_layers.size() < static_cast<size_t>(m_selection.size()))
         m_layers.append(GraphicsLayer::create(this));