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

Bug 599588 addendum - Revert change to nsIParser and introduce a new abstract class instead to avoid changing the interface during an interface freeze. r=jonas, a=blocking2.0-final.

Browse Source
This commit is contained in:
Henri Sivonen
2010-11-16 09:47:10 +02:00
parent bf51f71a6f
commit 14caf81d48
10 changed files with 146 additions and 320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
parser/html/nsHtml5Parser.h
View File

@@ -62,8 +62,9 @@
#include "nsHtml5StreamParser.h"
#include "nsHtml5AtomTable.h"
#include "nsWeakReference.h"
#include "nsAHtml5FragmentParser.h"
class nsHtml5Parser : public nsIParser,
class nsHtml5Parser : public nsAHtml5FragmentParser, // inherits nsIParser
public nsSupportsWeakReference
{
public:
@@ -214,23 +215,13 @@ class nsHtml5Parser : public nsIParser,
nsDTDMode aMode = eDTDMode_autodetect);
/**
* Invoke the fragment parsing algorithm (innerHTML).
*
* @param aSourceBuffer the string being set as innerHTML
* @param aTargetNode the target container
* @param aContextLocalName local name of context node
* @param aContextNamespace namespace of context node
* @param aQuirks true to make <table> not close <p>
* @param aPreventScriptExecution true to prevent scripts from executing;
* don't set to false when parsing into a target node that has been bound
* to tree.
* Don't call. For interface backwards compat only.
*/
NS_IMETHOD ParseFragment(const nsAString& aSourceBuffer,
nsIContent* aTargetNode,
nsIAtom* aContextLocalName,
PRInt32 aContextNamespace,
PRBool aQuirks,
PRBool aPreventScriptExecution);
PRBool aQuirks);
/**
* Don't call. For interface compat only.
@@ -280,6 +271,30 @@ class nsHtml5Parser : public nsIParser,
/* End nsIParser */
/* Start nsAHtml5FragmentParser */
/**
* Invoke the fragment parsing algorithm (innerHTML).
*
* @param aSourceBuffer the string being set as innerHTML
* @param aTargetNode the target container
* @param aContextLocalName local name of context node
* @param aContextNamespace namespace of context node
* @param aQuirks true to make <table> not close <p>
* @param aPreventScriptExecution true to prevent scripts from executing;
* don't set to false when parsing into a target node that has been bound
* to tree.
*/
NS_IMETHOD ParseHtml5Fragment(const nsAString& aSourceBuffer,
nsIContent* aTargetNode,
nsIAtom* aContextLocalName,
PRInt32 aContextNamespace,
PRBool aQuirks,
PRBool aPreventScriptExecution);
/* End nsAHtml5FragmentParser */
// Not from an external interface
// Non-inherited methods