auto merge of #4270 : ProgramFOX/servo/issue-4252, r=saneyuki

Resolves #4252

2 files changed, 6 insertions, 0 deletions

diff --git a/components/script/dom/document.rs b/components/script/dom/document.rs
index 84016cf75fa..4fbdaab837d 100644
--- a/components/script/dom/document.rs
+++ b/components/script/dom/document.rs
@@ -518,6 +518,11 @@ impl<'a> DocumentMethods for JSRef<'a, Document> {
         self.encoding_name.borrow().clone()
     }
 
+    // http://dom.spec.whatwg.org/#dom-document-inputencoding
+    fn InputEncoding(self) -> DOMString {
+        self.encoding_name.borrow().clone()
+    }
+
     // http://dom.spec.whatwg.org/#dom-document-content_type
     fn ContentType(self) -> DOMString {
         self.content_type.clone()
diff --git a/components/script/dom/webidls/Document.webidl b/components/script/dom/webidls/Document.webidl
index 9a9272ac824..8d75f20a8f7 100644
--- a/components/script/dom/webidls/Document.webidl
+++ b/components/script/dom/webidls/Document.webidl
@@ -16,6 +16,7 @@ interface Document : Node {
   readonly attribute DOMString documentURI;
   readonly attribute DOMString compatMode;
   readonly attribute DOMString characterSet;
+  readonly attribute DOMString inputEncoding;
   readonly attribute DOMString contentType;
 
   readonly attribute DocumentType? doctype;