bug 821593 - remove the nsIDOMRGBColor xpidl now that nothing uses it r=bz
authorTrevor Saunders <trev.saunders@gmail.com>
Fri, 14 Dec 2012 04:51:06 -0500
changeset 125995 bc10be0681179170bb921e83e04f5bc6ce9dbe20
parent 125994 6c3f79ca958b4d8801a84b1efd9a43a1bd65afc1
child 125996 101f652fe7a5193c28902a15d69d984e9016e00f
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz
bugs821593
milestone20.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
bug 821593 - remove the nsIDOMRGBColor xpidl now that nothing uses it r=bz
dom/interfaces/base/domstubs.idl
dom/interfaces/css/Makefile.in
dom/interfaces/css/nsIDOMNSRGBAColor.idl
dom/interfaces/css/nsIDOMRGBColor.idl
layout/style/nsDOMCSSRGBColor.cpp
layout/style/nsDOMCSSRGBColor.h
--- a/dom/interfaces/base/domstubs.idl
+++ b/dom/interfaces/base/domstubs.idl
@@ -70,17 +70,16 @@ interface nsIDOMCSSValue;
 interface nsIDOMCSSPrimitiveValue;
 interface nsIDOMCSSRule;
 interface nsIDOMCSSRuleList;
 interface nsIDOMMozCSSKeyframeRule;
 interface nsIDOMCSSStyleSheet;
 interface nsIDOMCSSStyleDeclaration;
 interface nsIDOMCounter;
 interface nsIDOMRect;
-interface nsIDOMRGBColor;
 interface nsIDOMCSSStyleRule;
 interface nsIDOMCSSStyleRuleCollection;
 interface nsIDOMHTMLTableCaptionElement;
 interface nsIDOMHTMLTableSectionElement;
 
 // Range
 interface nsIDOMRange;
 
--- a/dom/interfaces/css/Makefile.in
+++ b/dom/interfaces/css/Makefile.in
@@ -34,19 +34,17 @@ XPIDLSRCS =					\
 	nsIDOMCSSMozDocumentRule.idl		\
 	nsIDOMCSSSupportsRule.idl		\
 	nsIDOMMozCSSKeyframeRule.idl		\
 	nsIDOMMozCSSKeyframesRule.idl		\
 	nsIDOMCSSPageRule.idl			\
 	nsIDOMCSSStyleRule.idl			\
 	nsIDOMCSSUnknownRule.idl		\
 	nsIDOMCounter.idl			\
-	nsIDOMRGBColor.idl			\
 	nsIDOMRect.idl				\
-	nsIDOMNSRGBAColor.idl			\
 	$(NULL)
 
 include $(topsrcdir)/config/rules.mk
 
 XPIDL_FLAGS += \
   -I$(topsrcdir)/dom/interfaces/base \
   -I$(topsrcdir)/dom/interfaces/stylesheets \
   $(NULL)
