Removed Objective-C specific attributes from IDL, made conditionals more consistent
authordarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 21 Aug 2016 02:21:54 +0000 (02:21 +0000)
committerdarin@apple.com <darin@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 21 Aug 2016 02:21:54 +0000 (02:21 +0000)
https://bugs.webkit.org/show_bug.cgi?id=160900

Reviewed by Sam Weinig.

Removed all Objective-C-specific attributes from all the various IDL files where
they were used. Except, oops, Sam already did that, and so everything just merged!
Now that Objective-C is gone, made all the conditionals be based on LANGUAGE_GOBJECT
specifically. Later we should cut these down because many were not actually needed
for the GObject bindings, actually only for Objective-C. Also made the style of
conditional consistent. Also re-sorted attributes in alphabetical order in many cases
and made formatting more consistent without fancy indentation. Also removed old comments
that tried to document where various operations and attributes were defined; it's not
helpful to track "this was part of DOM level 2" at this point. Also fixed a variety of
types to explicitly state the values are nullable in cases where the generated code
is currently not affected by that; mostly read-only attribute types.

* Modules/mediasession/HTMLMediaElementMediaSession.idl:
* Modules/mediastream/HTMLMediaElementMediaStream.idl:
* animation/AnimationTimeline.idl:
* animation/DocumentAnimation.idl:
* bindings/scripts/IDLAttributes.txt:
* css/CSSMediaRule.idl:
* css/CSSPrimitiveValue.idl:
* css/CSSRule.idl:
* css/CSSStyleDeclaration.idl:
* css/CSSStyleSheet.idl:
* css/CSSValue.idl:
* css/RGBColor.idl:
* css/StyleSheet.idl:
* dom/CharacterData.idl:
* dom/DOMCoreException.idl:
* dom/DOMImplementation.idl:
* dom/Document.idl:
* dom/DocumentType.idl:
* dom/Element.idl:
* dom/Event.idl:
* dom/EventListener.idl:
* dom/EventTarget.idl:
* dom/KeyboardEvent.idl:
* dom/MessageEvent.idl:
* dom/MessagePort.idl:
* dom/MouseEvent.idl:
* dom/MutationEvent.idl:
* dom/NamedNodeMap.idl:
* dom/Node.idl:
* dom/NodeFilter.idl:
* dom/NonElementParentNode.idl:
* dom/Range.idl:
* dom/Slotable.idl:
* dom/UIEvent.idl:
* dom/WheelEvent.idl:
* fileapi/FileException.idl:
* html/DOMTokenList.idl:
* html/HTMLAnchorElement.idl:
* html/HTMLAppletElement.idl:
* html/HTMLCollection.idl:
* html/HTMLDocument.idl:
* html/HTMLElement.idl:
* html/HTMLEmbedElement.idl:
* html/HTMLFormElement.idl:
* html/HTMLInputElement.idl:
* html/HTMLMediaElement.idl:
* html/HTMLOptionElement.idl:
* html/HTMLOptionsCollection.idl:
* html/HTMLSelectElement.idl:
* html/HTMLTableColElement.idl:
* html/HTMLVideoElement.idl:
* html/ImageData.idl:
* html/URLUtils.idl:
* html/track/TextTrack.idl:
* page/AbstractView.idl:
* page/DOMSelection.idl:
* page/DOMWindow.idl:
* page/Location.idl:
* svg/SVGDocument.idl:
* svg/SVGElement.idl:
* svg/SVGException.idl:
* svg/SVGExternalResourcesRequired.idl:
* svg/SVGFilterPrimitiveStandardAttributes.idl:
* svg/SVGFitToViewBox.idl:
* svg/SVGPathSeg.idl:
* svg/SVGTests.idl:
* svg/SVGURIReference.idl:
* svg/SVGZoomAndPan.idl:
* workers/DedicatedWorkerGlobalScope.idl:
* workers/Worker.idl:
* workers/WorkerGlobalScope.idl:
* xml/XPathException.idl:
* xml/XPathExpression.idl:
* xml/XPathNSResolver.idl:
See above for summary of changes.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@204687 268f45cc-cd09-0410-ab3c-d52691b4dbfc

74 files changed:
Source/WebCore/ChangeLog
Source/WebCore/Modules/mediasession/HTMLMediaElementMediaSession.idl
Source/WebCore/Modules/mediastream/HTMLMediaElementMediaStream.idl
Source/WebCore/animation/AnimationTimeline.idl
Source/WebCore/animation/DocumentAnimation.idl
Source/WebCore/bindings/scripts/IDLAttributes.txt
Source/WebCore/css/CSSMediaRule.idl
Source/WebCore/css/CSSPrimitiveValue.idl
Source/WebCore/css/CSSRule.idl
Source/WebCore/css/CSSStyleDeclaration.idl
Source/WebCore/css/CSSStyleSheet.idl
Source/WebCore/css/CSSValue.idl
Source/WebCore/css/RGBColor.idl
Source/WebCore/css/StyleSheet.idl
Source/WebCore/dom/Attr.idl
Source/WebCore/dom/CharacterData.idl
Source/WebCore/dom/DOMCoreException.idl
Source/WebCore/dom/DOMImplementation.idl
Source/WebCore/dom/Document.idl
Source/WebCore/dom/DocumentType.idl
Source/WebCore/dom/Element.idl
Source/WebCore/dom/Event.idl
Source/WebCore/dom/EventListener.idl
Source/WebCore/dom/EventTarget.idl
Source/WebCore/dom/KeyboardEvent.idl
Source/WebCore/dom/MessageEvent.idl
Source/WebCore/dom/MessagePort.idl
Source/WebCore/dom/MouseEvent.idl
Source/WebCore/dom/MutationEvent.idl
Source/WebCore/dom/NamedNodeMap.idl
Source/WebCore/dom/Node.idl
Source/WebCore/dom/NodeFilter.idl
Source/WebCore/dom/Range.idl
Source/WebCore/dom/Slotable.idl
Source/WebCore/dom/UIEvent.idl
Source/WebCore/dom/WheelEvent.idl
Source/WebCore/fileapi/FileException.idl
Source/WebCore/html/DOMTokenList.idl
Source/WebCore/html/HTMLAnchorElement.idl
Source/WebCore/html/HTMLAppletElement.idl
Source/WebCore/html/HTMLCollection.idl
Source/WebCore/html/HTMLDocument.idl
Source/WebCore/html/HTMLElement.idl
Source/WebCore/html/HTMLEmbedElement.idl
Source/WebCore/html/HTMLFormElement.idl
Source/WebCore/html/HTMLInputElement.idl
Source/WebCore/html/HTMLMediaElement.idl
Source/WebCore/html/HTMLOptionElement.idl
Source/WebCore/html/HTMLOptionsCollection.idl
Source/WebCore/html/HTMLSelectElement.idl
Source/WebCore/html/HTMLTableColElement.idl
Source/WebCore/html/HTMLVideoElement.idl
Source/WebCore/html/ImageData.idl
Source/WebCore/html/URLUtils.idl
Source/WebCore/html/track/TextTrack.idl
Source/WebCore/page/DOMSelection.idl
Source/WebCore/page/DOMWindow.idl
Source/WebCore/page/Location.idl
Source/WebCore/svg/SVGDocument.idl
Source/WebCore/svg/SVGElement.idl
Source/WebCore/svg/SVGException.idl
Source/WebCore/svg/SVGExternalResourcesRequired.idl
Source/WebCore/svg/SVGFilterPrimitiveStandardAttributes.idl
Source/WebCore/svg/SVGFitToViewBox.idl
Source/WebCore/svg/SVGPathSeg.idl
Source/WebCore/svg/SVGTests.idl
Source/WebCore/svg/SVGURIReference.idl
Source/WebCore/svg/SVGZoomAndPan.idl
Source/WebCore/workers/DedicatedWorkerGlobalScope.idl
Source/WebCore/workers/Worker.idl
Source/WebCore/workers/WorkerGlobalScope.idl
Source/WebCore/xml/XPathException.idl
Source/WebCore/xml/XPathExpression.idl
Source/WebCore/xml/XPathNSResolver.idl

index 208ff4e..b509ca9 100644 (file)
@@ -1,3 +1,98 @@
+2016-08-20  Darin Adler  <darin@apple.com>
+
+        Removed Objective-C specific attributes from IDL, made conditionals more consistent
+        https://bugs.webkit.org/show_bug.cgi?id=160900
+
+        Reviewed by Sam Weinig.
+
+        Removed all Objective-C-specific attributes from all the various IDL files where
+        they were used. Except, oops, Sam already did that, and so everything just merged!
+        Now that Objective-C is gone, made all the conditionals be based on LANGUAGE_GOBJECT
+        specifically. Later we should cut these down because many were not actually needed
+        for the GObject bindings, actually only for Objective-C. Also made the style of
+        conditional consistent. Also re-sorted attributes in alphabetical order in many cases
+        and made formatting more consistent without fancy indentation. Also removed old comments
+        that tried to document where various operations and attributes were defined; it's not
+        helpful to track "this was part of DOM level 2" at this point. Also fixed a variety of
+        types to explicitly state the values are nullable in cases where the generated code
+        is currently not affected by that; mostly read-only attribute types.
+
+        * Modules/mediasession/HTMLMediaElementMediaSession.idl:
+        * Modules/mediastream/HTMLMediaElementMediaStream.idl:
+        * animation/AnimationTimeline.idl:
+        * animation/DocumentAnimation.idl:
+        * bindings/scripts/IDLAttributes.txt:
+        * css/CSSMediaRule.idl:
+        * css/CSSPrimitiveValue.idl:
+        * css/CSSRule.idl:
+        * css/CSSStyleDeclaration.idl:
+        * css/CSSStyleSheet.idl:
+        * css/CSSValue.idl:
+        * css/RGBColor.idl:
+        * css/StyleSheet.idl:
+        * dom/CharacterData.idl:
+        * dom/DOMCoreException.idl:
+        * dom/DOMImplementation.idl:
+        * dom/Document.idl:
+        * dom/DocumentType.idl:
+        * dom/Element.idl:
+        * dom/Event.idl:
+        * dom/EventListener.idl:
+        * dom/EventTarget.idl:
+        * dom/KeyboardEvent.idl:
+        * dom/MessageEvent.idl:
+        * dom/MessagePort.idl:
+        * dom/MouseEvent.idl:
+        * dom/MutationEvent.idl:
+        * dom/NamedNodeMap.idl:
+        * dom/Node.idl:
+        * dom/NodeFilter.idl:
+        * dom/NonElementParentNode.idl:
+        * dom/Range.idl:
+        * dom/Slotable.idl:
+        * dom/UIEvent.idl:
+        * dom/WheelEvent.idl:
+        * fileapi/FileException.idl:
+        * html/DOMTokenList.idl:
+        * html/HTMLAnchorElement.idl:
+        * html/HTMLAppletElement.idl:
+        * html/HTMLCollection.idl:
+        * html/HTMLDocument.idl:
+        * html/HTMLElement.idl:
+        * html/HTMLEmbedElement.idl:
+        * html/HTMLFormElement.idl:
+        * html/HTMLInputElement.idl:
+        * html/HTMLMediaElement.idl:
+        * html/HTMLOptionElement.idl:
+        * html/HTMLOptionsCollection.idl:
+        * html/HTMLSelectElement.idl:
+        * html/HTMLTableColElement.idl:
+        * html/HTMLVideoElement.idl:
+        * html/ImageData.idl:
+        * html/URLUtils.idl:
+        * html/track/TextTrack.idl:
+        * page/AbstractView.idl:
+        * page/DOMSelection.idl:
+        * page/DOMWindow.idl:
+        * page/Location.idl:
+        * svg/SVGDocument.idl:
+        * svg/SVGElement.idl:
+        * svg/SVGException.idl:
+        * svg/SVGExternalResourcesRequired.idl:
+        * svg/SVGFilterPrimitiveStandardAttributes.idl:
+        * svg/SVGFitToViewBox.idl:
+        * svg/SVGPathSeg.idl:
+        * svg/SVGTests.idl:
+        * svg/SVGURIReference.idl:
+        * svg/SVGZoomAndPan.idl:
+        * workers/DedicatedWorkerGlobalScope.idl:
+        * workers/Worker.idl:
+        * workers/WorkerGlobalScope.idl:
+        * xml/XPathException.idl:
+        * xml/XPathExpression.idl:
+        * xml/XPathNSResolver.idl:
+        See above for summary of changes.
+
 2016-08-20  Sam Weinig  <sam@webkit.org>
 
         Remove Objective-C specific extended attributes from the bindings
