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 767790 - Remove nsIHTMLDocument::{Get,Set}IsFrameset; r=mounir

Browse Source
This commit is contained in:
Ms2ger 2012-07-02 08:22:37 +02:00
parent 26b13a6a2d
commit 93ce055147
4 changed files with 2 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
content/html/document/src/nsHTMLDocument.h
View File

@ -79,9 +79,6 @@ public:
return mWriteLevel != PRUint32(0);
}
virtual bool GetIsFrameset() { return mIsFrameset; }
virtual void SetIsFrameset(bool aFrameset) { mIsFrameset = aFrameset; }
virtual NS_HIDDEN_(nsContentList*) GetForms();
virtual NS_HIDDEN_(nsContentList*) GetFormControls();
@ -253,8 +250,6 @@ protected:
// Load flags of the document's channel
PRUint32 mLoadFlags;
bool mIsFrameset;
bool mTooDeepWriteRecursion;
bool mDisableDocWrite;

7
content/html/document/src/nsIHTMLDocument.h
View File

@ -17,8 +17,8 @@ class nsContentList;
class nsWrapperCache;
#define NS_IHTMLDOCUMENT_IID \
{ 0xa921276f, 0x5e70, 0x42e0, \
{ 0xb8, 0x36, 0x7e, 0x6a, 0xb8, 0x30, 0xb3, 0xc0 } }
{ 0xcf814492, 0x303c, 0x4718, \
{ 0x9a, 0x3e, 0x39, 0xbc, 0xd5, 0x2c, 0x10, 0xdb } }
/**
* HTML document extensions to nsIDocument.
@ -58,9 +58,6 @@ public:
virtual bool IsWriting() = 0;
virtual bool GetIsFrameset() = 0;
virtual void SetIsFrameset(bool aFrameset) = 0;
/**
* Get the list of form elements in the document.
*/

7
layout/base/nsDocumentViewer.cpp
View File

@ -726,13 +726,6 @@ DocumentViewerImpl::InitPresentationStuff(bool aDoInitialReflow)
mPresContext->SetMinFontSize(mMinFontSize);
if (aDoInitialReflow) {
nsCOMPtr<nsIHTMLDocument> htmlDoc = do_QueryInterface(mDocument);
if (htmlDoc) {
nsCOMPtr<nsIDOMHTMLFrameSetElement> frameset =
do_QueryInterface(mDocument->GetRootElement());
htmlDoc->SetIsFrameset(frameset != nsnull);
}
nsCOMPtr<nsIPresShell> shellGrip = mPresShell;
// Initial reflow
mPresShell->InitialReflow(width, height);

8
parser/html/nsHtml5TreeOperation.cpp
View File

@ -392,14 +392,6 @@ nsHtml5TreeOperation::Perform(nsHtml5TreeOpExecutor* aBuilder,
newContent->AppendChildTo(optionElt, false);
newContent->DoneAddingChildren(false);
}
} else if (name == nsHtml5Atoms::frameset && ns == kNameSpaceID_XHTML) {
nsIDocument* doc = aBuilder->GetDocument();
nsCOMPtr<nsIHTMLDocument> htmlDocument = do_QueryInterface(doc);
if (htmlDocument) {
// It seems harmless to call this multiple times, since this
// is a simple field setter
htmlDocument->SetIsFrameset(true);
}
}
if (!attributes) {