diff --git a/mozilla/dom/public/coreDom/nsIDOMStyleSheet.h b/mozilla/dom/public/coreDom/nsIDOMStyleSheet.h
index a000ab59a03..d3f893dcf2a 100644
--- a/mozilla/dom/public/coreDom/nsIDOMStyleSheet.h
+++ b/mozilla/dom/public/coreDom/nsIDOMStyleSheet.h
@@ -32,6 +32,8 @@
 class nsIDOMStyleSheet : public nsISupports {
 public:
 
+  NS_IMETHOD    GetType(nsString& aType)=0;
+
   NS_IMETHOD    GetDisabled(PRBool* aDisabled)=0;
   NS_IMETHOD    SetDisabled(PRBool aDisabled)=0;
 
@@ -40,6 +42,7 @@ public:
 
 
 #define NS_DECL_IDOMSTYLESHEET   \
+  NS_IMETHOD    GetType(nsString& aType);  \
   NS_IMETHOD    GetDisabled(PRBool* aDisabled);  \
   NS_IMETHOD    SetDisabled(PRBool aDisabled);  \
   NS_IMETHOD    GetReadOnly(PRBool* aReadOnly);  \
@@ -47,6 +50,7 @@ public:
 
 
 #define NS_FORWARD_IDOMSTYLESHEET(_to)  \
+  NS_IMETHOD    GetType(nsString& aType) { return _to##GetType(aType); } \
   NS_IMETHOD    GetDisabled(PRBool* aDisabled) { return _to##GetDisabled(aDisabled); } \
   NS_IMETHOD    SetDisabled(PRBool aDisabled) { return _to##SetDisabled(aDisabled); } \
   NS_IMETHOD    GetReadOnly(PRBool* aReadOnly) { return _to##GetReadOnly(aReadOnly); } \
diff --git a/mozilla/dom/public/css/MANIFEST b/mozilla/dom/public/css/MANIFEST
index 3ae025ee21d..fe3c530d526 100644
--- a/mozilla/dom/public/css/MANIFEST
+++ b/mozilla/dom/public/css/MANIFEST
@@ -16,9 +16,12 @@
 # This is a list of local files which get copied to the mozilla:dist:dom directory
 #
 
+nsIDOMCSS2Properties.h
 nsIDOMCSSFontFaceRule.h
+nsIDOMCSSImportRule.h
 nsIDOMCSSMediaRule.h
-nsIDOMCSSPageRule.h		   
+nsIDOMCSSPageRule.h
+nsIDOMCSSRule.h
 nsIDOMCSSStyleDeclaration.h
 nsIDOMCSSStyleRule.h
 nsIDOMCSSStyleRuleCollection.h
diff --git a/mozilla/dom/public/css/Makefile.in b/mozilla/dom/public/css/Makefile.in
index 56c3551b1a6..7778d130a6a 100644
--- a/mozilla/dom/public/css/Makefile.in
+++ b/mozilla/dom/public/css/Makefile.in
@@ -25,13 +25,16 @@ include $(DEPTH)/config/autoconf.mk
 DEFINES += -D_IMPL_NS_DOM
 
 EXPORTS =               \
-	nsIDOMCSSFontFaceRule.h \
-	nsIDOMCSSMediaRule.h \
-	nsIDOMCSSPageRule.h \
-	nsIDOMCSSStyleDeclaration.h \
-	nsIDOMCSSStyleRule.h \
-	nsIDOMCSSStyleRuleCollection.h \
-	nsIDOMCSSStyleRuleSimple.h \
+  nsIDOMCSS2Properties.h \
+  nsIDOMCSSFontFaceRule.h \
+  nsIDOMCSSImportRule.h \
+  nsIDOMCSSMediaRule.h \
+  nsIDOMCSSPageRule.h \
+  nsIDOMCSSRule.h \
+  nsIDOMCSSStyleDeclaration.h \
+  nsIDOMCSSStyleRule.h \
+  nsIDOMCSSStyleRuleCollection.h \
+  nsIDOMCSSStyleRuleSimple.h \
 	nsIDOMCSSStyleSheet.h \
         $(NULL)
 
diff --git a/mozilla/dom/public/css/makefile.win b/mozilla/dom/public/css/makefile.win
index 89e28ac609e..cbaed1d5f11 100644
--- a/mozilla/dom/public/css/makefile.win
+++ b/mozilla/dom/public/css/makefile.win
@@ -20,14 +20,17 @@ IGNORE_MANIFEST=1
 
 DEFINES=-D_IMPL_NS_DOM 
 EXPORTS= \
-	nsIDOMCSSFontFaceRule.h \
-	nsIDOMCSSMediaRule.h \
-	nsIDOMCSSPageRule.h \
-	nsIDOMCSSStyleDeclaration.h \
-	nsIDOMCSSStyleRule.h \
-	nsIDOMCSSStyleRuleCollection.h \
-	nsIDOMCSSStyleRuleSimple.h \
-	nsIDOMCSSStyleSheet.h
+  nsIDOMCSS2Properties.h \
+  nsIDOMCSSFontFaceRule.h \
+  nsIDOMCSSImportRule.h \
+  nsIDOMCSSMediaRule.h \
+  nsIDOMCSSPageRule.h \
+  nsIDOMCSSRule.h \
+  nsIDOMCSSStyleDeclaration.h \
+  nsIDOMCSSStyleRule.h \
+  nsIDOMCSSStyleRuleCollection.h \
+  nsIDOMCSSStyleSheet.h \
+  nsIDOMCSSUnknownRule.h
 
 MODULE=dom 
 
diff --git a/mozilla/dom/public/css/nsIDOMCSS2Properties.h b/mozilla/dom/public/css/nsIDOMCSS2Properties.h
new file mode 100644
index 00000000000..9cd32af7077
--- /dev/null
+++ b/mozilla/dom/public/css/nsIDOMCSS2Properties.h
@@ -0,0 +1,910 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#ifndef nsIDOMCSS2Properties_h__
+#define nsIDOMCSS2Properties_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIScriptContext.h"
+#include "nsIDOMCSSStyleDeclaration.h"
+
+
+#define NS_IDOMCSS2PROPERTIES_IID \
+ { 0xa6cf90d1, 0x15b3, 0x11d2, \
+    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
+
+class nsIDOMCSS2Properties : public nsIDOMCSSStyleDeclaration {
+public:
+
+  NS_IMETHOD    GetAzimuth(nsString& aAzimuth)=0;
+  NS_IMETHOD    SetAzimuth(const nsString& aAzimuth)=0;
+
+  NS_IMETHOD    GetBackground(nsString& aBackground)=0;
+  NS_IMETHOD    SetBackground(const nsString& aBackground)=0;
+
+  NS_IMETHOD    GetBackgroundAttachment(nsString& aBackgroundAttachment)=0;
+  NS_IMETHOD    SetBackgroundAttachment(const nsString& aBackgroundAttachment)=0;
+
+  NS_IMETHOD    GetBackgroundColor(nsString& aBackgroundColor)=0;
+  NS_IMETHOD    SetBackgroundColor(const nsString& aBackgroundColor)=0;
+
+  NS_IMETHOD    GetBackgroundImage(nsString& aBackgroundImage)=0;
+  NS_IMETHOD    SetBackgroundImage(const nsString& aBackgroundImage)=0;
+
+  NS_IMETHOD    GetBackgroundPosition(nsString& aBackgroundPosition)=0;
+  NS_IMETHOD    SetBackgroundPosition(const nsString& aBackgroundPosition)=0;
+
+  NS_IMETHOD    GetBackgroundRepeat(nsString& aBackgroundRepeat)=0;
+  NS_IMETHOD    SetBackgroundRepeat(const nsString& aBackgroundRepeat)=0;
+
+  NS_IMETHOD    GetBorder(nsString& aBorder)=0;
+  NS_IMETHOD    SetBorder(const nsString& aBorder)=0;
+
+  NS_IMETHOD    GetBorderCollapse(nsString& aBorderCollapse)=0;
+  NS_IMETHOD    SetBorderCollapse(const nsString& aBorderCollapse)=0;
+
+  NS_IMETHOD    GetBorderColor(nsString& aBorderColor)=0;
+  NS_IMETHOD    SetBorderColor(const nsString& aBorderColor)=0;
+
+  NS_IMETHOD    GetBorderSpacing(nsString& aBorderSpacing)=0;
+  NS_IMETHOD    SetBorderSpacing(const nsString& aBorderSpacing)=0;
+
+  NS_IMETHOD    GetBorderStyle(nsString& aBorderStyle)=0;
+  NS_IMETHOD    SetBorderStyle(const nsString& aBorderStyle)=0;
+
+  NS_IMETHOD    GetBorderTop(nsString& aBorderTop)=0;
+  NS_IMETHOD    SetBorderTop(const nsString& aBorderTop)=0;
+
+  NS_IMETHOD    GetBorderRight(nsString& aBorderRight)=0;
+  NS_IMETHOD    SetBorderRight(const nsString& aBorderRight)=0;
+
+  NS_IMETHOD    GetBorderBottom(nsString& aBorderBottom)=0;
+  NS_IMETHOD    SetBorderBottom(const nsString& aBorderBottom)=0;
+
+  NS_IMETHOD    GetBorderLeft(nsString& aBorderLeft)=0;
+  NS_IMETHOD    SetBorderLeft(const nsString& aBorderLeft)=0;
+
+  NS_IMETHOD    GetBorderTopColor(nsString& aBorderTopColor)=0;
+  NS_IMETHOD    SetBorderTopColor(const nsString& aBorderTopColor)=0;
+
+  NS_IMETHOD    GetBorderRightColor(nsString& aBorderRightColor)=0;
+  NS_IMETHOD    SetBorderRightColor(const nsString& aBorderRightColor)=0;
+
+  NS_IMETHOD    GetBorderBottomColor(nsString& aBorderBottomColor)=0;
+  NS_IMETHOD    SetBorderBottomColor(const nsString& aBorderBottomColor)=0;
+
+  NS_IMETHOD    GetBorderLeftColor(nsString& aBorderLeftColor)=0;
+  NS_IMETHOD    SetBorderLeftColor(const nsString& aBorderLeftColor)=0;
+
+  NS_IMETHOD    GetBorderTopStyle(nsString& aBorderTopStyle)=0;
+  NS_IMETHOD    SetBorderTopStyle(const nsString& aBorderTopStyle)=0;
+
+  NS_IMETHOD    GetBorderRightStyle(nsString& aBorderRightStyle)=0;
+  NS_IMETHOD    SetBorderRightStyle(const nsString& aBorderRightStyle)=0;
+
+  NS_IMETHOD    GetBorderBottomStyle(nsString& aBorderBottomStyle)=0;
+  NS_IMETHOD    SetBorderBottomStyle(const nsString& aBorderBottomStyle)=0;
+
+  NS_IMETHOD    GetBorderLeftStyle(nsString& aBorderLeftStyle)=0;
+  NS_IMETHOD    SetBorderLeftStyle(const nsString& aBorderLeftStyle)=0;
+
+  NS_IMETHOD    GetBorderTopWidth(nsString& aBorderTopWidth)=0;
+  NS_IMETHOD    SetBorderTopWidth(const nsString& aBorderTopWidth)=0;
+
+  NS_IMETHOD    GetBorderRightWidth(nsString& aBorderRightWidth)=0;
+  NS_IMETHOD    SetBorderRightWidth(const nsString& aBorderRightWidth)=0;
+
+  NS_IMETHOD    GetBorderBottomWidth(nsString& aBorderBottomWidth)=0;
+  NS_IMETHOD    SetBorderBottomWidth(const nsString& aBorderBottomWidth)=0;
+
+  NS_IMETHOD    GetBorderLeftWidth(nsString& aBorderLeftWidth)=0;
+  NS_IMETHOD    SetBorderLeftWidth(const nsString& aBorderLeftWidth)=0;
+
+  NS_IMETHOD    GetBorderWidth(nsString& aBorderWidth)=0;
+  NS_IMETHOD    SetBorderWidth(const nsString& aBorderWidth)=0;
+
+  NS_IMETHOD    GetBottom(nsString& aBottom)=0;
+  NS_IMETHOD    SetBottom(const nsString& aBottom)=0;
+
+  NS_IMETHOD    GetCaptionSide(nsString& aCaptionSide)=0;
+  NS_IMETHOD    SetCaptionSide(const nsString& aCaptionSide)=0;
+
+  NS_IMETHOD    GetClear(nsString& aClear)=0;
+  NS_IMETHOD    SetClear(const nsString& aClear)=0;
+
+  NS_IMETHOD    GetClip(nsString& aClip)=0;
+  NS_IMETHOD    SetClip(const nsString& aClip)=0;
+
+  NS_IMETHOD    GetColor(nsString& aColor)=0;
+  NS_IMETHOD    SetColor(const nsString& aColor)=0;
+
+  NS_IMETHOD    GetContent(nsString& aContent)=0;
+  NS_IMETHOD    SetContent(const nsString& aContent)=0;
+
+  NS_IMETHOD    GetCounterIncrement(nsString& aCounterIncrement)=0;
+  NS_IMETHOD    SetCounterIncrement(const nsString& aCounterIncrement)=0;
+
+  NS_IMETHOD    GetCounterReset(nsString& aCounterReset)=0;
+  NS_IMETHOD    SetCounterReset(const nsString& aCounterReset)=0;
+
+  NS_IMETHOD    GetCue(nsString& aCue)=0;
+  NS_IMETHOD    SetCue(const nsString& aCue)=0;
+
+  NS_IMETHOD    GetCueAfter(nsString& aCueAfter)=0;
+  NS_IMETHOD    SetCueAfter(const nsString& aCueAfter)=0;
+
+  NS_IMETHOD    GetCueBefore(nsString& aCueBefore)=0;
+  NS_IMETHOD    SetCueBefore(const nsString& aCueBefore)=0;
+
+  NS_IMETHOD    GetCursor(nsString& aCursor)=0;
+  NS_IMETHOD    SetCursor(const nsString& aCursor)=0;
+
+  NS_IMETHOD    GetDirection(nsString& aDirection)=0;
+  NS_IMETHOD    SetDirection(const nsString& aDirection)=0;
+
+  NS_IMETHOD    GetDisplay(nsString& aDisplay)=0;
+  NS_IMETHOD    SetDisplay(const nsString& aDisplay)=0;
+
+  NS_IMETHOD    GetElevation(nsString& aElevation)=0;
+  NS_IMETHOD    SetElevation(const nsString& aElevation)=0;
+
+  NS_IMETHOD    GetEmptyCells(nsString& aEmptyCells)=0;
+  NS_IMETHOD    SetEmptyCells(const nsString& aEmptyCells)=0;
+
+  NS_IMETHOD    GetCssFloat(nsString& aCssFloat)=0;
+  NS_IMETHOD    SetCssFloat(const nsString& aCssFloat)=0;
+
+  NS_IMETHOD    GetFont(nsString& aFont)=0;
+  NS_IMETHOD    SetFont(const nsString& aFont)=0;
+
+  NS_IMETHOD    GetFontFamily(nsString& aFontFamily)=0;
+  NS_IMETHOD    SetFontFamily(const nsString& aFontFamily)=0;
+
+  NS_IMETHOD    GetFontSize(nsString& aFontSize)=0;
+  NS_IMETHOD    SetFontSize(const nsString& aFontSize)=0;
+
+  NS_IMETHOD    GetFontSizeAdjust(nsString& aFontSizeAdjust)=0;
+  NS_IMETHOD    SetFontSizeAdjust(const nsString& aFontSizeAdjust)=0;
+
+  NS_IMETHOD    GetFontStretch(nsString& aFontStretch)=0;
+  NS_IMETHOD    SetFontStretch(const nsString& aFontStretch)=0;
+
+  NS_IMETHOD    GetFontStyle(nsString& aFontStyle)=0;
+  NS_IMETHOD    SetFontStyle(const nsString& aFontStyle)=0;
+
+  NS_IMETHOD    GetFontVariant(nsString& aFontVariant)=0;
+  NS_IMETHOD    SetFontVariant(const nsString& aFontVariant)=0;
+
+  NS_IMETHOD    GetFontWeight(nsString& aFontWeight)=0;
+  NS_IMETHOD    SetFontWeight(const nsString& aFontWeight)=0;
+
+  NS_IMETHOD    GetHeight(nsString& aHeight)=0;
+  NS_IMETHOD    SetHeight(const nsString& aHeight)=0;
+
+  NS_IMETHOD    GetLeft(nsString& aLeft)=0;
+  NS_IMETHOD    SetLeft(const nsString& aLeft)=0;
+
+  NS_IMETHOD    GetLetterSpacing(nsString& aLetterSpacing)=0;
+  NS_IMETHOD    SetLetterSpacing(const nsString& aLetterSpacing)=0;
+
+  NS_IMETHOD    GetLineHeight(nsString& aLineHeight)=0;
+  NS_IMETHOD    SetLineHeight(const nsString& aLineHeight)=0;
+
+  NS_IMETHOD    GetListStyle(nsString& aListStyle)=0;
+  NS_IMETHOD    SetListStyle(const nsString& aListStyle)=0;
+
+  NS_IMETHOD    GetListStyleImage(nsString& aListStyleImage)=0;
+  NS_IMETHOD    SetListStyleImage(const nsString& aListStyleImage)=0;
+
+  NS_IMETHOD    GetListStylePosition(nsString& aListStylePosition)=0;
+  NS_IMETHOD    SetListStylePosition(const nsString& aListStylePosition)=0;
+
+  NS_IMETHOD    GetListStyleType(nsString& aListStyleType)=0;
+  NS_IMETHOD    SetListStyleType(const nsString& aListStyleType)=0;
+
+  NS_IMETHOD    GetMargin(nsString& aMargin)=0;
+  NS_IMETHOD    SetMargin(const nsString& aMargin)=0;
+
+  NS_IMETHOD    GetMarginTop(nsString& aMarginTop)=0;
+  NS_IMETHOD    SetMarginTop(const nsString& aMarginTop)=0;
+
+  NS_IMETHOD    GetMarginRight(nsString& aMarginRight)=0;
+  NS_IMETHOD    SetMarginRight(const nsString& aMarginRight)=0;
+
+  NS_IMETHOD    GetMarginBottom(nsString& aMarginBottom)=0;
+  NS_IMETHOD    SetMarginBottom(const nsString& aMarginBottom)=0;
+
+  NS_IMETHOD    GetMarginLeft(nsString& aMarginLeft)=0;
+  NS_IMETHOD    SetMarginLeft(const nsString& aMarginLeft)=0;
+
+  NS_IMETHOD    GetMarkerOffset(nsString& aMarkerOffset)=0;
+  NS_IMETHOD    SetMarkerOffset(const nsString& aMarkerOffset)=0;
+
+  NS_IMETHOD    GetMarks(nsString& aMarks)=0;
+  NS_IMETHOD    SetMarks(const nsString& aMarks)=0;
+
+  NS_IMETHOD    GetMaxHeight(nsString& aMaxHeight)=0;
+  NS_IMETHOD    SetMaxHeight(const nsString& aMaxHeight)=0;
+
+  NS_IMETHOD    GetMaxWidth(nsString& aMaxWidth)=0;
+  NS_IMETHOD    SetMaxWidth(const nsString& aMaxWidth)=0;
+
+  NS_IMETHOD    GetMinHeight(nsString& aMinHeight)=0;
+  NS_IMETHOD    SetMinHeight(const nsString& aMinHeight)=0;
+
+  NS_IMETHOD    GetMinWidth(nsString& aMinWidth)=0;
+  NS_IMETHOD    SetMinWidth(const nsString& aMinWidth)=0;
+
+  NS_IMETHOD    GetOrphans(nsString& aOrphans)=0;
+  NS_IMETHOD    SetOrphans(const nsString& aOrphans)=0;
+
+  NS_IMETHOD    GetOutline(nsString& aOutline)=0;
+  NS_IMETHOD    SetOutline(const nsString& aOutline)=0;
+
+  NS_IMETHOD    GetOutlineColor(nsString& aOutlineColor)=0;
+  NS_IMETHOD    SetOutlineColor(const nsString& aOutlineColor)=0;
+
+  NS_IMETHOD    GetOutlineStyle(nsString& aOutlineStyle)=0;
+  NS_IMETHOD    SetOutlineStyle(const nsString& aOutlineStyle)=0;
+
+  NS_IMETHOD    GetOutlineWidth(nsString& aOutlineWidth)=0;
+  NS_IMETHOD    SetOutlineWidth(const nsString& aOutlineWidth)=0;
+
+  NS_IMETHOD    GetOverflow(nsString& aOverflow)=0;
+  NS_IMETHOD    SetOverflow(const nsString& aOverflow)=0;
+
+  NS_IMETHOD    GetPadding(nsString& aPadding)=0;
+  NS_IMETHOD    SetPadding(const nsString& aPadding)=0;
+
+  NS_IMETHOD    GetPaddingTop(nsString& aPaddingTop)=0;
+  NS_IMETHOD    SetPaddingTop(const nsString& aPaddingTop)=0;
+
+  NS_IMETHOD    GetPaddingRight(nsString& aPaddingRight)=0;
+  NS_IMETHOD    SetPaddingRight(const nsString& aPaddingRight)=0;
+
+  NS_IMETHOD    GetPaddingBottom(nsString& aPaddingBottom)=0;
+  NS_IMETHOD    SetPaddingBottom(const nsString& aPaddingBottom)=0;
+
+  NS_IMETHOD    GetPaddingLeft(nsString& aPaddingLeft)=0;
+  NS_IMETHOD    SetPaddingLeft(const nsString& aPaddingLeft)=0;
+
+  NS_IMETHOD    GetPage(nsString& aPage)=0;
+  NS_IMETHOD    SetPage(const nsString& aPage)=0;
+
+  NS_IMETHOD    GetPageBreakAfter(nsString& aPageBreakAfter)=0;
+  NS_IMETHOD    SetPageBreakAfter(const nsString& aPageBreakAfter)=0;
+
+  NS_IMETHOD    GetPageBreakBefore(nsString& aPageBreakBefore)=0;
+  NS_IMETHOD    SetPageBreakBefore(const nsString& aPageBreakBefore)=0;
+
+  NS_IMETHOD    GetPageBreakInside(nsString& aPageBreakInside)=0;
+  NS_IMETHOD    SetPageBreakInside(const nsString& aPageBreakInside)=0;
+
+  NS_IMETHOD    GetPause(nsString& aPause)=0;
+  NS_IMETHOD    SetPause(const nsString& aPause)=0;
+
+  NS_IMETHOD    GetPauseAfter(nsString& aPauseAfter)=0;
+  NS_IMETHOD    SetPauseAfter(const nsString& aPauseAfter)=0;
+
+  NS_IMETHOD    GetPauseBefore(nsString& aPauseBefore)=0;
+  NS_IMETHOD    SetPauseBefore(const nsString& aPauseBefore)=0;
+
+  NS_IMETHOD    GetPitch(nsString& aPitch)=0;
+  NS_IMETHOD    SetPitch(const nsString& aPitch)=0;
+
+  NS_IMETHOD    GetPitchRange(nsString& aPitchRange)=0;
+  NS_IMETHOD    SetPitchRange(const nsString& aPitchRange)=0;
+
+  NS_IMETHOD    GetPlayDuring(nsString& aPlayDuring)=0;
+  NS_IMETHOD    SetPlayDuring(const nsString& aPlayDuring)=0;
+
+  NS_IMETHOD    GetPosition(nsString& aPosition)=0;
+  NS_IMETHOD    SetPosition(const nsString& aPosition)=0;
+
+  NS_IMETHOD    GetQuotes(nsString& aQuotes)=0;
+  NS_IMETHOD    SetQuotes(const nsString& aQuotes)=0;
+
+  NS_IMETHOD    GetRichness(nsString& aRichness)=0;
+  NS_IMETHOD    SetRichness(const nsString& aRichness)=0;
+
+  NS_IMETHOD    GetRight(nsString& aRight)=0;
+  NS_IMETHOD    SetRight(const nsString& aRight)=0;
+
+  NS_IMETHOD    GetSize(nsString& aSize)=0;
+  NS_IMETHOD    SetSize(const nsString& aSize)=0;
+
+  NS_IMETHOD    GetSpeak(nsString& aSpeak)=0;
+  NS_IMETHOD    SetSpeak(const nsString& aSpeak)=0;
+
+  NS_IMETHOD    GetSpeakHeader(nsString& aSpeakHeader)=0;
+  NS_IMETHOD    SetSpeakHeader(const nsString& aSpeakHeader)=0;
+
+  NS_IMETHOD    GetSpeakNumeral(nsString& aSpeakNumeral)=0;
+  NS_IMETHOD    SetSpeakNumeral(const nsString& aSpeakNumeral)=0;
+
+  NS_IMETHOD    GetSpeakPunctuation(nsString& aSpeakPunctuation)=0;
+  NS_IMETHOD    SetSpeakPunctuation(const nsString& aSpeakPunctuation)=0;
+
+  NS_IMETHOD    GetSpeechRate(nsString& aSpeechRate)=0;
+  NS_IMETHOD    SetSpeechRate(const nsString& aSpeechRate)=0;
+
+  NS_IMETHOD    GetStress(nsString& aStress)=0;
+  NS_IMETHOD    SetStress(const nsString& aStress)=0;
+
+  NS_IMETHOD    GetTableLayout(nsString& aTableLayout)=0;
+  NS_IMETHOD    SetTableLayout(const nsString& aTableLayout)=0;
+
+  NS_IMETHOD    GetTextAlign(nsString& aTextAlign)=0;
+  NS_IMETHOD    SetTextAlign(const nsString& aTextAlign)=0;
+
+  NS_IMETHOD    GetTextDecoration(nsString& aTextDecoration)=0;
+  NS_IMETHOD    SetTextDecoration(const nsString& aTextDecoration)=0;
+
+  NS_IMETHOD    GetTextIndent(nsString& aTextIndent)=0;
+  NS_IMETHOD    SetTextIndent(const nsString& aTextIndent)=0;
+
+  NS_IMETHOD    GetTextShadow(nsString& aTextShadow)=0;
+  NS_IMETHOD    SetTextShadow(const nsString& aTextShadow)=0;
+
+  NS_IMETHOD    GetTextTransform(nsString& aTextTransform)=0;
+  NS_IMETHOD    SetTextTransform(const nsString& aTextTransform)=0;
+
+  NS_IMETHOD    GetTop(nsString& aTop)=0;
+  NS_IMETHOD    SetTop(const nsString& aTop)=0;
+
+  NS_IMETHOD    GetUnicodeBidi(nsString& aUnicodeBidi)=0;
+  NS_IMETHOD    SetUnicodeBidi(const nsString& aUnicodeBidi)=0;
+
+  NS_IMETHOD    GetVerticalAlign(nsString& aVerticalAlign)=0;
+  NS_IMETHOD    SetVerticalAlign(const nsString& aVerticalAlign)=0;
+
+  NS_IMETHOD    GetVisibility(nsString& aVisibility)=0;
+  NS_IMETHOD    SetVisibility(const nsString& aVisibility)=0;
+
+  NS_IMETHOD    GetVoiceFamily(nsString& aVoiceFamily)=0;
+  NS_IMETHOD    SetVoiceFamily(const nsString& aVoiceFamily)=0;
+
+  NS_IMETHOD    GetVolume(nsString& aVolume)=0;
+  NS_IMETHOD    SetVolume(const nsString& aVolume)=0;
+
+  NS_IMETHOD    GetWhiteSpace(nsString& aWhiteSpace)=0;
+  NS_IMETHOD    SetWhiteSpace(const nsString& aWhiteSpace)=0;
+
+  NS_IMETHOD    GetWidows(nsString& aWidows)=0;
+  NS_IMETHOD    SetWidows(const nsString& aWidows)=0;
+
+  NS_IMETHOD    GetWidth(nsString& aWidth)=0;
+  NS_IMETHOD    SetWidth(const nsString& aWidth)=0;
+
+  NS_IMETHOD    GetWordSpacing(nsString& aWordSpacing)=0;
+  NS_IMETHOD    SetWordSpacing(const nsString& aWordSpacing)=0;
+
+  NS_IMETHOD    GetZIndex(nsString& aZIndex)=0;
+  NS_IMETHOD    SetZIndex(const nsString& aZIndex)=0;
+
+  NS_IMETHOD    GetOpacity(nsString& aOpacity)=0;
+  NS_IMETHOD    SetOpacity(const nsString& aOpacity)=0;
+};
+
+
+#define NS_DECL_IDOMCSS2PROPERTIES   \
+  NS_IMETHOD    GetAzimuth(nsString& aAzimuth);  \
+  NS_IMETHOD    SetAzimuth(const nsString& aAzimuth);  \
+  NS_IMETHOD    GetBackground(nsString& aBackground);  \
+  NS_IMETHOD    SetBackground(const nsString& aBackground);  \
+  NS_IMETHOD    GetBackgroundAttachment(nsString& aBackgroundAttachment);  \
+  NS_IMETHOD    SetBackgroundAttachment(const nsString& aBackgroundAttachment);  \
+  NS_IMETHOD    GetBackgroundColor(nsString& aBackgroundColor);  \
+  NS_IMETHOD    SetBackgroundColor(const nsString& aBackgroundColor);  \
+  NS_IMETHOD    GetBackgroundImage(nsString& aBackgroundImage);  \
+  NS_IMETHOD    SetBackgroundImage(const nsString& aBackgroundImage);  \
+  NS_IMETHOD    GetBackgroundPosition(nsString& aBackgroundPosition);  \
+  NS_IMETHOD    SetBackgroundPosition(const nsString& aBackgroundPosition);  \
+  NS_IMETHOD    GetBackgroundRepeat(nsString& aBackgroundRepeat);  \
+  NS_IMETHOD    SetBackgroundRepeat(const nsString& aBackgroundRepeat);  \
+  NS_IMETHOD    GetBorder(nsString& aBorder);  \
+  NS_IMETHOD    SetBorder(const nsString& aBorder);  \
+  NS_IMETHOD    GetBorderCollapse(nsString& aBorderCollapse);  \
+  NS_IMETHOD    SetBorderCollapse(const nsString& aBorderCollapse);  \
+  NS_IMETHOD    GetBorderColor(nsString& aBorderColor);  \
+  NS_IMETHOD    SetBorderColor(const nsString& aBorderColor);  \
+  NS_IMETHOD    GetBorderSpacing(nsString& aBorderSpacing);  \
+  NS_IMETHOD    SetBorderSpacing(const nsString& aBorderSpacing);  \
+  NS_IMETHOD    GetBorderStyle(nsString& aBorderStyle);  \
+  NS_IMETHOD    SetBorderStyle(const nsString& aBorderStyle);  \
+  NS_IMETHOD    GetBorderTop(nsString& aBorderTop);  \
+  NS_IMETHOD    SetBorderTop(const nsString& aBorderTop);  \
+  NS_IMETHOD    GetBorderRight(nsString& aBorderRight);  \
+  NS_IMETHOD    SetBorderRight(const nsString& aBorderRight);  \
+  NS_IMETHOD    GetBorderBottom(nsString& aBorderBottom);  \
+  NS_IMETHOD    SetBorderBottom(const nsString& aBorderBottom);  \
+  NS_IMETHOD    GetBorderLeft(nsString& aBorderLeft);  \
+  NS_IMETHOD    SetBorderLeft(const nsString& aBorderLeft);  \
+  NS_IMETHOD    GetBorderTopColor(nsString& aBorderTopColor);  \
+  NS_IMETHOD    SetBorderTopColor(const nsString& aBorderTopColor);  \
+  NS_IMETHOD    GetBorderRightColor(nsString& aBorderRightColor);  \
+  NS_IMETHOD    SetBorderRightColor(const nsString& aBorderRightColor);  \
+  NS_IMETHOD    GetBorderBottomColor(nsString& aBorderBottomColor);  \
+  NS_IMETHOD    SetBorderBottomColor(const nsString& aBorderBottomColor);  \
+  NS_IMETHOD    GetBorderLeftColor(nsString& aBorderLeftColor);  \
+  NS_IMETHOD    SetBorderLeftColor(const nsString& aBorderLeftColor);  \
+  NS_IMETHOD    GetBorderTopStyle(nsString& aBorderTopStyle);  \
+  NS_IMETHOD    SetBorderTopStyle(const nsString& aBorderTopStyle);  \
+  NS_IMETHOD    GetBorderRightStyle(nsString& aBorderRightStyle);  \
+  NS_IMETHOD    SetBorderRightStyle(const nsString& aBorderRightStyle);  \
+  NS_IMETHOD    GetBorderBottomStyle(nsString& aBorderBottomStyle);  \
+  NS_IMETHOD    SetBorderBottomStyle(const nsString& aBorderBottomStyle);  \
+  NS_IMETHOD    GetBorderLeftStyle(nsString& aBorderLeftStyle);  \
+  NS_IMETHOD    SetBorderLeftStyle(const nsString& aBorderLeftStyle);  \
+  NS_IMETHOD    GetBorderTopWidth(nsString& aBorderTopWidth);  \
+  NS_IMETHOD    SetBorderTopWidth(const nsString& aBorderTopWidth);  \
+  NS_IMETHOD    GetBorderRightWidth(nsString& aBorderRightWidth);  \
+  NS_IMETHOD    SetBorderRightWidth(const nsString& aBorderRightWidth);  \
+  NS_IMETHOD    GetBorderBottomWidth(nsString& aBorderBottomWidth);  \
+  NS_IMETHOD    SetBorderBottomWidth(const nsString& aBorderBottomWidth);  \
+  NS_IMETHOD    GetBorderLeftWidth(nsString& aBorderLeftWidth);  \
+  NS_IMETHOD    SetBorderLeftWidth(const nsString& aBorderLeftWidth);  \
+  NS_IMETHOD    GetBorderWidth(nsString& aBorderWidth);  \
+  NS_IMETHOD    SetBorderWidth(const nsString& aBorderWidth);  \
+  NS_IMETHOD    GetBottom(nsString& aBottom);  \
+  NS_IMETHOD    SetBottom(const nsString& aBottom);  \
+  NS_IMETHOD    GetCaptionSide(nsString& aCaptionSide);  \
+  NS_IMETHOD    SetCaptionSide(const nsString& aCaptionSide);  \
+  NS_IMETHOD    GetClear(nsString& aClear);  \
+  NS_IMETHOD    SetClear(const nsString& aClear);  \
+  NS_IMETHOD    GetClip(nsString& aClip);  \
+  NS_IMETHOD    SetClip(const nsString& aClip);  \
+  NS_IMETHOD    GetColor(nsString& aColor);  \
+  NS_IMETHOD    SetColor(const nsString& aColor);  \
+  NS_IMETHOD    GetContent(nsString& aContent);  \
+  NS_IMETHOD    SetContent(const nsString& aContent);  \
+  NS_IMETHOD    GetCounterIncrement(nsString& aCounterIncrement);  \
+  NS_IMETHOD    SetCounterIncrement(const nsString& aCounterIncrement);  \
+  NS_IMETHOD    GetCounterReset(nsString& aCounterReset);  \
+  NS_IMETHOD    SetCounterReset(const nsString& aCounterReset);  \
+  NS_IMETHOD    GetCue(nsString& aCue);  \
+  NS_IMETHOD    SetCue(const nsString& aCue);  \
+  NS_IMETHOD    GetCueAfter(nsString& aCueAfter);  \
+  NS_IMETHOD    SetCueAfter(const nsString& aCueAfter);  \
+  NS_IMETHOD    GetCueBefore(nsString& aCueBefore);  \
+  NS_IMETHOD    SetCueBefore(const nsString& aCueBefore);  \
+  NS_IMETHOD    GetCursor(nsString& aCursor);  \
+  NS_IMETHOD    SetCursor(const nsString& aCursor);  \
+  NS_IMETHOD    GetDirection(nsString& aDirection);  \
+  NS_IMETHOD    SetDirection(const nsString& aDirection);  \
+  NS_IMETHOD    GetDisplay(nsString& aDisplay);  \
+  NS_IMETHOD    SetDisplay(const nsString& aDisplay);  \
+  NS_IMETHOD    GetElevation(nsString& aElevation);  \
+  NS_IMETHOD    SetElevation(const nsString& aElevation);  \
+  NS_IMETHOD    GetEmptyCells(nsString& aEmptyCells);  \
+  NS_IMETHOD    SetEmptyCells(const nsString& aEmptyCells);  \
+  NS_IMETHOD    GetCssFloat(nsString& aCssFloat);  \
+  NS_IMETHOD    SetCssFloat(const nsString& aCssFloat);  \
+  NS_IMETHOD    GetFont(nsString& aFont);  \
+  NS_IMETHOD    SetFont(const nsString& aFont);  \
+  NS_IMETHOD    GetFontFamily(nsString& aFontFamily);  \
+  NS_IMETHOD    SetFontFamily(const nsString& aFontFamily);  \
+  NS_IMETHOD    GetFontSize(nsString& aFontSize);  \
+  NS_IMETHOD    SetFontSize(const nsString& aFontSize);  \
+  NS_IMETHOD    GetFontSizeAdjust(nsString& aFontSizeAdjust);  \
+  NS_IMETHOD    SetFontSizeAdjust(const nsString& aFontSizeAdjust);  \
+  NS_IMETHOD    GetFontStretch(nsString& aFontStretch);  \
+  NS_IMETHOD    SetFontStretch(const nsString& aFontStretch);  \
+  NS_IMETHOD    GetFontStyle(nsString& aFontStyle);  \
+  NS_IMETHOD    SetFontStyle(const nsString& aFontStyle);  \
+  NS_IMETHOD    GetFontVariant(nsString& aFontVariant);  \
+  NS_IMETHOD    SetFontVariant(const nsString& aFontVariant);  \
+  NS_IMETHOD    GetFontWeight(nsString& aFontWeight);  \
+  NS_IMETHOD    SetFontWeight(const nsString& aFontWeight);  \
+  NS_IMETHOD    GetHeight(nsString& aHeight);  \
+  NS_IMETHOD    SetHeight(const nsString& aHeight);  \
+  NS_IMETHOD    GetLeft(nsString& aLeft);  \
+  NS_IMETHOD    SetLeft(const nsString& aLeft);  \
+  NS_IMETHOD    GetLetterSpacing(nsString& aLetterSpacing);  \
+  NS_IMETHOD    SetLetterSpacing(const nsString& aLetterSpacing);  \
+  NS_IMETHOD    GetLineHeight(nsString& aLineHeight);  \
+  NS_IMETHOD    SetLineHeight(const nsString& aLineHeight);  \
+  NS_IMETHOD    GetListStyle(nsString& aListStyle);  \
+  NS_IMETHOD    SetListStyle(const nsString& aListStyle);  \
+  NS_IMETHOD    GetListStyleImage(nsString& aListStyleImage);  \
+  NS_IMETHOD    SetListStyleImage(const nsString& aListStyleImage);  \
+  NS_IMETHOD    GetListStylePosition(nsString& aListStylePosition);  \
+  NS_IMETHOD    SetListStylePosition(const nsString& aListStylePosition);  \
+  NS_IMETHOD    GetListStyleType(nsString& aListStyleType);  \
+  NS_IMETHOD    SetListStyleType(const nsString& aListStyleType);  \
+  NS_IMETHOD    GetMargin(nsString& aMargin);  \
+  NS_IMETHOD    SetMargin(const nsString& aMargin);  \
+  NS_IMETHOD    GetMarginTop(nsString& aMarginTop);  \
+  NS_IMETHOD    SetMarginTop(const nsString& aMarginTop);  \
+  NS_IMETHOD    GetMarginRight(nsString& aMarginRight);  \
+  NS_IMETHOD    SetMarginRight(const nsString& aMarginRight);  \
+  NS_IMETHOD    GetMarginBottom(nsString& aMarginBottom);  \
+  NS_IMETHOD    SetMarginBottom(const nsString& aMarginBottom);  \
+  NS_IMETHOD    GetMarginLeft(nsString& aMarginLeft);  \
+  NS_IMETHOD    SetMarginLeft(const nsString& aMarginLeft);  \
+  NS_IMETHOD    GetMarkerOffset(nsString& aMarkerOffset);  \
+  NS_IMETHOD    SetMarkerOffset(const nsString& aMarkerOffset);  \
+  NS_IMETHOD    GetMarks(nsString& aMarks);  \
+  NS_IMETHOD    SetMarks(const nsString& aMarks);  \
+  NS_IMETHOD    GetMaxHeight(nsString& aMaxHeight);  \
+  NS_IMETHOD    SetMaxHeight(const nsString& aMaxHeight);  \
+  NS_IMETHOD    GetMaxWidth(nsString& aMaxWidth);  \
+  NS_IMETHOD    SetMaxWidth(const nsString& aMaxWidth);  \
+  NS_IMETHOD    GetMinHeight(nsString& aMinHeight);  \
+  NS_IMETHOD    SetMinHeight(const nsString& aMinHeight);  \
+  NS_IMETHOD    GetMinWidth(nsString& aMinWidth);  \
+  NS_IMETHOD    SetMinWidth(const nsString& aMinWidth);  \
+  NS_IMETHOD    GetOrphans(nsString& aOrphans);  \
+  NS_IMETHOD    SetOrphans(const nsString& aOrphans);  \
+  NS_IMETHOD    GetOutline(nsString& aOutline);  \
+  NS_IMETHOD    SetOutline(const nsString& aOutline);  \
+  NS_IMETHOD    GetOutlineColor(nsString& aOutlineColor);  \
+  NS_IMETHOD    SetOutlineColor(const nsString& aOutlineColor);  \
+  NS_IMETHOD    GetOutlineStyle(nsString& aOutlineStyle);  \
+  NS_IMETHOD    SetOutlineStyle(const nsString& aOutlineStyle);  \
+  NS_IMETHOD    GetOutlineWidth(nsString& aOutlineWidth);  \
+  NS_IMETHOD    SetOutlineWidth(const nsString& aOutlineWidth);  \
+  NS_IMETHOD    GetOverflow(nsString& aOverflow);  \
+  NS_IMETHOD    SetOverflow(const nsString& aOverflow);  \
+  NS_IMETHOD    GetPadding(nsString& aPadding);  \
+  NS_IMETHOD    SetPadding(const nsString& aPadding);  \
+  NS_IMETHOD    GetPaddingTop(nsString& aPaddingTop);  \
+  NS_IMETHOD    SetPaddingTop(const nsString& aPaddingTop);  \
+  NS_IMETHOD    GetPaddingRight(nsString& aPaddingRight);  \
+  NS_IMETHOD    SetPaddingRight(const nsString& aPaddingRight);  \
+  NS_IMETHOD    GetPaddingBottom(nsString& aPaddingBottom);  \
+  NS_IMETHOD    SetPaddingBottom(const nsString& aPaddingBottom);  \
+  NS_IMETHOD    GetPaddingLeft(nsString& aPaddingLeft);  \
+  NS_IMETHOD    SetPaddingLeft(const nsString& aPaddingLeft);  \
+  NS_IMETHOD    GetPage(nsString& aPage);  \
+  NS_IMETHOD    SetPage(const nsString& aPage);  \
+  NS_IMETHOD    GetPageBreakAfter(nsString& aPageBreakAfter);  \
+  NS_IMETHOD    SetPageBreakAfter(const nsString& aPageBreakAfter);  \
+  NS_IMETHOD    GetPageBreakBefore(nsString& aPageBreakBefore);  \
+  NS_IMETHOD    SetPageBreakBefore(const nsString& aPageBreakBefore);  \
+  NS_IMETHOD    GetPageBreakInside(nsString& aPageBreakInside);  \
+  NS_IMETHOD    SetPageBreakInside(const nsString& aPageBreakInside);  \
+  NS_IMETHOD    GetPause(nsString& aPause);  \
+  NS_IMETHOD    SetPause(const nsString& aPause);  \
+  NS_IMETHOD    GetPauseAfter(nsString& aPauseAfter);  \
+  NS_IMETHOD    SetPauseAfter(const nsString& aPauseAfter);  \
+  NS_IMETHOD    GetPauseBefore(nsString& aPauseBefore);  \
+  NS_IMETHOD    SetPauseBefore(const nsString& aPauseBefore);  \
+  NS_IMETHOD    GetPitch(nsString& aPitch);  \
+  NS_IMETHOD    SetPitch(const nsString& aPitch);  \
+  NS_IMETHOD    GetPitchRange(nsString& aPitchRange);  \
+  NS_IMETHOD    SetPitchRange(const nsString& aPitchRange);  \
+  NS_IMETHOD    GetPlayDuring(nsString& aPlayDuring);  \
+  NS_IMETHOD    SetPlayDuring(const nsString& aPlayDuring);  \
+  NS_IMETHOD    GetPosition(nsString& aPosition);  \
+  NS_IMETHOD    SetPosition(const nsString& aPosition);  \
+  NS_IMETHOD    GetQuotes(nsString& aQuotes);  \
+  NS_IMETHOD    SetQuotes(const nsString& aQuotes);  \
+  NS_IMETHOD    GetRichness(nsString& aRichness);  \
+  NS_IMETHOD    SetRichness(const nsString& aRichness);  \
+  NS_IMETHOD    GetRight(nsString& aRight);  \
+  NS_IMETHOD    SetRight(const nsString& aRight);  \
+  NS_IMETHOD    GetSize(nsString& aSize);  \
+  NS_IMETHOD    SetSize(const nsString& aSize);  \
+  NS_IMETHOD    GetSpeak(nsString& aSpeak);  \
+  NS_IMETHOD    SetSpeak(const nsString& aSpeak);  \
+  NS_IMETHOD    GetSpeakHeader(nsString& aSpeakHeader);  \
+  NS_IMETHOD    SetSpeakHeader(const nsString& aSpeakHeader);  \
+  NS_IMETHOD    GetSpeakNumeral(nsString& aSpeakNumeral);  \
+  NS_IMETHOD    SetSpeakNumeral(const nsString& aSpeakNumeral);  \
+  NS_IMETHOD    GetSpeakPunctuation(nsString& aSpeakPunctuation);  \
+  NS_IMETHOD    SetSpeakPunctuation(const nsString& aSpeakPunctuation);  \
+  NS_IMETHOD    GetSpeechRate(nsString& aSpeechRate);  \
+  NS_IMETHOD    SetSpeechRate(const nsString& aSpeechRate);  \
+  NS_IMETHOD    GetStress(nsString& aStress);  \
+  NS_IMETHOD    SetStress(const nsString& aStress);  \
+  NS_IMETHOD    GetTableLayout(nsString& aTableLayout);  \
+  NS_IMETHOD    SetTableLayout(const nsString& aTableLayout);  \
+  NS_IMETHOD    GetTextAlign(nsString& aTextAlign);  \
+  NS_IMETHOD    SetTextAlign(const nsString& aTextAlign);  \
+  NS_IMETHOD    GetTextDecoration(nsString& aTextDecoration);  \
+  NS_IMETHOD    SetTextDecoration(const nsString& aTextDecoration);  \
+  NS_IMETHOD    GetTextIndent(nsString& aTextIndent);  \
+  NS_IMETHOD    SetTextIndent(const nsString& aTextIndent);  \
+  NS_IMETHOD    GetTextShadow(nsString& aTextShadow);  \
+  NS_IMETHOD    SetTextShadow(const nsString& aTextShadow);  \
+  NS_IMETHOD    GetTextTransform(nsString& aTextTransform);  \
+  NS_IMETHOD    SetTextTransform(const nsString& aTextTransform);  \
+  NS_IMETHOD    GetTop(nsString& aTop);  \
+  NS_IMETHOD    SetTop(const nsString& aTop);  \
+  NS_IMETHOD    GetUnicodeBidi(nsString& aUnicodeBidi);  \
+  NS_IMETHOD    SetUnicodeBidi(const nsString& aUnicodeBidi);  \
+  NS_IMETHOD    GetVerticalAlign(nsString& aVerticalAlign);  \
+  NS_IMETHOD    SetVerticalAlign(const nsString& aVerticalAlign);  \
+  NS_IMETHOD    GetVisibility(nsString& aVisibility);  \
+  NS_IMETHOD    SetVisibility(const nsString& aVisibility);  \
+  NS_IMETHOD    GetVoiceFamily(nsString& aVoiceFamily);  \
+  NS_IMETHOD    SetVoiceFamily(const nsString& aVoiceFamily);  \
+  NS_IMETHOD    GetVolume(nsString& aVolume);  \
+  NS_IMETHOD    SetVolume(const nsString& aVolume);  \
+  NS_IMETHOD    GetWhiteSpace(nsString& aWhiteSpace);  \
+  NS_IMETHOD    SetWhiteSpace(const nsString& aWhiteSpace);  \
+  NS_IMETHOD    GetWidows(nsString& aWidows);  \
+  NS_IMETHOD    SetWidows(const nsString& aWidows);  \
+  NS_IMETHOD    GetWidth(nsString& aWidth);  \
+  NS_IMETHOD    SetWidth(const nsString& aWidth);  \
+  NS_IMETHOD    GetWordSpacing(nsString& aWordSpacing);  \
+  NS_IMETHOD    SetWordSpacing(const nsString& aWordSpacing);  \
+  NS_IMETHOD    GetZIndex(nsString& aZIndex);  \
+  NS_IMETHOD    SetZIndex(const nsString& aZIndex);  \
+  NS_IMETHOD    GetOpacity(nsString& aOpacity);  \
+  NS_IMETHOD    SetOpacity(const nsString& aOpacity);  \
+
+
+
+#define NS_FORWARD_IDOMCSS2PROPERTIES(_to)  \
+  NS_IMETHOD    GetAzimuth(nsString& aAzimuth) { return _to##GetAzimuth(aAzimuth); } \
+  NS_IMETHOD    SetAzimuth(const nsString& aAzimuth) { return _to##SetAzimuth(aAzimuth); } \
+  NS_IMETHOD    GetBackground(nsString& aBackground) { return _to##GetBackground(aBackground); } \
+  NS_IMETHOD    SetBackground(const nsString& aBackground) { return _to##SetBackground(aBackground); } \
+  NS_IMETHOD    GetBackgroundAttachment(nsString& aBackgroundAttachment) { return _to##GetBackgroundAttachment(aBackgroundAttachment); } \
+  NS_IMETHOD    SetBackgroundAttachment(const nsString& aBackgroundAttachment) { return _to##SetBackgroundAttachment(aBackgroundAttachment); } \
+  NS_IMETHOD    GetBackgroundColor(nsString& aBackgroundColor) { return _to##GetBackgroundColor(aBackgroundColor); } \
+  NS_IMETHOD    SetBackgroundColor(const nsString& aBackgroundColor) { return _to##SetBackgroundColor(aBackgroundColor); } \
+  NS_IMETHOD    GetBackgroundImage(nsString& aBackgroundImage) { return _to##GetBackgroundImage(aBackgroundImage); } \
+  NS_IMETHOD    SetBackgroundImage(const nsString& aBackgroundImage) { return _to##SetBackgroundImage(aBackgroundImage); } \
+  NS_IMETHOD    GetBackgroundPosition(nsString& aBackgroundPosition) { return _to##GetBackgroundPosition(aBackgroundPosition); } \
+  NS_IMETHOD    SetBackgroundPosition(const nsString& aBackgroundPosition) { return _to##SetBackgroundPosition(aBackgroundPosition); } \
+  NS_IMETHOD    GetBackgroundRepeat(nsString& aBackgroundRepeat) { return _to##GetBackgroundRepeat(aBackgroundRepeat); } \
+  NS_IMETHOD    SetBackgroundRepeat(const nsString& aBackgroundRepeat) { return _to##SetBackgroundRepeat(aBackgroundRepeat); } \
+  NS_IMETHOD    GetBorder(nsString& aBorder) { return _to##GetBorder(aBorder); } \
+  NS_IMETHOD    SetBorder(const nsString& aBorder) { return _to##SetBorder(aBorder); } \
+  NS_IMETHOD    GetBorderCollapse(nsString& aBorderCollapse) { return _to##GetBorderCollapse(aBorderCollapse); } \
+  NS_IMETHOD    SetBorderCollapse(const nsString& aBorderCollapse) { return _to##SetBorderCollapse(aBorderCollapse); } \
+  NS_IMETHOD    GetBorderColor(nsString& aBorderColor) { return _to##GetBorderColor(aBorderColor); } \
+  NS_IMETHOD    SetBorderColor(const nsString& aBorderColor) { return _to##SetBorderColor(aBorderColor); } \
+  NS_IMETHOD    GetBorderSpacing(nsString& aBorderSpacing) { return _to##GetBorderSpacing(aBorderSpacing); } \
+  NS_IMETHOD    SetBorderSpacing(const nsString& aBorderSpacing) { return _to##SetBorderSpacing(aBorderSpacing); } \
+  NS_IMETHOD    GetBorderStyle(nsString& aBorderStyle) { return _to##GetBorderStyle(aBorderStyle); } \
+  NS_IMETHOD    SetBorderStyle(const nsString& aBorderStyle) { return _to##SetBorderStyle(aBorderStyle); } \
+  NS_IMETHOD    GetBorderTop(nsString& aBorderTop) { return _to##GetBorderTop(aBorderTop); } \
+  NS_IMETHOD    SetBorderTop(const nsString& aBorderTop) { return _to##SetBorderTop(aBorderTop); } \
+  NS_IMETHOD    GetBorderRight(nsString& aBorderRight) { return _to##GetBorderRight(aBorderRight); } \
+  NS_IMETHOD    SetBorderRight(const nsString& aBorderRight) { return _to##SetBorderRight(aBorderRight); } \
+  NS_IMETHOD    GetBorderBottom(nsString& aBorderBottom) { return _to##GetBorderBottom(aBorderBottom); } \
+  NS_IMETHOD    SetBorderBottom(const nsString& aBorderBottom) { return _to##SetBorderBottom(aBorderBottom); } \
+  NS_IMETHOD    GetBorderLeft(nsString& aBorderLeft) { return _to##GetBorderLeft(aBorderLeft); } \
+  NS_IMETHOD    SetBorderLeft(const nsString& aBorderLeft) { return _to##SetBorderLeft(aBorderLeft); } \
+  NS_IMETHOD    GetBorderTopColor(nsString& aBorderTopColor) { return _to##GetBorderTopColor(aBorderTopColor); } \
+  NS_IMETHOD    SetBorderTopColor(const nsString& aBorderTopColor) { return _to##SetBorderTopColor(aBorderTopColor); } \
+  NS_IMETHOD    GetBorderRightColor(nsString& aBorderRightColor) { return _to##GetBorderRightColor(aBorderRightColor); } \
+  NS_IMETHOD    SetBorderRightColor(const nsString& aBorderRightColor) { return _to##SetBorderRightColor(aBorderRightColor); } \
+  NS_IMETHOD    GetBorderBottomColor(nsString& aBorderBottomColor) { return _to##GetBorderBottomColor(aBorderBottomColor); } \
+  NS_IMETHOD    SetBorderBottomColor(const nsString& aBorderBottomColor) { return _to##SetBorderBottomColor(aBorderBottomColor); } \
+  NS_IMETHOD    GetBorderLeftColor(nsString& aBorderLeftColor) { return _to##GetBorderLeftColor(aBorderLeftColor); } \
+  NS_IMETHOD    SetBorderLeftColor(const nsString& aBorderLeftColor) { return _to##SetBorderLeftColor(aBorderLeftColor); } \
+  NS_IMETHOD    GetBorderTopStyle(nsString& aBorderTopStyle) { return _to##GetBorderTopStyle(aBorderTopStyle); } \
+  NS_IMETHOD    SetBorderTopStyle(const nsString& aBorderTopStyle) { return _to##SetBorderTopStyle(aBorderTopStyle); } \
+  NS_IMETHOD    GetBorderRightStyle(nsString& aBorderRightStyle) { return _to##GetBorderRightStyle(aBorderRightStyle); } \
+  NS_IMETHOD    SetBorderRightStyle(const nsString& aBorderRightStyle) { return _to##SetBorderRightStyle(aBorderRightStyle); } \
+  NS_IMETHOD    GetBorderBottomStyle(nsString& aBorderBottomStyle) { return _to##GetBorderBottomStyle(aBorderBottomStyle); } \
+  NS_IMETHOD    SetBorderBottomStyle(const nsString& aBorderBottomStyle) { return _to##SetBorderBottomStyle(aBorderBottomStyle); } \
+  NS_IMETHOD    GetBorderLeftStyle(nsString& aBorderLeftStyle) { return _to##GetBorderLeftStyle(aBorderLeftStyle); } \
+  NS_IMETHOD    SetBorderLeftStyle(const nsString& aBorderLeftStyle) { return _to##SetBorderLeftStyle(aBorderLeftStyle); } \
+  NS_IMETHOD    GetBorderTopWidth(nsString& aBorderTopWidth) { return _to##GetBorderTopWidth(aBorderTopWidth); } \
+  NS_IMETHOD    SetBorderTopWidth(const nsString& aBorderTopWidth) { return _to##SetBorderTopWidth(aBorderTopWidth); } \
+  NS_IMETHOD    GetBorderRightWidth(nsString& aBorderRightWidth) { return _to##GetBorderRightWidth(aBorderRightWidth); } \
+  NS_IMETHOD    SetBorderRightWidth(const nsString& aBorderRightWidth) { return _to##SetBorderRightWidth(aBorderRightWidth); } \
+  NS_IMETHOD    GetBorderBottomWidth(nsString& aBorderBottomWidth) { return _to##GetBorderBottomWidth(aBorderBottomWidth); } \
+  NS_IMETHOD    SetBorderBottomWidth(const nsString& aBorderBottomWidth) { return _to##SetBorderBottomWidth(aBorderBottomWidth); } \
+  NS_IMETHOD    GetBorderLeftWidth(nsString& aBorderLeftWidth) { return _to##GetBorderLeftWidth(aBorderLeftWidth); } \
+  NS_IMETHOD    SetBorderLeftWidth(const nsString& aBorderLeftWidth) { return _to##SetBorderLeftWidth(aBorderLeftWidth); } \
+  NS_IMETHOD    GetBorderWidth(nsString& aBorderWidth) { return _to##GetBorderWidth(aBorderWidth); } \
+  NS_IMETHOD    SetBorderWidth(const nsString& aBorderWidth) { return _to##SetBorderWidth(aBorderWidth); } \
+  NS_IMETHOD    GetBottom(nsString& aBottom) { return _to##GetBottom(aBottom); } \
+  NS_IMETHOD    SetBottom(const nsString& aBottom) { return _to##SetBottom(aBottom); } \
+  NS_IMETHOD    GetCaptionSide(nsString& aCaptionSide) { return _to##GetCaptionSide(aCaptionSide); } \
+  NS_IMETHOD    SetCaptionSide(const nsString& aCaptionSide) { return _to##SetCaptionSide(aCaptionSide); } \
+  NS_IMETHOD    GetClear(nsString& aClear) { return _to##GetClear(aClear); } \
+  NS_IMETHOD    SetClear(const nsString& aClear) { return _to##SetClear(aClear); } \
+  NS_IMETHOD    GetClip(nsString& aClip) { return _to##GetClip(aClip); } \
+  NS_IMETHOD    SetClip(const nsString& aClip) { return _to##SetClip(aClip); } \
+  NS_IMETHOD    GetColor(nsString& aColor) { return _to##GetColor(aColor); } \
+  NS_IMETHOD    SetColor(const nsString& aColor) { return _to##SetColor(aColor); } \
+  NS_IMETHOD    GetContent(nsString& aContent) { return _to##GetContent(aContent); } \
+  NS_IMETHOD    SetContent(const nsString& aContent) { return _to##SetContent(aContent); } \
+  NS_IMETHOD    GetCounterIncrement(nsString& aCounterIncrement) { return _to##GetCounterIncrement(aCounterIncrement); } \
+  NS_IMETHOD    SetCounterIncrement(const nsString& aCounterIncrement) { return _to##SetCounterIncrement(aCounterIncrement); } \
+  NS_IMETHOD    GetCounterReset(nsString& aCounterReset) { return _to##GetCounterReset(aCounterReset); } \
+  NS_IMETHOD    SetCounterReset(const nsString& aCounterReset) { return _to##SetCounterReset(aCounterReset); } \
+  NS_IMETHOD    GetCue(nsString& aCue) { return _to##GetCue(aCue); } \
+  NS_IMETHOD    SetCue(const nsString& aCue) { return _to##SetCue(aCue); } \
+  NS_IMETHOD    GetCueAfter(nsString& aCueAfter) { return _to##GetCueAfter(aCueAfter); } \
+  NS_IMETHOD    SetCueAfter(const nsString& aCueAfter) { return _to##SetCueAfter(aCueAfter); } \
+  NS_IMETHOD    GetCueBefore(nsString& aCueBefore) { return _to##GetCueBefore(aCueBefore); } \
+  NS_IMETHOD    SetCueBefore(const nsString& aCueBefore) { return _to##SetCueBefore(aCueBefore); } \
+  NS_IMETHOD    GetCursor(nsString& aCursor) { return _to##GetCursor(aCursor); } \
+  NS_IMETHOD    SetCursor(const nsString& aCursor) { return _to##SetCursor(aCursor); } \
+  NS_IMETHOD    GetDirection(nsString& aDirection) { return _to##GetDirection(aDirection); } \
+  NS_IMETHOD    SetDirection(const nsString& aDirection) { return _to##SetDirection(aDirection); } \
+  NS_IMETHOD    GetDisplay(nsString& aDisplay) { return _to##GetDisplay(aDisplay); } \
+  NS_IMETHOD    SetDisplay(const nsString& aDisplay) { return _to##SetDisplay(aDisplay); } \
+  NS_IMETHOD    GetElevation(nsString& aElevation) { return _to##GetElevation(aElevation); } \
+  NS_IMETHOD    SetElevation(const nsString& aElevation) { return _to##SetElevation(aElevation); } \
+  NS_IMETHOD    GetEmptyCells(nsString& aEmptyCells) { return _to##GetEmptyCells(aEmptyCells); } \
+  NS_IMETHOD    SetEmptyCells(const nsString& aEmptyCells) { return _to##SetEmptyCells(aEmptyCells); } \
+  NS_IMETHOD    GetCssFloat(nsString& aCssFloat) { return _to##GetCssFloat(aCssFloat); } \
+  NS_IMETHOD    SetCssFloat(const nsString& aCssFloat) { return _to##SetCssFloat(aCssFloat); } \
+  NS_IMETHOD    GetFont(nsString& aFont) { return _to##GetFont(aFont); } \
+  NS_IMETHOD    SetFont(const nsString& aFont) { return _to##SetFont(aFont); } \
+  NS_IMETHOD    GetFontFamily(nsString& aFontFamily) { return _to##GetFontFamily(aFontFamily); } \
+  NS_IMETHOD    SetFontFamily(const nsString& aFontFamily) { return _to##SetFontFamily(aFontFamily); } \
+  NS_IMETHOD    GetFontSize(nsString& aFontSize) { return _to##GetFontSize(aFontSize); } \
+  NS_IMETHOD    SetFontSize(const nsString& aFontSize) { return _to##SetFontSize(aFontSize); } \
+  NS_IMETHOD    GetFontSizeAdjust(nsString& aFontSizeAdjust) { return _to##GetFontSizeAdjust(aFontSizeAdjust); } \
+  NS_IMETHOD    SetFontSizeAdjust(const nsString& aFontSizeAdjust) { return _to##SetFontSizeAdjust(aFontSizeAdjust); } \
+  NS_IMETHOD    GetFontStretch(nsString& aFontStretch) { return _to##GetFontStretch(aFontStretch); } \
+  NS_IMETHOD    SetFontStretch(const nsString& aFontStretch) { return _to##SetFontStretch(aFontStretch); } \
+  NS_IMETHOD    GetFontStyle(nsString& aFontStyle) { return _to##GetFontStyle(aFontStyle); } \
+  NS_IMETHOD    SetFontStyle(const nsString& aFontStyle) { return _to##SetFontStyle(aFontStyle); } \
+  NS_IMETHOD    GetFontVariant(nsString& aFontVariant) { return _to##GetFontVariant(aFontVariant); } \
+  NS_IMETHOD    SetFontVariant(const nsString& aFontVariant) { return _to##SetFontVariant(aFontVariant); } \
+  NS_IMETHOD    GetFontWeight(nsString& aFontWeight) { return _to##GetFontWeight(aFontWeight); } \
+  NS_IMETHOD    SetFontWeight(const nsString& aFontWeight) { return _to##SetFontWeight(aFontWeight); } \
+  NS_IMETHOD    GetHeight(nsString& aHeight) { return _to##GetHeight(aHeight); } \
+  NS_IMETHOD    SetHeight(const nsString& aHeight) { return _to##SetHeight(aHeight); } \
+  NS_IMETHOD    GetLeft(nsString& aLeft) { return _to##GetLeft(aLeft); } \
+  NS_IMETHOD    SetLeft(const nsString& aLeft) { return _to##SetLeft(aLeft); } \
+  NS_IMETHOD    GetLetterSpacing(nsString& aLetterSpacing) { return _to##GetLetterSpacing(aLetterSpacing); } \
+  NS_IMETHOD    SetLetterSpacing(const nsString& aLetterSpacing) { return _to##SetLetterSpacing(aLetterSpacing); } \
+  NS_IMETHOD    GetLineHeight(nsString& aLineHeight) { return _to##GetLineHeight(aLineHeight); } \
+  NS_IMETHOD    SetLineHeight(const nsString& aLineHeight) { return _to##SetLineHeight(aLineHeight); } \
+  NS_IMETHOD    GetListStyle(nsString& aListStyle) { return _to##GetListStyle(aListStyle); } \
+  NS_IMETHOD    SetListStyle(const nsString& aListStyle) { return _to##SetListStyle(aListStyle); } \
+  NS_IMETHOD    GetListStyleImage(nsString& aListStyleImage) { return _to##GetListStyleImage(aListStyleImage); } \
+  NS_IMETHOD    SetListStyleImage(const nsString& aListStyleImage) { return _to##SetListStyleImage(aListStyleImage); } \
+  NS_IMETHOD    GetListStylePosition(nsString& aListStylePosition) { return _to##GetListStylePosition(aListStylePosition); } \
+  NS_IMETHOD    SetListStylePosition(const nsString& aListStylePosition) { return _to##SetListStylePosition(aListStylePosition); } \
+  NS_IMETHOD    GetListStyleType(nsString& aListStyleType) { return _to##GetListStyleType(aListStyleType); } \
+  NS_IMETHOD    SetListStyleType(const nsString& aListStyleType) { return _to##SetListStyleType(aListStyleType); } \
+  NS_IMETHOD    GetMargin(nsString& aMargin) { return _to##GetMargin(aMargin); } \
+  NS_IMETHOD    SetMargin(const nsString& aMargin) { return _to##SetMargin(aMargin); } \
+  NS_IMETHOD    GetMarginTop(nsString& aMarginTop) { return _to##GetMarginTop(aMarginTop); } \
+  NS_IMETHOD    SetMarginTop(const nsString& aMarginTop) { return _to##SetMarginTop(aMarginTop); } \
+  NS_IMETHOD    GetMarginRight(nsString& aMarginRight) { return _to##GetMarginRight(aMarginRight); } \
+  NS_IMETHOD    SetMarginRight(const nsString& aMarginRight) { return _to##SetMarginRight(aMarginRight); } \
+  NS_IMETHOD    GetMarginBottom(nsString& aMarginBottom) { return _to##GetMarginBottom(aMarginBottom); } \
+  NS_IMETHOD    SetMarginBottom(const nsString& aMarginBottom) { return _to##SetMarginBottom(aMarginBottom); } \
+  NS_IMETHOD    GetMarginLeft(nsString& aMarginLeft) { return _to##GetMarginLeft(aMarginLeft); } \
+  NS_IMETHOD    SetMarginLeft(const nsString& aMarginLeft) { return _to##SetMarginLeft(aMarginLeft); } \
+  NS_IMETHOD    GetMarkerOffset(nsString& aMarkerOffset) { return _to##GetMarkerOffset(aMarkerOffset); } \
+  NS_IMETHOD    SetMarkerOffset(const nsString& aMarkerOffset) { return _to##SetMarkerOffset(aMarkerOffset); } \
+  NS_IMETHOD    GetMarks(nsString& aMarks) { return _to##GetMarks(aMarks); } \
+  NS_IMETHOD    SetMarks(const nsString& aMarks) { return _to##SetMarks(aMarks); } \
+  NS_IMETHOD    GetMaxHeight(nsString& aMaxHeight) { return _to##GetMaxHeight(aMaxHeight); } \
+  NS_IMETHOD    SetMaxHeight(const nsString& aMaxHeight) { return _to##SetMaxHeight(aMaxHeight); } \
+  NS_IMETHOD    GetMaxWidth(nsString& aMaxWidth) { return _to##GetMaxWidth(aMaxWidth); } \
+  NS_IMETHOD    SetMaxWidth(const nsString& aMaxWidth) { return _to##SetMaxWidth(aMaxWidth); } \
+  NS_IMETHOD    GetMinHeight(nsString& aMinHeight) { return _to##GetMinHeight(aMinHeight); } \
+  NS_IMETHOD    SetMinHeight(const nsString& aMinHeight) { return _to##SetMinHeight(aMinHeight); } \
+  NS_IMETHOD    GetMinWidth(nsString& aMinWidth) { return _to##GetMinWidth(aMinWidth); } \
+  NS_IMETHOD    SetMinWidth(const nsString& aMinWidth) { return _to##SetMinWidth(aMinWidth); } \
+  NS_IMETHOD    GetOrphans(nsString& aOrphans) { return _to##GetOrphans(aOrphans); } \
+  NS_IMETHOD    SetOrphans(const nsString& aOrphans) { return _to##SetOrphans(aOrphans); } \
+  NS_IMETHOD    GetOutline(nsString& aOutline) { return _to##GetOutline(aOutline); } \
+  NS_IMETHOD    SetOutline(const nsString& aOutline) { return _to##SetOutline(aOutline); } \
+  NS_IMETHOD    GetOutlineColor(nsString& aOutlineColor) { return _to##GetOutlineColor(aOutlineColor); } \
+  NS_IMETHOD    SetOutlineColor(const nsString& aOutlineColor) { return _to##SetOutlineColor(aOutlineColor); } \
+  NS_IMETHOD    GetOutlineStyle(nsString& aOutlineStyle) { return _to##GetOutlineStyle(aOutlineStyle); } \
+  NS_IMETHOD    SetOutlineStyle(const nsString& aOutlineStyle) { return _to##SetOutlineStyle(aOutlineStyle); } \
+  NS_IMETHOD    GetOutlineWidth(nsString& aOutlineWidth) { return _to##GetOutlineWidth(aOutlineWidth); } \
+  NS_IMETHOD    SetOutlineWidth(const nsString& aOutlineWidth) { return _to##SetOutlineWidth(aOutlineWidth); } \
+  NS_IMETHOD    GetOverflow(nsString& aOverflow) { return _to##GetOverflow(aOverflow); } \
+  NS_IMETHOD    SetOverflow(const nsString& aOverflow) { return _to##SetOverflow(aOverflow); } \
+  NS_IMETHOD    GetPadding(nsString& aPadding) { return _to##GetPadding(aPadding); } \
+  NS_IMETHOD    SetPadding(const nsString& aPadding) { return _to##SetPadding(aPadding); } \
+  NS_IMETHOD    GetPaddingTop(nsString& aPaddingTop) { return _to##GetPaddingTop(aPaddingTop); } \
+  NS_IMETHOD    SetPaddingTop(const nsString& aPaddingTop) { return _to##SetPaddingTop(aPaddingTop); } \
+  NS_IMETHOD    GetPaddingRight(nsString& aPaddingRight) { return _to##GetPaddingRight(aPaddingRight); } \
+  NS_IMETHOD    SetPaddingRight(const nsString& aPaddingRight) { return _to##SetPaddingRight(aPaddingRight); } \
+  NS_IMETHOD    GetPaddingBottom(nsString& aPaddingBottom) { return _to##GetPaddingBottom(aPaddingBottom); } \
+  NS_IMETHOD    SetPaddingBottom(const nsString& aPaddingBottom) { return _to##SetPaddingBottom(aPaddingBottom); } \
+  NS_IMETHOD    GetPaddingLeft(nsString& aPaddingLeft) { return _to##GetPaddingLeft(aPaddingLeft); } \
+  NS_IMETHOD    SetPaddingLeft(const nsString& aPaddingLeft) { return _to##SetPaddingLeft(aPaddingLeft); } \
+  NS_IMETHOD    GetPage(nsString& aPage) { return _to##GetPage(aPage); } \
+  NS_IMETHOD    SetPage(const nsString& aPage) { return _to##SetPage(aPage); } \
+  NS_IMETHOD    GetPageBreakAfter(nsString& aPageBreakAfter) { return _to##GetPageBreakAfter(aPageBreakAfter); } \
+  NS_IMETHOD    SetPageBreakAfter(const nsString& aPageBreakAfter) { return _to##SetPageBreakAfter(aPageBreakAfter); } \
+  NS_IMETHOD    GetPageBreakBefore(nsString& aPageBreakBefore) { return _to##GetPageBreakBefore(aPageBreakBefore); } \
+  NS_IMETHOD    SetPageBreakBefore(const nsString& aPageBreakBefore) { return _to##SetPageBreakBefore(aPageBreakBefore); } \
+  NS_IMETHOD    GetPageBreakInside(nsString& aPageBreakInside) { return _to##GetPageBreakInside(aPageBreakInside); } \
+  NS_IMETHOD    SetPageBreakInside(const nsString& aPageBreakInside) { return _to##SetPageBreakInside(aPageBreakInside); } \
+  NS_IMETHOD    GetPause(nsString& aPause) { return _to##GetPause(aPause); } \
+  NS_IMETHOD    SetPause(const nsString& aPause) { return _to##SetPause(aPause); } \
+  NS_IMETHOD    GetPauseAfter(nsString& aPauseAfter) { return _to##GetPauseAfter(aPauseAfter); } \
+  NS_IMETHOD    SetPauseAfter(const nsString& aPauseAfter) { return _to##SetPauseAfter(aPauseAfter); } \
+  NS_IMETHOD    GetPauseBefore(nsString& aPauseBefore) { return _to##GetPauseBefore(aPauseBefore); } \
+  NS_IMETHOD    SetPauseBefore(const nsString& aPauseBefore) { return _to##SetPauseBefore(aPauseBefore); } \
+  NS_IMETHOD    GetPitch(nsString& aPitch) { return _to##GetPitch(aPitch); } \
+  NS_IMETHOD    SetPitch(const nsString& aPitch) { return _to##SetPitch(aPitch); } \
+  NS_IMETHOD    GetPitchRange(nsString& aPitchRange) { return _to##GetPitchRange(aPitchRange); } \
+  NS_IMETHOD    SetPitchRange(const nsString& aPitchRange) { return _to##SetPitchRange(aPitchRange); } \
+  NS_IMETHOD    GetPlayDuring(nsString& aPlayDuring) { return _to##GetPlayDuring(aPlayDuring); } \
+  NS_IMETHOD    SetPlayDuring(const nsString& aPlayDuring) { return _to##SetPlayDuring(aPlayDuring); } \
+  NS_IMETHOD    GetPosition(nsString& aPosition) { return _to##GetPosition(aPosition); } \
+  NS_IMETHOD    SetPosition(const nsString& aPosition) { return _to##SetPosition(aPosition); } \
+  NS_IMETHOD    GetQuotes(nsString& aQuotes) { return _to##GetQuotes(aQuotes); } \
+  NS_IMETHOD    SetQuotes(const nsString& aQuotes) { return _to##SetQuotes(aQuotes); } \
+  NS_IMETHOD    GetRichness(nsString& aRichness) { return _to##GetRichness(aRichness); } \
+  NS_IMETHOD    SetRichness(const nsString& aRichness) { return _to##SetRichness(aRichness); } \
+  NS_IMETHOD    GetRight(nsString& aRight) { return _to##GetRight(aRight); } \
+  NS_IMETHOD    SetRight(const nsString& aRight) { return _to##SetRight(aRight); } \
+  NS_IMETHOD    GetSize(nsString& aSize) { return _to##GetSize(aSize); } \
+  NS_IMETHOD    SetSize(const nsString& aSize) { return _to##SetSize(aSize); } \
+  NS_IMETHOD    GetSpeak(nsString& aSpeak) { return _to##GetSpeak(aSpeak); } \
+  NS_IMETHOD    SetSpeak(const nsString& aSpeak) { return _to##SetSpeak(aSpeak); } \
+  NS_IMETHOD    GetSpeakHeader(nsString& aSpeakHeader) { return _to##GetSpeakHeader(aSpeakHeader); } \
+  NS_IMETHOD    SetSpeakHeader(const nsString& aSpeakHeader) { return _to##SetSpeakHeader(aSpeakHeader); } \
+  NS_IMETHOD    GetSpeakNumeral(nsString& aSpeakNumeral) { return _to##GetSpeakNumeral(aSpeakNumeral); } \
+  NS_IMETHOD    SetSpeakNumeral(const nsString& aSpeakNumeral) { return _to##SetSpeakNumeral(aSpeakNumeral); } \
+  NS_IMETHOD    GetSpeakPunctuation(nsString& aSpeakPunctuation) { return _to##GetSpeakPunctuation(aSpeakPunctuation); } \
+  NS_IMETHOD    SetSpeakPunctuation(const nsString& aSpeakPunctuation) { return _to##SetSpeakPunctuation(aSpeakPunctuation); } \
+  NS_IMETHOD    GetSpeechRate(nsString& aSpeechRate) { return _to##GetSpeechRate(aSpeechRate); } \
+  NS_IMETHOD    SetSpeechRate(const nsString& aSpeechRate) { return _to##SetSpeechRate(aSpeechRate); } \
+  NS_IMETHOD    GetStress(nsString& aStress) { return _to##GetStress(aStress); } \
+  NS_IMETHOD    SetStress(const nsString& aStress) { return _to##SetStress(aStress); } \
+  NS_IMETHOD    GetTableLayout(nsString& aTableLayout) { return _to##GetTableLayout(aTableLayout); } \
+  NS_IMETHOD    SetTableLayout(const nsString& aTableLayout) { return _to##SetTableLayout(aTableLayout); } \
+  NS_IMETHOD    GetTextAlign(nsString& aTextAlign) { return _to##GetTextAlign(aTextAlign); } \
+  NS_IMETHOD    SetTextAlign(const nsString& aTextAlign) { return _to##SetTextAlign(aTextAlign); } \
+  NS_IMETHOD    GetTextDecoration(nsString& aTextDecoration) { return _to##GetTextDecoration(aTextDecoration); } \
+  NS_IMETHOD    SetTextDecoration(const nsString& aTextDecoration) { return _to##SetTextDecoration(aTextDecoration); } \
+  NS_IMETHOD    GetTextIndent(nsString& aTextIndent) { return _to##GetTextIndent(aTextIndent); } \
+  NS_IMETHOD    SetTextIndent(const nsString& aTextIndent) { return _to##SetTextIndent(aTextIndent); } \
+  NS_IMETHOD    GetTextShadow(nsString& aTextShadow) { return _to##GetTextShadow(aTextShadow); } \
+  NS_IMETHOD    SetTextShadow(const nsString& aTextShadow) { return _to##SetTextShadow(aTextShadow); } \
+  NS_IMETHOD    GetTextTransform(nsString& aTextTransform) { return _to##GetTextTransform(aTextTransform); } \
+  NS_IMETHOD    SetTextTransform(const nsString& aTextTransform) { return _to##SetTextTransform(aTextTransform); } \
+  NS_IMETHOD    GetTop(nsString& aTop) { return _to##GetTop(aTop); } \
+  NS_IMETHOD    SetTop(const nsString& aTop) { return _to##SetTop(aTop); } \
+  NS_IMETHOD    GetUnicodeBidi(nsString& aUnicodeBidi) { return _to##GetUnicodeBidi(aUnicodeBidi); } \
+  NS_IMETHOD    SetUnicodeBidi(const nsString& aUnicodeBidi) { return _to##SetUnicodeBidi(aUnicodeBidi); } \
+  NS_IMETHOD    GetVerticalAlign(nsString& aVerticalAlign) { return _to##GetVerticalAlign(aVerticalAlign); } \
+  NS_IMETHOD    SetVerticalAlign(const nsString& aVerticalAlign) { return _to##SetVerticalAlign(aVerticalAlign); } \
+  NS_IMETHOD    GetVisibility(nsString& aVisibility) { return _to##GetVisibility(aVisibility); } \
+  NS_IMETHOD    SetVisibility(const nsString& aVisibility) { return _to##SetVisibility(aVisibility); } \
+  NS_IMETHOD    GetVoiceFamily(nsString& aVoiceFamily) { return _to##GetVoiceFamily(aVoiceFamily); } \
+  NS_IMETHOD    SetVoiceFamily(const nsString& aVoiceFamily) { return _to##SetVoiceFamily(aVoiceFamily); } \
+  NS_IMETHOD    GetVolume(nsString& aVolume) { return _to##GetVolume(aVolume); } \
+  NS_IMETHOD    SetVolume(const nsString& aVolume) { return _to##SetVolume(aVolume); } \
+  NS_IMETHOD    GetWhiteSpace(nsString& aWhiteSpace) { return _to##GetWhiteSpace(aWhiteSpace); } \
+  NS_IMETHOD    SetWhiteSpace(const nsString& aWhiteSpace) { return _to##SetWhiteSpace(aWhiteSpace); } \
+  NS_IMETHOD    GetWidows(nsString& aWidows) { return _to##GetWidows(aWidows); } \
+  NS_IMETHOD    SetWidows(const nsString& aWidows) { return _to##SetWidows(aWidows); } \
+  NS_IMETHOD    GetWidth(nsString& aWidth) { return _to##GetWidth(aWidth); } \
+  NS_IMETHOD    SetWidth(const nsString& aWidth) { return _to##SetWidth(aWidth); } \
+  NS_IMETHOD    GetWordSpacing(nsString& aWordSpacing) { return _to##GetWordSpacing(aWordSpacing); } \
+  NS_IMETHOD    SetWordSpacing(const nsString& aWordSpacing) { return _to##SetWordSpacing(aWordSpacing); } \
+  NS_IMETHOD    GetZIndex(nsString& aZIndex) { return _to##GetZIndex(aZIndex); } \
+  NS_IMETHOD    SetZIndex(const nsString& aZIndex) { return _to##SetZIndex(aZIndex); } \
+  NS_IMETHOD    GetOpacity(nsString& aOpacity) { return _to##GetOpacity(aOpacity); } \
+  NS_IMETHOD    SetOpacity(const nsString& aOpacity) { return _to##SetOpacity(aOpacity); } \
+
+
+extern nsresult NS_InitCSS2PropertiesClass(nsIScriptContext *aContext, void **aPrototype);
+
+extern "C" NS_DOM nsresult NS_NewScriptCSS2Properties(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
+
+#endif // nsIDOMCSS2Properties_h__
diff --git a/mozilla/dom/public/css/nsIDOMCSSFontFaceRule.h b/mozilla/dom/public/css/nsIDOMCSSFontFaceRule.h
index 8695f3b7618..469e532b03a 100644
--- a/mozilla/dom/public/css/nsIDOMCSSFontFaceRule.h
+++ b/mozilla/dom/public/css/nsIDOMCSSFontFaceRule.h
@@ -23,7 +23,7 @@
 #include "nsISupports.h"
 #include "nsString.h"
 #include "nsIScriptContext.h"
-#include "nsIDOMCSSStyleRule.h"
+#include "nsIDOMCSSRule.h"
 
 class nsIDOMCSSStyleDeclaration;
 
@@ -31,7 +31,7 @@ class nsIDOMCSSStyleDeclaration;
  { 0xa6cf90bb, 0x15b3, 0x11d2, \
    { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMCSSFontFaceRule : public nsIDOMCSSStyleRule {
+class nsIDOMCSSFontFaceRule : public nsIDOMCSSRule {
 public:
 
   NS_IMETHOD    GetStyle(nsIDOMCSSStyleDeclaration** aStyle)=0;
diff --git a/mozilla/dom/public/css/nsIDOMCSSImportRule.h b/mozilla/dom/public/css/nsIDOMCSSImportRule.h
new file mode 100644
index 00000000000..c882fca6cd4
--- /dev/null
+++ b/mozilla/dom/public/css/nsIDOMCSSImportRule.h
@@ -0,0 +1,68 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#ifndef nsIDOMCSSImportRule_h__
+#define nsIDOMCSSImportRule_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIScriptContext.h"
+#include "nsIDOMCSSRule.h"
+
+class nsIDOMCSSStyleSheet;
+
+#define NS_IDOMCSSIMPORTRULE_IID \
+ { 0xa6cf90cf, 0x15b3, 0x11d2, \
+    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} } 
+
+class nsIDOMCSSImportRule : public nsIDOMCSSRule {
+public:
+
+  NS_IMETHOD    GetHref(nsString& aHref)=0;
+  NS_IMETHOD    SetHref(const nsString& aHref)=0;
+
+  NS_IMETHOD    GetMedia(nsString& aMedia)=0;
+  NS_IMETHOD    SetMedia(const nsString& aMedia)=0;
+
+  NS_IMETHOD    GetStyleSheet(nsIDOMCSSStyleSheet** aStyleSheet)=0;
+};
+
+
+#define NS_DECL_IDOMCSSIMPORTRULE   \
+  NS_IMETHOD    GetHref(nsString& aHref);  \
+  NS_IMETHOD    SetHref(const nsString& aHref);  \
+  NS_IMETHOD    GetMedia(nsString& aMedia);  \
+  NS_IMETHOD    SetMedia(const nsString& aMedia);  \
+  NS_IMETHOD    GetStyleSheet(nsIDOMCSSStyleSheet** aStyleSheet);  \
+
+
+
+#define NS_FORWARD_IDOMCSSIMPORTRULE(_to)  \
+  NS_IMETHOD    GetHref(nsString& aHref) { return _to##GetHref(aHref); } \
+  NS_IMETHOD    SetHref(const nsString& aHref) { return _to##SetHref(aHref); } \
+  NS_IMETHOD    GetMedia(nsString& aMedia) { return _to##GetMedia(aMedia); } \
+  NS_IMETHOD    SetMedia(const nsString& aMedia) { return _to##SetMedia(aMedia); } \
+  NS_IMETHOD    GetStyleSheet(nsIDOMCSSStyleSheet** aStyleSheet) { return _to##GetStyleSheet(aStyleSheet); } \
+
+
+extern nsresult NS_InitCSSImportRuleClass(nsIScriptContext *aContext, void **aPrototype);
+
+extern "C" NS_DOM nsresult NS_NewScriptCSSImportRule(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
+
+#endif // nsIDOMCSSImportRule_h__
diff --git a/mozilla/dom/public/css/nsIDOMCSSMediaRule.h b/mozilla/dom/public/css/nsIDOMCSSMediaRule.h
index b0fbf73f327..c9b13f56bf3 100644
--- a/mozilla/dom/public/css/nsIDOMCSSMediaRule.h
+++ b/mozilla/dom/public/css/nsIDOMCSSMediaRule.h
@@ -23,7 +23,7 @@
 #include "nsISupports.h"
 #include "nsString.h"
 #include "nsIScriptContext.h"
-#include "nsIDOMCSSStyleRule.h"
+#include "nsIDOMCSSRule.h"
 
 class nsIDOMCSSStyleRuleCollection;
 
@@ -31,35 +31,35 @@ class nsIDOMCSSStyleRuleCollection;
  { 0xa6cf90bc, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMCSSMediaRule : public nsIDOMCSSStyleRule {
+class nsIDOMCSSMediaRule : public nsIDOMCSSRule {
 public:
 
   NS_IMETHOD    GetMediaTypes(nsString& aMediaTypes)=0;
   NS_IMETHOD    SetMediaTypes(const nsString& aMediaTypes)=0;
 
-  NS_IMETHOD    GetRules(nsIDOMCSSStyleRuleCollection** aRules)=0;
+  NS_IMETHOD    GetCssRules(nsIDOMCSSStyleRuleCollection** aCssRules)=0;
 
-  NS_IMETHOD    AddRule(const nsString& aSelector, const nsString& aDeclaration, PRUint32 aIndex, PRUint32* aReturn)=0;
+  NS_IMETHOD    InsertRule(const nsString& aRule, PRUint32 aIndex, PRUint32* aReturn)=0;
 
-  NS_IMETHOD    RemoveRule(PRUint32 aIndex)=0;
+  NS_IMETHOD    DeleteRule(PRUint32 aIndex)=0;
 };
 
 
 #define NS_DECL_IDOMCSSMEDIARULE   \
   NS_IMETHOD    GetMediaTypes(nsString& aMediaTypes);  \
   NS_IMETHOD    SetMediaTypes(const nsString& aMediaTypes);  \
-  NS_IMETHOD    GetRules(nsIDOMCSSStyleRuleCollection** aRules);  \
-  NS_IMETHOD    AddRule(const nsString& aSelector, const nsString& aDeclaration, PRUint32 aIndex, PRUint32* aReturn);  \
-  NS_IMETHOD    RemoveRule(PRUint32 aIndex);  \
+  NS_IMETHOD    GetCssRules(nsIDOMCSSStyleRuleCollection** aCssRules);  \
+  NS_IMETHOD    InsertRule(const nsString& aRule, PRUint32 aIndex, PRUint32* aReturn);  \
+  NS_IMETHOD    DeleteRule(PRUint32 aIndex);  \
 
 
 
 #define NS_FORWARD_IDOMCSSMEDIARULE(_to)  \
   NS_IMETHOD    GetMediaTypes(nsString& aMediaTypes) { return _to##GetMediaTypes(aMediaTypes); } \
   NS_IMETHOD    SetMediaTypes(const nsString& aMediaTypes) { return _to##SetMediaTypes(aMediaTypes); } \
-  NS_IMETHOD    GetRules(nsIDOMCSSStyleRuleCollection** aRules) { return _to##GetRules(aRules); } \
-  NS_IMETHOD    AddRule(const nsString& aSelector, const nsString& aDeclaration, PRUint32 aIndex, PRUint32* aReturn) { return _to##AddRule(aSelector, aDeclaration, aIndex, aReturn); }  \
-  NS_IMETHOD    RemoveRule(PRUint32 aIndex) { return _to##RemoveRule(aIndex); }  \
+  NS_IMETHOD    GetCssRules(nsIDOMCSSStyleRuleCollection** aCssRules) { return _to##GetCssRules(aCssRules); } \
+  NS_IMETHOD    InsertRule(const nsString& aRule, PRUint32 aIndex, PRUint32* aReturn) { return _to##InsertRule(aRule, aIndex, aReturn); }  \
+  NS_IMETHOD    DeleteRule(PRUint32 aIndex) { return _to##DeleteRule(aIndex); }  \
 
 
 extern nsresult NS_InitCSSMediaRuleClass(nsIScriptContext *aContext, void **aPrototype);
diff --git a/mozilla/dom/public/css/nsIDOMCSSPageRule.h b/mozilla/dom/public/css/nsIDOMCSSPageRule.h
index b893e3b7c8f..5364b9a1233 100644
--- a/mozilla/dom/public/css/nsIDOMCSSPageRule.h
+++ b/mozilla/dom/public/css/nsIDOMCSSPageRule.h
@@ -23,7 +23,7 @@
 #include "nsISupports.h"
 #include "nsString.h"
 #include "nsIScriptContext.h"
-#include "nsIDOMCSSStyleRule.h"
+#include "nsIDOMCSSRule.h"
 
 class nsIDOMCSSStyleDeclaration;
 
@@ -31,11 +31,11 @@ class nsIDOMCSSStyleDeclaration;
  { 0xa6cf90bd, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMCSSPageRule : public nsIDOMCSSStyleRule {
+class nsIDOMCSSPageRule : public nsIDOMCSSRule {
 public:
 
-  NS_IMETHOD    GetSelectorText(nsString& aSelectorText)=0;
-  NS_IMETHOD    SetSelectorText(const nsString& aSelectorText)=0;
+  NS_IMETHOD    GetName(nsString& aName)=0;
+  NS_IMETHOD    SetName(const nsString& aName)=0;
 
   NS_IMETHOD    GetStyle(nsIDOMCSSStyleDeclaration** aStyle)=0;
   NS_IMETHOD    SetStyle(nsIDOMCSSStyleDeclaration* aStyle)=0;
@@ -43,16 +43,16 @@ public:
 
 
 #define NS_DECL_IDOMCSSPAGERULE   \
-  NS_IMETHOD    GetSelectorText(nsString& aSelectorText);  \
-  NS_IMETHOD    SetSelectorText(const nsString& aSelectorText);  \
+  NS_IMETHOD    GetName(nsString& aName);  \
+  NS_IMETHOD    SetName(const nsString& aName);  \
   NS_IMETHOD    GetStyle(nsIDOMCSSStyleDeclaration** aStyle);  \
   NS_IMETHOD    SetStyle(nsIDOMCSSStyleDeclaration* aStyle);  \
 
 
 
 #define NS_FORWARD_IDOMCSSPAGERULE(_to)  \
-  NS_IMETHOD    GetSelectorText(nsString& aSelectorText) { return _to##GetSelectorText(aSelectorText); } \
-  NS_IMETHOD    SetSelectorText(const nsString& aSelectorText) { return _to##SetSelectorText(aSelectorText); } \
+  NS_IMETHOD    GetName(nsString& aName) { return _to##GetName(aName); } \
+  NS_IMETHOD    SetName(const nsString& aName) { return _to##SetName(aName); } \
   NS_IMETHOD    GetStyle(nsIDOMCSSStyleDeclaration** aStyle) { return _to##GetStyle(aStyle); } \
   NS_IMETHOD    SetStyle(nsIDOMCSSStyleDeclaration* aStyle) { return _to##SetStyle(aStyle); } \
 
diff --git a/mozilla/dom/public/css/nsIDOMCSSRule.h b/mozilla/dom/public/css/nsIDOMCSSRule.h
new file mode 100644
index 00000000000..9a9032d7125
--- /dev/null
+++ b/mozilla/dom/public/css/nsIDOMCSSRule.h
@@ -0,0 +1,72 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#ifndef nsIDOMCSSRule_h__
+#define nsIDOMCSSRule_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIScriptContext.h"
+
+class nsIDOMCSSStyleSheet;
+
+#define NS_IDOMCSSRULE_IID \
+ { 0xa6cf90c1, 0x15b3, 0x11d2, \
+    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} } 
+
+class nsIDOMCSSRule : public nsISupports {
+public:
+  enum {
+    UNKNOWN_RULE = 14005568,
+    STYLE_RULE = 1,
+    IMPORT_RULE = 2,
+    MEDIA_RULE = 3,
+    FONT_FACE_RULE = 4,
+    PAGE_RULE = 5
+  };
+
+  NS_IMETHOD    GetType(PRUint16* aType)=0;
+
+  NS_IMETHOD    GetCssText(nsString& aCssText)=0;
+  NS_IMETHOD    SetCssText(const nsString& aCssText)=0;
+
+  NS_IMETHOD    GetSheet(nsIDOMCSSStyleSheet** aSheet)=0;
+};
+
+
+#define NS_DECL_IDOMCSSRULE   \
+  NS_IMETHOD    GetType(PRUint16* aType);  \
+  NS_IMETHOD    GetCssText(nsString& aCssText);  \
+  NS_IMETHOD    SetCssText(const nsString& aCssText);  \
+  NS_IMETHOD    GetSheet(nsIDOMCSSStyleSheet** aSheet);  \
+
+
+
+#define NS_FORWARD_IDOMCSSRULE(_to)  \
+  NS_IMETHOD    GetType(PRUint16* aType) { return _to##GetType(aType); } \
+  NS_IMETHOD    GetCssText(nsString& aCssText) { return _to##GetCssText(aCssText); } \
+  NS_IMETHOD    SetCssText(const nsString& aCssText) { return _to##SetCssText(aCssText); } \
+  NS_IMETHOD    GetSheet(nsIDOMCSSStyleSheet** aSheet) { return _to##GetSheet(aSheet); } \
+
+
+extern nsresult NS_InitCSSRuleClass(nsIScriptContext *aContext, void **aPrototype);
+
+extern "C" NS_DOM nsresult NS_NewScriptCSSRule(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
+
+#endif // nsIDOMCSSRule_h__
diff --git a/mozilla/dom/public/css/nsIDOMCSSStyleDeclaration.h b/mozilla/dom/public/css/nsIDOMCSSStyleDeclaration.h
index 461e99e1f71..1f56da5fd5e 100644
--- a/mozilla/dom/public/css/nsIDOMCSSStyleDeclaration.h
+++ b/mozilla/dom/public/css/nsIDOMCSSStyleDeclaration.h
@@ -32,377 +32,11 @@
 class nsIDOMCSSStyleDeclaration : public nsISupports {
 public:
 
+  NS_IMETHOD    GetCssText(nsString& aCssText)=0;
+  NS_IMETHOD    SetCssText(const nsString& aCssText)=0;
+
   NS_IMETHOD    GetLength(PRUint32* aLength)=0;
 
-  NS_IMETHOD    GetAzimuth(nsString& aAzimuth)=0;
-  NS_IMETHOD    SetAzimuth(const nsString& aAzimuth)=0;
-
-  NS_IMETHOD    GetBackground(nsString& aBackground)=0;
-  NS_IMETHOD    SetBackground(const nsString& aBackground)=0;
-
-  NS_IMETHOD    GetBackgroundAttachment(nsString& aBackgroundAttachment)=0;
-  NS_IMETHOD    SetBackgroundAttachment(const nsString& aBackgroundAttachment)=0;
-
-  NS_IMETHOD    GetBackgroundColor(nsString& aBackgroundColor)=0;
-  NS_IMETHOD    SetBackgroundColor(const nsString& aBackgroundColor)=0;
-
-  NS_IMETHOD    GetBackgroundImage(nsString& aBackgroundImage)=0;
-  NS_IMETHOD    SetBackgroundImage(const nsString& aBackgroundImage)=0;
-
-  NS_IMETHOD    GetBackgroundPosition(nsString& aBackgroundPosition)=0;
-  NS_IMETHOD    SetBackgroundPosition(const nsString& aBackgroundPosition)=0;
-
-  NS_IMETHOD    GetBackgroundRepeat(nsString& aBackgroundRepeat)=0;
-  NS_IMETHOD    SetBackgroundRepeat(const nsString& aBackgroundRepeat)=0;
-
-  NS_IMETHOD    GetBorder(nsString& aBorder)=0;
-  NS_IMETHOD    SetBorder(const nsString& aBorder)=0;
-
-  NS_IMETHOD    GetBorderCollapse(nsString& aBorderCollapse)=0;
-  NS_IMETHOD    SetBorderCollapse(const nsString& aBorderCollapse)=0;
-
-  NS_IMETHOD    GetBorderColor(nsString& aBorderColor)=0;
-  NS_IMETHOD    SetBorderColor(const nsString& aBorderColor)=0;
-
-  NS_IMETHOD    GetBorderSpacing(nsString& aBorderSpacing)=0;
-  NS_IMETHOD    SetBorderSpacing(const nsString& aBorderSpacing)=0;
-
-  NS_IMETHOD    GetBorderStyle(nsString& aBorderStyle)=0;
-  NS_IMETHOD    SetBorderStyle(const nsString& aBorderStyle)=0;
-
-  NS_IMETHOD    GetBorderTop(nsString& aBorderTop)=0;
-  NS_IMETHOD    SetBorderTop(const nsString& aBorderTop)=0;
-
-  NS_IMETHOD    GetBorderRight(nsString& aBorderRight)=0;
-  NS_IMETHOD    SetBorderRight(const nsString& aBorderRight)=0;
-
-  NS_IMETHOD    GetBorderBottom(nsString& aBorderBottom)=0;
-  NS_IMETHOD    SetBorderBottom(const nsString& aBorderBottom)=0;
-
-  NS_IMETHOD    GetBorderLeft(nsString& aBorderLeft)=0;
-  NS_IMETHOD    SetBorderLeft(const nsString& aBorderLeft)=0;
-
-  NS_IMETHOD    GetBorderTopColor(nsString& aBorderTopColor)=0;
-  NS_IMETHOD    SetBorderTopColor(const nsString& aBorderTopColor)=0;
-
-  NS_IMETHOD    GetBorderRightColor(nsString& aBorderRightColor)=0;
-  NS_IMETHOD    SetBorderRightColor(const nsString& aBorderRightColor)=0;
-
-  NS_IMETHOD    GetBorderBottomColor(nsString& aBorderBottomColor)=0;
-  NS_IMETHOD    SetBorderBottomColor(const nsString& aBorderBottomColor)=0;
-
-  NS_IMETHOD    GetBorderLeftColor(nsString& aBorderLeftColor)=0;
-  NS_IMETHOD    SetBorderLeftColor(const nsString& aBorderLeftColor)=0;
-
-  NS_IMETHOD    GetBorderTopStyle(nsString& aBorderTopStyle)=0;
-  NS_IMETHOD    SetBorderTopStyle(const nsString& aBorderTopStyle)=0;
-
-  NS_IMETHOD    GetBorderRightStyle(nsString& aBorderRightStyle)=0;
-  NS_IMETHOD    SetBorderRightStyle(const nsString& aBorderRightStyle)=0;
-
-  NS_IMETHOD    GetBorderBottomStyle(nsString& aBorderBottomStyle)=0;
-  NS_IMETHOD    SetBorderBottomStyle(const nsString& aBorderBottomStyle)=0;
-
-  NS_IMETHOD    GetBorderLeftStyle(nsString& aBorderLeftStyle)=0;
-  NS_IMETHOD    SetBorderLeftStyle(const nsString& aBorderLeftStyle)=0;
-
-  NS_IMETHOD    GetBorderTopWidth(nsString& aBorderTopWidth)=0;
-  NS_IMETHOD    SetBorderTopWidth(const nsString& aBorderTopWidth)=0;
-
-  NS_IMETHOD    GetBorderRightWidth(nsString& aBorderRightWidth)=0;
-  NS_IMETHOD    SetBorderRightWidth(const nsString& aBorderRightWidth)=0;
-
-  NS_IMETHOD    GetBorderBottomWidth(nsString& aBorderBottomWidth)=0;
-  NS_IMETHOD    SetBorderBottomWidth(const nsString& aBorderBottomWidth)=0;
-
-  NS_IMETHOD    GetBorderLeftWidth(nsString& aBorderLeftWidth)=0;
-  NS_IMETHOD    SetBorderLeftWidth(const nsString& aBorderLeftWidth)=0;
-
-  NS_IMETHOD    GetBorderWidth(nsString& aBorderWidth)=0;
-  NS_IMETHOD    SetBorderWidth(const nsString& aBorderWidth)=0;
-
-  NS_IMETHOD    GetBottom(nsString& aBottom)=0;
-  NS_IMETHOD    SetBottom(const nsString& aBottom)=0;
-
-  NS_IMETHOD    GetCaptionSide(nsString& aCaptionSide)=0;
-  NS_IMETHOD    SetCaptionSide(const nsString& aCaptionSide)=0;
-
-  NS_IMETHOD    GetClear(nsString& aClear)=0;
-  NS_IMETHOD    SetClear(const nsString& aClear)=0;
-
-  NS_IMETHOD    GetClip(nsString& aClip)=0;
-  NS_IMETHOD    SetClip(const nsString& aClip)=0;
-
-  NS_IMETHOD    GetColor(nsString& aColor)=0;
-  NS_IMETHOD    SetColor(const nsString& aColor)=0;
-
-  NS_IMETHOD    GetContent(nsString& aContent)=0;
-  NS_IMETHOD    SetContent(const nsString& aContent)=0;
-
-  NS_IMETHOD    GetCounterIncrement(nsString& aCounterIncrement)=0;
-  NS_IMETHOD    SetCounterIncrement(const nsString& aCounterIncrement)=0;
-
-  NS_IMETHOD    GetCounterReset(nsString& aCounterReset)=0;
-  NS_IMETHOD    SetCounterReset(const nsString& aCounterReset)=0;
-
-  NS_IMETHOD    GetCue(nsString& aCue)=0;
-  NS_IMETHOD    SetCue(const nsString& aCue)=0;
-
-  NS_IMETHOD    GetCueAfter(nsString& aCueAfter)=0;
-  NS_IMETHOD    SetCueAfter(const nsString& aCueAfter)=0;
-
-  NS_IMETHOD    GetCueBefore(nsString& aCueBefore)=0;
-  NS_IMETHOD    SetCueBefore(const nsString& aCueBefore)=0;
-
-  NS_IMETHOD    GetCursor(nsString& aCursor)=0;
-  NS_IMETHOD    SetCursor(const nsString& aCursor)=0;
-
-  NS_IMETHOD    GetDirection(nsString& aDirection)=0;
-  NS_IMETHOD    SetDirection(const nsString& aDirection)=0;
-
-  NS_IMETHOD    GetDisplay(nsString& aDisplay)=0;
-  NS_IMETHOD    SetDisplay(const nsString& aDisplay)=0;
-
-  NS_IMETHOD    GetElevation(nsString& aElevation)=0;
-  NS_IMETHOD    SetElevation(const nsString& aElevation)=0;
-
-  NS_IMETHOD    GetEmptyCells(nsString& aEmptyCells)=0;
-  NS_IMETHOD    SetEmptyCells(const nsString& aEmptyCells)=0;
-
-  NS_IMETHOD    GetStyleFloat(nsString& aStyleFloat)=0;
-  NS_IMETHOD    SetStyleFloat(const nsString& aStyleFloat)=0;
-
-  NS_IMETHOD    GetFont(nsString& aFont)=0;
-  NS_IMETHOD    SetFont(const nsString& aFont)=0;
-
-  NS_IMETHOD    GetFontFamily(nsString& aFontFamily)=0;
-  NS_IMETHOD    SetFontFamily(const nsString& aFontFamily)=0;
-
-  NS_IMETHOD    GetFontSize(nsString& aFontSize)=0;
-  NS_IMETHOD    SetFontSize(const nsString& aFontSize)=0;
-
-  NS_IMETHOD    GetFontSizeAdjust(nsString& aFontSizeAdjust)=0;
-  NS_IMETHOD    SetFontSizeAdjust(const nsString& aFontSizeAdjust)=0;
-
-  NS_IMETHOD    GetFontStretch(nsString& aFontStretch)=0;
-  NS_IMETHOD    SetFontStretch(const nsString& aFontStretch)=0;
-
-  NS_IMETHOD    GetFontStyle(nsString& aFontStyle)=0;
-  NS_IMETHOD    SetFontStyle(const nsString& aFontStyle)=0;
-
-  NS_IMETHOD    GetFontVariant(nsString& aFontVariant)=0;
-  NS_IMETHOD    SetFontVariant(const nsString& aFontVariant)=0;
-
-  NS_IMETHOD    GetFontWeight(nsString& aFontWeight)=0;
-  NS_IMETHOD    SetFontWeight(const nsString& aFontWeight)=0;
-
-  NS_IMETHOD    GetHeight(nsString& aHeight)=0;
-  NS_IMETHOD    SetHeight(const nsString& aHeight)=0;
-
-  NS_IMETHOD    GetLeft(nsString& aLeft)=0;
-  NS_IMETHOD    SetLeft(const nsString& aLeft)=0;
-
-  NS_IMETHOD    GetLetterSpacing(nsString& aLetterSpacing)=0;
-  NS_IMETHOD    SetLetterSpacing(const nsString& aLetterSpacing)=0;
-
-  NS_IMETHOD    GetLineHeight(nsString& aLineHeight)=0;
-  NS_IMETHOD    SetLineHeight(const nsString& aLineHeight)=0;
-
-  NS_IMETHOD    GetListStyle(nsString& aListStyle)=0;
-  NS_IMETHOD    SetListStyle(const nsString& aListStyle)=0;
-
-  NS_IMETHOD    GetListStyleImage(nsString& aListStyleImage)=0;
-  NS_IMETHOD    SetListStyleImage(const nsString& aListStyleImage)=0;
-
-  NS_IMETHOD    GetListStylePosition(nsString& aListStylePosition)=0;
-  NS_IMETHOD    SetListStylePosition(const nsString& aListStylePosition)=0;
-
-  NS_IMETHOD    GetListStyleType(nsString& aListStyleType)=0;
-  NS_IMETHOD    SetListStyleType(const nsString& aListStyleType)=0;
-
-  NS_IMETHOD    GetMargin(nsString& aMargin)=0;
-  NS_IMETHOD    SetMargin(const nsString& aMargin)=0;
-
-  NS_IMETHOD    GetMarginTop(nsString& aMarginTop)=0;
-  NS_IMETHOD    SetMarginTop(const nsString& aMarginTop)=0;
-
-  NS_IMETHOD    GetMarginRight(nsString& aMarginRight)=0;
-  NS_IMETHOD    SetMarginRight(const nsString& aMarginRight)=0;
-
-  NS_IMETHOD    GetMarginBottom(nsString& aMarginBottom)=0;
-  NS_IMETHOD    SetMarginBottom(const nsString& aMarginBottom)=0;
-
-  NS_IMETHOD    GetMarginLeft(nsString& aMarginLeft)=0;
-  NS_IMETHOD    SetMarginLeft(const nsString& aMarginLeft)=0;
-
-  NS_IMETHOD    GetMarkerOffset(nsString& aMarkerOffset)=0;
-  NS_IMETHOD    SetMarkerOffset(const nsString& aMarkerOffset)=0;
-
-  NS_IMETHOD    GetMarks(nsString& aMarks)=0;
-  NS_IMETHOD    SetMarks(const nsString& aMarks)=0;
-
-  NS_IMETHOD    GetMaxHeight(nsString& aMaxHeight)=0;
-  NS_IMETHOD    SetMaxHeight(const nsString& aMaxHeight)=0;
-
-  NS_IMETHOD    GetMaxWidth(nsString& aMaxWidth)=0;
-  NS_IMETHOD    SetMaxWidth(const nsString& aMaxWidth)=0;
-
-  NS_IMETHOD    GetMinHeight(nsString& aMinHeight)=0;
-  NS_IMETHOD    SetMinHeight(const nsString& aMinHeight)=0;
-
-  NS_IMETHOD    GetMinWidth(nsString& aMinWidth)=0;
-  NS_IMETHOD    SetMinWidth(const nsString& aMinWidth)=0;
-
-  NS_IMETHOD    GetOrphans(nsString& aOrphans)=0;
-  NS_IMETHOD    SetOrphans(const nsString& aOrphans)=0;
-
-  NS_IMETHOD    GetOutline(nsString& aOutline)=0;
-  NS_IMETHOD    SetOutline(const nsString& aOutline)=0;
-
-  NS_IMETHOD    GetOutlineColor(nsString& aOutlineColor)=0;
-  NS_IMETHOD    SetOutlineColor(const nsString& aOutlineColor)=0;
-
-  NS_IMETHOD    GetOutlineStyle(nsString& aOutlineStyle)=0;
-  NS_IMETHOD    SetOutlineStyle(const nsString& aOutlineStyle)=0;
-
-  NS_IMETHOD    GetOutlineWidth(nsString& aOutlineWidth)=0;
-  NS_IMETHOD    SetOutlineWidth(const nsString& aOutlineWidth)=0;
-
-  NS_IMETHOD    GetOverflow(nsString& aOverflow)=0;
-  NS_IMETHOD    SetOverflow(const nsString& aOverflow)=0;
-
-  NS_IMETHOD    GetPadding(nsString& aPadding)=0;
-  NS_IMETHOD    SetPadding(const nsString& aPadding)=0;
-
-  NS_IMETHOD    GetPaddingTop(nsString& aPaddingTop)=0;
-  NS_IMETHOD    SetPaddingTop(const nsString& aPaddingTop)=0;
-
-  NS_IMETHOD    GetPaddingRight(nsString& aPaddingRight)=0;
-  NS_IMETHOD    SetPaddingRight(const nsString& aPaddingRight)=0;
-
-  NS_IMETHOD    GetPaddingBottom(nsString& aPaddingBottom)=0;
-  NS_IMETHOD    SetPaddingBottom(const nsString& aPaddingBottom)=0;
-
-  NS_IMETHOD    GetPaddingLeft(nsString& aPaddingLeft)=0;
-  NS_IMETHOD    SetPaddingLeft(const nsString& aPaddingLeft)=0;
-
-  NS_IMETHOD    GetPage(nsString& aPage)=0;
-  NS_IMETHOD    SetPage(const nsString& aPage)=0;
-
-  NS_IMETHOD    GetPageBreakAfter(nsString& aPageBreakAfter)=0;
-  NS_IMETHOD    SetPageBreakAfter(const nsString& aPageBreakAfter)=0;
-
-  NS_IMETHOD    GetPageBreakBefore(nsString& aPageBreakBefore)=0;
-  NS_IMETHOD    SetPageBreakBefore(const nsString& aPageBreakBefore)=0;
-
-  NS_IMETHOD    GetPageBreakInside(nsString& aPageBreakInside)=0;
-  NS_IMETHOD    SetPageBreakInside(const nsString& aPageBreakInside)=0;
-
-  NS_IMETHOD    GetPause(nsString& aPause)=0;
-  NS_IMETHOD    SetPause(const nsString& aPause)=0;
-
-  NS_IMETHOD    GetPauseAfter(nsString& aPauseAfter)=0;
-  NS_IMETHOD    SetPauseAfter(const nsString& aPauseAfter)=0;
-
-  NS_IMETHOD    GetPauseBefore(nsString& aPauseBefore)=0;
-  NS_IMETHOD    SetPauseBefore(const nsString& aPauseBefore)=0;
-
-  NS_IMETHOD    GetPitch(nsString& aPitch)=0;
-  NS_IMETHOD    SetPitch(const nsString& aPitch)=0;
-
-  NS_IMETHOD    GetPitchRange(nsString& aPitchRange)=0;
-  NS_IMETHOD    SetPitchRange(const nsString& aPitchRange)=0;
-
-  NS_IMETHOD    GetPlayDuring(nsString& aPlayDuring)=0;
-  NS_IMETHOD    SetPlayDuring(const nsString& aPlayDuring)=0;
-
-  NS_IMETHOD    GetPosition(nsString& aPosition)=0;
-  NS_IMETHOD    SetPosition(const nsString& aPosition)=0;
-
-  NS_IMETHOD    GetQuotes(nsString& aQuotes)=0;
-  NS_IMETHOD    SetQuotes(const nsString& aQuotes)=0;
-
-  NS_IMETHOD    GetRichness(nsString& aRichness)=0;
-  NS_IMETHOD    SetRichness(const nsString& aRichness)=0;
-
-  NS_IMETHOD    GetRight(nsString& aRight)=0;
-  NS_IMETHOD    SetRight(const nsString& aRight)=0;
-
-  NS_IMETHOD    GetSize(nsString& aSize)=0;
-  NS_IMETHOD    SetSize(const nsString& aSize)=0;
-
-  NS_IMETHOD    GetSpeak(nsString& aSpeak)=0;
-  NS_IMETHOD    SetSpeak(const nsString& aSpeak)=0;
-
-  NS_IMETHOD    GetSpeakHeader(nsString& aSpeakHeader)=0;
-  NS_IMETHOD    SetSpeakHeader(const nsString& aSpeakHeader)=0;
-
-  NS_IMETHOD    GetSpeakNumeral(nsString& aSpeakNumeral)=0;
-  NS_IMETHOD    SetSpeakNumeral(const nsString& aSpeakNumeral)=0;
-
-  NS_IMETHOD    GetSpeakPunctuation(nsString& aSpeakPunctuation)=0;
-  NS_IMETHOD    SetSpeakPunctuation(const nsString& aSpeakPunctuation)=0;
-
-  NS_IMETHOD    GetSpeechRate(nsString& aSpeechRate)=0;
-  NS_IMETHOD    SetSpeechRate(const nsString& aSpeechRate)=0;
-
-  NS_IMETHOD    GetStress(nsString& aStress)=0;
-  NS_IMETHOD    SetStress(const nsString& aStress)=0;
-
-  NS_IMETHOD    GetTableLayout(nsString& aTableLayout)=0;
-  NS_IMETHOD    SetTableLayout(const nsString& aTableLayout)=0;
-
-  NS_IMETHOD    GetTextAlign(nsString& aTextAlign)=0;
-  NS_IMETHOD    SetTextAlign(const nsString& aTextAlign)=0;
-
-  NS_IMETHOD    GetTextDecoration(nsString& aTextDecoration)=0;
-  NS_IMETHOD    SetTextDecoration(const nsString& aTextDecoration)=0;
-
-  NS_IMETHOD    GetTextIndent(nsString& aTextIndent)=0;
-  NS_IMETHOD    SetTextIndent(const nsString& aTextIndent)=0;
-
-  NS_IMETHOD    GetTextShadow(nsString& aTextShadow)=0;
-  NS_IMETHOD    SetTextShadow(const nsString& aTextShadow)=0;
-
-  NS_IMETHOD    GetTextTransform(nsString& aTextTransform)=0;
-  NS_IMETHOD    SetTextTransform(const nsString& aTextTransform)=0;
-
-  NS_IMETHOD    GetTop(nsString& aTop)=0;
-  NS_IMETHOD    SetTop(const nsString& aTop)=0;
-
-  NS_IMETHOD    GetUnicodeBidi(nsString& aUnicodeBidi)=0;
-  NS_IMETHOD    SetUnicodeBidi(const nsString& aUnicodeBidi)=0;
-
-  NS_IMETHOD    GetVerticalAlign(nsString& aVerticalAlign)=0;
-  NS_IMETHOD    SetVerticalAlign(const nsString& aVerticalAlign)=0;
-
-  NS_IMETHOD    GetVisibility(nsString& aVisibility)=0;
-  NS_IMETHOD    SetVisibility(const nsString& aVisibility)=0;
-
-  NS_IMETHOD    GetVoiceFamily(nsString& aVoiceFamily)=0;
-  NS_IMETHOD    SetVoiceFamily(const nsString& aVoiceFamily)=0;
-
-  NS_IMETHOD    GetVolume(nsString& aVolume)=0;
-  NS_IMETHOD    SetVolume(const nsString& aVolume)=0;
-
-  NS_IMETHOD    GetWhiteSpace(nsString& aWhiteSpace)=0;
-  NS_IMETHOD    SetWhiteSpace(const nsString& aWhiteSpace)=0;
-
-  NS_IMETHOD    GetWidows(nsString& aWidows)=0;
-  NS_IMETHOD    SetWidows(const nsString& aWidows)=0;
-
-  NS_IMETHOD    GetWidth(nsString& aWidth)=0;
-  NS_IMETHOD    SetWidth(const nsString& aWidth)=0;
-
-  NS_IMETHOD    GetWordSpacing(nsString& aWordSpacing)=0;
-  NS_IMETHOD    SetWordSpacing(const nsString& aWordSpacing)=0;
-
-  NS_IMETHOD    GetZIndex(nsString& aZIndex)=0;
-  NS_IMETHOD    SetZIndex(const nsString& aZIndex)=0;
-
-  NS_IMETHOD    GetOpacity(nsString& aOpacity)=0;
-  NS_IMETHOD    SetOpacity(const nsString& aOpacity)=0;
-
   NS_IMETHOD    GetPropertyValue(const nsString& aPropertyName, nsString& aReturn)=0;
 
   NS_IMETHOD    GetPropertyPriority(const nsString& aPropertyName, nsString& aReturn)=0;
@@ -414,253 +48,9 @@ public:
 
 
 #define NS_DECL_IDOMCSSSTYLEDECLARATION   \
+  NS_IMETHOD    GetCssText(nsString& aCssText);  \
+  NS_IMETHOD    SetCssText(const nsString& aCssText);  \
   NS_IMETHOD    GetLength(PRUint32* aLength);  \
-  NS_IMETHOD    GetAzimuth(nsString& aAzimuth);  \
-  NS_IMETHOD    SetAzimuth(const nsString& aAzimuth);  \
-  NS_IMETHOD    GetBackground(nsString& aBackground);  \
-  NS_IMETHOD    SetBackground(const nsString& aBackground);  \
-  NS_IMETHOD    GetBackgroundAttachment(nsString& aBackgroundAttachment);  \
-  NS_IMETHOD    SetBackgroundAttachment(const nsString& aBackgroundAttachment);  \
-  NS_IMETHOD    GetBackgroundColor(nsString& aBackgroundColor);  \
-  NS_IMETHOD    SetBackgroundColor(const nsString& aBackgroundColor);  \
-  NS_IMETHOD    GetBackgroundImage(nsString& aBackgroundImage);  \
-  NS_IMETHOD    SetBackgroundImage(const nsString& aBackgroundImage);  \
-  NS_IMETHOD    GetBackgroundPosition(nsString& aBackgroundPosition);  \
-  NS_IMETHOD    SetBackgroundPosition(const nsString& aBackgroundPosition);  \
-  NS_IMETHOD    GetBackgroundRepeat(nsString& aBackgroundRepeat);  \
-  NS_IMETHOD    SetBackgroundRepeat(const nsString& aBackgroundRepeat);  \
-  NS_IMETHOD    GetBorder(nsString& aBorder);  \
-  NS_IMETHOD    SetBorder(const nsString& aBorder);  \
-  NS_IMETHOD    GetBorderCollapse(nsString& aBorderCollapse);  \
-  NS_IMETHOD    SetBorderCollapse(const nsString& aBorderCollapse);  \
-  NS_IMETHOD    GetBorderColor(nsString& aBorderColor);  \
-  NS_IMETHOD    SetBorderColor(const nsString& aBorderColor);  \
-  NS_IMETHOD    GetBorderSpacing(nsString& aBorderSpacing);  \
-  NS_IMETHOD    SetBorderSpacing(const nsString& aBorderSpacing);  \
-  NS_IMETHOD    GetBorderStyle(nsString& aBorderStyle);  \
-  NS_IMETHOD    SetBorderStyle(const nsString& aBorderStyle);  \
-  NS_IMETHOD    GetBorderTop(nsString& aBorderTop);  \
-  NS_IMETHOD    SetBorderTop(const nsString& aBorderTop);  \
-  NS_IMETHOD    GetBorderRight(nsString& aBorderRight);  \
-  NS_IMETHOD    SetBorderRight(const nsString& aBorderRight);  \
-  NS_IMETHOD    GetBorderBottom(nsString& aBorderBottom);  \
-  NS_IMETHOD    SetBorderBottom(const nsString& aBorderBottom);  \
-  NS_IMETHOD    GetBorderLeft(nsString& aBorderLeft);  \
-  NS_IMETHOD    SetBorderLeft(const nsString& aBorderLeft);  \
-  NS_IMETHOD    GetBorderTopColor(nsString& aBorderTopColor);  \
-  NS_IMETHOD    SetBorderTopColor(const nsString& aBorderTopColor);  \
-  NS_IMETHOD    GetBorderRightColor(nsString& aBorderRightColor);  \
-  NS_IMETHOD    SetBorderRightColor(const nsString& aBorderRightColor);  \
-  NS_IMETHOD    GetBorderBottomColor(nsString& aBorderBottomColor);  \
-  NS_IMETHOD    SetBorderBottomColor(const nsString& aBorderBottomColor);  \
-  NS_IMETHOD    GetBorderLeftColor(nsString& aBorderLeftColor);  \
-  NS_IMETHOD    SetBorderLeftColor(const nsString& aBorderLeftColor);  \
-  NS_IMETHOD    GetBorderTopStyle(nsString& aBorderTopStyle);  \
-  NS_IMETHOD    SetBorderTopStyle(const nsString& aBorderTopStyle);  \
-  NS_IMETHOD    GetBorderRightStyle(nsString& aBorderRightStyle);  \
-  NS_IMETHOD    SetBorderRightStyle(const nsString& aBorderRightStyle);  \
-  NS_IMETHOD    GetBorderBottomStyle(nsString& aBorderBottomStyle);  \
-  NS_IMETHOD    SetBorderBottomStyle(const nsString& aBorderBottomStyle);  \
-  NS_IMETHOD    GetBorderLeftStyle(nsString& aBorderLeftStyle);  \
-  NS_IMETHOD    SetBorderLeftStyle(const nsString& aBorderLeftStyle);  \
-  NS_IMETHOD    GetBorderTopWidth(nsString& aBorderTopWidth);  \
-  NS_IMETHOD    SetBorderTopWidth(const nsString& aBorderTopWidth);  \
-  NS_IMETHOD    GetBorderRightWidth(nsString& aBorderRightWidth);  \
-  NS_IMETHOD    SetBorderRightWidth(const nsString& aBorderRightWidth);  \
-  NS_IMETHOD    GetBorderBottomWidth(nsString& aBorderBottomWidth);  \
-  NS_IMETHOD    SetBorderBottomWidth(const nsString& aBorderBottomWidth);  \
-  NS_IMETHOD    GetBorderLeftWidth(nsString& aBorderLeftWidth);  \
-  NS_IMETHOD    SetBorderLeftWidth(const nsString& aBorderLeftWidth);  \
-  NS_IMETHOD    GetBorderWidth(nsString& aBorderWidth);  \
-  NS_IMETHOD    SetBorderWidth(const nsString& aBorderWidth);  \
-  NS_IMETHOD    GetBottom(nsString& aBottom);  \
-  NS_IMETHOD    SetBottom(const nsString& aBottom);  \
-  NS_IMETHOD    GetCaptionSide(nsString& aCaptionSide);  \
-  NS_IMETHOD    SetCaptionSide(const nsString& aCaptionSide);  \
-  NS_IMETHOD    GetClear(nsString& aClear);  \
-  NS_IMETHOD    SetClear(const nsString& aClear);  \
-  NS_IMETHOD    GetClip(nsString& aClip);  \
-  NS_IMETHOD    SetClip(const nsString& aClip);  \
-  NS_IMETHOD    GetColor(nsString& aColor);  \
-  NS_IMETHOD    SetColor(const nsString& aColor);  \
-  NS_IMETHOD    GetContent(nsString& aContent);  \
-  NS_IMETHOD    SetContent(const nsString& aContent);  \
-  NS_IMETHOD    GetCounterIncrement(nsString& aCounterIncrement);  \
-  NS_IMETHOD    SetCounterIncrement(const nsString& aCounterIncrement);  \
-  NS_IMETHOD    GetCounterReset(nsString& aCounterReset);  \
-  NS_IMETHOD    SetCounterReset(const nsString& aCounterReset);  \
-  NS_IMETHOD    GetCue(nsString& aCue);  \
-  NS_IMETHOD    SetCue(const nsString& aCue);  \
-  NS_IMETHOD    GetCueAfter(nsString& aCueAfter);  \
-  NS_IMETHOD    SetCueAfter(const nsString& aCueAfter);  \
-  NS_IMETHOD    GetCueBefore(nsString& aCueBefore);  \
-  NS_IMETHOD    SetCueBefore(const nsString& aCueBefore);  \
-  NS_IMETHOD    GetCursor(nsString& aCursor);  \
-  NS_IMETHOD    SetCursor(const nsString& aCursor);  \
-  NS_IMETHOD    GetDirection(nsString& aDirection);  \
-  NS_IMETHOD    SetDirection(const nsString& aDirection);  \
-  NS_IMETHOD    GetDisplay(nsString& aDisplay);  \
-  NS_IMETHOD    SetDisplay(const nsString& aDisplay);  \
-  NS_IMETHOD    GetElevation(nsString& aElevation);  \
-  NS_IMETHOD    SetElevation(const nsString& aElevation);  \
-  NS_IMETHOD    GetEmptyCells(nsString& aEmptyCells);  \
-  NS_IMETHOD    SetEmptyCells(const nsString& aEmptyCells);  \
-  NS_IMETHOD    GetStyleFloat(nsString& aStyleFloat);  \
-  NS_IMETHOD    SetStyleFloat(const nsString& aStyleFloat);  \
-  NS_IMETHOD    GetFont(nsString& aFont);  \
-  NS_IMETHOD    SetFont(const nsString& aFont);  \
-  NS_IMETHOD    GetFontFamily(nsString& aFontFamily);  \
-  NS_IMETHOD    SetFontFamily(const nsString& aFontFamily);  \
-  NS_IMETHOD    GetFontSize(nsString& aFontSize);  \
-  NS_IMETHOD    SetFontSize(const nsString& aFontSize);  \
-  NS_IMETHOD    GetFontSizeAdjust(nsString& aFontSizeAdjust);  \
-  NS_IMETHOD    SetFontSizeAdjust(const nsString& aFontSizeAdjust);  \
-  NS_IMETHOD    GetFontStretch(nsString& aFontStretch);  \
-  NS_IMETHOD    SetFontStretch(const nsString& aFontStretch);  \
-  NS_IMETHOD    GetFontStyle(nsString& aFontStyle);  \
-  NS_IMETHOD    SetFontStyle(const nsString& aFontStyle);  \
-  NS_IMETHOD    GetFontVariant(nsString& aFontVariant);  \
-  NS_IMETHOD    SetFontVariant(const nsString& aFontVariant);  \
-  NS_IMETHOD    GetFontWeight(nsString& aFontWeight);  \
-  NS_IMETHOD    SetFontWeight(const nsString& aFontWeight);  \
-  NS_IMETHOD    GetHeight(nsString& aHeight);  \
-  NS_IMETHOD    SetHeight(const nsString& aHeight);  \
-  NS_IMETHOD    GetLeft(nsString& aLeft);  \
-  NS_IMETHOD    SetLeft(const nsString& aLeft);  \
-  NS_IMETHOD    GetLetterSpacing(nsString& aLetterSpacing);  \
-  NS_IMETHOD    SetLetterSpacing(const nsString& aLetterSpacing);  \
-  NS_IMETHOD    GetLineHeight(nsString& aLineHeight);  \
-  NS_IMETHOD    SetLineHeight(const nsString& aLineHeight);  \
-  NS_IMETHOD    GetListStyle(nsString& aListStyle);  \
-  NS_IMETHOD    SetListStyle(const nsString& aListStyle);  \
-  NS_IMETHOD    GetListStyleImage(nsString& aListStyleImage);  \
-  NS_IMETHOD    SetListStyleImage(const nsString& aListStyleImage);  \
-  NS_IMETHOD    GetListStylePosition(nsString& aListStylePosition);  \
-  NS_IMETHOD    SetListStylePosition(const nsString& aListStylePosition);  \
-  NS_IMETHOD    GetListStyleType(nsString& aListStyleType);  \
-  NS_IMETHOD    SetListStyleType(const nsString& aListStyleType);  \
-  NS_IMETHOD    GetMargin(nsString& aMargin);  \
-  NS_IMETHOD    SetMargin(const nsString& aMargin);  \
-  NS_IMETHOD    GetMarginTop(nsString& aMarginTop);  \
-  NS_IMETHOD    SetMarginTop(const nsString& aMarginTop);  \
-  NS_IMETHOD    GetMarginRight(nsString& aMarginRight);  \
-  NS_IMETHOD    SetMarginRight(const nsString& aMarginRight);  \
-  NS_IMETHOD    GetMarginBottom(nsString& aMarginBottom);  \
-  NS_IMETHOD    SetMarginBottom(const nsString& aMarginBottom);  \
-  NS_IMETHOD    GetMarginLeft(nsString& aMarginLeft);  \
-  NS_IMETHOD    SetMarginLeft(const nsString& aMarginLeft);  \
-  NS_IMETHOD    GetMarkerOffset(nsString& aMarkerOffset);  \
-  NS_IMETHOD    SetMarkerOffset(const nsString& aMarkerOffset);  \
-  NS_IMETHOD    GetMarks(nsString& aMarks);  \
-  NS_IMETHOD    SetMarks(const nsString& aMarks);  \
-  NS_IMETHOD    GetMaxHeight(nsString& aMaxHeight);  \
-  NS_IMETHOD    SetMaxHeight(const nsString& aMaxHeight);  \
-  NS_IMETHOD    GetMaxWidth(nsString& aMaxWidth);  \
-  NS_IMETHOD    SetMaxWidth(const nsString& aMaxWidth);  \
-  NS_IMETHOD    GetMinHeight(nsString& aMinHeight);  \
-  NS_IMETHOD    SetMinHeight(const nsString& aMinHeight);  \
-  NS_IMETHOD    GetMinWidth(nsString& aMinWidth);  \
-  NS_IMETHOD    SetMinWidth(const nsString& aMinWidth);  \
-  NS_IMETHOD    GetOrphans(nsString& aOrphans);  \
-  NS_IMETHOD    SetOrphans(const nsString& aOrphans);  \
-  NS_IMETHOD    GetOutline(nsString& aOutline);  \
-  NS_IMETHOD    SetOutline(const nsString& aOutline);  \
-  NS_IMETHOD    GetOutlineColor(nsString& aOutlineColor);  \
-  NS_IMETHOD    SetOutlineColor(const nsString& aOutlineColor);  \
-  NS_IMETHOD    GetOutlineStyle(nsString& aOutlineStyle);  \
-  NS_IMETHOD    SetOutlineStyle(const nsString& aOutlineStyle);  \
-  NS_IMETHOD    GetOutlineWidth(nsString& aOutlineWidth);  \
-  NS_IMETHOD    SetOutlineWidth(const nsString& aOutlineWidth);  \
-  NS_IMETHOD    GetOverflow(nsString& aOverflow);  \
-  NS_IMETHOD    SetOverflow(const nsString& aOverflow);  \
-  NS_IMETHOD    GetPadding(nsString& aPadding);  \
-  NS_IMETHOD    SetPadding(const nsString& aPadding);  \
-  NS_IMETHOD    GetPaddingTop(nsString& aPaddingTop);  \
-  NS_IMETHOD    SetPaddingTop(const nsString& aPaddingTop);  \
-  NS_IMETHOD    GetPaddingRight(nsString& aPaddingRight);  \
-  NS_IMETHOD    SetPaddingRight(const nsString& aPaddingRight);  \
-  NS_IMETHOD    GetPaddingBottom(nsString& aPaddingBottom);  \
-  NS_IMETHOD    SetPaddingBottom(const nsString& aPaddingBottom);  \
-  NS_IMETHOD    GetPaddingLeft(nsString& aPaddingLeft);  \
-  NS_IMETHOD    SetPaddingLeft(const nsString& aPaddingLeft);  \
-  NS_IMETHOD    GetPage(nsString& aPage);  \
-  NS_IMETHOD    SetPage(const nsString& aPage);  \
-  NS_IMETHOD    GetPageBreakAfter(nsString& aPageBreakAfter);  \
-  NS_IMETHOD    SetPageBreakAfter(const nsString& aPageBreakAfter);  \
-  NS_IMETHOD    GetPageBreakBefore(nsString& aPageBreakBefore);  \
-  NS_IMETHOD    SetPageBreakBefore(const nsString& aPageBreakBefore);  \
-  NS_IMETHOD    GetPageBreakInside(nsString& aPageBreakInside);  \
-  NS_IMETHOD    SetPageBreakInside(const nsString& aPageBreakInside);  \
-  NS_IMETHOD    GetPause(nsString& aPause);  \
-  NS_IMETHOD    SetPause(const nsString& aPause);  \
-  NS_IMETHOD    GetPauseAfter(nsString& aPauseAfter);  \
-  NS_IMETHOD    SetPauseAfter(const nsString& aPauseAfter);  \
-  NS_IMETHOD    GetPauseBefore(nsString& aPauseBefore);  \
-  NS_IMETHOD    SetPauseBefore(const nsString& aPauseBefore);  \
-  NS_IMETHOD    GetPitch(nsString& aPitch);  \
-  NS_IMETHOD    SetPitch(const nsString& aPitch);  \
-  NS_IMETHOD    GetPitchRange(nsString& aPitchRange);  \
-  NS_IMETHOD    SetPitchRange(const nsString& aPitchRange);  \
-  NS_IMETHOD    GetPlayDuring(nsString& aPlayDuring);  \
-  NS_IMETHOD    SetPlayDuring(const nsString& aPlayDuring);  \
-  NS_IMETHOD    GetPosition(nsString& aPosition);  \
-  NS_IMETHOD    SetPosition(const nsString& aPosition);  \
-  NS_IMETHOD    GetQuotes(nsString& aQuotes);  \
-  NS_IMETHOD    SetQuotes(const nsString& aQuotes);  \
-  NS_IMETHOD    GetRichness(nsString& aRichness);  \
-  NS_IMETHOD    SetRichness(const nsString& aRichness);  \
-  NS_IMETHOD    GetRight(nsString& aRight);  \
-  NS_IMETHOD    SetRight(const nsString& aRight);  \
-  NS_IMETHOD    GetSize(nsString& aSize);  \
-  NS_IMETHOD    SetSize(const nsString& aSize);  \
-  NS_IMETHOD    GetSpeak(nsString& aSpeak);  \
-  NS_IMETHOD    SetSpeak(const nsString& aSpeak);  \
-  NS_IMETHOD    GetSpeakHeader(nsString& aSpeakHeader);  \
-  NS_IMETHOD    SetSpeakHeader(const nsString& aSpeakHeader);  \
-  NS_IMETHOD    GetSpeakNumeral(nsString& aSpeakNumeral);  \
-  NS_IMETHOD    SetSpeakNumeral(const nsString& aSpeakNumeral);  \
-  NS_IMETHOD    GetSpeakPunctuation(nsString& aSpeakPunctuation);  \
-  NS_IMETHOD    SetSpeakPunctuation(const nsString& aSpeakPunctuation);  \
-  NS_IMETHOD    GetSpeechRate(nsString& aSpeechRate);  \
-  NS_IMETHOD    SetSpeechRate(const nsString& aSpeechRate);  \
-  NS_IMETHOD    GetStress(nsString& aStress);  \
-  NS_IMETHOD    SetStress(const nsString& aStress);  \
-  NS_IMETHOD    GetTableLayout(nsString& aTableLayout);  \
-  NS_IMETHOD    SetTableLayout(const nsString& aTableLayout);  \
-  NS_IMETHOD    GetTextAlign(nsString& aTextAlign);  \
-  NS_IMETHOD    SetTextAlign(const nsString& aTextAlign);  \
-  NS_IMETHOD    GetTextDecoration(nsString& aTextDecoration);  \
-  NS_IMETHOD    SetTextDecoration(const nsString& aTextDecoration);  \
-  NS_IMETHOD    GetTextIndent(nsString& aTextIndent);  \
-  NS_IMETHOD    SetTextIndent(const nsString& aTextIndent);  \
-  NS_IMETHOD    GetTextShadow(nsString& aTextShadow);  \
-  NS_IMETHOD    SetTextShadow(const nsString& aTextShadow);  \
-  NS_IMETHOD    GetTextTransform(nsString& aTextTransform);  \
-  NS_IMETHOD    SetTextTransform(const nsString& aTextTransform);  \
-  NS_IMETHOD    GetTop(nsString& aTop);  \
-  NS_IMETHOD    SetTop(const nsString& aTop);  \
-  NS_IMETHOD    GetUnicodeBidi(nsString& aUnicodeBidi);  \
-  NS_IMETHOD    SetUnicodeBidi(const nsString& aUnicodeBidi);  \
-  NS_IMETHOD    GetVerticalAlign(nsString& aVerticalAlign);  \
-  NS_IMETHOD    SetVerticalAlign(const nsString& aVerticalAlign);  \
-  NS_IMETHOD    GetVisibility(nsString& aVisibility);  \
-  NS_IMETHOD    SetVisibility(const nsString& aVisibility);  \
-  NS_IMETHOD    GetVoiceFamily(nsString& aVoiceFamily);  \
-  NS_IMETHOD    SetVoiceFamily(const nsString& aVoiceFamily);  \
-  NS_IMETHOD    GetVolume(nsString& aVolume);  \
-  NS_IMETHOD    SetVolume(const nsString& aVolume);  \
-  NS_IMETHOD    GetWhiteSpace(nsString& aWhiteSpace);  \
-  NS_IMETHOD    SetWhiteSpace(const nsString& aWhiteSpace);  \
-  NS_IMETHOD    GetWidows(nsString& aWidows);  \
-  NS_IMETHOD    SetWidows(const nsString& aWidows);  \
-  NS_IMETHOD    GetWidth(nsString& aWidth);  \
-  NS_IMETHOD    SetWidth(const nsString& aWidth);  \
-  NS_IMETHOD    GetWordSpacing(nsString& aWordSpacing);  \
-  NS_IMETHOD    SetWordSpacing(const nsString& aWordSpacing);  \
-  NS_IMETHOD    GetZIndex(nsString& aZIndex);  \
-  NS_IMETHOD    SetZIndex(const nsString& aZIndex);  \
-  NS_IMETHOD    GetOpacity(nsString& aOpacity);  \
-  NS_IMETHOD    SetOpacity(const nsString& aOpacity);  \
   NS_IMETHOD    GetPropertyValue(const nsString& aPropertyName, nsString& aReturn);  \
   NS_IMETHOD    GetPropertyPriority(const nsString& aPropertyName, nsString& aReturn);  \
   NS_IMETHOD    SetProperty(const nsString& aPropertyName, const nsString& aValue, const nsString& aPriority);  \
@@ -669,253 +59,9 @@ public:
 
 
 #define NS_FORWARD_IDOMCSSSTYLEDECLARATION(_to)  \
+  NS_IMETHOD    GetCssText(nsString& aCssText) { return _to##GetCssText(aCssText); } \
+  NS_IMETHOD    SetCssText(const nsString& aCssText) { return _to##SetCssText(aCssText); } \
   NS_IMETHOD    GetLength(PRUint32* aLength) { return _to##GetLength(aLength); } \
-  NS_IMETHOD    GetAzimuth(nsString& aAzimuth) { return _to##GetAzimuth(aAzimuth); } \
-  NS_IMETHOD    SetAzimuth(const nsString& aAzimuth) { return _to##SetAzimuth(aAzimuth); } \
-  NS_IMETHOD    GetBackground(nsString& aBackground) { return _to##GetBackground(aBackground); } \
-  NS_IMETHOD    SetBackground(const nsString& aBackground) { return _to##SetBackground(aBackground); } \
-  NS_IMETHOD    GetBackgroundAttachment(nsString& aBackgroundAttachment) { return _to##GetBackgroundAttachment(aBackgroundAttachment); } \
-  NS_IMETHOD    SetBackgroundAttachment(const nsString& aBackgroundAttachment) { return _to##SetBackgroundAttachment(aBackgroundAttachment); } \
-  NS_IMETHOD    GetBackgroundColor(nsString& aBackgroundColor) { return _to##GetBackgroundColor(aBackgroundColor); } \
-  NS_IMETHOD    SetBackgroundColor(const nsString& aBackgroundColor) { return _to##SetBackgroundColor(aBackgroundColor); } \
-  NS_IMETHOD    GetBackgroundImage(nsString& aBackgroundImage) { return _to##GetBackgroundImage(aBackgroundImage); } \
-  NS_IMETHOD    SetBackgroundImage(const nsString& aBackgroundImage) { return _to##SetBackgroundImage(aBackgroundImage); } \
-  NS_IMETHOD    GetBackgroundPosition(nsString& aBackgroundPosition) { return _to##GetBackgroundPosition(aBackgroundPosition); } \
-  NS_IMETHOD    SetBackgroundPosition(const nsString& aBackgroundPosition) { return _to##SetBackgroundPosition(aBackgroundPosition); } \
-  NS_IMETHOD    GetBackgroundRepeat(nsString& aBackgroundRepeat) { return _to##GetBackgroundRepeat(aBackgroundRepeat); } \
-  NS_IMETHOD    SetBackgroundRepeat(const nsString& aBackgroundRepeat) { return _to##SetBackgroundRepeat(aBackgroundRepeat); } \
-  NS_IMETHOD    GetBorder(nsString& aBorder) { return _to##GetBorder(aBorder); } \
-  NS_IMETHOD    SetBorder(const nsString& aBorder) { return _to##SetBorder(aBorder); } \
-  NS_IMETHOD    GetBorderCollapse(nsString& aBorderCollapse) { return _to##GetBorderCollapse(aBorderCollapse); } \
-  NS_IMETHOD    SetBorderCollapse(const nsString& aBorderCollapse) { return _to##SetBorderCollapse(aBorderCollapse); } \
-  NS_IMETHOD    GetBorderColor(nsString& aBorderColor) { return _to##GetBorderColor(aBorderColor); } \
-  NS_IMETHOD    SetBorderColor(const nsString& aBorderColor) { return _to##SetBorderColor(aBorderColor); } \
-  NS_IMETHOD    GetBorderSpacing(nsString& aBorderSpacing) { return _to##GetBorderSpacing(aBorderSpacing); } \
-  NS_IMETHOD    SetBorderSpacing(const nsString& aBorderSpacing) { return _to##SetBorderSpacing(aBorderSpacing); } \
-  NS_IMETHOD    GetBorderStyle(nsString& aBorderStyle) { return _to##GetBorderStyle(aBorderStyle); } \
-  NS_IMETHOD    SetBorderStyle(const nsString& aBorderStyle) { return _to##SetBorderStyle(aBorderStyle); } \
-  NS_IMETHOD    GetBorderTop(nsString& aBorderTop) { return _to##GetBorderTop(aBorderTop); } \
-  NS_IMETHOD    SetBorderTop(const nsString& aBorderTop) { return _to##SetBorderTop(aBorderTop); } \
-  NS_IMETHOD    GetBorderRight(nsString& aBorderRight) { return _to##GetBorderRight(aBorderRight); } \
-  NS_IMETHOD    SetBorderRight(const nsString& aBorderRight) { return _to##SetBorderRight(aBorderRight); } \
-  NS_IMETHOD    GetBorderBottom(nsString& aBorderBottom) { return _to##GetBorderBottom(aBorderBottom); } \
-  NS_IMETHOD    SetBorderBottom(const nsString& aBorderBottom) { return _to##SetBorderBottom(aBorderBottom); } \
-  NS_IMETHOD    GetBorderLeft(nsString& aBorderLeft) { return _to##GetBorderLeft(aBorderLeft); } \
-  NS_IMETHOD    SetBorderLeft(const nsString& aBorderLeft) { return _to##SetBorderLeft(aBorderLeft); } \
-  NS_IMETHOD    GetBorderTopColor(nsString& aBorderTopColor) { return _to##GetBorderTopColor(aBorderTopColor); } \
-  NS_IMETHOD    SetBorderTopColor(const nsString& aBorderTopColor) { return _to##SetBorderTopColor(aBorderTopColor); } \
-  NS_IMETHOD    GetBorderRightColor(nsString& aBorderRightColor) { return _to##GetBorderRightColor(aBorderRightColor); } \
-  NS_IMETHOD    SetBorderRightColor(const nsString& aBorderRightColor) { return _to##SetBorderRightColor(aBorderRightColor); } \
-  NS_IMETHOD    GetBorderBottomColor(nsString& aBorderBottomColor) { return _to##GetBorderBottomColor(aBorderBottomColor); } \
-  NS_IMETHOD    SetBorderBottomColor(const nsString& aBorderBottomColor) { return _to##SetBorderBottomColor(aBorderBottomColor); } \
-  NS_IMETHOD    GetBorderLeftColor(nsString& aBorderLeftColor) { return _to##GetBorderLeftColor(aBorderLeftColor); } \
-  NS_IMETHOD    SetBorderLeftColor(const nsString& aBorderLeftColor) { return _to##SetBorderLeftColor(aBorderLeftColor); } \
-  NS_IMETHOD    GetBorderTopStyle(nsString& aBorderTopStyle) { return _to##GetBorderTopStyle(aBorderTopStyle); } \
-  NS_IMETHOD    SetBorderTopStyle(const nsString& aBorderTopStyle) { return _to##SetBorderTopStyle(aBorderTopStyle); } \
-  NS_IMETHOD    GetBorderRightStyle(nsString& aBorderRightStyle) { return _to##GetBorderRightStyle(aBorderRightStyle); } \
-  NS_IMETHOD    SetBorderRightStyle(const nsString& aBorderRightStyle) { return _to##SetBorderRightStyle(aBorderRightStyle); } \
-  NS_IMETHOD    GetBorderBottomStyle(nsString& aBorderBottomStyle) { return _to##GetBorderBottomStyle(aBorderBottomStyle); } \
-  NS_IMETHOD    SetBorderBottomStyle(const nsString& aBorderBottomStyle) { return _to##SetBorderBottomStyle(aBorderBottomStyle); } \
-  NS_IMETHOD    GetBorderLeftStyle(nsString& aBorderLeftStyle) { return _to##GetBorderLeftStyle(aBorderLeftStyle); } \
-  NS_IMETHOD    SetBorderLeftStyle(const nsString& aBorderLeftStyle) { return _to##SetBorderLeftStyle(aBorderLeftStyle); } \
-  NS_IMETHOD    GetBorderTopWidth(nsString& aBorderTopWidth) { return _to##GetBorderTopWidth(aBorderTopWidth); } \
-  NS_IMETHOD    SetBorderTopWidth(const nsString& aBorderTopWidth) { return _to##SetBorderTopWidth(aBorderTopWidth); } \
-  NS_IMETHOD    GetBorderRightWidth(nsString& aBorderRightWidth) { return _to##GetBorderRightWidth(aBorderRightWidth); } \
-  NS_IMETHOD    SetBorderRightWidth(const nsString& aBorderRightWidth) { return _to##SetBorderRightWidth(aBorderRightWidth); } \
-  NS_IMETHOD    GetBorderBottomWidth(nsString& aBorderBottomWidth) { return _to##GetBorderBottomWidth(aBorderBottomWidth); } \
-  NS_IMETHOD    SetBorderBottomWidth(const nsString& aBorderBottomWidth) { return _to##SetBorderBottomWidth(aBorderBottomWidth); } \
-  NS_IMETHOD    GetBorderLeftWidth(nsString& aBorderLeftWidth) { return _to##GetBorderLeftWidth(aBorderLeftWidth); } \
-  NS_IMETHOD    SetBorderLeftWidth(const nsString& aBorderLeftWidth) { return _to##SetBorderLeftWidth(aBorderLeftWidth); } \
-  NS_IMETHOD    GetBorderWidth(nsString& aBorderWidth) { return _to##GetBorderWidth(aBorderWidth); } \
-  NS_IMETHOD    SetBorderWidth(const nsString& aBorderWidth) { return _to##SetBorderWidth(aBorderWidth); } \
-  NS_IMETHOD    GetBottom(nsString& aBottom) { return _to##GetBottom(aBottom); } \
-  NS_IMETHOD    SetBottom(const nsString& aBottom) { return _to##SetBottom(aBottom); } \
-  NS_IMETHOD    GetCaptionSide(nsString& aCaptionSide) { return _to##GetCaptionSide(aCaptionSide); } \
-  NS_IMETHOD    SetCaptionSide(const nsString& aCaptionSide) { return _to##SetCaptionSide(aCaptionSide); } \
-  NS_IMETHOD    GetClear(nsString& aClear) { return _to##GetClear(aClear); } \
-  NS_IMETHOD    SetClear(const nsString& aClear) { return _to##SetClear(aClear); } \
-  NS_IMETHOD    GetClip(nsString& aClip) { return _to##GetClip(aClip); } \
-  NS_IMETHOD    SetClip(const nsString& aClip) { return _to##SetClip(aClip); } \
-  NS_IMETHOD    GetColor(nsString& aColor) { return _to##GetColor(aColor); } \
-  NS_IMETHOD    SetColor(const nsString& aColor) { return _to##SetColor(aColor); } \
-  NS_IMETHOD    GetContent(nsString& aContent) { return _to##GetContent(aContent); } \
-  NS_IMETHOD    SetContent(const nsString& aContent) { return _to##SetContent(aContent); } \
-  NS_IMETHOD    GetCounterIncrement(nsString& aCounterIncrement) { return _to##GetCounterIncrement(aCounterIncrement); } \
-  NS_IMETHOD    SetCounterIncrement(const nsString& aCounterIncrement) { return _to##SetCounterIncrement(aCounterIncrement); } \
-  NS_IMETHOD    GetCounterReset(nsString& aCounterReset) { return _to##GetCounterReset(aCounterReset); } \
-  NS_IMETHOD    SetCounterReset(const nsString& aCounterReset) { return _to##SetCounterReset(aCounterReset); } \
-  NS_IMETHOD    GetCue(nsString& aCue) { return _to##GetCue(aCue); } \
-  NS_IMETHOD    SetCue(const nsString& aCue) { return _to##SetCue(aCue); } \
-  NS_IMETHOD    GetCueAfter(nsString& aCueAfter) { return _to##GetCueAfter(aCueAfter); } \
-  NS_IMETHOD    SetCueAfter(const nsString& aCueAfter) { return _to##SetCueAfter(aCueAfter); } \
-  NS_IMETHOD    GetCueBefore(nsString& aCueBefore) { return _to##GetCueBefore(aCueBefore); } \
-  NS_IMETHOD    SetCueBefore(const nsString& aCueBefore) { return _to##SetCueBefore(aCueBefore); } \
-  NS_IMETHOD    GetCursor(nsString& aCursor) { return _to##GetCursor(aCursor); } \
-  NS_IMETHOD    SetCursor(const nsString& aCursor) { return _to##SetCursor(aCursor); } \
-  NS_IMETHOD    GetDirection(nsString& aDirection) { return _to##GetDirection(aDirection); } \
-  NS_IMETHOD    SetDirection(const nsString& aDirection) { return _to##SetDirection(aDirection); } \
-  NS_IMETHOD    GetDisplay(nsString& aDisplay) { return _to##GetDisplay(aDisplay); } \
-  NS_IMETHOD    SetDisplay(const nsString& aDisplay) { return _to##SetDisplay(aDisplay); } \
-  NS_IMETHOD    GetElevation(nsString& aElevation) { return _to##GetElevation(aElevation); } \
-  NS_IMETHOD    SetElevation(const nsString& aElevation) { return _to##SetElevation(aElevation); } \
-  NS_IMETHOD    GetEmptyCells(nsString& aEmptyCells) { return _to##GetEmptyCells(aEmptyCells); } \
-  NS_IMETHOD    SetEmptyCells(const nsString& aEmptyCells) { return _to##SetEmptyCells(aEmptyCells); } \
-  NS_IMETHOD    GetStyleFloat(nsString& aStyleFloat) { return _to##GetStyleFloat(aStyleFloat); } \
-  NS_IMETHOD    SetStyleFloat(const nsString& aStyleFloat) { return _to##SetStyleFloat(aStyleFloat); } \
-  NS_IMETHOD    GetFont(nsString& aFont) { return _to##GetFont(aFont); } \
-  NS_IMETHOD    SetFont(const nsString& aFont) { return _to##SetFont(aFont); } \
-  NS_IMETHOD    GetFontFamily(nsString& aFontFamily) { return _to##GetFontFamily(aFontFamily); } \
-  NS_IMETHOD    SetFontFamily(const nsString& aFontFamily) { return _to##SetFontFamily(aFontFamily); } \
-  NS_IMETHOD    GetFontSize(nsString& aFontSize) { return _to##GetFontSize(aFontSize); } \
-  NS_IMETHOD    SetFontSize(const nsString& aFontSize) { return _to##SetFontSize(aFontSize); } \
-  NS_IMETHOD    GetFontSizeAdjust(nsString& aFontSizeAdjust) { return _to##GetFontSizeAdjust(aFontSizeAdjust); } \
-  NS_IMETHOD    SetFontSizeAdjust(const nsString& aFontSizeAdjust) { return _to##SetFontSizeAdjust(aFontSizeAdjust); } \
-  NS_IMETHOD    GetFontStretch(nsString& aFontStretch) { return _to##GetFontStretch(aFontStretch); } \
-  NS_IMETHOD    SetFontStretch(const nsString& aFontStretch) { return _to##SetFontStretch(aFontStretch); } \
-  NS_IMETHOD    GetFontStyle(nsString& aFontStyle) { return _to##GetFontStyle(aFontStyle); } \
-  NS_IMETHOD    SetFontStyle(const nsString& aFontStyle) { return _to##SetFontStyle(aFontStyle); } \
-  NS_IMETHOD    GetFontVariant(nsString& aFontVariant) { return _to##GetFontVariant(aFontVariant); } \
-  NS_IMETHOD    SetFontVariant(const nsString& aFontVariant) { return _to##SetFontVariant(aFontVariant); } \
-  NS_IMETHOD    GetFontWeight(nsString& aFontWeight) { return _to##GetFontWeight(aFontWeight); } \
-  NS_IMETHOD    SetFontWeight(const nsString& aFontWeight) { return _to##SetFontWeight(aFontWeight); } \
-  NS_IMETHOD    GetHeight(nsString& aHeight) { return _to##GetHeight(aHeight); } \
-  NS_IMETHOD    SetHeight(const nsString& aHeight) { return _to##SetHeight(aHeight); } \
-  NS_IMETHOD    GetLeft(nsString& aLeft) { return _to##GetLeft(aLeft); } \
-  NS_IMETHOD    SetLeft(const nsString& aLeft) { return _to##SetLeft(aLeft); } \
-  NS_IMETHOD    GetLetterSpacing(nsString& aLetterSpacing) { return _to##GetLetterSpacing(aLetterSpacing); } \
-  NS_IMETHOD    SetLetterSpacing(const nsString& aLetterSpacing) { return _to##SetLetterSpacing(aLetterSpacing); } \
-  NS_IMETHOD    GetLineHeight(nsString& aLineHeight) { return _to##GetLineHeight(aLineHeight); } \
-  NS_IMETHOD    SetLineHeight(const nsString& aLineHeight) { return _to##SetLineHeight(aLineHeight); } \
-  NS_IMETHOD    GetListStyle(nsString& aListStyle) { return _to##GetListStyle(aListStyle); } \
-  NS_IMETHOD    SetListStyle(const nsString& aListStyle) { return _to##SetListStyle(aListStyle); } \
-  NS_IMETHOD    GetListStyleImage(nsString& aListStyleImage) { return _to##GetListStyleImage(aListStyleImage); } \
-  NS_IMETHOD    SetListStyleImage(const nsString& aListStyleImage) { return _to##SetListStyleImage(aListStyleImage); } \
-  NS_IMETHOD    GetListStylePosition(nsString& aListStylePosition) { return _to##GetListStylePosition(aListStylePosition); } \
-  NS_IMETHOD    SetListStylePosition(const nsString& aListStylePosition) { return _to##SetListStylePosition(aListStylePosition); } \
-  NS_IMETHOD    GetListStyleType(nsString& aListStyleType) { return _to##GetListStyleType(aListStyleType); } \
-  NS_IMETHOD    SetListStyleType(const nsString& aListStyleType) { return _to##SetListStyleType(aListStyleType); } \
-  NS_IMETHOD    GetMargin(nsString& aMargin) { return _to##GetMargin(aMargin); } \
-  NS_IMETHOD    SetMargin(const nsString& aMargin) { return _to##SetMargin(aMargin); } \
-  NS_IMETHOD    GetMarginTop(nsString& aMarginTop) { return _to##GetMarginTop(aMarginTop); } \
-  NS_IMETHOD    SetMarginTop(const nsString& aMarginTop) { return _to##SetMarginTop(aMarginTop); } \
-  NS_IMETHOD    GetMarginRight(nsString& aMarginRight) { return _to##GetMarginRight(aMarginRight); } \
-  NS_IMETHOD    SetMarginRight(const nsString& aMarginRight) { return _to##SetMarginRight(aMarginRight); } \
-  NS_IMETHOD    GetMarginBottom(nsString& aMarginBottom) { return _to##GetMarginBottom(aMarginBottom); } \
-  NS_IMETHOD    SetMarginBottom(const nsString& aMarginBottom) { return _to##SetMarginBottom(aMarginBottom); } \
-  NS_IMETHOD    GetMarginLeft(nsString& aMarginLeft) { return _to##GetMarginLeft(aMarginLeft); } \
-  NS_IMETHOD    SetMarginLeft(const nsString& aMarginLeft) { return _to##SetMarginLeft(aMarginLeft); } \
-  NS_IMETHOD    GetMarkerOffset(nsString& aMarkerOffset) { return _to##GetMarkerOffset(aMarkerOffset); } \
-  NS_IMETHOD    SetMarkerOffset(const nsString& aMarkerOffset) { return _to##SetMarkerOffset(aMarkerOffset); } \
-  NS_IMETHOD    GetMarks(nsString& aMarks) { return _to##GetMarks(aMarks); } \
-  NS_IMETHOD    SetMarks(const nsString& aMarks) { return _to##SetMarks(aMarks); } \
-  NS_IMETHOD    GetMaxHeight(nsString& aMaxHeight) { return _to##GetMaxHeight(aMaxHeight); } \
-  NS_IMETHOD    SetMaxHeight(const nsString& aMaxHeight) { return _to##SetMaxHeight(aMaxHeight); } \
-  NS_IMETHOD    GetMaxWidth(nsString& aMaxWidth) { return _to##GetMaxWidth(aMaxWidth); } \
-  NS_IMETHOD    SetMaxWidth(const nsString& aMaxWidth) { return _to##SetMaxWidth(aMaxWidth); } \
-  NS_IMETHOD    GetMinHeight(nsString& aMinHeight) { return _to##GetMinHeight(aMinHeight); } \
-  NS_IMETHOD    SetMinHeight(const nsString& aMinHeight) { return _to##SetMinHeight(aMinHeight); } \
-  NS_IMETHOD    GetMinWidth(nsString& aMinWidth) { return _to##GetMinWidth(aMinWidth); } \
-  NS_IMETHOD    SetMinWidth(const nsString& aMinWidth) { return _to##SetMinWidth(aMinWidth); } \
-  NS_IMETHOD    GetOrphans(nsString& aOrphans) { return _to##GetOrphans(aOrphans); } \
-  NS_IMETHOD    SetOrphans(const nsString& aOrphans) { return _to##SetOrphans(aOrphans); } \
-  NS_IMETHOD    GetOutline(nsString& aOutline) { return _to##GetOutline(aOutline); } \
-  NS_IMETHOD    SetOutline(const nsString& aOutline) { return _to##SetOutline(aOutline); } \
-  NS_IMETHOD    GetOutlineColor(nsString& aOutlineColor) { return _to##GetOutlineColor(aOutlineColor); } \
-  NS_IMETHOD    SetOutlineColor(const nsString& aOutlineColor) { return _to##SetOutlineColor(aOutlineColor); } \
-  NS_IMETHOD    GetOutlineStyle(nsString& aOutlineStyle) { return _to##GetOutlineStyle(aOutlineStyle); } \
-  NS_IMETHOD    SetOutlineStyle(const nsString& aOutlineStyle) { return _to##SetOutlineStyle(aOutlineStyle); } \
-  NS_IMETHOD    GetOutlineWidth(nsString& aOutlineWidth) { return _to##GetOutlineWidth(aOutlineWidth); } \
-  NS_IMETHOD    SetOutlineWidth(const nsString& aOutlineWidth) { return _to##SetOutlineWidth(aOutlineWidth); } \
-  NS_IMETHOD    GetOverflow(nsString& aOverflow) { return _to##GetOverflow(aOverflow); } \
-  NS_IMETHOD    SetOverflow(const nsString& aOverflow) { return _to##SetOverflow(aOverflow); } \
-  NS_IMETHOD    GetPadding(nsString& aPadding) { return _to##GetPadding(aPadding); } \
-  NS_IMETHOD    SetPadding(const nsString& aPadding) { return _to##SetPadding(aPadding); } \
-  NS_IMETHOD    GetPaddingTop(nsString& aPaddingTop) { return _to##GetPaddingTop(aPaddingTop); } \
-  NS_IMETHOD    SetPaddingTop(const nsString& aPaddingTop) { return _to##SetPaddingTop(aPaddingTop); } \
-  NS_IMETHOD    GetPaddingRight(nsString& aPaddingRight) { return _to##GetPaddingRight(aPaddingRight); } \
-  NS_IMETHOD    SetPaddingRight(const nsString& aPaddingRight) { return _to##SetPaddingRight(aPaddingRight); } \
-  NS_IMETHOD    GetPaddingBottom(nsString& aPaddingBottom) { return _to##GetPaddingBottom(aPaddingBottom); } \
-  NS_IMETHOD    SetPaddingBottom(const nsString& aPaddingBottom) { return _to##SetPaddingBottom(aPaddingBottom); } \
-  NS_IMETHOD    GetPaddingLeft(nsString& aPaddingLeft) { return _to##GetPaddingLeft(aPaddingLeft); } \
-  NS_IMETHOD    SetPaddingLeft(const nsString& aPaddingLeft) { return _to##SetPaddingLeft(aPaddingLeft); } \
-  NS_IMETHOD    GetPage(nsString& aPage) { return _to##GetPage(aPage); } \
-  NS_IMETHOD    SetPage(const nsString& aPage) { return _to##SetPage(aPage); } \
-  NS_IMETHOD    GetPageBreakAfter(nsString& aPageBreakAfter) { return _to##GetPageBreakAfter(aPageBreakAfter); } \
-  NS_IMETHOD    SetPageBreakAfter(const nsString& aPageBreakAfter) { return _to##SetPageBreakAfter(aPageBreakAfter); } \
-  NS_IMETHOD    GetPageBreakBefore(nsString& aPageBreakBefore) { return _to##GetPageBreakBefore(aPageBreakBefore); } \
-  NS_IMETHOD    SetPageBreakBefore(const nsString& aPageBreakBefore) { return _to##SetPageBreakBefore(aPageBreakBefore); } \
-  NS_IMETHOD    GetPageBreakInside(nsString& aPageBreakInside) { return _to##GetPageBreakInside(aPageBreakInside); } \
-  NS_IMETHOD    SetPageBreakInside(const nsString& aPageBreakInside) { return _to##SetPageBreakInside(aPageBreakInside); } \
-  NS_IMETHOD    GetPause(nsString& aPause) { return _to##GetPause(aPause); } \
-  NS_IMETHOD    SetPause(const nsString& aPause) { return _to##SetPause(aPause); } \
-  NS_IMETHOD    GetPauseAfter(nsString& aPauseAfter) { return _to##GetPauseAfter(aPauseAfter); } \
-  NS_IMETHOD    SetPauseAfter(const nsString& aPauseAfter) { return _to##SetPauseAfter(aPauseAfter); } \
-  NS_IMETHOD    GetPauseBefore(nsString& aPauseBefore) { return _to##GetPauseBefore(aPauseBefore); } \
-  NS_IMETHOD    SetPauseBefore(const nsString& aPauseBefore) { return _to##SetPauseBefore(aPauseBefore); } \
-  NS_IMETHOD    GetPitch(nsString& aPitch) { return _to##GetPitch(aPitch); } \
-  NS_IMETHOD    SetPitch(const nsString& aPitch) { return _to##SetPitch(aPitch); } \
-  NS_IMETHOD    GetPitchRange(nsString& aPitchRange) { return _to##GetPitchRange(aPitchRange); } \
-  NS_IMETHOD    SetPitchRange(const nsString& aPitchRange) { return _to##SetPitchRange(aPitchRange); } \
-  NS_IMETHOD    GetPlayDuring(nsString& aPlayDuring) { return _to##GetPlayDuring(aPlayDuring); } \
-  NS_IMETHOD    SetPlayDuring(const nsString& aPlayDuring) { return _to##SetPlayDuring(aPlayDuring); } \
-  NS_IMETHOD    GetPosition(nsString& aPosition) { return _to##GetPosition(aPosition); } \
-  NS_IMETHOD    SetPosition(const nsString& aPosition) { return _to##SetPosition(aPosition); } \
-  NS_IMETHOD    GetQuotes(nsString& aQuotes) { return _to##GetQuotes(aQuotes); } \
-  NS_IMETHOD    SetQuotes(const nsString& aQuotes) { return _to##SetQuotes(aQuotes); } \
-  NS_IMETHOD    GetRichness(nsString& aRichness) { return _to##GetRichness(aRichness); } \
-  NS_IMETHOD    SetRichness(const nsString& aRichness) { return _to##SetRichness(aRichness); } \
-  NS_IMETHOD    GetRight(nsString& aRight) { return _to##GetRight(aRight); } \
-  NS_IMETHOD    SetRight(const nsString& aRight) { return _to##SetRight(aRight); } \
-  NS_IMETHOD    GetSize(nsString& aSize) { return _to##GetSize(aSize); } \
-  NS_IMETHOD    SetSize(const nsString& aSize) { return _to##SetSize(aSize); } \
-  NS_IMETHOD    GetSpeak(nsString& aSpeak) { return _to##GetSpeak(aSpeak); } \
-  NS_IMETHOD    SetSpeak(const nsString& aSpeak) { return _to##SetSpeak(aSpeak); } \
-  NS_IMETHOD    GetSpeakHeader(nsString& aSpeakHeader) { return _to##GetSpeakHeader(aSpeakHeader); } \
-  NS_IMETHOD    SetSpeakHeader(const nsString& aSpeakHeader) { return _to##SetSpeakHeader(aSpeakHeader); } \
-  NS_IMETHOD    GetSpeakNumeral(nsString& aSpeakNumeral) { return _to##GetSpeakNumeral(aSpeakNumeral); } \
-  NS_IMETHOD    SetSpeakNumeral(const nsString& aSpeakNumeral) { return _to##SetSpeakNumeral(aSpeakNumeral); } \
-  NS_IMETHOD    GetSpeakPunctuation(nsString& aSpeakPunctuation) { return _to##GetSpeakPunctuation(aSpeakPunctuation); } \
-  NS_IMETHOD    SetSpeakPunctuation(const nsString& aSpeakPunctuation) { return _to##SetSpeakPunctuation(aSpeakPunctuation); } \
-  NS_IMETHOD    GetSpeechRate(nsString& aSpeechRate) { return _to##GetSpeechRate(aSpeechRate); } \
-  NS_IMETHOD    SetSpeechRate(const nsString& aSpeechRate) { return _to##SetSpeechRate(aSpeechRate); } \
-  NS_IMETHOD    GetStress(nsString& aStress) { return _to##GetStress(aStress); } \
-  NS_IMETHOD    SetStress(const nsString& aStress) { return _to##SetStress(aStress); } \
-  NS_IMETHOD    GetTableLayout(nsString& aTableLayout) { return _to##GetTableLayout(aTableLayout); } \
-  NS_IMETHOD    SetTableLayout(const nsString& aTableLayout) { return _to##SetTableLayout(aTableLayout); } \
-  NS_IMETHOD    GetTextAlign(nsString& aTextAlign) { return _to##GetTextAlign(aTextAlign); } \
-  NS_IMETHOD    SetTextAlign(const nsString& aTextAlign) { return _to##SetTextAlign(aTextAlign); } \
-  NS_IMETHOD    GetTextDecoration(nsString& aTextDecoration) { return _to##GetTextDecoration(aTextDecoration); } \
-  NS_IMETHOD    SetTextDecoration(const nsString& aTextDecoration) { return _to##SetTextDecoration(aTextDecoration); } \
-  NS_IMETHOD    GetTextIndent(nsString& aTextIndent) { return _to##GetTextIndent(aTextIndent); } \
-  NS_IMETHOD    SetTextIndent(const nsString& aTextIndent) { return _to##SetTextIndent(aTextIndent); } \
-  NS_IMETHOD    GetTextShadow(nsString& aTextShadow) { return _to##GetTextShadow(aTextShadow); } \
-  NS_IMETHOD    SetTextShadow(const nsString& aTextShadow) { return _to##SetTextShadow(aTextShadow); } \
-  NS_IMETHOD    GetTextTransform(nsString& aTextTransform) { return _to##GetTextTransform(aTextTransform); } \
-  NS_IMETHOD    SetTextTransform(const nsString& aTextTransform) { return _to##SetTextTransform(aTextTransform); } \
-  NS_IMETHOD    GetTop(nsString& aTop) { return _to##GetTop(aTop); } \
-  NS_IMETHOD    SetTop(const nsString& aTop) { return _to##SetTop(aTop); } \
-  NS_IMETHOD    GetUnicodeBidi(nsString& aUnicodeBidi) { return _to##GetUnicodeBidi(aUnicodeBidi); } \
-  NS_IMETHOD    SetUnicodeBidi(const nsString& aUnicodeBidi) { return _to##SetUnicodeBidi(aUnicodeBidi); } \
-  NS_IMETHOD    GetVerticalAlign(nsString& aVerticalAlign) { return _to##GetVerticalAlign(aVerticalAlign); } \
-  NS_IMETHOD    SetVerticalAlign(const nsString& aVerticalAlign) { return _to##SetVerticalAlign(aVerticalAlign); } \
-  NS_IMETHOD    GetVisibility(nsString& aVisibility) { return _to##GetVisibility(aVisibility); } \
-  NS_IMETHOD    SetVisibility(const nsString& aVisibility) { return _to##SetVisibility(aVisibility); } \
-  NS_IMETHOD    GetVoiceFamily(nsString& aVoiceFamily) { return _to##GetVoiceFamily(aVoiceFamily); } \
-  NS_IMETHOD    SetVoiceFamily(const nsString& aVoiceFamily) { return _to##SetVoiceFamily(aVoiceFamily); } \
-  NS_IMETHOD    GetVolume(nsString& aVolume) { return _to##GetVolume(aVolume); } \
-  NS_IMETHOD    SetVolume(const nsString& aVolume) { return _to##SetVolume(aVolume); } \
-  NS_IMETHOD    GetWhiteSpace(nsString& aWhiteSpace) { return _to##GetWhiteSpace(aWhiteSpace); } \
-  NS_IMETHOD    SetWhiteSpace(const nsString& aWhiteSpace) { return _to##SetWhiteSpace(aWhiteSpace); } \
-  NS_IMETHOD    GetWidows(nsString& aWidows) { return _to##GetWidows(aWidows); } \
-  NS_IMETHOD    SetWidows(const nsString& aWidows) { return _to##SetWidows(aWidows); } \
-  NS_IMETHOD    GetWidth(nsString& aWidth) { return _to##GetWidth(aWidth); } \
-  NS_IMETHOD    SetWidth(const nsString& aWidth) { return _to##SetWidth(aWidth); } \
-  NS_IMETHOD    GetWordSpacing(nsString& aWordSpacing) { return _to##GetWordSpacing(aWordSpacing); } \
-  NS_IMETHOD    SetWordSpacing(const nsString& aWordSpacing) { return _to##SetWordSpacing(aWordSpacing); } \
-  NS_IMETHOD    GetZIndex(nsString& aZIndex) { return _to##GetZIndex(aZIndex); } \
-  NS_IMETHOD    SetZIndex(const nsString& aZIndex) { return _to##SetZIndex(aZIndex); } \
-  NS_IMETHOD    GetOpacity(nsString& aOpacity) { return _to##GetOpacity(aOpacity); } \
-  NS_IMETHOD    SetOpacity(const nsString& aOpacity) { return _to##SetOpacity(aOpacity); } \
   NS_IMETHOD    GetPropertyValue(const nsString& aPropertyName, nsString& aReturn) { return _to##GetPropertyValue(aPropertyName, aReturn); }  \
   NS_IMETHOD    GetPropertyPriority(const nsString& aPropertyName, nsString& aReturn) { return _to##GetPropertyPriority(aPropertyName, aReturn); }  \
   NS_IMETHOD    SetProperty(const nsString& aPropertyName, const nsString& aValue, const nsString& aPriority) { return _to##SetProperty(aPropertyName, aValue, aPriority); }  \
diff --git a/mozilla/dom/public/css/nsIDOMCSSStyleRule.h b/mozilla/dom/public/css/nsIDOMCSSStyleRule.h
index c7e1a04b6b8..df747dfce55 100644
--- a/mozilla/dom/public/css/nsIDOMCSSStyleRule.h
+++ b/mozilla/dom/public/css/nsIDOMCSSStyleRule.h
@@ -23,26 +23,38 @@
 #include "nsISupports.h"
 #include "nsString.h"
 #include "nsIScriptContext.h"
+#include "nsIDOMCSSRule.h"
 
+class nsIDOMCSSStyleDeclaration;
 
 #define NS_IDOMCSSSTYLERULE_IID \
  { 0xa6cf90bf, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
 
-class nsIDOMCSSStyleRule : public nsISupports {
+class nsIDOMCSSStyleRule : public nsIDOMCSSRule {
 public:
 
-  NS_IMETHOD    GetType(nsString& aType)=0;
+  NS_IMETHOD    GetSelectorText(nsString& aSelectorText)=0;
+  NS_IMETHOD    SetSelectorText(const nsString& aSelectorText)=0;
+
+  NS_IMETHOD    GetStyle(nsIDOMCSSStyleDeclaration** aStyle)=0;
+  NS_IMETHOD    SetStyle(nsIDOMCSSStyleDeclaration* aStyle)=0;
 };
 
 
 #define NS_DECL_IDOMCSSSTYLERULE   \
-  NS_IMETHOD    GetType(nsString& aType);  \
+  NS_IMETHOD    GetSelectorText(nsString& aSelectorText);  \
+  NS_IMETHOD    SetSelectorText(const nsString& aSelectorText);  \
+  NS_IMETHOD    GetStyle(nsIDOMCSSStyleDeclaration** aStyle);  \
+  NS_IMETHOD    SetStyle(nsIDOMCSSStyleDeclaration* aStyle);  \
 
 
 
 #define NS_FORWARD_IDOMCSSSTYLERULE(_to)  \
-  NS_IMETHOD    GetType(nsString& aType) { return _to##GetType(aType); } \
+  NS_IMETHOD    GetSelectorText(nsString& aSelectorText) { return _to##GetSelectorText(aSelectorText); } \
+  NS_IMETHOD    SetSelectorText(const nsString& aSelectorText) { return _to##SetSelectorText(aSelectorText); } \
+  NS_IMETHOD    GetStyle(nsIDOMCSSStyleDeclaration** aStyle) { return _to##GetStyle(aStyle); } \
+  NS_IMETHOD    SetStyle(nsIDOMCSSStyleDeclaration* aStyle) { return _to##SetStyle(aStyle); } \
 
 
 extern nsresult NS_InitCSSStyleRuleClass(nsIScriptContext *aContext, void **aPrototype);
diff --git a/mozilla/dom/public/css/nsIDOMCSSStyleRuleSimple.h b/mozilla/dom/public/css/nsIDOMCSSStyleRuleSimple.h
deleted file mode 100644
index 216a42ad732..00000000000
--- a/mozilla/dom/public/css/nsIDOMCSSStyleRuleSimple.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.0 (the "NPL"); you may not use this file except in
- * compliance with the NPL.  You may obtain a copy of the NPL at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the NPL is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
- * for the specific language governing rights and limitations under the
- * NPL.
- *
- * The Initial Developer of this code under the NPL is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
- * Reserved.
- */
-/* AUTO-GENERATED. DO NOT EDIT!!! */
-
-#ifndef nsIDOMCSSStyleRuleSimple_h__
-#define nsIDOMCSSStyleRuleSimple_h__
-
-#include "nsISupports.h"
-#include "nsString.h"
-#include "nsIScriptContext.h"
-#include "nsIDOMCSSStyleRule.h"
-
-class nsIDOMCSSStyleDeclaration;
-
-#define NS_IDOMCSSSTYLERULESIMPLE_IID \
- { 0xa6cf90c1, 0x15b3, 0x11d2, \
-  { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
-
-class nsIDOMCSSStyleRuleSimple : public nsIDOMCSSStyleRule {
-public:
-
-  NS_IMETHOD    GetSelectorText(nsString& aSelectorText)=0;
-  NS_IMETHOD    SetSelectorText(const nsString& aSelectorText)=0;
-
-  NS_IMETHOD    GetStyle(nsIDOMCSSStyleDeclaration** aStyle)=0;
-};
-
-
-#define NS_DECL_IDOMCSSSTYLERULESIMPLE   \
-  NS_IMETHOD    GetSelectorText(nsString& aSelectorText);  \
-  NS_IMETHOD    SetSelectorText(const nsString& aSelectorText);  \
-  NS_IMETHOD    GetStyle(nsIDOMCSSStyleDeclaration** aStyle);  \
-
-
-
-#define NS_FORWARD_IDOMCSSSTYLERULESIMPLE(_to)  \
-  NS_IMETHOD    GetSelectorText(nsString& aSelectorText) { return _to##GetSelectorText(aSelectorText); } \
-  NS_IMETHOD    SetSelectorText(const nsString& aSelectorText) { return _to##SetSelectorText(aSelectorText); } \
-  NS_IMETHOD    GetStyle(nsIDOMCSSStyleDeclaration** aStyle) { return _to##GetStyle(aStyle); } \
-
-
-extern nsresult NS_InitCSSStyleRuleSimpleClass(nsIScriptContext *aContext, void **aPrototype);
-
-extern "C" NS_DOM nsresult NS_NewScriptCSSStyleRuleSimple(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
-
-#endif // nsIDOMCSSStyleRuleSimple_h__
diff --git a/mozilla/dom/public/css/nsIDOMCSSStyleSheet.h b/mozilla/dom/public/css/nsIDOMCSSStyleSheet.h
index b9979943244..c042c5a4322 100644
--- a/mozilla/dom/public/css/nsIDOMCSSStyleSheet.h
+++ b/mozilla/dom/public/css/nsIDOMCSSStyleSheet.h
@@ -25,10 +25,9 @@
 #include "nsIScriptContext.h"
 #include "nsIDOMStyleSheet.h"
 
-class nsIDOMHTMLElement;
-class nsIDOMStyleSheetCollection;
+class nsIDOMNode;
+class nsIDOMStyleSheet;
 class nsIDOMCSSStyleRuleCollection;
-class nsIDOMCSSStyleSheet;
 
 #define NS_IDOMCSSSTYLESHEET_IID \
  { 0xa6cf90c2, 0x15b3, 0x11d2, \
@@ -37,53 +36,45 @@ class nsIDOMCSSStyleSheet;
 class nsIDOMCSSStyleSheet : public nsIDOMStyleSheet {
 public:
 
-  NS_IMETHOD    GetOwningElement(nsIDOMHTMLElement** aOwningElement)=0;
+  NS_IMETHOD    GetOwningNode(nsIDOMNode** aOwningNode)=0;
 
-  NS_IMETHOD    GetParentStyleSheet(nsIDOMCSSStyleSheet** aParentStyleSheet)=0;
+  NS_IMETHOD    GetParentStyleSheet(nsIDOMStyleSheet** aParentStyleSheet)=0;
 
   NS_IMETHOD    GetHref(nsString& aHref)=0;
 
   NS_IMETHOD    GetTitle(nsString& aTitle)=0;
 
-  NS_IMETHOD    GetImports(nsIDOMStyleSheetCollection** aImports)=0;
+  NS_IMETHOD    GetMedia(nsString& aMedia)=0;
 
-  NS_IMETHOD    GetRules(nsIDOMCSSStyleRuleCollection** aRules)=0;
+  NS_IMETHOD    GetCssRules(nsIDOMCSSStyleRuleCollection** aCssRules)=0;
 
-  NS_IMETHOD    AddRule(const nsString& aSelector, const nsString& aDeclaration, PRUint32 aIndex, PRUint32* aReturn)=0;
+  NS_IMETHOD    InsertRule(const nsString& aRule, PRUint32 aIndex, PRUint32* aReturn)=0;
 
-  NS_IMETHOD    AddImport(const nsString& aUrl, PRUint32 aIndex, PRUint32* aReturn)=0;
-
-  NS_IMETHOD    RemoveRule(PRUint32 aIndex)=0;
-
-  NS_IMETHOD    RemoveImport(PRUint32 aIndex)=0;
+  NS_IMETHOD    DeleteRule(PRUint32 aIndex)=0;
 };
 
 
 #define NS_DECL_IDOMCSSSTYLESHEET   \
-  NS_IMETHOD    GetOwningElement(nsIDOMHTMLElement** aOwningElement);  \
-  NS_IMETHOD    GetParentStyleSheet(nsIDOMCSSStyleSheet** aParentStyleSheet);  \
+  NS_IMETHOD    GetOwningNode(nsIDOMNode** aOwningNode);  \
+  NS_IMETHOD    GetParentStyleSheet(nsIDOMStyleSheet** aParentStyleSheet);  \
   NS_IMETHOD    GetHref(nsString& aHref);  \
   NS_IMETHOD    GetTitle(nsString& aTitle);  \
-  NS_IMETHOD    GetImports(nsIDOMStyleSheetCollection** aImports);  \
-  NS_IMETHOD    GetRules(nsIDOMCSSStyleRuleCollection** aRules);  \
-  NS_IMETHOD    AddRule(const nsString& aSelector, const nsString& aDeclaration, PRUint32 aIndex, PRUint32* aReturn);  \
-  NS_IMETHOD    AddImport(const nsString& aUrl, PRUint32 aIndex, PRUint32* aReturn);  \
-  NS_IMETHOD    RemoveRule(PRUint32 aIndex);  \
-  NS_IMETHOD    RemoveImport(PRUint32 aIndex);  \
+  NS_IMETHOD    GetMedia(nsString& aMedia);  \
+  NS_IMETHOD    GetCssRules(nsIDOMCSSStyleRuleCollection** aCssRules);  \
+  NS_IMETHOD    InsertRule(const nsString& aRule, PRUint32 aIndex, PRUint32* aReturn);  \
+  NS_IMETHOD    DeleteRule(PRUint32 aIndex);  \
 
 
 
 #define NS_FORWARD_IDOMCSSSTYLESHEET(_to)  \
-  NS_IMETHOD    GetOwningElement(nsIDOMHTMLElement** aOwningElement) { return _to##GetOwningElement(aOwningElement); } \
-  NS_IMETHOD    GetParentStyleSheet(nsIDOMCSSStyleSheet** aParentStyleSheet) { return _to##GetParentStyleSheet(aParentStyleSheet); } \
+  NS_IMETHOD    GetOwningNode(nsIDOMNode** aOwningNode) { return _to##GetOwningNode(aOwningNode); } \
+  NS_IMETHOD    GetParentStyleSheet(nsIDOMStyleSheet** aParentStyleSheet) { return _to##GetParentStyleSheet(aParentStyleSheet); } \
   NS_IMETHOD    GetHref(nsString& aHref) { return _to##GetHref(aHref); } \
   NS_IMETHOD    GetTitle(nsString& aTitle) { return _to##GetTitle(aTitle); } \
-  NS_IMETHOD    GetImports(nsIDOMStyleSheetCollection** aImports) { return _to##GetImports(aImports); } \
-  NS_IMETHOD    GetRules(nsIDOMCSSStyleRuleCollection** aRules) { return _to##GetRules(aRules); } \
-  NS_IMETHOD    AddRule(const nsString& aSelector, const nsString& aDeclaration, PRUint32 aIndex, PRUint32* aReturn) { return _to##AddRule(aSelector, aDeclaration, aIndex, aReturn); }  \
-  NS_IMETHOD    AddImport(const nsString& aUrl, PRUint32 aIndex, PRUint32* aReturn) { return _to##AddImport(aUrl, aIndex, aReturn); }  \
-  NS_IMETHOD    RemoveRule(PRUint32 aIndex) { return _to##RemoveRule(aIndex); }  \
-  NS_IMETHOD    RemoveImport(PRUint32 aIndex) { return _to##RemoveImport(aIndex); }  \
+  NS_IMETHOD    GetMedia(nsString& aMedia) { return _to##GetMedia(aMedia); } \
+  NS_IMETHOD    GetCssRules(nsIDOMCSSStyleRuleCollection** aCssRules) { return _to##GetCssRules(aCssRules); } \
+  NS_IMETHOD    InsertRule(const nsString& aRule, PRUint32 aIndex, PRUint32* aReturn) { return _to##InsertRule(aRule, aIndex, aReturn); }  \
+  NS_IMETHOD    DeleteRule(PRUint32 aIndex) { return _to##DeleteRule(aIndex); }  \
 
 
 extern nsresult NS_InitCSSStyleSheetClass(nsIScriptContext *aContext, void **aPrototype);
diff --git a/mozilla/dom/public/css/nsIDOMCSSUnknownRule.h b/mozilla/dom/public/css/nsIDOMCSSUnknownRule.h
new file mode 100644
index 00000000000..23cd58f1c05
--- /dev/null
+++ b/mozilla/dom/public/css/nsIDOMCSSUnknownRule.h
@@ -0,0 +1,49 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#ifndef nsIDOMCSSUnknownRule_h__
+#define nsIDOMCSSUnknownRule_h__
+
+#include "nsISupports.h"
+#include "nsString.h"
+#include "nsIScriptContext.h"
+#include "nsIDOMCSSRule.h"
+
+
+#define NS_IDOMCSSUNKNOWNRULE_IID \
+ { 0xa6cf90d0, 0x15b3, 0x11d2, \
+    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } 
+
+class nsIDOMCSSUnknownRule : public nsIDOMCSSRule {
+public:
+};
+
+
+#define NS_DECL_IDOMCSSUNKNOWNRULE   \
+
+
+
+#define NS_FORWARD_IDOMCSSUNKNOWNRULE(_to)  \
+
+
+extern nsresult NS_InitCSSUnknownRuleClass(nsIScriptContext *aContext, void **aPrototype);
+
+extern "C" NS_DOM nsresult NS_NewScriptCSSUnknownRule(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn);
+
+#endif // nsIDOMCSSUnknownRule_h__
diff --git a/mozilla/dom/public/idl/coreDom/StyleSheet.idl b/mozilla/dom/public/idl/coreDom/StyleSheet.idl
index 5ea1252c887..62e5cc39875 100644
--- a/mozilla/dom/public/idl/coreDom/StyleSheet.idl
+++ b/mozilla/dom/public/idl/coreDom/StyleSheet.idl
@@ -3,6 +3,7 @@
  /* IID: { 0xa6cf9080, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } */
 
-      attribute boolean disabled;
-      readonly attribute boolean readOnly;
+      readonly attribute wstring type; 
+      attribute boolean disabled; 
+      readonly attribute boolean readOnly; 
    };
\ No newline at end of file
diff --git a/mozilla/dom/public/idl/css/CSS2Properties.idl b/mozilla/dom/public/idl/css/CSS2Properties.idl
new file mode 100644
index 00000000000..4fbc8d8955d
--- /dev/null
+++ b/mozilla/dom/public/idl/css/CSS2Properties.idl
@@ -0,0 +1,131 @@
+
+   interface CSS2Properties : CSSStyleDeclaration { 
+/* IID: { 0xa6cf90d1, 0x15b3, 0x11d2, \
+    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } */
+
+      attribute wstring azimuth; 
+      attribute wstring background; 
+      attribute wstring backgroundAttachment; 
+      attribute wstring backgroundColor; 
+      attribute wstring backgroundImage; 
+      attribute wstring backgroundPosition; 
+      attribute wstring backgroundRepeat; 
+      attribute wstring border; 
+      attribute wstring borderCollapse; 
+      attribute wstring borderColor; 
+      attribute wstring borderSpacing; 
+      attribute wstring borderStyle; 
+      attribute wstring borderTop; 
+      attribute wstring borderRight; 
+      attribute wstring borderBottom; 
+      attribute wstring borderLeft; 
+      attribute wstring borderTopColor; 
+      attribute wstring borderRightColor; 
+      attribute wstring borderBottomColor; 
+      attribute wstring borderLeftColor; 
+      attribute wstring borderTopStyle; 
+      attribute wstring borderRightStyle; 
+      attribute wstring borderBottomStyle; 
+      attribute wstring borderLeftStyle; 
+      attribute wstring borderTopWidth; 
+      attribute wstring borderRightWidth; 
+      attribute wstring borderBottomWidth; 
+      attribute wstring borderLeftWidth; 
+      attribute wstring borderWidth; 
+      attribute wstring bottom; 
+      attribute wstring captionSide; 
+      attribute wstring clear; 
+      attribute wstring clip; 
+      attribute wstring color; 
+      attribute wstring content; 
+      attribute wstring counterIncrement; 
+      attribute wstring counterReset; 
+      attribute wstring cue; 
+      attribute wstring cueAfter; 
+      attribute wstring cueBefore; 
+      attribute wstring cursor; 
+      attribute wstring direction; 
+      attribute wstring display; 
+      attribute wstring elevation; 
+      attribute wstring emptyCells; 
+      attribute wstring cssFloat; 
+      attribute wstring font; 
+      attribute wstring fontFamily; 
+      attribute wstring fontSize; 
+      attribute wstring fontSizeAdjust; 
+      attribute wstring fontStretch; 
+      attribute wstring fontStyle; 
+      attribute wstring fontVariant; 
+      attribute wstring fontWeight; 
+      attribute wstring height; 
+      attribute wstring left; 
+      attribute wstring letterSpacing; 
+      attribute wstring lineHeight; 
+      attribute wstring listStyle; 
+      attribute wstring listStyleImage; 
+      attribute wstring listStylePosition; 
+      attribute wstring listStyleType; 
+      attribute wstring margin; 
+      attribute wstring marginTop; 
+      attribute wstring marginRight; 
+      attribute wstring marginBottom; 
+      attribute wstring marginLeft; 
+      attribute wstring markerOffset; 
+      attribute wstring marks; 
+      attribute wstring maxHeight; 
+      attribute wstring maxWidth; 
+      attribute wstring minHeight; 
+      attribute wstring minWidth; 
+      attribute wstring orphans; 
+      attribute wstring outline; 
+      attribute wstring outlineColor; 
+      attribute wstring outlineStyle; 
+      attribute wstring outlineWidth; 
+      attribute wstring overflow; 
+      attribute wstring padding; 
+      attribute wstring paddingTop; 
+      attribute wstring paddingRight; 
+      attribute wstring paddingBottom; 
+      attribute wstring paddingLeft; 
+      attribute wstring page; 
+      attribute wstring pageBreakAfter; 
+      attribute wstring pageBreakBefore; 
+      attribute wstring pageBreakInside; 
+      attribute wstring pause; 
+      attribute wstring pauseAfter; 
+      attribute wstring pauseBefore; 
+      attribute wstring pitch; 
+      attribute wstring pitchRange; 
+      attribute wstring playDuring; 
+      attribute wstring position; 
+      attribute wstring quotes; 
+      attribute wstring richness; 
+      attribute wstring right; 
+      attribute wstring size; 
+      attribute wstring speak; 
+      attribute wstring speakHeader; 
+      attribute wstring speakNumeral; 
+      attribute wstring speakPunctuation; 
+      attribute wstring speechRate; 
+      attribute wstring stress; 
+      attribute wstring tableLayout; 
+      attribute wstring textAlign; 
+      attribute wstring textDecoration; 
+      attribute wstring textIndent; 
+      attribute wstring textShadow; 
+      attribute wstring textTransform; 
+      attribute wstring top; 
+      attribute wstring unicodeBidi; 
+      attribute wstring verticalAlign; 
+      attribute wstring visibility; 
+      attribute wstring voiceFamily; 
+      attribute wstring volume; 
+      attribute wstring whiteSpace; 
+      attribute wstring widows; 
+      attribute wstring width; 
+      attribute wstring wordSpacing; 
+      attribute wstring zIndex; 
+
+      /* XXX Kipp was here */
+      attribute wstring opacity; 
+}; 
\ No newline at end of file
diff --git a/mozilla/dom/public/idl/css/CSSFontFaceRule.idl b/mozilla/dom/public/idl/css/CSSFontFaceRule.idl
index 2fd10cc6fbe..cf59efff95a 100644
--- a/mozilla/dom/public/idl/css/CSSFontFaceRule.idl
+++ b/mozilla/dom/public/idl/css/CSSFontFaceRule.idl
@@ -1,5 +1,5 @@
 
-   interface CSSFontFaceRule : CSSStyleRule {
+   interface CSSFontFaceRule : CSSRule {
  /* IID: { 0xa6cf90bb, 0x15b3, 0x11d2, \
    { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } */
 
diff --git a/mozilla/dom/public/idl/css/CSSImportRule.idl b/mozilla/dom/public/idl/css/CSSImportRule.idl
new file mode 100644
index 00000000000..1660b0139d3
--- /dev/null
+++ b/mozilla/dom/public/idl/css/CSSImportRule.idl
@@ -0,0 +1,9 @@
+
+      interface CSSImportRule : CSSRule {	
+ /* IID: { 0xa6cf90cf, 0x15b3, 0x11d2, \
+    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} } */
+
+        attribute wstring href;
+        attribute wstring media;
+        readonly attribute CSSStyleSheet styleSheet;
+      };
diff --git a/mozilla/dom/public/idl/css/CSSMediaRule.idl b/mozilla/dom/public/idl/css/CSSMediaRule.idl
index c6dc66b86c0..b7e644c35ba 100644
--- a/mozilla/dom/public/idl/css/CSSMediaRule.idl
+++ b/mozilla/dom/public/idl/css/CSSMediaRule.idl
@@ -1,11 +1,11 @@
 
-   interface CSSMediaRule : CSSStyleRule {	
+   interface CSSMediaRule : CSSRule {	
  /* IID: { 0xa6cf90bc, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } */
 
-     attribute wstring mediaTypes;
-     readonly attribute CSSStyleRuleCollection rules;
+     attribute wstring mediaTypes; 
+     readonly attribute CSSStyleRuleCollection cssRules; 
 
-     unsigned long addRule(in wstring selector, in wstring declaration, in unsigned long index);
-     void removeRule(in unsigned long index);
+     unsigned long insertRule(in wstring rule, in unsigned long index); 
+     void deleteRule(in unsigned long index); 
    };
diff --git a/mozilla/dom/public/idl/css/CSSPageRule.idl b/mozilla/dom/public/idl/css/CSSPageRule.idl
index f0f7af1563c..e6deafb17fd 100644
--- a/mozilla/dom/public/idl/css/CSSPageRule.idl
+++ b/mozilla/dom/public/idl/css/CSSPageRule.idl
@@ -1,8 +1,8 @@
 
-      interface CSSPageRule : CSSStyleRule {	
+      interface CSSPageRule : CSSRule {	
  /* IID: { 0xa6cf90bd, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } */
 
-         attribute wstring selectorText;
-         attribute CSSStyleDeclaration style;
+        attribute wstring name; 
+        attribute CSSStyleDeclaration style; 
       };
diff --git a/mozilla/dom/public/idl/css/CSSRule.idl b/mozilla/dom/public/idl/css/CSSRule.idl
new file mode 100644
index 00000000000..1c0b9739029
--- /dev/null
+++ b/mozilla/dom/public/idl/css/CSSRule.idl
@@ -0,0 +1,17 @@
+
+interface CSSRule { 
+/* IID: { 0xa6cf90c1, 0x15b3, 0x11d2, \
+    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32} } */
+
+     const unsigned short UNKNOWN_RULE = 0; 
+     const unsigned short STYLE_RULE = 1; 
+     const unsigned short IMPORT_RULE = 2; 
+     const unsigned short MEDIA_RULE = 3; 
+     const unsigned short FONT_FACE_RULE = 4; 
+     const unsigned short PAGE_RULE = 5; 
+
+     readonly attribute unsigned short type; 
+     attribute wstring cssText; 
+     readonly attribute CSSStyleSheet sheet; 
+}; 
+
diff --git a/mozilla/dom/public/idl/css/CSSStyleDeclaration.idl b/mozilla/dom/public/idl/css/CSSStyleDeclaration.idl
index 42a02d0f40e..c27c3ac92c3 100644
--- a/mozilla/dom/public/idl/css/CSSStyleDeclaration.idl
+++ b/mozilla/dom/public/idl/css/CSSStyleDeclaration.idl
@@ -3,137 +3,14 @@
  /* IID: { 0xa6cf90be, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } */
 
-      wstring getPropertyValue(in wstring propertyName);
-      wstring getPropertyPriority(in wstring propertyName);
-      void setProperty(in wstring propertyName, in wstring value, in wstring priority);
-      readonly attribute unsigned long length;
-      wstring item(in unsigned long index); /* Returns property name */
+      attribute wstring cssText; 
 
-      attribute wstring azimuth;
-      attribute wstring background;
-      attribute wstring backgroundAttachment;
-      attribute wstring backgroundColor;
-      attribute wstring backgroundImage; 
-      attribute wstring backgroundPosition; 
-      attribute wstring backgroundRepeat; 
-      attribute wstring border; 
-      attribute wstring borderCollapse; 
-      attribute wstring borderColor; 
-      attribute wstring borderSpacing; 
-      attribute wstring borderStyle; 
-      attribute wstring borderTop; 
-      attribute wstring borderRight; 
-      attribute wstring borderBottom; 
-      attribute wstring borderLeft; 
-      attribute wstring borderTopColor;
-      attribute wstring borderRightColor;
-      attribute wstring borderBottomColor;
-      attribute wstring borderLeftColor; 
-      attribute wstring borderTopStyle;
-      attribute wstring borderRightStyle;
-      attribute wstring borderBottomStyle;
-      attribute wstring borderLeftStyle; 
-      attribute wstring borderTopWidth;
-      attribute wstring borderRightWidth;
-      attribute wstring borderBottomWidth;
-      attribute wstring borderLeftWidth; 
-      attribute wstring borderWidth; 
-      attribute wstring bottom; 
-      attribute wstring captionSide; 
-      attribute wstring clear; 
-      attribute wstring clip; 
-      attribute wstring color; 
-      attribute wstring content; 
-      attribute wstring counterIncrement; 
-      attribute wstring counterReset; 
-      attribute wstring cue; 
-      attribute wstring cueAfter; 
-      attribute wstring cueBefore; 
-      attribute wstring cursor; 
-      attribute wstring direction; 
-      attribute wstring display; 
-      attribute wstring elevation; 
-      attribute wstring emptyCells; 
-      attribute wstring styleFloat; 
-      attribute wstring font; 
-      attribute wstring fontFamily; 
-      attribute wstring fontSize; 
-      attribute wstring fontSizeAdjust; 
-      attribute wstring fontStretch; 
-      attribute wstring fontStyle; 
-      attribute wstring fontVariant; 
-      attribute wstring fontWeight; 
-      attribute wstring height; 
-      attribute wstring left; 
-      attribute wstring letterSpacing; 
-      attribute wstring lineHeight; 
-      attribute wstring listStyle; 
-      attribute wstring listStyleImage; 
-      attribute wstring listStylePosition; 
-      attribute wstring listStyleType; 
-      attribute wstring margin; 
-      attribute wstring marginTop;
-      attribute wstring marginRight;
-      attribute wstring marginBottom;
-      attribute wstring marginLeft; 
-      attribute wstring markerOffset; 
-      attribute wstring marks; 
-      attribute wstring maxHeight; 
-      attribute wstring maxWidth; 
-      attribute wstring minHeight; 
-      attribute wstring minWidth; 
-      attribute wstring orphans; 
-      attribute wstring outline; 
-      attribute wstring outlineColor; 
-      attribute wstring outlineStyle; 
-      attribute wstring outlineWidth; 
-      attribute wstring overflow; 
-      attribute wstring padding; 
-      attribute wstring paddingTop;
-      attribute wstring paddingRight;
-      attribute wstring paddingBottom;
-      attribute wstring paddingLeft; 
-      attribute wstring page; 
-      attribute wstring pageBreakAfter; 
-      attribute wstring pageBreakBefore; 
-      attribute wstring pageBreakInside; 
-      attribute wstring pause; 
-      attribute wstring pauseAfter; 
-      attribute wstring pauseBefore; 
-      attribute wstring pitch; 
-      attribute wstring pitchRange; 
-      attribute wstring playDuring; 
-      attribute wstring position; 
-      attribute wstring quotes; 
-      attribute wstring richness; 
-      attribute wstring right; 
-      attribute wstring size; 
-      attribute wstring speak; 
-      attribute wstring speakHeader; 
-      attribute wstring speakNumeral; 
-      attribute wstring speakPunctuation; 
-      attribute wstring speechRate; 
-      attribute wstring stress; 
-      attribute wstring tableLayout; 
-      attribute wstring textAlign; 
-      attribute wstring textDecoration; 
-      attribute wstring textIndent; 
-      attribute wstring textShadow; 
-      attribute wstring textTransform; 
-      attribute wstring top; 
-      attribute wstring unicodeBidi; 
-      attribute wstring verticalAlign; 
-      attribute wstring visibility; 
-      attribute wstring voiceFamily; 
-      attribute wstring volume; 
-      attribute wstring whiteSpace; 
-      attribute wstring widows; 
-      attribute wstring width; 
-      attribute wstring wordSpacing; 
-      attribute wstring zIndex;       
-
-      /* XXX: kipp was here */
-      attribute wstring opacity;       
+      wstring getPropertyValue(in wstring propertyName); 
+      wstring getPropertyPriority(in wstring propertyName); 
+      void setProperty(in wstring propertyName, in wstring value, in wstring 
+priority); 
+      readonly attribute unsigned long length; 
+      wstring item(in unsigned long index); /* Returns property name */ 
     };
 
 
diff --git a/mozilla/dom/public/idl/css/CSSStyleRule.idl b/mozilla/dom/public/idl/css/CSSStyleRule.idl
index 24c8c3451c9..ba048bd4454 100644
--- a/mozilla/dom/public/idl/css/CSSStyleRule.idl
+++ b/mozilla/dom/public/idl/css/CSSStyleRule.idl
@@ -1,7 +1,8 @@
 
-   interface CSSStyleRule {
+   interface CSSStyleRule : CSSRule {
  /* IID: { 0xa6cf90bf, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } */
 
-     readonly attribute wstring type;
+     attribute wstring selectorText; 
+     attribute CSSStyleDeclaration style; 
    };
diff --git a/mozilla/dom/public/idl/css/CSSStyleRuleSimple.idl b/mozilla/dom/public/idl/css/CSSStyleRuleSimple.idl
deleted file mode 100644
index 6f86b70f67d..00000000000
--- a/mozilla/dom/public/idl/css/CSSStyleRuleSimple.idl
+++ /dev/null
@@ -1,8 +0,0 @@
-
-   interface CSSStyleRuleSimple : CSSStyleRule {
- /* IID: { 0xa6cf90c1, 0x15b3, 0x11d2, \
-  { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } */
-
-     attribute wstring selectorText;
-     readonly attribute CSSStyleDeclaration style;
-   };
diff --git a/mozilla/dom/public/idl/css/CSSStyleSheet.idl b/mozilla/dom/public/idl/css/CSSStyleSheet.idl
index 30b74888f38..e5eceb5f3d6 100644
--- a/mozilla/dom/public/idl/css/CSSStyleSheet.idl
+++ b/mozilla/dom/public/idl/css/CSSStyleSheet.idl
@@ -3,17 +3,15 @@
  /* IID: { 0xa6cf90c2, 0x15b3, 0x11d2, \
   { 0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } */
 
-      readonly attribute HTMLElement owningElement;
-      readonly attribute CSSStyleSheet parentStyleSheet;
-      readonly attribute wstring href;
-      readonly attribute wstring title;
+      readonly attribute Node owningNode; 
+      readonly attribute StyleSheet parentStyleSheet; 
+      readonly attribute wstring href; 
+      readonly attribute wstring title; 
+      readonly attribute wstring media; 
 
-      readonly attribute StyleSheetCollection imports;
-      readonly attribute CSSStyleRuleCollection rules;
+      readonly attribute CSSStyleRuleCollection cssRules; 
 
-      unsigned long addRule(in wstring selector, in wstring declaration, in unsigned long index);
-      unsigned long addImport(in wstring url, in unsigned long index);
-      void removeRule(in unsigned long index);
-      void removeImport(in unsigned long index);
+      unsigned long insertRule(in wstring rule, in unsigned long index); 
+      void deleteRule(in unsigned long index); 
     };
 
diff --git a/mozilla/dom/public/idl/css/CSSUnknownRule.idl b/mozilla/dom/public/idl/css/CSSUnknownRule.idl
new file mode 100644
index 00000000000..c68453b15e3
--- /dev/null
+++ b/mozilla/dom/public/idl/css/CSSUnknownRule.idl
@@ -0,0 +1,6 @@
+
+      interface CSSUnknownRule : CSSRule {	
+ /* IID: { 0xa6cf90d0, 0x15b3, 0x11d2, \
+    {0x93, 0x2e, 0x00, 0x80, 0x5f, 0x8a, 0xdd, 0x32 } } */
+
+      };
diff --git a/mozilla/dom/public/idl/css/makefile.win b/mozilla/dom/public/idl/css/makefile.win
index 8ddf7a3636b..df8a21c9b8a 100644
--- a/mozilla/dom/public/idl/css/makefile.win
+++ b/mozilla/dom/public/idl/css/makefile.win
@@ -21,14 +21,17 @@ IGNORE_MANIFEST=1
 MODULE=raptor 
 
 IDLSRCS =  \
+  CSS2Properties.idl \
 	CSSFontFaceRule.idl \
+  CSSImportRule.idl \
 	CSSMediaRule.idl \
 	CSSPageRule.idl \
+	CSSRule.idl \
 	CSSStyleDeclaration.idl \
 	CSSStyleRule.idl \
 	CSSStyleRuleCollection.idl \
-	CSSStyleRuleSimple.idl \
-	CSSStyleSheet.idl
+	CSSStyleSheet.idl \
+  CSSUnknownRule.idl
 
 XPCOM_DESTDIR=$(DEPTH)\dom\public\css
 JSSTUB_DESTDIR=$(DEPTH)\dom\src\css
diff --git a/mozilla/dom/src/build/nsDOMFactory.cpp b/mozilla/dom/src/build/nsDOMFactory.cpp
index c9f6535605e..e07d4c2fd1e 100644
--- a/mozilla/dom/src/build/nsDOMFactory.cpp
+++ b/mozilla/dom/src/build/nsDOMFactory.cpp
@@ -101,9 +101,9 @@
 #include "nsIDOMNavigator.h"
 #include "nsIDOMLocation.h"
 #include "nsIDOMStyleSheetCollection.h"
-#include "nsIDOMCSSStyleDeclaration.h"
+#include "nsIDOMCSS2Properties.h"
 #include "nsIDOMCSSStyleSheet.h"
-#include "nsIDOMCSSStyleRuleSimple.h"
+#include "nsIDOMCSSStyleRule.h"
 #include "nsIDOMCSSStyleRuleCollection.h"
 #include "plhash.h"
 
@@ -687,10 +687,10 @@ void XXXDomNeverCalled()
   NS_NewScriptNavigator(0, 0, 0, 0);
   NS_NewScriptLocation(0, 0, 0, 0);
   NS_NewScriptEventListener(0, 0, 0);
-  NS_NewScriptCSSStyleDeclaration(0, 0, 0, 0);
+  NS_NewScriptCSS2Properties(0, 0, 0, 0);
   NS_NewScriptCSSStyleSheet(0, 0, 0, 0);
-  NS_NewScriptCSSStyleRuleSimple(0, 0, 0, 0);
   NS_NewScriptStyleSheetCollection(0, 0, 0, 0);
+  NS_NewScriptCSSStyleRule(0, 0, 0, 0);
   NS_NewScriptCSSStyleRuleCollection(0, 0, 0, 0);
   NET_InitJavaScriptProtocol();
 }
diff --git a/mozilla/dom/src/coreDOM/nsJSElement.cpp b/mozilla/dom/src/coreDOM/nsJSElement.cpp
index 3b918d549b3..950fb9c8096 100644
--- a/mozilla/dom/src/coreDOM/nsJSElement.cpp
+++ b/mozilla/dom/src/coreDOM/nsJSElement.cpp
@@ -662,8 +662,8 @@ static JSPropertySpec ElementProperties[] =
 //
 static JSFunctionSpec ElementMethods[] = 
 {
-  {"getAttribute",          ElementGetDOMAttribute,     1},
-  {"setAttribute",          ElementSetDOMAttribute,     2},
+  {"getDOMAttribute",          ElementGetDOMAttribute,     1},
+  {"setDOMAttribute",          ElementSetDOMAttribute,     2},
   {"removeAttribute",          ElementRemoveAttribute,     1},
   {"getAttributeNode",          ElementGetAttributeNode,     1},
   {"setAttributeNode",          ElementSetAttributeNode,     1},
diff --git a/mozilla/dom/src/coreDOM/nsJSStyleSheet.cpp b/mozilla/dom/src/coreDOM/nsJSStyleSheet.cpp
index 55e4dc0c1ff..91709c5a22e 100644
--- a/mozilla/dom/src/coreDOM/nsJSStyleSheet.cpp
+++ b/mozilla/dom/src/coreDOM/nsJSStyleSheet.cpp
@@ -39,8 +39,9 @@ NS_DEF_PTR(nsIDOMStyleSheet);
 // StyleSheet property ids
 //
 enum StyleSheet_slots {
-  STYLESHEET_DISABLED = -1,
-  STYLESHEET_READONLY = -2
+  STYLESHEET_TYPE = -1,
+  STYLESHEET_DISABLED = -2,
+  STYLESHEET_READONLY = -3
 };
 
 /***********************************************************************/
@@ -59,6 +60,19 @@ GetStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
 
   if (JSVAL_IS_INT(id)) {
     switch(JSVAL_TO_INT(id)) {
+      case STYLESHEET_TYPE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetType(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
       case STYLESHEET_DISABLED:
       {
         PRBool prop;
@@ -248,6 +262,7 @@ JSClass StyleSheetClass = {
 //
 static JSPropertySpec StyleSheetProperties[] =
 {
+  {"type",    STYLESHEET_TYPE,    JSPROP_ENUMERATE | JSPROP_READONLY},
   {"disabled",    STYLESHEET_DISABLED,    JSPROP_ENUMERATE},
   {"readOnly",    STYLESHEET_READONLY,    JSPROP_ENUMERATE | JSPROP_READONLY},
   {0}
diff --git a/mozilla/dom/src/css/Makefile.in b/mozilla/dom/src/css/Makefile.in
index 835f6a70407..44aa5d399a5 100644
--- a/mozilla/dom/src/css/Makefile.in
+++ b/mozilla/dom/src/css/Makefile.in
@@ -25,16 +25,20 @@ include $(DEPTH)/config/autoconf.mk
 LIBRARY_NAME = jsdomcss_s
 
 CPPSRCS =				\
-	nsJSCSSFontFaceRule.cpp		\
-	nsJSCSSMediaRule.cpp		\
-	nsJSCSSPageRule.cpp		\
-	nsJSCSSStyleDeclaration.cpp	\
-	nsJSCSSStyleRule.cpp		\
-	nsJSCSSStyleRuleCollection.cpp	\
-	nsJSCSSStyleRuleSimple.cpp	\
-	nsJSCSSStyleSheet.cpp		\
+  nsJSCSS2Properties.cpp  \
+  nsJSCSSFontFaceRule.cpp \
+  nsJSCSSImportRule.cpp \
+  nsJSCSSMediaRule.cpp  \
+  nsJSCSSPageRule.cpp \
+  nsJSCSSRule.cpp \
+  nsJSCSSStyleDeclaration.cpp \
+  nsJSCSSStyleRule.cpp  \
+  nsJSCSSStyleRuleCollection.cpp  \
+  nsJSCSSStyleSheet.cpp \
+  nsJSCSSUnknownRule.cpp  \
 	$(NULL)
 
+
 DEFINES += -D_IMPL_NS_DOM
 
 MODULE = raptor
diff --git a/mozilla/dom/src/css/makefile.win b/mozilla/dom/src/css/makefile.win
index 04ee20c6a89..04ce5688440 100644
--- a/mozilla/dom/src/css/makefile.win
+++ b/mozilla/dom/src/css/makefile.win
@@ -10,27 +10,34 @@ REQUIRES=xpcom raptor js netlib
 DEFINES=-D_IMPL_NS_DOM -DWIN32_LEAN_AND_MEAN
 
 CPPSRCS =				\
-	nsJSCSSFontFaceRule.cpp		\
-	nsJSCSSMediaRule.cpp		\
-	nsJSCSSPageRule.cpp		\
-	nsJSCSSStyleDeclaration.cpp	\
-	nsJSCSSStyleRule.cpp		\
-	nsJSCSSStyleRuleCollection.cpp	\
-	nsJSCSSStyleRuleSimple.cpp	\
-	nsJSCSSStyleSheet.cpp		\
+  nsJSCSS2Properties.cpp \
+  nsJSCSSFontFaceRule.cpp \
+  nsJSCSSImportRule.cpp \
+  nsJSCSSMediaRule.cpp \
+  nsJSCSSPageRule.cpp \
+  nsJSCSSRule.cpp \
+  nsJSCSSStyleDeclaration.cpp \
+  nsJSCSSStyleRule.cpp \
+  nsJSCSSStyleRuleCollection.cpp  \
+  nsJSCSSStyleSheet.cpp \
+  nsJSCSSUnknownRule.cpp \
 	$(NULL)
 
 CPP_OBJS=						\
-	.\$(OBJDIR)\nsJSCSSFontFaceRule.obj		\
-	.\$(OBJDIR)\nsJSCSSMediaRule.obj		\
-	.\$(OBJDIR)\nsJSCSSPageRule.obj			\
-	.\$(OBJDIR)\nsJSCSSStyleDeclaration.obj		\
-	.\$(OBJDIR)\nsJSCSSStyleRule.obj		\
-	.\$(OBJDIR)\nsJSCSSStyleRuleCollection.obj	\
-	.\$(OBJDIR)\nsJSCSSStyleRuleSimple.obj		\
-	.\$(OBJDIR)\nsJSCSSStyleSheet.obj		\
+  .\$(OBJDIR)\nsJSCSS2Properties.obj \
+  .\$(OBJDIR)\nsJSCSSFontFaceRule.obj \
+  .\$(OBJDIR)\nsJSCSSImportRule.obj \
+  .\$(OBJDIR)\nsJSCSSMediaRule.obj \
+  .\$(OBJDIR)\nsJSCSSPageRule.obj \
+  .\$(OBJDIR)\nsJSCSSRule.obj \
+  .\$(OBJDIR)\nsJSCSSStyleDeclaration.obj \
+  .\$(OBJDIR)\nsJSCSSStyleRule.obj \
+  .\$(OBJDIR)\nsJSCSSStyleRuleCollection.obj \
+  .\$(OBJDIR)\nsJSCSSStyleSheet.obj \
+  .\$(OBJDIR)\nsJSCSSUnknownRule.obj \
 	$(NULL)
 
+
 LINCS=-I$(XPDIST)\public\xpcom -I$(XPDIST)\public\raptor \
 	-I$(XPDIST)\public\dom -I$(XPDIST)\public\js -I$(PUBLIC)\netlib
 
diff --git a/mozilla/dom/src/css/nsJSCSS2Properties.cpp b/mozilla/dom/src/css/nsJSCSS2Properties.cpp
new file mode 100644
index 00000000000..0e1639c1f7d
--- /dev/null
+++ b/mozilla/dom/src/css/nsJSCSS2Properties.cpp
@@ -0,0 +1,4022 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#include "jsapi.h"
+#include "nscore.h"
+#include "nsIScriptContext.h"
+#include "nsIJSScriptObject.h"
+#include "nsIScriptObjectOwner.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIPtr.h"
+#include "nsString.h"
+#include "nsIDOMCSS2Properties.h"
+
+
+static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
+static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
+static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
+static NS_DEFINE_IID(kICSS2PropertiesIID, NS_IDOMCSS2PROPERTIES_IID);
+
+NS_DEF_PTR(nsIDOMCSS2Properties);
+
+//
+// CSS2Properties property ids
+//
+enum CSS2Properties_slots {
+  CSS2PROPERTIES_AZIMUTH = -1,
+  CSS2PROPERTIES_BACKGROUND = -2,
+  CSS2PROPERTIES_BACKGROUNDATTACHMENT = -3,
+  CSS2PROPERTIES_BACKGROUNDCOLOR = -4,
+  CSS2PROPERTIES_BACKGROUNDIMAGE = -5,
+  CSS2PROPERTIES_BACKGROUNDPOSITION = -6,
+  CSS2PROPERTIES_BACKGROUNDREPEAT = -7,
+  CSS2PROPERTIES_BORDER = -8,
+  CSS2PROPERTIES_BORDERCOLLAPSE = -9,
+  CSS2PROPERTIES_BORDERCOLOR = -10,
+  CSS2PROPERTIES_BORDERSPACING = -11,
+  CSS2PROPERTIES_BORDERSTYLE = -12,
+  CSS2PROPERTIES_BORDERTOP = -13,
+  CSS2PROPERTIES_BORDERRIGHT = -14,
+  CSS2PROPERTIES_BORDERBOTTOM = -15,
+  CSS2PROPERTIES_BORDERLEFT = -16,
+  CSS2PROPERTIES_BORDERTOPCOLOR = -17,
+  CSS2PROPERTIES_BORDERRIGHTCOLOR = -18,
+  CSS2PROPERTIES_BORDERBOTTOMCOLOR = -19,
+  CSS2PROPERTIES_BORDERLEFTCOLOR = -20,
+  CSS2PROPERTIES_BORDERTOPSTYLE = -21,
+  CSS2PROPERTIES_BORDERRIGHTSTYLE = -22,
+  CSS2PROPERTIES_BORDERBOTTOMSTYLE = -23,
+  CSS2PROPERTIES_BORDERLEFTSTYLE = -24,
+  CSS2PROPERTIES_BORDERTOPWIDTH = -25,
+  CSS2PROPERTIES_BORDERRIGHTWIDTH = -26,
+  CSS2PROPERTIES_BORDERBOTTOMWIDTH = -27,
+  CSS2PROPERTIES_BORDERLEFTWIDTH = -28,
+  CSS2PROPERTIES_BORDERWIDTH = -29,
+  CSS2PROPERTIES_BOTTOM = -30,
+  CSS2PROPERTIES_CAPTIONSIDE = -31,
+  CSS2PROPERTIES_CLEAR = -32,
+  CSS2PROPERTIES_CLIP = -33,
+  CSS2PROPERTIES_COLOR = -34,
+  CSS2PROPERTIES_CONTENT = -35,
+  CSS2PROPERTIES_COUNTERINCREMENT = -36,
+  CSS2PROPERTIES_COUNTERRESET = -37,
+  CSS2PROPERTIES_CUE = -38,
+  CSS2PROPERTIES_CUEAFTER = -39,
+  CSS2PROPERTIES_CUEBEFORE = -40,
+  CSS2PROPERTIES_CURSOR = -41,
+  CSS2PROPERTIES_DIRECTION = -42,
+  CSS2PROPERTIES_DISPLAY = -43,
+  CSS2PROPERTIES_ELEVATION = -44,
+  CSS2PROPERTIES_EMPTYCELLS = -45,
+  CSS2PROPERTIES_CSSFLOAT = -46,
+  CSS2PROPERTIES_FONT = -47,
+  CSS2PROPERTIES_FONTFAMILY = -48,
+  CSS2PROPERTIES_FONTSIZE = -49,
+  CSS2PROPERTIES_FONTSIZEADJUST = -50,
+  CSS2PROPERTIES_FONTSTRETCH = -51,
+  CSS2PROPERTIES_FONTSTYLE = -52,
+  CSS2PROPERTIES_FONTVARIANT = -53,
+  CSS2PROPERTIES_FONTWEIGHT = -54,
+  CSS2PROPERTIES_HEIGHT = -55,
+  CSS2PROPERTIES_LEFT = -56,
+  CSS2PROPERTIES_LETTERSPACING = -57,
+  CSS2PROPERTIES_LINEHEIGHT = -58,
+  CSS2PROPERTIES_LISTSTYLE = -59,
+  CSS2PROPERTIES_LISTSTYLEIMAGE = -60,
+  CSS2PROPERTIES_LISTSTYLEPOSITION = -61,
+  CSS2PROPERTIES_LISTSTYLETYPE = -62,
+  CSS2PROPERTIES_MARGIN = -63,
+  CSS2PROPERTIES_MARGINTOP = -64,
+  CSS2PROPERTIES_MARGINRIGHT = -65,
+  CSS2PROPERTIES_MARGINBOTTOM = -66,
+  CSS2PROPERTIES_MARGINLEFT = -67,
+  CSS2PROPERTIES_MARKEROFFSET = -68,
+  CSS2PROPERTIES_MARKS = -69,
+  CSS2PROPERTIES_MAXHEIGHT = -70,
+  CSS2PROPERTIES_MAXWIDTH = -71,
+  CSS2PROPERTIES_MINHEIGHT = -72,
+  CSS2PROPERTIES_MINWIDTH = -73,
+  CSS2PROPERTIES_ORPHANS = -74,
+  CSS2PROPERTIES_OUTLINE = -75,
+  CSS2PROPERTIES_OUTLINECOLOR = -76,
+  CSS2PROPERTIES_OUTLINESTYLE = -77,
+  CSS2PROPERTIES_OUTLINEWIDTH = -78,
+  CSS2PROPERTIES_OVERFLOW = -79,
+  CSS2PROPERTIES_PADDING = -80,
+  CSS2PROPERTIES_PADDINGTOP = -81,
+  CSS2PROPERTIES_PADDINGRIGHT = -82,
+  CSS2PROPERTIES_PADDINGBOTTOM = -83,
+  CSS2PROPERTIES_PADDINGLEFT = -84,
+  CSS2PROPERTIES_PAGE = -85,
+  CSS2PROPERTIES_PAGEBREAKAFTER = -86,
+  CSS2PROPERTIES_PAGEBREAKBEFORE = -87,
+  CSS2PROPERTIES_PAGEBREAKINSIDE = -88,
+  CSS2PROPERTIES_PAUSE = -89,
+  CSS2PROPERTIES_PAUSEAFTER = -90,
+  CSS2PROPERTIES_PAUSEBEFORE = -91,
+  CSS2PROPERTIES_PITCH = -92,
+  CSS2PROPERTIES_PITCHRANGE = -93,
+  CSS2PROPERTIES_PLAYDURING = -94,
+  CSS2PROPERTIES_POSITION = -95,
+  CSS2PROPERTIES_QUOTES = -96,
+  CSS2PROPERTIES_RICHNESS = -97,
+  CSS2PROPERTIES_RIGHT = -98,
+  CSS2PROPERTIES_SIZE = -99,
+  CSS2PROPERTIES_SPEAK = -100,
+  CSS2PROPERTIES_SPEAKHEADER = -101,
+  CSS2PROPERTIES_SPEAKNUMERAL = -102,
+  CSS2PROPERTIES_SPEAKPUNCTUATION = -103,
+  CSS2PROPERTIES_SPEECHRATE = -104,
+  CSS2PROPERTIES_STRESS = -105,
+  CSS2PROPERTIES_TABLELAYOUT = -106,
+  CSS2PROPERTIES_TEXTALIGN = -107,
+  CSS2PROPERTIES_TEXTDECORATION = -108,
+  CSS2PROPERTIES_TEXTINDENT = -109,
+  CSS2PROPERTIES_TEXTSHADOW = -110,
+  CSS2PROPERTIES_TEXTTRANSFORM = -111,
+  CSS2PROPERTIES_TOP = -112,
+  CSS2PROPERTIES_UNICODEBIDI = -113,
+  CSS2PROPERTIES_VERTICALALIGN = -114,
+  CSS2PROPERTIES_VISIBILITY = -115,
+  CSS2PROPERTIES_VOICEFAMILY = -116,
+  CSS2PROPERTIES_VOLUME = -117,
+  CSS2PROPERTIES_WHITESPACE = -118,
+  CSS2PROPERTIES_WIDOWS = -119,
+  CSS2PROPERTIES_WIDTH = -120,
+  CSS2PROPERTIES_WORDSPACING = -121,
+  CSS2PROPERTIES_ZINDEX = -122,
+  CSS2PROPERTIES_OPACITY = -123
+};
+
+/***********************************************************************/
+//
+// CSS2Properties Properties Getter
+//
+PR_STATIC_CALLBACK(JSBool)
+GetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMCSS2Properties *a = (nsIDOMCSS2Properties*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case CSS2PROPERTIES_AZIMUTH:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetAzimuth(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BACKGROUND:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBackground(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BACKGROUNDATTACHMENT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBackgroundAttachment(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BACKGROUNDCOLOR:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBackgroundColor(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BACKGROUNDIMAGE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBackgroundImage(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BACKGROUNDPOSITION:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBackgroundPosition(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BACKGROUNDREPEAT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBackgroundRepeat(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BORDER:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBorder(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BORDERCOLLAPSE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBorderCollapse(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BORDERCOLOR:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBorderColor(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BORDERSPACING:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBorderSpacing(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BORDERSTYLE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBorderStyle(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BORDERTOP:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBorderTop(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BORDERRIGHT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBorderRight(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BORDERBOTTOM:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBorderBottom(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BORDERLEFT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBorderLeft(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BORDERTOPCOLOR:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBorderTopColor(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BORDERRIGHTCOLOR:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBorderRightColor(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BORDERBOTTOMCOLOR:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBorderBottomColor(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BORDERLEFTCOLOR:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBorderLeftColor(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BORDERTOPSTYLE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBorderTopStyle(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BORDERRIGHTSTYLE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBorderRightStyle(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BORDERBOTTOMSTYLE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBorderBottomStyle(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BORDERLEFTSTYLE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBorderLeftStyle(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BORDERTOPWIDTH:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBorderTopWidth(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BORDERRIGHTWIDTH:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBorderRightWidth(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BORDERBOTTOMWIDTH:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBorderBottomWidth(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BORDERLEFTWIDTH:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBorderLeftWidth(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BORDERWIDTH:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBorderWidth(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_BOTTOM:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetBottom(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_CAPTIONSIDE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetCaptionSide(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_CLEAR:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetClear(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_CLIP:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetClip(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_COLOR:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetColor(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_CONTENT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetContent(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_COUNTERINCREMENT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetCounterIncrement(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_COUNTERRESET:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetCounterReset(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_CUE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetCue(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_CUEAFTER:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetCueAfter(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_CUEBEFORE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetCueBefore(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_CURSOR:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetCursor(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_DIRECTION:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetDirection(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_DISPLAY:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetDisplay(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_ELEVATION:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetElevation(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_EMPTYCELLS:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetEmptyCells(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_CSSFLOAT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetCssFloat(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_FONT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetFont(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_FONTFAMILY:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetFontFamily(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_FONTSIZE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetFontSize(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_FONTSIZEADJUST:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetFontSizeAdjust(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_FONTSTRETCH:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetFontStretch(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_FONTSTYLE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetFontStyle(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_FONTVARIANT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetFontVariant(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_FONTWEIGHT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetFontWeight(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_HEIGHT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetHeight(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_LEFT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetLeft(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_LETTERSPACING:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetLetterSpacing(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_LINEHEIGHT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetLineHeight(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_LISTSTYLE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetListStyle(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_LISTSTYLEIMAGE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetListStyleImage(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_LISTSTYLEPOSITION:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetListStylePosition(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_LISTSTYLETYPE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetListStyleType(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_MARGIN:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetMargin(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_MARGINTOP:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetMarginTop(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_MARGINRIGHT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetMarginRight(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_MARGINBOTTOM:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetMarginBottom(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_MARGINLEFT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetMarginLeft(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_MARKEROFFSET:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetMarkerOffset(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_MARKS:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetMarks(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_MAXHEIGHT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetMaxHeight(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_MAXWIDTH:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetMaxWidth(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_MINHEIGHT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetMinHeight(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_MINWIDTH:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetMinWidth(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_ORPHANS:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetOrphans(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_OUTLINE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetOutline(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_OUTLINECOLOR:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetOutlineColor(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_OUTLINESTYLE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetOutlineStyle(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_OUTLINEWIDTH:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetOutlineWidth(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_OVERFLOW:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetOverflow(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_PADDING:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetPadding(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_PADDINGTOP:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetPaddingTop(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_PADDINGRIGHT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetPaddingRight(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_PADDINGBOTTOM:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetPaddingBottom(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_PADDINGLEFT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetPaddingLeft(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_PAGE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetPage(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_PAGEBREAKAFTER:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetPageBreakAfter(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_PAGEBREAKBEFORE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetPageBreakBefore(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_PAGEBREAKINSIDE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetPageBreakInside(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_PAUSE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetPause(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_PAUSEAFTER:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetPauseAfter(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_PAUSEBEFORE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetPauseBefore(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_PITCH:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetPitch(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_PITCHRANGE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetPitchRange(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_PLAYDURING:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetPlayDuring(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_POSITION:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetPosition(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_QUOTES:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetQuotes(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_RICHNESS:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetRichness(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_RIGHT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetRight(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_SIZE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetSize(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_SPEAK:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetSpeak(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_SPEAKHEADER:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetSpeakHeader(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_SPEAKNUMERAL:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetSpeakNumeral(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_SPEAKPUNCTUATION:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetSpeakPunctuation(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_SPEECHRATE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetSpeechRate(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_STRESS:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetStress(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_TABLELAYOUT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetTableLayout(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_TEXTALIGN:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetTextAlign(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_TEXTDECORATION:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetTextDecoration(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_TEXTINDENT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetTextIndent(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_TEXTSHADOW:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetTextShadow(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_TEXTTRANSFORM:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetTextTransform(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_TOP:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetTop(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_UNICODEBIDI:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetUnicodeBidi(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_VERTICALALIGN:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetVerticalAlign(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_VISIBILITY:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetVisibility(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_VOICEFAMILY:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetVoiceFamily(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_VOLUME:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetVolume(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_WHITESPACE:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetWhiteSpace(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_WIDOWS:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetWidows(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_WIDTH:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetWidth(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_WORDSPACING:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetWordSpacing(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_ZINDEX:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetZIndex(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSS2PROPERTIES_OPACITY:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetOpacity(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      default:
+      {
+        nsIJSScriptObject *object;
+        if (NS_OK == a->QueryInterface(kIJSScriptObjectIID, (void**)&object)) {
+          PRBool rval;
+          rval =  object->GetProperty(cx, id, vp);
+          NS_RELEASE(object);
+          return rval;
+        }
+      }
+    }
+  }
+  else {
+    nsIJSScriptObject *object;
+    if (NS_OK == a->QueryInterface(kIJSScriptObjectIID, (void**)&object)) {
+      PRBool rval;
+      rval =  object->GetProperty(cx, id, vp);
+      NS_RELEASE(object);
+      return rval;
+    }
+  }
+
+  return PR_TRUE;
+}
+
+/***********************************************************************/
+//
+// CSS2Properties Properties Setter
+//
+PR_STATIC_CALLBACK(JSBool)
+SetCSS2PropertiesProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMCSS2Properties *a = (nsIDOMCSS2Properties*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case CSS2PROPERTIES_AZIMUTH:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetAzimuth(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BACKGROUND:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBackground(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BACKGROUNDATTACHMENT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBackgroundAttachment(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BACKGROUNDCOLOR:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBackgroundColor(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BACKGROUNDIMAGE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBackgroundImage(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BACKGROUNDPOSITION:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBackgroundPosition(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BACKGROUNDREPEAT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBackgroundRepeat(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BORDER:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBorder(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BORDERCOLLAPSE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBorderCollapse(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BORDERCOLOR:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBorderColor(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BORDERSPACING:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBorderSpacing(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BORDERSTYLE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBorderStyle(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BORDERTOP:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBorderTop(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BORDERRIGHT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBorderRight(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BORDERBOTTOM:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBorderBottom(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BORDERLEFT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBorderLeft(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BORDERTOPCOLOR:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBorderTopColor(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BORDERRIGHTCOLOR:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBorderRightColor(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BORDERBOTTOMCOLOR:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBorderBottomColor(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BORDERLEFTCOLOR:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBorderLeftColor(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BORDERTOPSTYLE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBorderTopStyle(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BORDERRIGHTSTYLE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBorderRightStyle(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BORDERBOTTOMSTYLE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBorderBottomStyle(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BORDERLEFTSTYLE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBorderLeftStyle(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BORDERTOPWIDTH:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBorderTopWidth(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BORDERRIGHTWIDTH:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBorderRightWidth(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BORDERBOTTOMWIDTH:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBorderBottomWidth(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BORDERLEFTWIDTH:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBorderLeftWidth(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BORDERWIDTH:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBorderWidth(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_BOTTOM:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetBottom(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_CAPTIONSIDE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetCaptionSide(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_CLEAR:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetClear(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_CLIP:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetClip(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_COLOR:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetColor(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_CONTENT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetContent(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_COUNTERINCREMENT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetCounterIncrement(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_COUNTERRESET:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetCounterReset(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_CUE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetCue(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_CUEAFTER:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetCueAfter(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_CUEBEFORE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetCueBefore(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_CURSOR:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetCursor(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_DIRECTION:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetDirection(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_DISPLAY:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetDisplay(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_ELEVATION:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetElevation(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_EMPTYCELLS:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetEmptyCells(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_CSSFLOAT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetCssFloat(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_FONT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetFont(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_FONTFAMILY:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetFontFamily(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_FONTSIZE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetFontSize(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_FONTSIZEADJUST:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetFontSizeAdjust(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_FONTSTRETCH:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetFontStretch(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_FONTSTYLE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetFontStyle(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_FONTVARIANT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetFontVariant(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_FONTWEIGHT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetFontWeight(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_HEIGHT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetHeight(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_LEFT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetLeft(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_LETTERSPACING:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetLetterSpacing(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_LINEHEIGHT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetLineHeight(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_LISTSTYLE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetListStyle(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_LISTSTYLEIMAGE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetListStyleImage(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_LISTSTYLEPOSITION:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetListStylePosition(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_LISTSTYLETYPE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetListStyleType(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_MARGIN:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetMargin(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_MARGINTOP:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetMarginTop(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_MARGINRIGHT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetMarginRight(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_MARGINBOTTOM:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetMarginBottom(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_MARGINLEFT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetMarginLeft(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_MARKEROFFSET:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetMarkerOffset(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_MARKS:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetMarks(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_MAXHEIGHT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetMaxHeight(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_MAXWIDTH:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetMaxWidth(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_MINHEIGHT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetMinHeight(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_MINWIDTH:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetMinWidth(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_ORPHANS:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetOrphans(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_OUTLINE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetOutline(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_OUTLINECOLOR:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetOutlineColor(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_OUTLINESTYLE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetOutlineStyle(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_OUTLINEWIDTH:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetOutlineWidth(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_OVERFLOW:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetOverflow(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_PADDING:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetPadding(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_PADDINGTOP:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetPaddingTop(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_PADDINGRIGHT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetPaddingRight(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_PADDINGBOTTOM:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetPaddingBottom(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_PADDINGLEFT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetPaddingLeft(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_PAGE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetPage(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_PAGEBREAKAFTER:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetPageBreakAfter(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_PAGEBREAKBEFORE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetPageBreakBefore(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_PAGEBREAKINSIDE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetPageBreakInside(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_PAUSE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetPause(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_PAUSEAFTER:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetPauseAfter(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_PAUSEBEFORE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetPauseBefore(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_PITCH:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetPitch(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_PITCHRANGE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetPitchRange(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_PLAYDURING:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetPlayDuring(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_POSITION:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetPosition(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_QUOTES:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetQuotes(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_RICHNESS:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetRichness(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_RIGHT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetRight(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_SIZE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetSize(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_SPEAK:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetSpeak(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_SPEAKHEADER:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetSpeakHeader(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_SPEAKNUMERAL:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetSpeakNumeral(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_SPEAKPUNCTUATION:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetSpeakPunctuation(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_SPEECHRATE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetSpeechRate(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_STRESS:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetStress(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_TABLELAYOUT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetTableLayout(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_TEXTALIGN:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetTextAlign(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_TEXTDECORATION:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetTextDecoration(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_TEXTINDENT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetTextIndent(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_TEXTSHADOW:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetTextShadow(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_TEXTTRANSFORM:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetTextTransform(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_TOP:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetTop(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_UNICODEBIDI:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetUnicodeBidi(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_VERTICALALIGN:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetVerticalAlign(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_VISIBILITY:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetVisibility(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_VOICEFAMILY:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetVoiceFamily(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_VOLUME:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetVolume(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_WHITESPACE:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetWhiteSpace(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_WIDOWS:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetWidows(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_WIDTH:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetWidth(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_WORDSPACING:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetWordSpacing(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_ZINDEX:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetZIndex(prop);
+        
+        break;
+      }
+      case CSS2PROPERTIES_OPACITY:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetOpacity(prop);
+        
+        break;
+      }
+      default:
+      {
+        nsIJSScriptObject *object;
+        if (NS_OK == a->QueryInterface(kIJSScriptObjectIID, (void**)&object)) {
+          PRBool rval;
+          rval =  object->SetProperty(cx, id, vp);
+          NS_RELEASE(object);
+          return rval;
+        }
+      }
+    }
+  }
+  else {
+    nsIJSScriptObject *object;
+    if (NS_OK == a->QueryInterface(kIJSScriptObjectIID, (void**)&object)) {
+      PRBool rval;
+      rval =  object->SetProperty(cx, id, vp);
+      NS_RELEASE(object);
+      return rval;
+    }
+  }
+
+  return PR_TRUE;
+}
+
+
+//
+// CSS2Properties finalizer
+//
+PR_STATIC_CALLBACK(void)
+FinalizeCSS2Properties(JSContext *cx, JSObject *obj)
+{
+  nsIDOMCSS2Properties *a = (nsIDOMCSS2Properties*)JS_GetPrivate(cx, obj);
+  
+  if (nsnull != a) {
+    // get the js object
+    nsIScriptObjectOwner *owner = nsnull;
+    if (NS_OK == a->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
+      owner->SetScriptObject(nsnull);
+      NS_RELEASE(owner);
+    }
+
+    NS_RELEASE(a);
+  }
+}
+
+
+//
+// CSS2Properties enumerate
+//
+PR_STATIC_CALLBACK(JSBool)
+EnumerateCSS2Properties(JSContext *cx, JSObject *obj)
+{
+  nsIDOMCSS2Properties *a = (nsIDOMCSS2Properties*)JS_GetPrivate(cx, obj);
+  
+  if (nsnull != a) {
+    // get the js object
+    nsIJSScriptObject *object;
+    if (NS_OK == a->QueryInterface(kIJSScriptObjectIID, (void**)&object)) {
+      object->EnumerateProperty(cx);
+      NS_RELEASE(object);
+    }
+  }
+  return JS_TRUE;
+}
+
+
+//
+// CSS2Properties resolve
+//
+PR_STATIC_CALLBACK(JSBool)
+ResolveCSS2Properties(JSContext *cx, JSObject *obj, jsval id)
+{
+  nsIDOMCSS2Properties *a = (nsIDOMCSS2Properties*)JS_GetPrivate(cx, obj);
+  
+  if (nsnull != a) {
+    // get the js object
+    nsIJSScriptObject *object;
+    if (NS_OK == a->QueryInterface(kIJSScriptObjectIID, (void**)&object)) {
+      object->Resolve(cx, id);
+      NS_RELEASE(object);
+    }
+  }
+  return JS_TRUE;
+}
+
+
+/***********************************************************************/
+//
+// class for CSS2Properties
+//
+JSClass CSS2PropertiesClass = {
+  "CSS2Properties", 
+  JSCLASS_HAS_PRIVATE,
+  JS_PropertyStub,
+  JS_PropertyStub,
+  GetCSS2PropertiesProperty,
+  SetCSS2PropertiesProperty,
+  EnumerateCSS2Properties,
+  ResolveCSS2Properties,
+  JS_ConvertStub,
+  FinalizeCSS2Properties
+};
+
+
+//
+// CSS2Properties class properties
+//
+static JSPropertySpec CSS2PropertiesProperties[] =
+{
+  {"azimuth",    CSS2PROPERTIES_AZIMUTH,    JSPROP_ENUMERATE},
+  {"background",    CSS2PROPERTIES_BACKGROUND,    JSPROP_ENUMERATE},
+  {"backgroundAttachment",    CSS2PROPERTIES_BACKGROUNDATTACHMENT,    JSPROP_ENUMERATE},
+  {"backgroundColor",    CSS2PROPERTIES_BACKGROUNDCOLOR,    JSPROP_ENUMERATE},
+  {"backgroundImage",    CSS2PROPERTIES_BACKGROUNDIMAGE,    JSPROP_ENUMERATE},
+  {"backgroundPosition",    CSS2PROPERTIES_BACKGROUNDPOSITION,    JSPROP_ENUMERATE},
+  {"backgroundRepeat",    CSS2PROPERTIES_BACKGROUNDREPEAT,    JSPROP_ENUMERATE},
+  {"border",    CSS2PROPERTIES_BORDER,    JSPROP_ENUMERATE},
+  {"borderCollapse",    CSS2PROPERTIES_BORDERCOLLAPSE,    JSPROP_ENUMERATE},
+  {"borderColor",    CSS2PROPERTIES_BORDERCOLOR,    JSPROP_ENUMERATE},
+  {"borderSpacing",    CSS2PROPERTIES_BORDERSPACING,    JSPROP_ENUMERATE},
+  {"borderStyle",    CSS2PROPERTIES_BORDERSTYLE,    JSPROP_ENUMERATE},
+  {"borderTop",    CSS2PROPERTIES_BORDERTOP,    JSPROP_ENUMERATE},
+  {"borderRight",    CSS2PROPERTIES_BORDERRIGHT,    JSPROP_ENUMERATE},
+  {"borderBottom",    CSS2PROPERTIES_BORDERBOTTOM,    JSPROP_ENUMERATE},
+  {"borderLeft",    CSS2PROPERTIES_BORDERLEFT,    JSPROP_ENUMERATE},
+  {"borderTopColor",    CSS2PROPERTIES_BORDERTOPCOLOR,    JSPROP_ENUMERATE},
+  {"borderRightColor",    CSS2PROPERTIES_BORDERRIGHTCOLOR,    JSPROP_ENUMERATE},
+  {"borderBottomColor",    CSS2PROPERTIES_BORDERBOTTOMCOLOR,    JSPROP_ENUMERATE},
+  {"borderLeftColor",    CSS2PROPERTIES_BORDERLEFTCOLOR,    JSPROP_ENUMERATE},
+  {"borderTopStyle",    CSS2PROPERTIES_BORDERTOPSTYLE,    JSPROP_ENUMERATE},
+  {"borderRightStyle",    CSS2PROPERTIES_BORDERRIGHTSTYLE,    JSPROP_ENUMERATE},
+  {"borderBottomStyle",    CSS2PROPERTIES_BORDERBOTTOMSTYLE,    JSPROP_ENUMERATE},
+  {"borderLeftStyle",    CSS2PROPERTIES_BORDERLEFTSTYLE,    JSPROP_ENUMERATE},
+  {"borderTopWidth",    CSS2PROPERTIES_BORDERTOPWIDTH,    JSPROP_ENUMERATE},
+  {"borderRightWidth",    CSS2PROPERTIES_BORDERRIGHTWIDTH,    JSPROP_ENUMERATE},
+  {"borderBottomWidth",    CSS2PROPERTIES_BORDERBOTTOMWIDTH,    JSPROP_ENUMERATE},
+  {"borderLeftWidth",    CSS2PROPERTIES_BORDERLEFTWIDTH,    JSPROP_ENUMERATE},
+  {"borderWidth",    CSS2PROPERTIES_BORDERWIDTH,    JSPROP_ENUMERATE},
+  {"bottom",    CSS2PROPERTIES_BOTTOM,    JSPROP_ENUMERATE},
+  {"captionSide",    CSS2PROPERTIES_CAPTIONSIDE,    JSPROP_ENUMERATE},
+  {"clear",    CSS2PROPERTIES_CLEAR,    JSPROP_ENUMERATE},
+  {"clip",    CSS2PROPERTIES_CLIP,    JSPROP_ENUMERATE},
+  {"color",    CSS2PROPERTIES_COLOR,    JSPROP_ENUMERATE},
+  {"content",    CSS2PROPERTIES_CONTENT,    JSPROP_ENUMERATE},
+  {"counterIncrement",    CSS2PROPERTIES_COUNTERINCREMENT,    JSPROP_ENUMERATE},
+  {"counterReset",    CSS2PROPERTIES_COUNTERRESET,    JSPROP_ENUMERATE},
+  {"cue",    CSS2PROPERTIES_CUE,    JSPROP_ENUMERATE},
+  {"cueAfter",    CSS2PROPERTIES_CUEAFTER,    JSPROP_ENUMERATE},
+  {"cueBefore",    CSS2PROPERTIES_CUEBEFORE,    JSPROP_ENUMERATE},
+  {"cursor",    CSS2PROPERTIES_CURSOR,    JSPROP_ENUMERATE},
+  {"direction",    CSS2PROPERTIES_DIRECTION,    JSPROP_ENUMERATE},
+  {"display",    CSS2PROPERTIES_DISPLAY,    JSPROP_ENUMERATE},
+  {"elevation",    CSS2PROPERTIES_ELEVATION,    JSPROP_ENUMERATE},
+  {"emptyCells",    CSS2PROPERTIES_EMPTYCELLS,    JSPROP_ENUMERATE},
+  {"cssFloat",    CSS2PROPERTIES_CSSFLOAT,    JSPROP_ENUMERATE},
+  {"font",    CSS2PROPERTIES_FONT,    JSPROP_ENUMERATE},
+  {"fontFamily",    CSS2PROPERTIES_FONTFAMILY,    JSPROP_ENUMERATE},
+  {"fontSize",    CSS2PROPERTIES_FONTSIZE,    JSPROP_ENUMERATE},
+  {"fontSizeAdjust",    CSS2PROPERTIES_FONTSIZEADJUST,    JSPROP_ENUMERATE},
+  {"fontStretch",    CSS2PROPERTIES_FONTSTRETCH,    JSPROP_ENUMERATE},
+  {"fontStyle",    CSS2PROPERTIES_FONTSTYLE,    JSPROP_ENUMERATE},
+  {"fontVariant",    CSS2PROPERTIES_FONTVARIANT,    JSPROP_ENUMERATE},
+  {"fontWeight",    CSS2PROPERTIES_FONTWEIGHT,    JSPROP_ENUMERATE},
+  {"height",    CSS2PROPERTIES_HEIGHT,    JSPROP_ENUMERATE},
+  {"left",    CSS2PROPERTIES_LEFT,    JSPROP_ENUMERATE},
+  {"letterSpacing",    CSS2PROPERTIES_LETTERSPACING,    JSPROP_ENUMERATE},
+  {"lineHeight",    CSS2PROPERTIES_LINEHEIGHT,    JSPROP_ENUMERATE},
+  {"listStyle",    CSS2PROPERTIES_LISTSTYLE,    JSPROP_ENUMERATE},
+  {"listStyleImage",    CSS2PROPERTIES_LISTSTYLEIMAGE,    JSPROP_ENUMERATE},
+  {"listStylePosition",    CSS2PROPERTIES_LISTSTYLEPOSITION,    JSPROP_ENUMERATE},
+  {"listStyleType",    CSS2PROPERTIES_LISTSTYLETYPE,    JSPROP_ENUMERATE},
+  {"margin",    CSS2PROPERTIES_MARGIN,    JSPROP_ENUMERATE},
+  {"marginTop",    CSS2PROPERTIES_MARGINTOP,    JSPROP_ENUMERATE},
+  {"marginRight",    CSS2PROPERTIES_MARGINRIGHT,    JSPROP_ENUMERATE},
+  {"marginBottom",    CSS2PROPERTIES_MARGINBOTTOM,    JSPROP_ENUMERATE},
+  {"marginLeft",    CSS2PROPERTIES_MARGINLEFT,    JSPROP_ENUMERATE},
+  {"markerOffset",    CSS2PROPERTIES_MARKEROFFSET,    JSPROP_ENUMERATE},
+  {"marks",    CSS2PROPERTIES_MARKS,    JSPROP_ENUMERATE},
+  {"maxHeight",    CSS2PROPERTIES_MAXHEIGHT,    JSPROP_ENUMERATE},
+  {"maxWidth",    CSS2PROPERTIES_MAXWIDTH,    JSPROP_ENUMERATE},
+  {"minHeight",    CSS2PROPERTIES_MINHEIGHT,    JSPROP_ENUMERATE},
+  {"minWidth",    CSS2PROPERTIES_MINWIDTH,    JSPROP_ENUMERATE},
+  {"orphans",    CSS2PROPERTIES_ORPHANS,    JSPROP_ENUMERATE},
+  {"outline",    CSS2PROPERTIES_OUTLINE,    JSPROP_ENUMERATE},
+  {"outlineColor",    CSS2PROPERTIES_OUTLINECOLOR,    JSPROP_ENUMERATE},
+  {"outlineStyle",    CSS2PROPERTIES_OUTLINESTYLE,    JSPROP_ENUMERATE},
+  {"outlineWidth",    CSS2PROPERTIES_OUTLINEWIDTH,    JSPROP_ENUMERATE},
+  {"overflow",    CSS2PROPERTIES_OVERFLOW,    JSPROP_ENUMERATE},
+  {"padding",    CSS2PROPERTIES_PADDING,    JSPROP_ENUMERATE},
+  {"paddingTop",    CSS2PROPERTIES_PADDINGTOP,    JSPROP_ENUMERATE},
+  {"paddingRight",    CSS2PROPERTIES_PADDINGRIGHT,    JSPROP_ENUMERATE},
+  {"paddingBottom",    CSS2PROPERTIES_PADDINGBOTTOM,    JSPROP_ENUMERATE},
+  {"paddingLeft",    CSS2PROPERTIES_PADDINGLEFT,    JSPROP_ENUMERATE},
+  {"page",    CSS2PROPERTIES_PAGE,    JSPROP_ENUMERATE},
+  {"pageBreakAfter",    CSS2PROPERTIES_PAGEBREAKAFTER,    JSPROP_ENUMERATE},
+  {"pageBreakBefore",    CSS2PROPERTIES_PAGEBREAKBEFORE,    JSPROP_ENUMERATE},
+  {"pageBreakInside",    CSS2PROPERTIES_PAGEBREAKINSIDE,    JSPROP_ENUMERATE},
+  {"pause",    CSS2PROPERTIES_PAUSE,    JSPROP_ENUMERATE},
+  {"pauseAfter",    CSS2PROPERTIES_PAUSEAFTER,    JSPROP_ENUMERATE},
+  {"pauseBefore",    CSS2PROPERTIES_PAUSEBEFORE,    JSPROP_ENUMERATE},
+  {"pitch",    CSS2PROPERTIES_PITCH,    JSPROP_ENUMERATE},
+  {"pitchRange",    CSS2PROPERTIES_PITCHRANGE,    JSPROP_ENUMERATE},
+  {"playDuring",    CSS2PROPERTIES_PLAYDURING,    JSPROP_ENUMERATE},
+  {"position",    CSS2PROPERTIES_POSITION,    JSPROP_ENUMERATE},
+  {"quotes",    CSS2PROPERTIES_QUOTES,    JSPROP_ENUMERATE},
+  {"richness",    CSS2PROPERTIES_RICHNESS,    JSPROP_ENUMERATE},
+  {"right",    CSS2PROPERTIES_RIGHT,    JSPROP_ENUMERATE},
+  {"size",    CSS2PROPERTIES_SIZE,    JSPROP_ENUMERATE},
+  {"speak",    CSS2PROPERTIES_SPEAK,    JSPROP_ENUMERATE},
+  {"speakHeader",    CSS2PROPERTIES_SPEAKHEADER,    JSPROP_ENUMERATE},
+  {"speakNumeral",    CSS2PROPERTIES_SPEAKNUMERAL,    JSPROP_ENUMERATE},
+  {"speakPunctuation",    CSS2PROPERTIES_SPEAKPUNCTUATION,    JSPROP_ENUMERATE},
+  {"speechRate",    CSS2PROPERTIES_SPEECHRATE,    JSPROP_ENUMERATE},
+  {"stress",    CSS2PROPERTIES_STRESS,    JSPROP_ENUMERATE},
+  {"tableLayout",    CSS2PROPERTIES_TABLELAYOUT,    JSPROP_ENUMERATE},
+  {"textAlign",    CSS2PROPERTIES_TEXTALIGN,    JSPROP_ENUMERATE},
+  {"textDecoration",    CSS2PROPERTIES_TEXTDECORATION,    JSPROP_ENUMERATE},
+  {"textIndent",    CSS2PROPERTIES_TEXTINDENT,    JSPROP_ENUMERATE},
+  {"textShadow",    CSS2PROPERTIES_TEXTSHADOW,    JSPROP_ENUMERATE},
+  {"textTransform",    CSS2PROPERTIES_TEXTTRANSFORM,    JSPROP_ENUMERATE},
+  {"top",    CSS2PROPERTIES_TOP,    JSPROP_ENUMERATE},
+  {"unicodeBidi",    CSS2PROPERTIES_UNICODEBIDI,    JSPROP_ENUMERATE},
+  {"verticalAlign",    CSS2PROPERTIES_VERTICALALIGN,    JSPROP_ENUMERATE},
+  {"visibility",    CSS2PROPERTIES_VISIBILITY,    JSPROP_ENUMERATE},
+  {"voiceFamily",    CSS2PROPERTIES_VOICEFAMILY,    JSPROP_ENUMERATE},
+  {"volume",    CSS2PROPERTIES_VOLUME,    JSPROP_ENUMERATE},
+  {"whiteSpace",    CSS2PROPERTIES_WHITESPACE,    JSPROP_ENUMERATE},
+  {"widows",    CSS2PROPERTIES_WIDOWS,    JSPROP_ENUMERATE},
+  {"width",    CSS2PROPERTIES_WIDTH,    JSPROP_ENUMERATE},
+  {"wordSpacing",    CSS2PROPERTIES_WORDSPACING,    JSPROP_ENUMERATE},
+  {"zIndex",    CSS2PROPERTIES_ZINDEX,    JSPROP_ENUMERATE},
+  {"opacity",    CSS2PROPERTIES_OPACITY,    JSPROP_ENUMERATE},
+  {0}
+};
+
+
+//
+// CSS2Properties class methods
+//
+static JSFunctionSpec CSS2PropertiesMethods[] = 
+{
+  {0}
+};
+
+
+//
+// CSS2Properties constructor
+//
+PR_STATIC_CALLBACK(JSBool)
+CSS2Properties(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  return JS_FALSE;
+}
+
+
+//
+// CSS2Properties class initialization
+//
+nsresult NS_InitCSS2PropertiesClass(nsIScriptContext *aContext, void **aPrototype)
+{
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  JSObject *proto = nsnull;
+  JSObject *constructor = nsnull;
+  JSObject *parent_proto = nsnull;
+  JSObject *global = JS_GetGlobalObject(jscontext);
+  jsval vp;
+
+  if ((PR_TRUE != JS_LookupProperty(jscontext, global, "CSS2Properties", &vp)) ||
+      !JSVAL_IS_OBJECT(vp) ||
+      ((constructor = JSVAL_TO_OBJECT(vp)) == nsnull) ||
+      (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
+      !JSVAL_IS_OBJECT(vp)) {
+
+    if (NS_OK != NS_InitCSSStyleDeclarationClass(aContext, (void **)&parent_proto)) {
+      return NS_ERROR_FAILURE;
+    }
+    proto = JS_InitClass(jscontext,     // context
+                         global,        // global object
+                         parent_proto,  // parent proto 
+                         &CSS2PropertiesClass,      // JSClass
+                         CSS2Properties,            // JSNative ctor
+                         0,             // ctor args
+                         CSS2PropertiesProperties,  // proto props
+                         CSS2PropertiesMethods,     // proto funcs
+                         nsnull,        // ctor props (static)
+                         nsnull);       // ctor funcs (static)
+    if (nsnull == proto) {
+      return NS_ERROR_FAILURE;
+    }
+
+  }
+  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) {
+    proto = JSVAL_TO_OBJECT(vp);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (aPrototype) {
+    *aPrototype = proto;
+  }
+  return NS_OK;
+}
+
+
+//
+// Method for creating a new CSS2Properties JavaScript object
+//
+extern "C" NS_DOM nsresult NS_NewScriptCSS2Properties(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn)
+{
+  NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptCSS2Properties");
+  JSObject *proto;
+  JSObject *parent;
+  nsIScriptObjectOwner *owner;
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  nsresult result = NS_OK;
+  nsIDOMCSS2Properties *aCSS2Properties;
+
+  if (nsnull == aParent) {
+    parent = nsnull;
+  }
+  else if (NS_OK == aParent->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
+    if (NS_OK != owner->GetScriptObject(aContext, (void **)&parent)) {
+      NS_RELEASE(owner);
+      return NS_ERROR_FAILURE;
+    }
+    NS_RELEASE(owner);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (NS_OK != NS_InitCSS2PropertiesClass(aContext, (void **)&proto)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  result = aSupports->QueryInterface(kICSS2PropertiesIID, (void **)&aCSS2Properties);
+  if (NS_OK != result) {
+    return result;
+  }
+
+  // create a js object for this class
+  *aReturn = JS_NewObject(jscontext, &CSS2PropertiesClass, proto, parent);
+  if (nsnull != *aReturn) {
+    // connect the native object to the js object
+    JS_SetPrivate(jscontext, (JSObject *)*aReturn, aCSS2Properties);
+  }
+  else {
+    NS_RELEASE(aCSS2Properties);
+    return NS_ERROR_FAILURE; 
+  }
+
+  return NS_OK;
+}
diff --git a/mozilla/dom/src/css/nsJSCSSFontFaceRule.cpp b/mozilla/dom/src/css/nsJSCSSFontFaceRule.cpp
index c4c73bc8eb4..2386e40ee95 100644
--- a/mozilla/dom/src/css/nsJSCSSFontFaceRule.cpp
+++ b/mozilla/dom/src/css/nsJSCSSFontFaceRule.cpp
@@ -304,7 +304,7 @@ nsresult NS_InitCSSFontFaceRuleClass(nsIScriptContext *aContext, void **aPrototy
       (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
       !JSVAL_IS_OBJECT(vp)) {
 
-    if (NS_OK != NS_InitCSSStyleRuleClass(aContext, (void **)&parent_proto)) {
+    if (NS_OK != NS_InitCSSRuleClass(aContext, (void **)&parent_proto)) {
       return NS_ERROR_FAILURE;
     }
     proto = JS_InitClass(jscontext,     // context
diff --git a/mozilla/dom/src/css/nsJSCSSImportRule.cpp b/mozilla/dom/src/css/nsJSCSSImportRule.cpp
new file mode 100644
index 00000000000..61a83e85cdf
--- /dev/null
+++ b/mozilla/dom/src/css/nsJSCSSImportRule.cpp
@@ -0,0 +1,424 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#include "jsapi.h"
+#include "nscore.h"
+#include "nsIScriptContext.h"
+#include "nsIJSScriptObject.h"
+#include "nsIScriptObjectOwner.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIPtr.h"
+#include "nsString.h"
+#include "nsIDOMCSSImportRule.h"
+#include "nsIDOMCSSStyleSheet.h"
+
+
+static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
+static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
+static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
+static NS_DEFINE_IID(kICSSImportRuleIID, NS_IDOMCSSIMPORTRULE_IID);
+static NS_DEFINE_IID(kICSSStyleSheetIID, NS_IDOMCSSSTYLESHEET_IID);
+
+NS_DEF_PTR(nsIDOMCSSImportRule);
+NS_DEF_PTR(nsIDOMCSSStyleSheet);
+
+//
+// CSSImportRule property ids
+//
+enum CSSImportRule_slots {
+  CSSIMPORTRULE_HREF = -1,
+  CSSIMPORTRULE_MEDIA = -2,
+  CSSIMPORTRULE_STYLESHEET = -3
+};
+
+/***********************************************************************/
+//
+// CSSImportRule Properties Getter
+//
+PR_STATIC_CALLBACK(JSBool)
+GetCSSImportRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMCSSImportRule *a = (nsIDOMCSSImportRule*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case CSSIMPORTRULE_HREF:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetHref(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSSIMPORTRULE_MEDIA:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetMedia(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSSIMPORTRULE_STYLESHEET:
+      {
+        nsIDOMCSSStyleSheet* prop;
+        if (NS_OK == a->GetStyleSheet(&prop)) {
+          // get the js object
+          if (prop != nsnull) {
+            nsIScriptObjectOwner *owner = nsnull;
+            if (NS_OK == prop->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
+              JSObject *object = nsnull;
+              nsIScriptContext *script_cx = (nsIScriptContext *)JS_GetContextPrivate(cx);
+              if (NS_OK == owner->GetScriptObject(script_cx, (void**)&object)) {
+                // set the return value
+                *vp = OBJECT_TO_JSVAL(object);
+              }
+              NS_RELEASE(owner);
+            }
+            NS_RELEASE(prop);
+          }
+          else {
+            *vp = JSVAL_NULL;
+          }
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      default:
+      {
+        nsIJSScriptObject *object;
+        if (NS_OK == a->QueryInterface(kIJSScriptObjectIID, (void**)&object)) {
+          PRBool rval;
+          rval =  object->GetProperty(cx, id, vp);
+          NS_RELEASE(object);
+          return rval;
+        }
+      }
+    }
+  }
+  else {
+    nsIJSScriptObject *object;
+    if (NS_OK == a->QueryInterface(kIJSScriptObjectIID, (void**)&object)) {
+      PRBool rval;
+      rval =  object->GetProperty(cx, id, vp);
+      NS_RELEASE(object);
+      return rval;
+    }
+  }
+
+  return PR_TRUE;
+}
+
+/***********************************************************************/
+//
+// CSSImportRule Properties Setter
+//
+PR_STATIC_CALLBACK(JSBool)
+SetCSSImportRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMCSSImportRule *a = (nsIDOMCSSImportRule*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case CSSIMPORTRULE_HREF:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetHref(prop);
+        
+        break;
+      }
+      case CSSIMPORTRULE_MEDIA:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetMedia(prop);
+        
+        break;
+      }
+      default:
+      {
+        nsIJSScriptObject *object;
+        if (NS_OK == a->QueryInterface(kIJSScriptObjectIID, (void**)&object)) {
+          PRBool rval;
+          rval =  object->SetProperty(cx, id, vp);
+          NS_RELEASE(object);
+          return rval;
+        }
+      }
+    }
+  }
+  else {
+    nsIJSScriptObject *object;
+    if (NS_OK == a->QueryInterface(kIJSScriptObjectIID, (void**)&object)) {
+      PRBool rval;
+      rval =  object->SetProperty(cx, id, vp);
+      NS_RELEASE(object);
+      return rval;
+    }
+  }
+
+  return PR_TRUE;
+}
+
+
+//
+// CSSImportRule finalizer
+//
+PR_STATIC_CALLBACK(void)
+FinalizeCSSImportRule(JSContext *cx, JSObject *obj)
+{
+  nsIDOMCSSImportRule *a = (nsIDOMCSSImportRule*)JS_GetPrivate(cx, obj);
+  
+  if (nsnull != a) {
+    // get the js object
+    nsIScriptObjectOwner *owner = nsnull;
+    if (NS_OK == a->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
+      owner->SetScriptObject(nsnull);
+      NS_RELEASE(owner);
+    }
+
+    NS_RELEASE(a);
+  }
+}
+
+
+//
+// CSSImportRule enumerate
+//
+PR_STATIC_CALLBACK(JSBool)
+EnumerateCSSImportRule(JSContext *cx, JSObject *obj)
+{
+  nsIDOMCSSImportRule *a = (nsIDOMCSSImportRule*)JS_GetPrivate(cx, obj);
+  
+  if (nsnull != a) {
+    // get the js object
+    nsIJSScriptObject *object;
+    if (NS_OK == a->QueryInterface(kIJSScriptObjectIID, (void**)&object)) {
+      object->EnumerateProperty(cx);
+      NS_RELEASE(object);
+    }
+  }
+  return JS_TRUE;
+}
+
+
+//
+// CSSImportRule resolve
+//
+PR_STATIC_CALLBACK(JSBool)
+ResolveCSSImportRule(JSContext *cx, JSObject *obj, jsval id)
+{
+  nsIDOMCSSImportRule *a = (nsIDOMCSSImportRule*)JS_GetPrivate(cx, obj);
+  
+  if (nsnull != a) {
+    // get the js object
+    nsIJSScriptObject *object;
+    if (NS_OK == a->QueryInterface(kIJSScriptObjectIID, (void**)&object)) {
+      object->Resolve(cx, id);
+      NS_RELEASE(object);
+    }
+  }
+  return JS_TRUE;
+}
+
+
+/***********************************************************************/
+//
+// class for CSSImportRule
+//
+JSClass CSSImportRuleClass = {
+  "CSSImportRule", 
+  JSCLASS_HAS_PRIVATE,
+  JS_PropertyStub,
+  JS_PropertyStub,
+  GetCSSImportRuleProperty,
+  SetCSSImportRuleProperty,
+  EnumerateCSSImportRule,
+  ResolveCSSImportRule,
+  JS_ConvertStub,
+  FinalizeCSSImportRule
+};
+
+
+//
+// CSSImportRule class properties
+//
+static JSPropertySpec CSSImportRuleProperties[] =
+{
+  {"href",    CSSIMPORTRULE_HREF,    JSPROP_ENUMERATE},
+  {"media",    CSSIMPORTRULE_MEDIA,    JSPROP_ENUMERATE},
+  {"styleSheet",    CSSIMPORTRULE_STYLESHEET,    JSPROP_ENUMERATE | JSPROP_READONLY},
+  {0}
+};
+
+
+//
+// CSSImportRule class methods
+//
+static JSFunctionSpec CSSImportRuleMethods[] = 
+{
+  {0}
+};
+
+
+//
+// CSSImportRule constructor
+//
+PR_STATIC_CALLBACK(JSBool)
+CSSImportRule(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  return JS_FALSE;
+}
+
+
+//
+// CSSImportRule class initialization
+//
+nsresult NS_InitCSSImportRuleClass(nsIScriptContext *aContext, void **aPrototype)
+{
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  JSObject *proto = nsnull;
+  JSObject *constructor = nsnull;
+  JSObject *parent_proto = nsnull;
+  JSObject *global = JS_GetGlobalObject(jscontext);
+  jsval vp;
+
+  if ((PR_TRUE != JS_LookupProperty(jscontext, global, "CSSImportRule", &vp)) ||
+      !JSVAL_IS_OBJECT(vp) ||
+      ((constructor = JSVAL_TO_OBJECT(vp)) == nsnull) ||
+      (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
+      !JSVAL_IS_OBJECT(vp)) {
+
+    if (NS_OK != NS_InitCSSRuleClass(aContext, (void **)&parent_proto)) {
+      return NS_ERROR_FAILURE;
+    }
+    proto = JS_InitClass(jscontext,     // context
+                         global,        // global object
+                         parent_proto,  // parent proto 
+                         &CSSImportRuleClass,      // JSClass
+                         CSSImportRule,            // JSNative ctor
+                         0,             // ctor args
+                         CSSImportRuleProperties,  // proto props
+                         CSSImportRuleMethods,     // proto funcs
+                         nsnull,        // ctor props (static)
+                         nsnull);       // ctor funcs (static)
+    if (nsnull == proto) {
+      return NS_ERROR_FAILURE;
+    }
+
+  }
+  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) {
+    proto = JSVAL_TO_OBJECT(vp);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (aPrototype) {
+    *aPrototype = proto;
+  }
+  return NS_OK;
+}
+
+
+//
+// Method for creating a new CSSImportRule JavaScript object
+//
+extern "C" NS_DOM nsresult NS_NewScriptCSSImportRule(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn)
+{
+  NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptCSSImportRule");
+  JSObject *proto;
+  JSObject *parent;
+  nsIScriptObjectOwner *owner;
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  nsresult result = NS_OK;
+  nsIDOMCSSImportRule *aCSSImportRule;
+
+  if (nsnull == aParent) {
+    parent = nsnull;
+  }
+  else if (NS_OK == aParent->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
+    if (NS_OK != owner->GetScriptObject(aContext, (void **)&parent)) {
+      NS_RELEASE(owner);
+      return NS_ERROR_FAILURE;
+    }
+    NS_RELEASE(owner);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (NS_OK != NS_InitCSSImportRuleClass(aContext, (void **)&proto)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  result = aSupports->QueryInterface(kICSSImportRuleIID, (void **)&aCSSImportRule);
+  if (NS_OK != result) {
+    return result;
+  }
+
+  // create a js object for this class
+  *aReturn = JS_NewObject(jscontext, &CSSImportRuleClass, proto, parent);
+  if (nsnull != *aReturn) {
+    // connect the native object to the js object
+    JS_SetPrivate(jscontext, (JSObject *)*aReturn, aCSSImportRule);
+  }
+  else {
+    NS_RELEASE(aCSSImportRule);
+    return NS_ERROR_FAILURE; 
+  }
+
+  return NS_OK;
+}
diff --git a/mozilla/dom/src/css/nsJSCSSMediaRule.cpp b/mozilla/dom/src/css/nsJSCSSMediaRule.cpp
index f13fb94fc12..79c0c124f91 100644
--- a/mozilla/dom/src/css/nsJSCSSMediaRule.cpp
+++ b/mozilla/dom/src/css/nsJSCSSMediaRule.cpp
@@ -43,7 +43,7 @@ NS_DEF_PTR(nsIDOMCSSMediaRule);
 //
 enum CSSMediaRule_slots {
   CSSMEDIARULE_MEDIATYPES = -1,
-  CSSMEDIARULE_RULES = -2
+  CSSMEDIARULE_CSSRULES = -2
 };
 
 /***********************************************************************/
@@ -75,10 +75,10 @@ GetCSSMediaRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
         }
         break;
       }
-      case CSSMEDIARULE_RULES:
+      case CSSMEDIARULE_CSSRULES:
       {
         nsIDOMCSSStyleRuleCollection* prop;
-        if (NS_OK == a->GetRules(&prop)) {
+        if (NS_OK == a->GetCssRules(&prop)) {
           // get the js object
           if (prop != nsnull) {
             nsIScriptObjectOwner *owner = nsnull;
@@ -246,17 +246,16 @@ ResolveCSSMediaRule(JSContext *cx, JSObject *obj, jsval id)
 
 
 //
-// Native method AddRule
+// Native method InsertRule
 //
 PR_STATIC_CALLBACK(JSBool)
-CSSMediaRuleAddRule(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+CSSMediaRuleInsertRule(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
   nsIDOMCSSMediaRule *nativeThis = (nsIDOMCSSMediaRule*)JS_GetPrivate(cx, obj);
   JSBool rBool = JS_FALSE;
   PRUint32 nativeRet;
   nsAutoString b0;
-  nsAutoString b1;
-  PRUint32 b2;
+  PRUint32 b1;
 
   *rval = JSVAL_NULL;
 
@@ -265,7 +264,7 @@ CSSMediaRuleAddRule(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval
     return JS_TRUE;
   }
 
-  if (argc >= 3) {
+  if (argc >= 2) {
 
     JSString *jsstring0 = JS_ValueToString(cx, argv[0]);
     if (nsnull != jsstring0) {
@@ -275,27 +274,19 @@ CSSMediaRuleAddRule(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval
       b0.SetString("");   // Should this really be null?? 
     }
 
-    JSString *jsstring1 = JS_ValueToString(cx, argv[1]);
-    if (nsnull != jsstring1) {
-      b1.SetString(JS_GetStringChars(jsstring1));
-    }
-    else {
-      b1.SetString("");   // Should this really be null?? 
-    }
-
-    if (!JS_ValueToInt32(cx, argv[2], (int32 *)&b2)) {
+    if (!JS_ValueToInt32(cx, argv[1], (int32 *)&b1)) {
       JS_ReportError(cx, "Parameter must be a number");
       return JS_FALSE;
     }
 
-    if (NS_OK != nativeThis->AddRule(b0, b1, b2, &nativeRet)) {
+    if (NS_OK != nativeThis->InsertRule(b0, b1, &nativeRet)) {
       return JS_FALSE;
     }
 
     *rval = INT_TO_JSVAL(nativeRet);
   }
   else {
-    JS_ReportError(cx, "Function addRule requires 3 parameters");
+    JS_ReportError(cx, "Function insertRule requires 2 parameters");
     return JS_FALSE;
   }
 
@@ -304,10 +295,10 @@ CSSMediaRuleAddRule(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval
 
 
 //
-// Native method RemoveRule
+// Native method DeleteRule
 //
 PR_STATIC_CALLBACK(JSBool)
-CSSMediaRuleRemoveRule(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+CSSMediaRuleDeleteRule(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
   nsIDOMCSSMediaRule *nativeThis = (nsIDOMCSSMediaRule*)JS_GetPrivate(cx, obj);
   JSBool rBool = JS_FALSE;
@@ -327,14 +318,14 @@ CSSMediaRuleRemoveRule(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js
       return JS_FALSE;
     }
 
-    if (NS_OK != nativeThis->RemoveRule(b0)) {
+    if (NS_OK != nativeThis->DeleteRule(b0)) {
       return JS_FALSE;
     }
 
     *rval = JSVAL_VOID;
   }
   else {
-    JS_ReportError(cx, "Function removeRule requires 1 parameters");
+    JS_ReportError(cx, "Function deleteRule requires 1 parameters");
     return JS_FALSE;
   }
 
@@ -366,7 +357,7 @@ JSClass CSSMediaRuleClass = {
 static JSPropertySpec CSSMediaRuleProperties[] =
 {
   {"mediaTypes",    CSSMEDIARULE_MEDIATYPES,    JSPROP_ENUMERATE},
-  {"rules",    CSSMEDIARULE_RULES,    JSPROP_ENUMERATE | JSPROP_READONLY},
+  {"cssRules",    CSSMEDIARULE_CSSRULES,    JSPROP_ENUMERATE | JSPROP_READONLY},
   {0}
 };
 
@@ -376,8 +367,8 @@ static JSPropertySpec CSSMediaRuleProperties[] =
 //
 static JSFunctionSpec CSSMediaRuleMethods[] = 
 {
-  {"addRule",          CSSMediaRuleAddRule,     3},
-  {"removeRule",          CSSMediaRuleRemoveRule,     1},
+  {"insertRule",          CSSMediaRuleInsertRule,     2},
+  {"deleteRule",          CSSMediaRuleDeleteRule,     1},
   {0}
 };
 
@@ -410,7 +401,7 @@ nsresult NS_InitCSSMediaRuleClass(nsIScriptContext *aContext, void **aPrototype)
       (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
       !JSVAL_IS_OBJECT(vp)) {
 
-    if (NS_OK != NS_InitCSSStyleRuleClass(aContext, (void **)&parent_proto)) {
+    if (NS_OK != NS_InitCSSRuleClass(aContext, (void **)&parent_proto)) {
       return NS_ERROR_FAILURE;
     }
     proto = JS_InitClass(jscontext,     // context
diff --git a/mozilla/dom/src/css/nsJSCSSPageRule.cpp b/mozilla/dom/src/css/nsJSCSSPageRule.cpp
index b733673edf2..59c0abddf79 100644
--- a/mozilla/dom/src/css/nsJSCSSPageRule.cpp
+++ b/mozilla/dom/src/css/nsJSCSSPageRule.cpp
@@ -42,7 +42,7 @@ NS_DEF_PTR(nsIDOMCSSStyleDeclaration);
 // CSSPageRule property ids
 //
 enum CSSPageRule_slots {
-  CSSPAGERULE_SELECTORTEXT = -1,
+  CSSPAGERULE_NAME = -1,
   CSSPAGERULE_STYLE = -2
 };
 
@@ -62,10 +62,10 @@ GetCSSPageRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
 
   if (JSVAL_IS_INT(id)) {
     switch(JSVAL_TO_INT(id)) {
-      case CSSPAGERULE_SELECTORTEXT:
+      case CSSPAGERULE_NAME:
       {
         nsAutoString prop;
-        if (NS_OK == a->GetSelectorText(prop)) {
+        if (NS_OK == a->GetName(prop)) {
           JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
           // set the return value
           *vp = STRING_TO_JSVAL(jsstring);
@@ -143,7 +143,7 @@ SetCSSPageRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
 
   if (JSVAL_IS_INT(id)) {
     switch(JSVAL_TO_INT(id)) {
-      case CSSPAGERULE_SELECTORTEXT:
+      case CSSPAGERULE_NAME:
       {
         nsAutoString prop;
         JSString *jsstring;
@@ -154,7 +154,7 @@ SetCSSPageRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
           prop.SetString((const char *)nsnull);
         }
       
-        a->SetSelectorText(prop);
+        a->SetName(prop);
         
         break;
       }
@@ -291,7 +291,7 @@ JSClass CSSPageRuleClass = {
 //
 static JSPropertySpec CSSPageRuleProperties[] =
 {
-  {"selectorText",    CSSPAGERULE_SELECTORTEXT,    JSPROP_ENUMERATE},
+  {"name",    CSSPAGERULE_NAME,    JSPROP_ENUMERATE},
   {"style",    CSSPAGERULE_STYLE,    JSPROP_ENUMERATE},
   {0}
 };
@@ -334,7 +334,7 @@ nsresult NS_InitCSSPageRuleClass(nsIScriptContext *aContext, void **aPrototype)
       (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
       !JSVAL_IS_OBJECT(vp)) {
 
-    if (NS_OK != NS_InitCSSStyleRuleClass(aContext, (void **)&parent_proto)) {
+    if (NS_OK != NS_InitCSSRuleClass(aContext, (void **)&parent_proto)) {
       return NS_ERROR_FAILURE;
     }
     proto = JS_InitClass(jscontext,     // context
diff --git a/mozilla/dom/src/css/nsJSCSSStyleRuleSimple.cpp b/mozilla/dom/src/css/nsJSCSSRule.cpp
similarity index 64%
rename from mozilla/dom/src/css/nsJSCSSStyleRuleSimple.cpp
rename to mozilla/dom/src/css/nsJSCSSRule.cpp
index 07665b737b5..b5ff44e8344 100644
--- a/mozilla/dom/src/css/nsJSCSSStyleRuleSimple.cpp
+++ b/mozilla/dom/src/css/nsJSCSSRule.cpp
@@ -25,35 +25,36 @@
 #include "nsIScriptGlobalObject.h"
 #include "nsIPtr.h"
 #include "nsString.h"
-#include "nsIDOMCSSStyleDeclaration.h"
-#include "nsIDOMCSSStyleRuleSimple.h"
+#include "nsIDOMCSSRule.h"
+#include "nsIDOMCSSStyleSheet.h"
 
 
 static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
 static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
 static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
-static NS_DEFINE_IID(kICSSStyleDeclarationIID, NS_IDOMCSSSTYLEDECLARATION_IID);
-static NS_DEFINE_IID(kICSSStyleRuleSimpleIID, NS_IDOMCSSSTYLERULESIMPLE_IID);
+static NS_DEFINE_IID(kICSSRuleIID, NS_IDOMCSSRULE_IID);
+static NS_DEFINE_IID(kICSSStyleSheetIID, NS_IDOMCSSSTYLESHEET_IID);
 
-NS_DEF_PTR(nsIDOMCSSStyleDeclaration);
-NS_DEF_PTR(nsIDOMCSSStyleRuleSimple);
+NS_DEF_PTR(nsIDOMCSSRule);
+NS_DEF_PTR(nsIDOMCSSStyleSheet);
 
 //
-// CSSStyleRuleSimple property ids
+// CSSRule property ids
 //
-enum CSSStyleRuleSimple_slots {
-  CSSSTYLERULESIMPLE_SELECTORTEXT = -1,
-  CSSSTYLERULESIMPLE_STYLE = -2
+enum CSSRule_slots {
+  CSSRULE_TYPE = -1,
+  CSSRULE_CSSTEXT = -2,
+  CSSRULE_SHEET = -3
 };
 
 /***********************************************************************/
 //
-// CSSStyleRuleSimple Properties Getter
+// CSSRule Properties Getter
 //
 PR_STATIC_CALLBACK(JSBool)
-GetCSSStyleRuleSimpleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+GetCSSRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
 {
-  nsIDOMCSSStyleRuleSimple *a = (nsIDOMCSSStyleRuleSimple*)JS_GetPrivate(cx, obj);
+  nsIDOMCSSRule *a = (nsIDOMCSSRule*)JS_GetPrivate(cx, obj);
 
   // If there's no private data, this must be the prototype, so ignore
   if (nsnull == a) {
@@ -62,10 +63,21 @@ GetCSSStyleRuleSimpleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
 
   if (JSVAL_IS_INT(id)) {
     switch(JSVAL_TO_INT(id)) {
-      case CSSSTYLERULESIMPLE_SELECTORTEXT:
+      case CSSRULE_TYPE:
+      {
+        PRUint16 prop;
+        if (NS_OK == a->GetType(&prop)) {
+          *vp = INT_TO_JSVAL(prop);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
+      case CSSRULE_CSSTEXT:
       {
         nsAutoString prop;
-        if (NS_OK == a->GetSelectorText(prop)) {
+        if (NS_OK == a->GetCssText(prop)) {
           JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
           // set the return value
           *vp = STRING_TO_JSVAL(jsstring);
@@ -75,10 +87,10 @@ GetCSSStyleRuleSimpleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
         }
         break;
       }
-      case CSSSTYLERULESIMPLE_STYLE:
+      case CSSRULE_SHEET:
       {
-        nsIDOMCSSStyleDeclaration* prop;
-        if (NS_OK == a->GetStyle(&prop)) {
+        nsIDOMCSSStyleSheet* prop;
+        if (NS_OK == a->GetSheet(&prop)) {
           // get the js object
           if (prop != nsnull) {
             nsIScriptObjectOwner *owner = nsnull;
@@ -129,12 +141,12 @@ GetCSSStyleRuleSimpleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
 
 /***********************************************************************/
 //
-// CSSStyleRuleSimple Properties Setter
+// CSSRule Properties Setter
 //
 PR_STATIC_CALLBACK(JSBool)
-SetCSSStyleRuleSimpleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+SetCSSRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
 {
-  nsIDOMCSSStyleRuleSimple *a = (nsIDOMCSSStyleRuleSimple*)JS_GetPrivate(cx, obj);
+  nsIDOMCSSRule *a = (nsIDOMCSSRule*)JS_GetPrivate(cx, obj);
 
   // If there's no private data, this must be the prototype, so ignore
   if (nsnull == a) {
@@ -143,7 +155,7 @@ SetCSSStyleRuleSimpleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
 
   if (JSVAL_IS_INT(id)) {
     switch(JSVAL_TO_INT(id)) {
-      case CSSSTYLERULESIMPLE_SELECTORTEXT:
+      case CSSRULE_CSSTEXT:
       {
         nsAutoString prop;
         JSString *jsstring;
@@ -154,7 +166,7 @@ SetCSSStyleRuleSimpleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
           prop.SetString((const char *)nsnull);
         }
       
-        a->SetSelectorText(prop);
+        a->SetCssText(prop);
         
         break;
       }
@@ -185,12 +197,12 @@ SetCSSStyleRuleSimpleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
 
 
 //
-// CSSStyleRuleSimple finalizer
+// CSSRule finalizer
 //
 PR_STATIC_CALLBACK(void)
-FinalizeCSSStyleRuleSimple(JSContext *cx, JSObject *obj)
+FinalizeCSSRule(JSContext *cx, JSObject *obj)
 {
-  nsIDOMCSSStyleRuleSimple *a = (nsIDOMCSSStyleRuleSimple*)JS_GetPrivate(cx, obj);
+  nsIDOMCSSRule *a = (nsIDOMCSSRule*)JS_GetPrivate(cx, obj);
   
   if (nsnull != a) {
     // get the js object
@@ -206,12 +218,12 @@ FinalizeCSSStyleRuleSimple(JSContext *cx, JSObject *obj)
 
 
 //
-// CSSStyleRuleSimple enumerate
+// CSSRule enumerate
 //
 PR_STATIC_CALLBACK(JSBool)
-EnumerateCSSStyleRuleSimple(JSContext *cx, JSObject *obj)
+EnumerateCSSRule(JSContext *cx, JSObject *obj)
 {
-  nsIDOMCSSStyleRuleSimple *a = (nsIDOMCSSStyleRuleSimple*)JS_GetPrivate(cx, obj);
+  nsIDOMCSSRule *a = (nsIDOMCSSRule*)JS_GetPrivate(cx, obj);
   
   if (nsnull != a) {
     // get the js object
@@ -226,12 +238,12 @@ EnumerateCSSStyleRuleSimple(JSContext *cx, JSObject *obj)
 
 
 //
-// CSSStyleRuleSimple resolve
+// CSSRule resolve
 //
 PR_STATIC_CALLBACK(JSBool)
-ResolveCSSStyleRuleSimple(JSContext *cx, JSObject *obj, jsval id)
+ResolveCSSRule(JSContext *cx, JSObject *obj, jsval id)
 {
-  nsIDOMCSSStyleRuleSimple *a = (nsIDOMCSSStyleRuleSimple*)JS_GetPrivate(cx, obj);
+  nsIDOMCSSRule *a = (nsIDOMCSSRule*)JS_GetPrivate(cx, obj);
   
   if (nsnull != a) {
     // get the js object
@@ -247,56 +259,57 @@ ResolveCSSStyleRuleSimple(JSContext *cx, JSObject *obj, jsval id)
 
 /***********************************************************************/
 //
-// class for CSSStyleRuleSimple
+// class for CSSRule
 //
-JSClass CSSStyleRuleSimpleClass = {
-  "CSSStyleRuleSimple", 
+JSClass CSSRuleClass = {
+  "CSSRule", 
   JSCLASS_HAS_PRIVATE,
   JS_PropertyStub,
   JS_PropertyStub,
-  GetCSSStyleRuleSimpleProperty,
-  SetCSSStyleRuleSimpleProperty,
-  EnumerateCSSStyleRuleSimple,
-  ResolveCSSStyleRuleSimple,
+  GetCSSRuleProperty,
+  SetCSSRuleProperty,
+  EnumerateCSSRule,
+  ResolveCSSRule,
   JS_ConvertStub,
-  FinalizeCSSStyleRuleSimple
+  FinalizeCSSRule
 };
 
 
 //
-// CSSStyleRuleSimple class properties
+// CSSRule class properties
 //
-static JSPropertySpec CSSStyleRuleSimpleProperties[] =
+static JSPropertySpec CSSRuleProperties[] =
 {
-  {"selectorText",    CSSSTYLERULESIMPLE_SELECTORTEXT,    JSPROP_ENUMERATE},
-  {"style",    CSSSTYLERULESIMPLE_STYLE,    JSPROP_ENUMERATE | JSPROP_READONLY},
+  {"type",    CSSRULE_TYPE,    JSPROP_ENUMERATE | JSPROP_READONLY},
+  {"cssText",    CSSRULE_CSSTEXT,    JSPROP_ENUMERATE},
+  {"sheet",    CSSRULE_SHEET,    JSPROP_ENUMERATE | JSPROP_READONLY},
   {0}
 };
 
 
 //
-// CSSStyleRuleSimple class methods
+// CSSRule class methods
 //
-static JSFunctionSpec CSSStyleRuleSimpleMethods[] = 
+static JSFunctionSpec CSSRuleMethods[] = 
 {
   {0}
 };
 
 
 //
-// CSSStyleRuleSimple constructor
+// CSSRule constructor
 //
 PR_STATIC_CALLBACK(JSBool)
-CSSStyleRuleSimple(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+CSSRule(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
   return JS_FALSE;
 }
 
 
 //
-// CSSStyleRuleSimple class initialization
+// CSSRule class initialization
 //
-nsresult NS_InitCSSStyleRuleSimpleClass(nsIScriptContext *aContext, void **aPrototype)
+nsresult NS_InitCSSRuleClass(nsIScriptContext *aContext, void **aPrototype)
 {
   JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
   JSObject *proto = nsnull;
@@ -305,29 +318,49 @@ nsresult NS_InitCSSStyleRuleSimpleClass(nsIScriptContext *aContext, void **aProt
   JSObject *global = JS_GetGlobalObject(jscontext);
   jsval vp;
 
-  if ((PR_TRUE != JS_LookupProperty(jscontext, global, "CSSStyleRuleSimple", &vp)) ||
+  if ((PR_TRUE != JS_LookupProperty(jscontext, global, "CSSRule", &vp)) ||
       !JSVAL_IS_OBJECT(vp) ||
       ((constructor = JSVAL_TO_OBJECT(vp)) == nsnull) ||
       (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
       !JSVAL_IS_OBJECT(vp)) {
 
-    if (NS_OK != NS_InitCSSStyleRuleClass(aContext, (void **)&parent_proto)) {
-      return NS_ERROR_FAILURE;
-    }
     proto = JS_InitClass(jscontext,     // context
                          global,        // global object
                          parent_proto,  // parent proto 
-                         &CSSStyleRuleSimpleClass,      // JSClass
-                         CSSStyleRuleSimple,            // JSNative ctor
+                         &CSSRuleClass,      // JSClass
+                         CSSRule,            // JSNative ctor
                          0,             // ctor args
-                         CSSStyleRuleSimpleProperties,  // proto props
-                         CSSStyleRuleSimpleMethods,     // proto funcs
+                         CSSRuleProperties,  // proto props
+                         CSSRuleMethods,     // proto funcs
                          nsnull,        // ctor props (static)
                          nsnull);       // ctor funcs (static)
     if (nsnull == proto) {
       return NS_ERROR_FAILURE;
     }
 
+    if ((PR_TRUE == JS_LookupProperty(jscontext, global, "CSSRule", &vp)) &&
+        JSVAL_IS_OBJECT(vp) &&
+        ((constructor = JSVAL_TO_OBJECT(vp)) != nsnull)) {
+      vp = INT_TO_JSVAL(nsIDOMCSSRule::UNKNOWN_RULE);
+      JS_SetProperty(jscontext, constructor, "UNKNOWN_RULE", &vp);
+
+      vp = INT_TO_JSVAL(nsIDOMCSSRule::STYLE_RULE);
+      JS_SetProperty(jscontext, constructor, "STYLE_RULE", &vp);
+
+      vp = INT_TO_JSVAL(nsIDOMCSSRule::IMPORT_RULE);
+      JS_SetProperty(jscontext, constructor, "IMPORT_RULE", &vp);
+
+      vp = INT_TO_JSVAL(nsIDOMCSSRule::MEDIA_RULE);
+      JS_SetProperty(jscontext, constructor, "MEDIA_RULE", &vp);
+
+      vp = INT_TO_JSVAL(nsIDOMCSSRule::FONT_FACE_RULE);
+      JS_SetProperty(jscontext, constructor, "FONT_FACE_RULE", &vp);
+
+      vp = INT_TO_JSVAL(nsIDOMCSSRule::PAGE_RULE);
+      JS_SetProperty(jscontext, constructor, "PAGE_RULE", &vp);
+
+    }
+
   }
   else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) {
     proto = JSVAL_TO_OBJECT(vp);
@@ -344,17 +377,17 @@ nsresult NS_InitCSSStyleRuleSimpleClass(nsIScriptContext *aContext, void **aProt
 
 
 //
-// Method for creating a new CSSStyleRuleSimple JavaScript object
+// Method for creating a new CSSRule JavaScript object
 //
-extern "C" NS_DOM nsresult NS_NewScriptCSSStyleRuleSimple(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn)
+extern "C" NS_DOM nsresult NS_NewScriptCSSRule(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn)
 {
-  NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptCSSStyleRuleSimple");
+  NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptCSSRule");
   JSObject *proto;
   JSObject *parent;
   nsIScriptObjectOwner *owner;
   JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
   nsresult result = NS_OK;
-  nsIDOMCSSStyleRuleSimple *aCSSStyleRuleSimple;
+  nsIDOMCSSRule *aCSSRule;
 
   if (nsnull == aParent) {
     parent = nsnull;
@@ -370,23 +403,23 @@ extern "C" NS_DOM nsresult NS_NewScriptCSSStyleRuleSimple(nsIScriptContext *aCon
     return NS_ERROR_FAILURE;
   }
 
-  if (NS_OK != NS_InitCSSStyleRuleSimpleClass(aContext, (void **)&proto)) {
+  if (NS_OK != NS_InitCSSRuleClass(aContext, (void **)&proto)) {
     return NS_ERROR_FAILURE;
   }
 
-  result = aSupports->QueryInterface(kICSSStyleRuleSimpleIID, (void **)&aCSSStyleRuleSimple);
+  result = aSupports->QueryInterface(kICSSRuleIID, (void **)&aCSSRule);
   if (NS_OK != result) {
     return result;
   }
 
   // create a js object for this class
-  *aReturn = JS_NewObject(jscontext, &CSSStyleRuleSimpleClass, proto, parent);
+  *aReturn = JS_NewObject(jscontext, &CSSRuleClass, proto, parent);
   if (nsnull != *aReturn) {
     // connect the native object to the js object
-    JS_SetPrivate(jscontext, (JSObject *)*aReturn, aCSSStyleRuleSimple);
+    JS_SetPrivate(jscontext, (JSObject *)*aReturn, aCSSRule);
   }
   else {
-    NS_RELEASE(aCSSStyleRuleSimple);
+    NS_RELEASE(aCSSRule);
     return NS_ERROR_FAILURE; 
   }
 
diff --git a/mozilla/dom/src/css/nsJSCSSStyleDeclaration.cpp b/mozilla/dom/src/css/nsJSCSSStyleDeclaration.cpp
index 98142aca3e7..0f5a8ac3210 100644
--- a/mozilla/dom/src/css/nsJSCSSStyleDeclaration.cpp
+++ b/mozilla/dom/src/css/nsJSCSSStyleDeclaration.cpp
@@ -39,130 +39,8 @@ NS_DEF_PTR(nsIDOMCSSStyleDeclaration);
 // CSSStyleDeclaration property ids
 //
 enum CSSStyleDeclaration_slots {
-  CSSSTYLEDECLARATION_LENGTH = -1,
-  CSSSTYLEDECLARATION_AZIMUTH = -2,
-  CSSSTYLEDECLARATION_BACKGROUND = -3,
-  CSSSTYLEDECLARATION_BACKGROUNDATTACHMENT = -4,
-  CSSSTYLEDECLARATION_BACKGROUNDCOLOR = -5,
-  CSSSTYLEDECLARATION_BACKGROUNDIMAGE = -6,
-  CSSSTYLEDECLARATION_BACKGROUNDPOSITION = -7,
-  CSSSTYLEDECLARATION_BACKGROUNDREPEAT = -8,
-  CSSSTYLEDECLARATION_BORDER = -9,
-  CSSSTYLEDECLARATION_BORDERCOLLAPSE = -10,
-  CSSSTYLEDECLARATION_BORDERCOLOR = -11,
-  CSSSTYLEDECLARATION_BORDERSPACING = -12,
-  CSSSTYLEDECLARATION_BORDERSTYLE = -13,
-  CSSSTYLEDECLARATION_BORDERTOP = -14,
-  CSSSTYLEDECLARATION_BORDERRIGHT = -15,
-  CSSSTYLEDECLARATION_BORDERBOTTOM = -16,
-  CSSSTYLEDECLARATION_BORDERLEFT = -17,
-  CSSSTYLEDECLARATION_BORDERTOPCOLOR = -18,
-  CSSSTYLEDECLARATION_BORDERRIGHTCOLOR = -19,
-  CSSSTYLEDECLARATION_BORDERBOTTOMCOLOR = -20,
-  CSSSTYLEDECLARATION_BORDERLEFTCOLOR = -21,
-  CSSSTYLEDECLARATION_BORDERTOPSTYLE = -22,
-  CSSSTYLEDECLARATION_BORDERRIGHTSTYLE = -23,
-  CSSSTYLEDECLARATION_BORDERBOTTOMSTYLE = -24,
-  CSSSTYLEDECLARATION_BORDERLEFTSTYLE = -25,
-  CSSSTYLEDECLARATION_BORDERTOPWIDTH = -26,
-  CSSSTYLEDECLARATION_BORDERRIGHTWIDTH = -27,
-  CSSSTYLEDECLARATION_BORDERBOTTOMWIDTH = -28,
-  CSSSTYLEDECLARATION_BORDERLEFTWIDTH = -29,
-  CSSSTYLEDECLARATION_BORDERWIDTH = -30,
-  CSSSTYLEDECLARATION_BOTTOM = -31,
-  CSSSTYLEDECLARATION_CAPTIONSIDE = -32,
-  CSSSTYLEDECLARATION_CLEAR = -33,
-  CSSSTYLEDECLARATION_CLIP = -34,
-  CSSSTYLEDECLARATION_COLOR = -35,
-  CSSSTYLEDECLARATION_CONTENT = -36,
-  CSSSTYLEDECLARATION_COUNTERINCREMENT = -37,
-  CSSSTYLEDECLARATION_COUNTERRESET = -38,
-  CSSSTYLEDECLARATION_CUE = -39,
-  CSSSTYLEDECLARATION_CUEAFTER = -40,
-  CSSSTYLEDECLARATION_CUEBEFORE = -41,
-  CSSSTYLEDECLARATION_CURSOR = -42,
-  CSSSTYLEDECLARATION_DIRECTION = -43,
-  CSSSTYLEDECLARATION_DISPLAY = -44,
-  CSSSTYLEDECLARATION_ELEVATION = -45,
-  CSSSTYLEDECLARATION_EMPTYCELLS = -46,
-  CSSSTYLEDECLARATION_STYLEFLOAT = -47,
-  CSSSTYLEDECLARATION_FONT = -48,
-  CSSSTYLEDECLARATION_FONTFAMILY = -49,
-  CSSSTYLEDECLARATION_FONTSIZE = -50,
-  CSSSTYLEDECLARATION_FONTSIZEADJUST = -51,
-  CSSSTYLEDECLARATION_FONTSTRETCH = -52,
-  CSSSTYLEDECLARATION_FONTSTYLE = -53,
-  CSSSTYLEDECLARATION_FONTVARIANT = -54,
-  CSSSTYLEDECLARATION_FONTWEIGHT = -55,
-  CSSSTYLEDECLARATION_HEIGHT = -56,
-  CSSSTYLEDECLARATION_LEFT = -57,
-  CSSSTYLEDECLARATION_LETTERSPACING = -58,
-  CSSSTYLEDECLARATION_LINEHEIGHT = -59,
-  CSSSTYLEDECLARATION_LISTSTYLE = -60,
-  CSSSTYLEDECLARATION_LISTSTYLEIMAGE = -61,
-  CSSSTYLEDECLARATION_LISTSTYLEPOSITION = -62,
-  CSSSTYLEDECLARATION_LISTSTYLETYPE = -63,
-  CSSSTYLEDECLARATION_MARGIN = -64,
-  CSSSTYLEDECLARATION_MARGINTOP = -65,
-  CSSSTYLEDECLARATION_MARGINRIGHT = -66,
-  CSSSTYLEDECLARATION_MARGINBOTTOM = -67,
-  CSSSTYLEDECLARATION_MARGINLEFT = -68,
-  CSSSTYLEDECLARATION_MARKEROFFSET = -69,
-  CSSSTYLEDECLARATION_MARKS = -70,
-  CSSSTYLEDECLARATION_MAXHEIGHT = -71,
-  CSSSTYLEDECLARATION_MAXWIDTH = -72,
-  CSSSTYLEDECLARATION_MINHEIGHT = -73,
-  CSSSTYLEDECLARATION_MINWIDTH = -74,
-  CSSSTYLEDECLARATION_ORPHANS = -75,
-  CSSSTYLEDECLARATION_OUTLINE = -76,
-  CSSSTYLEDECLARATION_OUTLINECOLOR = -77,
-  CSSSTYLEDECLARATION_OUTLINESTYLE = -78,
-  CSSSTYLEDECLARATION_OUTLINEWIDTH = -79,
-  CSSSTYLEDECLARATION_OVERFLOW = -80,
-  CSSSTYLEDECLARATION_PADDING = -81,
-  CSSSTYLEDECLARATION_PADDINGTOP = -82,
-  CSSSTYLEDECLARATION_PADDINGRIGHT = -83,
-  CSSSTYLEDECLARATION_PADDINGBOTTOM = -84,
-  CSSSTYLEDECLARATION_PADDINGLEFT = -85,
-  CSSSTYLEDECLARATION_PAGE = -86,
-  CSSSTYLEDECLARATION_PAGEBREAKAFTER = -87,
-  CSSSTYLEDECLARATION_PAGEBREAKBEFORE = -88,
-  CSSSTYLEDECLARATION_PAGEBREAKINSIDE = -89,
-  CSSSTYLEDECLARATION_PAUSE = -90,
-  CSSSTYLEDECLARATION_PAUSEAFTER = -91,
-  CSSSTYLEDECLARATION_PAUSEBEFORE = -92,
-  CSSSTYLEDECLARATION_PITCH = -93,
-  CSSSTYLEDECLARATION_PITCHRANGE = -94,
-  CSSSTYLEDECLARATION_PLAYDURING = -95,
-  CSSSTYLEDECLARATION_POSITION = -96,
-  CSSSTYLEDECLARATION_QUOTES = -97,
-  CSSSTYLEDECLARATION_RICHNESS = -98,
-  CSSSTYLEDECLARATION_RIGHT = -99,
-  CSSSTYLEDECLARATION_SIZE = -100,
-  CSSSTYLEDECLARATION_SPEAK = -101,
-  CSSSTYLEDECLARATION_SPEAKHEADER = -102,
-  CSSSTYLEDECLARATION_SPEAKNUMERAL = -103,
-  CSSSTYLEDECLARATION_SPEAKPUNCTUATION = -104,
-  CSSSTYLEDECLARATION_SPEECHRATE = -105,
-  CSSSTYLEDECLARATION_STRESS = -106,
-  CSSSTYLEDECLARATION_TABLELAYOUT = -107,
-  CSSSTYLEDECLARATION_TEXTALIGN = -108,
-  CSSSTYLEDECLARATION_TEXTDECORATION = -109,
-  CSSSTYLEDECLARATION_TEXTINDENT = -110,
-  CSSSTYLEDECLARATION_TEXTSHADOW = -111,
-  CSSSTYLEDECLARATION_TEXTTRANSFORM = -112,
-  CSSSTYLEDECLARATION_TOP = -113,
-  CSSSTYLEDECLARATION_UNICODEBIDI = -114,
-  CSSSTYLEDECLARATION_VERTICALALIGN = -115,
-  CSSSTYLEDECLARATION_VISIBILITY = -116,
-  CSSSTYLEDECLARATION_VOICEFAMILY = -117,
-  CSSSTYLEDECLARATION_VOLUME = -118,
-  CSSSTYLEDECLARATION_WHITESPACE = -119,
-  CSSSTYLEDECLARATION_WIDOWS = -120,
-  CSSSTYLEDECLARATION_WIDTH = -121,
-  CSSSTYLEDECLARATION_WORDSPACING = -122,
-  CSSSTYLEDECLARATION_ZINDEX = -123,
-  CSSSTYLEDECLARATION_OPACITY = -124
+  CSSSTYLEDECLARATION_CSSTEXT = -1,
+  CSSSTYLEDECLARATION_LENGTH = -2
 };
 
 /***********************************************************************/
@@ -181,6 +59,19 @@ GetCSSStyleDeclarationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp
 
   if (JSVAL_IS_INT(id)) {
     switch(JSVAL_TO_INT(id)) {
+      case CSSSTYLEDECLARATION_CSSTEXT:
+      {
+        nsAutoString prop;
+        if (NS_OK == a->GetCssText(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
       case CSSSTYLEDECLARATION_LENGTH:
       {
         PRUint32 prop;
@@ -192,1605 +83,6 @@ GetCSSStyleDeclarationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp
         }
         break;
       }
-      case CSSSTYLEDECLARATION_AZIMUTH:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetAzimuth(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BACKGROUND:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBackground(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BACKGROUNDATTACHMENT:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBackgroundAttachment(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BACKGROUNDCOLOR:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBackgroundColor(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BACKGROUNDIMAGE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBackgroundImage(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BACKGROUNDPOSITION:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBackgroundPosition(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BACKGROUNDREPEAT:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBackgroundRepeat(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDER:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBorder(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERCOLLAPSE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBorderCollapse(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERCOLOR:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBorderColor(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERSPACING:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBorderSpacing(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERSTYLE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBorderStyle(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERTOP:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBorderTop(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERRIGHT:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBorderRight(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERBOTTOM:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBorderBottom(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERLEFT:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBorderLeft(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERTOPCOLOR:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBorderTopColor(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERRIGHTCOLOR:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBorderRightColor(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERBOTTOMCOLOR:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBorderBottomColor(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERLEFTCOLOR:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBorderLeftColor(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERTOPSTYLE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBorderTopStyle(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERRIGHTSTYLE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBorderRightStyle(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERBOTTOMSTYLE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBorderBottomStyle(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERLEFTSTYLE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBorderLeftStyle(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERTOPWIDTH:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBorderTopWidth(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERRIGHTWIDTH:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBorderRightWidth(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERBOTTOMWIDTH:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBorderBottomWidth(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERLEFTWIDTH:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBorderLeftWidth(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERWIDTH:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBorderWidth(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_BOTTOM:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetBottom(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_CAPTIONSIDE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetCaptionSide(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_CLEAR:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetClear(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_CLIP:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetClip(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_COLOR:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetColor(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_CONTENT:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetContent(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_COUNTERINCREMENT:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetCounterIncrement(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_COUNTERRESET:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetCounterReset(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_CUE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetCue(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_CUEAFTER:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetCueAfter(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_CUEBEFORE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetCueBefore(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_CURSOR:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetCursor(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_DIRECTION:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetDirection(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_DISPLAY:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetDisplay(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_ELEVATION:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetElevation(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_EMPTYCELLS:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetEmptyCells(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_STYLEFLOAT:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetStyleFloat(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_FONT:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetFont(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_FONTFAMILY:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetFontFamily(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_FONTSIZE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetFontSize(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_FONTSIZEADJUST:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetFontSizeAdjust(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_FONTSTRETCH:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetFontStretch(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_FONTSTYLE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetFontStyle(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_FONTVARIANT:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetFontVariant(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_FONTWEIGHT:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetFontWeight(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_HEIGHT:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetHeight(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_LEFT:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetLeft(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_LETTERSPACING:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetLetterSpacing(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_LINEHEIGHT:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetLineHeight(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_LISTSTYLE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetListStyle(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_LISTSTYLEIMAGE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetListStyleImage(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_LISTSTYLEPOSITION:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetListStylePosition(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_LISTSTYLETYPE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetListStyleType(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_MARGIN:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetMargin(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_MARGINTOP:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetMarginTop(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_MARGINRIGHT:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetMarginRight(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_MARGINBOTTOM:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetMarginBottom(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_MARGINLEFT:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetMarginLeft(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_MARKEROFFSET:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetMarkerOffset(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_MARKS:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetMarks(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_MAXHEIGHT:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetMaxHeight(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_MAXWIDTH:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetMaxWidth(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_MINHEIGHT:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetMinHeight(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_MINWIDTH:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetMinWidth(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_ORPHANS:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetOrphans(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_OUTLINE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetOutline(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_OUTLINECOLOR:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetOutlineColor(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_OUTLINESTYLE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetOutlineStyle(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_OUTLINEWIDTH:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetOutlineWidth(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_OVERFLOW:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetOverflow(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_PADDING:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetPadding(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_PADDINGTOP:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetPaddingTop(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_PADDINGRIGHT:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetPaddingRight(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_PADDINGBOTTOM:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetPaddingBottom(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_PADDINGLEFT:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetPaddingLeft(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_PAGE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetPage(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_PAGEBREAKAFTER:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetPageBreakAfter(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_PAGEBREAKBEFORE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetPageBreakBefore(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_PAGEBREAKINSIDE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetPageBreakInside(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_PAUSE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetPause(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_PAUSEAFTER:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetPauseAfter(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_PAUSEBEFORE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetPauseBefore(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_PITCH:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetPitch(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_PITCHRANGE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetPitchRange(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_PLAYDURING:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetPlayDuring(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_POSITION:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetPosition(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_QUOTES:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetQuotes(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_RICHNESS:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetRichness(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_RIGHT:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetRight(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_SIZE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetSize(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_SPEAK:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetSpeak(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_SPEAKHEADER:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetSpeakHeader(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_SPEAKNUMERAL:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetSpeakNumeral(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_SPEAKPUNCTUATION:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetSpeakPunctuation(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_SPEECHRATE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetSpeechRate(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_STRESS:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetStress(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_TABLELAYOUT:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetTableLayout(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_TEXTALIGN:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetTextAlign(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_TEXTDECORATION:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetTextDecoration(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_TEXTINDENT:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetTextIndent(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_TEXTSHADOW:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetTextShadow(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_TEXTTRANSFORM:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetTextTransform(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_TOP:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetTop(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_UNICODEBIDI:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetUnicodeBidi(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_VERTICALALIGN:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetVerticalAlign(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_VISIBILITY:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetVisibility(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_VOICEFAMILY:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetVoiceFamily(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_VOLUME:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetVolume(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_WHITESPACE:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetWhiteSpace(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_WIDOWS:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetWidows(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_WIDTH:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetWidth(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_WORDSPACING:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetWordSpacing(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_ZINDEX:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetZIndex(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
-      case CSSSTYLEDECLARATION_OPACITY:
-      {
-        nsAutoString prop;
-        if (NS_OK == a->GetOpacity(prop)) {
-          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
-          // set the return value
-          *vp = STRING_TO_JSVAL(jsstring);
-        }
-        else {
-          return JS_FALSE;
-        }
-        break;
-      }
       default:
       {
         nsAutoString prop;
@@ -1834,7 +126,7 @@ SetCSSStyleDeclarationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp
 
   if (JSVAL_IS_INT(id)) {
     switch(JSVAL_TO_INT(id)) {
-      case CSSSTYLEDECLARATION_AZIMUTH:
+      case CSSSTYLEDECLARATION_CSSTEXT:
       {
         nsAutoString prop;
         JSString *jsstring;
@@ -1845,1837 +137,7 @@ SetCSSStyleDeclarationProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp
           prop.SetString((const char *)nsnull);
         }
       
-        a->SetAzimuth(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BACKGROUND:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBackground(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BACKGROUNDATTACHMENT:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBackgroundAttachment(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BACKGROUNDCOLOR:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBackgroundColor(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BACKGROUNDIMAGE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBackgroundImage(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BACKGROUNDPOSITION:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBackgroundPosition(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BACKGROUNDREPEAT:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBackgroundRepeat(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDER:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBorder(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERCOLLAPSE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBorderCollapse(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERCOLOR:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBorderColor(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERSPACING:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBorderSpacing(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERSTYLE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBorderStyle(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERTOP:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBorderTop(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERRIGHT:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBorderRight(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERBOTTOM:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBorderBottom(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERLEFT:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBorderLeft(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERTOPCOLOR:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBorderTopColor(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERRIGHTCOLOR:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBorderRightColor(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERBOTTOMCOLOR:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBorderBottomColor(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERLEFTCOLOR:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBorderLeftColor(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERTOPSTYLE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBorderTopStyle(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERRIGHTSTYLE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBorderRightStyle(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERBOTTOMSTYLE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBorderBottomStyle(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERLEFTSTYLE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBorderLeftStyle(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERTOPWIDTH:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBorderTopWidth(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERRIGHTWIDTH:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBorderRightWidth(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERBOTTOMWIDTH:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBorderBottomWidth(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERLEFTWIDTH:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBorderLeftWidth(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BORDERWIDTH:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBorderWidth(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_BOTTOM:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetBottom(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_CAPTIONSIDE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetCaptionSide(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_CLEAR:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetClear(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_CLIP:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetClip(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_COLOR:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetColor(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_CONTENT:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetContent(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_COUNTERINCREMENT:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetCounterIncrement(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_COUNTERRESET:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetCounterReset(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_CUE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetCue(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_CUEAFTER:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetCueAfter(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_CUEBEFORE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetCueBefore(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_CURSOR:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetCursor(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_DIRECTION:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetDirection(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_DISPLAY:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetDisplay(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_ELEVATION:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetElevation(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_EMPTYCELLS:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetEmptyCells(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_STYLEFLOAT:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetStyleFloat(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_FONT:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetFont(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_FONTFAMILY:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetFontFamily(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_FONTSIZE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetFontSize(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_FONTSIZEADJUST:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetFontSizeAdjust(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_FONTSTRETCH:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetFontStretch(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_FONTSTYLE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetFontStyle(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_FONTVARIANT:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetFontVariant(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_FONTWEIGHT:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetFontWeight(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_HEIGHT:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetHeight(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_LEFT:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetLeft(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_LETTERSPACING:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetLetterSpacing(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_LINEHEIGHT:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetLineHeight(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_LISTSTYLE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetListStyle(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_LISTSTYLEIMAGE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetListStyleImage(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_LISTSTYLEPOSITION:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetListStylePosition(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_LISTSTYLETYPE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetListStyleType(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_MARGIN:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetMargin(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_MARGINTOP:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetMarginTop(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_MARGINRIGHT:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetMarginRight(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_MARGINBOTTOM:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetMarginBottom(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_MARGINLEFT:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetMarginLeft(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_MARKEROFFSET:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetMarkerOffset(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_MARKS:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetMarks(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_MAXHEIGHT:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetMaxHeight(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_MAXWIDTH:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetMaxWidth(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_MINHEIGHT:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetMinHeight(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_MINWIDTH:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetMinWidth(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_ORPHANS:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetOrphans(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_OUTLINE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetOutline(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_OUTLINECOLOR:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetOutlineColor(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_OUTLINESTYLE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetOutlineStyle(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_OUTLINEWIDTH:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetOutlineWidth(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_OVERFLOW:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetOverflow(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_PADDING:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetPadding(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_PADDINGTOP:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetPaddingTop(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_PADDINGRIGHT:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetPaddingRight(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_PADDINGBOTTOM:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetPaddingBottom(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_PADDINGLEFT:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetPaddingLeft(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_PAGE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetPage(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_PAGEBREAKAFTER:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetPageBreakAfter(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_PAGEBREAKBEFORE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetPageBreakBefore(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_PAGEBREAKINSIDE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetPageBreakInside(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_PAUSE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetPause(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_PAUSEAFTER:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetPauseAfter(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_PAUSEBEFORE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetPauseBefore(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_PITCH:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetPitch(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_PITCHRANGE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetPitchRange(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_PLAYDURING:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetPlayDuring(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_POSITION:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetPosition(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_QUOTES:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetQuotes(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_RICHNESS:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetRichness(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_RIGHT:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetRight(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_SIZE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetSize(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_SPEAK:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetSpeak(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_SPEAKHEADER:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetSpeakHeader(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_SPEAKNUMERAL:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetSpeakNumeral(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_SPEAKPUNCTUATION:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetSpeakPunctuation(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_SPEECHRATE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetSpeechRate(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_STRESS:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetStress(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_TABLELAYOUT:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetTableLayout(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_TEXTALIGN:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetTextAlign(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_TEXTDECORATION:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetTextDecoration(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_TEXTINDENT:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetTextIndent(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_TEXTSHADOW:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetTextShadow(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_TEXTTRANSFORM:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetTextTransform(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_TOP:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetTop(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_UNICODEBIDI:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetUnicodeBidi(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_VERTICALALIGN:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetVerticalAlign(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_VISIBILITY:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetVisibility(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_VOICEFAMILY:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetVoiceFamily(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_VOLUME:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetVolume(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_WHITESPACE:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetWhiteSpace(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_WIDOWS:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetWidows(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_WIDTH:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetWidth(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_WORDSPACING:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetWordSpacing(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_ZINDEX:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetZIndex(prop);
-        
-        break;
-      }
-      case CSSSTYLEDECLARATION_OPACITY:
-      {
-        nsAutoString prop;
-        JSString *jsstring;
-        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
-          prop.SetString(JS_GetStringChars(jsstring));
-        }
-        else {
-          prop.SetString((const char *)nsnull);
-        }
-      
-        a->SetOpacity(prop);
+        a->SetCssText(prop);
         
         break;
       }
@@ -3981,130 +443,8 @@ JSClass CSSStyleDeclarationClass = {
 //
 static JSPropertySpec CSSStyleDeclarationProperties[] =
 {
+  {"cssText",    CSSSTYLEDECLARATION_CSSTEXT,    JSPROP_ENUMERATE},
   {"length",    CSSSTYLEDECLARATION_LENGTH,    JSPROP_ENUMERATE | JSPROP_READONLY},
-  {"azimuth",    CSSSTYLEDECLARATION_AZIMUTH,    JSPROP_ENUMERATE},
-  {"background",    CSSSTYLEDECLARATION_BACKGROUND,    JSPROP_ENUMERATE},
-  {"backgroundAttachment",    CSSSTYLEDECLARATION_BACKGROUNDATTACHMENT,    JSPROP_ENUMERATE},
-  {"backgroundColor",    CSSSTYLEDECLARATION_BACKGROUNDCOLOR,    JSPROP_ENUMERATE},
-  {"backgroundImage",    CSSSTYLEDECLARATION_BACKGROUNDIMAGE,    JSPROP_ENUMERATE},
-  {"backgroundPosition",    CSSSTYLEDECLARATION_BACKGROUNDPOSITION,    JSPROP_ENUMERATE},
-  {"backgroundRepeat",    CSSSTYLEDECLARATION_BACKGROUNDREPEAT,    JSPROP_ENUMERATE},
-  {"border",    CSSSTYLEDECLARATION_BORDER,    JSPROP_ENUMERATE},
-  {"borderCollapse",    CSSSTYLEDECLARATION_BORDERCOLLAPSE,    JSPROP_ENUMERATE},
-  {"borderColor",    CSSSTYLEDECLARATION_BORDERCOLOR,    JSPROP_ENUMERATE},
-  {"borderSpacing",    CSSSTYLEDECLARATION_BORDERSPACING,    JSPROP_ENUMERATE},
-  {"borderStyle",    CSSSTYLEDECLARATION_BORDERSTYLE,    JSPROP_ENUMERATE},
-  {"borderTop",    CSSSTYLEDECLARATION_BORDERTOP,    JSPROP_ENUMERATE},
-  {"borderRight",    CSSSTYLEDECLARATION_BORDERRIGHT,    JSPROP_ENUMERATE},
-  {"borderBottom",    CSSSTYLEDECLARATION_BORDERBOTTOM,    JSPROP_ENUMERATE},
-  {"borderLeft",    CSSSTYLEDECLARATION_BORDERLEFT,    JSPROP_ENUMERATE},
-  {"borderTopColor",    CSSSTYLEDECLARATION_BORDERTOPCOLOR,    JSPROP_ENUMERATE},
-  {"borderRightColor",    CSSSTYLEDECLARATION_BORDERRIGHTCOLOR,    JSPROP_ENUMERATE},
-  {"borderBottomColor",    CSSSTYLEDECLARATION_BORDERBOTTOMCOLOR,    JSPROP_ENUMERATE},
-  {"borderLeftColor",    CSSSTYLEDECLARATION_BORDERLEFTCOLOR,    JSPROP_ENUMERATE},
-  {"borderTopStyle",    CSSSTYLEDECLARATION_BORDERTOPSTYLE,    JSPROP_ENUMERATE},
-  {"borderRightStyle",    CSSSTYLEDECLARATION_BORDERRIGHTSTYLE,    JSPROP_ENUMERATE},
-  {"borderBottomStyle",    CSSSTYLEDECLARATION_BORDERBOTTOMSTYLE,    JSPROP_ENUMERATE},
-  {"borderLeftStyle",    CSSSTYLEDECLARATION_BORDERLEFTSTYLE,    JSPROP_ENUMERATE},
-  {"borderTopWidth",    CSSSTYLEDECLARATION_BORDERTOPWIDTH,    JSPROP_ENUMERATE},
-  {"borderRightWidth",    CSSSTYLEDECLARATION_BORDERRIGHTWIDTH,    JSPROP_ENUMERATE},
-  {"borderBottomWidth",    CSSSTYLEDECLARATION_BORDERBOTTOMWIDTH,    JSPROP_ENUMERATE},
-  {"borderLeftWidth",    CSSSTYLEDECLARATION_BORDERLEFTWIDTH,    JSPROP_ENUMERATE},
-  {"borderWidth",    CSSSTYLEDECLARATION_BORDERWIDTH,    JSPROP_ENUMERATE},
-  {"bottom",    CSSSTYLEDECLARATION_BOTTOM,    JSPROP_ENUMERATE},
-  {"captionSide",    CSSSTYLEDECLARATION_CAPTIONSIDE,    JSPROP_ENUMERATE},
-  {"clear",    CSSSTYLEDECLARATION_CLEAR,    JSPROP_ENUMERATE},
-  {"clip",    CSSSTYLEDECLARATION_CLIP,    JSPROP_ENUMERATE},
-  {"color",    CSSSTYLEDECLARATION_COLOR,    JSPROP_ENUMERATE},
-  {"content",    CSSSTYLEDECLARATION_CONTENT,    JSPROP_ENUMERATE},
-  {"counterIncrement",    CSSSTYLEDECLARATION_COUNTERINCREMENT,    JSPROP_ENUMERATE},
-  {"counterReset",    CSSSTYLEDECLARATION_COUNTERRESET,    JSPROP_ENUMERATE},
-  {"cue",    CSSSTYLEDECLARATION_CUE,    JSPROP_ENUMERATE},
-  {"cueAfter",    CSSSTYLEDECLARATION_CUEAFTER,    JSPROP_ENUMERATE},
-  {"cueBefore",    CSSSTYLEDECLARATION_CUEBEFORE,    JSPROP_ENUMERATE},
-  {"cursor",    CSSSTYLEDECLARATION_CURSOR,    JSPROP_ENUMERATE},
-  {"direction",    CSSSTYLEDECLARATION_DIRECTION,    JSPROP_ENUMERATE},
-  {"display",    CSSSTYLEDECLARATION_DISPLAY,    JSPROP_ENUMERATE},
-  {"elevation",    CSSSTYLEDECLARATION_ELEVATION,    JSPROP_ENUMERATE},
-  {"emptyCells",    CSSSTYLEDECLARATION_EMPTYCELLS,    JSPROP_ENUMERATE},
-  {"styleFloat",    CSSSTYLEDECLARATION_STYLEFLOAT,    JSPROP_ENUMERATE},
-  {"font",    CSSSTYLEDECLARATION_FONT,    JSPROP_ENUMERATE},
-  {"fontFamily",    CSSSTYLEDECLARATION_FONTFAMILY,    JSPROP_ENUMERATE},
-  {"fontSize",    CSSSTYLEDECLARATION_FONTSIZE,    JSPROP_ENUMERATE},
-  {"fontSizeAdjust",    CSSSTYLEDECLARATION_FONTSIZEADJUST,    JSPROP_ENUMERATE},
-  {"fontStretch",    CSSSTYLEDECLARATION_FONTSTRETCH,    JSPROP_ENUMERATE},
-  {"fontStyle",    CSSSTYLEDECLARATION_FONTSTYLE,    JSPROP_ENUMERATE},
-  {"fontVariant",    CSSSTYLEDECLARATION_FONTVARIANT,    JSPROP_ENUMERATE},
-  {"fontWeight",    CSSSTYLEDECLARATION_FONTWEIGHT,    JSPROP_ENUMERATE},
-  {"height",    CSSSTYLEDECLARATION_HEIGHT,    JSPROP_ENUMERATE},
-  {"left",    CSSSTYLEDECLARATION_LEFT,    JSPROP_ENUMERATE},
-  {"letterSpacing",    CSSSTYLEDECLARATION_LETTERSPACING,    JSPROP_ENUMERATE},
-  {"lineHeight",    CSSSTYLEDECLARATION_LINEHEIGHT,    JSPROP_ENUMERATE},
-  {"listStyle",    CSSSTYLEDECLARATION_LISTSTYLE,    JSPROP_ENUMERATE},
-  {"listStyleImage",    CSSSTYLEDECLARATION_LISTSTYLEIMAGE,    JSPROP_ENUMERATE},
-  {"listStylePosition",    CSSSTYLEDECLARATION_LISTSTYLEPOSITION,    JSPROP_ENUMERATE},
-  {"listStyleType",    CSSSTYLEDECLARATION_LISTSTYLETYPE,    JSPROP_ENUMERATE},
-  {"margin",    CSSSTYLEDECLARATION_MARGIN,    JSPROP_ENUMERATE},
-  {"marginTop",    CSSSTYLEDECLARATION_MARGINTOP,    JSPROP_ENUMERATE},
-  {"marginRight",    CSSSTYLEDECLARATION_MARGINRIGHT,    JSPROP_ENUMERATE},
-  {"marginBottom",    CSSSTYLEDECLARATION_MARGINBOTTOM,    JSPROP_ENUMERATE},
-  {"marginLeft",    CSSSTYLEDECLARATION_MARGINLEFT,    JSPROP_ENUMERATE},
-  {"markerOffset",    CSSSTYLEDECLARATION_MARKEROFFSET,    JSPROP_ENUMERATE},
-  {"marks",    CSSSTYLEDECLARATION_MARKS,    JSPROP_ENUMERATE},
-  {"maxHeight",    CSSSTYLEDECLARATION_MAXHEIGHT,    JSPROP_ENUMERATE},
-  {"maxWidth",    CSSSTYLEDECLARATION_MAXWIDTH,    JSPROP_ENUMERATE},
-  {"minHeight",    CSSSTYLEDECLARATION_MINHEIGHT,    JSPROP_ENUMERATE},
-  {"minWidth",    CSSSTYLEDECLARATION_MINWIDTH,    JSPROP_ENUMERATE},
-  {"orphans",    CSSSTYLEDECLARATION_ORPHANS,    JSPROP_ENUMERATE},
-  {"outline",    CSSSTYLEDECLARATION_OUTLINE,    JSPROP_ENUMERATE},
-  {"outlineColor",    CSSSTYLEDECLARATION_OUTLINECOLOR,    JSPROP_ENUMERATE},
-  {"outlineStyle",    CSSSTYLEDECLARATION_OUTLINESTYLE,    JSPROP_ENUMERATE},
-  {"outlineWidth",    CSSSTYLEDECLARATION_OUTLINEWIDTH,    JSPROP_ENUMERATE},
-  {"overflow",    CSSSTYLEDECLARATION_OVERFLOW,    JSPROP_ENUMERATE},
-  {"padding",    CSSSTYLEDECLARATION_PADDING,    JSPROP_ENUMERATE},
-  {"paddingTop",    CSSSTYLEDECLARATION_PADDINGTOP,    JSPROP_ENUMERATE},
-  {"paddingRight",    CSSSTYLEDECLARATION_PADDINGRIGHT,    JSPROP_ENUMERATE},
-  {"paddingBottom",    CSSSTYLEDECLARATION_PADDINGBOTTOM,    JSPROP_ENUMERATE},
-  {"paddingLeft",    CSSSTYLEDECLARATION_PADDINGLEFT,    JSPROP_ENUMERATE},
-  {"page",    CSSSTYLEDECLARATION_PAGE,    JSPROP_ENUMERATE},
-  {"pageBreakAfter",    CSSSTYLEDECLARATION_PAGEBREAKAFTER,    JSPROP_ENUMERATE},
-  {"pageBreakBefore",    CSSSTYLEDECLARATION_PAGEBREAKBEFORE,    JSPROP_ENUMERATE},
-  {"pageBreakInside",    CSSSTYLEDECLARATION_PAGEBREAKINSIDE,    JSPROP_ENUMERATE},
-  {"pause",    CSSSTYLEDECLARATION_PAUSE,    JSPROP_ENUMERATE},
-  {"pauseAfter",    CSSSTYLEDECLARATION_PAUSEAFTER,    JSPROP_ENUMERATE},
-  {"pauseBefore",    CSSSTYLEDECLARATION_PAUSEBEFORE,    JSPROP_ENUMERATE},
-  {"pitch",    CSSSTYLEDECLARATION_PITCH,    JSPROP_ENUMERATE},
-  {"pitchRange",    CSSSTYLEDECLARATION_PITCHRANGE,    JSPROP_ENUMERATE},
-  {"playDuring",    CSSSTYLEDECLARATION_PLAYDURING,    JSPROP_ENUMERATE},
-  {"position",    CSSSTYLEDECLARATION_POSITION,    JSPROP_ENUMERATE},
-  {"quotes",    CSSSTYLEDECLARATION_QUOTES,    JSPROP_ENUMERATE},
-  {"richness",    CSSSTYLEDECLARATION_RICHNESS,    JSPROP_ENUMERATE},
-  {"right",    CSSSTYLEDECLARATION_RIGHT,    JSPROP_ENUMERATE},
-  {"size",    CSSSTYLEDECLARATION_SIZE,    JSPROP_ENUMERATE},
-  {"speak",    CSSSTYLEDECLARATION_SPEAK,    JSPROP_ENUMERATE},
-  {"speakHeader",    CSSSTYLEDECLARATION_SPEAKHEADER,    JSPROP_ENUMERATE},
-  {"speakNumeral",    CSSSTYLEDECLARATION_SPEAKNUMERAL,    JSPROP_ENUMERATE},
-  {"speakPunctuation",    CSSSTYLEDECLARATION_SPEAKPUNCTUATION,    JSPROP_ENUMERATE},
-  {"speechRate",    CSSSTYLEDECLARATION_SPEECHRATE,    JSPROP_ENUMERATE},
-  {"stress",    CSSSTYLEDECLARATION_STRESS,    JSPROP_ENUMERATE},
-  {"tableLayout",    CSSSTYLEDECLARATION_TABLELAYOUT,    JSPROP_ENUMERATE},
-  {"textAlign",    CSSSTYLEDECLARATION_TEXTALIGN,    JSPROP_ENUMERATE},
-  {"textDecoration",    CSSSTYLEDECLARATION_TEXTDECORATION,    JSPROP_ENUMERATE},
-  {"textIndent",    CSSSTYLEDECLARATION_TEXTINDENT,    JSPROP_ENUMERATE},
-  {"textShadow",    CSSSTYLEDECLARATION_TEXTSHADOW,    JSPROP_ENUMERATE},
-  {"textTransform",    CSSSTYLEDECLARATION_TEXTTRANSFORM,    JSPROP_ENUMERATE},
-  {"top",    CSSSTYLEDECLARATION_TOP,    JSPROP_ENUMERATE},
-  {"unicodeBidi",    CSSSTYLEDECLARATION_UNICODEBIDI,    JSPROP_ENUMERATE},
-  {"verticalAlign",    CSSSTYLEDECLARATION_VERTICALALIGN,    JSPROP_ENUMERATE},
-  {"visibility",    CSSSTYLEDECLARATION_VISIBILITY,    JSPROP_ENUMERATE},
-  {"voiceFamily",    CSSSTYLEDECLARATION_VOICEFAMILY,    JSPROP_ENUMERATE},
-  {"volume",    CSSSTYLEDECLARATION_VOLUME,    JSPROP_ENUMERATE},
-  {"whiteSpace",    CSSSTYLEDECLARATION_WHITESPACE,    JSPROP_ENUMERATE},
-  {"widows",    CSSSTYLEDECLARATION_WIDOWS,    JSPROP_ENUMERATE},
-  {"width",    CSSSTYLEDECLARATION_WIDTH,    JSPROP_ENUMERATE},
-  {"wordSpacing",    CSSSTYLEDECLARATION_WORDSPACING,    JSPROP_ENUMERATE},
-  {"zIndex",    CSSSTYLEDECLARATION_ZINDEX,    JSPROP_ENUMERATE},
-  {"opacity",    CSSSTYLEDECLARATION_OPACITY,    JSPROP_ENUMERATE},
   {0}
 };
 
diff --git a/mozilla/dom/src/css/nsJSCSSStyleRule.cpp b/mozilla/dom/src/css/nsJSCSSStyleRule.cpp
index 70476810266..b90a9b26da3 100644
--- a/mozilla/dom/src/css/nsJSCSSStyleRule.cpp
+++ b/mozilla/dom/src/css/nsJSCSSStyleRule.cpp
@@ -25,21 +25,25 @@
 #include "nsIScriptGlobalObject.h"
 #include "nsIPtr.h"
 #include "nsString.h"
+#include "nsIDOMCSSStyleDeclaration.h"
 #include "nsIDOMCSSStyleRule.h"
 
 
 static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
 static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
 static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
+static NS_DEFINE_IID(kICSSStyleDeclarationIID, NS_IDOMCSSSTYLEDECLARATION_IID);
 static NS_DEFINE_IID(kICSSStyleRuleIID, NS_IDOMCSSSTYLERULE_IID);
 
+NS_DEF_PTR(nsIDOMCSSStyleDeclaration);
 NS_DEF_PTR(nsIDOMCSSStyleRule);
 
 //
 // CSSStyleRule property ids
 //
 enum CSSStyleRule_slots {
-  CSSSTYLERULE_TYPE = -1
+  CSSSTYLERULE_SELECTORTEXT = -1,
+  CSSSTYLERULE_STYLE = -2
 };
 
 /***********************************************************************/
@@ -58,10 +62,10 @@ GetCSSStyleRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
 
   if (JSVAL_IS_INT(id)) {
     switch(JSVAL_TO_INT(id)) {
-      case CSSSTYLERULE_TYPE:
+      case CSSSTYLERULE_SELECTORTEXT:
       {
         nsAutoString prop;
-        if (NS_OK == a->GetType(prop)) {
+        if (NS_OK == a->GetSelectorText(prop)) {
           JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
           // set the return value
           *vp = STRING_TO_JSVAL(jsstring);
@@ -71,6 +75,33 @@ GetCSSStyleRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
         }
         break;
       }
+      case CSSSTYLERULE_STYLE:
+      {
+        nsIDOMCSSStyleDeclaration* prop;
+        if (NS_OK == a->GetStyle(&prop)) {
+          // get the js object
+          if (prop != nsnull) {
+            nsIScriptObjectOwner *owner = nsnull;
+            if (NS_OK == prop->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
+              JSObject *object = nsnull;
+              nsIScriptContext *script_cx = (nsIScriptContext *)JS_GetContextPrivate(cx);
+              if (NS_OK == owner->GetScriptObject(script_cx, (void**)&object)) {
+                // set the return value
+                *vp = OBJECT_TO_JSVAL(object);
+              }
+              NS_RELEASE(owner);
+            }
+            NS_RELEASE(prop);
+          }
+          else {
+            *vp = JSVAL_NULL;
+          }
+        }
+        else {
+          return JS_FALSE;
+        }
+        break;
+      }
       default:
       {
         nsIJSScriptObject *object;
@@ -112,7 +143,44 @@ SetCSSStyleRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
 
   if (JSVAL_IS_INT(id)) {
     switch(JSVAL_TO_INT(id)) {
-      case 0:
+      case CSSSTYLERULE_SELECTORTEXT:
+      {
+        nsAutoString prop;
+        JSString *jsstring;
+        if ((jsstring = JS_ValueToString(cx, *vp)) != nsnull) {
+          prop.SetString(JS_GetStringChars(jsstring));
+        }
+        else {
+          prop.SetString((const char *)nsnull);
+        }
+      
+        a->SetSelectorText(prop);
+        
+        break;
+      }
+      case CSSSTYLERULE_STYLE:
+      {
+        nsIDOMCSSStyleDeclaration* prop;
+        if (JSVAL_IS_NULL(*vp)) {
+          prop = nsnull;
+        }
+        else if (JSVAL_IS_OBJECT(*vp)) {
+          JSObject *jsobj = JSVAL_TO_OBJECT(*vp); 
+          nsISupports *supports = (nsISupports *)JS_GetPrivate(cx, jsobj);
+          if (NS_OK != supports->QueryInterface(kICSSStyleDeclarationIID, (void **)&prop)) {
+            JS_ReportError(cx, "Parameter must be of type CSSStyleDeclaration");
+            return JS_FALSE;
+          }
+        }
+        else {
+          JS_ReportError(cx, "Parameter must be an object");
+          return JS_FALSE;
+        }
+      
+        a->SetStyle(prop);
+        if (prop) NS_RELEASE(prop);
+        break;
+      }
       default:
       {
         nsIJSScriptObject *object;
@@ -223,7 +291,8 @@ JSClass CSSStyleRuleClass = {
 //
 static JSPropertySpec CSSStyleRuleProperties[] =
 {
-  {"type",    CSSSTYLERULE_TYPE,    JSPROP_ENUMERATE | JSPROP_READONLY},
+  {"selectorText",    CSSSTYLERULE_SELECTORTEXT,    JSPROP_ENUMERATE},
+  {"style",    CSSSTYLERULE_STYLE,    JSPROP_ENUMERATE},
   {0}
 };
 
@@ -265,6 +334,9 @@ nsresult NS_InitCSSStyleRuleClass(nsIScriptContext *aContext, void **aPrototype)
       (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
       !JSVAL_IS_OBJECT(vp)) {
 
+    if (NS_OK != NS_InitCSSRuleClass(aContext, (void **)&parent_proto)) {
+      return NS_ERROR_FAILURE;
+    }
     proto = JS_InitClass(jscontext,     // context
                          global,        // global object
                          parent_proto,  // parent proto 
diff --git a/mozilla/dom/src/css/nsJSCSSStyleSheet.cpp b/mozilla/dom/src/css/nsJSCSSStyleSheet.cpp
index 1a63218eb36..e18cb618a1f 100644
--- a/mozilla/dom/src/css/nsJSCSSStyleSheet.cpp
+++ b/mozilla/dom/src/css/nsJSCSSStyleSheet.cpp
@@ -25,8 +25,8 @@
 #include "nsIScriptGlobalObject.h"
 #include "nsIPtr.h"
 #include "nsString.h"
-#include "nsIDOMHTMLElement.h"
-#include "nsIDOMStyleSheetCollection.h"
+#include "nsIDOMNode.h"
+#include "nsIDOMStyleSheet.h"
 #include "nsIDOMCSSStyleRuleCollection.h"
 #include "nsIDOMCSSStyleSheet.h"
 
@@ -34,13 +34,13 @@
 static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
 static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
 static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
-static NS_DEFINE_IID(kIHTMLElementIID, NS_IDOMHTMLELEMENT_IID);
-static NS_DEFINE_IID(kIStyleSheetCollectionIID, NS_IDOMSTYLESHEETCOLLECTION_IID);
+static NS_DEFINE_IID(kINodeIID, NS_IDOMNODE_IID);
+static NS_DEFINE_IID(kIStyleSheetIID, NS_IDOMSTYLESHEET_IID);
 static NS_DEFINE_IID(kICSSStyleRuleCollectionIID, NS_IDOMCSSSTYLERULECOLLECTION_IID);
 static NS_DEFINE_IID(kICSSStyleSheetIID, NS_IDOMCSSSTYLESHEET_IID);
 
-NS_DEF_PTR(nsIDOMHTMLElement);
-NS_DEF_PTR(nsIDOMStyleSheetCollection);
+NS_DEF_PTR(nsIDOMNode);
+NS_DEF_PTR(nsIDOMStyleSheet);
 NS_DEF_PTR(nsIDOMCSSStyleRuleCollection);
 NS_DEF_PTR(nsIDOMCSSStyleSheet);
 
@@ -48,12 +48,12 @@ NS_DEF_PTR(nsIDOMCSSStyleSheet);
 // CSSStyleSheet property ids
 //
 enum CSSStyleSheet_slots {
-  CSSSTYLESHEET_OWNINGELEMENT = -1,
+  CSSSTYLESHEET_OWNINGNODE = -1,
   CSSSTYLESHEET_PARENTSTYLESHEET = -2,
   CSSSTYLESHEET_HREF = -3,
   CSSSTYLESHEET_TITLE = -4,
-  CSSSTYLESHEET_IMPORTS = -5,
-  CSSSTYLESHEET_RULES = -6
+  CSSSTYLESHEET_MEDIA = -5,
+  CSSSTYLESHEET_CSSRULES = -6
 };
 
 /***********************************************************************/
@@ -72,10 +72,10 @@ GetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
 
   if (JSVAL_IS_INT(id)) {
     switch(JSVAL_TO_INT(id)) {
-      case CSSSTYLESHEET_OWNINGELEMENT:
+      case CSSSTYLESHEET_OWNINGNODE:
       {
-        nsIDOMHTMLElement* prop;
-        if (NS_OK == a->GetOwningElement(&prop)) {
+        nsIDOMNode* prop;
+        if (NS_OK == a->GetOwningNode(&prop)) {
           // get the js object
           if (prop != nsnull) {
             nsIScriptObjectOwner *owner = nsnull;
@@ -101,7 +101,7 @@ GetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
       }
       case CSSSTYLESHEET_PARENTSTYLESHEET:
       {
-        nsIDOMCSSStyleSheet* prop;
+        nsIDOMStyleSheet* prop;
         if (NS_OK == a->GetParentStyleSheet(&prop)) {
           // get the js object
           if (prop != nsnull) {
@@ -152,37 +152,23 @@ GetCSSStyleSheetProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
         }
         break;
       }
-      case CSSSTYLESHEET_IMPORTS:
+      case CSSSTYLESHEET_MEDIA:
       {
-        nsIDOMStyleSheetCollection* prop;
-        if (NS_OK == a->GetImports(&prop)) {
-          // get the js object
-          if (prop != nsnull) {
-            nsIScriptObjectOwner *owner = nsnull;
-            if (NS_OK == prop->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
-              JSObject *object = nsnull;
-              nsIScriptContext *script_cx = (nsIScriptContext *)JS_GetContextPrivate(cx);
-              if (NS_OK == owner->GetScriptObject(script_cx, (void**)&object)) {
-                // set the return value
-                *vp = OBJECT_TO_JSVAL(object);
-              }
-              NS_RELEASE(owner);
-            }
-            NS_RELEASE(prop);
-          }
-          else {
-            *vp = JSVAL_NULL;
-          }
+        nsAutoString prop;
+        if (NS_OK == a->GetMedia(prop)) {
+          JSString *jsstring = JS_NewUCStringCopyN(cx, prop, prop.Length());
+          // set the return value
+          *vp = STRING_TO_JSVAL(jsstring);
         }
         else {
           return JS_FALSE;
         }
         break;
       }
-      case CSSSTYLESHEET_RULES:
+      case CSSSTYLESHEET_CSSRULES:
       {
         nsIDOMCSSStyleRuleCollection* prop;
-        if (NS_OK == a->GetRules(&prop)) {
+        if (NS_OK == a->GetCssRules(&prop)) {
           // get the js object
           if (prop != nsnull) {
             nsIScriptObjectOwner *owner = nsnull;
@@ -336,68 +322,10 @@ ResolveCSSStyleSheet(JSContext *cx, JSObject *obj, jsval id)
 
 
 //
-// Native method AddRule
+// Native method InsertRule
 //
 PR_STATIC_CALLBACK(JSBool)
-CSSStyleSheetAddRule(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMCSSStyleSheet *nativeThis = (nsIDOMCSSStyleSheet*)JS_GetPrivate(cx, obj);
-  JSBool rBool = JS_FALSE;
-  PRUint32 nativeRet;
-  nsAutoString b0;
-  nsAutoString b1;
-  PRUint32 b2;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  if (argc >= 3) {
-
-    JSString *jsstring0 = JS_ValueToString(cx, argv[0]);
-    if (nsnull != jsstring0) {
-      b0.SetString(JS_GetStringChars(jsstring0));
-    }
-    else {
-      b0.SetString("");   // Should this really be null?? 
-    }
-
-    JSString *jsstring1 = JS_ValueToString(cx, argv[1]);
-    if (nsnull != jsstring1) {
-      b1.SetString(JS_GetStringChars(jsstring1));
-    }
-    else {
-      b1.SetString("");   // Should this really be null?? 
-    }
-
-    if (!JS_ValueToInt32(cx, argv[2], (int32 *)&b2)) {
-      JS_ReportError(cx, "Parameter must be a number");
-      return JS_FALSE;
-    }
-
-    if (NS_OK != nativeThis->AddRule(b0, b1, b2, &nativeRet)) {
-      return JS_FALSE;
-    }
-
-    *rval = INT_TO_JSVAL(nativeRet);
-  }
-  else {
-    JS_ReportError(cx, "Function addRule requires 3 parameters");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-
-//
-// Native method AddImport
-//
-PR_STATIC_CALLBACK(JSBool)
-CSSStyleSheetAddImport(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+CSSStyleSheetInsertRule(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
   nsIDOMCSSStyleSheet *nativeThis = (nsIDOMCSSStyleSheet*)JS_GetPrivate(cx, obj);
   JSBool rBool = JS_FALSE;
@@ -427,14 +355,14 @@ CSSStyleSheetAddImport(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js
       return JS_FALSE;
     }
 
-    if (NS_OK != nativeThis->AddImport(b0, b1, &nativeRet)) {
+    if (NS_OK != nativeThis->InsertRule(b0, b1, &nativeRet)) {
       return JS_FALSE;
     }
 
     *rval = INT_TO_JSVAL(nativeRet);
   }
   else {
-    JS_ReportError(cx, "Function addImport requires 2 parameters");
+    JS_ReportError(cx, "Function insertRule requires 2 parameters");
     return JS_FALSE;
   }
 
@@ -443,10 +371,10 @@ CSSStyleSheetAddImport(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, js
 
 
 //
-// Native method RemoveRule
+// Native method DeleteRule
 //
 PR_STATIC_CALLBACK(JSBool)
-CSSStyleSheetRemoveRule(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+CSSStyleSheetDeleteRule(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
 {
   nsIDOMCSSStyleSheet *nativeThis = (nsIDOMCSSStyleSheet*)JS_GetPrivate(cx, obj);
   JSBool rBool = JS_FALSE;
@@ -466,53 +394,14 @@ CSSStyleSheetRemoveRule(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, j
       return JS_FALSE;
     }
 
-    if (NS_OK != nativeThis->RemoveRule(b0)) {
+    if (NS_OK != nativeThis->DeleteRule(b0)) {
       return JS_FALSE;
     }
 
     *rval = JSVAL_VOID;
   }
   else {
-    JS_ReportError(cx, "Function removeRule requires 1 parameters");
-    return JS_FALSE;
-  }
-
-  return JS_TRUE;
-}
-
-
-//
-// Native method RemoveImport
-//
-PR_STATIC_CALLBACK(JSBool)
-CSSStyleSheetRemoveImport(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
-{
-  nsIDOMCSSStyleSheet *nativeThis = (nsIDOMCSSStyleSheet*)JS_GetPrivate(cx, obj);
-  JSBool rBool = JS_FALSE;
-  PRUint32 b0;
-
-  *rval = JSVAL_NULL;
-
-  // If there's no private data, this must be the prototype, so ignore
-  if (nsnull == nativeThis) {
-    return JS_TRUE;
-  }
-
-  if (argc >= 1) {
-
-    if (!JS_ValueToInt32(cx, argv[0], (int32 *)&b0)) {
-      JS_ReportError(cx, "Parameter must be a number");
-      return JS_FALSE;
-    }
-
-    if (NS_OK != nativeThis->RemoveImport(b0)) {
-      return JS_FALSE;
-    }
-
-    *rval = JSVAL_VOID;
-  }
-  else {
-    JS_ReportError(cx, "Function removeImport requires 1 parameters");
+    JS_ReportError(cx, "Function deleteRule requires 1 parameters");
     return JS_FALSE;
   }
 
@@ -543,12 +432,12 @@ JSClass CSSStyleSheetClass = {
 //
 static JSPropertySpec CSSStyleSheetProperties[] =
 {
-  {"owningElement",    CSSSTYLESHEET_OWNINGELEMENT,    JSPROP_ENUMERATE | JSPROP_READONLY},
+  {"owningNode",    CSSSTYLESHEET_OWNINGNODE,    JSPROP_ENUMERATE | JSPROP_READONLY},
   {"parentStyleSheet",    CSSSTYLESHEET_PARENTSTYLESHEET,    JSPROP_ENUMERATE | JSPROP_READONLY},
   {"href",    CSSSTYLESHEET_HREF,    JSPROP_ENUMERATE | JSPROP_READONLY},
   {"title",    CSSSTYLESHEET_TITLE,    JSPROP_ENUMERATE | JSPROP_READONLY},
-  {"imports",    CSSSTYLESHEET_IMPORTS,    JSPROP_ENUMERATE | JSPROP_READONLY},
-  {"rules",    CSSSTYLESHEET_RULES,    JSPROP_ENUMERATE | JSPROP_READONLY},
+  {"media",    CSSSTYLESHEET_MEDIA,    JSPROP_ENUMERATE | JSPROP_READONLY},
+  {"cssRules",    CSSSTYLESHEET_CSSRULES,    JSPROP_ENUMERATE | JSPROP_READONLY},
   {0}
 };
 
@@ -558,10 +447,8 @@ static JSPropertySpec CSSStyleSheetProperties[] =
 //
 static JSFunctionSpec CSSStyleSheetMethods[] = 
 {
-  {"addRule",          CSSStyleSheetAddRule,     3},
-  {"addImport",          CSSStyleSheetAddImport,     2},
-  {"removeRule",          CSSStyleSheetRemoveRule,     1},
-  {"removeImport",          CSSStyleSheetRemoveImport,     1},
+  {"insertRule",          CSSStyleSheetInsertRule,     2},
+  {"deleteRule",          CSSStyleSheetDeleteRule,     1},
   {0}
 };
 
diff --git a/mozilla/dom/src/css/nsJSCSSUnknownRule.cpp b/mozilla/dom/src/css/nsJSCSSUnknownRule.cpp
new file mode 100644
index 00000000000..6ac7fff9e35
--- /dev/null
+++ b/mozilla/dom/src/css/nsJSCSSUnknownRule.cpp
@@ -0,0 +1,329 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * The contents of this file are subject to the Netscape Public License
+ * Version 1.0 (the "NPL"); you may not use this file except in
+ * compliance with the NPL.  You may obtain a copy of the NPL at
+ * http://www.mozilla.org/NPL/
+ *
+ * Software distributed under the NPL is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the NPL
+ * for the specific language governing rights and limitations under the
+ * NPL.
+ *
+ * The Initial Developer of this code under the NPL is Netscape
+ * Communications Corporation.  Portions created by Netscape are
+ * Copyright (C) 1998 Netscape Communications Corporation.  All Rights
+ * Reserved.
+ */
+/* AUTO-GENERATED. DO NOT EDIT!!! */
+
+#include "jsapi.h"
+#include "nscore.h"
+#include "nsIScriptContext.h"
+#include "nsIJSScriptObject.h"
+#include "nsIScriptObjectOwner.h"
+#include "nsIScriptGlobalObject.h"
+#include "nsIPtr.h"
+#include "nsString.h"
+#include "nsIDOMCSSUnknownRule.h"
+
+
+static NS_DEFINE_IID(kIScriptObjectOwnerIID, NS_ISCRIPTOBJECTOWNER_IID);
+static NS_DEFINE_IID(kIJSScriptObjectIID, NS_IJSSCRIPTOBJECT_IID);
+static NS_DEFINE_IID(kIScriptGlobalObjectIID, NS_ISCRIPTGLOBALOBJECT_IID);
+static NS_DEFINE_IID(kICSSUnknownRuleIID, NS_IDOMCSSUNKNOWNRULE_IID);
+
+NS_DEF_PTR(nsIDOMCSSUnknownRule);
+
+
+/***********************************************************************/
+//
+// CSSUnknownRule Properties Getter
+//
+PR_STATIC_CALLBACK(JSBool)
+GetCSSUnknownRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMCSSUnknownRule *a = (nsIDOMCSSUnknownRule*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case 0:
+      default:
+      {
+        nsIJSScriptObject *object;
+        if (NS_OK == a->QueryInterface(kIJSScriptObjectIID, (void**)&object)) {
+          PRBool rval;
+          rval =  object->GetProperty(cx, id, vp);
+          NS_RELEASE(object);
+          return rval;
+        }
+      }
+    }
+  }
+  else {
+    nsIJSScriptObject *object;
+    if (NS_OK == a->QueryInterface(kIJSScriptObjectIID, (void**)&object)) {
+      PRBool rval;
+      rval =  object->GetProperty(cx, id, vp);
+      NS_RELEASE(object);
+      return rval;
+    }
+  }
+
+  return PR_TRUE;
+}
+
+/***********************************************************************/
+//
+// CSSUnknownRule Properties Setter
+//
+PR_STATIC_CALLBACK(JSBool)
+SetCSSUnknownRuleProperty(JSContext *cx, JSObject *obj, jsval id, jsval *vp)
+{
+  nsIDOMCSSUnknownRule *a = (nsIDOMCSSUnknownRule*)JS_GetPrivate(cx, obj);
+
+  // If there's no private data, this must be the prototype, so ignore
+  if (nsnull == a) {
+    return JS_TRUE;
+  }
+
+  if (JSVAL_IS_INT(id)) {
+    switch(JSVAL_TO_INT(id)) {
+      case 0:
+      default:
+      {
+        nsIJSScriptObject *object;
+        if (NS_OK == a->QueryInterface(kIJSScriptObjectIID, (void**)&object)) {
+          PRBool rval;
+          rval =  object->SetProperty(cx, id, vp);
+          NS_RELEASE(object);
+          return rval;
+        }
+      }
+    }
+  }
+  else {
+    nsIJSScriptObject *object;
+    if (NS_OK == a->QueryInterface(kIJSScriptObjectIID, (void**)&object)) {
+      PRBool rval;
+      rval =  object->SetProperty(cx, id, vp);
+      NS_RELEASE(object);
+      return rval;
+    }
+  }
+
+  return PR_TRUE;
+}
+
+
+//
+// CSSUnknownRule finalizer
+//
+PR_STATIC_CALLBACK(void)
+FinalizeCSSUnknownRule(JSContext *cx, JSObject *obj)
+{
+  nsIDOMCSSUnknownRule *a = (nsIDOMCSSUnknownRule*)JS_GetPrivate(cx, obj);
+  
+  if (nsnull != a) {
+    // get the js object
+    nsIScriptObjectOwner *owner = nsnull;
+    if (NS_OK == a->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
+      owner->SetScriptObject(nsnull);
+      NS_RELEASE(owner);
+    }
+
+    NS_RELEASE(a);
+  }
+}
+
+
+//
+// CSSUnknownRule enumerate
+//
+PR_STATIC_CALLBACK(JSBool)
+EnumerateCSSUnknownRule(JSContext *cx, JSObject *obj)
+{
+  nsIDOMCSSUnknownRule *a = (nsIDOMCSSUnknownRule*)JS_GetPrivate(cx, obj);
+  
+  if (nsnull != a) {
+    // get the js object
+    nsIJSScriptObject *object;
+    if (NS_OK == a->QueryInterface(kIJSScriptObjectIID, (void**)&object)) {
+      object->EnumerateProperty(cx);
+      NS_RELEASE(object);
+    }
+  }
+  return JS_TRUE;
+}
+
+
+//
+// CSSUnknownRule resolve
+//
+PR_STATIC_CALLBACK(JSBool)
+ResolveCSSUnknownRule(JSContext *cx, JSObject *obj, jsval id)
+{
+  nsIDOMCSSUnknownRule *a = (nsIDOMCSSUnknownRule*)JS_GetPrivate(cx, obj);
+  
+  if (nsnull != a) {
+    // get the js object
+    nsIJSScriptObject *object;
+    if (NS_OK == a->QueryInterface(kIJSScriptObjectIID, (void**)&object)) {
+      object->Resolve(cx, id);
+      NS_RELEASE(object);
+    }
+  }
+  return JS_TRUE;
+}
+
+
+/***********************************************************************/
+//
+// class for CSSUnknownRule
+//
+JSClass CSSUnknownRuleClass = {
+  "CSSUnknownRule", 
+  JSCLASS_HAS_PRIVATE,
+  JS_PropertyStub,
+  JS_PropertyStub,
+  GetCSSUnknownRuleProperty,
+  SetCSSUnknownRuleProperty,
+  EnumerateCSSUnknownRule,
+  ResolveCSSUnknownRule,
+  JS_ConvertStub,
+  FinalizeCSSUnknownRule
+};
+
+
+//
+// CSSUnknownRule class properties
+//
+static JSPropertySpec CSSUnknownRuleProperties[] =
+{
+  {0}
+};
+
+
+//
+// CSSUnknownRule class methods
+//
+static JSFunctionSpec CSSUnknownRuleMethods[] = 
+{
+  {0}
+};
+
+
+//
+// CSSUnknownRule constructor
+//
+PR_STATIC_CALLBACK(JSBool)
+CSSUnknownRule(JSContext *cx, JSObject *obj, uintN argc, jsval *argv, jsval *rval)
+{
+  return JS_FALSE;
+}
+
+
+//
+// CSSUnknownRule class initialization
+//
+nsresult NS_InitCSSUnknownRuleClass(nsIScriptContext *aContext, void **aPrototype)
+{
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  JSObject *proto = nsnull;
+  JSObject *constructor = nsnull;
+  JSObject *parent_proto = nsnull;
+  JSObject *global = JS_GetGlobalObject(jscontext);
+  jsval vp;
+
+  if ((PR_TRUE != JS_LookupProperty(jscontext, global, "CSSUnknownRule", &vp)) ||
+      !JSVAL_IS_OBJECT(vp) ||
+      ((constructor = JSVAL_TO_OBJECT(vp)) == nsnull) ||
+      (PR_TRUE != JS_LookupProperty(jscontext, JSVAL_TO_OBJECT(vp), "prototype", &vp)) || 
+      !JSVAL_IS_OBJECT(vp)) {
+
+    if (NS_OK != NS_InitCSSRuleClass(aContext, (void **)&parent_proto)) {
+      return NS_ERROR_FAILURE;
+    }
+    proto = JS_InitClass(jscontext,     // context
+                         global,        // global object
+                         parent_proto,  // parent proto 
+                         &CSSUnknownRuleClass,      // JSClass
+                         CSSUnknownRule,            // JSNative ctor
+                         0,             // ctor args
+                         CSSUnknownRuleProperties,  // proto props
+                         CSSUnknownRuleMethods,     // proto funcs
+                         nsnull,        // ctor props (static)
+                         nsnull);       // ctor funcs (static)
+    if (nsnull == proto) {
+      return NS_ERROR_FAILURE;
+    }
+
+  }
+  else if ((nsnull != constructor) && JSVAL_IS_OBJECT(vp)) {
+    proto = JSVAL_TO_OBJECT(vp);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (aPrototype) {
+    *aPrototype = proto;
+  }
+  return NS_OK;
+}
+
+
+//
+// Method for creating a new CSSUnknownRule JavaScript object
+//
+extern "C" NS_DOM nsresult NS_NewScriptCSSUnknownRule(nsIScriptContext *aContext, nsISupports *aSupports, nsISupports *aParent, void **aReturn)
+{
+  NS_PRECONDITION(nsnull != aContext && nsnull != aSupports && nsnull != aReturn, "null argument to NS_NewScriptCSSUnknownRule");
+  JSObject *proto;
+  JSObject *parent;
+  nsIScriptObjectOwner *owner;
+  JSContext *jscontext = (JSContext *)aContext->GetNativeContext();
+  nsresult result = NS_OK;
+  nsIDOMCSSUnknownRule *aCSSUnknownRule;
+
+  if (nsnull == aParent) {
+    parent = nsnull;
+  }
+  else if (NS_OK == aParent->QueryInterface(kIScriptObjectOwnerIID, (void**)&owner)) {
+    if (NS_OK != owner->GetScriptObject(aContext, (void **)&parent)) {
+      NS_RELEASE(owner);
+      return NS_ERROR_FAILURE;
+    }
+    NS_RELEASE(owner);
+  }
+  else {
+    return NS_ERROR_FAILURE;
+  }
+
+  if (NS_OK != NS_InitCSSUnknownRuleClass(aContext, (void **)&proto)) {
+    return NS_ERROR_FAILURE;
+  }
+
+  result = aSupports->QueryInterface(kICSSUnknownRuleIID, (void **)&aCSSUnknownRule);
+  if (NS_OK != result) {
+    return result;
+  }
+
+  // create a js object for this class
+  *aReturn = JS_NewObject(jscontext, &CSSUnknownRuleClass, proto, parent);
+  if (nsnull != *aReturn) {
+    // connect the native object to the js object
+    JS_SetPrivate(jscontext, (JSObject *)*aReturn, aCSSUnknownRule);
+  }
+  else {
+    NS_RELEASE(aCSSUnknownRule);
+    return NS_ERROR_FAILURE; 
+  }
+
+  return NS_OK;
+}
diff --git a/mozilla/dom/tests/js/style1.html b/mozilla/dom/tests/js/style1.html
index ca8a4dd4634..f345be0c463 100644
--- a/mozilla/dom/tests/js/style1.html
+++ b/mozilla/dom/tests/js/style1.html
@@ -1,7 +1,8 @@
 <html>
 <head>
 <title>Example 0</title>
-<style>
+<style title="hello" media="screen, print">
+ :first-letter { color: green; }
  a#id.foo:visited:first-line { color: red; }
  a#id.foo:first-line { color: red; }
  a#id.foo:visited { color: red; }
@@ -13,7 +14,8 @@
  a:visited:visited { color: red; }
  a:first-line:visited { color: red; }
  :active { color: blue; }
- :first-letter { color: green; }
+ P.first:first-line { color: blue; }
+ P.first:first-letter { color: yellow; }
 </style>
 </head>
 
@@ -28,7 +30,7 @@
 <p>This is a paragraph with font variations: <b><font face="Arial, Helvetica, sans-serif">Arial,</font></b><font face="Arial, Helvetica, sans-serif"> 
   <i><font face="Verdana, Arial, Helvetica, sans-serif">Verdana</font>,</i> <font face="co">COURIER, 
   <font face="Times New Roman, Times, serif">Times New Roman.</font></font></font></p>
-<p><font size=7>Font size=7, </font><font size=6>Font size=6, </font><font size=5>Font 
+<p class="first"><font size=7>Font size=7, </font><font size=6>Font size=6, </font><font size=5>Font 
   size=5, </font><font size=4>Font size=4, </font><font size=3>Font size=3, </font><font size=2>Font 
   size=2, </font><font size=1>Font size=1, </font><font point-size=24 font-weight=700>Font 
   point-size=24 font-weight=700</font></p>
@@ -82,6 +84,9 @@
 <script>
 var r = 0, g = 0, b = 0;
 var h = document.documentElement.childNodes[1].childNodes[1];
+var sheet = document.styleSheets[0];
+var rule = sheet.cssRules[0];
+var size = 10;
 
 function changeColor() {
   r += 5;
@@ -90,8 +95,14 @@ function changeColor() {
   r %= 255;
   g %= 255;
   b %= 255;
+  size += 1;
+  if (size > 48) {
+    size = 10;
+  }
 
   h.style.backgroundColor = "rgb(" + r + "," + g + "," + b + ")";
+  rule.style.color = "rgb(" + r + "," + g + "," + b + ")";
+  rule.style.fontSize = size + "pt";
 }
 
 setInterval(changeColor, 40);
diff --git a/mozilla/dom/tests/js/style2.html b/mozilla/dom/tests/js/style2.html
index 0ac98813a29..cc423141425 100644
--- a/mozilla/dom/tests/js/style2.html
+++ b/mozilla/dom/tests/js/style2.html
@@ -18,7 +18,20 @@
 </head>
 
 <body bgcolor="#FFFFFF" text="#000000">
+<table border=4>
+<tr>
+<td>
 <h1>Example 0: Basic HTML Text Styles</h1>
+</td>
+<td>
+more table cell
+</td>
+</tr>
+<tr>
+<td>second row</td>
+<td>second row</td>
+</tr>
+</table>
 <p><br></p>
 <h2>Formatted Text</h2>
 <p>This is a basic paragraph with <b>bold</b>, <i>italic</i> and <i>bold-italic 
@@ -81,7 +94,7 @@
 <p>&nbsp;</p>
 <script>
 var r = 0, g = 0, b = 0;
-var h = document.documentElement.childNodes[1].childNodes[1];
+var h = document.documentElement.childNodes[1].childNodes[1].childNodes[0].childNodes[0].childNodes[0].childNodes[1];
 h.style.borderStyle = "groove";
 
 function changeColor() {