    }
  
    // Delete cells whose contents were moved
+@@ -2687,17 +2735,17 @@ nsHTMLEditor::GetCellDataAt(nsIDOMElemen
+   }
+ 
+   nsTableOuterFrame* tableFrame = GetTableFrame(aTable);
+   NS_ENSURE_TRUE(tableFrame, NS_ERROR_FAILURE);
+ 
+   nsTableCellFrame* cellFrame =
+     tableFrame->GetCellFrameAt(aRowIndex, aColIndex);
+   if (!cellFrame)
+-    return NS_ERROR_FAILURE;
++    return NS_EDITOR_ELEMENT_NOT_FOUND;
+ 
+   *aIsSelected = cellFrame->IsSelected();
+   cellFrame->GetRowIndex(*aStartRowIndex);
+   cellFrame->GetColIndex(*aStartColIndex);
+   *aRowSpan = cellFrame->GetRowSpan();
+   *aColSpan = cellFrame->GetColSpan();
+   *aActualRowSpan = tableFrame->GetEffectiveRowSpanAt(aRowIndex, aColIndex);
+   *aActualColSpan = tableFrame->GetEffectiveColSpanAt(aRowIndex, aColIndex);
 diff --git a/editor/libeditor/nsWSRunObject.cpp b/editor/libeditor/nsWSRunObject.cpp
 --- a/editor/libeditor/nsWSRunObject.cpp
 +++ b/editor/libeditor/nsWSRunObject.cpp

     return NS_ERROR_FAILURE;
   }
 
+  PRBool showAlpha = false;
+  nsCOMPtr<nsIDOMXULDocument> xulDoc = do_QueryInterface(doc);
+  if (xulDoc)
+    showAlpha = true;
+
   nsAutoString initialValue;
   GetValueInternal(initialValue);

diff --git a/dom/html/HTMLInputElement.cpp b/dom/html/HTMLInputElement.cpp
--- a/dom/html/HTMLInputElement.cpp
+++ b/dom/html/HTMLInputElement.cpp
@@ -116,16 +116,18 @@
 #include "HTMLSplitOnSpacesTokenizer.h"
 #include "nsIController.h"
 #include "nsIMIMEInfo.h"
