mshtml: Don't share nsrow reference with nsnode.
This commit is contained in:
parent
e391dfc8ae
commit
1e9f33924b
|
@ -402,13 +402,44 @@ static HRESULT HTMLTableRow_QI(HTMLDOMNode *iface, REFIID riid, void **ppv)
|
||||||
return HTMLElement_QI(&This->element.node, riid, ppv);
|
return HTMLElement_QI(&This->element.node, riid, ppv);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void HTMLTableRow_traverse(HTMLDOMNode *iface, nsCycleCollectionTraversalCallback *cb)
|
||||||
|
{
|
||||||
|
HTMLTableRow *This = impl_from_HTMLDOMNode(iface);
|
||||||
|
|
||||||
|
if(This->nsrow)
|
||||||
|
note_cc_edge((nsISupports*)This->nsrow, "This->nstablerow", cb);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void HTMLTableRow_unlink(HTMLDOMNode *iface)
|
||||||
|
{
|
||||||
|
HTMLTableRow *This = impl_from_HTMLDOMNode(iface);
|
||||||
|
|
||||||
|
if(This->nsrow) {
|
||||||
|
nsIDOMHTMLTableRowElement *nsrow = This->nsrow;
|
||||||
|
|
||||||
|
This->nsrow = NULL;
|
||||||
|
nsIDOMHTMLTableRowElement_Release(nsrow);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
static const NodeImplVtbl HTMLTableRowImplVtbl = {
|
static const NodeImplVtbl HTMLTableRowImplVtbl = {
|
||||||
HTMLTableRow_QI,
|
HTMLTableRow_QI,
|
||||||
HTMLElement_destructor,
|
HTMLElement_destructor,
|
||||||
HTMLElement_cpc,
|
HTMLElement_cpc,
|
||||||
HTMLElement_clone,
|
HTMLElement_clone,
|
||||||
HTMLElement_handle_event,
|
HTMLElement_handle_event,
|
||||||
HTMLElement_get_attr_col
|
HTMLElement_get_attr_col,
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
NULL,
|
||||||
|
HTMLTableRow_traverse,
|
||||||
|
HTMLTableRow_unlink
|
||||||
};
|
};
|
||||||
|
|
||||||
static const tid_t HTMLTableRow_iface_tids[] = {
|
static const tid_t HTMLTableRow_iface_tids[] = {
|
||||||
|
@ -439,10 +470,7 @@ HRESULT HTMLTableRow_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HT
|
||||||
HTMLElement_Init(&ret->element, doc, nselem, &HTMLTableRow_dispex);
|
HTMLElement_Init(&ret->element, doc, nselem, &HTMLTableRow_dispex);
|
||||||
|
|
||||||
nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTableRowElement, (void**)&ret->nsrow);
|
nsres = nsIDOMHTMLElement_QueryInterface(nselem, &IID_nsIDOMHTMLTableRowElement, (void**)&ret->nsrow);
|
||||||
|
assert(nsres == NS_OK);
|
||||||
/* Share nsrow reference with nsnode */
|
|
||||||
assert(nsres == NS_OK && (nsIDOMNode*)ret->nsrow == ret->element.node.nsnode);
|
|
||||||
nsIDOMNode_Release(ret->element.node.nsnode);
|
|
||||||
|
|
||||||
*elem = &ret->element;
|
*elem = &ret->element;
|
||||||
return S_OK;
|
return S_OK;
|
||||||
|
|
Loading…
Reference in New Issue