Bug 1309413 part.2 Rename the variable in SetDocumentTitleTransaction::SetDomTitle() from "res" to "rv" r=ehsan
authorMasayuki Nakano <masayuki@d-toybox.com>
Fri, 14 Oct 2016 18:37:00 +0900
changeset 364255 b398efe8d73ae1e4592539bd0b48cafb538c73a5
parent 364254 3c9019258e29b2fbba2ef31879e421ee7e79baf3
child 364256 d2aefe65689c1fe670389e2da3d0c092bf836721
push id1369
push userjlorenzo@mozilla.com
push dateMon, 27 Feb 2017 14:59:41 +0000
treeherdermozilla-release@d75a1dba431f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersehsan
bugs1309413
milestone52.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1309413 part.2 Rename the variable in SetDocumentTitleTransaction::SetDomTitle() from "res" to "rv" r=ehsan MozReview-Commit-ID: CMZbBIpq8y2
editor/libeditor/SetDocumentTitleTransaction.cpp
--- a/editor/libeditor/SetDocumentTitleTransaction.cpp
+++ b/editor/libeditor/SetDocumentTitleTransaction.cpp
@@ -64,54 +64,59 @@ SetDocumentTitleTransaction::RedoTransac
 }
 
 nsresult
 SetDocumentTitleTransaction::SetDomTitle(const nsAString& aTitle)
 {
   nsCOMPtr<nsIEditor> editor = do_QueryInterface(mEditor);
   NS_ENSURE_TRUE(editor, NS_ERROR_FAILURE);
   nsCOMPtr<nsIDOMDocument> domDoc;
-  nsresult res = editor->GetDocument(getter_AddRefs(domDoc));
+  nsresult rv = editor->GetDocument(getter_AddRefs(domDoc));
   NS_ENSURE_TRUE(domDoc, NS_ERROR_FAILURE);
 
   nsCOMPtr<nsIDOMNodeList> titleList;
-  res = domDoc->GetElementsByTagName(NS_LITERAL_STRING("title"), getter_AddRefs(titleList));
-  NS_ENSURE_SUCCESS(res, res);
+  rv = domDoc->GetElementsByTagName(NS_LITERAL_STRING("title"),
+                                    getter_AddRefs(titleList));
+  NS_ENSURE_SUCCESS(rv, rv);
 
   // First assume we will NOT really do anything
   // (transaction will not be pushed on stack)
   mIsTransient = true;
 
   nsCOMPtr<nsIDOMNode>titleNode;
   if(titleList)
   {
-    res = titleList->Item(0, getter_AddRefs(titleNode));
-    NS_ENSURE_SUCCESS(res, res);
+    rv = titleList->Item(0, getter_AddRefs(titleNode));
+    NS_ENSURE_SUCCESS(rv, rv);
     if (titleNode)
     {
       // Delete existing child textnode of title node
       // (Note: all contents under a TITLE node are always in a single text node)
       nsCOMPtr<nsIDOMNode> child;
-      res = titleNode->GetFirstChild(getter_AddRefs(child));
-      if(NS_FAILED(res)) return res;
+      rv = titleNode->GetFirstChild(getter_AddRefs(child));
+      if (NS_FAILED(rv)) {
+        return rv;
+      }
       if(child)
       {
         // Save current text as the undo value
         nsCOMPtr<nsIDOMCharacterData> textNode = do_QueryInterface(child);
         if(textNode)
         {
           textNode->GetData(mUndoValue);
 
           // If title text is identical to what already exists,
           // quit now (mIsTransient is now TRUE)
           if (mUndoValue == aTitle)
             return NS_OK;
         }
-        res = editor->DeleteNode(child);
-        if(NS_FAILED(res)) return res;
+        rv = editor->DeleteNode(child);
+        if (NS_WARN_IF(NS_FAILED(rv))) {
+          return rv;
+        }
       }
     }
   }
 
   // We didn't return above, thus we really will be changing the title
   mIsTransient = false;
 
   // Get the <HEAD> node, create a <TITLE> and insert it under the HEAD
@@ -125,67 +130,68 @@ SetDocumentTitleTransaction::SetDomTitle
 
   bool     newTitleNode = false;
   uint32_t newTitleIndex = 0;
 
   if (!titleNode)
   {
     // Didn't find one above: Create a new one
     nsCOMPtr<nsIDOMElement>titleElement;
-    res = domDoc->CreateElement(NS_LITERAL_STRING("title"), getter_AddRefs(titleElement));
-    NS_ENSURE_SUCCESS(res, res);
+    rv = domDoc->CreateElement(NS_LITERAL_STRING("title"),
+                               getter_AddRefs(titleElement));
+    NS_ENSURE_SUCCESS(rv, rv);
     NS_ENSURE_TRUE(titleElement, NS_ERROR_FAILURE);
 
     titleNode = do_QueryInterface(titleElement);
     newTitleNode = true;
 
     // Get index so we append new title node after all existing HEAD children.
     newTitleIndex = headElement->GetChildCount();
   }
 
   // Append a text node under the TITLE
   //  only if the title text isn't empty
   if (titleNode && !aTitle.IsEmpty())
   {
     nsCOMPtr<nsIDOMText> textNode;
-    res = domDoc->CreateTextNode(aTitle, getter_AddRefs(textNode));
-    NS_ENSURE_SUCCESS(res, res);
+    rv = domDoc->CreateTextNode(aTitle, getter_AddRefs(textNode));
+    NS_ENSURE_SUCCESS(rv, rv);
     nsCOMPtr<nsIDOMNode> newNode = do_QueryInterface(textNode);
     NS_ENSURE_TRUE(newNode, NS_ERROR_FAILURE);
 
     if (newTitleNode)
     {
       // Not undoable: We will insert newTitleNode below
       nsCOMPtr<nsIDOMNode> resultNode;
-      res = titleNode->AppendChild(newNode, getter_AddRefs(resultNode));
+      rv = titleNode->AppendChild(newNode, getter_AddRefs(resultNode));
     }
     else
     {
       // This is an undoable transaction
-      res = editor->InsertNode(newNode, titleNode, 0);
+      rv = editor->InsertNode(newNode, titleNode, 0);
     }
-    NS_ENSURE_SUCCESS(res, res);
+    NS_ENSURE_SUCCESS(rv, rv);
     // Calling AppendChild() or InsertNode() could cause removing the head
     // element.  So, let's mark it dirty.
     headElement = nullptr;
   }
 
   if (newTitleNode)
   {
     if (!headElement) {
       headElement = document->GetHeadElement();
       if (NS_WARN_IF(!headElement)) {
         // XXX Can we return NS_OK when there is no head element?
         return NS_ERROR_UNEXPECTED;
       }
     }
     // Undoable transaction to insert title+text together
-    res = editor->InsertNode(titleNode, headElement->AsDOMNode(), newTitleIndex);
+    rv = editor->InsertNode(titleNode, headElement->AsDOMNode(), newTitleIndex);
   }
-  return res;
+  return rv;
 }
 
 NS_IMETHODIMP
 SetDocumentTitleTransaction::GetTxnDescription(nsAString& aString)
 {
   aString.AssignLiteral("SetDocumentTitleTransaction: ");
   aString += mValue;
   return NS_OK;