Title: [149816] trunk/Source/WebKit/blackberry
- Revision
- 149816
- Author
- [email protected]
- Date
- 2013-05-09 09:09:31 -0700 (Thu, 09 May 2013)
Log Message
Fix some compiler warnings (miscellaneous)
https://bugs.webkit.org/show_bug.cgi?id=80790
Patch by Jacky Jiang <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp (149815 => 149816)
--- trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp 2013-05-09 16:02:27 UTC (rev 149815)
+++ trunk/Source/WebKit/blackberry/Api/InRegionScroller.cpp 2013-05-09 16:09:31 UTC (rev 149816)
@@ -283,7 +283,7 @@
end->setCanPropagateScrollingToEnclosingScrollable(false);
}
- } while (layer = parentLayer(layer));
+ } while ((layer = parentLayer(layer)));
if (m_activeInRegionScrollableAreas.empty())
return;
@@ -346,7 +346,7 @@
end->setCanPropagateScrollingToEnclosingScrollable(false);
}
- } while (layer = parentLayer(layer));
+ } while ((layer = parentLayer(layer)));
return 0;
}
@@ -452,8 +452,8 @@
if (box->scrollHeight() == box->clientHeight() && box->scrollWidth() == box->clientWidth())
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;
Node* node = box->node();
Modified: trunk/Source/WebKit/blackberry/ChangeLog (149815 => 149816)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-05-09 16:02:27 UTC (rev 149815)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-05-09 16:09:31 UTC (rev 149816)
@@ -1,3 +1,36 @@
+2013-05-09 Jacky Jiang <[email protected]>
+
+ 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 <[email protected]>
[BlackBerry] Style updates required based on new check-webkit-style
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp (149815 => 149816)
--- trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp 2013-05-09 16:02:27 UTC (rev 149815)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/InRegionScrollableArea.cpp 2013-05-09 16:09:31 UTC (rev 149816)
@@ -131,11 +131,12 @@
m_forceContentToBeHorizontallyScrollable = m_scrollsHorizontally;
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());
m_camouflagedCompositedScrollableLayer = reinterpret_cast<unsigned>(m_layer->backing()->scrollingContentsLayer()->platformLayer());
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp (149815 => 149816)
--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp 2013-05-09 16:02:27 UTC (rev 149815)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionHandler.cpp 2013-05-09 16:09:31 UTC (rev 149816)
@@ -386,8 +386,8 @@
// 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;
VisiblePosition newVisiblePosition = isStartHandle ? controller->selection().extent() : controller->selection().base();
Modified: trunk/Source/WebKit/blackberry/WebKitSupport/SelectionOverlay.cpp (149815 => 149816)
--- trunk/Source/WebKit/blackberry/WebKitSupport/SelectionOverlay.cpp 2013-05-09 16:02:27 UTC (rev 149815)
+++ trunk/Source/WebKit/blackberry/WebKitSupport/SelectionOverlay.cpp 2013-05-09 16:09:31 UTC (rev 149816)
@@ -53,7 +53,7 @@
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));
m_layers.resize(m_selection.size());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
