Commit 217db163 authored by Henri Sivonen's avatar Henri Sivonen
Browse files

Bug 499642 - Split the HTML5 parser into stream parser, doc.write parser and... 

Bug 499642 - Split the HTML5 parser into stream parser, doc.write parser and tree op executor. r=bnewman, sr=mrbkap.
parent aa1ce3f4

content/html/document/src/nsHTMLDocument.cpp

+1 −1
Original line number Diff line number Diff line
@@ -925,7 +925,7 @@ nsHTMLDocument::StartDocumentLoad(const char* aCommand, 


  // Set the parser as the stream listener for the document loader...

  if (mParser) {

    rv = CallQueryInterface(mParser, aDocListener);

    rv = mParser->GetStreamListener(aDocListener);

    if (NS_FAILED(rv)) {

      return rv;

    }

parser/html/Makefile.in

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ CPPSRCS = \ 
		nsHtml5MetaScanner.cpp \

		nsHtml5TreeOperation.cpp \

		nsHtml5StateSnapshot.cpp \

		nsHtml5TreeOpExecutor.cpp \

		nsHtml5StreamParser.cpp \

		$(NULL)



FORCE_STATIC_LIB = 1

parser/html/java/htmlparser/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#

# ***** END LICENSE BLOCK *****



SVN_BASE=http://svn.versiondude.net/whattf/htmlparser/trunk

SVN_BASE=https://whattf.svn.cvsdude.com/htmlparser/trunk



sync:: \

; ../sync-src.sh $(SVN_BASE)/src/nu/validator/htmlparser/impl

parser/html/java/translator/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 
#

# ***** END LICENSE BLOCK *****



SVN_BASE=http://svn.versiondude.net/whattf/htmlparser/trunk

SVN_BASE=https://whattf.svn.cvsdude.com/htmlparser/trunk



libs:: \

; mkdir -p bin && \

parser/html/java/translator/src/nu/validator/htmlparser/cpptranslate/CppTypes.java

+7 −6
Original line number Diff line number Diff line
@@ -77,22 +77,23 @@ public class CppTypes { 
            "nsIDocument", "nsTraceRefcnt", "jArray", "nsHtml5DocumentMode",

            "nsHtml5ArrayCopy", "nsHtml5NamedCharacters", "nsHtml5Parser",

            "nsHtml5Atoms", "nsHtml5ByteReadable", "nsHtml5TreeOperation",

            "nsHtml5PendingNotification", "nsHtml5StateSnapshot", "nsHtml5StackNode" };

            "nsHtml5PendingNotification", "nsHtml5StateSnapshot", "nsHtml5StackNode", 

            "nsHtml5TreeOpExecutor", "nsHtml5StreamParser" };



    private static final String[] INCLUDES = { "prtypes", "nsIAtom",

            "nsString", "nsINameSpaceManager", "nsIContent", "nsIDocument",

            "nsTraceRefcnt", "jArray", "nsHtml5DocumentMode",

            "nsHtml5ArrayCopy", "nsHtml5NamedCharacters",

            "nsHtml5Atoms", "nsHtml5ByteReadable", };

            "nsHtml5Atoms", "nsHtml5ByteReadable", "nsIUnicodeDecoder", };



    private static final String[] OTHER_DECLATIONS = {};



    private static final String[] TREE_BUILDER_OTHER_DECLATIONS = { "typedef nsIContent* nsIContentPtr;" };

    private static final String[] TREE_BUILDER_OTHER_DECLATIONS = { };



    private static final String[] NAMED_CHARACTERS_INCLUDES = { "prtypes",

            "jArray", "nscore" };



    private static final String[] FORWARD_DECLARATIONS = { "nsHtml5Parser", };

    private static final String[] FORWARD_DECLARATIONS = { "nsHtml5StreamParser", };

    

    private static final String[] CLASSES_THAT_NEED_SUPPLEMENT = {

        "MetaScanner",
@@ -174,7 +175,7 @@ public class CppTypes { 
    }



    public String encodingDeclarationHandlerType() {

        return "nsHtml5Parser*";

        return "nsHtml5StreamParser*";

    }



    public String nodeType() {
@@ -275,7 +276,7 @@ public class CppTypes { 
    }



    public String documentModeHandlerType() {

        return "nsHtml5Parser*";

        return "nsHtml5TreeBuilder*";

    }



    public String documentModeType() {