From 92c7ee62af1e6d41752eeb54b14845e5fac15492 Mon Sep 17 00:00:00 2001
From: "surkov.alexander@gmail.com" <none@none>
Date: Fri, 8 Feb 2008 01:35:42 -0800
Subject: [PATCH] Bug 416109 - fix compile warnings, r=aaronlev, a=dsicore

---
 accessible/src/base/nsAccessNode.cpp           | 2 +-
 accessible/src/base/nsAccessibilityService.cpp | 3 ++-
 accessible/src/html/nsHyperTextAccessible.cpp  | 2 +-
 accessible/src/mac/nsRootAccessibleWrap.mm     | 4 +++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/accessible/src/base/nsAccessNode.cpp b/accessible/src/base/nsAccessNode.cpp
index b0b30ccb043..a5a2af997e0 100755
--- a/accessible/src/base/nsAccessNode.cpp
+++ b/accessible/src/base/nsAccessNode.cpp
@@ -467,7 +467,7 @@ nsAccessNode::ScrollToPoint(PRUint32 aCoordinateType, PRInt32 aX, PRInt32 aY)
   NS_ENSURE_SUCCESS(rv, rv);
 
   nsIFrame *parentFrame = frame;
-  while (parentFrame = parentFrame->GetParent())
+  while ((parentFrame = parentFrame->GetParent()))
     nsAccUtils::ScrollFrameToPoint(parentFrame, frame, coords);
 
   return NS_OK;
diff --git a/accessible/src/base/nsAccessibilityService.cpp b/accessible/src/base/nsAccessibilityService.cpp
index 5878a7c57fb..14cfb82f9ea 100644
--- a/accessible/src/base/nsAccessibilityService.cpp
+++ b/accessible/src/base/nsAccessibilityService.cpp
@@ -1441,7 +1441,8 @@ NS_IMETHODIMP nsAccessibilityService::GetAccessible(nsIDOMNode *aNode,
           if (!tableAccessible && !content->IsFocusable()) {
 #ifdef DEBUG
             nsRoleMapEntry *tableRoleMapEntry = nsAccUtils::GetRoleMapEntry(tableNode);
-            NS_ASSERTION(roleMapEntry && !nsCRT::strcmp(roleMapEntry->roleString, "presentation"),
+            NS_ASSERTION(tableRoleMapEntry &&
+                         !nsCRT::strcmp(tableRoleMapEntry->roleString, "presentation"),
                          "No accessible for parent table and it didn't have role of presentation");
 #endif
             // Table-related descendants of presentation table are also presentation
diff --git a/accessible/src/html/nsHyperTextAccessible.cpp b/accessible/src/html/nsHyperTextAccessible.cpp
index 538ae0f29d1..390a5223ff0 100644
--- a/accessible/src/html/nsHyperTextAccessible.cpp
+++ b/accessible/src/html/nsHyperTextAccessible.cpp
@@ -1873,7 +1873,7 @@ nsHyperTextAccessible::ScrollSubstringToPoint(PRInt32 aStartIndex,
 
   PRBool initialScrolled = PR_FALSE;
   nsIFrame *parentFrame = frame;
-  while (parentFrame = parentFrame->GetParent()) {
+  while ((parentFrame = parentFrame->GetParent())) {
     nsIScrollableFrame *scrollableFrame = nsnull;
     CallQueryInterface(parentFrame, &scrollableFrame);
     if (scrollableFrame) {
diff --git a/accessible/src/mac/nsRootAccessibleWrap.mm b/accessible/src/mac/nsRootAccessibleWrap.mm
index e4bc5558c6b..df5c0dbfd2e 100644
--- a/accessible/src/mac/nsRootAccessibleWrap.mm
+++ b/accessible/src/mac/nsRootAccessibleWrap.mm
@@ -36,9 +36,11 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#include "nsCOMPtr.h"
 #include "nsRootAccessibleWrap.h"
 
+#include "mozDocAccessible.h"
+
+#include "nsCOMPtr.h"
 #include "nsIWidget.h"
 #include "nsIViewManager.h"