From 2310fd67a999b7ae3604c39ccd8455a44b8080ef Mon Sep 17 00:00:00 2001
From: "caillon%redhat.com"
 <caillon%redhat.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 28 Feb 2005 22:35:02 +0000
Subject: [PATCH] 250245 - spec changed, its now Document.inputEncoding
 r+sr=jst

git-svn-id: svn://10.0.0.236/trunk@170013 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/base/src/nsDocument.cpp         | 8 ++++----
 mozilla/dom/public/idl/core/nsIDOM3Document.idl | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/mozilla/content/base/src/nsDocument.cpp b/mozilla/content/base/src/nsDocument.cpp
index 30431b09e0c..7c867952c41 100644
--- a/mozilla/content/base/src/nsDocument.cpp
+++ b/mozilla/content/base/src/nsDocument.cpp
@@ -3586,9 +3586,9 @@ nsDocument::LookupNamespaceURI(const nsAString& aNamespacePrefix,
 }
 
 NS_IMETHODIMP
-nsDocument::GetActualEncoding(nsAString& aActualEncoding)
+nsDocument::GetInputEncoding(nsAString& aInputEncoding)
 {
-  return GetCharacterSet(aActualEncoding);
+  return GetCharacterSet(aInputEncoding);
 }
 
 NS_IMETHODIMP
@@ -3597,8 +3597,8 @@ nsDocument::GetXmlEncoding(nsAString& aXmlEncoding)
   if (mXMLDeclarationBits & XML_DECLARATION_BITS_DECLARATION_EXISTS &&
       mXMLDeclarationBits & XML_DECLARATION_BITS_ENCODING_EXISTS) {
     // XXX We don't store the encoding given in the xml declaration.
-    // For now, just output the actualEncoding which we do store.
-    GetActualEncoding(aXmlEncoding);
+    // For now, just output the inputEncoding which we do store.
+    GetInputEncoding(aXmlEncoding);
   } else {
     SetDOMStringToNull(aXmlEncoding);
   }
diff --git a/mozilla/dom/public/idl/core/nsIDOM3Document.idl b/mozilla/dom/public/idl/core/nsIDOM3Document.idl
index 00a5d2ebd37..b99fd32d905 100644
--- a/mozilla/dom/public/idl/core/nsIDOM3Document.idl
+++ b/mozilla/dom/public/idl/core/nsIDOM3Document.idl
@@ -48,7 +48,7 @@ interface nsIDOMDOMConfiguration;
 interface nsIDOM3Document : nsIDOM3Node
 {
   // Introduced in DOM Level 3:
-  readonly attribute DOMString       actualEncoding;
+  readonly attribute DOMString       inputEncoding;
   // Introduced in DOM Level 3:
   readonly attribute DOMString       xmlEncoding;
   // Introduced in DOM Level 3: