bug 103443 replace the return rv?rv:NS_ERROR_FAILURE; with a more correct version

r=dbaron sr=attinasi


git-svn-id: svn://10.0.0.236/trunk@105372 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/layout/base/nsPresShell.cpp

@@ -4274,8 +4274,11 @@ PresShell::DoCopy()
   nsCOMPtr<nsIEventStateManager> manager;
   nsCOMPtr<nsIContent> content;
   rv = mPresContext->GetEventStateManager(getter_AddRefs(manager));
-  if (NS_FAILED(rv) || !manager)
-    return rv?rv:NS_ERROR_FAILURE;
+  if (NS_FAILED(rv)) 
+    return rv;
+  if (!manager) 
+    return NS_ERROR_FAILURE;
+
   rv = manager->GetFocusedContent(getter_AddRefs(content));
   if (NS_SUCCEEDED(rv) && content)
   {
@@ -4287,20 +4290,28 @@ PresShell::DoCopy()
     {
       nsIFrame *htmlInputFrame;
       rv = GetPrimaryFrameFor(content, &htmlInputFrame);
-      if (NS_FAILED(rv) || !htmlInputFrame)
-        return rv?rv:NS_ERROR_FAILURE;
+      if (NS_FAILED(rv)) 
+        return rv;
+      if (!htmlInputFrame) 
+        return NS_ERROR_FAILURE;
+
       nsCOMPtr<nsISelectionController> selCon;
       rv = htmlInputFrame->GetSelectionController(mPresContext,getter_AddRefs(selCon));
-      if (NS_FAILED(rv) || !selCon)
-        return rv?rv:NS_ERROR_FAILURE;
+      if (NS_FAILED(rv)) 
+        return rv;
+      if (!selCon) 
+        return NS_ERROR_FAILURE;
+
       rv = selCon->GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(sel));
     }
   }
   if (!sel) //get selection from this PresShell
     rv = GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(sel));
     
-  if (NS_FAILED(rv) || !sel)
-    return rv?rv:NS_ERROR_FAILURE;
+  if (NS_FAILED(rv)) 
+    return rv;
+  if (!sel) 
+    return NS_ERROR_FAILURE;
 
   // Now we have the selection.  Make sure it's nonzero:
   PRBool isCollapsed;

mozilla/layout/generic/nsFrame.cpp

@@ -4119,8 +4119,10 @@ nsFrame::CaptureMouse(nsIPresContext* aPresContext, PRBool aGrabMouseEvents)
   if (!view)
   {
     nsresult rv = GetParentWithView(aPresContext, &parent);
-    if (!parent || NS_FAILED(rv))
-      return rv?rv:NS_ERROR_FAILURE;
+    if (NS_FAILED(rv)) 
+      return rv;
+    if (!parent) 
+      return NS_ERROR_FAILURE;
     parent->GetView(aPresContext,&view);
   }
 
@@ -4151,8 +4153,11 @@ nsFrame::IsMouseCaptured(nsIPresContext* aPresContext)
   {
     nsIFrame *parent;//might be THIS frame thats ok
     nsresult rv = GetParentWithView(aPresContext, &parent);
-    if (!parent || NS_FAILED(rv))
-      return rv?rv:NS_ERROR_FAILURE;
+    if (NS_FAILED(rv)) 
+      return rv;
+    if (!parent) 
+      return NS_ERROR_FAILURE;
+
     parent->GetView(aPresContext,&view);
   }
   nsCOMPtr<nsIViewManager> viewMan;

mozilla/layout/generic/nsTextFrame.cpp

@@ -1893,8 +1893,10 @@ nsTextFrame::GetContentAndOffsetsForSelection(nsIPresContext *aPresContext, nsIC
     {
       //we COULD check the previous sibling but I dont think that is reliable
       rv = parent->GetContent(aContent);
-      if (NS_FAILED(rv) || !*aContent)
-        return rv?rv:NS_ERROR_FAILURE;
+      if (NS_FAILED(rv))
+        return rv;
+      if(!*aContent)
+        return NS_ERROR_FAILURE;
 
       //ARE WE A BEFORE FRAME? if not then we assume we are an after frame. this may be bad later
       nsIFrame *grandParent;
@@ -4204,13 +4206,18 @@ nsTextFrame::CheckVisibility(nsIPresContext* aContext, PRInt32 aStartIndex, PRIn
   //get the presshell
     nsCOMPtr<nsIPresShell> shell;
     rv = aContext->GetShell(getter_AddRefs(shell));
-    if (NS_FAILED(rv) || !shell)
-      return rv?rv:NS_ERROR_FAILURE;
+    if (NS_FAILED(rv))
+      return rv;
+    if (!shell) 
+      return NS_ERROR_FAILURE;
+
   //get the document
     nsCOMPtr<nsIDocument> doc;
     rv = shell->GetDocument(getter_AddRefs(doc));
+    if (NS_FAILED(rv))
+      return rv;
     if (!doc)
-      return rv?rv:NS_ERROR_FAILURE;
+      return NS_ERROR_FAILURE;
   //get the linebreaker
     nsCOMPtr<nsILineBreaker> lb;
     doc->GetLineBreaker(getter_AddRefs(lb));

mozilla/layout/html/base/src/nsFrame.cpp

@@ -4119,8 +4119,10 @@ nsFrame::CaptureMouse(nsIPresContext* aPresContext, PRBool aGrabMouseEvents)
   if (!view)
   {
     nsresult rv = GetParentWithView(aPresContext, &parent);
-    if (!parent || NS_FAILED(rv))
-      return rv?rv:NS_ERROR_FAILURE;
+    if (NS_FAILED(rv)) 
+      return rv;
+    if (!parent) 
+      return NS_ERROR_FAILURE;
     parent->GetView(aPresContext,&view);
   }
 
@@ -4151,8 +4153,11 @@ nsFrame::IsMouseCaptured(nsIPresContext* aPresContext)
   {
     nsIFrame *parent;//might be THIS frame thats ok
     nsresult rv = GetParentWithView(aPresContext, &parent);
-    if (!parent || NS_FAILED(rv))
-      return rv?rv:NS_ERROR_FAILURE;
+    if (NS_FAILED(rv)) 
+      return rv;
+    if (!parent) 
+      return NS_ERROR_FAILURE;
+
     parent->GetView(aPresContext,&view);
   }
   nsCOMPtr<nsIViewManager> viewMan;

mozilla/layout/html/base/src/nsPresShell.cpp

@@ -4274,8 +4274,11 @@ PresShell::DoCopy()
   nsCOMPtr<nsIEventStateManager> manager;
   nsCOMPtr<nsIContent> content;
   rv = mPresContext->GetEventStateManager(getter_AddRefs(manager));
-  if (NS_FAILED(rv) || !manager)
-    return rv?rv:NS_ERROR_FAILURE;
+  if (NS_FAILED(rv)) 
+    return rv;
+  if (!manager) 
+    return NS_ERROR_FAILURE;
+
   rv = manager->GetFocusedContent(getter_AddRefs(content));
   if (NS_SUCCEEDED(rv) && content)
   {
@@ -4287,20 +4290,28 @@ PresShell::DoCopy()
     {
       nsIFrame *htmlInputFrame;
       rv = GetPrimaryFrameFor(content, &htmlInputFrame);
-      if (NS_FAILED(rv) || !htmlInputFrame)
-        return rv?rv:NS_ERROR_FAILURE;
+      if (NS_FAILED(rv)) 
+        return rv;
+      if (!htmlInputFrame) 
+        return NS_ERROR_FAILURE;
+
       nsCOMPtr<nsISelectionController> selCon;
       rv = htmlInputFrame->GetSelectionController(mPresContext,getter_AddRefs(selCon));
-      if (NS_FAILED(rv) || !selCon)
-        return rv?rv:NS_ERROR_FAILURE;
+      if (NS_FAILED(rv)) 
+        return rv;
+      if (!selCon) 
+        return NS_ERROR_FAILURE;
+
       rv = selCon->GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(sel));
     }
   }
   if (!sel) //get selection from this PresShell
     rv = GetSelection(nsISelectionController::SELECTION_NORMAL, getter_AddRefs(sel));
     
-  if (NS_FAILED(rv) || !sel)
-    return rv?rv:NS_ERROR_FAILURE;
+  if (NS_FAILED(rv)) 
+    return rv;
+  if (!sel) 
+    return NS_ERROR_FAILURE;
 
   // Now we have the selection.  Make sure it's nonzero:
   PRBool isCollapsed;

mozilla/layout/html/base/src/nsTextFrame.cpp

@@ -1893,8 +1893,10 @@ nsTextFrame::GetContentAndOffsetsForSelection(nsIPresContext *aPresContext, nsIC
     {
       //we COULD check the previous sibling but I dont think that is reliable
       rv = parent->GetContent(aContent);
-      if (NS_FAILED(rv) || !*aContent)
-        return rv?rv:NS_ERROR_FAILURE;
+      if (NS_FAILED(rv))
+        return rv;
+      if(!*aContent)
+        return NS_ERROR_FAILURE;
 
       //ARE WE A BEFORE FRAME? if not then we assume we are an after frame. this may be bad later
       nsIFrame *grandParent;
@@ -4204,13 +4206,18 @@ nsTextFrame::CheckVisibility(nsIPresContext* aContext, PRInt32 aStartIndex, PRIn
   //get the presshell
     nsCOMPtr<nsIPresShell> shell;
     rv = aContext->GetShell(getter_AddRefs(shell));
-    if (NS_FAILED(rv) || !shell)
-      return rv?rv:NS_ERROR_FAILURE;
+    if (NS_FAILED(rv))
+      return rv;
+    if (!shell) 
+      return NS_ERROR_FAILURE;
+
   //get the document
     nsCOMPtr<nsIDocument> doc;
     rv = shell->GetDocument(getter_AddRefs(doc));
+    if (NS_FAILED(rv))
+      return rv;
     if (!doc)
-      return rv?rv:NS_ERROR_FAILURE;
+      return NS_ERROR_FAILURE;
   //get the linebreaker
     nsCOMPtr<nsILineBreaker> lb;
     doc->GetLineBreaker(getter_AddRefs(lb));

mozilla/layout/html/forms/src/nsGfxTextControlFrame2.cpp

@@ -548,22 +548,30 @@ nsresult nsTextInputListener::UpdateTextInputCommands(const nsString& commandsTo
   
   nsCOMPtr<nsIContent> content;
   nsresult rv = mFrame->GetContent(getter_AddRefs(content));
-  if (NS_FAILED(rv) || !content ) 
-    return rv?rv:NS_ERROR_FAILURE;
+  if (NS_FAILED(rv)) 
+    return rv;
+  if (!content) 
+    return NS_ERROR_FAILURE;
   
   nsCOMPtr<nsIDocument> doc;
   rv = content->GetDocument(*getter_AddRefs(doc));
-  if (NS_FAILED(rv) || !doc ) 
-    return rv?rv:NS_ERROR_FAILURE;
+  if (NS_FAILED(rv)) 
+    return rv;
+  if (!doc)
+    return NS_ERROR_FAILURE;
 
   nsCOMPtr<nsIScriptGlobalObject> scriptGlobalObject;
   rv = doc->GetScriptGlobalObject(getter_AddRefs(scriptGlobalObject));
-  if (NS_FAILED(rv) || !scriptGlobalObject ) 
-    return rv?rv:NS_ERROR_FAILURE;
+  if (NS_FAILED(rv))
+    return rv;
+  if (!scriptGlobalObject)
+    return NS_ERROR_FAILURE;
 
   nsCOMPtr<nsIDOMWindowInternal> domWindow = do_QueryInterface(scriptGlobalObject, &rv);
-  if (NS_FAILED(rv) || !domWindow ) 
-    return rv?rv:NS_ERROR_FAILURE;
+  if (NS_FAILED(rv))
+    return rv;
+  if (!domWindow)
+    return NS_ERROR_FAILURE;
 
   return domWindow->UpdateCommands(commandsToUpdate);
 }
@@ -1954,8 +1962,10 @@ nsGfxTextControlFrame2::CreateAnonymousContent(nsIPresContext* aPresContext,
   // Now create a DIV and add it to the anonymous content child list.
   nsCOMPtr<nsIElementFactory> elementFactory;
   rv = GetElementFactoryService(getter_AddRefs(elementFactory));
-  if (NS_FAILED(rv) || ! elementFactory)
-    return rv?rv:NS_ERROR_FAILURE;
+  if (NS_FAILED(rv))
+    return rv;
+  if (!elementFactory)
+    return NS_ERROR_FAILURE;
 
   nsCOMPtr<nsINodeInfoManager> nodeInfoManager;
   rv = doc->GetNodeInfoManager(*getter_AddRefs(nodeInfoManager));
@@ -3027,8 +3037,10 @@ nsGfxTextControlFrame2::AttributeChanged(nsIPresContext* aPresContext,
   {
     nsCOMPtr<nsIPresShell> shell;
     rv = aPresContext->GetShell(getter_AddRefs(shell));
-    if (NS_FAILED(rv) || !shell)
-      return rv?rv:NS_ERROR_FAILURE;
+    if (NS_FAILED(rv))
+      return rv;
+    if (!shell)
+      return NS_ERROR_FAILURE;
 
     rv = DoesAttributeExist(nsHTMLAtoms::disabled);
     PRUint32 flags;
@@ -3432,8 +3444,10 @@ nsGfxTextControlFrame2::SetInitialChildList(nsIPresContext* aPresContext,
     NS_ASSERTION(NS_SUCCEEDED(rv), "failed to register focus listener");
     nsCOMPtr<nsIPresShell> shell;
     nsresult rv = aPresContext->GetShell(getter_AddRefs(shell));
-    if (NS_FAILED(rv) || !shell)
-      return rv?rv:NS_ERROR_FAILURE;
+    if (NS_FAILED(rv))
+      return rv;
+    if (!shell)
+      return NS_ERROR_FAILURE;
   }
 
   while(first)

mozilla/layout/html/table/src/nsTableRowGroupFrame.cpp

@@ -1730,8 +1730,10 @@ nsTableRowGroupFrame::FindFrameAt(PRInt32    aLineNumber,
 
       rv = tempFrame->GetParent(&tempParentFrame);
     
-      if(NS_FAILED(rv) || !tempParentFrame)
-        return rv?rv:NS_ERROR_FAILURE;
+      if(NS_FAILED(rv))
+        return rv;
+      if(!tempParentFrame)
+        return NS_ERROR_FAILURE;
 
       tempParentFrame->GetRect(parentRectRef);
       aX -= parentRect.x;

mozilla/layout/tables/nsTableRowGroupFrame.cpp

@@ -1730,8 +1730,10 @@ nsTableRowGroupFrame::FindFrameAt(PRInt32    aLineNumber,
 
       rv = tempFrame->GetParent(&tempParentFrame);
     
-      if(NS_FAILED(rv) || !tempParentFrame)
-        return rv?rv:NS_ERROR_FAILURE;
+      if(NS_FAILED(rv))
+        return rv;
+      if(!tempParentFrame)
+        return NS_ERROR_FAILURE;
 
       tempParentFrame->GetRect(parentRectRef);
       aX -= parentRect.x;