From 789b7004008514cd3c81ecb1dd7b1b3ce8f999c5 Mon Sep 17 00:00:00 2001 From: Olli Pettay Date: Sat, 20 Sep 2008 23:01:34 +0300 Subject: [PATCH] backout Bug 456147 --- layout/reftests/bugs/colored-strike-ref.html | 12 ------------ layout/reftests/bugs/colored-strike.xul | 13 ------------- layout/reftests/bugs/reftest.list | 2 +- layout/xul/base/src/nsTextBoxFrame.cpp | 2 +- 4 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 layout/reftests/bugs/colored-strike-ref.html delete mode 100644 layout/reftests/bugs/colored-strike.xul diff --git a/layout/reftests/bugs/colored-strike-ref.html b/layout/reftests/bugs/colored-strike-ref.html deleted file mode 100644 index 3ffa32111e56d..0000000000000 --- a/layout/reftests/bugs/colored-strike-ref.html +++ /dev/null @@ -1,12 +0,0 @@ - -Colored strikethrough test - -
The next three lines should all have:
-
-
-No overline.
-Orange underline.
-Blue strikethrough.
-
-
- diff --git a/layout/reftests/bugs/colored-strike.xul b/layout/reftests/bugs/colored-strike.xul deleted file mode 100644 index c348c8eb58a36..0000000000000 --- a/layout/reftests/bugs/colored-strike.xul +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index 09ed606ea1286..c4521c2c55fe2 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -916,4 +916,4 @@ fails == 441259-2.html 441259-2-ref.html # bug 441400 == 451168-1.html 451168-1-ref.html == 454361.html about:blank == 455280-1.xhtml 455280-1-ref.xhtml -== colored-strike.xul colored-strike-ref.html + diff --git a/layout/xul/base/src/nsTextBoxFrame.cpp b/layout/xul/base/src/nsTextBoxFrame.cpp index bb322e1e9b49b..a694f37cfcff2 100644 --- a/layout/xul/base/src/nsTextBoxFrame.cpp +++ b/layout/xul/base/src/nsTextBoxFrame.cpp @@ -478,7 +478,7 @@ nsTextBoxFrame::PaintTitle(nsIRenderingContext& aRenderingContext, fontMet->GetStrikeout(offset, size); gfxFloat offsetPixel = presContext->AppUnitsToGfxUnits(offset); gfxFloat sizePixel = presContext->AppUnitsToGfxUnits(size); - nsCSSRendering::PaintDecorationLine(ctx, strikeColor, + nsCSSRendering::PaintDecorationLine(ctx, underColor, pt, gfxSize(width, sizePixel), ascentPixel, offsetPixel, NS_STYLE_TEXT_DECORATION_LINE_THROUGH,