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 500882 part 8. Remove the SetMayHaveFrame/MayHaveFrame vestiges. r=smaug

Browse Source
This commit is contained in:
Boris Zbarsky 2009-12-24 16:20:06 -05:00
parent 8519610b49
commit 1ca5801f4b
9 changed files with 17 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
content/base/public/nsIContent.h
View File

@ -71,10 +71,9 @@ enum nsLinkState {
};
// IID for the nsIContent interface
// c726e716-a4be-4202-8a5e-32d0525903e8
#define NS_ICONTENT_IID \
{ 0xc726e716, 0xa4be, 0x4202, \
{ 0x8a, 0x5e, 0x32, 0xd0, 0x52, 0x59, 0x03, 0xe8 } }
{ 0xe88a767e, 0x1ca1, 0x4855, \
{ 0xa7, 0xa4, 0x37, 0x9f, 0x07, 0x89, 0x45, 0xef } }
/**
* A node of content in a document's content model. This interface
@ -706,25 +705,6 @@ public:
{
}
/**
* Call to let the content node know that it may now have a frame.
* The content node may use this to determine what MayHaveFrame
* returns.
*/
virtual void SetMayHaveFrame(PRBool aMayHaveFrame)
{
}
/**
* @returns PR_TRUE if there is a chance that the content node has a
* frame.
* @returns PR_FALSE otherwise.
*/
virtual PRBool MayHaveFrame() const
{
return PR_TRUE;
}
/**
* This method is called when the parser begins creating the element's
* children, if any are present.

35
content/base/public/nsINode.h
View File

@ -98,45 +98,41 @@ enum {
// NOTE: Should only be used on nsIContent nodes
NODE_IS_NATIVE_ANONYMOUS_ROOT = 0x00000020U,
// Whether this node may have a frame
// NOTE: Should only be used on nsIContent nodes
NODE_MAY_HAVE_FRAME = 0x00000040U,
// Forces the XBL code to treat this node as if it were
// in the document and therefore should get bindings attached.
NODE_FORCE_XBL_BINDINGS = 0x00000080U,
NODE_FORCE_XBL_BINDINGS = 0x00000040U,
// Whether a binding manager may have a pointer to this
NODE_MAY_BE_IN_BINDING_MNGR = 0x00000100U,
NODE_MAY_BE_IN_BINDING_MNGR = 0x00000080U,
NODE_IS_EDITABLE = 0x00000200U,
NODE_IS_EDITABLE = 0x00000100U,
// Optimizations to quickly check whether element may have ID, class or style
// attributes. Not all element implementations may use these!
NODE_MAY_HAVE_ID = 0x00000400U,
NODE_MAY_HAVE_ID = 0x00000200U,
// For all Element nodes, NODE_MAY_HAVE_CLASS is guaranteed to be set if the
// node in fact has a class, but may be set even if it doesn't.
NODE_MAY_HAVE_CLASS = 0x00000800U,
NODE_MAY_HAVE_STYLE = 0x00001000U,
NODE_MAY_HAVE_CLASS = 0x00000400U,
NODE_MAY_HAVE_STYLE = 0x00000800U,
NODE_IS_INSERTION_PARENT = 0x00002000U,
NODE_IS_INSERTION_PARENT = 0x00001000U,
// Node has an :empty or :-moz-only-whitespace selector
NODE_HAS_EMPTY_SELECTOR = 0x00004000U,
NODE_HAS_EMPTY_SELECTOR = 0x00002000U,
// A child of the node has a selector such that any insertion,
// removal, or appending of children requires restyling the parent.
NODE_HAS_SLOW_SELECTOR = 0x00008000U,
NODE_HAS_SLOW_SELECTOR = 0x00004000U,
// A child of the node has a :first-child, :-moz-first-node,
// :only-child, :last-child or :-moz-last-node selector.
NODE_HAS_EDGE_CHILD_SELECTOR = 0x00010000U,
NODE_HAS_EDGE_CHILD_SELECTOR = 0x00008000U,
// A child of the node has a selector such that any insertion or
// removal of children requires restyling the parent (but append is
// OK).
NODE_HAS_SLOW_SELECTOR_NOAPPEND
= 0x00020000U,
= 0x00010000U,
NODE_ALL_SELECTOR_FLAGS = NODE_HAS_EMPTY_SELECTOR |
NODE_HAS_SLOW_SELECTOR |
@ -144,10 +140,10 @@ enum {
NODE_HAS_SLOW_SELECTOR_NOAPPEND,
NODE_MAY_HAVE_CONTENT_EDITABLE_ATTR
= 0x00040000U,
= 0x00020000U,
NODE_ATTACH_BINDING_ON_POSTCREATE
= 0x00080000U,
= 0x00040000U,
// Four bits for the script-type ID
NODE_SCRIPT_TYPE_OFFSET = 20,
@ -246,8 +242,8 @@ private:
// IID for the nsINode interface
#define NS_INODE_IID \
{ 0xc6485d02, 0x7c8a, 0x42fd, \
{ 0x97, 0x15, 0x0f, 0x67, 0xfd, 0x69, 0xd5, 0x3e } }
{ 0x7244fd04, 0xa8e9, 0x4839, \
{ 0x92, 0x48, 0xb2, 0xe0, 0xd8, 0xd8, 0x85, 0x0d } }
/**
* An internal interface that abstracts some DOMNode-related parts that both
@ -733,7 +729,6 @@ public:
void SetFlags(PtrBits aFlagsToSet)
{
NS_ASSERTION(!(aFlagsToSet & (NODE_IS_ANONYMOUS |
NODE_MAY_HAVE_FRAME |
NODE_IS_NATIVE_ANONYMOUS_ROOT |
NODE_IS_IN_ANONYMOUS_SUBTREE |
NODE_ATTACH_BINDING_ON_POSTCREATE)) ||

8
content/base/src/nsCommentNode.cpp
View File

@ -64,7 +64,6 @@ public:
// Empty interface
// nsIContent
virtual PRBool MayHaveFrame() const;
virtual PRBool IsNodeOfType(PRUint32 aFlags) const;
#ifdef DEBUG
@ -120,13 +119,6 @@ NS_IMPL_ADDREF_INHERITED(nsCommentNode, nsGenericDOMDataNode)
NS_IMPL_RELEASE_INHERITED(nsCommentNode, nsGenericDOMDataNode)
// virtual
PRBool
nsCommentNode::MayHaveFrame() const
{
return PR_FALSE;
}
PRBool
nsCommentNode::IsNodeOfType(PRUint32 aFlags) const
{

8
content/base/src/nsGenericDOMDataNode.cpp
View File

@ -767,14 +767,6 @@ nsGenericDOMDataNode::RemoveChildAt(PRUint32 aIndex, PRBool aNotify, PRBool aMut
return NS_OK;
}
// virtual
PRBool
nsGenericDOMDataNode::MayHaveFrame() const
{
nsIContent* parent = GetParent();
return parent && parent->MayHaveFrame();
}
nsIContent *
nsGenericDOMDataNode::GetBindingParent() const
{

2
content/base/src/nsGenericDOMDataNode.h
View File

@ -255,8 +255,6 @@ public:
virtual already_AddRefed<nsIURI> GetBaseURI() const;
virtual PRBool IsLink(nsIURI** aURI) const;
virtual PRBool MayHaveFrame() const;
virtual nsIAtom* GetID() const;
virtual const nsAttrValue* DoGetClasses() const;
NS_IMETHOD WalkContentStyleRules(nsRuleWalker* aRuleWalker);

18
content/base/src/nsGenericElement.cpp
View File

@ -3204,24 +3204,6 @@ nsGenericElement::IsNodeOfType(PRUint32 aFlags) const
//----------------------------------------------------------------------
// virtual
void
nsGenericElement::SetMayHaveFrame(PRBool aMayHaveFrame)
{
if (aMayHaveFrame) {
SetFlags(NODE_MAY_HAVE_FRAME);
} else {
UnsetFlags(NODE_MAY_HAVE_FRAME);
}
}
// virtual
PRBool
nsGenericElement::MayHaveFrame() const
{
return HasFlag(NODE_MAY_HAVE_FRAME);
}
PRUint32
nsGenericElement::GetScriptTypeID() const
{

2
content/base/src/nsGenericElement.h
View File

@ -422,8 +422,6 @@ public:
virtual PRBool IsNodeOfType(PRUint32 aFlags) const;
virtual already_AddRefed<nsIURI> GetBaseURI() const;
virtual PRBool IsLink(nsIURI** aURI) const;
virtual void SetMayHaveFrame(PRBool aMayHaveFrame);
virtual PRBool MayHaveFrame() const;
virtual PRUint32 GetScriptTypeID() const;
NS_IMETHOD SetScriptTypeID(PRUint32 aLang);

7
content/xml/content/src/nsXMLProcessingInstruction.cpp
View File

@ -140,13 +140,6 @@ nsXMLProcessingInstruction::IsNodeOfType(PRUint32 aFlags) const
return !(aFlags & ~(eCONTENT | ePROCESSING_INSTRUCTION | eDATA_NODE));
}
// virtual
PRBool
nsXMLProcessingInstruction::MayHaveFrame() const
{
return PR_FALSE;
}
NS_IMETHODIMP
nsXMLProcessingInstruction::GetNodeName(nsAString& aNodeName)
{

1
content/xml/content/src/nsXMLProcessingInstruction.h
View File

@ -65,7 +65,6 @@ public:
// nsIContent
virtual PRBool IsNodeOfType(PRUint32 aFlags) const;
virtual PRBool MayHaveFrame() const;
#ifdef DEBUG
virtual void List(FILE* out, PRInt32 aIndent) const;