index 05674aa..ea5d8be 100644 (file)
@@ -28,7 +28,7 @@
 ] partial interface HTMLMediaElement {
     attribute DOMString kind;
 
-#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     attribute MediaSession? session;
 #endif
 };
index 93e4caf..3acf4d6 100644 (file)
@@ -27,7 +27,7 @@
     Conditional=VIDEO&MEDIA_STREAM,
 ] partial interface HTMLMediaElement
 {
-#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [SetterCallWith=ScriptExecutionContext] attribute MediaStream? srcObject;
 #endif
 };
index 2def477..3b61b10 100644 (file)
@@ -33,4 +33,3 @@
 ] interface AnimationTimeline {
     // FIXME: Only a stub at the moment.
 };
-
index f6a0fc4..dde144c 100644 (file)
@@ -29,7 +29,7 @@
 [
     Conditional=WEB_ANIMATIONS
 ] partial interface Document {
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT // Workaround problems with binding generators
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT) // Work around problems with GObject binding generator.
     readonly attribute DocumentTimeline timeline;
     sequence<WebAnimation> getAnimations();
 #endif
index 4e2422b..c677dbb 100644 (file)
@@ -97,13 +97,6 @@ NewObject
 NoInterfaceObject
 Nondeterministic
 NotEnumerable
-ObjCCustomImplementation
-ObjCExplicitAtomicString
-ObjCImplementedAsUnsignedLong
-ObjCLegacyUnnamedParameters
-ObjCPolymorphic
-ObjCProtocol
-ObjCUseDefaultView
 OverrideBuiltins
 PassContext
 PrivateIdentifier
index cb079e0..0a60651 100644 (file)
  * Boston, MA 02110-1301, USA.
  */
 
-// Introduced in DOM Level 2:
 interface CSSMediaRule : CSSRule {
     readonly attribute MediaList media;
     readonly attribute CSSRuleList cssRules;
-    
-    [RaisesException] unsigned long insertRule(optional DOMString rule = "undefined",
-                                                 optional unsigned long index = 0);
+
+    [RaisesException] unsigned long insertRule(optional DOMString rule = "undefined", optional unsigned long index = 0);
     [RaisesException] void deleteRule(optional unsigned long index = 0);
 };
-
index 61f262a..5a94694 100644 (file)
 ] interface CSSPrimitiveValue : CSSValue {
 
     // UnitTypes
-    const unsigned short CSS_UNKNOWN    = 0;
-    const unsigned short CSS_NUMBER     = 1;
+    const unsigned short CSS_UNKNOWN = 0;
+    const unsigned short CSS_NUMBER = 1;
     const unsigned short CSS_PERCENTAGE = 2;
-    const unsigned short CSS_EMS        = 3;
-    const unsigned short CSS_EXS        = 4;
-    const unsigned short CSS_PX         = 5;
-    const unsigned short CSS_CM         = 6;
-    const unsigned short CSS_MM         = 7;
-    const unsigned short CSS_IN         = 8;
-    const unsigned short CSS_PT         = 9;
-    const unsigned short CSS_PC         = 10;
-    const unsigned short CSS_DEG        = 11;
-    const unsigned short CSS_RAD        = 12;
-    const unsigned short CSS_GRAD       = 13;
-    const unsigned short CSS_MS         = 14;
-    const unsigned short CSS_S          = 15;
-    const unsigned short CSS_HZ         = 16;
-    const unsigned short CSS_KHZ        = 17;
-    const unsigned short CSS_DIMENSION  = 18;
-    const unsigned short CSS_STRING     = 19;
-    const unsigned short CSS_URI        = 20;
-    const unsigned short CSS_IDENT      = 21;
-    const unsigned short CSS_ATTR       = 22;
-    const unsigned short CSS_COUNTER    = 23;
-    const unsigned short CSS_RECT       = 24;
-    const unsigned short CSS_RGBCOLOR   = 25;
-    const unsigned short CSS_VW         = 26;
-    const unsigned short CSS_VH         = 27;
-    const unsigned short CSS_VMIN       = 28;
-    const unsigned short CSS_VMAX       = 29;
+    const unsigned short CSS_EMS = 3;
+    const unsigned short CSS_EXS = 4;
+    const unsigned short CSS_PX = 5;
+    const unsigned short CSS_CM = 6;
+    const unsigned short CSS_MM = 7;
+    const unsigned short CSS_IN = 8;
+    const unsigned short CSS_PT = 9;
+    const unsigned short CSS_PC = 10;
+    const unsigned short CSS_DEG = 11;
+    const unsigned short CSS_RAD = 12;
+    const unsigned short CSS_GRAD = 13;
+    const unsigned short CSS_MS = 14;
+    const unsigned short CSS_S = 15;
+    const unsigned short CSS_HZ = 16;
+    const unsigned short CSS_KHZ = 17;
+    const unsigned short CSS_DIMENSION = 18;
+    const unsigned short CSS_STRING = 19;
+    const unsigned short CSS_URI = 20;
+    const unsigned short CSS_IDENT = 21;
+    const unsigned short CSS_ATTR = 22;
+    const unsigned short CSS_COUNTER = 23;
+    const unsigned short CSS_RECT = 24;
+    const unsigned short CSS_RGBCOLOR = 25;
+    const unsigned short CSS_VW = 26;
+    const unsigned short CSS_VH = 27;
+    const unsigned short CSS_VMIN = 28;
+    const unsigned short CSS_VMAX = 29;
     
     readonly attribute unsigned short primitiveType;
 
-    [RaisesException] void setFloatValue(optional unsigned short unitType = 0,
-                                      optional unrestricted float floatValue = NaN);
+    [RaisesException] void setFloatValue(optional unsigned short unitType = 0, optional unrestricted float floatValue = NaN);
     [RaisesException] unrestricted float getFloatValue(optional unsigned short unitType = 0);
 
     // FIXME: Using "undefined" as default parameter value is wrong.
-    [RaisesException] void setStringValue(optional unsigned short stringType = 0,
-                                       optional DOMString stringValue = "undefined");
+    [RaisesException] void setStringValue(optional unsigned short stringType = 0, optional DOMString stringValue = "undefined");
     [RaisesException] DOMString getStringValue();
     [RaisesException] Counter getCounterValue();
     [RaisesException] Rect getRectValue();
     [RaisesException] RGBColor getRGBColorValue();
 };
-
index 3c05613..5a315d2 100644 (file)
  * Boston, MA 02110-1301, USA.
  */
 
-// Introduced in DOM Level 2:
 [
+    CustomToJSObject,
+    GenerateIsReachable,
     JSCustomHeader,
     JSCustomMarkFunction,
-    GenerateIsReachable,
-    CustomToJSObject,
 ] interface CSSRule {
-
     // RuleType
     const unsigned short UNKNOWN_RULE = 0;
     const unsigned short STYLE_RULE = 1;
     const unsigned short WEBKIT_REGION_RULE = 16;
 #endif
 
-    const unsigned short WEBKIT_KEYFRAMES_RULE = 7; // Avoid breaking exisiting content.
+    const unsigned short WEBKIT_KEYFRAMES_RULE = 7; // Avoid breaking existing content.
     const unsigned short WEBKIT_KEYFRAME_RULE = 8;
 
-    readonly attribute unsigned short   type;
+    readonly attribute unsigned short type;
 
     [SetterRaisesException] attribute DOMString? cssText;
 
-    readonly attribute CSSStyleSheet    parentStyleSheet;
-    readonly attribute CSSRule          parentRule;
-
+    readonly attribute CSSStyleSheet? parentStyleSheet;
+    readonly attribute CSSRule? parentRule;
 };
-
index 33025bf..06c5304 100644 (file)
  * Boston, MA 02110-1301, USA.
  */
 
-// Introduced in DOM Level 2:
 [
-    JSCustomHeader,
-    JSCustomMarkFunction,
+    CustomEnumerateProperty,
+    CustomNamedSetter,
+    ExportMacro=WEBCORE_EXPORT,
     GenerateIsReachable,
     JSCustomGetOwnPropertySlotAndDescriptor,
-    CustomNamedSetter,
-    CustomEnumerateProperty,
+    JSCustomHeader,
+    JSCustomMarkFunction,
     SkipVTableValidation,
-    ExportMacro=WEBCORE_EXPORT,
 ] interface CSSStyleDeclaration {
     [SetterRaisesException] attribute DOMString cssText;
 
@@ -43,9 +42,7 @@
     getter DOMString item(unsigned long index);
     readonly attribute CSSRule? parentRule;
 
-    // Extensions
     // FIXME: Using "undefined" as default parameter value is wrong.
-    DOMString?          getPropertyShorthand(optional DOMString propertyName = "undefined");
-    boolean            isPropertyImplicit(optional DOMString propertyName = "undefined");
+    DOMString? getPropertyShorthand(optional DOMString propertyName = "undefined");
+    boolean isPropertyImplicit(optional DOMString propertyName = "undefined");
 };
-
index 10d6c3a..562b5da 100644 (file)
  * Boston, MA 02110-1301, USA.
  */
 
-// Introduced in DOM Level 2:
 interface CSSStyleSheet : StyleSheet {
-    readonly attribute CSSRule          ownerRule;
-    readonly attribute CSSRuleList      cssRules;
+    readonly attribute CSSRule ownerRule;
+    readonly attribute CSSRuleList cssRules;
 
     [RaisesException] unsigned long insertRule(DOMString rule, unsigned long index);
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [RaisesException, ImplementedAs=deprecatedInsertRule] unsigned long insertRule(DOMString rule); // Deprecated.
 #endif
 
     [RaisesException] void deleteRule(unsigned long index);
 
-    // IE Extensions
-    readonly attribute CSSRuleList      rules;
+    readonly attribute CSSRuleList rules;
 
     // FIXME: Those operations are WebKit-specific.
     [RaisesException] long addRule(optional DOMString selector = "undefined", optional DOMString style = "undefined", optional unsigned long index);
     [RaisesException] void removeRule(optional unsigned long index = 0);
 };
-
index 4685375..7b8b94b 100644 (file)
 [
     CustomToJSObject,
     CustomIsReachable,
+    ImplementationLacksVTable,
     JSCustomFinalize,
-    ImplementationLacksVTable
 ] interface CSSValue {
     // UnitTypes
-    const unsigned short CSS_INHERIT         = 0;
+    const unsigned short CSS_INHERIT = 0;
     const unsigned short CSS_PRIMITIVE_VALUE = 1;
-    const unsigned short CSS_VALUE_LIST      = 2;
-    const unsigned short CSS_CUSTOM          = 3;
+    const unsigned short CSS_VALUE_LIST = 2;
+    const unsigned short CSS_CUSTOM = 3;
 
     [SetterRaisesException] attribute DOMString? cssText;
 
     readonly attribute unsigned short cssValueType;
 };
-
index b93dcb1..4d76987 100644 (file)
  * Boston, MA 02110-1301, USA.
  */
 
-// Introduced in DOM Level 2:
 [
     ImplementationLacksVTable
 ] interface RGBColor {
-    readonly attribute CSSPrimitiveValue  red;
-    readonly attribute CSSPrimitiveValue  green;
-    readonly attribute CSSPrimitiveValue  blue;
+    readonly attribute CSSPrimitiveValue red;
+    readonly attribute CSSPrimitiveValue green;
+    readonly attribute CSSPrimitiveValue blue;
 
-    // WebKit extensions
-#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
-    readonly attribute CSSPrimitiveValue  alpha;
+#if defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT
+    readonly attribute CSSPrimitiveValue alpha;
 #endif
 };
-
index 4035083..bceebbb 100644 (file)
  * Boston, MA 02110-1301, USA.
  */
 
-// Introduced in DOM Level 2:
 [
+    CustomToJSObject,
+    GenerateIsReachable,
     JSCustomHeader,
     JSCustomMarkFunction,
-    GenerateIsReachable,
-    CustomToJSObject,
 ] interface StyleSheet {
-    readonly attribute DOMString?       type;
-             attribute boolean          disabled;
-    readonly attribute Node             ownerNode;
-    readonly attribute StyleSheet       parentStyleSheet;
-    readonly attribute DOMString?       href;
-    readonly attribute DOMString?       title;
-    readonly attribute MediaList        media;
+    readonly attribute DOMString? type;
+    attribute boolean disabled;
+    readonly attribute Node ownerNode;
+    readonly attribute StyleSheet parentStyleSheet;
+    readonly attribute DOMString? href;
+    readonly attribute DOMString? title;
+    readonly attribute MediaList media;
 };
