Index: core/dom/Document.idl |
diff --git a/core/dom/Document.idl b/core/dom/Document.idl |
index abee35674ac5589201aa426fd7d57e4e1e5366fe..7afd390b3f3c23767023ac67f2584a81da6a4681 100644 |
--- a/core/dom/Document.idl |
+++ b/core/dom/Document.idl |
@@ -18,6 +18,8 @@ |
* Boston, MA 02110-1301, USA. |
*/ |
+callback CustomElementConstructor = Element (); |
+ |
[ |
CustomToV8 |
] interface Document : Node { |
@@ -65,24 +67,26 @@ |
[RaisesException] Event createEvent([Default=Undefined] optional DOMString eventType); |
- // DOM Level 2 Tranversal and Range (DocumentRange interface) |
+ // DOM Level 2 Traversal and Range (DocumentRange interface) |
Range createRange(); |
- // DOM Level 2 Tranversal and Range (DocumentTraversal interface) |
- |
- [RaisesException] NodeIterator createNodeIterator([Default=Undefined] optional Node root, |
- [Default=Undefined] optional unsigned long whatToShow, |
- [Default=Undefined] optional NodeFilter filter, |
- [Default=Undefined] optional boolean expandEntityReferences); |
- [RaisesException] TreeWalker createTreeWalker([Default=Undefined] optional Node root, |
- [Default=Undefined] optional unsigned long whatToShow, |
- [Default=Undefined] optional NodeFilter filter, |
- [Default=Undefined] optional boolean expandEntityReferences); |
+ // DOM Level 2 Traversal and Range (DocumentTraversal interface) |
+ // In DOM4, the fourth argument |expandEntityReferences| is removed. |
+ // Historically, this argument was never implemented and has been ignored. |
+ // We still receive the argument to keep compatibility, but don't do anything if it's specified. |
+ [RaisesException] NodeIterator createNodeIterator(Node root, |
+ optional unsigned long whatToShow, |
+ optional NodeFilter filter, |
+ optional boolean expandEntityReferences); |
+ [RaisesException] TreeWalker createTreeWalker(Node root, |
+ optional unsigned long whatToShow, |
+ optional NodeFilter filter, |
+ optional boolean expandEntityReferences); |
// DOM Level 2 Abstract Views (DocumentView interface) |
- readonly attribute DOMWindow defaultView; |
+ readonly attribute Window defaultView; |
// DOM Level 2 Style (DocumentStyle interface) |
@@ -169,21 +173,10 @@ |
[RaisesException] Element querySelector(DOMString selectors); |
[RaisesException] NodeList querySelectorAll(DOMString selectors); |
- // Mozilla version |
- [EnabledAtRuntime=fullscreen] readonly attribute boolean webkitIsFullScreen; |
- [EnabledAtRuntime=fullscreen] readonly attribute boolean webkitFullScreenKeyboardInputAllowed; |
- [EnabledAtRuntime=fullscreen] readonly attribute Element webkitCurrentFullScreenElement; |
- [EnabledAtRuntime=fullscreen] void webkitCancelFullScreen(); |
- |
- // W3C version |
- [EnabledAtRuntime=fullscreen] readonly attribute boolean webkitFullscreenEnabled; |
- [EnabledAtRuntime=fullscreen] readonly attribute Element webkitFullscreenElement; |
- [EnabledAtRuntime=fullscreen] void webkitExitFullscreen(); |
- |
void webkitExitPointerLock(); |
readonly attribute Element webkitPointerLockElement; |
- [EnabledAtRuntime=cssRegions] DOMNamedFlowCollection webkitGetNamedFlows(); |
+ [EnabledAtRuntime=cssRegions] WebKitNamedFlowCollection webkitGetNamedFlows(); |
[EnabledAtRuntime=fontLoadEvents] readonly attribute FontLoader fontloader; |
@@ -263,7 +256,7 @@ |
[NotEnumerable] attribute EventListener onwebkitpointerlockerror; |
[NotEnumerable, EnabledAtRuntime=experimentalContentSecurityPolicyFeatures] attribute EventListener onsecuritypolicyviolation; |
- [EnabledAtRuntime=touch] Touch createTouch([Default=Undefined] optional DOMWindow window, |
+ [EnabledAtRuntime=touch] Touch createTouch([Default=Undefined] optional Window window, |
[Default=Undefined] optional EventTarget target, |
[Default=Undefined] optional long identifier, |
[Default=Undefined] optional long pageX, |
@@ -276,7 +269,8 @@ |
[Default=Undefined] optional float webkitForce); |
[EnabledAtRuntime=touch, Custom, RaisesException] TouchList createTouchList(); |
- [EnabledAtRuntime=customDOMElements, ImplementedAs=registerElement, CallWith=ScriptState, DeliverCustomElementCallbacks, RaisesException] CustomElementConstructor webkitRegister(DOMString name, optional Dictionary options); |
+ [DeprecateAs=PrefixedDocumentRegister, EnabledAtRuntime=customDOMElements, ImplementedAs=registerElement, CallWith=ScriptState, DeliverCustomElementCallbacks, RaisesException] CustomElementConstructor webkitRegister(DOMString name, optional Dictionary options); |
+ [EnabledAtRuntime=customDOMElements, ImplementedAs=registerElement, CallWith=ScriptState, DeliverCustomElementCallbacks, RaisesException] CustomElementConstructor register(DOMString name, optional Dictionary options); |
[DeliverCustomElementCallbacks, PerWorldBindings, ActivityLog=AccessForIsolatedWorlds, RaisesException] Element createElement(DOMString localName, [TreatNullAs=NullString] DOMString typeExtension); |
[DeliverCustomElementCallbacks, PerWorldBindings, ActivityLog=AccessForIsolatedWorlds, RaisesException] Element createElementNS([TreatNullAs=NullString] DOMString namespaceURI, DOMString qualifiedName, |
[TreatNullAs=NullString] DOMString typeExtension); |
@@ -288,10 +282,8 @@ |
// Security Policy API: http://dvcs.w3.org/hg/content-security-policy/raw-file/tip/csp-specification.dev.html#script-interfaces |
[EnabledAtRuntime=experimentalContentSecurityPolicyFeatures] readonly attribute SecurityPolicy securityPolicy; |
- // ParentNode interface API |
- readonly attribute HTMLCollection children; |
- readonly attribute Element firstElementChild; |
- readonly attribute Element lastElementChild; |
- readonly attribute unsigned long childElementCount; |
+ readonly attribute HTMLScriptElement currentScript; |
}; |
+Document implements ParentNode; |
+ |