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 669012 - Part c: Remove the return value from nsIContent::DoneAddingChildren; r=smaug+hsivonen.

Browse Source
This commit is contained in:
Ms2ger 2011-11-16 08:50:18 +01:00
parent c8b7c1e16a
commit ff51eaf751
10 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -74,9 +74,9 @@ enum nsLinkState {
};
// IID for the nsIContent interface
#define NS_ICONTENT_IID \
{ 0xdec4b381, 0xa3fc, 0x402b, \
{ 0x83, 0x96, 0x0a, 0x7b, 0x37, 0x52, 0xcf, 0x70 } }
#define NS_ICONTENT_IID \
{ 0xb651e0a7, 0x1471, 0x49cc, \
{ 0xb4, 0xe1, 0xc2, 0xca, 0x01, 0xfe, 0xb7, 0x80 } }
/**
* A node of content in a document's content model. This interface
@ -753,18 +753,12 @@ public:
* have the parser pass true. See nsHTMLInputElement.cpp and
* nsHTMLContentSink::MakeContentObject().
*
* It is ok to ignore an error returned from this function.
*
* This means that implementations will have to deal with returned error
* codes being ignored.
*
* @param aHaveNotified Whether there has been a
* ContentInserted/ContentAppended notification for this content node
* yet.
*/
virtual nsresult DoneAddingChildren(bool aHaveNotified)
virtual void DoneAddingChildren(bool aHaveNotified)
{
return NS_OK;
}
/**

5
content/html/content/src/nsHTMLObjectElement.cpp
View File

@ -129,7 +129,7 @@ public:
virtual bool IsDisabled() const { return false; }
virtual nsresult DoneAddingChildren(bool aHaveNotified);
virtual void DoneAddingChildren(bool aHaveNotified);
virtual bool IsDoneAddingChildren();
virtual bool ParseAttribute(PRInt32 aNamespaceID,
@ -200,7 +200,7 @@ nsHTMLObjectElement::IsDoneAddingChildren()
return mIsDoneAddingChildren;
}
nsresult
void
nsHTMLObjectElement::DoneAddingChildren(bool aHaveNotified)
{
mIsDoneAddingChildren = true;
@ -210,7 +210,6 @@ nsHTMLObjectElement::DoneAddingChildren(bool aHaveNotified)
if (IsInDoc()) {
StartObjectLoad(aHaveNotified);
}
return NS_OK;
}
NS_IMPL_CYCLE_COLLECTION_CLASS(nsHTMLObjectElement)

4
content/html/content/src/nsHTMLSelectElement.cpp
View File

@ -1443,7 +1443,7 @@ nsHTMLSelectElement::UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute,
return rv;
}
nsresult
void
nsHTMLSelectElement::DoneAddingChildren(bool aHaveNotified)
{
mIsDoneAddingChildren = true;
@ -1480,8 +1480,6 @@ nsHTMLSelectElement::DoneAddingChildren(bool aHaveNotified)
}
mDefaultSelectionSet = true;
return NS_OK;
}
bool

2
content/html/content/src/nsHTMLSelectElement.h
View File

@ -398,7 +398,7 @@ public:
virtual nsresult UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute,
bool aNotify);
virtual nsresult DoneAddingChildren(bool aHaveNotified);
virtual void DoneAddingChildren(bool aHaveNotified);
virtual bool IsDoneAddingChildren() {
return mIsDoneAddingChildren;
}

6
content/html/content/src/nsHTMLSharedObjectElement.cpp
View File

@ -127,7 +127,7 @@ public:
virtual bool IsHTMLFocusable(bool aWithMouse, bool *aIsFocusable, PRInt32 *aTabIndex);
virtual PRUint32 GetDesiredIMEState();
virtual nsresult DoneAddingChildren(bool aHaveNotified);
virtual void DoneAddingChildren(bool aHaveNotified);
virtual bool IsDoneAddingChildren();
virtual bool ParseAttribute(PRInt32 aNamespaceID,
@ -215,7 +215,7 @@ nsHTMLSharedObjectElement::IsDoneAddingChildren()
return mIsDoneAddingChildren;
}
nsresult
void
nsHTMLSharedObjectElement::DoneAddingChildren(bool aHaveNotified)
{
if (!mIsDoneAddingChildren) {
@ -227,8 +227,6 @@ nsHTMLSharedObjectElement::DoneAddingChildren(bool aHaveNotified)
StartObjectLoad(aHaveNotified);
}
}
return NS_OK;
}
NS_IMPL_CYCLE_COLLECTION_CLASS(nsHTMLSharedObjectElement)

6
content/html/content/src/nsHTMLTextAreaElement.cpp
View File

@ -201,7 +201,7 @@ public:
virtual bool IsHTMLFocusable(bool aWithMouse, bool *aIsFocusable, PRInt32 *aTabIndex);
virtual nsresult DoneAddingChildren(bool aHaveNotified);
virtual void DoneAddingChildren(bool aHaveNotified);
virtual bool IsDoneAddingChildren();
virtual nsresult Clone(nsINodeInfo *aNodeInfo, nsINode **aResult) const;
@ -775,7 +775,7 @@ nsHTMLTextAreaElement::PostHandleEvent(nsEventChainPostVisitor& aVisitor)
return NS_OK;
}
nsresult
void
nsHTMLTextAreaElement::DoneAddingChildren(bool aHaveNotified)
{
if (!mValueChanged) {
@ -790,8 +790,6 @@ nsHTMLTextAreaElement::DoneAddingChildren(bool aHaveNotified)
}
mDoneAddingChildren = true;
return NS_OK;
}
bool

5
content/html/content/src/nsHTMLTitleElement.cpp
View File

@ -84,7 +84,7 @@ public:
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true);
virtual nsresult DoneAddingChildren(bool aHaveNotified);
virtual void DoneAddingChildren(bool aHaveNotified);
virtual nsXPCClassInfo* GetClassInfo();
private:
@ -200,13 +200,12 @@ nsHTMLTitleElement::UnbindFromTree(bool aDeep, bool aNullParent)
nsGenericHTMLElement::UnbindFromTree(aDeep, aNullParent);
}
nsresult
void
nsHTMLTitleElement::DoneAddingChildren(bool aHaveNotified)
{
if (!aHaveNotified) {
SendTitleChangeEvent(false);
}
return NS_OK;
}
void

5
content/svg/content/src/nsSVGTitleElement.cpp
View File

@ -77,7 +77,7 @@ public:
virtual void UnbindFromTree(bool aDeep = true,
bool aNullParent = true);
virtual nsresult DoneAddingChildren(bool aHaveNotified);
virtual void DoneAddingChildren(bool aHaveNotified);
virtual nsXPCClassInfo* GetClassInfo();
private:
@ -180,13 +180,12 @@ nsSVGTitleElement::UnbindFromTree(bool aDeep, bool aNullParent)
nsSVGTitleElementBase::UnbindFromTree(aDeep, aNullParent);
}
nsresult
void
nsSVGTitleElement::DoneAddingChildren(bool aHaveNotified)
{
if (!aHaveNotified) {
SendTitleChangeEvent(false);
}
return NS_OK;
}
void

4
content/xtf/src/nsXTFElementWrapper.cpp
View File

@ -518,13 +518,11 @@ nsXTFElementWrapper::BeginAddingChildren()
GetXTFElement()->BeginAddingChildren();
}
nsresult
void
nsXTFElementWrapper::DoneAddingChildren(bool aHaveNotified)
{
if (mNotificationMask & nsIXTFElement::NOTIFY_DONE_ADDING_CHILDREN)
GetXTFElement()->DoneAddingChildren();
return NS_OK;
}
already_AddRefed<nsINodeInfo>

2
content/xtf/src/nsXTFElementWrapper.h
View File

@ -111,7 +111,7 @@ public:
virtual nsEventStates IntrinsicState() const;
virtual void BeginAddingChildren();
virtual nsresult DoneAddingChildren(bool aHaveNotified);
virtual void DoneAddingChildren(bool aHaveNotified);
virtual nsIAtom *GetClassAttributeName() const;
virtual const nsAttrValue* DoGetClasses() const;