    }
  
    // 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

 
 // This must come outside of any namespace, or else it won't overload with the
 // double based version in nsMathUtils.h
@@ -596,19 +599,24 @@ HTMLInputElement::InitColorPicker()
   nsContentUtils::GetLocalizedString(nsContentUtils::eFORMS_PROPERTIES,
                                      "ColorPicker", title);
 

 #include "js/Date.h"
 
+#include "nsCSSParser.h"
+
 NS_IMPL_NS_NEW_HTML_ELEMENT_CHECK_PARSER(Input)
 