-
index 39e3574..ecd55e1 100644 (file)
 
 [
     JSCustomMarkFunction,
+    JSGenerateToJSObject,
     JSGenerateToNativeObject,
-    JSGenerateToJSObject
 ] interface Attr : Node {
-
-    // DOM Level 1
-
     readonly attribute DOMString? name;
 
     readonly attribute boolean specified;
 
     [ImplementedAs=valueForBindings] attribute DOMString value;
 
-    // DOM Level 2
-
     readonly attribute Element ownerElement;
 
-    // DOM Level 3
-
     readonly attribute boolean isId;
 
     readonly attribute DOMString? namespaceURI;
     readonly attribute DOMString? prefix;
     readonly attribute DOMString localName;
 };
-
index b2ede93..379c4a8 100644 (file)
  */
 
 interface CharacterData : Node {
-
     [TreatNullAs=EmptyString] attribute DOMString data;
-
     readonly attribute unsigned long length;
-    
+
     [RaisesException] DOMString? substringData(unsigned long offset, unsigned long length);
 
     void appendData(DOMString data);
-
     [RaisesException] void insertData(unsigned long offset, DOMString data);
-
     [RaisesException] void deleteData(unsigned long offset, unsigned long length);
-
     [RaisesException] void replaceData(unsigned long offset, unsigned long length, DOMString data);
 };
 
index 5fa04b1..4a4293b 100644 (file)
     readonly attribute DOMString        name;
     readonly attribute DOMString        message;
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
-    // Override in a Mozilla compatible format
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [NotEnumerable] DOMString toString();
 #endif
 
     // ExceptionCode
-    const unsigned short      INDEX_SIZE_ERR                 = 1;
-    const unsigned short      DOMSTRING_SIZE_ERR             = 2;
-    const unsigned short      HIERARCHY_REQUEST_ERR          = 3;
-    const unsigned short      WRONG_DOCUMENT_ERR             = 4;
-    const unsigned short      INVALID_CHARACTER_ERR          = 5;
-    const unsigned short      NO_DATA_ALLOWED_ERR            = 6;
-    const unsigned short      NO_MODIFICATION_ALLOWED_ERR    = 7;
-    const unsigned short      NOT_FOUND_ERR                  = 8;
-    const unsigned short      NOT_SUPPORTED_ERR              = 9;
-    const unsigned short      INUSE_ATTRIBUTE_ERR            = 10;
-    // Introduced in DOM Level 2:
-    const unsigned short      INVALID_STATE_ERR              = 11;
-    // Introduced in DOM Level 2:
-    const unsigned short      SYNTAX_ERR                     = 12;
-    // Introduced in DOM Level 2:
-    const unsigned short      INVALID_MODIFICATION_ERR       = 13;
-    // Introduced in DOM Level 2:
-    const unsigned short      NAMESPACE_ERR                  = 14;
-    // Introduced in DOM Level 2:
-    const unsigned short      INVALID_ACCESS_ERR             = 15;
-    // Introduced in DOM Level 3:
-    const unsigned short      VALIDATION_ERR                 = 16;
-    // Introduced in DOM Level 3:
-    const unsigned short      TYPE_MISMATCH_ERR              = 17;
-    // Introduced as an XHR extension:
-    const unsigned short      SECURITY_ERR                   = 18;
-    // Introduced in HTML5:
-    const unsigned short      NETWORK_ERR                    = 19;
-    const unsigned short      ABORT_ERR                      = 20;
-    const unsigned short      URL_MISMATCH_ERR               = 21;
-    const unsigned short      QUOTA_EXCEEDED_ERR             = 22;
-    // TIMEOUT_ERR is currently unused but was added for completeness.
-    const unsigned short      TIMEOUT_ERR                    = 23;
-    // INVALID_NODE_TYPE_ERR is currently unused but was added for completeness.
-    const unsigned short      INVALID_NODE_TYPE_ERR          = 24;
-    const unsigned short      DATA_CLONE_ERR                 = 25;
+    const unsigned short INDEX_SIZE_ERR = 1;
+    const unsigned short DOMSTRING_SIZE_ERR = 2;
+    const unsigned short HIERARCHY_REQUEST_ERR = 3;
+    const unsigned short WRONG_DOCUMENT_ERR = 4;
+    const unsigned short INVALID_CHARACTER_ERR = 5;
+    const unsigned short NO_DATA_ALLOWED_ERR = 6;
+    const unsigned short NO_MODIFICATION_ALLOWED_ERR = 7;
+    const unsigned short NOT_FOUND_ERR = 8;
+    const unsigned short NOT_SUPPORTED_ERR = 9;
+    const unsigned short INUSE_ATTRIBUTE_ERR = 10;
+    const unsigned short INVALID_STATE_ERR = 11;
+    const unsigned short SYNTAX_ERR = 12;
+    const unsigned short INVALID_MODIFICATION_ERR = 13;
+    const unsigned short NAMESPACE_ERR = 14;
+    const unsigned short INVALID_ACCESS_ERR = 15;
+    const unsigned short VALIDATION_ERR = 16;
+    const unsigned short TYPE_MISMATCH_ERR = 17;
+    const unsigned short SECURITY_ERR = 18;
+    const unsigned short NETWORK_ERR = 19;
+    const unsigned short ABORT_ERR = 20;
+    const unsigned short URL_MISMATCH_ERR = 21;
+    const unsigned short QUOTA_EXCEEDED_ERR = 22;
+    const unsigned short TIMEOUT_ERR = 23;
+    const unsigned short INVALID_NODE_TYPE_ERR = 24;
+    const unsigned short DATA_CLONE_ERR = 25;
 };
-
index 34b1ef5..abddc54 100644 (file)
     GenerateIsReachable=ImplDocument,
     ImplementationLacksVTable,
 ] interface DOMImplementation {
-
-    // DOM Level 1
-
     // FIXME: Using "undefined" as default parameter value is wrong.
-    boolean hasFeature(optional DOMString feature = "undefined",
-        [TreatNullAs=EmptyString] optional DOMString version = "undefined");
-
-    // DOM Level 2
+    boolean hasFeature(optional DOMString feature = "undefined", [TreatNullAs=EmptyString] optional DOMString version = "undefined");
 
     [RaisesException, NewObject] DocumentType createDocumentType(DOMString qualifiedName, DOMString publicId, DOMString systemId);
 
 #endif
     createDocument(DOMString? namespaceURI, [TreatNullAs=EmptyString] DOMString qualifiedName, optional DocumentType? doctype = null);
 
-    // DOMImplementationCSS interface from DOM Level 2 CSS
-
     // FIXME: Using "undefined" as default parameter value is wrong.
     [RaisesException] CSSStyleSheet createCSSStyleSheet(optional DOMString title = "undefined", optional DOMString media = "undefined");
 
-    // HTMLDOMImplementation interface from DOM Level 2 HTML
-
     [NewObject] HTMLDocument createHTMLDocument(optional DOMString title);
-
 };
index 2cb6838..0660dec 100644 (file)
@@ -27,8 +27,6 @@
     JSCustomMarkFunction,
     JSGenerateToNativeObject,
 ] interface Document : Node {
-
-    // DOM Level 1 Core
     readonly attribute DocumentType? doctype;
     readonly attribute DOMImplementation implementation;
     readonly attribute Element? documentElement;
@@ -44,8 +42,6 @@
 
     HTMLCollection getElementsByTagName(DOMString tagname);
 
-    // Introduced in DOM Level 2:
-
     [NewObject, RaisesException] Node importNode(Node importedNode, optional boolean deep = false);
 
     [NewObject, RaisesException] Element createElementNS(DOMString? namespaceURI, DOMString qualifiedName);
@@ -53,8 +49,6 @@
 
     HTMLCollection getElementsByTagNameNS(DOMString? namespaceURI, DOMString localName);
 
-    // DOM Level 3 Core
-
     [ImplementedAs=characterSetWithUTF8Fallback] readonly attribute DOMString inputEncoding;
 
     readonly attribute DOMString? xmlEncoding;
     [ImplementedAs=urlForBindings] readonly attribute USVString documentURI;
 #endif
 
-    // DOM Level 2 Events (DocumentEvents interface)
-
     [RaisesException, NewObject] Event createEvent(DOMString eventType);
 
-    // DOM Level 2 Tranversal and Range (DocumentRange interface)
-
-    [NewObject] Range              createRange();
-
-    // DOM Level 2 Tranversal and Range (DocumentTraversal interface)
+    [NewObject] Range createRange();
 
 #if defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT
     NodeIterator createNodeIterator(Node root,
         optional NodeFilter? filter = null);
 #endif
 
-    // DOM Level 2 Abstract Views (DocumentView interface)
-
     readonly attribute DOMWindow defaultView;
 
-    // DOM Level 2 Style (DocumentStyle interface)
-
     readonly attribute StyleSheetList styleSheets;
 
-    // DOM Level 2 Style (DocumentCSS interface)
-
     // FIXME: Using "undefined" as default parameter value is wrong.
     CSSStyleDeclaration getOverrideStyle(optional Element? element = null, optional DOMString pseudoElement = "undefined");
 
     readonly attribute DOMString contentType;
 
-    // DOM Level 3 XPath (XPathEvaluator interface)
     // FIXME: Using "undefined" as default parameter value is wrong.
     [RaisesException] XPathExpression createExpression(optional DOMString expression = "undefined", optional XPathNSResolver? resolver);
     XPathNSResolver createNSResolver(Node? nodeResolver);
 
     // FIXME: Using "undefined" as default parameter value is wrong.
-    [RaisesException] XPathResult evaluate(optional DOMString expression = "undefined",
-                                                  optional Node? contextNode,
-                                                  optional XPathNSResolver? resolver,
-                                                  optional unsigned short type = 0,
-                                                  optional XPathResult? inResult);
+    [RaisesException] XPathResult evaluate(optional DOMString expression = "undefined", optional Node? contextNode, optional XPathNSResolver? resolver,
+        optional unsigned short type = 0, optional XPathResult? inResult);
 
-    // Common extensions
     // FIXME: The default value for the last parameter should be the empty string.
     boolean execCommand(DOMString command, optional boolean userInterface = false, optional DOMString? value = null);
 
     boolean queryCommandSupported(DOMString command);
     DOMString queryCommandValue(DOMString command);
 
-    // Moved down from HTMLDocument
-
     [SetterRaisesException] attribute DOMString title;
     attribute DOMString dir;
     attribute DOMString designMode;
 
     readonly attribute USVString referrer;
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [SetterRaisesException] attribute USVString domain;
 #else
     readonly attribute DOMString domain;
 
     NodeList getElementsByName([AtomicString] DOMString elementName);
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [PutForwards=href, Unforgeable] readonly attribute Location? location;
 #endif
 
-    // IE extensions
-
 #if defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT
     attribute DOMString charset;
 #else
 #endif
     readonly attribute DOMString readyState;
 
-    Element            elementFromPoint(optional long x = 0, optional long y = 0);
-    Range              caretRangeFromPoint(optional long x = 0, optional long y = 0);
+    Element elementFromPoint(optional long x = 0, optional long y = 0);
+    Range caretRangeFromPoint(optional long x = 0, optional long y = 0);
 
     // Mozilla extensions
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
-    DOMSelection       getSelection();
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
+    DOMSelection getSelection();
 #endif
     [ImplementedAs=characterSetWithUTF8Fallback] readonly attribute DOMString characterSet;
 
-    // WebKit extensions
-
     readonly attribute DOMString? preferredStylesheetSet;
     attribute DOMString? selectedStylesheetSet;
 
-#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
+#if defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT
     CSSStyleDeclaration createCSSStyleDeclaration();
 #endif
 
     CanvasRenderingContext getCSSCanvasContext(DOMString contextId, DOMString name, long width, long height);
 
-    // HTML 5
     HTMLCollection getElementsByClassName(DOMString classNames);
 
     readonly attribute Element? activeElement;
     [Conditional=POINTER_LOCK] void exitPointerLock();
     [Conditional=POINTER_LOCK] readonly attribute Element? pointerLockElement;
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [Conditional=CSS_REGIONS] DOMNamedFlowCollection webkitGetNamedFlows();
 
     readonly attribute FontFaceSet fonts;
 #if defined(ENABLE_IOS_TOUCH_EVENTS) && ENABLE_IOS_TOUCH_EVENTS
 #include <WebKitAdditions/DocumentIOS.idl>
 #elif defined(ENABLE_TOUCH_EVENTS) && ENABLE_TOUCH_EVENTS
-    [NewObject, RaisesException] Touch createTouch(optional DOMWindow? window = null,
-                                                   optional EventTarget? target = null,
-                                                   optional long identifier = 0,
-                                                   optional long pageX = 0,
-                                                   optional long pageY = 0,
-                                                   optional long screenX = 0,
-                                                   optional long screenY = 0,
-                                                   optional long webkitRadiusX = 0,
-                                                   optional long webkitRadiusY = 0,
-                                                   optional unrestricted float webkitRotationAngle = NaN,
-                                                   optional unrestricted float webkitForce = NaN);
+    [NewObject, RaisesException] Touch createTouch(optional DOMWindow? window = null, optional EventTarget? target = null,
+        optional long identifier = 0,
+        optional long pageX = 0, optional long pageY = 0, optional long screenX = 0, optional long screenY = 0,
+        optional long webkitRadiusX = 0, optional long webkitRadiusY = 0,
+        optional unrestricted float webkitRotationAngle = NaN, optional unrestricted float webkitForce = NaN);
     [NewObject, Custom] TouchList createTouchList(Touch... touches);
 #endif
 
     // http://dev.w3.org/csswg/cssom-view/#dom-document-scrollingelement
     readonly attribute Element? scrollingElement;
 
-
-    // Event Handlers
-
     // Unique to Element and Document
     // FIXME: Should these be exposed on Window as well (and therefore moved to GlobalEventHandlers.idl)?
     [NotEnumerable] attribute EventHandler onbeforecopy;
index 71c5769..e68745b 100644 (file)
     JSGenerateToNativeObject,
     JSGenerateToJSObject
 ] interface DocumentType : Node {
-
-    // DOM Level 1
-
     readonly attribute DOMString name;
 
-#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
+#if defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT
     [ImplementedAs=entitiesForBindings] readonly attribute NamedNodeMap entities;
     [ImplementedAs=notationsForBindings] readonly attribute NamedNodeMap notations;
     [ImplementedAs=internalSubsetForBindings] readonly attribute DOMString? internalSubset;
 #endif
 
-    // DOM Level 2
-
     readonly attribute DOMString publicId;
     readonly attribute DOMString systemId;
 };
 
 DocumentType implements ChildNode;
-
index a1ea211..71b6043 100644 (file)
@@ -24,9 +24,6 @@
     JSGenerateToNativeObject,
     ExportMacro=WEBCORE_EXPORT,
 ] interface Element : Node {
-
-    // DOM Level 1 Core
-
     readonly attribute DOMString? tagName;
 
     DOMString? getAttribute(DOMString name);
     readonly attribute NamedNodeMap attributes;
     boolean hasAttributes();
 
-    // DOM Level 2 Core
-
     DOMString? getAttributeNS(DOMString? namespaceURI, DOMString localName);
 
     [RaisesException, CEReactions] void setAttributeNS(DOMString? namespaceURI, DOMString qualifiedName, DOMString value);
-
     [CEReactions] void removeAttributeNS(DOMString? namespaceURI, DOMString localName);
 
     HTMLCollection getElementsByTagNameNS(DOMString? namespaceURI, DOMString localName);
 
     [ImplementedAs=cssomStyle] readonly attribute CSSStyleDeclaration style;
 
-    // DOM 4
     [Reflect] attribute DOMString id;
 
     readonly attribute DOMString? namespaceURI;
     readonly attribute DOMString? prefix;
     readonly attribute DOMString localName;
 
-    // Common extensions
-
     readonly attribute double offsetLeft;
     readonly attribute double offsetTop;
     readonly attribute double offsetWidth;
 
     sequence<DOMString> getAttributeNames();
 
-    // WebKit extensions
-
     void scrollIntoViewIfNeeded(optional boolean centerIfNeeded = true);
     void scrollByLines(optional long lines = 0);
     void scrollByPages(optional long pages = 0);
 
-    // HTML 5
     HTMLCollection getElementsByClassName(DOMString name);
     [TreatNullAs=EmptyString, SetterRaisesException] attribute DOMString innerHTML;
     [TreatNullAs=EmptyString, SetterRaisesException] attribute DOMString outerHTML;
 
-
     [Reflect=class] attribute DOMString className;
     [PutForwards=value] readonly attribute DOMTokenList classList;
 
     [RaisesException] Element closest(DOMString selectors);    
     [ImplementedAs=matches, RaisesException] boolean webkitMatchesSelector(DOMString selectors);
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     // CSSOM View Module API
     ClientRectList getClientRects();
     ClientRect getBoundingClientRect();
     [Conditional=CSS_REGIONS] readonly attribute DOMString webkitRegionOverset;
     [Conditional=CSS_REGIONS] sequence<Range> webkitGetRegionFlowRanges();
 
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     // Shadow DOM API
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
     [EnabledAtRuntime=ShadowDOM, RaisesException] ShadowRoot attachShadow(ShadowRootInit init);
     [EnabledAtRuntime=ShadowDOM, ImplementedAs=shadowRootForBindings, CallWith=ScriptState] readonly attribute ShadowRoot shadowRoot;
     [EnabledAtRuntime=ShadowDOM, Reflect] attribute DOMString slot;
index efa9711..ec0c607 100644 (file)
  * Boston, MA 02110-1301, USA.
  */
 
-// Introduced in DOM Level 2:
 [
-    CustomToJSObject,
     ConstructorTemplate=Event,
+    CustomToJSObject,
     Exposed=(Window,Worker),
 ] interface Event {
+    // PhaseType
+    const unsigned short NONE = 0;
+    const unsigned short CAPTURING_PHASE = 1;
+    const unsigned short AT_TARGET = 2;
+    const unsigned short BUBBLING_PHASE = 3;
 
-    // DOM PhaseType
-    const unsigned short NONE                = 0;
-    const unsigned short CAPTURING_PHASE     = 1;
-    const unsigned short AT_TARGET           = 2;
-    const unsigned short BUBBLING_PHASE      = 3;
-
-    // Reverse-engineered from Netscape
-    const unsigned short MOUSEDOWN           = 1;
-    const unsigned short MOUSEUP             = 2;
-    const unsigned short MOUSEOVER           = 4;
-    const unsigned short MOUSEOUT            = 8;
-    const unsigned short MOUSEMOVE           = 16;
-    const unsigned short MOUSEDRAG           = 32;
-    const unsigned short CLICK               = 64;
-    const unsigned short DBLCLICK            = 128;
-    const unsigned short KEYDOWN             = 256;
-    const unsigned short KEYUP               = 512;
-    const unsigned short KEYPRESS            = 1024;
-    const unsigned short DRAGDROP            = 2048;
-    const unsigned short FOCUS               = 4096;
-    const unsigned short BLUR                = 8192;
-    const unsigned short SELECT              = 16384;
-    const unsigned short CHANGE              = 32768;
+    const unsigned short MOUSEDOWN = 1;
+    const unsigned short MOUSEUP = 2;
+    const unsigned short MOUSEOVER = 4;
+    const unsigned short MOUSEOUT = 8;
+    const unsigned short MOUSEMOVE = 16;
+    const unsigned short MOUSEDRAG = 32;
+    const unsigned short CLICK = 64;
+    const unsigned short DBLCLICK = 128;
+    const unsigned short KEYDOWN = 256;
+    const unsigned short KEYUP = 512;
+    const unsigned short KEYPRESS = 1024;
+    const unsigned short DRAGDROP = 2048;
+    const unsigned short FOCUS = 4096;
+    const unsigned short BLUR = 8192;
+    const unsigned short SELECT = 16384;
+    const unsigned short CHANGE = 32768;
 
-    readonly attribute DOMString        type;
-    readonly attribute EventTarget      target;
-    readonly attribute EventTarget      currentTarget;
-    readonly attribute unsigned short   eventPhase;
+    readonly attribute DOMString type;
+    readonly attribute EventTarget target;
+    readonly attribute EventTarget currentTarget;
+    readonly attribute unsigned short eventPhase;
     [InitializedByEventConstructor] readonly attribute boolean bubbles;
     [InitializedByEventConstructor] readonly attribute boolean cancelable;
     [InitializedByEventConstructor, EnabledAtRuntime=ShadowDOM] readonly attribute boolean composed;
-    readonly attribute DOMTimeStamp     timeStamp;
+    readonly attribute DOMTimeStamp timeStamp;
 
     [EnabledAtRuntime=ShadowDOM] sequence<Node> composedPath();
 
-    void               stopPropagation();
-    void               preventDefault();
+    void stopPropagation();
+    void preventDefault();
 
     void initEvent(DOMString eventTypeArg, boolean canBubbleArg, boolean cancelableArg);
 
-    // DOM Level 3 Additions.
     readonly attribute boolean defaultPrevented;
     void stopImmediatePropagation();
 
     [Unforgeable] readonly attribute boolean isTrusted;
 
-    // IE Extensions
-    readonly attribute EventTarget      srcElement;
+    readonly attribute EventTarget srcElement;
     [ImplementedAs=legacyReturnValue] attribute boolean returnValue;
-             attribute boolean          cancelBubble;
+    attribute boolean cancelBubble;
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
-    [Custom] readonly attribute DataTransfer        clipboardData;
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
+    [Custom] readonly attribute DataTransfer clipboardData;
 #endif
-
 };
-
index cfd3a8d..72d1f3f 100644 (file)
@@ -18,7 +18,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-// Introduced in DOM Level 2:
 [
     NoInterfaceObject
 ] interface EventListener {
index 4c752ca..d013b0b 100644 (file)
  * Boston, MA 02110-1301, USA.
  */
 
-// Introduced in DOM Level 2:
 [
     CustomToJSObject,
     Exposed=(Window,Worker),
     JSCustomHeader,
     JSCustomToNativeObject,
 ] interface EventTarget {
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     // FIXME: Should be:
     // void addEventListener(DOMString type, EventListener? callback, optional (AddEventListenerOptions or boolean) options);
     // void removeEventListener(DOMString type, EventListener? callback, optional (EventListenerOptions or boolean) options);
index d94d096..e4383fa 100644 (file)
     ConstructorTemplate=Event,
 ] interface KeyboardEvent : UIEvent {
 
-#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
+#if defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT
     // KeyLocationCode
-    const unsigned long       KEY_LOCATION_STANDARD      = 0x00;
-    const unsigned long       KEY_LOCATION_LEFT          = 0x01;
-    const unsigned long       KEY_LOCATION_RIGHT         = 0x02;
-    const unsigned long       KEY_LOCATION_NUMPAD        = 0x03;
+    const unsigned long KEY_LOCATION_STANDARD = 0x00;
+    const unsigned long KEY_LOCATION_LEFT = 0x01;
+    const unsigned long KEY_LOCATION_RIGHT = 0x02;
+    const unsigned long KEY_LOCATION_NUMPAD = 0x03;
 #endif
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     const unsigned long DOM_KEY_LOCATION_STANDARD = 0x00;
-    const unsigned long DOM_KEY_LOCATION_LEFT     = 0x01;
-    const unsigned long DOM_KEY_LOCATION_RIGHT    = 0x02;
-    const unsigned long DOM_KEY_LOCATION_NUMPAD   = 0x03;
-    // FIXME: The following constants are defined in the specification but
-    // not yet supported.
-    // const unsigned long DOM_KEY_LOCATION_MOBILE   = 0x04;
-    // const unsigned long DOM_KEY_LOCATION_JOYSTICK = 0x05;
+    const unsigned long DOM_KEY_LOCATION_LEFT = 0x01;
+    const unsigned long DOM_KEY_LOCATION_RIGHT = 0x02;
+    const unsigned long DOM_KEY_LOCATION_NUMPAD = 0x03;
 #endif
 
-    [InitializedByEventConstructor] readonly attribute DOMString        keyIdentifier;
-    [InitializedByEventConstructor] readonly attribute unsigned long    location;
+    [InitializedByEventConstructor] readonly attribute DOMString keyIdentifier;
+    [InitializedByEventConstructor] readonly attribute unsigned long location;
     [InitializedByEventConstructor, ImplementedAs=location] readonly attribute unsigned long keyLocation; // Deprecated.
-    [InitializedByEventConstructor] readonly attribute boolean          ctrlKey;
-    [InitializedByEventConstructor] readonly attribute boolean          shiftKey;
-    [InitializedByEventConstructor] readonly attribute boolean          altKey;
-    [InitializedByEventConstructor] readonly attribute boolean          metaKey;
-    readonly attribute boolean          altGraphKey;
+    [InitializedByEventConstructor] readonly attribute boolean ctrlKey;
+    [InitializedByEventConstructor] readonly attribute boolean shiftKey;
+    [InitializedByEventConstructor] readonly attribute boolean altKey;
+    [InitializedByEventConstructor] readonly attribute boolean metaKey;
+    readonly attribute boolean altGraphKey;
 
-#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
+#if defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT
     boolean getModifierState(optional DOMString keyIdentifierArg);
 #endif
 
     // FIXME: this does not match the version in the DOM spec.
     // FIXME: Using "undefined" as default parameter value is wrong.
-    void initKeyboardEvent(optional DOMString type = "undefined",
-                           optional boolean canBubble = false,
-                           optional boolean cancelable = false,
-                           optional DOMWindow? view = null,
-                           optional DOMString keyIdentifier = "undefined",
-                           optional unsigned long location = 0,
-                           optional boolean ctrlKey = false,
-                           optional boolean altKey = false,
-                           optional boolean shiftKey = false,
-                           optional boolean metaKey = false,
-                           optional boolean altGraphKey = false);
-
-    // WebKit Extensions
-#if (!defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT) && (!defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT)
-    readonly attribute long             keyCode;
-    readonly attribute long             charCode;
-    
-    // FIXME: Using "undefined" as default parameter value is wrong.
-    void initKeyboardEvent(optional DOMString type = "undefined",
-                           optional boolean canBubble = false,
-                           optional boolean cancelable = false,
-                           optional DOMWindow? view = null,
-                           optional DOMString keyIdentifier = "undefined",
-                           optional unsigned long location = 0,
-                           optional boolean ctrlKey = false,
-                           optional boolean altKey = false,
-                           optional boolean shiftKey = false,
-                           optional boolean metaKey = false);
-#endif
+    void initKeyboardEvent(optional DOMString type = "undefined", optional boolean canBubble = false, optional boolean cancelable = false,
+        optional DOMWindow? view = null, optional DOMString keyIdentifier = "undefined", optional unsigned long location = 0,
+        optional boolean ctrlKey = false, optional boolean altKey = false, optional boolean shiftKey = false, optional boolean metaKey = false, optional boolean altGraphKey = false);
 };
-
index bfb8040..f15278a 100644 (file)
  */
 
 [
-    Exposed=(Window,Worker),
     ConstructorTemplate=Event,
+    Exposed=(Window,Worker),
 ] interface MessageEvent : Event {
     [InitializedByEventConstructor] readonly attribute USVString origin;
     [InitializedByEventConstructor] readonly attribute DOMString lastEventId;
     [InitializedByEventConstructor] readonly attribute EventTarget source; // May be a DOMWindow or a MessagePort.
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [InitializedByEventConstructor, CachedAttribute, CustomGetter] readonly attribute any data;
     [InitializedByEventConstructor] readonly attribute sequence<MessagePort> ports;
 
-    [Custom] void initMessageEvent(optional DOMString typeArg,
-                                   optional boolean canBubbleArg,
-                                   optional boolean cancelableArg,
-                                   optional any dataArg,
-                                   optional USVString originArg,
-                                   optional DOMString lastEventIdArg,
-                                   optional DOMWindow sourceArg,
-                                   optional Array messagePorts);
+    [Custom] void initMessageEvent(optional DOMString typeArg, optional boolean canBubbleArg, optional boolean cancelableArg,
+        optional any dataArg, optional USVString originArg, optional DOMString lastEventIdArg, optional DOMWindow sourceArg,
+        optional Array messagePorts);
 
-    [Custom] void webkitInitMessageEvent(optional DOMString typeArg,
-                                         optional boolean canBubbleArg,
-                                         optional boolean cancelableArg,
-                                         optional any dataArg,
-                                         optional USVString originArg,
-                                         optional DOMString lastEventIdArg,
-                                         optional DOMWindow sourceArg,
-                                         optional Array transferables);
+    [Custom] void webkitInitMessageEvent(optional DOMString typeArg, optional boolean canBubbleArg, optional boolean cancelableArg,
+        optional any dataArg, optional USVString originArg, optional DOMString lastEventIdArg, optional DOMWindow sourceArg,
+        optional Array transferables);
 #else
-    // Code generator for ObjC bindings does not support custom bindings, thus there is no good way to
-    // return a variant value. As workaround, expose the data attribute as SerializedScriptValue.
     readonly attribute SerializedScriptValue data;
-
-    // There's no good way to expose an array via the ObjC bindings, so for now just expose a single port.
     readonly attribute MessagePort messagePort;
-
-    void initMessageEvent(optional DOMString typeArg,
-                          optional boolean canBubbleArg,
-                          optional boolean cancelableArg,
-                          optional SerializedScriptValue? dataArg,
-                          optional DOMString originArg,
-                          optional DOMString lastEventIdArg,
-                          optional DOMWindow? sourceArg,
-                          optional MessagePort? messagePort);
+    void initMessageEvent(optional DOMString typeArg, optional boolean canBubbleArg, optional boolean cancelableArg,
+        optional SerializedScriptValue? dataArg, optional DOMString originArg, optional DOMString lastEventIdArg, optional DOMWindow? sourceArg,
+        optional MessagePort? messagePort);
 #endif
-
 };
-
index 7f9a496..cae8352 100644 (file)
  */
 
 [
+    ActiveDOMObject,
     Exposed=(Window,Worker),
-    JSCustomMarkFunction,
     GenerateIsReachable=Impl,
-    ActiveDOMObject,
+    JSCustomMarkFunction,
 ] interface MessagePort : EventTarget {
-// 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) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [Custom, RaisesException] void postMessage(any message, optional Array messagePorts);
 
     void start();
@@ -42,4 +40,3 @@
     attribute EventHandler onmessage;
 #endif
 };
-
index ea6265f..55fa726 100644 (file)
     ConstructorTemplate=Event,
     DoNotCheckConstants,
 ] interface MouseEvent : UIEvent {
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
-    [Conditional=MOUSE_FORCE_EVENTS] const double WEBKIT_FORCE_AT_MOUSE_DOWN        = 1;
-    [Conditional=MOUSE_FORCE_EVENTS] const double WEBKIT_FORCE_AT_FORCE_MOUSE_DOWN  = 2;
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
+    [Conditional=MOUSE_FORCE_EVENTS] const double WEBKIT_FORCE_AT_MOUSE_DOWN = 1;
+    [Conditional=MOUSE_FORCE_EVENTS] const double WEBKIT_FORCE_AT_FORCE_MOUSE_DOWN = 2;
 #endif
 
-    [InitializedByEventConstructor] readonly attribute long             screenX;
-    [InitializedByEventConstructor] readonly attribute long             screenY;
-    [InitializedByEventConstructor] readonly attribute long             clientX;
-    [InitializedByEventConstructor] readonly attribute long             clientY;
-    [InitializedByEventConstructor] readonly attribute boolean          ctrlKey;
-    [InitializedByEventConstructor] readonly attribute boolean          shiftKey;
-    [InitializedByEventConstructor] readonly attribute boolean          altKey;
-    [InitializedByEventConstructor] readonly attribute boolean          metaKey;
-    [InitializedByEventConstructor] readonly attribute unsigned short   button;
-    [InitializedByEventConstructor] readonly attribute EventTarget      relatedTarget;
-    [Conditional=POINTER_LOCK]      readonly attribute long             movementX;
-    [Conditional=POINTER_LOCK]      readonly attribute long             movementY;
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
-    [Conditional=MOUSE_FORCE_EVENTS, ImplementedAs=force]readonly attribute double  webkitForce;
+    [InitializedByEventConstructor] readonly attribute long screenX;
+    [InitializedByEventConstructor] readonly attribute long screenY;
+    [InitializedByEventConstructor] readonly attribute long clientX;
+    [InitializedByEventConstructor] readonly attribute long clientY;
+    [InitializedByEventConstructor] readonly attribute boolean ctrlKey;
+    [InitializedByEventConstructor] readonly attribute boolean shiftKey;
+    [InitializedByEventConstructor] readonly attribute boolean altKey;
+    [InitializedByEventConstructor] readonly attribute boolean metaKey;
+    [InitializedByEventConstructor] readonly attribute unsigned short button;
+    [InitializedByEventConstructor] readonly attribute EventTarget? relatedTarget;
+    [Conditional=POINTER_LOCK] readonly attribute long movementX;
+    [Conditional=POINTER_LOCK] readonly attribute long movementY;
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
+    [Conditional=MOUSE_FORCE_EVENTS, ImplementedAs=force]readonly attribute double webkitForce;
 #endif
-    
+
     // FIXME: Using "undefined" as default parameter value is wrong.
-    void initMouseEvent(optional DOMString type = "undefined",
-                                       optional boolean canBubble = false,
-                                       optional boolean cancelable = false,
-                                       optional DOMWindow? view = null,
-                                       optional long detail = 0,
-                                       optional long screenX = 0,
-                                       optional long screenY = 0,
-                                       optional long clientX = 0,
-                                       optional long clientY = 0,
-                                       optional boolean ctrlKey = false,
-                                       optional boolean altKey = false,
-                                       optional boolean shiftKey = false,
-                                       optional boolean metaKey = false,
-                                       optional unsigned short button = 0,
-                                       optional EventTarget? relatedTarget = null);
+    void initMouseEvent(optional DOMString type = "undefined", optional boolean canBubble = false,  optional boolean cancelable = false,
+        optional DOMWindow? view = null, optional long detail = 0,
+        optional long screenX = 0, optional long screenY = 0, optional long clientX = 0, optional long clientY = 0,
+        optional boolean ctrlKey = false, optional boolean altKey = false, optional boolean shiftKey = false, optional boolean metaKey = false,
+        optional unsigned short button = 0, optional EventTarget? relatedTarget = null);
 
-    // extensions
-    readonly attribute long             offsetX;
-    readonly attribute long             offsetY;
-    readonly attribute long             x;
-    readonly attribute long             y;
-    readonly attribute Node             fromElement;
-    readonly attribute Node             toElement;
+    readonly attribute long offsetX;
+    readonly attribute long offsetY;
+    readonly attribute long x;
+    readonly attribute long y;
+    readonly attribute Node? fromElement;
+    readonly attribute Node? toElement;
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
-    readonly attribute DataTransfer     dataTransfer;
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
+    readonly attribute DataTransfer dataTransfer;
 #endif
 };
-
index 4ddc7b9..448c1ab 100644 (file)
  * Boston, MA 02110-1301, USA.
  */
 
-// Introduced in DOM Level 2:
 interface MutationEvent : Event {
-
     // attrChangeType
     const unsigned short MODIFICATION = 1;
-    const unsigned short ADDITION     = 2;
-    const unsigned short REMOVAL      = 3;
+    const unsigned short ADDITION = 2;
+    const unsigned short REMOVAL = 3;
 
-    readonly attribute Node           relatedNode;
-    readonly attribute DOMString      prevValue;
-    readonly attribute DOMString      newValue;
-    readonly attribute DOMString      attrName;
+    readonly attribute Node? relatedNode;
+    readonly attribute DOMString prevValue;
+    readonly attribute DOMString newValue;
+    readonly attribute DOMString attrName;
     readonly attribute unsigned short attrChange;
 
     // FIXME: Using "undefined" as default parameter value is wrong.
-    void initMutationEvent(optional DOMString type = "undefined",
-                                          optional boolean canBubble = false,
-                                          optional boolean cancelable = false,
-                                          optional Node? relatedNode = null,
-                                          optional DOMString prevValue = "undefined",
-                                          optional DOMString newValue = "undefined",
-                                          optional DOMString attrName = "undefined",
-                                          optional unsigned short attrChange = 0);
-
+    void initMutationEvent(optional DOMString type = "undefined", optional boolean canBubble = false, optional boolean cancelable = false,
+        optional Node? relatedNode = null, optional DOMString prevValue = "undefined", optional DOMString newValue = "undefined",
+        optional DOMString attrName = "undefined", optional unsigned short attrChange = 0);
 };
-
index f3b3fac..236a251 100644 (file)
@@ -24,7 +24,7 @@
 ] interface NamedNodeMap {
     readonly attribute unsigned long length;
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     getter Attr? getNamedItem(DOMString name);
     [RaisesException] Attr? setNamedItem(Attr attr);
     [RaisesException] Attr removeNamedItem(DOMString name);
index 0bf36a6..7c925e3 100644 (file)
 ] interface Node : EventTarget
  {
     // NodeType
-    const unsigned short      ELEMENT_NODE                   = 1;
-    const unsigned short      ATTRIBUTE_NODE                 = 2;
-    const unsigned short      TEXT_NODE                      = 3;
-    const unsigned short      CDATA_SECTION_NODE             = 4;
-    const unsigned short      ENTITY_REFERENCE_NODE          = 5;
-    const unsigned short      ENTITY_NODE                    = 6;
-    const unsigned short      PROCESSING_INSTRUCTION_NODE    = 7;
-    const unsigned short      COMMENT_NODE                   = 8;
-    const unsigned short      DOCUMENT_NODE                  = 9;
-    const unsigned short      DOCUMENT_TYPE_NODE             = 10;
-    const unsigned short      DOCUMENT_FRAGMENT_NODE         = 11;
-    const unsigned short      NOTATION_NODE                  = 12;
+    const unsigned short ELEMENT_NODE = 1;
+    const unsigned short ATTRIBUTE_NODE = 2;
+    const unsigned short TEXT_NODE = 3;
+    const unsigned short CDATA_SECTION_NODE = 4;
+    const unsigned short ENTITY_REFERENCE_NODE = 5;
+    const unsigned short ENTITY_NODE = 6;
+    const unsigned short PROCESSING_INSTRUCTION_NODE = 7;
+    const unsigned short COMMENT_NODE = 8;
+    const unsigned short DOCUMENT_NODE = 9;
+    const unsigned short DOCUMENT_TYPE_NODE = 10;
+    const unsigned short DOCUMENT_FRAGMENT_NODE = 11;
+    const unsigned short NOTATION_NODE = 12;
 
     readonly attribute DOMString nodeName;
 
     // FIXME: the spec says this can also raise on retrieval.
     [SetterRaisesException] attribute DOMString? nodeValue;
 
-    readonly attribute unsigned short   nodeType;
-    readonly attribute Node             parentNode;
-    readonly attribute NodeList         childNodes;
-    readonly attribute Node             firstChild;
-    readonly attribute Node             lastChild;
-    readonly attribute Node             previousSibling;
-    readonly attribute Node             nextSibling;
-    readonly attribute Document         ownerDocument;
+    readonly attribute unsigned short nodeType;
+    readonly attribute Node? parentNode;
+    readonly attribute NodeList childNodes;
+    readonly attribute Node? firstChild;
+    readonly attribute Node? lastChild;
+    readonly attribute Node? previousSibling;
+    readonly attribute Node? nextSibling;
+    readonly attribute Document? ownerDocument;
 
     [Custom, RaisesException] Node insertBefore([CustomReturn] Node newChild, Node? refChild);
     [Custom, RaisesException] Node replaceChild(Node newChild, [CustomReturn] Node oldChild);
     [Custom, RaisesException, CEReactions] Node removeChild([CustomReturn] Node oldChild);
     [Custom, RaisesException, CEReactions] Node appendChild([CustomReturn] Node newChild);
 
-    boolean            hasChildNodes();
+    boolean hasChildNodes();
 
     [NewObject, RaisesException, ImplementedAs=cloneNodeForBindings, CEReactions] Node cloneNode(optional boolean deep = false);
 
-    void               normalize();
+    void normalize();
 
-    // Introduced in DOM Level 2:
-
-#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
+#if defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT
     [ImplementedAs=isSupportedForBindings] boolean isSupported(optional DOMString feature, optional DOMString version);
 #endif
 
-    // Introduced in DOM Level 3:
-
     readonly attribute USVString baseURI;
 
     // FIXME: the spec says this can also raise on retrieval.
     boolean isDefaultNamespace(DOMString? namespaceURI);
 
     // DocumentPosition
-    const unsigned short      DOCUMENT_POSITION_DISCONNECTED = 0x01;
-    const unsigned short      DOCUMENT_POSITION_PRECEDING    = 0x02;
-    const unsigned short      DOCUMENT_POSITION_FOLLOWING    = 0x04;
-    const unsigned short      DOCUMENT_POSITION_CONTAINS     = 0x08;
-    const unsigned short      DOCUMENT_POSITION_CONTAINED_BY = 0x10;
-    const unsigned short      DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC = 0x20;
+    const unsigned short DOCUMENT_POSITION_DISCONNECTED = 0x01;
+    const unsigned short DOCUMENT_POSITION_PRECEDING = 0x02;
+    const unsigned short DOCUMENT_POSITION_FOLLOWING = 0x04;
+    const unsigned short DOCUMENT_POSITION_CONTAINS = 0x08;
+    const unsigned short DOCUMENT_POSITION_CONTAINED_BY = 0x10;
+    const unsigned short DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC = 0x20;
 
     unsigned short compareDocumentPosition(Node other);
 
-    // Introduced in DOM4
     boolean contains(Node? other);
 
     [EnabledAtRuntime=ShadowDOM, ImplementedAs=inDocument] readonly attribute boolean isConnected;
 
-    // IE extensions
-    readonly attribute Element          parentElement;
+    readonly attribute Element parentElement;
 };
-
index 1481ff4..7330b3b 100644 (file)
@@ -18,7 +18,6 @@
  * Boston, MA 02110-1301, USA.
  */
 
-// Introduced in DOM Level 2:
 [
     IsWeakCallback,
 ] callback interface NodeFilter {
     const unsigned short FILTER_SKIP = 3;
 
     // Constants for whatToShow
-    const unsigned long       SHOW_ALL                       = 0xFFFFFFFF;
-    const unsigned long       SHOW_ELEMENT                   = 0x00000001;
-    const unsigned long       SHOW_ATTRIBUTE                 = 0x00000002;
-    const unsigned long       SHOW_TEXT                      = 0x00000004;
-    const unsigned long       SHOW_CDATA_SECTION             = 0x00000008;
-    const unsigned long       SHOW_ENTITY_REFERENCE          = 0x00000010;
-    const unsigned long       SHOW_ENTITY                    = 0x00000020;
-    const unsigned long       SHOW_PROCESSING_INSTRUCTION    = 0x00000040;
-    const unsigned long       SHOW_COMMENT                   = 0x00000080;
-    const unsigned long       SHOW_DOCUMENT                  = 0x00000100;
-    const unsigned long       SHOW_DOCUMENT_TYPE             = 0x00000200;
-    const unsigned long       SHOW_DOCUMENT_FRAGMENT         = 0x00000400;
-    const unsigned long       SHOW_NOTATION                  = 0x00000800;
+    const unsigned long SHOW_ALL = 0xFFFFFFFF;
+    const unsigned long SHOW_ELEMENT = 0x00000001;
+    const unsigned long SHOW_ATTRIBUTE = 0x00000002;
+    const unsigned long SHOW_TEXT = 0x00000004;
+    const unsigned long SHOW_CDATA_SECTION = 0x00000008;
+    const unsigned long SHOW_ENTITY_REFERENCE = 0x00000010;
+    const unsigned long SHOW_ENTITY = 0x00000020;
+    const unsigned long SHOW_PROCESSING_INSTRUCTION = 0x00000040;
+    const unsigned long SHOW_COMMENT = 0x00000080;
+    const unsigned long SHOW_DOCUMENT = 0x00000100;
+    const unsigned long SHOW_DOCUMENT_TYPE = 0x00000200;
+    const unsigned long SHOW_DOCUMENT_FRAGMENT = 0x00000400;
+    const unsigned long SHOW_NOTATION = 0x00000800;
 
     [Custom] unsigned short acceptNode(optional Node node);
 };
