bug 824970 - store nsDOMCSSRect* in nsROCSSPrimitiveValue r=bz
authorTrevor Saunders <trev.saunders@gmail.com>
Tue, 25 Dec 2012 22:01:06 -0500
changeset 117215 41f218bd308240098bbfd91205d689b33e6a8b47
parent 117214 516b3defe68dc4305f5770bc33f3d5303ca7dc31
child 117216 355d2e8ede647e88740b9acf3519cd5a2b2b02b8
push id20377
push usertrev.saunders@gmail.com
push dateSat, 29 Dec 2012 13:42:09 +0000
treeherdermozilla-inbound@280420584744 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbz
bugs824970
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 824970 - store nsDOMCSSRect* in nsROCSSPrimitiveValue r=bz
layout/style/nsROCSSPrimitiveValue.cpp
layout/style/nsROCSSPrimitiveValue.h
--- a/layout/style/nsROCSSPrimitiveValue.cpp
+++ b/layout/style/nsROCSSPrimitiveValue.cpp
@@ -7,17 +7,17 @@
 
 #include "nsROCSSPrimitiveValue.h"
 
 #include "nsContentUtils.h"
 #include "mozilla/dom/CSSPrimitiveValueBinding.h"
 #include "nsPresContext.h"
 #include "nsStyleUtil.h"
 #include "nsDOMCSSRGBColor.h"
-#include "nsIDOMRect.h"
+#include "nsDOMCSSRect.h"
 #include "nsIURI.h"
 #include "nsError.h"
 
 using namespace mozilla;
 
 nsROCSSPrimitiveValue::nsROCSSPrimitiveValue()
   : CSSValue(), mType(CSS_PX)
 {
@@ -596,17 +596,17 @@ nsROCSSPrimitiveValue::SetColor(nsDOMCSS
     mType = CSS_RGBCOLOR;
   }
   else {
     mType = CSS_UNKNOWN;
   }
 }
 
 void
-nsROCSSPrimitiveValue::SetRect(nsIDOMRect* aRect)
+nsROCSSPrimitiveValue::SetRect(nsDOMCSSRect* aRect)
 {
   NS_PRECONDITION(aRect, "Null rect being set!");
   Reset();
   mValue.mRect = aRect;
   if (mValue.mRect) {
     NS_ADDREF(mValue.mRect);
     mType = CSS_RECT;
   }
--- a/layout/style/nsROCSSPrimitiveValue.h
+++ b/layout/style/nsROCSSPrimitiveValue.h
@@ -13,16 +13,17 @@
 #include "nsCSSKeywords.h"
 #include "CSSValue.h"
 #include "nsAutoPtr.h"
 #include "nsCoord.h"
 #include "nsWrapperCache.h"
 
 class nsIURI;
 class nsComputedDOMStyle;
+class nsDOMCSSRect;
 class nsDOMCSSRGBColor;
 
 /**
  * Read-only CSS primitive value - a DOM object representing values in DOM
  * computed style.
  */
 class nsROCSSPrimitiveValue MOZ_FINAL : public mozilla::dom::CSSValue,
   public nsIDOMCSSPrimitiveValue
@@ -69,17 +70,17 @@ public:
   void SetAppUnits(float aValue);
   void SetIdent(nsCSSKeyword aKeyword);
   // FIXME: CSS_STRING should imply a string with "" and a need for escaping.
   void SetString(const nsACString& aString, uint16_t aType = CSS_STRING);
   // FIXME: CSS_STRING should imply a string with "" and a need for escaping.
   void SetString(const nsAString& aString, uint16_t aType = CSS_STRING);
   void SetURI(nsIURI *aURI);
   void SetColor(nsDOMCSSRGBColor* aColor);
-  void SetRect(nsIDOMRect* aRect);
+  void SetRect(nsDOMCSSRect* aRect);
   void SetTime(float aValue);
   void Reset();
 
   nsISupports* GetParentObject() const
   {
     return nullptr;
   }
 
@@ -87,17 +88,17 @@ public:
 
 private:
   uint16_t mType;
 
   union {
     nscoord         mAppUnits;
     float           mFloat;
     nsDOMCSSRGBColor* mColor;
-    nsIDOMRect*     mRect;
+    nsDOMCSSRect*     mRect;
     PRUnichar*      mString;
     nsIURI*         mURI;
     nsCSSKeyword    mKeyword;
   } mValue;
 };
 
 inline nsROCSSPrimitiveValue *mozilla::dom::CSSValue::AsPrimitiveValue()
 {