From 501277d9f2efbfa01bd8d459913ee9bf3a039e7a Mon Sep 17 00:00:00 2001
From: "tbogard%aol.net" <tbogard%aol.net@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 20 Oct 1999 07:37:37 +0000
Subject: [PATCH] Integrated some changes made by buster.  Still talking some
 them over, but here for now.

git-svn-id: svn://10.0.0.236/trunk@51251 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/docshell/html/nsIHTMLDocShell.idl | 32 ++++++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/mozilla/docshell/html/nsIHTMLDocShell.idl b/mozilla/docshell/html/nsIHTMLDocShell.idl
index 1d01fb85528..8a1dba0c2b2 100644
--- a/mozilla/docshell/html/nsIHTMLDocShell.idl
+++ b/mozilla/docshell/html/nsIHTMLDocShell.idl
@@ -33,5 +33,35 @@ interface nsIHTMLDocShell : nsISupports
 	/*
 	Scrolls to a given DOM content node. 
 	*/
-	void ScrollToNode(in nsIDOMNode node);
+	void scrollToNode(in nsIDOMNode node);
+
+	/*
+	XXX Comment here!
+	*/
+	attribute long marginWidth;
+
+	/*
+	XXX Comment here!
+	*/
+	attribute long marginHeight;
+
+	/*
+	XXX Comment here!
+	*/
+	attribute boolean isFrame;
+
+	/*
+	XXX Comment here!
+	*/
+	attribute wstring defaultCharacterSet;
+
+	/*
+	XXX Comment here!
+	*/
+	attribute wstring forceCharacterSet;
+
+	/* the following is the hacky access method 
+	Commented out as nsCharsetSource should be something IDL like
+	void GetCharacterSetHint(in wstring hintCharset, in nsCharsetSource charsetSource);
+	*/
 };