deleted file mode 100644
--- a/dom/interfaces/css/nsIDOMNSRGBAColor.idl
+++ /dev/null
@@ -1,12 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsIDOMRGBColor.idl"
-
-[scriptable, uuid(742dc816-5134-4214-adfa-cad9dd3377cd)]
-interface nsIDOMNSRGBAColor : nsIDOMRGBColor
-{
-  readonly attribute nsIDOMCSSPrimitiveValue  alpha;
-};
deleted file mode 100644
--- a/dom/interfaces/css/nsIDOMRGBColor.idl
+++ /dev/null
@@ -1,14 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "domstubs.idl"
-
-[scriptable, uuid(6aff3102-320d-4986-9790-12316bb87cf9)]
-interface nsIDOMRGBColor : nsISupports
-{
-  readonly attribute nsIDOMCSSPrimitiveValue  red;
-  readonly attribute nsIDOMCSSPrimitiveValue  green;
-  readonly attribute nsIDOMCSSPrimitiveValue  blue;
-};
--- a/layout/style/nsDOMCSSRGBColor.cpp
+++ b/layout/style/nsDOMCSSRGBColor.cpp
@@ -27,60 +27,22 @@ nsDOMCSSRGBColor::nsDOMCSSRGBColor(nsROC
   SetIsDOMBinding();
 }
 
 nsDOMCSSRGBColor::~nsDOMCSSRGBColor(void)
 {
 }
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsDOMCSSRGBColor)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMRGBColor)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMNSRGBAColor)
   NS_INTERFACE_MAP_ENTRY(nsISupports)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
 NS_INTERFACE_MAP_END
 
 NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_4(nsDOMCSSRGBColor, mAlpha,  mBlue, mGreen, mRed)
 NS_IMPL_CYCLE_COLLECTING_ADDREF(nsDOMCSSRGBColor)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(nsDOMCSSRGBColor)
 
 JSObject*
 nsDOMCSSRGBColor::WrapObject(JSContext *aCx, JSObject *aScope, bool *aTried)
 {
   return dom::RGBColorBinding::Wrap(aCx, aScope, this, aTried);
 }
 
-
-NS_IMETHODIMP
-nsDOMCSSRGBColor::GetRed(nsIDOMCSSPrimitiveValue** aRed)
-{
-  NS_ENSURE_TRUE(mRed, NS_ERROR_NOT_INITIALIZED);
-  *aRed = mRed;
-  NS_ADDREF(*aRed);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDOMCSSRGBColor::GetGreen(nsIDOMCSSPrimitiveValue** aGreen)
-{
-  NS_ENSURE_TRUE(mGreen, NS_ERROR_NOT_INITIALIZED);
-  *aGreen = mGreen;
-  NS_ADDREF(*aGreen);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDOMCSSRGBColor::GetBlue(nsIDOMCSSPrimitiveValue** aBlue)
-{
-  NS_ENSURE_TRUE(mBlue, NS_ERROR_NOT_INITIALIZED);
-  *aBlue = mBlue;
-  NS_ADDREF(*aBlue);
-  return NS_OK;
-}
-
-NS_IMETHODIMP
-nsDOMCSSRGBColor::GetAlpha(nsIDOMCSSPrimitiveValue** aAlpha)
-{
-  NS_ENSURE_TRUE(mAlpha, NS_ERROR_NOT_INITIALIZED);
-  *aAlpha = mAlpha;
-  NS_ADDREF(*aAlpha);
-  return NS_OK;
-}
--- a/layout/style/nsDOMCSSRGBColor.h
+++ b/layout/style/nsDOMCSSRGBColor.h
@@ -6,36 +6,33 @@
 /* DOM object representing color values in DOM computed style */
 
 #ifndef nsDOMCSSRGBColor_h__
 #define nsDOMCSSRGBColor_h__
 
 #include "mozilla/Attributes.h"
 #include "nsAutoPtr.h"
 #include "nsISupports.h"
-#include "nsIDOMNSRGBAColor.h"
 #include "nsWrapperCache.h"
 
 class nsROCSSPrimitiveValue;
 
-class nsDOMCSSRGBColor : public nsIDOMNSRGBAColor,
+class nsDOMCSSRGBColor : public nsISupports,
                          public nsWrapperCache
 {
 public:
   nsDOMCSSRGBColor(nsROCSSPrimitiveValue* aRed,
                    nsROCSSPrimitiveValue* aGreen,
                    nsROCSSPrimitiveValue* aBlue,
                    nsROCSSPrimitiveValue* aAlpha,
                    bool aHasAlpha);
 
   virtual ~nsDOMCSSRGBColor(void);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
-  NS_DECL_NSIDOMRGBCOLOR
-  NS_DECL_NSIDOMNSRGBACOLOR
 
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(nsDOMCSSRGBColor)
 
   bool HasAlpha() const { return mHasAlpha; }
 
   // RGBColor webidl interface
   nsROCSSPrimitiveValue* Red() const
   {