Commit 38fe0204 authored by ddkilzer@apple.com's avatar ddkilzer@apple.com

Bug 25087: Test for ENABLE_FOO macros consistently in IDL files

        <https://bugs.webkit.org/show_bug.cgi?id=25087>

        Reviewed by Timothy Hatcher.

        Change tests for ENABLE macros to check for both existence and
        value:

        - Negative:  #if !defined(ENABLE_FOO) || !ENABLE_FOO
        - Positive:  #if defined(ENABLE_FOO) && ENABLE_FOO

        * css/CSSCharsetRule.idl:
        * css/CSSPrimitiveValue.idl:
        * css/RGBColor.idl:
        * dom/Attr.idl:
        * dom/DOMCoreException.idl:
        * dom/DOMImplementation.idl:
        * dom/Document.idl:
        * dom/Element.idl:
        * dom/Event.idl:
        * dom/EventException.idl:
        * dom/KeyboardEvent.idl:
        * dom/MessagePort.idl:
        * dom/MouseEvent.idl:
        * dom/Node.idl:
        * dom/ProcessingInstruction.idl:
        * dom/Range.idl:
        * dom/RangeException.idl:
        * dom/WheelEvent.idl:
        * html/CanvasPixelArray.idl:
        * html/HTMLAnchorElement.idl:
        * html/HTMLAppletElement.idl:
        * html/HTMLAreaElement.idl:
        * html/HTMLBaseFontElement.idl:
        * html/HTMLCanvasElement.idl:
        * html/HTMLDocument.idl:
        * html/HTMLElement.idl:
        * html/HTMLEmbedElement.idl:
        * html/HTMLFrameElement.idl:
        * html/HTMLIFrameElement.idl:
        * html/HTMLImageElement.idl:
        * html/HTMLInputElement.idl:
        * html/HTMLLinkElement.idl:
        * html/HTMLObjectElement.idl:
        * html/HTMLOptionElement.idl:
        * html/HTMLOptionsCollection.idl:
        * html/HTMLSelectElement.idl:
        * html/HTMLStyleElement.idl:
        * html/ImageData.idl:
        * inspector/InspectorController.idl:
        * loader/appcache/DOMApplicationCache.idl:
        * page/Console.idl:
        * page/Coordinates.idl:
        * page/DOMSelection.idl:
        * page/DOMWindow.idl:
        * page/Geoposition.idl:
        * page/History.idl:
        * page/Location.idl:
        * page/Navigator.idl:
        * svg/SVGElementInstance.idl:
        * svg/SVGException.idl:
        * workers/WorkerContext.idl:
        * xml/XMLHttpRequestException.idl:
        * xml/XPathException.idl:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@43528 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ecd17709
