  {
    // Before setting the property, we remove it if it's already set.
    // RemoveStyleInside might remove the node we're looking at or some of its
-   // descendants, however, in which case we want to set the property on
-   // whatever wound up in its place.  We have to save the original siblings and
-   // parent to figure this out.
-   NS_ENSURE_TRUE(aNode && aProperty, NS_ERROR_NULL_POINTER);
- 
+@@ -529,14 +536,15 @@
    nsCOMPtr<nsIContent> node = do_QueryInterface(aNode);
    NS_ENSURE_STATE(node);
  

 
 #include "nsColor.h"
 #include "nsColorPicker.h"
 #include "nsGtkUtils.h"
 #include "nsIWidget.h"
 #include "WidgetUtils.h"
 
 NS_IMPL_ISUPPORTS(nsColorPicker, nsIColorPicker)
@@ -35,38 +36,39 @@ GtkColorSelection* nsColorPicker::Widget
 {
   return GTK_COLOR_SELECTION(gtk_color_selection_dialog_get_color_selection(
                              GTK_COLOR_SELECTION_DIALOG(widget)));
 }
 
 /* void init (in nsIDOMWindow parent, in AString title, in short mode); */
 NS_IMETHODIMP nsColorPicker::Init(nsIDOMWindow *parent,
                                   const nsAString& title,

       ((aProperty == nsGkAtoms::b &&
         element->IsHTMLElement(nsGkAtoms::strong)) ||
        (aProperty == nsGkAtoms::i &&
@@ -305,7 +308,8 @@
   // style supports it
   if (!mHTMLCSSUtils->IsCSSEditableProperty(element, aProperty, aAttribute) ||
       !element->IsHTMLElement(nsGkAtoms::span) ||
