wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 653125. Remove misc SVG views. r=roc

Browse Source
This commit is contained in:
Timothy Nikkel 2011-04-29 12:36:02 +02:00
parent 79ed69dc0c
commit baa16dc247
2 changed files with 10 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
layout/base/nsCSSFrameConstructor.cpp
View File

@ -3687,11 +3687,9 @@ nsCSSFrameConstructor::ConstructFrameFromItemInternal(FrameConstructionItem& aIt
CHECK_ONLY_ONE_BIT(FCDATA_FUNC_IS_FULL_CTOR, FCDATA_MAY_NEED_SCROLLFRAME);
CHECK_ONLY_ONE_BIT(FCDATA_FUNC_IS_FULL_CTOR, FCDATA_IS_POPUP);
CHECK_ONLY_ONE_BIT(FCDATA_FUNC_IS_FULL_CTOR, FCDATA_SKIP_ABSPOS_PUSH);
CHECK_ONLY_ONE_BIT(FCDATA_FUNC_IS_FULL_CTOR, FCDATA_FORCE_VIEW);
CHECK_ONLY_ONE_BIT(FCDATA_FUNC_IS_FULL_CTOR,
FCDATA_DISALLOW_GENERATED_CONTENT);
CHECK_ONLY_ONE_BIT(FCDATA_FUNC_IS_FULL_CTOR, FCDATA_ALLOW_BLOCK_STYLES);
CHECK_ONLY_ONE_BIT(FCDATA_MAY_NEED_SCROLLFRAME, FCDATA_FORCE_VIEW);
#undef CHECK_ONLY_ONE_BIT
NS_ASSERTION(!(bits & FCDATA_FORCED_NON_SCROLLABLE_BLOCK) ||
((bits & FCDATA_FUNC_IS_FULL_CTOR) &&
@ -3755,8 +3753,7 @@ nsCSSFrameConstructor::ConstructFrameFromItemInternal(FrameConstructionItem& aIt
newFrame);
NS_ASSERTION(NS_SUCCEEDED(rv), "InitAndRestoreFrame failed");
// See whether we need to create a view
nsContainerFrame::CreateViewForFrame(newFrame,
(bits & FCDATA_FORCE_VIEW) != 0);
nsContainerFrame::CreateViewForFrame(newFrame, PR_FALSE);
frameToAddToList = newFrame;
}
@ -4797,8 +4794,7 @@ nsCSSFrameConstructor::FindSVGData(Element* aElement,
// and do the PassesConditionalProcessingTests call in
// nsSVGOuterSVGFrame::Init.
static const FrameConstructionData sOuterSVGData =
FCDATA_DECL(FCDATA_FORCE_VIEW | FCDATA_SKIP_ABSPOS_PUSH |
FCDATA_DISALLOW_GENERATED_CONTENT,
FCDATA_DECL(FCDATA_SKIP_ABSPOS_PUSH | FCDATA_DISALLOW_GENERATED_CONTENT,
NS_NewSVGOuterSVGFrame);
return &sOuterSVGData;
}
@ -4944,10 +4940,6 @@ nsCSSFrameConstructor::ConstructSVGForeignObjectFrame(nsFrameConstructorState& a
&blockFrame, childItems, PR_TRUE,
aItem.mPendingBinding);
// Give the blockFrame a view so that GetOffsetTo works for descendants
// of blockFrame with views...
nsHTMLContainerFrame::CreateViewForFrame(blockFrame, PR_TRUE);
newFrame->SetInitialChildList(nsnull, childItems);
*aNewFrame = newFrame;

21
layout/base/nsCSSFrameConstructor.h
View File

@ -698,40 +698,35 @@ private:
/* If FCDATA_SKIP_ABSPOS_PUSH is set, don't push this frame as an
absolute containing block, no matter what its style says. */
#define FCDATA_SKIP_ABSPOS_PUSH 0x200
/* If FCDATA_FORCE_VIEW is set, then force creation of a view for the frame.
this is only used if a scrollframe is not created and a full constructor
isn't used, so this flag shouldn't be used with
FCDATA_MAY_NEED_SCROLLFRAME or FCDATA_FUNC_IS_FULL_CTOR. */
#define FCDATA_FORCE_VIEW 0x400
/* If FCDATA_DISALLOW_GENERATED_CONTENT is set, then don't allow generated
content when processing kids of this frame. This should not be used with
FCDATA_FUNC_IS_FULL_CTOR */
#define FCDATA_DISALLOW_GENERATED_CONTENT 0x800
#define FCDATA_DISALLOW_GENERATED_CONTENT 0x400
/* If FCDATA_IS_TABLE_PART is set, then the frame is some sort of
table-related thing and we should not attempt to fetch a table-cell parent
for it if it's inside another table-related frame. */
#define FCDATA_IS_TABLE_PART 0x1000
#define FCDATA_IS_TABLE_PART 0x800
/* If FCDATA_IS_INLINE is set, then the frame is a non-replaced CSS
inline box. */
#define FCDATA_IS_INLINE 0x2000
#define FCDATA_IS_INLINE 0x1000
/* If FCDATA_IS_LINE_PARTICIPANT is set, the frame is something that will
return true for IsFrameOfType(nsIFrame::eLineParticipant) */
#define FCDATA_IS_LINE_PARTICIPANT 0x4000
#define FCDATA_IS_LINE_PARTICIPANT 0x2000
/* If FCDATA_IS_LINE_BREAK is set, the frame is something that will
induce a line break boundary before and after itself. */
#define FCDATA_IS_LINE_BREAK 0x8000
#define FCDATA_IS_LINE_BREAK 0x4000
/* If FCDATA_ALLOW_BLOCK_STYLES is set, allow block styles when processing
children. This should not be used with FCDATA_FUNC_IS_FULL_CTOR. */
#define FCDATA_ALLOW_BLOCK_STYLES 0x10000
#define FCDATA_ALLOW_BLOCK_STYLES 0x8000
/* If FCDATA_USE_CHILD_ITEMS is set, then use the mChildItems in the relevant
FrameConstructionItem instead of trying to process the content's children.
This can be used with or without FCDATA_FUNC_IS_FULL_CTOR.
The child items might still need table pseudo processing. */
#define FCDATA_USE_CHILD_ITEMS 0x20000
#define FCDATA_USE_CHILD_ITEMS 0x10000
/* If FCDATA_FORCED_NON_SCROLLABLE_BLOCK is set, then this block
would have been scrollable but has been forced to be
non-scrollable due to being in a paginated context. */
#define FCDATA_FORCED_NON_SCROLLABLE_BLOCK 0x40000
#define FCDATA_FORCED_NON_SCROLLABLE_BLOCK 0x20000
/* Structure representing information about how a frame should be
constructed. */