From 660ee8c1250e9d499ba7ebf087bd6ce82749982c Mon Sep 17 00:00:00 2001 From: "reed@reedloden.com" Date: Mon, 24 Mar 2008 21:55:47 -0700 Subject: [PATCH] Bug 417178 - "Google reader does not show subscribed topics in ff3b3 at certain zoom levels" [p=roc@ocallahan.org (Robert O'Callahan [roc]) r+sr=dbaron a1.9b5=mconnor] --- layout/reftests/bugs/reftest.list | 1 + layout/style/nsStyleStruct.h | 7 ++++--- layout/style/test/test_bug412901.html | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index 420e315ccb5..5a147f5f449 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -756,6 +756,7 @@ fails == 413027-3.html 413027-3-ref.html == 414851-1.html 414851-1-ref.html == 416106-1.xhtml 416106-1-ref.xhtml == 416752-1.html 416752-1-ref.html +== 417178-1.html 417178-1-ref.html == 417246-1.html 417246-1-ref.html == 417676.html 417676-ref.html == 418766-1a.html 418766-1-ref.html diff --git a/layout/style/nsStyleStruct.h b/layout/style/nsStyleStruct.h index 8ee7169aba9..a55f3a9ce59 100644 --- a/layout/style/nsStyleStruct.h +++ b/layout/style/nsStyleStruct.h @@ -306,10 +306,11 @@ struct nsBorderColors { } }; -// Border widths are rounded to the nearest integer number of pixels, but values -// between zero and one device pixels are always rounded up to one device pixel. +// Border widths are rounded to the nearest-below integer number of pixels, +// but values between zero and one device pixels are always rounded up to +// one device pixel. #define NS_ROUND_BORDER_TO_PIXELS(l,tpp) \ - ((l) == 0) ? 0 : PR_MAX((tpp), ((l) + ((tpp) / 2)) / (tpp) * (tpp)) + ((l) == 0) ? 0 : PR_MAX((tpp), (l) / (tpp) * (tpp)) // Outline offset is rounded to the nearest integer number of pixels, but values // between zero and one device pixels are always rounded up to one device pixel. // Note that the offset can be negative. diff --git a/layout/style/test/test_bug412901.html b/layout/style/test/test_bug412901.html index f28f3b4745f..2c3fead9914 100644 --- a/layout/style/test/test_bug412901.html +++ b/layout/style/test/test_bug412901.html @@ -29,7 +29,7 @@ var computedStyle = document.defaultView.getComputedStyle(div, ""); is(computedStyle.borderLeftWidth, "1px"); is(computedStyle.borderRightWidth, "0px"); is(computedStyle.borderTopWidth, "2px"); -is(computedStyle.borderBottomWidth, "6px"); +is(computedStyle.borderBottomWidth, "5px"); var div2 = document.getElementById("testDiv2"); var computedStyle2 = document.defaultView.getComputedStyle(div2, "");