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 612839 - Removed nsAHtml5FragmentParser. r=hsivonen

Browse Source
This commit is contained in:
Marco Castelluccio 2011-08-14 10:39:26 -07:00
parent dc3c793de5
commit b8fd68e0c6
10 changed files with 40 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
content/base/public/nsContentUtils.h
View File

@ -80,7 +80,7 @@ static fp_except_t oldmask = fpsetmask(~allmask);
#include "nsINode.h"
#include "nsHashtable.h"
#include "nsIDOMNode.h"
#include "nsAHtml5FragmentParser.h"
#include "nsHtml5Parser.h"
#include "nsIFragmentContentSink.h"
#include "nsMathUtils.h"
@ -1865,7 +1865,7 @@ private:
static PRBool sIsHandlingKeyBoardEvent;
static PRBool sAllowXULXBL_for_file;
static nsAHtml5FragmentParser* sHTMLFragmentParser;
static nsHtml5Parser* sHTMLFragmentParser;
static nsIParser* sXMLFragmentParser;
static nsIFragmentContentSink* sXMLFragmentSink;

2
content/base/src/Makefile.in
View File

@ -52,9 +52,11 @@ EXPORTS = \
nsAtomListUtils.h \
nsAttrName.h \
nsContentList.h \
nsContentSink.h \
nsGkAtomList.h \
nsGkAtoms.h \
nsNodeInfoManager.h \
nsNodeUtils.h \
nsPropertyTable.h \
nsScriptLoader.h \
nsStubDocumentObserver.h \

5
content/base/src/nsContentUtils.cpp
View File

