bug 272702: Remove skipped content. This simplifies the code handling <script>, <style> and related tags and makes the nsIHTMLContentSink interface just that much easier to implement. This also allows <object> tags to appear in the head with children. r=sicking sr=jst

parser/htmlparser/robot/nsRobotSink.cpp

@@ -75,10 +75,10 @@ public:
   NS_DECL_ISUPPORTS
 
   // nsIHTMLContentSink
-  NS_IMETHOD SetTitle(const nsString& aValue);
   NS_IMETHOD OpenHTML(const nsIParserNode& aNode);
   NS_IMETHOD CloseHTML();
   NS_IMETHOD OpenHead(const nsIParserNode& aNode);
+  NS_IMETHOD OpenHead();
   NS_IMETHOD CloseHead();
   NS_IMETHOD OpenBody(const nsIParserNode& aNode);
   NS_IMETHOD CloseBody();
@@ -94,7 +94,6 @@ public:
   NS_IMETHOD OpenContainer(const nsIParserNode& aNode);
   NS_IMETHOD CloseContainer(const nsHTMLTag aTag);
   NS_IMETHOD CloseTopmostContainer();
-  NS_IMETHOD AddHeadContent(const nsIParserNode& aNode);
   NS_IMETHOD AddLeaf(const nsIParserNode& aNode);
   NS_IMETHOD AddComment(const nsIParserNode& aNode);
   NS_IMETHOD AddProcessingInstruction(const nsIParserNode& aNode);
@@ -177,11 +176,6 @@ NS_IMETHODIMP RobotSink::QueryInterface(REFNSIID aIID, void** aInstancePtr)
   return NS_NOINTERFACE;
 }
 
-NS_IMETHODIMP RobotSink::SetTitle(const nsString& aValue)
-{
-  return NS_OK;
-}
-
 NS_IMETHODIMP RobotSink::OpenHTML(const nsIParserNode& aNode)
 {
   return NS_OK;
@@ -197,6 +191,11 @@ NS_IMETHODIMP RobotSink::OpenHead(const nsIParserNode& aNode)
   return NS_OK;
 }
 
+NS_IMETHODIMP RobotSink::OpenHead()
+{
+  return NS_OK;
+}
+
 NS_IMETHODIMP RobotSink::CloseHead()
 {
   return NS_OK;
@@ -287,11 +286,6 @@ NS_IMETHODIMP RobotSink::CloseTopmostContainer()
   return NS_OK;
 }
 
-NS_IMETHODIMP RobotSink::AddHeadContent(const nsIParserNode& aNode)
-{
-  return NS_OK;
-}
-
 NS_IMETHODIMP RobotSink::AddLeaf(const nsIParserNode& aNode)
 {
   return NS_OK;

parser/htmlparser/robot/test/RobotMain.cpp

@@ -1,31 +0,0 @@
-#include "nsXPCOM.h"
-#include "nsVoidArray.h"
-#include "nsString.h"
-class nsIDocShell;
-
-//XXXbz is this even used?  There is no DebugRobot() with this
-//signature in the tree!
-
-extern "C" NS_EXPORT int DebugRobot(nsVoidArray * workList, nsIDocShell * ww);
-
-int main(int argc, char **argv)
-{
-  nsresult rv = NS_InitXPCOM2(nsnull, nsnull, nsnull);
-  if (NS_FAILED(rv)) {
-    printf("NS_InitXPCOM2 failed\n");
-    return 1;
-  }
-
-  nsVoidArray * gWorkList = new nsVoidArray();
-  if(gWorkList) {
-    int i;
-    for (i = 1; i < argc; ++i) {
-      nsString *tempString = new nsString;
-      tempString->AssignWithConversion(argv[i]);
-      gWorkList->AppendElement(tempString);
-    }
-  }
-
-  return DebugRobot(gWorkList, nsnull);
-}
-