Changeset 149907 in webkit


Ignore:
Timestamp:
May 10, 2013 2:28:14 PM (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-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):

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebKit/blackberry/Api/BackingStore.cpp

    r149819 r149907  
    849849#endif
    850850            } else {
    851                 if (!tileBuffer || !tileBuffer->isRendered(tileVisibleContentsRect(index, geometry), geometry->scale())
    852                     && !isCurrentVisibleJob(index, geometry))
     851                if (!tileBuffer || (!tileBuffer->isRendered(tileVisibleContentsRect(index, geometry), geometry->scale())
     852                    && !isCurrentVisibleJob(index, geometry)))
    853853                    updateTile(tileOrigin, false /*immediate*/);
    854854            }
  • trunk/Source/WebKit/blackberry/Api/WebPage.cpp

    r149820 r149907  
    28162816        } else
    28172817            break;
    2818     } while (tnode = tnode->parentNode());
     2818    } while ((tnode = tnode->parentNode()));
    28192819
    28202820    return adjustedRect;
     
    28382838
    28392839    if (!tnode->hasTagName(HTMLNames::imgTag) && !tnode->hasTagName(HTMLNames::inputTag) && !tnode->hasTagName(HTMLNames::textareaTag)) {
    2840         while (tnode = tnode->parentNode()) {
     2840        while ((tnode = tnode->parentNode())) {
    28412841            ASSERT(tnode);
    28422842            IntRect tRect = rectForNode(tnode);
  • trunk/Source/WebKit/blackberry/ChangeLog

    r149831 r149907  
     12013-05-10  Jacky Jiang  <zhajiang@blackberry.com>
     2
     3        Fix some compiler warnings (miscellaneous)
     4        https://bugs.webkit.org/show_bug.cgi?id=80790
     5
     6        Reviewed by Rob Buis.
     7
     8        Fix the following warnings for BlackBerry:
     9        BackingStore.cpp:852:60: warning: suggest parentheses around '&&' within
     10        '||' [-Wparentheses].
     11        WebPage.cpp:2858:40: warning: suggest parentheses around assignment used
     12        as truth value [-Wparentheses].
     13        WebPage.cpp:2880:42: warning: suggest parentheses around assignment used
     14        as truth value [-Wparentheses]
     15
     16        * Api/BackingStore.cpp:
     17        (BlackBerry::WebKit::BackingStorePrivate::updateTilesAfterBackingStoreRectChange):
     18        * Api/WebPage.cpp:
     19        (BlackBerry::WebKit::WebPagePrivate::adjustRectOffsetForFrameOffset):
     20        (BlackBerry::WebKit::WebPagePrivate::blockZoomRectForNode):
     21
    1222013-05-09  Mike Fenton  <mifenton@rim.com>
    223
  • trunk/Tools/ChangeLog

    r149902 r149907  
     12013-05-10  Jacky Jiang  <zhajiang@blackberry.com>
     2
     3        Fix some compiler warnings (miscellaneous)
     4        https://bugs.webkit.org/show_bug.cgi?id=80790
     5
     6        Reviewed by Rob Buis.
     7
     8        Fix the following warnings for BlackBerry:
     9        DumpRenderTree.cpp:357:42: warning: suggest parentheses around assignment
     10        used as truth value [-Wparentheses].
     11
     12        * DumpRenderTree/blackberry/DumpRenderTree.cpp:
     13        (BlackBerry::WebKit::DumpRenderTree::resetToConsistentStateBeforeTesting):
     14
    1152013-05-10  Jesus Sanchez-Palencia  <jesus.palencia@openbossa.org>
    216
  • trunk/Tools/DumpRenderTree/blackberry/DumpRenderTree.cpp

    r149769 r149907  
    355355        // FIXME: Other ports also clear history/backForwardList allong with visited links.
    356356        page->group().removeVisitedLinks();
    357         if (mainFrame = page->mainFrame()) {
     357        if ((mainFrame = page->mainFrame())) {
    358358            mainFrame->tree()->clearName();
    359359            mainFrame->loader()->setOpener(0);
Note: See TracChangeset for help on using the changeset viewer.