2009-05-11 David Kilzer <ddkilzer@apple.com>
Bug 25087: Test for ENABLE_FOO macros consistently in IDL files
<https://bugs.webkit.org/show_bug.cgi?id=25087>
Reviewed by Timothy Hatcher.
Change tests for ENABLE macros to check for both existence and
value:
- Negative: #if !defined(ENABLE_FOO) || !ENABLE_FOO
- Positive: #if defined(ENABLE_FOO) && ENABLE_FOO
* css/CSSCharsetRule.idl:
* css/CSSPrimitiveValue.idl:
* css/RGBColor.idl:
* dom/Attr.idl:
* dom/DOMCoreException.idl:
* dom/DOMImplementation.idl:
* dom/Document.idl:
* dom/Element.idl:
* dom/Event.idl:
* dom/EventException.idl:
* dom/KeyboardEvent.idl:
* dom/MessagePort.idl:
* dom/MouseEvent.idl:
* dom/Node.idl:
* dom/ProcessingInstruction.idl:
* dom/Range.idl:
* dom/RangeException.idl:
* dom/WheelEvent.idl:
* html/CanvasPixelArray.idl:
* html/HTMLAnchorElement.idl:
* html/HTMLAppletElement.idl:
* html/HTMLAreaElement.idl:
* html/HTMLBaseFontElement.idl:
* html/HTMLCanvasElement.idl:
* html/HTMLDocument.idl:
* html/HTMLElement.idl:
* html/HTMLEmbedElement.idl:
* html/HTMLFrameElement.idl:
* html/HTMLIFrameElement.idl:
* html/HTMLImageElement.idl:
* html/HTMLInputElement.idl:
* html/HTMLLinkElement.idl:
* html/HTMLObjectElement.idl:
* html/HTMLOptionElement.idl:
* html/HTMLOptionsCollection.idl:
* html/HTMLSelectElement.idl:
* html/HTMLStyleElement.idl:
* html/ImageData.idl:
* inspector/InspectorController.idl:
* loader/appcache/DOMApplicationCache.idl:
* page/Console.idl:
* page/Coordinates.idl:
* page/DOMSelection.idl:
* page/DOMWindow.idl:
* page/Geoposition.idl:
* page/History.idl:
* page/Location.idl:
* page/Navigator.idl:
* svg/SVGElementInstance.idl:
* svg/SVGException.idl:
* workers/WorkerContext.idl:
* xml/XMLHttpRequestException.idl:
* xml/XPathException.idl:
2009-05-11 Norbert Leser <norbert.leser@nokia.com>
Reviewed by Darin Adler.
......@@ -26,7 +26,7 @@ module css {
InterfaceUUID=94180bad-a74e-4df9-adbc-6ce4e5b96155,
ImplementationUUID=354aa39e-ad53-4e9a-a927-80c3966c47f2
] CSSCharsetRule : CSSRule {
#if defined(LANGUAGE_OBJECTIVE_C)
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
readonly attribute [ConvertNullStringTo=Null] DOMString encoding;
#else
attribute [ConvertNullStringTo=Null, ConvertNullToNullString] DOMString encoding
......
......@@ -69,7 +69,7 @@ module css {
raises(DOMException);
Rect getRectValue()
raises(DOMException);
#if !defined(LANGUAGE_COM)
#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
RGBColor getRGBColorValue()
raises(DOMException);
#endif
......
......@@ -33,10 +33,10 @@ module css {
readonly attribute CSSPrimitiveValue blue;
// WebKit extensions
#if !defined(LANGUAGE_JAVASCRIPT)
#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
readonly attribute CSSPrimitiveValue alpha;
#endif
#if defined(LANGUAGE_OBJECTIVE_C)
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
readonly attribute Color color;
#endif
};
......
......@@ -39,7 +39,7 @@ module core {
readonly attribute Element ownerElement;
// extensions
#if !defined(LANGUAGE_COM)
#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
readonly attribute CSSStyleDeclaration style;
#endif
};
......
......@@ -36,7 +36,7 @@ module core {
readonly attribute DOMString name;
readonly attribute DOMString message;
#if defined(LANGUAGE_JAVASCRIPT)
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
// Override in a Mozilla compatible format
[DontEnum] DOMString toString();
#endif
......
......@@ -44,7 +44,7 @@ module core {
// DOMImplementationCSS interface from DOM Level 2 CSS
#if !defined(LANGUAGE_COM)
#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
[OldStyleObjC] CSSStyleSheet createCSSStyleSheet(in DOMString title,
in DOMString media)
raises(DOMException);
......
......@@ -81,7 +81,7 @@ module core {
attribute [ConvertNullStringTo=Null, ConvertNullToNullString] DOMString documentURI;
#if !defined(LANGUAGE_COM)
#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
// DOM Level 2 Events (DocumentEvents interface)
Event createEvent(in DOMString eventType)
......@@ -116,7 +116,7 @@ module core {
[OldStyleObjC] CSSStyleDeclaration getOverrideStyle(in Element element,
in DOMString pseudoElement);
#if ENABLE_XPATH
#if defined(ENABLE_XPATH) && ENABLE_XPATH
// DOM Level 3 XPath (XPathEvaluator interface)
[OldStyleObjC] XPathExpression createExpression(in DOMString expression,
in XPathNSResolver resolver)
......@@ -137,7 +137,7 @@ module core {
in boolean userInterface,
in [ConvertUndefinedOrNullToNullString] DOMString value);
#if defined(LANGUAGE_OBJECTIVE_C)
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
// FIXME: remove the these two versions once [Optional] is implemented for Objective-C.
boolean execCommand(in DOMString command,
in boolean userInterface);
......@@ -154,7 +154,7 @@ module core {
attribute [ConvertNullToNullString] DOMString title;
readonly attribute DOMString referrer;
#if defined(LANGUAGE_JAVASCRIPT)
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
attribute [ConvertNullToNullString] DOMString domain;
#else
readonly attribute DOMString domain;
......@@ -180,7 +180,7 @@ module core {
NodeList getElementsByName(in DOMString elementName);
#if defined(LANGUAGE_JAVASCRIPT)
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
attribute [Custom] Location location;
#endif
......@@ -193,7 +193,7 @@ module core {
Element elementFromPoint(in long x, in long y);
// Mozilla extensions
#if defined(LANGUAGE_JAVASCRIPT)
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
DOMSelection getSelection();
#endif
readonly attribute [ConvertNullStringTo=Null] DOMString characterSet;
......@@ -203,13 +203,13 @@ module core {
readonly attribute [ConvertNullStringTo=Null] DOMString preferredStylesheetSet;
attribute [ConvertNullStringTo=Null, ConvertNullToNullString] DOMString selectedStylesheetSet;
#if !defined(LANGUAGE_COM)
#if !defined(LANGUAGE_JAVASCRIPT)
#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
CSSStyleDeclaration createCSSStyleDeclaration();
#endif
#endif
#if defined(LANGUAGE_OBJECTIVE_C)
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
// DOM Level 2 Style Interface
[OldStyleObjC, UsesView] CSSStyleDeclaration getComputedStyle(in Element element,
in DOMString pseudoElement);
......@@ -224,8 +224,8 @@ module core {
#endif
#if !defined(LANGUAGE_COM)
#if !defined(LANGUAGE_OBJECTIVE_C)
#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
......@@ -239,7 +239,7 @@ module core {
NodeList querySelectorAll(in DOMString selectors)
raises(DOMException);
#if ENABLE_WML
#if defined(ENABLE_WML) && ENABLE_WML
// Only used from within WML layout tests, WML doesn't have JS support at all.
void resetWMLPageState();
#endif
......
......@@ -66,7 +66,7 @@ module core {
[OldStyleObjC] boolean hasAttributeNS(in [ConvertNullToNullString] DOMString namespaceURI,
in DOMString localName);
#if !defined(LANGUAGE_COM)
#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
readonly attribute CSSStyleDeclaration style;
#endif
......@@ -109,7 +109,7 @@ module core {
NodeList querySelectorAll(in DOMString selectors)
raises(DOMException);
#if !defined(LANGUAGE_COM)
#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
// ElementTraversal API
readonly attribute Element firstElementChild;
readonly attribute Element lastElementChild;
......@@ -118,13 +118,13 @@ module core {
readonly attribute unsigned long childElementCount;
#endif
#if defined(LANGUAGE_JAVASCRIPT)
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
// CSSOM View Module API
ClientRectList getClientRects();
ClientRect getBoundingClientRect();
#endif
#if defined(LANGUAGE_OBJECTIVE_C)
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
// Objective-C extensions
readonly attribute DOMString innerText;
#endif
......
......@@ -34,7 +34,7 @@ module events {
const unsigned short AT_TARGET = 2;
const unsigned short BUBBLING_PHASE = 3;
#if !defined(LANGUAGE_OBJECTIVE_C)
#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
// Reverse-engineered from Netscape
const unsigned short MOUSEDOWN = 1;
const unsigned short MOUSEUP = 2;
......@@ -60,7 +60,7 @@ module events {
readonly attribute unsigned short eventPhase;
readonly attribute boolean bubbles;
readonly attribute boolean cancelable;
#if !defined(LANGUAGE_COM)
#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
readonly attribute DOMTimeStamp timeStamp;
#endif
void stopPropagation();
......@@ -74,7 +74,7 @@ module events {
attribute boolean returnValue;
attribute boolean cancelBubble;
#if defined(LANGUAGE_JAVASCRIPT)
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
readonly attribute [Custom] Clipboard clipboardData;
#endif
......
......@@ -38,7 +38,7 @@ module events {
readonly attribute DOMString name;
readonly attribute DOMString message;
#if defined(LANGUAGE_JAVASCRIPT)
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
// Override in a Mozilla compatible format
[DontEnum] DOMString toString();
#endif
......
......@@ -25,7 +25,7 @@ module events {
GenerateConstructor
] KeyboardEvent : UIEvent {
#if !defined(LANGUAGE_JAVASCRIPT)
#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
// KeyLocationCode
const unsigned long KEY_LOCATION_STANDARD = 0x00;
const unsigned long KEY_LOCATION_LEFT = 0x01;
......@@ -41,7 +41,7 @@ module events {
readonly attribute boolean metaKey;
readonly attribute boolean altGraphKey;
#if !defined(LANGUAGE_JAVASCRIPT)
#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
boolean getModifierState(in DOMString keyIdentifierArg);
#endif
......@@ -59,7 +59,7 @@ module events {
in boolean altGraphKey);
// WebKit Extensions
#if !defined(LANGUAGE_JAVASCRIPT)
#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
readonly attribute long keyCode;
readonly attribute long charCode;
......
......@@ -33,7 +33,7 @@ module events {
] MessagePort {
// We need to have something as an ObjC binding, because MessagePort is used in MessageEvent, which already has one,
// but we don't want to actually expose the API while it is in flux.
#if defined(LANGUAGE_JAVASCRIPT)
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
readonly attribute boolean active;
void postMessage(in DOMString message, in [Optional] MessagePort messagePort)
raises(DOMException);
......
......@@ -58,7 +58,7 @@ module events {
readonly attribute Node fromElement;
readonly attribute Node toElement;
#if defined(LANGUAGE_JAVASCRIPT)
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
readonly attribute Clipboard dataTransfer;
#endif
};
......
......@@ -31,7 +31,7 @@ module core {
InterfaceUUID=84BA0D7A-7E3E-4a7b-B6FB-7653E8FB54ED,
ImplementationUUID=81B47FDB-94B0-40fd-8E0C-FB2A6E53CC04
] Node
#if defined(LANGUAGE_OBJECTIVE_C)
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
: Object, EventTarget
#endif /* defined(LANGUAGE_OBJECTIVE_C) */
{
......@@ -128,13 +128,13 @@ module core {
// IE extensions
readonly attribute Element parentElement;
#if defined(LANGUAGE_OBJECTIVE_C)
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
// Objective-C extensions
readonly attribute boolean isContentEditable;
#endif /* defined(LANGUAGE_OBJECTIVE_C) */
#if !defined(LANGUAGE_OBJECTIVE_C)
#if !defined(LANGUAGE_COM)
#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
attribute [DontEnum] EventListener onabort;
attribute [DontEnum] EventListener onblur;
attribute [DontEnum] EventListener onchange;
......
......@@ -32,7 +32,7 @@ module core {
attribute [ConvertNullStringTo=Null, ConvertNullToNullString] DOMString data
setter raises(DOMException);
#if !defined(LANGUAGE_COM)
#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
// interface LinkStyle from DOM Level 2 Style Sheets
readonly attribute StyleSheet sheet;
#endif
......
......@@ -112,7 +112,7 @@ module ranges {
in long offset)
raises(RangeException, DOMException);
#if !defined(LANGUAGE_JAVASCRIPT)
#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
readonly attribute DOMString text;
#endif
};
......
......@@ -27,7 +27,7 @@ module ranges {
readonly attribute DOMString name;
readonly attribute DOMString message;
#if defined(LANGUAGE_JAVASCRIPT)
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
[DontEnum] DOMString toString();
#endif
......
......@@ -42,11 +42,11 @@ module events {
readonly attribute long x;
readonly attribute long y;
#if defined(LANGUAGE_OBJECTIVE_C)
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
readonly attribute boolean isHorizontal;
#endif /* defined(LANGUAGE_OBJECTIVE_C) */
#if !defined(LANGUAGE_JAVASCRIPT)
#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
void initWheelEvent(in long wheelDeltaX,
in long wheelDeltaY,
in DOMWindow view,
......
......@@ -27,7 +27,7 @@
*/
module html {
#if !defined(LANGUAGE_JAVASCRIPT) || defined(V8_BINDING)
#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT || defined(V8_BINDING) && V8_BINDING
interface [
CustomHeader,
HasCustomIndexGetter,
......
......@@ -47,11 +47,11 @@ module html {
readonly attribute DOMString search;
readonly attribute DOMString text;
#if defined(LANGUAGE_JAVASCRIPT)
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
[DontEnum] DOMString toString();
#endif
#if defined(LANGUAGE_OBJECTIVE_C)
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
// Objective-C extension:
readonly attribute URL absoluteLinkURL;
#endif
......
......@@ -35,14 +35,14 @@ module html {
attribute [ConvertNullToNullString] DOMString code;
attribute [ConvertNullToNullString] DOMString codeBase;
attribute [ConvertNullToNullString] DOMString height;
#if defined(LANGUAGE_JAVASCRIPT)
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
attribute [ConvertNullToNullString] DOMString hspace;
#else
attribute [ConvertFromString] long hspace;
#endif
attribute [ConvertNullToNullString] DOMString name;
attribute [ConvertNullToNullString] DOMString object;
#if defined(LANGUAGE_JAVASCRIPT)
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
attribute [ConvertNullToNullString] DOMString vspace;
#else
attribute [ConvertFromString] long vspace;
......
......@@ -42,7 +42,7 @@ module html {
readonly attribute DOMString protocol;
readonly attribute DOMString search;
#if defined(LANGUAGE_OBJECTIVE_C)
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
// Objective-C extension:
readonly attribute URL absoluteLinkURL;
#endif
......
......@@ -26,7 +26,7 @@ module html {
] HTMLBaseFontElement : HTMLElement {
attribute [ConvertNullToNullString] DOMString color;
attribute [ConvertNullToNullString] DOMString face;
#if defined(LANGUAGE_OBJECTIVE_C)
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
attribute [ConvertToString] DOMString size; // this changed to a long, but our existing API is a string
#else
attribute long size;
......
......@@ -37,7 +37,7 @@ module html {
DOMString toDataURL(in [ConvertUndefinedOrNullToNullString] DOMString type)
raises(DOMException);
#if !defined(LANGUAGE_OBJECTIVE_C)
#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C
[V8Custom] DOMObject getContext(in DOMString contextId);
#endif
......
......@@ -37,7 +37,7 @@ module html {
// Extensions
#if defined(LANGUAGE_JAVASCRIPT)
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
// FIXME: This should eventually be available (if they are wanted) for all languages.
attribute [Custom, Deletable] HTMLCollection all;
#endif
......
......@@ -62,7 +62,7 @@ module html {
attribute [ConvertNullToNullString] DOMString contentEditable;
readonly attribute boolean isContentEditable;
#if defined(LANGUAGE_OBJECTIVE_C)
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
readonly attribute DOMString titleDisplayString;
#endif
};
......
......@@ -30,7 +30,7 @@ module html {
ImplementationUUID=93e0407a-8380-4ff0-978d-f773f2dee6a3
] HTMLEmbedElement : HTMLElement {
attribute [ConvertNullToNullString] DOMString align;
#if defined(LANGUAGE_JAVASCRIPT)
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
attribute [ConvertNullToNullString] DOMString height;
#else
attribute [ConvertFromString] long height;
......@@ -38,15 +38,15 @@ module html {
attribute [ConvertNullToNullString] DOMString name;
attribute [ConvertNullToNullString] DOMString src;
attribute [ConvertNullToNullString] DOMString type;
#if defined(LANGUAGE_JAVASCRIPT)
#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
attribute [ConvertNullToNullString] DOMString width;
#else
attribute [ConvertFromString] long width;
#endif
#if !defined(LANGUAGE_COM)
#if ENABLE_SVG
#if !defined(LANGUAGE_OBJECTIVE_C) || defined(ENABLE_SVG_DOM_OBJC_BINDINGS)
#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
#if defined(ENABLE_SVG) && ENABLE_SVG
#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C || defined(ENABLE_SVG_DOM_OBJC_BINDINGS) && ENABLE_SVG_DOM_OBJC_BINDINGS
[SVGCheckSecurityDocument] SVGDocument getSVGDocument()
raises(DOMException);
#endif
......
......@@ -38,12 +38,12 @@ module html {
// Introduced in DOM Level 2:
readonly attribute [CheckFrameSecurity] Document contentDocument;
#if !defined(LANGUAGE_COM)
#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
// Extensions
readonly attribute DOMWindow contentWindow;
#if ENABLE_SVG
#if !defined(LANGUAGE_OBJECTIVE_C) || defined(ENABLE_SVG_DOM_OBJC_BINDINGS)
#if defined(ENABLE_SVG) && ENABLE_SVG
#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C || defined(ENABLE_SVG_DOM_OBJC_BINDINGS) && ENABLE_SVG_DOM_OBJC_BINDINGS
[SVGCheckSecurityDocument] SVGDocument getSVGDocument()
raises(DOMException);
#endif
......
......@@ -40,12 +40,12 @@ module html {
// Introduced in DOM Level 2:
readonly attribute [CheckFrameSecurity] Document contentDocument;
#if !defined(LANGUAGE_COM)
#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
// Extensions
readonly attribute DOMWindow contentWindow;
#if ENABLE_SVG
#if !defined(LANGUAGE_OBJECTIVE_C) || defined(ENABLE_SVG_DOM_OBJC_BINDINGS)
#if defined(ENABLE_SVG) && ENABLE_SVG
#if !defined(LANGUAGE_OBJECTIVE_C) || !LANGUAGE_OBJECTIVE_C || defined(ENABLE_SVG_DOM_OBJC_BINDINGS) && ENABLE_SVG_DOM_OBJC_BINDINGS
[SVGCheckSecurityDocument] SVGDocument getSVGDocument()
raises(DOMException);
#endif
......
......@@ -46,7 +46,7 @@ module html {
readonly attribute long x;
readonly attribute long y;
#if defined(LANGUAGE_OBJECTIVE_C)
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
// Objective-C extension:
readonly attribute DOMString altDisplayString;
readonly attribute URL absoluteImageURL;
......
......@@ -39,7 +39,7 @@ module html {
attribute boolean multiple;
attribute [ConvertNullToNullString] DOMString name;
attribute boolean readOnly;
#if defined(LANGUAGE_OBJECTIVE_C)
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
attribute [ConvertToString] DOMString size; // DOM level 2 changed this to a long, but our existing API is a string
#else
// FIXME: the spec says this should be a long, not an unsigned long
......
......@@ -35,12 +35,12 @@ module html {
attribute [ConvertNullToNullString] DOMString target;
attribute [ConvertNullToNullString] DOMString type;
#if !defined(LANGUAGE_COM)
#if !defined(LANGUAGE_COM) || !LANGUAGE_COM
// DOM Level 2 Style
readonly attribute StyleSheet sheet;
#endif
#if defined(LANGUAGE_OBJECTIVE_C)
#if defined(LANGUAGE_OBJECTIVE_C) && LANGUAGE_OBJECTIVE_C
// Objective-C extension:
readonly attribute URL absoluteLinkURL;
#endif
......
......@@ -50,16 +50,16 @@ module html {
// Introduced in DOM Level 2:
readonly attribute [CheckFrameSecurity] Document contentDocument;