From 3deda508c06d1339e7eecc9cbe552d470b2eb4a5 Mon Sep 17 00:00:00 2001
From: "mrbkap%gmail.com"
 <mrbkap%gmail.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Fri, 9 Sep 2005 19:15:06 +0000
Subject: [PATCH] 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

git-svn-id: svn://10.0.0.236/trunk@179922 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../parser/htmlparser/robot/nsRobotSink.cpp    | 18 ++++++------------
 .../parser/htmlparser/robot/test/RobotMain.cpp | 10 ++++++++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/mozilla/parser/htmlparser/robot/nsRobotSink.cpp b/mozilla/parser/htmlparser/robot/nsRobotSink.cpp
index d714c8d6519..bb3ca428796 100644
--- a/mozilla/parser/htmlparser/robot/nsRobotSink.cpp
+++ b/mozilla/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;
diff --git a/mozilla/parser/htmlparser/robot/test/RobotMain.cpp b/mozilla/parser/htmlparser/robot/test/RobotMain.cpp
index 5d752359225..f932efe652a 100644
--- a/mozilla/parser/htmlparser/robot/test/RobotMain.cpp
+++ b/mozilla/parser/htmlparser/robot/test/RobotMain.cpp
@@ -6,7 +6,13 @@ 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);
+extern "C" NS_EXPORT int DebugRobot(
+   nsVoidArray * workList,
+   nsIDocShell * docShell,
+   int iMaxLoads,
+   char * verify_dir,
+   void (*yieldProc )(const char *)
+   );
 
 int main(int argc, char **argv)
 {
@@ -26,6 +32,6 @@ int main(int argc, char **argv)
     }
   }
 
-  return DebugRobot(gWorkList, nsnull);
+  return DebugRobot(gWorkList, nsnull, 50, nsnull, nsnull);
 }