diff options
Diffstat (limited to 'WebCore/dom/Document.idl')
| -rw-r--r-- | WebCore/dom/Document.idl | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/WebCore/dom/Document.idl b/WebCore/dom/Document.idl index 69417c8..2b17a13 100644 --- a/WebCore/dom/Document.idl +++ b/WebCore/dom/Document.idl @@ -22,12 +22,9 @@ module core { interface [ CustomToJS, - GenerateConstructor, GenerateNativeConverter, CustomMarkFunction, - InlineGetOwnPropertySlot, - InterfaceUUID=48BB95FC-2D08-4c54-BE65-7558736A4CAE, - ImplementationUUID=FF5CBE81-F817-429c-A6C2-0CCCD2328062 + InlineGetOwnPropertySlot ] Document : Node { // DOM Level 1 Core @@ -81,7 +78,6 @@ module core { attribute [ConvertNullStringTo=Null, ConvertNullToNullString] DOMString documentURI; -#if !defined(LANGUAGE_COM) || !LANGUAGE_COM // DOM Level 2 Events (DocumentEvents interface) Event createEvent(in DOMString eventType) @@ -129,7 +125,6 @@ module core { in XPathResult inResult) raises(DOMException); #endif // ENABLE_XPATH -#endif // !defined(LANGUAGE_COM) // Common extensions @@ -171,9 +166,7 @@ module core { attribute HTMLElement body setter raises (DOMException); -#if !defined(LANGUAGE_COM) || !LANGUAGE_COM readonly attribute HTMLHeadElement head; -#endif readonly attribute HTMLCollection images; readonly attribute HTMLCollection applets; readonly attribute HTMLCollection links; @@ -194,9 +187,7 @@ module core { readonly attribute [ConvertNullStringTo=Undefined] DOMString readyState; Element elementFromPoint(in long x, in long y); -#if !defined(LANGUAGE_COM) || !LANGUAGE_COM Range caretRangeFromPoint(in long x, in long y); -#endif // Mozilla extensions #if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT @@ -209,11 +200,9 @@ module core { readonly attribute [ConvertNullStringTo=Null] DOMString preferredStylesheetSet; attribute [ConvertNullStringTo=Null, ConvertNullToNullString] DOMString selectedStylesheetSet; -#if !defined(LANGUAGE_COM) || !LANGUAGE_COM #if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT CSSStyleDeclaration createCSSStyleDeclaration(); #endif -#endif #if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C // DOM Level 2 Style Interface @@ -230,11 +219,9 @@ module core { #endif -#if !defined(LANGUAGE_COM) || !LANGUAGE_COM #if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C [V8Custom] DOMObject getCSSCanvasContext(in DOMString contextId, in DOMString name, in long width, in long height); #endif -#endif // HTML 5 NodeList getElementsByClassName(in DOMString tagname); @@ -252,7 +239,6 @@ module core { #endif #if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C -#if !defined(LANGUAGE_COM) || !LANGUAGE_COM // Event handler DOM attributes attribute [DontEnum] EventListener onabort; attribute [DontEnum] EventListener onblur; @@ -325,7 +311,10 @@ module core { attribute [DontEnum] EventListener ontouchmove; attribute [DontEnum] EventListener ontouchend; attribute [DontEnum] EventListener ontouchcancel; +<<<<<<< HEAD #endif +======= +>>>>>>> webkit.org at r54127 #endif #endif }; |