    } else if (nsGkAtoms::tt == aHTMLProperty) {
      equivTable = ttEquivTable;
    } else if (aAttribute) {
+diff --git a/editor/libeditor/CSSEditUtils.h b/editor/libeditor/CSSEditUtils.h
+index 445c4cef71c0..46819400228a 100644
+--- a/editor/libeditor/CSSEditUtils.h
++++ b/editor/libeditor/CSSEditUtils.h
+@@ -107,7 +107,8 @@ public:
+   nsresult SetCSSProperty(dom::Element& aElement, nsIAtom& aProperty,
+                           const nsAString& aValue, bool aSuppressTxn = false);
+   nsresult SetCSSPropertyPixels(dom::Element& aElement,
+-                                nsIAtom& aProperty, int32_t aIntValue);
++                                nsIAtom& aProperty, int32_t aIntValue,
++                                bool aSuppressTxn = false);
+   nsresult RemoveCSSProperty(dom::Element& aElement,
+                              nsIAtom& aProperty,
+                              const nsAString& aPropertyValue,
 diff --git a/editor/libeditor/EditorBase.cpp b/editor/libeditor/EditorBase.cpp
 index a845b69aabd2..4c120782e3f1 100644
 --- a/editor/libeditor/EditorBase.cpp

   virtual nsresult MouseClick(nsIDOMMouseEvent* aMouseEvent);
   nsresult Focus(InternalFocusEvent* aFocusEvent);
   nsresult Blur(InternalFocusEvent* aBlurEvent);
diff --git a/editor/libeditor/HTMLEditRules.cpp b/editor/libeditor/HTMLEditRules.cpp
index 40bef2b30b0c..f6f4c86e93a6 100644
--- a/editor/libeditor/HTMLEditRules.cpp

     });
 }
diff --git a/editor/libeditor/CSSEditUtils.cpp b/editor/libeditor/CSSEditUtils.cpp
index 8d8ecc5c62c0..f59e98b60b17 100644
--- a/editor/libeditor/CSSEditUtils.cpp
+++ b/editor/libeditor/CSSEditUtils.cpp
@@ -339,11 +339,12 @@ CSSEditUtils::IsCSSEditableProperty(nsINode* aNode,
