Bug 454469: prbool issues in content/ r+sr=sicking
authorTaras Glek <tglek@mozilla.com>
Tue, 14 Oct 2008 12:00:08 -0700
changeset 20484 f57be2771480e5a3372e05a15e63d9f05ae40907
parent 20483 4d78262505d706efa80926d23baf9d674c0d3d55
child 20485 1889da60bbf4621abc79ffaaa0d2b0e6f0a5c963
push id2899
push usertglek@mozilla.com
push dateTue, 14 Oct 2008 19:20:23 +0000
treeherderautoland@f57be2771480 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs454469
milestone1.9.1b2pre
Bug 454469: prbool issues in content/ r+sr=sicking
content/events/src/nsEventStateManager.cpp
content/html/document/src/nsHTMLContentSink.cpp
--- a/content/events/src/nsEventStateManager.cpp
+++ b/content/events/src/nsEventStateManager.cpp
@@ -2884,33 +2884,33 @@ nsEventStateManager::PostHandleEvent(nsP
             action = -1;
           }
         }
 
         switch (action) {
         case MOUSE_SCROLL_N_LINES:
           {
             DoScrollText(presContext, aTargetFrame, msEvent, msEvent->delta,
-                         (msEvent->scrollFlags & nsMouseScrollEvent::kIsHorizontal),
+                         !!(msEvent->scrollFlags & nsMouseScrollEvent::kIsHorizontal),
                          eScrollByLine);
           }
           break;
 
         case MOUSE_SCROLL_PAGE:
           {
             DoScrollText(presContext, aTargetFrame, msEvent, msEvent->delta,
-                         (msEvent->scrollFlags & nsMouseScrollEvent::kIsHorizontal),
+                         !!(msEvent->scrollFlags & nsMouseScrollEvent::kIsHorizontal),
                          eScrollByPage);
           }
           break;
 
         case MOUSE_SCROLL_PIXELS:
           {
             DoScrollText(presContext, aTargetFrame, msEvent, msEvent->delta,
-                         (msEvent->scrollFlags & nsMouseScrollEvent::kIsHorizontal),
+                         !!(msEvent->scrollFlags & nsMouseScrollEvent::kIsHorizontal),
                          eScrollByPixel);
           }
           break;
 
         case MOUSE_SCROLL_HISTORY:
           {
             DoScrollHistory(msEvent->delta);
           }
--- a/content/html/document/src/nsHTMLContentSink.cpp
+++ b/content/html/document/src/nsHTMLContentSink.cpp
@@ -2060,17 +2060,17 @@ HTMLContentSink::OpenBody(const nsIParse
     
     PRInt32 insertionPoint =
       mCurrentContext->mStack[parentIndex].mInsertionPoint;
 
     // XXX: I have yet to see a case where numFlushed is non-zero and
     // insertionPoint is not -1, but this code will try to handle
     // those cases too.
 
-    PRBool oldUpdates = mUpdatesInNotification;
+    PRUint32 oldUpdates = mUpdatesInNotification;
     mUpdatesInNotification = 0;
     if (insertionPoint != -1) {
       NotifyInsert(parent, mBody, insertionPoint - 1);
     } else {
       NotifyAppend(parent, numFlushed);
     }
     mCurrentContext->mStack[parentIndex].mNumFlushed = childCount;
     if (mUpdatesInNotification > 1) {
@@ -2222,17 +2222,17 @@ HTMLContentSink::OpenFrameset(const nsIP
 
     PRInt32 insertionPoint =
       mCurrentContext->mStack[parentIndex].mInsertionPoint;
 
     // XXX: I have yet to see a case where numFlushed is non-zero and
     // insertionPoint is not -1, but this code will try to handle
     // those cases too.
 
-    PRBool oldUpdates = mUpdatesInNotification;
+    PRUint32 oldUpdates = mUpdatesInNotification;
     mUpdatesInNotification = 0;
     if (insertionPoint != -1) {
       NotifyInsert(parent, mFrameset, insertionPoint - 1);
     } else {
       NotifyAppend(parent, numFlushed);
     }
     mCurrentContext->mStack[parentIndex].mNumFlushed = childCount;
     if (mUpdatesInNotification > 1) {