Remove nsCSSStruct.h/cpp. (Bug 645620, patch 4) r=bzbarsky
authorL. David Baron <dbaron@dbaron.org>
Mon, 28 Mar 2011 16:07:26 -0700
changeset 64077 e76c7e9b17cf9da7154275648b54416b81d82a5e
parent 64076 ebb436e2d8d0c6464b5157ccd3b9ff1c6c3d1d57
child 64078 0aec17daf6f1f1ece6bbaecbfa09bcf704da5d03
push idunknown
push userunknown
push dateunknown
reviewersbzbarsky
bugs645620
milestone2.2a1pre
Remove nsCSSStruct.h/cpp. (Bug 645620, patch 4) r=bzbarsky
content/html/content/src/nsGenericHTMLElement.cpp
content/html/content/src/nsHTMLFontElement.cpp
content/html/content/src/nsHTMLPreElement.cpp
layout/style/Makefile.in
layout/style/nsCSSDataBlock.h
layout/style/nsCSSStruct.cpp
layout/style/nsCSSStruct.h
layout/style/nsRuleData.h
layout/style/nsRuleNode.h
layout/style/nsStyleAnimation.cpp
layout/style/nsStyleTransformMatrix.cpp
--- a/content/html/content/src/nsGenericHTMLElement.cpp
+++ b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -37,17 +37,16 @@
  *
  * ***** END LICENSE BLOCK ***** */
 #include "nscore.h"
 #include "nsGenericHTMLElement.h"
 #include "nsCOMPtr.h"
 #include "nsIAtom.h"
 #include "nsIContentViewer.h"
 #include "mozilla/css/StyleRule.h"
-#include "nsCSSStruct.h"
 #include "nsIDocument.h"
 #include "nsIDocumentEncoder.h"
 #include "nsIDOMHTMLBodyElement.h"
 #include "nsIDOMHTMLDocument.h"
 #include "nsIDOMAttr.h"
 #include "nsIDOMDocumentFragment.h"
 #include "nsIDOMNSHTMLDocument.h"
 #include "nsIDOMNSHTMLElement.h"
--- a/content/html/content/src/nsHTMLFontElement.cpp
+++ b/content/html/content/src/nsHTMLFontElement.cpp
@@ -38,17 +38,16 @@
 #include "nsIDOMHTMLFontElement.h"
 #include "nsIDOMEventTarget.h"
 #include "nsGenericHTMLElement.h"
 #include "nsGkAtoms.h"
 #include "nsIDeviceContext.h"
 #include "nsStyleConsts.h"
 #include "nsPresContext.h"
 #include "nsMappedAttributes.h"