-
index 8c52d96..696249c 100644 (file)
@@ -33,7 +33,7 @@
     readonly attribute boolean collapsed;
     readonly attribute Node commonAncestorContainer;
 
-#if defined(LANGUAGE_JAVASCRIPT) || LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [RaisesException] void setStart(Node refNode, unsigned long offset);
     [RaisesException] void setEnd(Node refNode, unsigned long offset);
 #else
@@ -51,9 +51,9 @@
 
     // CompareHow
     const unsigned short START_TO_START = 0;
-    const unsigned short START_TO_END   = 1;
-    const unsigned short END_TO_END     = 2;
-    const unsigned short END_TO_START   = 3;
+    const unsigned short START_TO_END = 1;
+    const unsigned short END_TO_END = 2;
+    const unsigned short END_TO_START = 3;
 
     [RaisesException, ImplementedAs=compareBoundaryPointsForBindings] short compareBoundaryPoints(unsigned short how, Range sourceRange);
 
 
     void detach();
 
-#if defined(LANGUAGE_JAVASCRIPT) || LANGUAGE_JAVASCRIPT
-    // CSSOM View Module API extensions
-
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     ClientRectList getClientRects();
     ClientRect getBoundingClientRect();
 #endif
 
-    // extensions
-
     [RaisesException, NewObject] DocumentFragment createContextualFragment(DOMString html);
 
-    // WebKit extensions
-
     [RaisesException] short compareNode(Node refNode);
 
     // CompareResults
-    const unsigned short NODE_BEFORE           = 0;
-    const unsigned short NODE_AFTER            = 1;
+    const unsigned short NODE_BEFORE = 0;
+    const unsigned short NODE_AFTER = 1;
     const unsigned short NODE_BEFORE_AND_AFTER = 2;
-    const unsigned short NODE_INSIDE           = 3;
+    const unsigned short NODE_INSIDE = 3;
 
     [RaisesException] boolean intersectsNode(Node refNode);
 
-#if defined(LANGUAGE_JAVASCRIPT) || LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [RaisesException] short comparePoint(Node refNode, unsigned long offset);
     [RaisesException] boolean isPointInRange(Node refNode, unsigned long offset);
 #else
     // FIXME: Using "undefined" as default parameter value is wrong.
     [RaisesException] void expand(optional DOMString unit = "undefined");
 
-#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
+#if defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT
     readonly attribute DOMString text;
 #endif
 };
-
index 1c79352..2aa2c79 100644 (file)
@@ -28,7 +28,7 @@
     NoInterfaceObject,
     EnabledAtRuntime=ShadowDOM,
 ] interface Slotable {
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [ImplementedAs=assignedSlotForBindings] readonly attribute HTMLSlotElement? assignedSlot;
 #endif
 };
index eaa66e6..fad04a2 100644 (file)
     [InitializedByEventConstructor] readonly attribute long detail;
     
     // FIXME: Using "undefined" as default parameter value is wrong.
-    void initUIEvent(optional DOMString type = "undefined",
-                                    optional boolean canBubble = false,
-                                    optional boolean cancelable = false,
-                                    optional DOMWindow? view = null,
-                                    optional long detail = 0);
+    void initUIEvent(optional DOMString type = "undefined", optional boolean canBubble = false, optional boolean cancelable = false, optional DOMWindow? view = null, optional long detail = 0);
 
-    // extensions
-    readonly attribute long                 keyCode;
-    readonly attribute long                 charCode;
-    readonly attribute long                 layerX;
-    readonly attribute long                 layerY;
-    readonly attribute long                 pageX;
-    readonly attribute long                 pageY;
-    readonly attribute long                 which;
+    readonly attribute long keyCode;
+    readonly attribute long charCode;
+    readonly attribute long layerX;
+    readonly attribute long layerY;
+    readonly attribute long pageX;
+    readonly attribute long pageY;
+    readonly attribute long which;
 };
-
index 6e18f90..653ee4f 100644 (file)
  * Boston, MA 02110-1301, USA.
  */
 
