From 7042d53d8b23f2b4b730d5032168d9317a1edb02 Mon Sep 17 00:00:00 2001 From: Robert O'Callahan Date: Fri, 12 Jun 2009 13:48:07 +1200 Subject: [PATCH] Bug 496032. Buttons should should lay out their contents using IsBlockInside not IsBlockOutside. r+sr=bzbarsky --HG-- extra : rebase_source : bd35093b32239a2803868ab8d684f56db318fbeb --- layout/base/nsCSSFrameConstructor.cpp | 2 +- layout/reftests/bugs/496032-1-ref.html | 12 ++++++++++++ layout/reftests/bugs/496032-1.html | 13 +++++++++++++ layout/reftests/bugs/reftest.list | 1 + 4 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 layout/reftests/bugs/496032-1-ref.html create mode 100644 layout/reftests/bugs/496032-1.html diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index f238b92f2d4..e423be4e96e 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -3180,7 +3180,7 @@ nsCSSFrameConstructor::ConstructButtonFrame(nsFrameConstructorState& aState, #endif rv = ProcessChildren(aState, content, styleContext, blockFrame, PR_TRUE, - childItems, aStyleDisplay->IsBlockOutside()); + childItems, aStyleDisplay->IsBlockInside()); if (NS_FAILED(rv)) return rv; // Set the areas frame's initial child lists diff --git a/layout/reftests/bugs/496032-1-ref.html b/layout/reftests/bugs/496032-1-ref.html new file mode 100644 index 00000000000..faed2e13d1b --- /dev/null +++ b/layout/reftests/bugs/496032-1-ref.html @@ -0,0 +1,12 @@ + + + + + + + + + diff --git a/layout/reftests/bugs/496032-1.html b/layout/reftests/bugs/496032-1.html new file mode 100644 index 00000000000..ae0b489819b --- /dev/null +++ b/layout/reftests/bugs/496032-1.html @@ -0,0 +1,13 @@ + + + + + + + + + diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index c5bf2625937..d99961de502 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -1244,3 +1244,4 @@ fails-if(MOZ_WIDGET_TOOLKIT!="cocoa") == 488692-1.html 488692-1-ref.html # needs == 494667-1.html 494667-1-ref.html == 494667-2.html 494667-2-ref.html == 495274-1.html 495274-1-ref.html +== 496032-1.html 496032-1-ref.html