| Index: third_party/WebKit/Source/core/dom/Document.idl
|
| diff --git a/third_party/WebKit/Source/core/dom/Document.idl b/third_party/WebKit/Source/core/dom/Document.idl
|
| index 5c90a4d1ccfee662bff82b7a3113860d9451bb7d..a49f2188b9b4f42e28034b093fb8eafd4aadb064 100644
|
| --- a/third_party/WebKit/Source/core/dom/Document.idl
|
| +++ b/third_party/WebKit/Source/core/dom/Document.idl
|
| @@ -38,7 +38,8 @@ interface Document : Node {
|
| readonly attribute DOMString compatMode;
|
|
|
| readonly attribute DOMString characterSet;
|
| - [MeasureAs=DocumentInputEncoding, ImplementedAs=characterSet] readonly attribute DOMString inputEncoding; // legacy alias of .characterSet
|
| + [ImplementedAs=characterSet] readonly attribute DOMString charset; // legacy alias of .characterSet
|
| + [ImplementedAs=characterSet] readonly attribute DOMString inputEncoding; // legacy alias of .characterSet
|
| readonly attribute DOMString contentType;
|
|
|
| readonly attribute DocumentType? doctype;
|
| @@ -201,7 +202,6 @@ interface Document : Node {
|
| readonly attribute VisibilityState visibilityState;
|
|
|
| // Non-standard APIs
|
| - [MeasureAs=DocumentCharset] readonly attribute DOMString charset;
|
| [MeasureAs=DocumentDefaultCharset, TreatReturnedNullStringAs=Undefined] readonly attribute DOMString defaultCharset;
|
| [MeasureAs=DocumentCaretRangeFromPoint] Range caretRangeFromPoint([Default=Undefined] optional long x, [Default=Undefined] optional long y);
|
| [CallWith=ScriptState, DeprecateAs=DocumentGetCSSCanvasContext] any getCSSCanvasContext(DOMString contextId, DOMString name, long width, long height);
|
|
|