@ -176,7 +176,6 @@ static NS_DEFINE_CID(kXTFServiceCID, NS_XTFSERVICE_CID);
#include "nsTextEditorState.h"
#include "nsIPluginHost.h"
#include "nsICategoryManager.h"
#include "nsAHtml5FragmentParser.h"
#include "nsIViewManager.h"
#ifdef IBMBIDI
@ -264,7 +263,7 @@ nsString* nsContentUtils::sModifierSeparator = nsnull;
PRBool nsContentUtils::sInitialized = PR_FALSE;
nsAHtml5FragmentParser* nsContentUtils::sHTMLFragmentParser = nsnull;
nsHtml5Parser* nsContentUtils::sHTMLFragmentParser = nsnull;
nsIParser* nsContentUtils::sXMLFragmentParser = nsnull;
nsIFragmentContentSink* nsContentUtils::sXMLFragmentSink = nsnull;
@ -3596,7 +3595,7 @@ nsContentUtils::ParseFragmentHTML(const nsAString& aSourceBuffer,
{
if (!sHTMLFragmentParser) {
sHTMLFragmentParser =
static_cast<nsAHtml5FragmentParser*>(nsHtml5Module::NewHtml5Parser().get());
static_cast<nsHtml5Parser*>(nsHtml5Module::NewHtml5Parser().get());
// Now sHTMLFragmentParser owns the object
}
sHTMLFragmentParser->ParseHtml5Fragment(aSourceBuffer,

1
content/html/content/src/nsGenericHTMLElement.cpp
View File

@ -77,7 +77,6 @@
#include "nsDOMError.h"
#include "nsScriptLoader.h"
#include "nsRuleData.h"
#include "nsAHtml5FragmentParser.h"
#include "nsPresState.h"
#include "nsILayoutHistoryState.h"

1
editor/libeditor/html/nsHTMLDataTransfer.cpp
View File

@ -78,7 +78,6 @@
#include "nsXPCOM.h"
#include "nsISupportsPrimitives.h"
#include "nsLinebreakConverter.h"
#include "nsAHtml5FragmentParser.h"
#include "nsHtml5Module.h"
#include "nsTreeSanitizer.h"

28
parser/html/Makefile.in
View File

@ -47,9 +47,33 @@ LIBXUL_LIBRARY = 1
EXPORTS = \
nsHtml5Module.h \
nsAHtml5FragmentParser.h \
jArray.h \
nsAHtml5TreeBuilderState.h \
nsHtml5ArrayCopy.h \
nsHtml5Atoms.h \
nsHtml5AtomList.h \
nsHtml5AtomTable.h \
nsHtml5ByteReadable.h \
nsHtml5DocumentMode.h \
nsHtml5HtmlAttributes.h \
nsHtml5Macros.h \
nsHtml5MetaScanner.h \
nsHtml5MetaScannerHSupplement.h \
nsHtml5Module.h \
nsHtml5NamedCharacters.h \
nsHtml5NamedCharactersAccel.h \
nsHtml5Parser.h \
nsHtml5PendingNotification.h \
nsHtml5Speculation.h \
nsHtml5SpeculativeLoad.h \
nsHtml5StreamParser.h \
nsHtml5SVGLoadDispatcher.h \
nsHtml5TreeOperation.h \
nsHtml5TreeOpExecutor.h \
nsAHtml5TreeOpSink.h \
nsHtml5TreeOpStage.h \
nsHtml5UTF16Buffer.h \
nsHtml5UTF16BufferHSupplement.h \
$(NULL)
CPPSRCS = \

72
parser/html/nsAHtml5FragmentParser.h
View File

@ -1,72 +0,0 @@
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Mozilla Public License Version
* 1.1 (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
* http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS IS" basis,
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
* for the specific language governing rights and limitations under the
* License.
*
* The Original Code is HTML Parser C++ Translator code.
*
* The Initial Developer of the Original Code is
* Mozilla Foundation.
* Portions created by the Initial Developer are Copyright (C) 2010
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Henri Sivonen <hsivonen@iki.fi>
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the MPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#ifndef nsAHtml5FragmentParser_h_
#define nsAHtml5FragmentParser_h_
#include "nsIParser.h"
/**
* The purpose of this class is to avoid changing the signatures in nsIParser.h
* after the Firefox 4.0 interface freeze. In later releases this can be folded
* into nsIParser.h.
*/
class nsAHtml5FragmentParser : public nsIParser {
public:
/**
* 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) = 0;
};
#endif // nsAHtml5FragmentParser_h_

2
parser/html/nsHtml5Parser.cpp
View File

@ -469,7 +469,7 @@ nsHtml5Parser::ParseFragment(const nsAString& aSourceBuffer,
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP
nsresult
nsHtml5Parser::ParseHtml5Fragment(const nsAString& aSourceBuffer,
nsIContent* aTargetNode,
nsIAtom* aContextLocalName,

20
parser/html/nsHtml5Parser.h
View File

@ -61,9 +61,8 @@
#include "nsHtml5StreamParser.h"
#include "nsHtml5AtomTable.h"
#include "nsWeakReference.h"
#include "nsAHtml5FragmentParser.h"
class nsHtml5Parser : public nsAHtml5FragmentParser, // inherits nsIParser
class nsHtml5Parser : public nsIParser,
public nsSupportsWeakReference
{
public:
@ -257,8 +256,6 @@ class nsHtml5Parser : public nsAHtml5FragmentParser, // inherits nsIParser
/* End nsIParser */
/* Start nsAHtml5FragmentParser */
/**
* Invoke the fragment parsing algorithm (innerHTML).
*
@ -271,15 +268,12 @@ class nsHtml5Parser : public nsAHtml5FragmentParser, // inherits nsIParser
* 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 */
nsresult ParseHtml5Fragment(const nsAString& aSourceBuffer,
nsIContent* aTargetNode,
nsIAtom* aContextLocalName,
PRInt32 aContextNamespace,
PRBool aQuirks,
PRBool aPreventScriptExecution);
// Not from an external interface
// Non-inherited methods

1
toolkit/components/feeds/nsScriptableUnescapeHTML.cpp
View File

@ -66,7 +66,6 @@
#include "nsScriptableUnescapeHTML.h"
#include "nsAutoPtr.h"
#include "nsTreeSanitizer.h"
#include "nsAHtml5FragmentParser.h"
#include "nsHtml5Module.h"
#define XHTML_DIV_TAG "div xmlns=\"http://www.w3.org/1999/xhtml\""