-// Introduced in DOM Level 3:
 [
     ConstructorConditional=DOM4_EVENTS_CONSTRUCTOR,
     ConstructorTemplate=Event,
 ] interface WheelEvent : MouseEvent {
     // DeltaModeCode
-    const unsigned long              DOM_DELTA_PIXEL = 0x00;
-    const unsigned long              DOM_DELTA_LINE  = 0x01;
-    const unsigned long              DOM_DELTA_PAGE  = 0x02;
+    const unsigned long DOM_DELTA_PIXEL = 0x00;
+    const unsigned long DOM_DELTA_LINE = 0x01;
+    const unsigned long DOM_DELTA_PAGE = 0x02;
 
     [InitializedByEventConstructor] readonly attribute unrestricted double deltaX;
     [InitializedByEventConstructor] readonly attribute unrestricted double deltaY;
     [InitializedByEventConstructor] readonly attribute long wheelDeltaY;
     readonly attribute long wheelDelta;
 
-    // WebKit Extension
     readonly attribute boolean webkitDirectionInvertedFromDevice;
 
-#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
-    void initWheelEvent(optional long wheelDeltaX,
-                        optional long wheelDeltaY,
-                        optional DOMWindow? view,
-                        optional long screenX,
-                        optional long screenY,
-                        optional long clientX,
-                        optional long clientY,
-                        optional boolean ctrlKey,
-                        optional boolean altKey,
-                        optional boolean shiftKey,
-                        optional boolean metaKey);
-#endif /* !defined(LANGUAGE_JAVASCRIPT) */
-
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
-    void initWebKitWheelEvent(optional long wheelDeltaX = 0,
-                              optional long wheelDeltaY = 0,
-                              optional DOMWindow? view = null,
-                              optional long screenX = 0,
-                              optional long screenY = 0,
-                              optional long clientX = 0,
-                              optional long clientY = 0,
-                              optional boolean ctrlKey = false,
-                              optional boolean altKey = false,
-                              optional boolean shiftKey = false,
-                              optional boolean metaKey = false);
-#endif /* defined(LANGUAGE_JAVASCRIPT) */
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
+    void initWebKitWheelEvent(optional long wheelDeltaX = 0, optional long wheelDeltaY = 0, optional DOMWindow? view = null,
+        optional long screenX = 0, optional long screenY = 0, optional long clientX = 0, optional long clientY = 0,
+        optional boolean ctrlKey = false, optional boolean altKey = false,
+        optional boolean shiftKey = false, optional boolean metaKey = false);
+#else
+    void initWheelEvent(optional long wheelDeltaX = 0, optional long wheelDeltaY = 0, optional DOMWindow? view = null,
+        optional long screenX = 0, optional long screenY = 0, optional long clientX = 0, optional long clientY = 0,
+        optional boolean ctrlKey = false, optional boolean altKey = false,
+        optional boolean shiftKey = false, optional boolean metaKey = false);
+#endif
 };
index 77a5a36..2e16dc3 100644 (file)
  */
 
 [
-    NoInterfaceObject,
     DoNotCheckConstants,
     ImplementationLacksVTable,
+    NoInterfaceObject,
 ] exception FileException {
+    readonly attribute unsigned short code;
+    readonly attribute DOMString name;
+    readonly attribute DOMString message;
 
-    readonly attribute unsigned short   code;
-    readonly attribute DOMString        name;
-    readonly attribute DOMString        message;
-
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
-    // Override in a Mozilla compatible format
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [NotEnumerable] DOMString toString();
 #endif
 
index b349f6e..84f9c53 100644 (file)
@@ -39,8 +39,7 @@
 
     attribute DOMString value;
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     DOMString toString();
 #endif
 };
-
index 2a1d72a..b61003e 100644 (file)
@@ -25,8 +25,7 @@ interface HTMLAnchorElement : HTMLElement {
     [Reflect] attribute DOMString hreflang;
     [Reflect] attribute DOMString name;
 
-    // FIXME: This is supposed to be:
-    // [PutForwards=value] readonly attribute DOMTokenList ping;
+    // FIXME: This is supposed to be: [PutForwards=value] readonly attribute DOMTokenList ping;
     [Reflect] attribute USVString ping;
 
     [Reflect] attribute DOMString rel;
@@ -35,9 +34,9 @@ interface HTMLAnchorElement : HTMLElement {
     [Reflect] attribute DOMString target;
     [Reflect] attribute DOMString type;
 
-    [SetterRaisesException]  attribute DOMString text;
+    [SetterRaisesException] attribute DOMString text;
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [NotEnumerable] DOMString toString();
 #endif
 
index 10da719..b289c59 100644 (file)
@@ -19,9 +19,9 @@
  */
 
 [
+    CustomCall,
     CustomNamedSetter,
     JSCustomGetOwnPropertySlotAndDescriptor,
-    CustomCall
 ] interface HTMLAppletElement : HTMLElement {
     [Reflect] attribute DOMString align;
     [Reflect] attribute DOMString alt;
     [Reflect] attribute DOMString code;
     [Reflect] attribute USVString codeBase;
     [Reflect] attribute DOMString height;
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [Reflect] attribute DOMString hspace;
 #else
     [Reflect] attribute long hspace;
 #endif
     [Reflect] attribute DOMString name;
     [Reflect] attribute USVString object;
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [Reflect] attribute DOMString vspace;
 #else
     [Reflect] attribute long vspace;
 #endif
     [Reflect] attribute DOMString width;
 };
-
index 029fe05..7e97919 100644 (file)
@@ -33,4 +33,3 @@
     getter Element? namedItem(DOMString name);
 #endif
 };
-
index 1c7f0ea..d00f5b2 100644 (file)
     [Custom] void write(optional DOMString text);
     [Custom] void writeln(optional DOMString text);
 
-    // Extensions
-
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
-    // FIXME: This should eventually be available (if they are wanted) for all languages.
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [Custom, Replaceable, Deletable] readonly attribute HTMLAllCollection all;
 #endif
 
@@ -42,7 +39,7 @@
     void captureEvents();
     void releaseEvents();
 
-#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
+#if defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT
     readonly attribute long width;
     readonly attribute long height;
     attribute DOMString dir;
@@ -55,4 +52,3 @@
     [TreatNullAs=EmptyString] attribute DOMString linkColor;
     [TreatNullAs=EmptyString] attribute DOMString vlinkColor;
 };
-
index 3bdf4b5..024ec47 100644 (file)
@@ -51,7 +51,7 @@
 
     void click();
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     void focus();
     void blur();
 