-#include "nsCSSStruct.h"
 #include "nsRuleData.h"
 #include "nsIDocument.h"
 
 class nsHTMLFontElement : public nsGenericHTMLElement,
                           public nsIDOMHTMLFontElement
 {
 public:
   nsHTMLFontElement(already_AddRefed<nsINodeInfo> aNodeInfo);
--- a/content/html/content/src/nsHTMLPreElement.cpp
+++ b/content/html/content/src/nsHTMLPreElement.cpp
@@ -36,17 +36,16 @@
  * ***** END LICENSE BLOCK ***** */
 #include "nsIDOMHTMLPreElement.h"
 #include "nsIDOMEventTarget.h"
 #include "nsGenericHTMLElement.h"
 #include "nsGkAtoms.h"
 #include "nsStyleConsts.h"
 #include "nsMappedAttributes.h"
 #include "nsRuleData.h"
-#include "nsCSSStruct.h"
 
 class nsHTMLPreElement : public nsGenericHTMLElement,
                          public nsIDOMHTMLPreElement
 {
 public:
   nsHTMLPreElement(already_AddRefed<nsINodeInfo> aNodeInfo);
   virtual ~nsHTMLPreElement();
 
--- a/layout/style/Makefile.in
+++ b/layout/style/Makefile.in
@@ -63,17 +63,16 @@ EXPORTS		= \
 		nsCSSProperty.h \
 		nsCSSProps.h \
 		nsCSSPseudoClassList.h \
 		nsCSSPseudoClasses.h \
 		nsCSSPseudoElementList.h \
 		nsCSSPseudoElements.h \
 		nsCSSRuleProcessor.h \
 		nsCSSStyleSheet.h \
-		nsCSSStruct.h \
 		nsCSSValue.h \
 		nsDOMCSSAttrDeclaration.h \
 		nsDOMCSSDeclaration.h \
 		nsICSSDeclaration.h \
 		nsICSSGroupRule.h \
 		nsICSSLoaderObserver.h \
 		nsICSSPseudoComparator.h \
 		nsICSSRule.h \
@@ -114,17 +113,16 @@ CPPSRCS		= \
 		Loader.cpp \
 		nsCSSParser.cpp \
 		nsCSSProps.cpp \
 		nsCSSPseudoClasses.cpp \
 		nsCSSPseudoElements.cpp \
 		nsCSSRuleProcessor.cpp \
 		nsCSSRules.cpp \
 		nsCSSScanner.cpp \
-		nsCSSStruct.cpp \
 		nsCSSStyleSheet.cpp \
 		nsCSSValue.cpp \
 		nsComputedDOMStyle.cpp \
 		nsDOMCSSAttrDeclaration.cpp \
 		nsDOMCSSDeclaration.cpp \
 		nsDOMCSSRGBColor.cpp \
 		nsDOMCSSRect.cpp \
 		nsDOMCSSValueList.cpp \
--- a/layout/style/nsCSSDataBlock.h
+++ b/layout/style/nsCSSDataBlock.h
@@ -38,17 +38,16 @@
 /*
  * compact representation of the property-value pairs within a CSS
  * declaration, and the code for expanding and compacting it
  */
 
 #ifndef nsCSSDataBlock_h__
 #define nsCSSDataBlock_h__
 
-#include "nsCSSStruct.h"
 #include "nsCSSProps.h"
 #include "nsCSSPropertySet.h"
 
 struct nsRuleData;
 class nsCSSExpandedDataBlock;
 
 namespace mozilla {
 namespace css {
deleted file mode 100644
--- a/layout/style/nsCSSStruct.cpp
+++ /dev/null
@@ -1,239 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Daniel Glazman <glazman@netscape.com>
- *   Mats Palmgren <mats.palmgren@bredband.net>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * temporary (expanded) representation of the property-value pairs
- * within a CSS declaration using during parsing and mutation, and
- * representation of complex values for CSS properties
- */
-
-#include "nsCSSStruct.h"
-#include "nsString.h"
-
-// --- nsCSSFont -----------------
-
-nsCSSFont::nsCSSFont(void)
-{
-  MOZ_COUNT_CTOR(nsCSSFont);
-}
-
-nsCSSFont::~nsCSSFont(void)
-{
-  MOZ_COUNT_DTOR(nsCSSFont);
-}
-
-// --- nsCSSColor -----------------
-
-nsCSSColor::nsCSSColor(void)
-{
-  MOZ_COUNT_CTOR(nsCSSColor);
-}
-
-nsCSSColor::~nsCSSColor(void)
-{
-  MOZ_COUNT_DTOR(nsCSSColor);
-}
-
-// --- nsCSSText -----------------
-
-nsCSSText::nsCSSText(void)
-{
-  MOZ_COUNT_CTOR(nsCSSText);
-}
-
-nsCSSText::~nsCSSText(void)
-{
-  MOZ_COUNT_DTOR(nsCSSText);
-}
-
-// --- nsCSSDisplay -----------------
-
-nsCSSDisplay::nsCSSDisplay(void)
-{
-  MOZ_COUNT_CTOR(nsCSSDisplay);
-}
-
-nsCSSDisplay::~nsCSSDisplay(void)
-{
-  MOZ_COUNT_DTOR(nsCSSDisplay);
-}
-
-// --- nsCSSMargin -----------------
-
-nsCSSMargin::nsCSSMargin(void)
-{
-  MOZ_COUNT_CTOR(nsCSSMargin);
-}
-
-nsCSSMargin::~nsCSSMargin(void)
-{
-  MOZ_COUNT_DTOR(nsCSSMargin);
-}
-
-// --- nsCSSPosition -----------------
-
-nsCSSPosition::nsCSSPosition(void)
-{
-  MOZ_COUNT_CTOR(nsCSSPosition);
-}
-
-nsCSSPosition::~nsCSSPosition(void)
-{
-  MOZ_COUNT_DTOR(nsCSSPosition);
-}
-
-// --- nsCSSList -----------------
-
-nsCSSList::nsCSSList(void)
-{
-  MOZ_COUNT_CTOR(nsCSSList);
-}
-
-nsCSSList::~nsCSSList(void)
-{
-  MOZ_COUNT_DTOR(nsCSSList);
-}
-
-// --- nsCSSTable -----------------
-
-nsCSSTable::nsCSSTable(void)
-{
-  MOZ_COUNT_CTOR(nsCSSTable);
-}
-
-nsCSSTable::~nsCSSTable(void)
-{
-  MOZ_COUNT_DTOR(nsCSSTable);
-}
-
-// --- nsCSSBreaks -----------------
-
-nsCSSBreaks::nsCSSBreaks(void)
-{
-  MOZ_COUNT_CTOR(nsCSSBreaks);
-}
-
-nsCSSBreaks::~nsCSSBreaks(void)
-{
-  MOZ_COUNT_DTOR(nsCSSBreaks);
-}
-
-// --- nsCSSPage -----------------
-
-nsCSSPage::nsCSSPage(void)
-{
-  MOZ_COUNT_CTOR(nsCSSPage);
-}
-
-nsCSSPage::~nsCSSPage(void)
-{
-  MOZ_COUNT_DTOR(nsCSSPage);
-}
-
-// --- nsCSSContent -----------------
-
-nsCSSContent::nsCSSContent(void)
-{
-  MOZ_COUNT_CTOR(nsCSSContent);
-}
-
-nsCSSContent::~nsCSSContent(void)
-{
-  MOZ_COUNT_DTOR(nsCSSContent);
-}
-
-// --- nsCSSUserInterface -----------------
-
-nsCSSUserInterface::nsCSSUserInterface(void)
-{
-  MOZ_COUNT_CTOR(nsCSSUserInterface);
-}
-
-nsCSSUserInterface::~nsCSSUserInterface(void)
-{
-  MOZ_COUNT_DTOR(nsCSSUserInterface);
-}
-
-// --- nsCSSAural -----------------
-
-nsCSSAural::nsCSSAural(void)
-{
-  MOZ_COUNT_CTOR(nsCSSAural);
-}
-
-nsCSSAural::~nsCSSAural(void)
-{
-  MOZ_COUNT_DTOR(nsCSSAural);
-}
-
-// --- nsCSSXUL -----------------
-
-nsCSSXUL::nsCSSXUL(void)
-{
-  MOZ_COUNT_CTOR(nsCSSXUL);
-}
-
-nsCSSXUL::~nsCSSXUL(void)
-{
-  MOZ_COUNT_DTOR(nsCSSXUL);
-}
-
-// --- nsCSSColumn -----------------
-
-nsCSSColumn::nsCSSColumn(void)
-{
-  MOZ_COUNT_CTOR(nsCSSColumn);
-}
-
-nsCSSColumn::~nsCSSColumn(void)
-{
-  MOZ_COUNT_DTOR(nsCSSColumn);
-}
-
-// --- nsCSSSVG -----------------
-
-nsCSSSVG::nsCSSSVG(void)
-{
-  MOZ_COUNT_CTOR(nsCSSSVG);
-}
-
-nsCSSSVG::~nsCSSSVG(void)
-{
-  MOZ_COUNT_DTOR(nsCSSSVG);
-}
deleted file mode 100644
--- a/layout/style/nsCSSStruct.h
+++ /dev/null
@@ -1,399 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Daniel Glazman <glazman@netscape.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * temporary (expanded) representation of the property-value pairs
- * within a CSS declaration using during parsing and mutation, and
- * representation of complex values for CSS properties
- */
-
-#ifndef nsCSSStruct_h___
-#define nsCSSStruct_h___
-
-#include "nsCSSValue.h"
-
-/****************************************************************************/
-
-struct nsCSSStruct {
-  // EMPTY on purpose.  ABSTRACT with no virtuals (typedef void nsCSSStruct?)
-};
-
-// We use the nsCSS* structures for storing css::Declaration's
-// *temporary* data during parsing and modification.
-
-struct nsCSSFont : public nsCSSStruct {
-  nsCSSFont(void);
-  ~nsCSSFont(void);
-
-  nsCSSValue mSystemFont;
-  nsCSSValue mFamily;
-  nsCSSValue mStyle;
-  nsCSSValue mVariant;
-  nsCSSValue mWeight;
-  nsCSSValue mSize;
-  nsCSSValue mSizeAdjust; // NEW
-  nsCSSValue mStretch; // NEW
-  nsCSSValue mFontFeatureSettings;
-  nsCSSValue mFontLanguageOverride;
-
-#ifdef MOZ_MATHML
-  nsCSSValue mScriptLevel; // Integer values mean "relative", Number values mean "absolute" 
-  nsCSSValue mScriptSizeMultiplier;
-  nsCSSValue mScriptMinSize;
-#endif
-
-private:
-  nsCSSFont(const nsCSSFont& aOther); // NOT IMPLEMENTED
-};
-
-struct nsCSSColor : public nsCSSStruct  {
-  nsCSSColor(void);
-  ~nsCSSColor(void);
-
-  nsCSSValue mColor;
-  nsCSSValue mBackColor;
-  nsCSSValue mBackImage;
-  nsCSSValue mBackRepeat;
-  nsCSSValue mBackAttachment;
-  nsCSSValue mBackPosition;
-  nsCSSValue mBackSize;
-  nsCSSValue mBackClip;
-  nsCSSValue mBackOrigin;
-  nsCSSValue mBackInlinePolicy;
-private:
-  nsCSSColor(const nsCSSColor& aOther); // NOT IMPLEMENTED
-};
-
-struct nsCSSText : public nsCSSStruct  {
-  nsCSSText(void);
-  ~nsCSSText(void);
-
-  nsCSSValue mTabSize;
-  nsCSSValue mWordSpacing;
-  nsCSSValue mLetterSpacing;
-  nsCSSValue mVerticalAlign;
-  nsCSSValue mTextTransform;
-  nsCSSValue mTextAlign;
-  nsCSSValue mTextIndent;
-  nsCSSValue mDecoration;
-  nsCSSValue mTextShadow; // NEW
-  nsCSSValue mUnicodeBidi;  // NEW
-  nsCSSValue mLineHeight;
-  nsCSSValue mWhiteSpace;
-  nsCSSValue mWordWrap;
-private:
-  nsCSSText(const nsCSSText& aOther); // NOT IMPLEMENTED
-};
-
-struct nsCSSDisplay : public nsCSSStruct  {
-  nsCSSDisplay(void);
-  ~nsCSSDisplay(void);
-
-  nsCSSValue mDirection;
-  nsCSSValue mDisplay;
-  nsCSSValue mBinding;
-  nsCSSValue mAppearance;
-  nsCSSValue mPosition;
-  nsCSSValue mFloat;
-  nsCSSValue mClear;
-  nsCSSValue mClip;
-  nsCSSValue mOverflowX;
-  nsCSSValue mOverflowY;
-  nsCSSValue mResize;
-  nsCSSValue mPointerEvents;
-  nsCSSValue mVisibility;
-  nsCSSValue mOpacity;
-  nsCSSValue mTransform; // List of Arrays containing transform information
-  nsCSSValue mTransformOrigin;
-  nsCSSValue mTransitionProperty;
-  nsCSSValue mTransitionDuration;
-  nsCSSValue mTransitionTimingFunction;
-  nsCSSValue mTransitionDelay;
-
-  // temp fix for bug 24000 
-  nsCSSValue mBreakBefore;
-  nsCSSValue mBreakAfter;
-  // end temp fix
-private:
-  nsCSSDisplay(const nsCSSDisplay& aOther); // NOT IMPLEMENTED
-};
-
-struct nsCSSMargin : public nsCSSStruct  {
-  nsCSSMargin(void);
-  ~nsCSSMargin(void);
-
-  nsCSSRect   mMargin;
-  nsCSSValue  mMarginStart;
-  nsCSSValue  mMarginEnd;
-  nsCSSValue  mMarginLeftLTRSource;
-  nsCSSValue  mMarginLeftRTLSource;
-  nsCSSValue  mMarginRightLTRSource;
-  nsCSSValue  mMarginRightRTLSource;
-  nsCSSRect   mPadding;
-  nsCSSValue  mPaddingStart;
-  nsCSSValue  mPaddingEnd;
-  nsCSSValue  mPaddingLeftLTRSource;
-  nsCSSValue  mPaddingLeftRTLSource;
-  nsCSSValue  mPaddingRightLTRSource;
-  nsCSSValue  mPaddingRightRTLSource;
-  nsCSSRect   mBorderWidth;
-  nsCSSValue  mBorderStartWidth;
-  nsCSSValue  mBorderEndWidth;
-  nsCSSValue  mBorderLeftWidthLTRSource;
-  nsCSSValue  mBorderLeftWidthRTLSource;
-  nsCSSValue  mBorderRightWidthLTRSource;
-  nsCSSValue  mBorderRightWidthRTLSource;
-  nsCSSRect   mBorderColor;
-  nsCSSValue  mBorderStartColor;
-  nsCSSValue  mBorderEndColor;
-  nsCSSValue  mBorderLeftColorLTRSource;
-  nsCSSValue  mBorderLeftColorRTLSource;
-  nsCSSValue  mBorderRightColorLTRSource;
-  nsCSSValue  mBorderRightColorRTLSource;
-  nsCSSRect   mBorderColors;
-  nsCSSRect   mBorderStyle;
-  nsCSSValue  mBorderStartStyle;
-  nsCSSValue  mBorderEndStyle;
-  nsCSSValue  mBorderLeftStyleLTRSource;
-  nsCSSValue  mBorderLeftStyleRTLSource;
-  nsCSSValue  mBorderRightStyleLTRSource;
-  nsCSSValue  mBorderRightStyleRTLSource;
-  nsCSSCornerSizes mBorderRadius;
-  nsCSSValue  mOutlineWidth;
-  nsCSSValue  mOutlineColor;
-  nsCSSValue  mOutlineStyle;
-  nsCSSValue  mOutlineOffset;
-  nsCSSCornerSizes mOutlineRadius;
-  nsCSSValue  mFloatEdge; // NEW
-  nsCSSValue  mBorderImage;
-  nsCSSValue  mBoxShadow;
-private:
-  nsCSSMargin(const nsCSSMargin& aOther); // NOT IMPLEMENTED
-};
-
-struct nsCSSPosition : public nsCSSStruct  {
-  nsCSSPosition(void);
-  ~nsCSSPosition(void);
-
-  nsCSSValue  mWidth;
-  nsCSSValue  mMinWidth;
-  nsCSSValue  mMaxWidth;
-  nsCSSValue  mHeight;
-  nsCSSValue  mMinHeight;
-  nsCSSValue  mMaxHeight;
-  nsCSSValue  mBoxSizing; // NEW
-  nsCSSRect   mOffset;
-  nsCSSValue  mZIndex;
-private:
-  nsCSSPosition(const nsCSSPosition& aOther); // NOT IMPLEMENTED
-};
-
-struct nsCSSList : public nsCSSStruct  {
-  nsCSSList(void);
-  ~nsCSSList(void);
-
-  nsCSSValue mType;
-  nsCSSValue mImage;
-  nsCSSValue mPosition;
-  nsCSSValue mImageRegion;
-private:
-  nsCSSList(const nsCSSList& aOther); // NOT IMPLEMENTED
-};
-
-struct nsCSSTable : public nsCSSStruct  { // NEW
-  nsCSSTable(void);
-  ~nsCSSTable(void);
-
-  nsCSSValue mBorderCollapse;
-  nsCSSValue mBorderSpacing;
-  nsCSSValue mCaptionSide;
-  nsCSSValue mEmptyCells;
-
-  nsCSSValue mLayout;
-private:
-  nsCSSTable(const nsCSSTable& aOther); // NOT IMPLEMENTED
-};
-
-struct nsCSSBreaks : public nsCSSStruct  { // NEW
-  nsCSSBreaks(void);
-  ~nsCSSBreaks(void);
-
-  nsCSSValue mOrphans;
-  nsCSSValue mWidows;
-  nsCSSValue mPage;
-  // temp fix for bug 24000 
-  //nsCSSValue mPageBreakAfter;
-  //nsCSSValue mPageBreakBefore;
-  nsCSSValue mPageBreakInside;
-private:
-  nsCSSBreaks(const nsCSSBreaks& aOther); // NOT IMPLEMENTED
-};
-
-struct nsCSSPage : public nsCSSStruct  { // NEW
-  nsCSSPage(void);
-  ~nsCSSPage(void);
-
-  nsCSSValue mMarks;
-  nsCSSValue mSize;
-private:
-  nsCSSPage(const nsCSSPage& aOther); // NOT IMPLEMENTED
-};
-
-struct nsCSSContent : public nsCSSStruct  {
-  nsCSSContent(void);
-  ~nsCSSContent(void);
-
-  nsCSSValue mContent;
-  nsCSSValue mCounterIncrement;
-  nsCSSValue mCounterReset;
-  nsCSSValue mMarkerOffset;
-  nsCSSValue mQuotes;
-private:
-  nsCSSContent(const nsCSSContent& aOther); // NOT IMPLEMENTED
-};
-
-struct nsCSSUserInterface : public nsCSSStruct  { // NEW
-  nsCSSUserInterface(void);
-  ~nsCSSUserInterface(void);
-
-  nsCSSValue mUserInput;
-  nsCSSValue mUserModify;
-  nsCSSValue mUserSelect;
-  nsCSSValue mUserFocus;
-
-  nsCSSValue mCursor;
-  nsCSSValue mForceBrokenImageIcon;
-  nsCSSValue mIMEMode;
-  nsCSSValue mWindowShadow;
-private:
-  nsCSSUserInterface(const nsCSSUserInterface& aOther); // NOT IMPLEMENTED
-};
-
-struct nsCSSAural : public nsCSSStruct  { // NEW
-  nsCSSAural(void);
-  ~nsCSSAural(void);
-
-  nsCSSValue mAzimuth;
-  nsCSSValue mElevation;
-  nsCSSValue mCueAfter;
-  nsCSSValue mCueBefore;
-  nsCSSValue mPauseAfter;
-  nsCSSValue mPauseBefore;
-  nsCSSValue mPitch;
-  nsCSSValue mPitchRange;
-  nsCSSValue mRichness;
-  nsCSSValue mSpeak;
-  nsCSSValue mSpeakHeader;
-  nsCSSValue mSpeakNumeral;
-  nsCSSValue mSpeakPunctuation;
-  nsCSSValue mSpeechRate;
-  nsCSSValue mStress;
-  nsCSSValue mVoiceFamily;
-  nsCSSValue mVolume;
-private:
-  nsCSSAural(const nsCSSAural& aOther); // NOT IMPLEMENTED
-};
-
-struct nsCSSXUL : public nsCSSStruct  {
-  nsCSSXUL(void);
-  ~nsCSSXUL(void);
-
-  nsCSSValue  mBoxAlign;
-  nsCSSValue  mBoxDirection;
-  nsCSSValue  mBoxFlex;
-  nsCSSValue  mBoxOrient;
-  nsCSSValue  mBoxPack;
-  nsCSSValue  mBoxOrdinal;
-  nsCSSValue  mStackSizing;
-private:
-  nsCSSXUL(const nsCSSXUL& aOther); // NOT IMPLEMENTED
-};
-
-struct nsCSSColumn : public nsCSSStruct  {
-  nsCSSColumn(void);
-  ~nsCSSColumn(void);
-
-  nsCSSValue  mColumnCount;
-  nsCSSValue  mColumnWidth;
-  nsCSSValue  mColumnGap;
-  nsCSSValue  mColumnRuleColor;
-  nsCSSValue  mColumnRuleWidth;
-  nsCSSValue  mColumnRuleStyle;
-private:
-  nsCSSColumn(const nsCSSColumn& aOther); // NOT IMPLEMENTED
-};
-
-struct nsCSSSVG : public nsCSSStruct {
-  nsCSSSVG(void);
-  ~nsCSSSVG(void);
-
-  nsCSSValue mClipPath;
-  nsCSSValue mClipRule;
-  nsCSSValue mColorInterpolation;
-  nsCSSValue mColorInterpolationFilters;
-  nsCSSValue mDominantBaseline;
-  nsCSSValue mFill;
-  nsCSSValue mFillOpacity;
-  nsCSSValue mFillRule;
-  nsCSSValue mFilter;
-  nsCSSValue mFloodColor;
-  nsCSSValue mFloodOpacity;
-  nsCSSValue mImageRendering;
-  nsCSSValue mLightingColor;
-  nsCSSValue mMarkerEnd;
-  nsCSSValue mMarkerMid;
-  nsCSSValue mMarkerStart;
-  nsCSSValue mMask;
-  nsCSSValue mShapeRendering;
-  nsCSSValue mStopColor;
-  nsCSSValue mStopOpacity;
-  nsCSSValue mStroke;
-  nsCSSValue mStrokeDasharray;
-  nsCSSValue mStrokeDashoffset;
-  nsCSSValue mStrokeLinecap;
-  nsCSSValue mStrokeLinejoin;
-  nsCSSValue mStrokeMiterlimit;
-  nsCSSValue mStrokeOpacity;
-  nsCSSValue mStrokeWidth;
-  nsCSSValue mTextAnchor;
-  nsCSSValue mTextRendering;
-private:
-  nsCSSSVG(const nsCSSSVG& aOther); // NOT IMPLEMENTED
-};
-
-#endif /* nsCSSStruct_h___ */
--- a/layout/style/nsRuleData.h
+++ b/layout/style/nsRuleData.h
@@ -40,17 +40,16 @@
  * temporary (expanded) representation of property-value pairs used to
  * hold data from matched rules during style data computation.
  */
 
 #ifndef nsRuleData_h_
 #define nsRuleData_h_
 
 #include "nsCSSProps.h"
-#include "nsCSSStruct.h"
 #include "nsStyleStructFwd.h"
 
 class nsPresContext;
 class nsStyleContext;
 struct nsRuleData;
 
 typedef void (*nsPostResolveFunc)(void* aStyleStruct, nsRuleData* aData);
 
--- a/layout/style/nsRuleNode.h
+++ b/layout/style/nsRuleNode.h
@@ -48,17 +48,16 @@
 #include "nsPresContext.h"
 #include "nsStyleStruct.h"
 
 class nsStyleContext;
 struct PLDHashTable;
 class nsILanguageAtomService;
 struct nsRuleData;
 class nsIStyleRule;
-struct nsCSSStruct;
 struct nsCSSValueList;
 
 class nsCSSValue;
 struct nsCSSRect;
 
 class nsStyleCoord;
 
 template <nsStyleStructID MinIndex, nsStyleStructID Count>
--- a/layout/style/nsStyleAnimation.cpp
+++ b/layout/style/nsStyleAnimation.cpp
@@ -44,17 +44,16 @@
 #include "nsIStyleRule.h"
 #include "mozilla/css/StyleRule.h"
 #include "nsString.h"
 #include "nsStyleContext.h"
 #include "nsStyleSet.h"
 #include "nsComputedDOMStyle.h"
 #include "nsCSSParser.h"
 #include "mozilla/css/Declaration.h"
-#include "nsCSSStruct.h"
 #include "prlog.h"
 #include <math.h>
 
 namespace css = mozilla::css;
 
 // HELPER METHODS
 // --------------
 /*
--- a/layout/style/nsStyleTransformMatrix.cpp
+++ b/layout/style/nsStyleTransformMatrix.cpp
@@ -42,17 +42,16 @@
 #include "nsAutoPtr.h"
 #include "nsCSSValue.h"
 #include "nsStyleContext.h"
 #include "nsPresContext.h"
 #include "nsRuleNode.h"
 #include "nsCSSKeywords.h"
 #include "nsMathUtils.h"
 #include "CSSCalc.h"
-#include "nsCSSStruct.h"
 
 namespace css = mozilla::css;
 
 /* Note on floating point precision: The transform matrix is an array
  * of single precision 'float's, and so are most of the input values
  * we get from the style system, but intermediate calculations
  * involving angles need to be done in 'double'.
  */