From 8246fb01776d4f64dd0cbd80b1fcc41095ec07a7 Mon Sep 17 00:00:00 2001
From: "dcone%netscape.com"
 <dcone%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 18 Nov 1999 16:03:45 +0000
Subject: [PATCH] Thickness of side is now checked.  Fixed bug 14944.  r=rods

git-svn-id: svn://10.0.0.236/trunk@53885 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/base/nsCSSRendering.cpp        | 20 +++++++++++++++++--
 .../layout/html/style/src/nsCSSRendering.cpp  | 20 +++++++++++++++++--
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/mozilla/layout/base/nsCSSRendering.cpp b/mozilla/layout/base/nsCSSRendering.cpp
index b6ba2964e17..b851aedcacb 100644
--- a/mozilla/layout/base/nsCSSRendering.cpp
+++ b/mozilla/layout/base/nsCSSRendering.cpp
@@ -2487,14 +2487,30 @@ nscolor   sideColor;
 nsPoint   polypath[MAXPOLYPATHSIZE];
 PRInt32   curIndex,c1Index,c2Index,junk;
 PRInt8    border_Style;
-PRInt16   r,g,b;
+PRInt16   r,g,b,thickness;
 
   // set the style information
   aBorderStyle.GetBorderColor(aSide,sideColor);
   aRenderingContext.SetColor ( sideColor );
 
+  thickness = 0;
+  switch(aSide){
+    case  NS_SIDE_LEFT:
+      thickness = aBorThick.left;
+      break;
+    case  NS_SIDE_TOP:
+      thickness = aBorThick.top;
+      break;
+    case  NS_SIDE_RIGHT:
+      thickness = aBorThick.right;
+      break;
+    case  NS_SIDE_BOTTOM:
+      thickness = aBorThick.bottom;
+      break;
+  }
+
   // if the border is thin, just draw it 
-  if (aBorThick.top<aTwipsPerPixel) {
+  if (thickness<aTwipsPerPixel) {
     // NOTHING FANCY JUST DRAW OUR OUTSIDE BORDER
     thecurve.SetPoints(aPoints[0].x,aPoints[0].y,aPoints[1].x,aPoints[1].y,aPoints[2].x,aPoints[2].y);
     thecurve.SubDivide((nsIRenderingContext*)&aRenderingContext,0,0);
diff --git a/mozilla/layout/html/style/src/nsCSSRendering.cpp b/mozilla/layout/html/style/src/nsCSSRendering.cpp
index b6ba2964e17..b851aedcacb 100644
--- a/mozilla/layout/html/style/src/nsCSSRendering.cpp
+++ b/mozilla/layout/html/style/src/nsCSSRendering.cpp
@@ -2487,14 +2487,30 @@ nscolor   sideColor;
 nsPoint   polypath[MAXPOLYPATHSIZE];
 PRInt32   curIndex,c1Index,c2Index,junk;
 PRInt8    border_Style;
-PRInt16   r,g,b;
+PRInt16   r,g,b,thickness;
 
   // set the style information
   aBorderStyle.GetBorderColor(aSide,sideColor);
   aRenderingContext.SetColor ( sideColor );
 
+  thickness = 0;
+  switch(aSide){
+    case  NS_SIDE_LEFT:
+      thickness = aBorThick.left;
+      break;
+    case  NS_SIDE_TOP:
+      thickness = aBorThick.top;
+      break;
+    case  NS_SIDE_RIGHT:
+      thickness = aBorThick.right;
+      break;
+    case  NS_SIDE_BOTTOM:
+      thickness = aBorThick.bottom;
+      break;
+  }
+
   // if the border is thin, just draw it 
-  if (aBorThick.top<aTwipsPerPixel) {
+  if (thickness<aTwipsPerPixel) {
     // NOTHING FANCY JUST DRAW OUR OUTSIDE BORDER
     thecurve.SetPoints(aPoints[0].x,aPoints[0].y,aPoints[1].x,aPoints[1].y,aPoints[2].x,aPoints[2].y);
     thecurve.SubDivide((nsIRenderingContext*)&aRenderingContext,0,0);