Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 13:51:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove obsolete state bit NS_BLOCK_SHRINK_WRAP. Bug 369243, r=bz, sr=dbaron

Browse Source
This commit is contained in:
smontagu%smontagu.org 2007-02-15 05:07:57 +00:00
parent 44dddff819
commit 2932d47653
5 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
layout/base/nsCSSFrameConstructor.cpp
View File

@ -4765,7 +4765,7 @@ nsCSSFrameConstructor::ConstructButtonFrame(nsFrameConstructorState& aState,
aStyleContext);
nsIFrame* areaFrame = NS_NewAreaFrame(mPresShell, styleContext,
NS_BLOCK_SPACE_MGR | NS_BLOCK_SHRINK_WRAP);
NS_BLOCK_SPACE_MGR);
if (NS_UNLIKELY(!areaFrame)) {
buttonFrame->Destroy();
@ -4861,7 +4861,7 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsFrameConstructorState& aState,
// a dropdown list. The display area and button are created through anonymous content.
// The drop-down list's frame is created explicitly. The combobox frame shares its content
// with the drop-down list.
PRUint32 flags = NS_BLOCK_SHRINK_WRAP | NS_BLOCK_SPACE_MGR;
PRUint32 flags = NS_BLOCK_SPACE_MGR;
nsIFrame* comboboxFrame = NS_NewComboboxControlFrame(mPresShell, aStyleContext, flags);
// Save the history state so we don't restore during construction
@ -4968,7 +4968,7 @@ nsCSSFrameConstructor::ConstructSelectFrame(nsFrameConstructorState& aState,
}
nsIFrame* scrolledFrame = NS_NewSelectsAreaFrame(
mPresShell, aStyleContext, NS_BLOCK_SHRINK_WRAP | NS_BLOCK_SPACE_MGR);
mPresShell, aStyleContext, NS_BLOCK_SPACE_MGR);
// ******* this code stolen from Initialze ScrollFrame ********
// please adjust this code to use BuildScrollFrame.
@ -5111,7 +5111,7 @@ nsCSSFrameConstructor::ConstructFieldSetFrame(nsFrameConstructorState& aState,
aStyleContext);
nsIFrame* areaFrame = NS_NewAreaFrame(mPresShell, styleContext,
NS_BLOCK_SPACE_MGR | NS_BLOCK_SHRINK_WRAP | NS_BLOCK_MARGIN_ROOT);
NS_BLOCK_SPACE_MGR | NS_BLOCK_MARGIN_ROOT);
InitAndRestoreFrame(aState, aContent, newFrame, nsnull, areaFrame);
nsresult rv = aState.AddChild(newFrame, aFrameItems, aStyleDisplay, aContent,
@ -5814,7 +5814,7 @@ nsCSSFrameConstructor::ConstructXULFrame(nsFrameConstructorState& aState,
if ((aTag == nsGkAtoms::label || aTag == nsGkAtoms::description) &&
(! aContent->HasAttr(kNameSpaceID_None, nsGkAtoms::value))) {
newFrame = NS_NewAreaFrame(mPresShell, aStyleContext,
NS_BLOCK_SPACE_MGR | NS_BLOCK_SHRINK_WRAP | NS_BLOCK_MARGIN_ROOT);
NS_BLOCK_SPACE_MGR | NS_BLOCK_MARGIN_ROOT);
}
else {
newFrame = NS_NewTextBoxFrame(mPresShell, aStyleContext);
@ -6361,7 +6361,7 @@ nsCSSFrameConstructor::ConstructFrameByDisplayType(nsFrameConstructorState& aSta
// pass a temporary stylecontext, the correct one will be set later
nsIFrame* scrolledFrame =
NS_NewAreaFrame(mPresShell, aStyleContext,
NS_BLOCK_SPACE_MGR | NS_BLOCK_SHRINK_WRAP | NS_BLOCK_MARGIN_ROOT);
NS_BLOCK_SPACE_MGR | NS_BLOCK_MARGIN_ROOT);
nsFrameItems blockItem;
rv = ConstructBlock(aState,

3
layout/forms/nsComboboxControlFrame.cpp
View File

@ -275,9 +275,6 @@ nsComboboxControlFrame::nsComboboxControlFrame(nsStyleContext* aContext)
mRecentSelectedIndex = NS_SKIP_NOTIFY_INDEX;
//Shrink the area around its contents
//SetFlags(NS_BLOCK_SHRINK_WRAP);
REFLOW_COUNTER_INIT()
}

2
layout/forms/nsFileControlFrame.cpp
View File

@ -87,8 +87,6 @@ nsFileControlFrame::nsFileControlFrame(nsStyleContext* aContext):
mTextFrame(nsnull),
mCachedState(nsnull)
{
//Shrink the area around its contents
SetFlags(NS_BLOCK_SHRINK_WRAP);
}
nsFileControlFrame::~nsFileControlFrame()

3
layout/forms/nsIsIndexFrame.cpp
View File

@ -88,8 +88,7 @@ NS_NewIsIndexFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
nsIsIndexFrame::nsIsIndexFrame(nsStyleContext* aContext) :
nsAreaFrame(aContext)
{
//Shrink the area around its contents
SetFlags(NS_BLOCK_SHRINK_WRAP | NS_BLOCK_SPACE_MGR);
SetFlags(NS_BLOCK_SPACE_MGR);
}
nsIsIndexFrame::~nsIsIndexFrame()

3
layout/generic/nsHTMLParts.h
View File

@ -61,7 +61,6 @@ class nsIChannel;
* Additional frame-state bits used by nsBlockFrame
* See the meanings at http://www.mozilla.org/newlayout/doc/block-and-line.html
*/
#define NS_BLOCK_SHRINK_WRAP 0x00100000
#define NS_BLOCK_NO_AUTO_MARGINS 0x00200000
#define NS_BLOCK_MARGIN_ROOT 0x00400000
#define NS_BLOCK_SPACE_MGR 0x00800000
@ -120,7 +119,7 @@ NS_NewAbsoluteItemWrapperFrame(nsIPresShell* aPresShell, nsStyleContext* aContex
inline nsIFrame*
NS_NewFloatingItemWrapperFrame(nsIPresShell* aPresShell, nsStyleContext* aContext) {
return NS_NewAreaFrame(aPresShell, aContext,
NS_BLOCK_SPACE_MGR|NS_BLOCK_SHRINK_WRAP|NS_BLOCK_MARGIN_ROOT);
NS_BLOCK_SPACE_MGR|NS_BLOCK_MARGIN_ROOT);
}
// This type of AreaFrame doesn't use its own space manager and