зеркало из https://github.com/mozilla/pjs.git
fixed queryInterface to return *DOM interface
This commit is contained in:
buster%netscape.com
Родитель
cbfc477565
Коммит
00ce1c6356
|
|
@ -30,10 +30,10 @@
|
|||
|
||||
static NS_DEFINE_IID(kIDOMHTMLTableCaptionElementIID, NS_IDOMHTMLTABLECAPTIONELEMENT_IID);
|
||||
|
||||
class nsHTMLTableCaptionElement : public nsIDOMHTMLTableCaptionElement,
|
||||
public nsIScriptObjectOwner,
|
||||
public nsIDOMEventReceiver,
|
||||
public nsIHTMLContent
|
||||
class nsHTMLTableCaptionElement : public nsIDOMHTMLTableCaptionElement,
|
||||
public nsIScriptObjectOwner,
|
||||
public nsIDOMEventReceiver,
|
||||
public nsIHTMLContent
|
||||
{
|
||||
public:
|
||||
nsHTMLTableCaptionElement(nsIAtom* aTag);
|
||||
|
|
|
|||
|
|
@ -33,10 +33,10 @@ static NS_DEFINE_IID(kIDOMHTMLTableColElementIID, NS_IDOMHTMLTABLECOLELEMENT_IID
|
|||
static NS_DEFINE_IID(kIHTMLTableColElementIID, NS_IHTMLTABLECOLELEMENT_IID);
|
||||
|
||||
class nsHTMLTableColElement : public nsIDOMHTMLTableColElement,
|
||||
public nsIHTMLTableColElement,
|
||||
public nsIScriptObjectOwner,
|
||||
public nsIDOMEventReceiver,
|
||||
public nsIHTMLContent,
|
||||
public nsIHTMLTableColElement
|
||||
public nsIHTMLContent
|
||||
{
|
||||
public:
|
||||
nsHTMLTableColElement(nsIAtom* aTag);
|
||||
|
|
|
|||
|
|
@ -28,12 +28,12 @@
|
|||
#include "nsStyleConsts.h"
|
||||
#include "nsIPresContext.h"
|
||||
|
||||
static NS_DEFINE_IID(kIDOMHTMLTableColGroupElementIID, NS_IDOMHTMLTABLECOLELEMENT_IID);
|
||||
static NS_DEFINE_IID(kIDOMHTMLTableColElementIID, NS_IDOMHTMLTABLECOLELEMENT_IID);
|
||||
|
||||
class nsHTMLTableColGroupElement : public nsIDOMHTMLElement, // nsIDOMHTMLColGroupElement
|
||||
public nsIScriptObjectOwner,
|
||||
public nsIDOMEventReceiver,
|
||||
public nsIHTMLContent
|
||||
class nsHTMLTableColGroupElement : public nsIDOMHTMLTableColElement,
|
||||
public nsIScriptObjectOwner,
|
||||
public nsIDOMEventReceiver,
|
||||
public nsIHTMLContent
|
||||
{
|
||||
public:
|
||||
nsHTMLTableColGroupElement(nsIAtom* aTag);
|
||||
|
|
@ -113,14 +113,13 @@ nsresult
|
|||
nsHTMLTableColGroupElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
|
||||
{
|
||||
NS_IMPL_HTML_CONTENT_QUERY_INTERFACE(aIID, aInstancePtr, this)
|
||||
/*
|
||||
if (aIID.Equals(kIDOMHTMLTableColGroupElementIID)) {
|
||||
nsIDOMHTMLTableColGroupElement* tmp = this;
|
||||
// DOM treats COLGROUP like COL
|
||||
if (aIID.Equals(kIDOMHTMLTableColElementIID)) {
|
||||
nsIDOMHTMLTableColElement* tmp = this;
|
||||
*aInstancePtr = (void*) tmp;
|
||||
mRefCnt++;
|
||||
return NS_OK;
|
||||
}
|
||||
*/
|
||||
return NS_NOINTERFACE;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,10 +30,11 @@
|
|||
|
||||
static NS_DEFINE_IID(kIDOMHTMLTableElementIID, NS_IDOMHTMLTABLEELEMENT_IID);
|
||||
|
||||
class nsHTMLTableElement : public nsIDOMHTMLTableElement,
|
||||
public nsIScriptObjectOwner,
|
||||
public nsIDOMEventReceiver,
|
||||
public nsIHTMLContent
|
||||
|
||||
class nsHTMLTableElement : public nsIDOMHTMLTableElement,
|
||||
public nsIScriptObjectOwner,
|
||||
public nsIDOMEventReceiver,
|
||||
public nsIHTMLContent
|
||||
{
|
||||
public:
|
||||
nsHTMLTableElement(nsIAtom* aTag);
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@
|
|||
static NS_DEFINE_IID(kIDOMHTMLTableRowElementIID, NS_IDOMHTMLTABLEROWELEMENT_IID);
|
||||
|
||||
class nsHTMLTableRowElement : public nsIDOMHTMLTableRowElement,
|
||||
public nsIScriptObjectOwner,
|
||||
public nsIDOMEventReceiver,
|
||||
public nsIHTMLContent
|
||||
public nsIScriptObjectOwner,
|
||||
public nsIDOMEventReceiver,
|
||||
public nsIHTMLContent
|
||||
{
|
||||
public:
|
||||
nsHTMLTableRowElement(nsIAtom* aTag);
|
||||
|
|
|
|||
|
|
@ -30,10 +30,10 @@
|
|||
|
||||
static NS_DEFINE_IID(kIDOMHTMLTableCaptionElementIID, NS_IDOMHTMLTABLECAPTIONELEMENT_IID);
|
||||
|
||||
class nsHTMLTableCaptionElement : public nsIDOMHTMLTableCaptionElement,
|
||||
public nsIScriptObjectOwner,
|
||||
public nsIDOMEventReceiver,
|
||||
public nsIHTMLContent
|
||||
class nsHTMLTableCaptionElement : public nsIDOMHTMLTableCaptionElement,
|
||||
public nsIScriptObjectOwner,
|
||||
public nsIDOMEventReceiver,
|
||||
public nsIHTMLContent
|
||||
{
|
||||
public:
|
||||
nsHTMLTableCaptionElement(nsIAtom* aTag);
|
||||
|
|
|
|||
|
|
@ -33,10 +33,10 @@ static NS_DEFINE_IID(kIDOMHTMLTableColElementIID, NS_IDOMHTMLTABLECOLELEMENT_IID
|
|||
static NS_DEFINE_IID(kIHTMLTableColElementIID, NS_IHTMLTABLECOLELEMENT_IID);
|
||||
|
||||
class nsHTMLTableColElement : public nsIDOMHTMLTableColElement,
|
||||
public nsIHTMLTableColElement,
|
||||
public nsIScriptObjectOwner,
|
||||
public nsIDOMEventReceiver,
|
||||
public nsIHTMLContent,
|
||||
public nsIHTMLTableColElement
|
||||
public nsIHTMLContent
|
||||
{
|
||||
public:
|
||||
nsHTMLTableColElement(nsIAtom* aTag);
|
||||
|
|
|
|||
|
|
@ -28,12 +28,12 @@
|
|||
#include "nsStyleConsts.h"
|
||||
#include "nsIPresContext.h"
|
||||
|
||||
static NS_DEFINE_IID(kIDOMHTMLTableColGroupElementIID, NS_IDOMHTMLTABLECOLELEMENT_IID);
|
||||
static NS_DEFINE_IID(kIDOMHTMLTableColElementIID, NS_IDOMHTMLTABLECOLELEMENT_IID);
|
||||
|
||||
class nsHTMLTableColGroupElement : public nsIDOMHTMLElement, // nsIDOMHTMLColGroupElement
|
||||
public nsIScriptObjectOwner,
|
||||
public nsIDOMEventReceiver,
|
||||
public nsIHTMLContent
|
||||
class nsHTMLTableColGroupElement : public nsIDOMHTMLTableColElement,
|
||||
public nsIScriptObjectOwner,
|
||||
public nsIDOMEventReceiver,
|
||||
public nsIHTMLContent
|
||||
{
|
||||
public:
|
||||
nsHTMLTableColGroupElement(nsIAtom* aTag);
|
||||
|
|
@ -113,14 +113,13 @@ nsresult
|
|||
nsHTMLTableColGroupElement::QueryInterface(REFNSIID aIID, void** aInstancePtr)
|
||||
{
|
||||
NS_IMPL_HTML_CONTENT_QUERY_INTERFACE(aIID, aInstancePtr, this)
|
||||
/*
|
||||
if (aIID.Equals(kIDOMHTMLTableColGroupElementIID)) {
|
||||
nsIDOMHTMLTableColGroupElement* tmp = this;
|
||||
// DOM treats COLGROUP like COL
|
||||
if (aIID.Equals(kIDOMHTMLTableColElementIID)) {
|
||||
nsIDOMHTMLTableColElement* tmp = this;
|
||||
*aInstancePtr = (void*) tmp;
|
||||
mRefCnt++;
|
||||
return NS_OK;
|
||||
}
|
||||
*/
|
||||
return NS_NOINTERFACE;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -30,10 +30,11 @@
|
|||
|
||||
static NS_DEFINE_IID(kIDOMHTMLTableElementIID, NS_IDOMHTMLTABLEELEMENT_IID);
|
||||
|
||||
class nsHTMLTableElement : public nsIDOMHTMLTableElement,
|
||||
public nsIScriptObjectOwner,
|
||||
public nsIDOMEventReceiver,
|
||||
public nsIHTMLContent
|
||||
|
||||
class nsHTMLTableElement : public nsIDOMHTMLTableElement,
|
||||
public nsIScriptObjectOwner,
|
||||
public nsIDOMEventReceiver,
|
||||
public nsIHTMLContent
|
||||
{
|
||||
public:
|
||||
nsHTMLTableElement(nsIAtom* aTag);
|
||||
|
|
|
|||
|
|
@ -31,9 +31,9 @@
|
|||
static NS_DEFINE_IID(kIDOMHTMLTableRowElementIID, NS_IDOMHTMLTABLEROWELEMENT_IID);
|
||||
|
||||
class nsHTMLTableRowElement : public nsIDOMHTMLTableRowElement,
|
||||
public nsIScriptObjectOwner,
|
||||
public nsIDOMEventReceiver,
|
||||
public nsIHTMLContent
|
||||
public nsIScriptObjectOwner,
|
||||
public nsIDOMEventReceiver,
|
||||
public nsIHTMLContent
|
||||
{
|
||||
public:
|
||||
nsHTMLTableRowElement(nsIAtom* aTag);
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче