Backed out changeset 9b0b2391485c due to linker errors related to nsS…

…tyleStructInlines.h not being included enough.
Brli · Jul 17, 2008 · 0d1a0dc · 0d1a0dc
1 parent 8ef9b02
commit 0d1a0dc
Show file tree

Hide file tree

Showing 73 changed files with 125 additions and 1,993 deletions.
diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp
@@ -583,8 +583,8 @@ nsGenericHTMLElement::GetOffsetRect(nsRect& aRect, nsIContent** aOffsetParent)
   if (parent &&
       parent->GetStylePosition()->mBoxSizing != NS_STYLE_BOX_SIZING_BORDER) {
     const nsStyleBorder* border = parent->GetStyleBorder();
-    origin.x -= border->GetActualBorderWidth(NS_SIDE_LEFT);
-    origin.y -= border->GetActualBorderWidth(NS_SIDE_TOP);
+    origin.x -= border->GetBorderWidth(NS_SIDE_LEFT);
+    origin.y -= border->GetBorderWidth(NS_SIDE_TOP);
   }
 
   // XXX We should really consider subtracting out padding for

diff --git a/content/html/document/src/nsImageDocument.cpp b/content/html/document/src/nsImageDocument.cpp
@@ -666,7 +666,7 @@ nsImageDocument::CheckOverflowing(PRBool changeState)
     nsMargin m;
     if (styleContext->GetStyleMargin()->GetMargin(m))
       visibleArea.Deflate(m);
-    m = styleContext->GetStyleBorder()->GetActualBorder();
+    m = styleContext->GetStyleBorder()->GetBorder();
     visibleArea.Deflate(m);
     if (styleContext->GetStylePadding()->GetPadding(m))
       visibleArea.Deflate(m);

diff --git a/dom/public/idl/css/nsIDOMCSS2Properties.idl b/dom/public/idl/css/nsIDOMCSS2Properties.idl
@@ -406,7 +406,7 @@ interface nsIDOMCSS2Properties : nsISupports
                                         // raises(DOMException) on setting
 };
 
-[scriptable, uuid(f1781ae4-00e6-4751-8698-2925f925fd76)]
+[scriptable, uuid(816581b0-3d89-11dd-ae16-0800200c9a66)]
 interface nsIDOMNSCSS2Properties : nsIDOMCSS2Properties
 {
            /* Non-DOM 2 extensions */
@@ -596,8 +596,4 @@ interface nsIDOMNSCSS2Properties : nsIDOMCSS2Properties
 
            attribute DOMString        MozBoxShadow;
                                         // raises(DOMException) on setting
-
-           attribute DOMString        MozBorderImage;
-                                        // raises(DOMException) on setting
-
 };
diff --git a/gfx/thebes/public/gfxContext.h b/gfx/thebes/public/gfxContext.h
@@ -337,8 +337,7 @@ class THEBES_API gfxContext {
      * Uses a surface for drawing. This is a shorthand for creating a
      * pattern and setting it.
      *
-     * @param offset from the source surface, to use only part of it.
-     *        May need to make it negative.
+     * @param offset ?
      */
     void SetSource(gfxASurface *surface, const gfxPoint& offset = gfxPoint(0.0, 0.0));