diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp
index 3761f32401c..39d6c4f743e 100644
--- a/mozilla/layout/generic/nsBlockFrame.cpp
+++ b/mozilla/layout/generic/nsBlockFrame.cpp
@@ -3975,7 +3975,7 @@ nsBaseIBFrame::Paint(nsIPresContext&      aPresContext,
     nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this,
                                     aDirtyRect, rect, *color, *spacing, 0, 0);
     nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this,
-                                aDirtyRect, rect, *spacing, skipSides);
+                                aDirtyRect, rect, *spacing, mStyleContext, skipSides);
   }
 
   // If overflow is hidden then set the clip rect so that children
diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp
index 3761f32401c..39d6c4f743e 100644
--- a/mozilla/layout/generic/nsBlockReflowState.cpp
+++ b/mozilla/layout/generic/nsBlockReflowState.cpp
@@ -3975,7 +3975,7 @@ nsBaseIBFrame::Paint(nsIPresContext&      aPresContext,
     nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this,
                                     aDirtyRect, rect, *color, *spacing, 0, 0);
     nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this,
-                                aDirtyRect, rect, *spacing, skipSides);
+                                aDirtyRect, rect, *spacing, mStyleContext, skipSides);
   }
 
   // If overflow is hidden then set the clip rect so that children
diff --git a/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h
index 3761f32401c..39d6c4f743e 100644
--- a/mozilla/layout/generic/nsBlockReflowState.h
+++ b/mozilla/layout/generic/nsBlockReflowState.h
@@ -3975,7 +3975,7 @@ nsBaseIBFrame::Paint(nsIPresContext&      aPresContext,
     nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this,
                                     aDirtyRect, rect, *color, *spacing, 0, 0);
     nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this,
-                                aDirtyRect, rect, *spacing, skipSides);
+                                aDirtyRect, rect, *spacing, mStyleContext, skipSides);
   }
 
   // If overflow is hidden then set the clip rect so that children
diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp
index 3761f32401c..39d6c4f743e 100644
--- a/mozilla/layout/html/base/src/nsBlockFrame.cpp
+++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp
@@ -3975,7 +3975,7 @@ nsBaseIBFrame::Paint(nsIPresContext&      aPresContext,
     nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this,
                                     aDirtyRect, rect, *color, *spacing, 0, 0);
     nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this,
-                                aDirtyRect, rect, *spacing, skipSides);
+                                aDirtyRect, rect, *spacing, mStyleContext, skipSides);
   }
 
   // If overflow is hidden then set the clip rect so that children
diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp
index 3761f32401c..39d6c4f743e 100644
--- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp
+++ b/mozilla/layout/html/base/src/nsBlockReflowState.cpp
@@ -3975,7 +3975,7 @@ nsBaseIBFrame::Paint(nsIPresContext&      aPresContext,
     nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this,
                                     aDirtyRect, rect, *color, *spacing, 0, 0);
     nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this,
-                                aDirtyRect, rect, *spacing, skipSides);
+                                aDirtyRect, rect, *spacing, mStyleContext, skipSides);
   }
 
   // If overflow is hidden then set the clip rect so that children
diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h
index 3761f32401c..39d6c4f743e 100644
--- a/mozilla/layout/html/base/src/nsBlockReflowState.h
+++ b/mozilla/layout/html/base/src/nsBlockReflowState.h
@@ -3975,7 +3975,7 @@ nsBaseIBFrame::Paint(nsIPresContext&      aPresContext,
     nsCSSRendering::PaintBackground(aPresContext, aRenderingContext, this,
                                     aDirtyRect, rect, *color, *spacing, 0, 0);
     nsCSSRendering::PaintBorder(aPresContext, aRenderingContext, this,
-                                aDirtyRect, rect, *spacing, skipSides);
+                                aDirtyRect, rect, *spacing, mStyleContext, skipSides);
   }
 
   // If overflow is hidden then set the clip rect so that children