Title: [149907] trunk
- Revision
- 149907
- Author
- [email protected]
- Date
- 2013-05-10 14:28:14 -0700 (Fri, 10 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-10.
Reviewed by Rob Buis.
Source/WebKit/blackberry:
Fix the following warnings for BlackBerry:
BackingStore.cpp:852:60: warning: suggest parentheses around '&&' within
'||' [-Wparentheses].
WebPage.cpp:2858:40: warning: suggest parentheses around assignment used
as truth value [-Wparentheses].
WebPage.cpp:2880:42: warning: suggest parentheses around assignment used
as truth value [-Wparentheses]
* Api/BackingStore.cpp:
(BlackBerry::WebKit::BackingStorePrivate::updateTilesAfterBackingStoreRectChange):
* Api/WebPage.cpp:
(BlackBerry::WebKit::WebPagePrivate::adjustRectOffsetForFrameOffset):
(BlackBerry::WebKit::WebPagePrivate::blockZoomRectForNode):
Tools:
Fix the following warnings for BlackBerry:
DumpRenderTree.cpp:357:42: warning: suggest parentheses around assignment
used as truth value [-Wparentheses].
* DumpRenderTree/blackberry/DumpRenderTree.cpp:
(BlackBerry::WebKit::DumpRenderTree::resetToConsistentStateBeforeTesting):
Modified Paths
Diff
Modified: trunk/Source/WebKit/blackberry/Api/BackingStore.cpp (149906 => 149907)
--- trunk/Source/WebKit/blackberry/Api/BackingStore.cpp 2013-05-10 21:11:51 UTC (rev 149906)
+++ trunk/Source/WebKit/blackberry/Api/BackingStore.cpp 2013-05-10 21:28:14 UTC (rev 149907)
@@ -848,8 +848,8 @@
tileNotRenderedRegion.extents().toString().c_str());
#endif
} else {
- if (!tileBuffer || !tileBuffer->isRendered(tileVisibleContentsRect(index, geometry), geometry->scale())
- && !isCurrentVisibleJob(index, geometry))
+ if (!tileBuffer || (!tileBuffer->isRendered(tileVisibleContentsRect(index, geometry), geometry->scale())
+ && !isCurrentVisibleJob(index, geometry)))
updateTile(tileOrigin, false /*immediate*/);
}
} else if (rect.intersects(expandedContentsRect()))
Modified: trunk/Source/WebKit/blackberry/Api/WebPage.cpp (149906 => 149907)
--- trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-05-10 21:11:51 UTC (rev 149906)
+++ trunk/Source/WebKit/blackberry/Api/WebPage.cpp 2013-05-10 21:28:14 UTC (rev 149907)
@@ -2815,7 +2815,7 @@
} while (iFrameRect.isEmpty() && ownerNode);
} else
break;
- } while (tnode = tnode->parentNode());
+ } while ((tnode = tnode->parentNode()));
return adjustedRect;
}
@@ -2837,7 +2837,7 @@
double blockExpansionRatio = 5.0 * blockToPageRatio * blockToPageRatio;
if (!tnode->hasTagName(HTMLNames::imgTag) && !tnode->hasTagName(HTMLNames::inputTag) && !tnode->hasTagName(HTMLNames::textareaTag)) {
- while (tnode = tnode->parentNode()) {
+ while ((tnode = tnode->parentNode())) {
ASSERT(tnode);
IntRect tRect = rectForNode(tnode);
int tempBlockArea = tRect.width() * tRect.height();
Modified: trunk/Source/WebKit/blackberry/ChangeLog (149906 => 149907)
--- trunk/Source/WebKit/blackberry/ChangeLog 2013-05-10 21:11:51 UTC (rev 149906)
+++ trunk/Source/WebKit/blackberry/ChangeLog 2013-05-10 21:28:14 UTC (rev 149907)
@@ -1,3 +1,24 @@
+2013-05-10 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:
+ BackingStore.cpp:852:60: warning: suggest parentheses around '&&' within
+ '||' [-Wparentheses].
+ WebPage.cpp:2858:40: warning: suggest parentheses around assignment used
+ as truth value [-Wparentheses].
+ WebPage.cpp:2880:42: warning: suggest parentheses around assignment used
+ as truth value [-Wparentheses]
+
+ * Api/BackingStore.cpp:
+ (BlackBerry::WebKit::BackingStorePrivate::updateTilesAfterBackingStoreRectChange):
+ * Api/WebPage.cpp:
+ (BlackBerry::WebKit::WebPagePrivate::adjustRectOffsetForFrameOffset):
+ (BlackBerry::WebKit::WebPagePrivate::blockZoomRectForNode):
+
2013-05-09 Mike Fenton <[email protected]>
[BlackBerry] Style updates required based on new check-webkit-style
Modified: trunk/Tools/ChangeLog (149906 => 149907)
--- trunk/Tools/ChangeLog 2013-05-10 21:11:51 UTC (rev 149906)
+++ trunk/Tools/ChangeLog 2013-05-10 21:28:14 UTC (rev 149907)
@@ -1,3 +1,17 @@
+2013-05-10 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:
+ DumpRenderTree.cpp:357:42: warning: suggest parentheses around assignment
+ used as truth value [-Wparentheses].
+
+ * DumpRenderTree/blackberry/DumpRenderTree.cpp:
+ (BlackBerry::WebKit::DumpRenderTree::resetToConsistentStateBeforeTesting):
+
2013-05-10 Jesus Sanchez-Palencia <[email protected]>
[WK2][CoordinatedGraphics] WKViewSetThemePath is EFL specific
Modified: trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp (149906 => 149907)
--- trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp 2013-05-10 21:11:51 UTC (rev 149906)
+++ trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp 2013-05-10 21:28:14 UTC (rev 149907)
@@ -354,7 +354,7 @@
page->settings()->setUsePreHTML5ParserQuirks(false);
// FIXME: Other ports also clear history/backForwardList allong with visited links.
page->group().removeVisitedLinks();
- if (mainFrame = page->mainFrame()) {
+ if ((mainFrame = page->mainFrame())) {
mainFrame->tree()->clearName();
mainFrame->loader()->setOpener(0);
// [WebKit bug #86899] Reset JS state settings.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