index 612a721..5026c2a 100644 (file)
@@ -24,7 +24,7 @@
     CustomCall,
 ] interface HTMLEmbedElement : HTMLElement {
 [Reflect] attribute DOMString align;
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
 [Reflect] attribute DOMString height;
 #else
 [Reflect] attribute long height;
@@ -32,7 +32,7 @@
 [Reflect] attribute DOMString name;
 [Reflect, URL] attribute USVString src;
 [Reflect] attribute DOMString type;
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
 [Reflect] attribute DOMString width;
 #else
 [Reflect] attribute long width;
index ed50c82..59949f7 100644 (file)
@@ -47,7 +47,7 @@
 
     [Conditional=IOS_AUTOCORRECT_AND_AUTOCAPITALIZE, TreatNullAs=EmptyString] attribute DOMString autocapitalize;
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [ImplementedAs=submitFromJavaScript] void submit();
 #else
     void submit();
index b7eda91..48b025a 100644 (file)
@@ -58,7 +58,7 @@
     attribute DOMString type; // readonly dropped as part of DOM level 2
     attribute DOMString defaultValue;
     // See the discussion in https://bugs.webkit.org/show_bug.cgi?id=100085
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [TreatNullAs=EmptyString, SetterRaisesException] attribute DOMString value;
 #else
     attribute DOMString value;
     [Custom] attribute DOMString selectionDirection;
 
     [RaisesException] void setRangeText(DOMString replacement);
-    [RaisesException] void setRangeText(DOMString replacement,
-                        unsigned long start,
-                        unsigned long end,
-                        optional DOMString selectionMode);
+    [RaisesException] void setRangeText(DOMString replacement, unsigned long start, unsigned long end, optional DOMString selectionMode);
 
     [Custom] void setSelectionRange(long start, long end, optional DOMString direction);
 
@@ -96,7 +93,7 @@
     [Reflect] attribute DOMString useMap;
     [Reflect] attribute boolean incremental;
 
-#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
+#if defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT
     void setValueForUser(DOMString value);
 #endif
 
index 3217f35..4f02861 100644 (file)
@@ -95,7 +95,7 @@
     [Conditional=MEDIA_STATISTICS] readonly attribute unsigned long webkitAudioDecodedByteCount;
     [Conditional=MEDIA_STATISTICS] readonly attribute unsigned long webkitVideoDecodedByteCount;
 
-#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [Conditional=ENCRYPTED_MEDIA, RaisesException] void webkitGenerateKeyRequest(DOMString? keySystem, optional Uint8Array? initData = null);
     [Conditional=ENCRYPTED_MEDIA, RaisesException] void webkitAddKey(DOMString? keySystem, Uint8Array key, optional Uint8Array? initData = null, optional DOMString sessionId);
     [Conditional=ENCRYPTED_MEDIA, RaisesException] void webkitCancelKeyRequest(DOMString? keySystem, optional DOMString sessionId);
 
     [CustomSetter] attribute MediaController controller;
 
-#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [Conditional=MEDIA_SOURCE] VideoPlaybackQuality getVideoPlaybackQuality();
 #endif
 
index b114298..99fc75a 100644 (file)
@@ -19,9 +19,9 @@
  */
 
 [
+    ConstructorRaisesException,
     JSGenerateToNativeObject,
     NamedConstructor=Option(optional DOMString data, optional DOMString value, optional boolean defaultSelected = false, optional boolean selected = false),
-    ConstructorRaisesException
 ] interface HTMLOptionElement : HTMLElement {
     [Reflect] attribute boolean disabled;
     readonly attribute HTMLFormElement form;
@@ -30,7 +30,7 @@
     attribute boolean selected;
     attribute DOMString value;
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [SetterRaisesException] attribute DOMString text;
 #else
     readonly attribute DOMString text;
index 1314e66..60ddd9f 100644 (file)
@@ -33,7 +33,7 @@
     getter HTMLOptionElement? namedItem(DOMString name);
 #endif
 
-#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     // FIXME: Should be:
     // void add((HTMLOptionElement or HTMLOptGroupElement) element, optional (HTMLElement or long)? before = null);
     [RaisesException] void add(HTMLElement element, optional HTMLElement? before = null);
@@ -43,7 +43,7 @@
 #endif
 
     void remove(long index);
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     // FIXME: This overload is not in the specification and has been dropped in Blink.
     void remove(HTMLOptionElement option);
 #endif
index 8d27b18..97cd801 100644 (file)
@@ -50,7 +50,7 @@
 #endif
 
     [RaisesException] void add(HTMLElement element, optional HTMLElement? before = null);
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     // FIXME: Should be:
     // void add((HTMLOptionElement or HTMLOptGroupElement) element, optional (HTMLElement or long)? before = null);
     [RaisesException] void add(HTMLElement element, long index);
@@ -61,7 +61,6 @@
 #endif
     [ImplementedAs=removeByIndex] void remove(long index);
 
-
     readonly attribute HTMLCollection selectedOptions;
     attribute long selectedIndex;
 
index 3684b3b..f79affa 100644 (file)
@@ -22,7 +22,7 @@ interface HTMLTableColElement : HTMLElement {
     [Reflect] attribute DOMString align;
     [Reflect=char] attribute DOMString ch;
     [Reflect=charoff] attribute DOMString chOff;
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     attribute unsigned long span;
 #else
     attribute long span;
@@ -30,4 +30,3 @@ interface HTMLTableColElement : HTMLElement {
     [Reflect] attribute DOMString vAlign;
     [Reflect] attribute DOMString width;
 };
-
index 7b5f6b9..fe1a92d 100644 (file)
@@ -53,7 +53,7 @@
     [Conditional=MEDIA_STATISTICS] readonly attribute unsigned long webkitDroppedFrameCount;
 
     // Work around shortcomings in the gobject binding generator handling of conditional features by turning these off for gobject.
-#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [Conditional=VIDEO_PRESENTATION_MODE] boolean webkitSupportsPresentationMode(VideoPresentationMode mode);
     [Conditional=VIDEO_PRESENTATION_MODE] readonly attribute VideoPresentationMode webkitPresentationMode;
     [Conditional=VIDEO_PRESENTATION_MODE] void webkitSetPresentationMode(VideoPresentationMode mode);
index e754b4d..2150127 100644 (file)
  */
 
 [
-    Exposed=(Window,Worker),
-    CustomToJSObject,
     Constructor(Uint8ClampedArray data, unsigned long sw, optional unsigned long sh = 0),
     Constructor(unsigned long sw, unsigned long sh),
     ConstructorRaisesException,
-    ImplementationLacksVTable
+    CustomToJSObject,
+    Exposed=(Window,Worker),
+    ImplementationLacksVTable,
 ] interface ImageData {
     readonly attribute long width;
     readonly attribute long height;
-#if !defined(LANGUAGE_JAVASCRIPT) || !LANGUAGE_JAVASCRIPT
+#if defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT
     readonly attribute Uint8ClampedArray data;
 #endif
 };
-
index 8a20d11..2708bcd 100644 (file)
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-[NoInterfaceObject]
-interface URLUtils {
+[NoInterfaceObject] interface URLUtils {
     [SetterRaisesException, URL] attribute USVString href;
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [NotEnumerable] DOMString toString();
 #endif
 
index bc16b3a..b78036a 100644 (file)
@@ -49,7 +49,8 @@ enum TextTrackKind { "subtitles", "captions", "descriptions", "chapters", "metad
 
     attribute EventHandler oncuechange;
 
-#if !defined(LANGUAGE_GOBJECT) || !LANGUAGE_GOBJECT // Work around shortcomings in the gobject binding generator handling of conditional features by turning these off for gobject.
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
+    // Work around shortcomings in the gobject binding generator handling of conditional features by turning these off for gobject.
     readonly attribute VTTRegionList regions;
     // FIXME: region parameter should not be nullable in addRegion and removeRegion.
     void addRegion(VTTRegion? region);
index e1704c6..799b7d5 100644 (file)
@@ -54,7 +54,7 @@
     void removeAllRanges();
     void addRange(Range range);
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [NotEnumerable] DOMString toString();
 #endif
 
index 83c8d69..4678405 100644 (file)
  */
 
 [
-    ImplicitThis,
     CheckSecurity,
-    JSCustomDefineOwnProperty,
     CustomDeleteProperty,
-    CustomGetOwnPropertySlot,
     CustomEnumerateProperty,
+    CustomGetOwnPropertySlot,
     CustomProxyToJSObject,
+    CustomPutFunction,
+    ExportMacro=WEBCORE_EXPORT,
+    ImplicitThis,
+    InterfaceName=Window,
+    JSCustomDefineOwnProperty,
     JSCustomMarkFunction,
     JSCustomToNativeObject,
-    CustomPutFunction,
     JSLegacyParent=JSDOMWindowBase,
-    InterfaceName=Window,
-    ExportMacro=WEBCORE_EXPORT,
 ] interface DOMWindow : EventTarget {
     // DOM Level 0
     [Replaceable] readonly attribute Screen screen;
 
     [Custom] DOMWindow open(optional USVString url = "about:blank", optional DOMString target = "_blank", [TreatNullAs=EmptyString] optional DOMString features = "");
 
-    [Custom] any showModalDialog(DOMString url,
-                                       optional any dialogArgs,
-                                       optional DOMString featureArgs);
+    [Custom] any showModalDialog(DOMString url, optional any dialogArgs, optional DOMString featureArgs);
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     void alert();
 #endif
     void alert(DOMString message);
     void scrollTo(unrestricted double x, unrestricted double y);
     [ImplementedAs=scrollTo] void scroll(unrestricted double x, unrestricted double y);
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     void scrollBy(optional ScrollToOptions option);
     void scrollTo(optional ScrollToOptions options);
     [ImplementedAs=scrollTo] void scroll(optional ScrollToOptions options);
 
     attribute DOMString status;
     attribute DOMString defaultStatus;
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     // This attribute is an alias of defaultStatus and is necessary for legacy uses.
     [ImplementedAs=defaultStatus] attribute DOMString defaultstatus;
 #endif
     [NewObject] CSSStyleDeclaration getComputedStyle(Element element, optional DOMString? pseudoElement = null);
 
     // WebKit extensions
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     CSSRuleList getMatchedCSSRules(optional Element? element = null, optional DOMString? pseudoElement = null);
 #endif
 
     [Conditional=ORIENTATION_EVENTS] readonly attribute long orientation;
 
     // cross-document messaging
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [DoNotCheckSecurity, Custom, RaisesException, ForwardDeclareInHeader] void postMessage(SerializedScriptValue message, USVString targetOrigin, optional Array messagePorts);
 #else
-    // There's no good way to expose an array via the ObjC bindings, so for now just allow passing in a single port.
     [DoNotCheckSecurity, Custom, RaisesException, ForwardDeclareInHeader] void postMessage(SerializedScriptValue message, optional MessagePort messagePort, DOMString targetOrigin);
 #endif
 
     void captureEvents(/*in long eventFlags*/);
     void releaseEvents(/*in long eventFlags*/);
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
-    // Additional constructors.
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [CustomGetter, CustomConstructor] attribute HTMLImageElementNamedConstructor Image; // Usable with new operator
     attribute XMLDocumentConstructor SVGDocument;
 
     attribute DOMURLConstructor webkitURL; // FIXME: deprecate this.
     attribute MutationObserverConstructor WebKitMutationObserver; // FIXME: Add metrics to determine when we can remove this.
-#endif // defined(LANGUAGE_JAVASCRIPT)
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
     [Conditional=CUSTOM_ELEMENTS, ImplementedAs=ensureCustomElementsRegistry] readonly attribute CustomElementsRegistry customElements;
 #endif
 
-
     // Event Handlers
 
     // Unique to Element and DOMWindow
index e4e63c4..b2b639a 100644 (file)
  */
 
 [
-    JSCustomGetOwnPropertySlotAndDescriptor,
-    CustomNamedSetter,
-    GenerateIsReachable=ImplFrame,
     CustomDeleteProperty,
     CustomEnumerateProperty,
+    CustomNamedSetter,
+    GenerateIsReachable=ImplFrame,
     JSCustomDefineOwnProperty,
-    JSCustomNamedGetterOnPrototype,
     JSCustomDefineOwnPropertyOnPrototype,
-    Unforgeable
+    JSCustomGetOwnPropertySlotAndDescriptor,
+    JSCustomNamedGetterOnPrototype,
+    Unforgeable,
 ] interface Location {
     [SetterCallWith=ActiveWindow&FirstWindow] attribute USVString href;
 
@@ -57,8 +57,7 @@
     // FIXME: Add support for SameObject
     [Unforgeable, CachedAttribute] readonly attribute FrozenArray<USVString> ancestorOrigins;
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [NotEnumerable, Custom, ImplementedAs=toStringFunction] DOMString toString();
 #endif
 };
-
index e258ef5..787e24c 100644 (file)
@@ -20,8 +20,7 @@
  */
 
 partial interface Document {
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     readonly attribute SVGSVGElement? rootElement;
 #endif
 };
-
index 085ff77..39836b8 100644 (file)
@@ -37,7 +37,7 @@
     // FIXME: Using "undefined" as default parameter value is wrong.
     CSSValue getPresentationAttribute(optional DOMString name = "undefined");
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     void focus();
     void blur();
 
index 3eb00fa..48e78b1 100644 (file)
     DoNotCheckConstants,
     ImplementationLacksVTable,
 ] exception SVGException {
-
     readonly attribute unsigned short   code;
     readonly attribute DOMString        name;
     readonly attribute DOMString        message;
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
-    // Override in a Mozilla compatible format
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [NotEnumerable] DOMString toString();
 #endif
 
index 60a1be2..0220889 100644 (file)
@@ -29,4 +29,3 @@
 ] interface SVGExternalResourcesRequired { 
     readonly attribute SVGAnimatedBoolean externalResourcesRequired;
 };
-
index adc71fc..69bad4a 100644 (file)
@@ -33,4 +33,3 @@
     readonly attribute SVGAnimatedLength height;
     readonly attribute SVGAnimatedString result;
 };
-
index a16f9b0..94964cd 100644 (file)
@@ -27,7 +27,6 @@
 [
     NoInterfaceObject,
 ] interface SVGFitToViewBox {
-    readonly attribute SVGAnimatedRect                viewBox;
+    readonly attribute SVGAnimatedRect viewBox;
     readonly attribute SVGAnimatedPreserveAspectRatio preserveAspectRatio;
 };
-
index f953058..2d90941 100644 (file)
@@ -28,7 +28,6 @@
     CustomToJSObject,
     ImplementationLacksVTable
 ] interface SVGPathSeg {
-    // Path Segment Types
     const unsigned short PATHSEG_UNKNOWN = 0;
     const unsigned short PATHSEG_CLOSEPATH = 1;
     const unsigned short PATHSEG_MOVETO_ABS = 2;
@@ -53,4 +52,3 @@
     readonly attribute unsigned short pathSegType;
     readonly attribute DOMString pathSegTypeAsLetter;
 };
-
index bd13046..3b7a9c7 100644 (file)
@@ -35,4 +35,3 @@
     // FIXME: Using "undefined" as default parameter value is wrong.
     boolean hasExtension(optional DOMString extension = "undefined");
 };
-
index 26e0b77..0ab024d 100644 (file)
@@ -30,4 +30,3 @@
 ] interface SVGURIReference {
     readonly attribute SVGAnimatedString href;
 };
-
index b9c3024..63c0834 100644 (file)
@@ -33,4 +33,3 @@
 
     attribute unsigned short zoomAndPan;
 };
-
index 90e0cf7..19b3775 100644 (file)
  */
 
 [
-    Exposed=DedicatedWorker,
     CustomProxyToJSObject,
+    Exposed=DedicatedWorker,
     JSGenerateToNativeObject,
 ] interface DedicatedWorkerGlobalScope : WorkerGlobalScope {
-
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [Custom, RaisesException] void postMessage(any message, optional Array messagePorts);
 #else
-    // There's no good way to expose an array via the ObjC bindings, so for now just allow passing in a single port.
     [RaisesException] void postMessage(DOMString message, optional MessagePort messagePort);
 #endif
 
     attribute EventHandler onmessage;
 };
-
index 34128a1..6168598 100644 (file)
  */
 
 [
-    CustomConstructor(USVString scriptUrl),
     ActiveDOMObject,
+    CustomConstructor(USVString scriptUrl),
 ] interface Worker : EventTarget {
-
     attribute EventHandler onmessage;
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [Custom, RaisesException] void postMessage(SerializedScriptValue message, optional Array messagePorts);
 #else
-    // There's no good way to expose an array via the ObjC bindings, so for now just allow passing in a single port.
     [RaisesException] void postMessage(SerializedScriptValue message, optional MessagePort messagePort);
 #endif
 
@@ -43,4 +41,3 @@
 };
 
 Worker implements AbstractWorker;
-
index eeecf9b..d9938ea 100644 (file)
  */
 
 [
-    Exposed=Worker,
     CustomProxyToJSObject,
+    Exposed=Worker,
     JSCustomMarkFunction,
     JSLegacyParent=JSWorkerGlobalScopeBase,
 ] interface WorkerGlobalScope : EventTarget {
 
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
-    readonly attribute  WorkerGlobalScope self;
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
+    readonly attribute WorkerGlobalScope self;
 #endif
     readonly attribute WorkerLocation location;
     void close();
index 1ffb25d..7a88a5f 100644 (file)
     DoNotCheckConstants,
     ImplementationLacksVTable,
 ] exception XPathException {
+    readonly attribute unsigned short code;
+    readonly attribute DOMString name;
+    readonly attribute DOMString message;
 
-    readonly attribute unsigned short   code;
-    readonly attribute DOMString        name;
-    readonly attribute DOMString        message;
-
-#if defined(LANGUAGE_JAVASCRIPT) && LANGUAGE_JAVASCRIPT
-    // Override in a Mozilla compatible format
+#if !(defined(LANGUAGE_GOBJECT) && LANGUAGE_GOBJECT)
     [NotEnumerable] DOMString toString();
 #endif
 
index a0b3225..88ee36e 100644 (file)
@@ -17,9 +17,9 @@
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
+
 [
     ImplementationLacksVTable,
 ] interface XPathExpression {
     [RaisesException] XPathResult evaluate(optional Node? contextNode = null, optional unsigned short type = 0, optional XPathResult? inResult = null);
 };
-
index 3b8495c..36b781b 100644 (file)
@@ -26,4 +26,3 @@
     // FIXME: Using "undefined" as default parameter value is wrong.
     DOMString? lookupNamespaceURI(optional DOMString prefix = "undefined");
 };
-