corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

http://bonsai.mozilla.org/cvsquery.cgi?module=SeaMonkeyAll&branch=HEAD&cvsroot=/cvsroot&date=explicit&mindate=1017959940&maxdate=1017960540&who=jst%25netscape.com&generateBackoutCVSCommands=1

Browse Source 
Backing out the fix for bug 52334

approved by sheriff (karnaze) and cathleen
This commit is contained in:
timeless@mac.com
2002-04-05 05:42:10 +00:00
parent c5c0ece4b0
commit 80b8928a1b
55 changed files with 3006 additions and 3603 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
layout/generic/nsFrameSetFrame.cpp
View File

@@ -63,6 +63,7 @@
#define ALL_VIS 0x000F
#define NONE_VIS 0x0000
static NS_DEFINE_IID(kIFramesetFrameIID, NS_IFRAMESETFRAME_IID);
static NS_DEFINE_IID(kLookAndFeelCID, NS_LOOKANDFEEL_CID);
/*******************************************************************************
@@ -251,7 +252,7 @@ nsresult nsHTMLFramesetFrame::QueryInterface(const nsIID& aIID,
{
if (NULL == aInstancePtr) {
return NS_ERROR_NULL_POINTER;
} else if (aIID.Equals(NS_GET_IID(nsHTMLFramesetFrame))) {
} else if (aIID.Equals(kIFramesetFrameIID)) {
*aInstancePtr = (void*)this;
return NS_OK;
} else if (aIID.Equals(NS_GET_IID(nsIObserver))) {
@@ -326,8 +327,7 @@ nsHTMLFramesetFrame::Init(nsIPresContext* aPresContext,
mTopLevelFrameset = (nsHTMLFramesetFrame*)this;
while (parentFrame) {
nsHTMLFramesetFrame* frameset;
rv = parentFrame->QueryInterface(NS_GET_IID(nsHTMLFramesetFrame),
(void**)&frameset);
rv = parentFrame->QueryInterface(kIFramesetFrameIID, (void**)&frameset);
if (NS_SUCCEEDED(rv)) {
mTopLevelFrameset = frameset;
parentFrame->GetParent((nsIFrame**)&parentFrame);
@@ -1404,7 +1404,7 @@ PRBool
nsHTMLFramesetFrame::ChildIsFrameset(nsIFrame* aChild)
{
nsIFrame* childFrame = nsnull;
aChild->QueryInterface(NS_GET_IID(nsHTMLFramesetFrame), (void**)&childFrame);
aChild->QueryInterface(kIFramesetFrameIID, (void**)&childFrame);
if (childFrame) {
return PR_TRUE;
}