[WebKit IDL] remove all module from idl files.

author commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Fri, 12 Oct 2012 06:10:17 +0000 (06:10 +0000)

committer commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Fri, 12 Oct 2012 06:10:17 +0000 (06:10 +0000)
author commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Oct 2012 06:10:17 +0000 (06:10 +0000)
committer commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 12 Oct 2012 06:10:17 +0000 (06:10 +0000)
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog

index e7ce0da..8efc0bd 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,650 @@
+2012-10-11  Takashi Sakamoto  <tasak@google.com>
+
+        [WebKit IDL] remove all module from idl files.
+        https://bugs.webkit.org/show_bug.cgi?id=99007
+
+        Reviewed by Kentaro Hara.
+
+        Since current WebIDL spec doesn't support "module", remove
+        module from all idl files.
+
+        No new tests. I ran run-bindings-tests and no error was reported.
+
+        * Modules/battery/BatteryManager.idl:
+        * Modules/battery/NavigatorBattery.idl:
+        * Modules/filesystem/DOMFileSystem.idl:
+        * Modules/filesystem/DOMFileSystemSync.idl:
+        * Modules/filesystem/DOMWindowFileSystem.idl:
+        * Modules/filesystem/DataTransferItemFileSystem.idl:
+        * Modules/filesystem/DirectoryEntry.idl:
+        * Modules/filesystem/DirectoryEntrySync.idl:
+        * Modules/filesystem/DirectoryReader.idl:
+        * Modules/filesystem/DirectoryReaderSync.idl:
+        * Modules/filesystem/EntriesCallback.idl:
+        * Modules/filesystem/Entry.idl:
+        * Modules/filesystem/EntryArray.idl:
+        * Modules/filesystem/EntryArraySync.idl:
+        * Modules/filesystem/EntryCallback.idl:
+        * Modules/filesystem/EntrySync.idl:
+        * Modules/filesystem/ErrorCallback.idl:
+        * Modules/filesystem/FileCallback.idl:
+        * Modules/filesystem/FileEntry.idl:
+        * Modules/filesystem/FileEntrySync.idl:
+        * Modules/filesystem/FileSystemCallback.idl:
+        * Modules/filesystem/FileWriter.idl:
+        * Modules/filesystem/FileWriterCallback.idl:
+        * Modules/filesystem/FileWriterSync.idl:
+        * Modules/filesystem/HTMLInputElementFileSystem.idl:
+        * Modules/filesystem/Metadata.idl:
+        * Modules/filesystem/MetadataCallback.idl:
+        * Modules/filesystem/WorkerContextFileSystem.idl:
+        * Modules/gamepad/Gamepad.idl:
+        * Modules/gamepad/GamepadList.idl:
+        * Modules/gamepad/NavigatorGamepad.idl:
+        * Modules/geolocation/Geolocation.idl:
+        * Modules/geolocation/Geoposition.idl:
+        * Modules/geolocation/NavigatorGeolocation.idl:
+        * Modules/geolocation/PositionCallback.idl:
+        * Modules/geolocation/PositionError.idl:
+        * Modules/geolocation/PositionErrorCallback.idl:
+        * Modules/indexeddb/DOMWindowIndexedDatabase.idl:
+        * Modules/indexeddb/IDBAny.idl:
+        * Modules/indexeddb/IDBCursor.idl:
+        * Modules/indexeddb/IDBCursorWithValue.idl:
+        * Modules/indexeddb/IDBDatabase.idl:
+        * Modules/indexeddb/IDBDatabaseException.idl:
+        * Modules/indexeddb/IDBFactory.idl:
+        * Modules/indexeddb/IDBIndex.idl:
+        * Modules/indexeddb/IDBKey.idl:
+        * Modules/indexeddb/IDBKeyRange.idl:
+        * Modules/indexeddb/IDBObjectStore.idl:
+        * Modules/indexeddb/IDBOpenDBRequest.idl:
+        * Modules/indexeddb/IDBRequest.idl:
+        * Modules/indexeddb/IDBTransaction.idl:
+        * Modules/indexeddb/IDBUpgradeNeededEvent.idl:
+        * Modules/indexeddb/IDBVersionChangeEvent.idl:
+        * Modules/indexeddb/IDBVersionChangeRequest.idl:
+        * Modules/indexeddb/WorkerContextIndexedDatabase.idl:
+        * Modules/intents/DOMWindowIntents.idl:
+        * Modules/intents/DeliveredIntent.idl:
+        * Modules/intents/Intent.idl:
+        * Modules/intents/IntentResultCallback.idl:
+        * Modules/intents/NavigatorIntents.idl:
+        * Modules/mediasource/MediaSource.idl:
+        * Modules/mediasource/SourceBuffer.idl:
+        * Modules/mediasource/SourceBufferList.idl:
+        * Modules/mediastream/DOMWindowMediaStream.idl:
+        * Modules/mediastream/IceCallback.idl:
+        * Modules/mediastream/IceCandidate.idl:
+        * Modules/mediastream/LocalMediaStream.idl:
+        * Modules/mediastream/MediaStream.idl:
+        * Modules/mediastream/MediaStreamEvent.idl:
+        * Modules/mediastream/MediaStreamList.idl:
+        * Modules/mediastream/MediaStreamTrack.idl:
+        * Modules/mediastream/MediaStreamTrackEvent.idl:
+        * Modules/mediastream/MediaStreamTrackList.idl:
+        * Modules/mediastream/NavigatorMediaStream.idl:
+        * Modules/mediastream/NavigatorUserMediaError.idl:
+        * Modules/mediastream/NavigatorUserMediaErrorCallback.idl:
+        * Modules/mediastream/NavigatorUserMediaSuccessCallback.idl:
+        * Modules/mediastream/PeerConnection00.idl:
+        * Modules/mediastream/RTCErrorCallback.idl:
+        * Modules/mediastream/RTCIceCandidate.idl:
+        * Modules/mediastream/RTCIceCandidateEvent.idl:
+        * Modules/mediastream/RTCPeerConnection.idl:
+        * Modules/mediastream/RTCSessionDescription.idl:
+        * Modules/mediastream/RTCSessionDescriptionCallback.idl:
+        * Modules/mediastream/RTCStatsCallback.idl:
+        * Modules/mediastream/RTCStatsElement.idl:
+        * Modules/mediastream/RTCStatsReport.idl:
+        * Modules/mediastream/RTCStatsResponse.idl:
+        * Modules/mediastream/SessionDescription.idl:
+        * Modules/navigatorcontentutils/NavigatorContentUtils.idl:
+        * Modules/networkinfo/NavigatorNetworkInfoConnection.idl:
+        * Modules/networkinfo/NetworkInfoConnection.idl:
+        * Modules/notifications/DOMWindowNotifications.idl:
+        * Modules/notifications/Notification.idl:
+        * Modules/notifications/NotificationCenter.idl:
+        * Modules/notifications/NotificationPermissionCallback.idl:
+        * Modules/notifications/WorkerContextNotifications.idl:
+        * Modules/proximity/DeviceProximityEvent.idl:
+        * Modules/quota/DOMWindowQuota.idl:
+        * Modules/quota/StorageInfo.idl:
+        * Modules/quota/StorageInfoErrorCallback.idl:
+        * Modules/quota/StorageInfoQuotaCallback.idl:
+        * Modules/quota/StorageInfoUsageCallback.idl:
+        * Modules/speech/DOMWindowSpeech.idl:
+        * Modules/speech/SpeechGrammar.idl:
+        * Modules/speech/SpeechGrammarList.idl:
+        * Modules/speech/SpeechRecognition.idl:
+        * Modules/speech/SpeechRecognitionAlternative.idl:
+        * Modules/speech/SpeechRecognitionError.idl:
+        * Modules/speech/SpeechRecognitionEvent.idl:
+        * Modules/speech/SpeechRecognitionResult.idl:
+        * Modules/speech/SpeechRecognitionResultList.idl:
+        * Modules/vibration/NavigatorVibration.idl:
+        * Modules/webaudio/AudioBuffer.idl:
+        * Modules/webaudio/AudioBufferCallback.idl:
+        * Modules/webaudio/AudioBufferSourceNode.idl:
+        * Modules/webaudio/AudioChannelMerger.idl:
+        * Modules/webaudio/AudioChannelSplitter.idl:
+        * Modules/webaudio/AudioContext.idl:
+        * Modules/webaudio/AudioDestinationNode.idl:
+        * Modules/webaudio/AudioGain.idl:
+        * Modules/webaudio/AudioGainNode.idl:
+        * Modules/webaudio/AudioListener.idl:
+        * Modules/webaudio/AudioNode.idl:
+        * Modules/webaudio/AudioPannerNode.idl:
+        * Modules/webaudio/AudioParam.idl:
+        * Modules/webaudio/AudioProcessingEvent.idl:
+        * Modules/webaudio/AudioSourceNode.idl:
+        * Modules/webaudio/BiquadFilterNode.idl:
+        * Modules/webaudio/ConvolverNode.idl:
+        * Modules/webaudio/DOMWindowWebAudio.idl:
+        * Modules/webaudio/DelayNode.idl:
+        * Modules/webaudio/DynamicsCompressorNode.idl:
+        * Modules/webaudio/JavaScriptAudioNode.idl:
+        * Modules/webaudio/MediaElementAudioSourceNode.idl:
+        * Modules/webaudio/MediaStreamAudioSourceNode.idl:
+        * Modules/webaudio/OfflineAudioCompletionEvent.idl:
+        * Modules/webaudio/Oscillator.idl:
+        * Modules/webaudio/RealtimeAnalyserNode.idl:
+        * Modules/webaudio/WaveShaperNode.idl:
+        * Modules/webaudio/WaveTable.idl:
+        * Modules/webdatabase/DOMWindowWebDatabase.idl:
+        * Modules/webdatabase/Database.idl:
+        * Modules/webdatabase/DatabaseCallback.idl:
+        * Modules/webdatabase/DatabaseSync.idl:
+        * Modules/webdatabase/SQLError.idl:
+        * Modules/webdatabase/SQLException.idl:
+        * Modules/webdatabase/SQLResultSet.idl:
+        * Modules/webdatabase/SQLResultSetRowList.idl:
+        * Modules/webdatabase/SQLStatementCallback.idl:
+        * Modules/webdatabase/SQLStatementErrorCallback.idl:
+        * Modules/webdatabase/SQLTransaction.idl:
+        * Modules/webdatabase/SQLTransactionCallback.idl:
+        * Modules/webdatabase/SQLTransactionErrorCallback.idl:
+        * Modules/webdatabase/SQLTransactionSync.idl:
+        * Modules/webdatabase/SQLTransactionSyncCallback.idl:
+        * Modules/webdatabase/WorkerContextWebDatabase.idl:
+        * Modules/websockets/CloseEvent.idl:
+        * Modules/websockets/DOMWindowWebSocket.idl:
+        * Modules/websockets/WebSocket.idl:
+        * Modules/websockets/WorkerContextWebSocket.idl:
+        * bindings/scripts/test/TestCallback.idl:
+        * bindings/scripts/test/TestCustomNamedGetter.idl:
+        * bindings/scripts/test/TestDomainSecurity.idl:
+        * bindings/scripts/test/TestEventConstructor.idl:
+        * bindings/scripts/test/TestEventTarget.idl:
+        * bindings/scripts/test/TestException.idl:
+        * bindings/scripts/test/TestInterface.idl:
+        * bindings/scripts/test/TestMediaQueryListListener.idl:
+        * bindings/scripts/test/TestNamedConstructor.idl:
+        * bindings/scripts/test/TestNode.idl:
+        * bindings/scripts/test/TestObj.idl:
+        * bindings/scripts/test/TestSerializedScriptValueInterface.idl:
+        * bindings/scripts/test/TestSupplemental.idl:
+        * bindings/scripts/test/TestTypedArray.idl:
+        * css/CSSCharsetRule.idl:
+        * css/CSSFontFaceRule.idl:
+        * css/CSSImportRule.idl:
+        * css/CSSMediaRule.idl:
+        * css/CSSPageRule.idl:
+        * css/CSSPrimitiveValue.idl:
+        * css/CSSRule.idl:
+        * css/CSSRuleList.idl:
+        * css/CSSStyleDeclaration.idl:
+        * css/CSSStyleRule.idl:
+        * css/CSSStyleSheet.idl:
+        * css/CSSUnknownRule.idl:
+        * css/CSSValue.idl:
+        * css/CSSValueList.idl:
+        * css/Counter.idl:
+        * css/MediaList.idl:
+        * css/MediaQueryList.idl:
+        * css/MediaQueryListListener.idl:
+        * css/RGBColor.idl:
+        * css/Rect.idl:
+        * css/StyleMedia.idl:
+        * css/StyleSheet.idl:
+        * css/StyleSheetList.idl:
+        * css/WebKitCSSFilterValue.idl:
+        * css/WebKitCSSKeyframeRule.idl:
+        * css/WebKitCSSKeyframesRule.idl:
+        * css/WebKitCSSMatrix.idl:
+        * css/WebKitCSSRegionRule.idl:
+        * css/WebKitCSSTransformValue.idl:
+        * dom/Attr.idl:
+        * dom/BeforeLoadEvent.idl:
+        * dom/CDATASection.idl:
+        * dom/CharacterData.idl:
+        * dom/ClientRect.idl:
+        * dom/ClientRectList.idl:
+        * dom/Clipboard.idl:
+        * dom/Comment.idl:
+        * dom/CompositionEvent.idl:
+        * dom/CustomEvent.idl:
+        * dom/DOMCoreException.idl:
+        * dom/DOMError.idl:
+        * dom/DOMImplementation.idl:
+        * dom/DOMNamedFlowCollection.idl:
+        * dom/DOMStringList.idl:
+        * dom/DOMStringMap.idl:
+        * dom/DataTransferItem.idl:
+        * dom/DataTransferItemList.idl:
+        * dom/DeviceMotionEvent.idl:
+        * dom/DeviceOrientationEvent.idl:
+        * dom/Document.idl:
+        * dom/DocumentFragment.idl:
+        * dom/DocumentType.idl:
+        * dom/Element.idl:
+        * dom/Entity.idl:
+        * dom/EntityReference.idl:
+        * dom/ErrorEvent.idl:
+        * dom/Event.idl:
+        * dom/EventException.idl:
+        * dom/EventListener.idl:
+        * dom/EventTarget.idl:
+        * dom/HashChangeEvent.idl:
+        * dom/KeyboardEvent.idl:
+        * dom/MessageChannel.idl:
+        * dom/MessageEvent.idl:
+        * dom/MessagePort.idl:
+        * dom/MouseEvent.idl:
+        * dom/MutationCallback.idl:
+        * dom/MutationEvent.idl:
+        * dom/MutationObserver.idl:
+        * dom/MutationRecord.idl:
+        * dom/NamedNodeMap.idl:
+        * dom/Node.idl:
+        * dom/NodeFilter.idl:
+        * dom/NodeIterator.idl:
+        * dom/NodeList.idl:
+        * dom/Notation.idl:
+        * dom/OverflowEvent.idl:
+        * dom/PageTransitionEvent.idl:
+        * dom/PopStateEvent.idl:
+        * dom/ProcessingInstruction.idl:
+        * dom/ProgressEvent.idl:
+        * dom/PropertyNodeList.idl:
+        * dom/Range.idl:
+        * dom/RangeException.idl:
+        * dom/RequestAnimationFrameCallback.idl:
+        * dom/ShadowRoot.idl:
+        * dom/StringCallback.idl:
+        * dom/Text.idl:
+        * dom/TextEvent.idl:
+        * dom/Touch.idl:
+        * dom/TouchEvent.idl:
+        * dom/TouchList.idl:
+        * dom/TreeWalker.idl:
+        * dom/UIEvent.idl:
+        * dom/WebKitAnimationEvent.idl:
+        * dom/WebKitNamedFlow.idl:
+        * dom/WebKitTransitionEvent.idl:
+        * dom/WheelEvent.idl:
+        * editing/DOMTransaction.idl:
+        * editing/UndoManager.idl:
+        * fileapi/Blob.idl:
+        * fileapi/File.idl:
+        * fileapi/FileError.idl:
+        * fileapi/FileException.idl:
+        * fileapi/FileList.idl:
+        * fileapi/FileReader.idl:
+        * fileapi/FileReaderSync.idl:
+        * html/DOMFormData.idl:
+        * html/DOMSettableTokenList.idl:
+        * html/DOMTokenList.idl:
+        * html/DOMURL.idl:
+        * html/HTMLAllCollection.idl:
+        * html/HTMLAnchorElement.idl:
+        * html/HTMLAppletElement.idl:
+        * html/HTMLAreaElement.idl:
+        * html/HTMLAudioElement.idl:
+        * html/HTMLBRElement.idl:
+        * html/HTMLBaseElement.idl:
+        * html/HTMLBaseFontElement.idl:
+        * html/HTMLBodyElement.idl:
+        * html/HTMLButtonElement.idl:
+        * html/HTMLCanvasElement.idl:
+        * html/HTMLCollection.idl:
+        * html/HTMLDListElement.idl:
+        * html/HTMLDataListElement.idl:
+        * html/HTMLDetailsElement.idl:
+        * html/HTMLDialogElement.idl:
+        * html/HTMLDirectoryElement.idl:
+        * html/HTMLDivElement.idl:
+        * html/HTMLDocument.idl:
+        * html/HTMLElement.idl:
+        * html/HTMLEmbedElement.idl:
+        * html/HTMLFieldSetElement.idl:
+        * html/HTMLFontElement.idl:
+        * html/HTMLFormElement.idl:
+        * html/HTMLFrameElement.idl:
+        * html/HTMLFrameSetElement.idl:
+        * html/HTMLHRElement.idl:
+        * html/HTMLHeadElement.idl:
+        * html/HTMLHeadingElement.idl:
+        * html/HTMLHtmlElement.idl:
+        * html/HTMLIFrameElement.idl:
+        * html/HTMLImageElement.idl:
+        * html/HTMLInputElement.idl:
+        * html/HTMLIntentElement.idl:
+        * html/HTMLKeygenElement.idl:
+        * html/HTMLLIElement.idl:
+        * html/HTMLLabelElement.idl:
+        * html/HTMLLegendElement.idl:
+        * html/HTMLLinkElement.idl:
+        * html/HTMLMapElement.idl:
+        * html/HTMLMarqueeElement.idl:
+        * html/HTMLMediaElement.idl:
+        * html/HTMLMenuElement.idl:
+        * html/HTMLMetaElement.idl:
+        * html/HTMLMeterElement.idl:
+        * html/HTMLModElement.idl:
+        * html/HTMLOListElement.idl:
+        * html/HTMLObjectElement.idl:
+        * html/HTMLOptGroupElement.idl:
+        * html/HTMLOptionElement.idl:
+        * html/HTMLOptionsCollection.idl:
+        * html/HTMLOutputElement.idl:
+        * html/HTMLParagraphElement.idl:
+        * html/HTMLParamElement.idl:
+        * html/HTMLPreElement.idl:
+        * html/HTMLProgressElement.idl:
+        * html/HTMLPropertiesCollection.idl:
+        * html/HTMLQuoteElement.idl:
+        * html/HTMLScriptElement.idl:
+        * html/HTMLSelectElement.idl:
+        * html/HTMLSourceElement.idl:
+        * html/HTMLSpanElement.idl:
+        * html/HTMLStyleElement.idl:
+        * html/HTMLTableCaptionElement.idl:
+        * html/HTMLTableCellElement.idl:
+        * html/HTMLTableColElement.idl:
+        * html/HTMLTableElement.idl:
+        * html/HTMLTableRowElement.idl:
+        * html/HTMLTableSectionElement.idl:
+        * html/HTMLTextAreaElement.idl:
+        * html/HTMLTitleElement.idl:
+        * html/HTMLTrackElement.idl:
+        * html/HTMLUListElement.idl:
+        * html/HTMLUnknownElement.idl:
+        * html/HTMLVideoElement.idl:
+        * html/ImageData.idl:
+        * html/MediaController.idl:
+        * html/MediaError.idl:
+        * html/MediaKeyError.idl:
+        * html/MediaKeyEvent.idl:
+        * html/MicroDataItemValue.idl:
+        * html/RadioNodeList.idl:
+        * html/TextMetrics.idl:
+        * html/TimeRanges.idl:
+        * html/ValidityState.idl:
+        * html/VoidCallback.idl:
+        * html/canvas/ArrayBuffer.idl:
+        * html/canvas/ArrayBufferView.idl:
+        * html/canvas/CanvasGradient.idl:
+        * html/canvas/CanvasPattern.idl:
+        * html/canvas/CanvasRenderingContext.idl:
+        * html/canvas/CanvasRenderingContext2D.idl:
+        * html/canvas/DataView.idl:
+        * html/canvas/EXTTextureFilterAnisotropic.idl:
+        * html/canvas/Float32Array.idl:
+        * html/canvas/Float64Array.idl:
+        * html/canvas/Int16Array.idl:
+        * html/canvas/Int32Array.idl:
+        * html/canvas/Int8Array.idl:
+        * html/canvas/OESStandardDerivatives.idl:
+        * html/canvas/OESTextureFloat.idl:
+        * html/canvas/OESVertexArrayObject.idl:
+        * html/canvas/Uint16Array.idl:
+        * html/canvas/Uint32Array.idl:
+        * html/canvas/Uint8Array.idl:
+        * html/canvas/Uint8ClampedArray.idl:
+        * html/canvas/WebGLActiveInfo.idl:
+        * html/canvas/WebGLBuffer.idl:
+        * html/canvas/WebGLCompressedTextureS3TC.idl:
+        * html/canvas/WebGLContextAttributes.idl:
+        * html/canvas/WebGLContextEvent.idl:
+        * html/canvas/WebGLDebugRendererInfo.idl:
+        * html/canvas/WebGLDebugShaders.idl:
+        * html/canvas/WebGLDepthTexture.idl:
+        * html/canvas/WebGLFramebuffer.idl:
+        * html/canvas/WebGLLoseContext.idl:
+        * html/canvas/WebGLProgram.idl:
+        * html/canvas/WebGLRenderbuffer.idl:
+        * html/canvas/WebGLRenderingContext.idl:
+        * html/canvas/WebGLShader.idl:
+        * html/canvas/WebGLShaderPrecisionFormat.idl:
+        * html/canvas/WebGLTexture.idl:
+        * html/canvas/WebGLUniformLocation.idl:
+        * html/canvas/WebGLVertexArrayObjectOES.idl:
+        * html/shadow/HTMLContentElement.idl:
+        * html/shadow/HTMLShadowElement.idl:
+        * html/track/TextTrack.idl:
+        * html/track/TextTrackCue.idl:
+        * html/track/TextTrackCueList.idl:
+        * html/track/TextTrackList.idl:
+        * html/track/TrackEvent.idl:
+        * inspector/InjectedScriptHost.idl:
+        * inspector/InspectorFrontendHost.idl:
+        * inspector/JavaScriptCallFrame.idl:
+        * inspector/ScriptProfile.idl:
+        * inspector/ScriptProfileNode.idl:
+        * loader/appcache/DOMApplicationCache.idl:
+        * page/AbstractView.idl:
+        * page/BarInfo.idl:
+        * page/Console.idl:
+        * page/Coordinates.idl:
+        * page/Crypto.idl:
+        * page/DOMSecurityPolicy.idl:
+        * page/DOMSelection.idl:
+        * page/DOMWindow.idl:
+        * page/DOMWindowPagePopup.idl:
+        * page/EventSource.idl:
+        * page/History.idl:
+        * page/Location.idl:
+        * page/MemoryInfo.idl:
+        * page/Navigator.idl:
+        * page/PagePopupController.idl:
+        * page/Performance.idl:
+        * page/PerformanceEntry.idl:
+        * page/PerformanceEntryList.idl:
+        * page/PerformanceNavigation.idl:
+        * page/PerformanceResourceTiming.idl:
+        * page/PerformanceTiming.idl:
+        * page/Screen.idl:
+        * page/SpeechInputEvent.idl:
+        * page/SpeechInputResult.idl:
+        * page/SpeechInputResultList.idl:
+        * page/WebKitAnimation.idl:
+        * page/WebKitAnimationList.idl:
+        * page/WebKitPoint.idl:
+        * page/WorkerNavigator.idl:
+        * plugins/DOMMimeType.idl:
+        * plugins/DOMMimeTypeArray.idl:
+        * plugins/DOMPlugin.idl:
+        * plugins/DOMPluginArray.idl:
+        * storage/Storage.idl:
+        * storage/StorageEvent.idl:
+        * svg/ElementTimeControl.idl:
+        * svg/SVGAElement.idl:
+        * svg/SVGAltGlyphDefElement.idl:
+        * svg/SVGAltGlyphElement.idl:
+        * svg/SVGAltGlyphItemElement.idl:
+        * svg/SVGAngle.idl:
+        * svg/SVGAnimateColorElement.idl:
+        * svg/SVGAnimateElement.idl:
+        * svg/SVGAnimateMotionElement.idl:
+        * svg/SVGAnimateTransformElement.idl:
+        * svg/SVGAnimatedAngle.idl:
+        * svg/SVGAnimatedBoolean.idl:
+        * svg/SVGAnimatedEnumeration.idl:
+        * svg/SVGAnimatedInteger.idl:
+        * svg/SVGAnimatedLength.idl:
+        * svg/SVGAnimatedLengthList.idl:
+        * svg/SVGAnimatedNumber.idl:
+        * svg/SVGAnimatedNumberList.idl:
+        * svg/SVGAnimatedPreserveAspectRatio.idl:
+        * svg/SVGAnimatedRect.idl:
+        * svg/SVGAnimatedString.idl:
+        * svg/SVGAnimatedTransformList.idl:
+        * svg/SVGAnimationElement.idl:
+        * svg/SVGCircleElement.idl:
+        * svg/SVGClipPathElement.idl:
+        * svg/SVGColor.idl:
+        * svg/SVGComponentTransferFunctionElement.idl:
+        * svg/SVGCursorElement.idl:
+        * svg/SVGDefsElement.idl:
+        * svg/SVGDescElement.idl:
+        * svg/SVGDocument.idl:
+        * svg/SVGElement.idl:
+        * svg/SVGElementInstance.idl:
+        * svg/SVGElementInstanceList.idl:
+        * svg/SVGEllipseElement.idl:
+        * svg/SVGException.idl:
+        * svg/SVGExternalResourcesRequired.idl:
+        * svg/SVGFEBlendElement.idl:
+        * svg/SVGFEColorMatrixElement.idl:
+        * svg/SVGFEComponentTransferElement.idl:
+        * svg/SVGFECompositeElement.idl:
+        * svg/SVGFEConvolveMatrixElement.idl:
+        * svg/SVGFEDiffuseLightingElement.idl:
+        * svg/SVGFEDisplacementMapElement.idl:
+        * svg/SVGFEDistantLightElement.idl:
+        * svg/SVGFEDropShadowElement.idl:
+        * svg/SVGFEFloodElement.idl:
+        * svg/SVGFEFuncAElement.idl:
+        * svg/SVGFEFuncBElement.idl:
+        * svg/SVGFEFuncGElement.idl:
+        * svg/SVGFEFuncRElement.idl:
+        * svg/SVGFEGaussianBlurElement.idl:
+        * svg/SVGFEImageElement.idl:
+        * svg/SVGFEMergeElement.idl:
+        * svg/SVGFEMergeNodeElement.idl:
+        * svg/SVGFEMorphologyElement.idl:
+        * svg/SVGFEOffsetElement.idl:
+        * svg/SVGFEPointLightElement.idl:
+        * svg/SVGFESpecularLightingElement.idl:
+        * svg/SVGFESpotLightElement.idl:
+        * svg/SVGFETileElement.idl:
+        * svg/SVGFETurbulenceElement.idl:
+        * svg/SVGFilterElement.idl:
+        * svg/SVGFilterPrimitiveStandardAttributes.idl:
+        * svg/SVGFitToViewBox.idl:
+        * svg/SVGFontElement.idl:
+        * svg/SVGFontFaceElement.idl:
+        * svg/SVGFontFaceFormatElement.idl:
+        * svg/SVGFontFaceNameElement.idl:
+        * svg/SVGFontFaceSrcElement.idl:
+        * svg/SVGFontFaceUriElement.idl:
+        * svg/SVGForeignObjectElement.idl:
+        * svg/SVGGElement.idl:
+        * svg/SVGGlyphElement.idl:
+        * svg/SVGGlyphRefElement.idl:
+        * svg/SVGGradientElement.idl:
+        * svg/SVGHKernElement.idl:
+        * svg/SVGImageElement.idl:
+        * svg/SVGLangSpace.idl:
+        * svg/SVGLength.idl:
+        * svg/SVGLengthList.idl:
+        * svg/SVGLineElement.idl:
+        * svg/SVGLinearGradientElement.idl:
+        * svg/SVGLocatable.idl:
+        * svg/SVGMPathElement.idl:
+        * svg/SVGMarkerElement.idl:
+        * svg/SVGMaskElement.idl:
+        * svg/SVGMatrix.idl:
+        * svg/SVGMetadataElement.idl:
+        * svg/SVGMissingGlyphElement.idl:
+        * svg/SVGNumber.idl:
+        * svg/SVGNumberList.idl:
+        * svg/SVGPaint.idl:
+        * svg/SVGPathElement.idl:
+        * svg/SVGPathSeg.idl:
+        * svg/SVGPathSegArcAbs.idl:
+        * svg/SVGPathSegArcRel.idl:
+        * svg/SVGPathSegClosePath.idl:
+        * svg/SVGPathSegCurvetoCubicAbs.idl:
+        * svg/SVGPathSegCurvetoCubicRel.idl:
+        * svg/SVGPathSegCurvetoCubicSmoothAbs.idl:
+        * svg/SVGPathSegCurvetoCubicSmoothRel.idl:
+        * svg/SVGPathSegCurvetoQuadraticAbs.idl:
+        * svg/SVGPathSegCurvetoQuadraticRel.idl:
+        * svg/SVGPathSegCurvetoQuadraticSmoothAbs.idl:
+        * svg/SVGPathSegCurvetoQuadraticSmoothRel.idl:
+        * svg/SVGPathSegLinetoAbs.idl:
+        * svg/SVGPathSegLinetoHorizontalAbs.idl:
+        * svg/SVGPathSegLinetoHorizontalRel.idl:
+        * svg/SVGPathSegLinetoRel.idl:
+        * svg/SVGPathSegLinetoVerticalAbs.idl:
+        * svg/SVGPathSegLinetoVerticalRel.idl:
+        * svg/SVGPathSegList.idl:
+        * svg/SVGPathSegMovetoAbs.idl:
+        * svg/SVGPathSegMovetoRel.idl:
+        * svg/SVGPatternElement.idl:
+        * svg/SVGPoint.idl:
+        * svg/SVGPointList.idl:
+        * svg/SVGPolygonElement.idl:
+        * svg/SVGPolylineElement.idl:
+        * svg/SVGPreserveAspectRatio.idl:
+        * svg/SVGRadialGradientElement.idl:
+        * svg/SVGRect.idl:
+        * svg/SVGRectElement.idl:
+        * svg/SVGRenderingIntent.idl:
+        * svg/SVGSVGElement.idl:
+        * svg/SVGScriptElement.idl:
+        * svg/SVGSetElement.idl:
+        * svg/SVGStopElement.idl:
+        * svg/SVGStringList.idl:
+        * svg/SVGStylable.idl:
+        * svg/SVGStyleElement.idl:
+        * svg/SVGSwitchElement.idl:
+        * svg/SVGSymbolElement.idl:
+        * svg/SVGTRefElement.idl:
+        * svg/SVGTSpanElement.idl:
+        * svg/SVGTests.idl:
+        * svg/SVGTextContentElement.idl:
+        * svg/SVGTextElement.idl:
+        * svg/SVGTextPathElement.idl:
+        * svg/SVGTextPositioningElement.idl:
+        * svg/SVGTitleElement.idl:
+        * svg/SVGTransform.idl:
+        * svg/SVGTransformList.idl:
+        * svg/SVGTransformable.idl:
+        * svg/SVGURIReference.idl:
+        * svg/SVGUnitTypes.idl:
+        * svg/SVGUseElement.idl:
+        * svg/SVGVKernElement.idl:
+        * svg/SVGViewElement.idl:
+        * svg/SVGViewSpec.idl:
+        * svg/SVGZoomAndPan.idl:
+        * svg/SVGZoomEvent.idl:
+        * testing/InternalSettings.idl:
+        * testing/Internals.idl:
+        * testing/MallocStatistics.idl:
+        * workers/AbstractWorker.idl:
+        * workers/DedicatedWorkerContext.idl:
+        * workers/SharedWorker.idl:
+        * workers/SharedWorkerContext.idl:
+        * workers/Worker.idl:
+        * workers/WorkerContext.idl:
+        * workers/WorkerLocation.idl:
+        * xml/DOMParser.idl:
+        * xml/XMLHttpRequest.idl:
+        * xml/XMLHttpRequestException.idl:
+        * xml/XMLHttpRequestProgressEvent.idl:
+        * xml/XMLHttpRequestUpload.idl:
+        * xml/XMLSerializer.idl:
+        * xml/XPathEvaluator.idl:
+        * xml/XPathException.idl:
+        * xml/XPathExpression.idl:
+        * xml/XPathNSResolver.idl:
+        * xml/XPathResult.idl:
+        * xml/XSLTProcessor.idl:
+        Removed "module".
+
  2012-10-11  Beth Dakin  <bdakin@apple.com>
  
          https://bugs.webkit.org/show_bug.cgi?id=98700
diff --git a/Source/WebCore/Modules/battery/BatteryManager.idl b/Source/WebCore/Modules/battery/BatteryManager.idl

index 49a2056..1c1d01e 100644 (file)
--- a/Source/WebCore/Modules/battery/BatteryManager.idl
+++ b/Source/WebCore/Modules/battery/BatteryManager.idl
@@ -17,34 +17,30 @@
   *  Boston, MA 02110-1301, USA.
   */
  
-module window {
+// http://dev.w3.org/2009/dap/system-info/battery-status.html
+interface [
+    Conditional=BATTERY_STATUS,
+    ActiveDOMObject,
+    EventTarget
+ ] BatteryManager {
+    readonly attribute boolean charging;
+    readonly attribute double chargingTime;
+    readonly attribute double dischargingTime;
+    readonly attribute double level;
  
-    // http://dev.w3.org/2009/dap/system-info/battery-status.html
-    interface [
-        Conditional=BATTERY_STATUS,
-        ActiveDOMObject,
-        EventTarget
-     ] BatteryManager {
-        readonly attribute boolean charging;
-        readonly attribute double chargingTime;
-        readonly attribute double dischargingTime;
-        readonly attribute double level;
+    attribute EventListener onchargingchange;
+    attribute EventListener onchargingtimechange;
+    attribute EventListener ondischargingtimechange;
+    attribute EventListener onlevelchange;
  
-        attribute EventListener onchargingchange;
-        attribute EventListener onchargingtimechange;
-        attribute EventListener ondischargingtimechange;
-        attribute EventListener onlevelchange;
-
-        // EventTarget interface
-        void addEventListener(in DOMString type,
-                              in EventListener listener,
-                              in [Optional] boolean useCapture);
-        void removeEventListener(in DOMString type,
-                                 in EventListener listener,
-                                 in [Optional] boolean useCapture);
-        boolean dispatchEvent(in Event event)
-            raises(EventException);
-    };
-
-}
+    // EventTarget interface
+    void addEventListener(in DOMString type,
+                          in EventListener listener,
+                          in [Optional] boolean useCapture);
+    void removeEventListener(in DOMString type,
+                             in EventListener listener,
+                             in [Optional] boolean useCapture);
+    boolean dispatchEvent(in Event event)
+        raises(EventException);
+};
  
diff --git a/Source/WebCore/Modules/battery/NavigatorBattery.idl b/Source/WebCore/Modules/battery/NavigatorBattery.idl

index 5c21472..7c41618 100644 (file)
--- a/Source/WebCore/Modules/battery/NavigatorBattery.idl
+++ b/Source/WebCore/Modules/battery/NavigatorBattery.idl
@@ -17,14 +17,10 @@
   *  Boston, MA 02110-1301, USA.
   */
  
-module window {
-
-    interface [
-        Conditional=BATTERY_STATUS,
-        Supplemental=Navigator
-    ] NavigatorBattery {
-        readonly attribute BatteryManager webkitBattery;
-    };
-
-}
+interface [
+    Conditional=BATTERY_STATUS,
+    Supplemental=Navigator
+] NavigatorBattery {
+    readonly attribute BatteryManager webkitBattery;
+};
  
diff --git a/Source/WebCore/Modules/filesystem/DOMFileSystem.idl b/Source/WebCore/Modules/filesystem/DOMFileSystem.idl

index 2e98fbf..55037a4 100644 (file)
--- a/Source/WebCore/Modules/filesystem/DOMFileSystem.idl
+++ b/Source/WebCore/Modules/filesystem/DOMFileSystem.idl
@@ -29,13 +29,11 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-    interface [
-        Conditional=FILE_SYSTEM,
-        ActiveDOMObject,
-        JSNoStaticTables
-    ] DOMFileSystem {
-        readonly attribute DOMString name;
-        readonly attribute DirectoryEntry root;
-    };
-}
+interface [
+    Conditional=FILE_SYSTEM,
+    ActiveDOMObject,
+    JSNoStaticTables
+] DOMFileSystem {
+    readonly attribute DOMString name;
+    readonly attribute DirectoryEntry root;
+};
diff --git a/Source/WebCore/Modules/filesystem/DOMFileSystemSync.idl b/Source/WebCore/Modules/filesystem/DOMFileSystemSync.idl

index 706aa50..3a5e812 100644 (file)
--- a/Source/WebCore/Modules/filesystem/DOMFileSystemSync.idl
+++ b/Source/WebCore/Modules/filesystem/DOMFileSystemSync.idl
@@ -28,12 +28,10 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-    interface [
-        Conditional=FILE_SYSTEM,
-        JSNoStaticTables
-    ] DOMFileSystemSync {
-        readonly attribute DOMString name;
-        readonly attribute DirectoryEntrySync root;
-    };
-}
+interface [
+    Conditional=FILE_SYSTEM,
+    JSNoStaticTables
+] DOMFileSystemSync {
+    readonly attribute DOMString name;
+    readonly attribute DirectoryEntrySync root;
+};
diff --git a/Source/WebCore/Modules/filesystem/DOMWindowFileSystem.idl b/Source/WebCore/Modules/filesystem/DOMWindowFileSystem.idl

index f8f7779..9ba9a05 100644 (file)
--- a/Source/WebCore/Modules/filesystem/DOMWindowFileSystem.idl
+++ b/Source/WebCore/Modules/filesystem/DOMWindowFileSystem.idl
@@ -24,19 +24,16 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module window {
+interface [
+    Conditional=FILE_SYSTEM,
+    Supplemental=DOMWindow
+] DOMWindowFileSystem {
+    const unsigned short TEMPORARY = 0;
+    const unsigned short PERSISTENT = 1;
  
-    interface [
-        Conditional=FILE_SYSTEM,
-        Supplemental=DOMWindow
-    ] DOMWindowFileSystem {
-        const unsigned short TEMPORARY = 0;
-        const unsigned short PERSISTENT = 1;
+    [V8EnabledAtRuntime=FileSystem] void webkitRequestFileSystem(in unsigned short type, in long long size,
+            in [Callback] FileSystemCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback);
+    [V8EnabledAtRuntime=FileSystem] void webkitResolveLocalFileSystemURL(in DOMString url,
+            in [Callback] EntryCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback);
+};
  
-        [V8EnabledAtRuntime=FileSystem] void webkitRequestFileSystem(in unsigned short type, in long long size,
-                in [Callback] FileSystemCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback);
-        [V8EnabledAtRuntime=FileSystem] void webkitResolveLocalFileSystemURL(in DOMString url,
-                in [Callback] EntryCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback);
-    };
-
-}
diff --git a/Source/WebCore/Modules/filesystem/DataTransferItemFileSystem.idl b/Source/WebCore/Modules/filesystem/DataTransferItemFileSystem.idl

index 1c50db4..b3d78a0 100644 (file)
--- a/Source/WebCore/Modules/filesystem/DataTransferItemFileSystem.idl
+++ b/Source/WebCore/Modules/filesystem/DataTransferItemFileSystem.idl
@@ -28,13 +28,10 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module core {
+interface [
+    Conditional=DATA_TRANSFER_ITEMS&FILE_SYSTEM,
+    Supplemental=DataTransferItem
+] DataTransferItemFileSystem {
+    [CallWith=ScriptExecutionContext] Entry webkitGetAsEntry();
+};
  
-    interface [
-        Conditional=DATA_TRANSFER_ITEMS&FILE_SYSTEM,
-        Supplemental=DataTransferItem
-    ] DataTransferItemFileSystem {
-        [CallWith=ScriptExecutionContext] Entry webkitGetAsEntry();
-    };
-
-}
diff --git a/Source/WebCore/Modules/filesystem/DirectoryEntry.idl b/Source/WebCore/Modules/filesystem/DirectoryEntry.idl

index b4737b4..0a41b02 100644 (file)
--- a/Source/WebCore/Modules/filesystem/DirectoryEntry.idl
+++ b/Source/WebCore/Modules/filesystem/DirectoryEntry.idl
@@ -28,16 +28,14 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-    interface [
-        Conditional=FILE_SYSTEM,
-        JSGenerateToNativeObject,
-        JSGenerateToJSObject,
-        JSNoStaticTables
-    ] DirectoryEntry : Entry {
-        DirectoryReader createReader();
-        void getFile(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString path, in [Optional] Dictionary options, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
-        void getDirectory(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString path, in [Optional] Dictionary options, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
-        void removeRecursively(in [Callback] VoidCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
-    };
-}
+interface [
+    Conditional=FILE_SYSTEM,
+    JSGenerateToNativeObject,
+    JSGenerateToJSObject,
+    JSNoStaticTables
+] DirectoryEntry : Entry {
+    DirectoryReader createReader();
+    void getFile(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString path, in [Optional] Dictionary options, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
+    void getDirectory(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString path, in [Optional] Dictionary options, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
+    void removeRecursively(in [Callback] VoidCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
+};
diff --git a/Source/WebCore/Modules/filesystem/DirectoryEntrySync.idl b/Source/WebCore/Modules/filesystem/DirectoryEntrySync.idl

index 13c3aab..4fc9923 100644 (file)
--- a/Source/WebCore/Modules/filesystem/DirectoryEntrySync.idl
+++ b/Source/WebCore/Modules/filesystem/DirectoryEntrySync.idl
@@ -28,16 +28,14 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-    interface [
-        Conditional=FILE_SYSTEM,
-        JSGenerateToNativeObject,
-        JSGenerateToJSObject,
-        JSNoStaticTables
-    ] DirectoryEntrySync : EntrySync {
-        DirectoryReaderSync createReader() raises (FileException);
-        FileEntrySync getFile(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString path, in Dictionary flags) raises (FileException);
-        DirectoryEntrySync getDirectory(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString path, in Dictionary flags) raises (FileException);
-        void removeRecursively() raises (FileException);
-    };
-}
+interface [
+    Conditional=FILE_SYSTEM,
+    JSGenerateToNativeObject,
+    JSGenerateToJSObject,
+    JSNoStaticTables
+] DirectoryEntrySync : EntrySync {
+    DirectoryReaderSync createReader() raises (FileException);
+    FileEntrySync getFile(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString path, in Dictionary flags) raises (FileException);
+    DirectoryEntrySync getDirectory(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString path, in Dictionary flags) raises (FileException);
+    void removeRecursively() raises (FileException);
+};
diff --git a/Source/WebCore/Modules/filesystem/DirectoryReader.idl b/Source/WebCore/Modules/filesystem/DirectoryReader.idl

index 87ce852..a7baa50 100644 (file)
--- a/Source/WebCore/Modules/filesystem/DirectoryReader.idl
+++ b/Source/WebCore/Modules/filesystem/DirectoryReader.idl
@@ -28,11 +28,9 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-    interface [
-        Conditional=FILE_SYSTEM,
-        JSNoStaticTables
-    ] DirectoryReader {
-        void readEntries(in [Callback] EntriesCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
-    };
-}
+interface [
+    Conditional=FILE_SYSTEM,
+    JSNoStaticTables
+] DirectoryReader {
+    void readEntries(in [Callback] EntriesCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
+};
diff --git a/Source/WebCore/Modules/filesystem/DirectoryReaderSync.idl b/Source/WebCore/Modules/filesystem/DirectoryReaderSync.idl

index a8ff685..2e71772 100644 (file)
--- a/Source/WebCore/Modules/filesystem/DirectoryReaderSync.idl
+++ b/Source/WebCore/Modules/filesystem/DirectoryReaderSync.idl
@@ -28,11 +28,9 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-    interface [
-        Conditional=FILE_SYSTEM,
-        JSNoStaticTables
-    ] DirectoryReaderSync {
-        EntryArraySync readEntries() raises (FileException);
-    };
-}
+interface [
+    Conditional=FILE_SYSTEM,
+    JSNoStaticTables
+] DirectoryReaderSync {
+    EntryArraySync readEntries() raises (FileException);
+};
diff --git a/Source/WebCore/Modules/filesystem/EntriesCallback.idl b/Source/WebCore/Modules/filesystem/EntriesCallback.idl

index 73b374d..9726a55 100644 (file)
--- a/Source/WebCore/Modules/filesystem/EntriesCallback.idl
+++ b/Source/WebCore/Modules/filesystem/EntriesCallback.idl
@@ -28,11 +28,9 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-    interface [
-        Conditional=FILE_SYSTEM,
-        Callback
-    ] EntriesCallback {
-        boolean handleEvent(in EntryArray entries);
-    };
-}
+interface [
+    Conditional=FILE_SYSTEM,
+    Callback
+] EntriesCallback {
+    boolean handleEvent(in EntryArray entries);
+};
diff --git a/Source/WebCore/Modules/filesystem/Entry.idl b/Source/WebCore/Modules/filesystem/Entry.idl

index c6cdba5..a068f3f 100644 (file)
--- a/Source/WebCore/Modules/filesystem/Entry.idl
+++ b/Source/WebCore/Modules/filesystem/Entry.idl
@@ -28,23 +28,21 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-    interface [
-        Conditional=FILE_SYSTEM,
-        CustomToJSObject,
-        JSNoStaticTables
-    ] Entry {
-        readonly attribute boolean isFile;
-        readonly attribute boolean isDirectory;
-        readonly attribute DOMString name;
-        readonly attribute DOMString fullPath;
-        readonly attribute DOMFileSystem filesystem;
+interface [
+    Conditional=FILE_SYSTEM,
+    CustomToJSObject,
+    JSNoStaticTables
+] Entry {
+    readonly attribute boolean isFile;
+    readonly attribute boolean isDirectory;
+    readonly attribute DOMString name;
+    readonly attribute DOMString fullPath;
+    readonly attribute DOMFileSystem filesystem;
  
-        void getMetadata(in [Callback] MetadataCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
-        void moveTo(in DirectoryEntry parent, in [Optional, TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString name, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
-        void copyTo(in DirectoryEntry parent, in [Optional, TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString name, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
-        DOMString toURL();
-        void remove(in [Callback] VoidCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
-        void getParent(in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
-    };
-}
+    void getMetadata(in [Callback] MetadataCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
+    void moveTo(in DirectoryEntry parent, in [Optional, TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString name, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
+    void copyTo(in DirectoryEntry parent, in [Optional, TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString name, in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
+    DOMString toURL();
+    void remove(in [Callback] VoidCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
+    void getParent(in [Optional, Callback] EntryCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
+};
diff --git a/Source/WebCore/Modules/filesystem/EntryArray.idl b/Source/WebCore/Modules/filesystem/EntryArray.idl

index 324dbc6..8d9ad19 100644 (file)
--- a/Source/WebCore/Modules/filesystem/EntryArray.idl
+++ b/Source/WebCore/Modules/filesystem/EntryArray.idl
@@ -28,13 +28,11 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-    interface [
-        Conditional=FILE_SYSTEM,
-        IndexedGetter,
-        JSNoStaticTables
-    ] EntryArray {
-        readonly attribute unsigned long length;
-        Entry item(in [IsIndex] unsigned long index);
-    };
-}
+interface [
+    Conditional=FILE_SYSTEM,
+    IndexedGetter,
+    JSNoStaticTables
+] EntryArray {
+    readonly attribute unsigned long length;
+    Entry item(in [IsIndex] unsigned long index);
+};
diff --git a/Source/WebCore/Modules/filesystem/EntryArraySync.idl b/Source/WebCore/Modules/filesystem/EntryArraySync.idl

index 224a68a..072a2ab 100644 (file)
--- a/Source/WebCore/Modules/filesystem/EntryArraySync.idl
+++ b/Source/WebCore/Modules/filesystem/EntryArraySync.idl
@@ -28,13 +28,11 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-    interface [
-        Conditional=FILE_SYSTEM,
-        IndexedGetter,
-        JSNoStaticTables
-    ] EntryArraySync {
-        readonly attribute unsigned long length;
-        EntrySync item(in [IsIndex] unsigned long index);
-    };
-}
+interface [
+    Conditional=FILE_SYSTEM,
+    IndexedGetter,
+    JSNoStaticTables
+] EntryArraySync {
+    readonly attribute unsigned long length;
+    EntrySync item(in [IsIndex] unsigned long index);
+};
diff --git a/Source/WebCore/Modules/filesystem/EntryCallback.idl b/Source/WebCore/Modules/filesystem/EntryCallback.idl

index bea3fd1..cf3d578 100644 (file)
--- a/Source/WebCore/Modules/filesystem/EntryCallback.idl
+++ b/Source/WebCore/Modules/filesystem/EntryCallback.idl
@@ -28,11 +28,9 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-    interface [
-        Conditional=FILE_SYSTEM,
-        Callback
-    ] EntryCallback {
-        boolean handleEvent(in Entry entry);
-    };
-}
+interface [
+    Conditional=FILE_SYSTEM,
+    Callback
+] EntryCallback {
+    boolean handleEvent(in Entry entry);
+};
diff --git a/Source/WebCore/Modules/filesystem/EntrySync.idl b/Source/WebCore/Modules/filesystem/EntrySync.idl

index cd4bae7..9e3088c 100644 (file)
--- a/Source/WebCore/Modules/filesystem/EntrySync.idl
+++ b/Source/WebCore/Modules/filesystem/EntrySync.idl
@@ -28,23 +28,21 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-    interface [
-        Conditional=FILE_SYSTEM,
-        CustomToJSObject,
-        JSNoStaticTables
-    ] EntrySync {
-        readonly attribute boolean isFile;
-        readonly attribute boolean isDirectory;
-        readonly attribute DOMString name;
-        readonly attribute DOMString fullPath;
-        readonly attribute DOMFileSystemSync filesystem;
+interface [
+    Conditional=FILE_SYSTEM,
+    CustomToJSObject,
+    JSNoStaticTables
+] EntrySync {
+    readonly attribute boolean isFile;
+    readonly attribute boolean isDirectory;
+    readonly attribute DOMString name;
+    readonly attribute DOMString fullPath;
+    readonly attribute DOMFileSystemSync filesystem;
  
-        Metadata getMetadata() raises (FileException);
-        EntrySync moveTo(in DirectoryEntrySync parent, in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString name) raises (FileException);
-        EntrySync copyTo(in DirectoryEntrySync parent, in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString name) raises (FileException);
-        DOMString toURL();
-        void remove() raises (FileException);
-        DirectoryEntrySync getParent();
-    };
-}
+    Metadata getMetadata() raises (FileException);
+    EntrySync moveTo(in DirectoryEntrySync parent, in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString name) raises (FileException);
+    EntrySync copyTo(in DirectoryEntrySync parent, in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString name) raises (FileException);
+    DOMString toURL();
+    void remove() raises (FileException);
+    DirectoryEntrySync getParent();
+};
diff --git a/Source/WebCore/Modules/filesystem/ErrorCallback.idl b/Source/WebCore/Modules/filesystem/ErrorCallback.idl

index fc7fa85..a763274 100644 (file)
--- a/Source/WebCore/Modules/filesystem/ErrorCallback.idl
+++ b/Source/WebCore/Modules/filesystem/ErrorCallback.idl
@@ -28,11 +28,9 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-    interface [
-        Conditional=FILE_SYSTEM,
-        Callback
-    ] ErrorCallback {
-        boolean handleEvent(in FileError error);
-    };
-}
+interface [
+    Conditional=FILE_SYSTEM,
+    Callback
+] ErrorCallback {
+    boolean handleEvent(in FileError error);
+};
diff --git a/Source/WebCore/Modules/filesystem/FileCallback.idl b/Source/WebCore/Modules/filesystem/FileCallback.idl

index 0ab814f..ddbae31 100644 (file)
--- a/Source/WebCore/Modules/filesystem/FileCallback.idl
+++ b/Source/WebCore/Modules/filesystem/FileCallback.idl
@@ -28,11 +28,9 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module fileapi {
-    interface [
-        Conditional=FILE_SYSTEM,
-        Callback
-    ] FileCallback {
-        boolean handleEvent(in File file);
-    };
-}
+interface [
+    Conditional=FILE_SYSTEM,
+    Callback
+] FileCallback {
+    boolean handleEvent(in File file);
+};
diff --git a/Source/WebCore/Modules/filesystem/FileEntry.idl b/Source/WebCore/Modules/filesystem/FileEntry.idl

index 63b0040..d83f5d2 100644 (file)
--- a/Source/WebCore/Modules/filesystem/FileEntry.idl
+++ b/Source/WebCore/Modules/filesystem/FileEntry.idl
@@ -28,14 +28,12 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-    interface [
-        Conditional=FILE_SYSTEM,
-        JSGenerateToNativeObject,
-        JSGenerateToJSObject,
-        JSNoStaticTables
-    ] FileEntry : Entry {
-        void createWriter(in [Callback] FileWriterCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
-        void file(in [Callback] FileCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
-    };
-}
+interface [
+    Conditional=FILE_SYSTEM,
+    JSGenerateToNativeObject,
+    JSGenerateToJSObject,
+    JSNoStaticTables
+] FileEntry : Entry {
+    void createWriter(in [Callback] FileWriterCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
+    void file(in [Callback] FileCallback successCallback, in [Optional, Callback] ErrorCallback errorCallback);
+};
diff --git a/Source/WebCore/Modules/filesystem/FileEntrySync.idl b/Source/WebCore/Modules/filesystem/FileEntrySync.idl

index 8ac40ba..53052c6 100644 (file)
--- a/Source/WebCore/Modules/filesystem/FileEntrySync.idl
+++ b/Source/WebCore/Modules/filesystem/FileEntrySync.idl
@@ -28,14 +28,12 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-    interface [
-        Conditional=FILE_SYSTEM,
-        JSGenerateToNativeObject,
-        JSGenerateToJSObject,
-        JSNoStaticTables
-    ] FileEntrySync : EntrySync {
-        File file() raises (FileException);
-        FileWriterSync createWriter() raises (FileException);
-    };
-}
+interface [
+    Conditional=FILE_SYSTEM,
+    JSGenerateToNativeObject,
+    JSGenerateToJSObject,
+    JSNoStaticTables
+] FileEntrySync : EntrySync {
+    File file() raises (FileException);
+    FileWriterSync createWriter() raises (FileException);
+};
diff --git a/Source/WebCore/Modules/filesystem/FileSystemCallback.idl b/Source/WebCore/Modules/filesystem/FileSystemCallback.idl

index cf686ff..940e238 100644 (file)
--- a/Source/WebCore/Modules/filesystem/FileSystemCallback.idl
+++ b/Source/WebCore/Modules/filesystem/FileSystemCallback.idl
@@ -28,11 +28,9 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-    interface [
-        Conditional=FILE_SYSTEM,
-        Callback
-    ] FileSystemCallback {
-        boolean handleEvent(in DOMFileSystem fileSystem);
-    };
-}
+interface [
+    Conditional=FILE_SYSTEM,
+    Callback
+] FileSystemCallback {
+    boolean handleEvent(in DOMFileSystem fileSystem);
+};
diff --git a/Source/WebCore/Modules/filesystem/FileWriter.idl b/Source/WebCore/Modules/filesystem/FileWriter.idl

index 754fa0f..e95764d 100644 (file)
--- a/Source/WebCore/Modules/filesystem/FileWriter.idl
+++ b/Source/WebCore/Modules/filesystem/FileWriter.idl
@@ -29,46 +29,44 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module html {
-    interface [
-        Conditional=FILE_SYSTEM,
-        ActiveDOMObject,
-        CallWith=ScriptExecutionContext,
-        EventTarget,
-        JSNoStaticTables
-    ] FileWriter {
-        // ready states
-        const unsigned short INIT = 0;
-        const unsigned short WRITING = 1;
-        const unsigned short DONE = 2;
-        readonly attribute unsigned short readyState;
+interface [
+    Conditional=FILE_SYSTEM,
+    ActiveDOMObject,
+    CallWith=ScriptExecutionContext,
+    EventTarget,
+    JSNoStaticTables
+] FileWriter {
+    // ready states
+    const unsigned short INIT = 0;
+    const unsigned short WRITING = 1;
+    const unsigned short DONE = 2;
+    readonly attribute unsigned short readyState;
  
-        // async write/modify methods
-        void write(in Blob data) raises (FileException);
-        void seek(in long long position) raises (FileException);
-        void truncate(in long long size) raises (FileException);
+    // async write/modify methods
+    void write(in Blob data) raises (FileException);
+    void seek(in long long position) raises (FileException);
+    void truncate(in long long size) raises (FileException);
  
-        void abort() raises (FileException);
+    void abort() raises (FileException);
  
-        readonly attribute FileError error;
-        readonly attribute long long position;
-        readonly attribute long long length;
+    readonly attribute FileError error;
+    readonly attribute long long position;
+    readonly attribute long long length;
  
-                 attribute EventListener onwritestart;
-                 attribute EventListener onprogress;
-                 attribute EventListener onwrite;
-                 attribute EventListener onabort;
-                 attribute EventListener onerror;
-                 attribute EventListener onwriteend;
+             attribute EventListener onwritestart;
+             attribute EventListener onprogress;
+             attribute EventListener onwrite;
+             attribute EventListener onabort;
+             attribute EventListener onerror;
+             attribute EventListener onwriteend;
  
-        // EventTarget interface
-        void addEventListener(in DOMString type,
-                              in EventListener listener,
-                              in [Optional] boolean useCapture);
-        void removeEventListener(in DOMString type,
-                                 in EventListener listener,
-                                 in [Optional] boolean useCapture);
-        boolean dispatchEvent(in Event evt)
-            raises(EventException);
-    };
-}
+    // EventTarget interface
+    void addEventListener(in DOMString type,
+                          in EventListener listener,
+                          in [Optional] boolean useCapture);
+    void removeEventListener(in DOMString type,
+                             in EventListener listener,
+                             in [Optional] boolean useCapture);
+    boolean dispatchEvent(in Event evt)
+        raises(EventException);
+};
diff --git a/Source/WebCore/Modules/filesystem/FileWriterCallback.idl b/Source/WebCore/Modules/filesystem/FileWriterCallback.idl

index df82fed..b4d1b50 100644 (file)
--- a/Source/WebCore/Modules/filesystem/FileWriterCallback.idl
+++ b/Source/WebCore/Modules/filesystem/FileWriterCallback.idl
@@ -28,11 +28,9 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module fileapi {
-    interface [
-        Conditional=FILE_SYSTEM,
-        Callback
-    ] FileWriterCallback {
-        boolean handleEvent(in FileWriter fileWriter);
-    };
-}
+interface [
+    Conditional=FILE_SYSTEM,
+    Callback
+] FileWriterCallback {
+    boolean handleEvent(in FileWriter fileWriter);
+};
diff --git a/Source/WebCore/Modules/filesystem/FileWriterSync.idl b/Source/WebCore/Modules/filesystem/FileWriterSync.idl

index 57cd256..264bb95 100644 (file)
--- a/Source/WebCore/Modules/filesystem/FileWriterSync.idl
+++ b/Source/WebCore/Modules/filesystem/FileWriterSync.idl
@@ -28,17 +28,15 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module html {
-    interface [
-        Conditional=FILE_SYSTEM,
-        JSNoStaticTables
-    ] FileWriterSync {
-        // synchronous write/modify methods
-        void write(in Blob data) raises (FileException);
-        void seek(in long long position) raises (FileException);
-        void truncate(in long long size) raises (FileException);
+interface [
+    Conditional=FILE_SYSTEM,
+    JSNoStaticTables
+] FileWriterSync {
+    // synchronous write/modify methods
+    void write(in Blob data) raises (FileException);
+    void seek(in long long position) raises (FileException);
+    void truncate(in long long size) raises (FileException);
  
-        readonly attribute long long position;
-        readonly attribute long long length;
-    };
-}
+    readonly attribute long long position;
+    readonly attribute long long length;
+};
diff --git a/Source/WebCore/Modules/filesystem/HTMLInputElementFileSystem.idl b/Source/WebCore/Modules/filesystem/HTMLInputElementFileSystem.idl

index d1c10a4..3222c2b 100644 (file)
--- a/Source/WebCore/Modules/filesystem/HTMLInputElementFileSystem.idl
+++ b/Source/WebCore/Modules/filesystem/HTMLInputElementFileSystem.idl
@@ -28,14 +28,10 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module core {
-
-    interface [
-        Conditional=FILE_SYSTEM,
-        Supplemental=HTMLInputElement
-    ] HTMLInputElementFileSystem {
-        readonly attribute [V8EnabledAtRuntime=FileSystem,CallWith=ScriptExecutionContext] EntryArray webkitEntries;
-    };
-
-}
+interface [
+    Conditional=FILE_SYSTEM,
+    Supplemental=HTMLInputElement
+] HTMLInputElementFileSystem {
+    readonly attribute [V8EnabledAtRuntime=FileSystem,CallWith=ScriptExecutionContext] EntryArray webkitEntries;
+};
  
diff --git a/Source/WebCore/Modules/filesystem/Metadata.idl b/Source/WebCore/Modules/filesystem/Metadata.idl

index ceaf21b..2a46741 100644 (file)
--- a/Source/WebCore/Modules/filesystem/Metadata.idl
+++ b/Source/WebCore/Modules/filesystem/Metadata.idl
@@ -28,12 +28,10 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-    interface [
-        Conditional=FILE_SYSTEM,
-        JSNoStaticTables
-    ] Metadata {
-        readonly attribute Date modificationTime;
-        readonly attribute unsigned long long size;
-    };
-}
+interface [
+    Conditional=FILE_SYSTEM,
+    JSNoStaticTables
+] Metadata {
+    readonly attribute Date modificationTime;
+    readonly attribute unsigned long long size;
+};
diff --git a/Source/WebCore/Modules/filesystem/MetadataCallback.idl b/Source/WebCore/Modules/filesystem/MetadataCallback.idl

index 44ca180..3981a1c 100644 (file)
--- a/Source/WebCore/Modules/filesystem/MetadataCallback.idl
+++ b/Source/WebCore/Modules/filesystem/MetadataCallback.idl
@@ -28,11 +28,9 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-    interface [
-        Conditional=FILE_SYSTEM,
-        Callback
-    ] MetadataCallback {
-        boolean handleEvent(in Metadata metadata);
-    };
-}
+interface [
+    Conditional=FILE_SYSTEM,
+    Callback
+] MetadataCallback {
+    boolean handleEvent(in Metadata metadata);
+};
diff --git a/Source/WebCore/Modules/filesystem/WorkerContextFileSystem.idl b/Source/WebCore/Modules/filesystem/WorkerContextFileSystem.idl

index befc0f5..6636167 100644 (file)
--- a/Source/WebCore/Modules/filesystem/WorkerContextFileSystem.idl
+++ b/Source/WebCore/Modules/filesystem/WorkerContextFileSystem.idl
@@ -24,22 +24,19 @@
   *
   */
  
-module threads {
+interface [
+    Conditional=FILE_SYSTEM,
+    Supplemental=WorkerContext
+] WorkerContextFileSystem {
+    const unsigned short TEMPORARY = 0;
+    const unsigned short PERSISTENT = 1;
  
-    interface [
-        Conditional=FILE_SYSTEM,
-        Supplemental=WorkerContext
-    ] WorkerContextFileSystem {
-        const unsigned short TEMPORARY = 0;
-        const unsigned short PERSISTENT = 1;
+    [V8EnabledAtRuntime=FileSystem] void webkitRequestFileSystem(in unsigned short type, in long long size, in [Callback, Optional] FileSystemCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback);
+    [V8EnabledAtRuntime=FileSystem] DOMFileSystemSync webkitRequestFileSystemSync(in unsigned short type, in long long size) raises (FileException);
+    [V8EnabledAtRuntime=FileSystem] void webkitResolveLocalFileSystemURL(in DOMString url, in [Callback] EntryCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback);
+    [V8EnabledAtRuntime=FileSystem] EntrySync webkitResolveLocalFileSystemSyncURL(in DOMString url) raises (FileException);
  
-        [V8EnabledAtRuntime=FileSystem] void webkitRequestFileSystem(in unsigned short type, in long long size, in [Callback, Optional] FileSystemCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback);
-        [V8EnabledAtRuntime=FileSystem] DOMFileSystemSync webkitRequestFileSystemSync(in unsigned short type, in long long size) raises (FileException);
-        [V8EnabledAtRuntime=FileSystem] void webkitResolveLocalFileSystemURL(in DOMString url, in [Callback] EntryCallback successCallback, in [Callback, Optional] ErrorCallback errorCallback);
-        [V8EnabledAtRuntime=FileSystem] EntrySync webkitResolveLocalFileSystemSyncURL(in DOMString url) raises (FileException);
+    attribute [V8EnabledAtRuntime=FileSystem] FileErrorConstructor FileError;
+    attribute [V8EnabledAtRuntime=FileSystem] FileExceptionConstructor FileException;
+};
  
-        attribute [V8EnabledAtRuntime=FileSystem] FileErrorConstructor FileError;
-        attribute [V8EnabledAtRuntime=FileSystem] FileExceptionConstructor FileException;
-    };
-
-}
diff --git a/Source/WebCore/Modules/gamepad/Gamepad.idl b/Source/WebCore/Modules/gamepad/Gamepad.idl

index e00e2dc..e2b0006 100644 (file)
--- a/Source/WebCore/Modules/gamepad/Gamepad.idl
+++ b/Source/WebCore/Modules/gamepad/Gamepad.idl
@@ -23,16 +23,13 @@
   * DAMAGE.
   */
  
-module dom {
+interface [
+    Conditional=GAMEPAD
+] Gamepad {
+    readonly attribute DOMString id;
+    readonly attribute unsigned long index;
+    readonly attribute unsigned long long timestamp;
+    readonly attribute float[] axes;
+    readonly attribute float[] buttons;
+};
  
-    interface [
-        Conditional=GAMEPAD
-    ] Gamepad {
-        readonly attribute DOMString id;
-        readonly attribute unsigned long index;
-        readonly attribute unsigned long long timestamp;
-        readonly attribute float[] axes;
-        readonly attribute float[] buttons;
-    };
-
-}
diff --git a/Source/WebCore/Modules/gamepad/GamepadList.idl b/Source/WebCore/Modules/gamepad/GamepadList.idl

index 4f1e1df..4fea9a9 100644 (file)
--- a/Source/WebCore/Modules/gamepad/GamepadList.idl
+++ b/Source/WebCore/Modules/gamepad/GamepadList.idl
@@ -23,14 +23,11 @@
   * DAMAGE.
   */
  
-module dom {
+interface [
+    Conditional=GAMEPAD,
+    IndexedGetter
+] GamepadList {
+    readonly attribute unsigned long length;
+    Gamepad item(in [Optional=DefaultIsUndefined] unsigned long index);
+};
  
-    interface [
-        Conditional=GAMEPAD,
-        IndexedGetter
-    ] GamepadList {
-        readonly attribute unsigned long length;
-        Gamepad item(in [Optional=DefaultIsUndefined] unsigned long index);
-    };
-
-}
diff --git a/Source/WebCore/Modules/gamepad/NavigatorGamepad.idl b/Source/WebCore/Modules/gamepad/NavigatorGamepad.idl

index 3e4985b..9554b8f 100644 (file)
--- a/Source/WebCore/Modules/gamepad/NavigatorGamepad.idl
+++ b/Source/WebCore/Modules/gamepad/NavigatorGamepad.idl
@@ -17,13 +17,10 @@
   * Boston, MA 02110-1301, USA.
   */
  
-module window {
+interface [
+    Conditional=GAMEPAD,
+    Supplemental=Navigator
+] NavigatorGamepad {
+    [V8EnabledAtRuntime] GamepadList webkitGetGamepads();
+};
  
-    interface [
-        Conditional=GAMEPAD,
-        Supplemental=Navigator
-    ] NavigatorGamepad {
-        [V8EnabledAtRuntime] GamepadList webkitGetGamepads();
-    };
-
-}
diff --git a/Source/WebCore/Modules/geolocation/Geolocation.idl b/Source/WebCore/Modules/geolocation/Geolocation.idl

index 4f159bc..f27be58 100644 (file)
--- a/Source/WebCore/Modules/geolocation/Geolocation.idl
+++ b/Source/WebCore/Modules/geolocation/Geolocation.idl
@@ -23,23 +23,20 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
   */
  
-module core {
+// http://www.w3.org/TR/geolocation-API/#geolocation_interface
+interface [
+    Conditional=GEOLOCATION, 
+    JSGenerateIsReachable=ImplFrame,
+    OmitConstructor
+] Geolocation {
+    [Custom] void getCurrentPosition(in PositionCallback successCallback,
+                                     in [Optional] PositionErrorCallback errorCallback,
+                                     in [Optional] PositionOptions options);
  
-    // http://www.w3.org/TR/geolocation-API/#geolocation_interface
-    interface [
-        Conditional=GEOLOCATION, 
-        JSGenerateIsReachable=ImplFrame,
-        OmitConstructor
-    ] Geolocation {
-        [Custom] void getCurrentPosition(in PositionCallback successCallback,
-                                         in [Optional] PositionErrorCallback errorCallback,
-                                         in [Optional] PositionOptions options);
+    [Custom] long watchPosition(in PositionCallback successCallback,
+                                in [Optional] PositionErrorCallback errorCallback,
+                                in [Optional] PositionOptions options);
  
-        [Custom] long watchPosition(in PositionCallback successCallback,
-                                    in [Optional] PositionErrorCallback errorCallback,
-                                    in [Optional] PositionOptions options);
+    void clearWatch(in long watchId);
+};
  
-        void clearWatch(in long watchId);
-    };
-
-}
diff --git a/Source/WebCore/Modules/geolocation/Geoposition.idl b/Source/WebCore/Modules/geolocation/Geoposition.idl

index cbe728a..00d9ddb 100644 (file)
--- a/Source/WebCore/Modules/geolocation/Geoposition.idl
+++ b/Source/WebCore/Modules/geolocation/Geoposition.idl
@@ -23,13 +23,10 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
   */
  
-module core {
-
-    interface [
-        Conditional=GEOLOCATION,
-        OmitConstructor
-    ] Geoposition {
-        readonly attribute Coordinates coords;
-        readonly attribute DOMTimeStamp timestamp;
-    };
-}
+interface [
+    Conditional=GEOLOCATION,
+    OmitConstructor
+] Geoposition {
+    readonly attribute Coordinates coords;
+    readonly attribute DOMTimeStamp timestamp;
+};
diff --git a/Source/WebCore/Modules/geolocation/NavigatorGeolocation.idl b/Source/WebCore/Modules/geolocation/NavigatorGeolocation.idl

index e0b8f0e..00a4034 100644 (file)
--- a/Source/WebCore/Modules/geolocation/NavigatorGeolocation.idl
+++ b/Source/WebCore/Modules/geolocation/NavigatorGeolocation.idl
@@ -17,13 +17,10 @@
   * Boston, MA 02110-1301, USA.
   */
  
-module window {
+interface [
+    Conditional=GEOLOCATION,
+    Supplemental=Navigator
+] NavigatorGeolocation {
+    readonly attribute [V8EnabledAtRuntime] Geolocation geolocation;
+};
  
-    interface [
-        Conditional=GEOLOCATION,
-        Supplemental=Navigator
-    ] NavigatorGeolocation {
-        readonly attribute [V8EnabledAtRuntime] Geolocation geolocation;
-    };
-
-}
diff --git a/Source/WebCore/Modules/geolocation/PositionCallback.idl b/Source/WebCore/Modules/geolocation/PositionCallback.idl

index 39cfa34..96b8313 100644 (file)
--- a/Source/WebCore/Modules/geolocation/PositionCallback.idl
+++ b/Source/WebCore/Modules/geolocation/PositionCallback.idl
@@ -22,11 +22,9 @@
   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module core {
-    interface [
-        Conditional=GEOLOCATION,
-        Callback
-    ] PositionCallback {
-        boolean handleEvent(in Geoposition position);
-    };
-}
+interface [
+    Conditional=GEOLOCATION,
+    Callback
+] PositionCallback {
+    boolean handleEvent(in Geoposition position);
+};
diff --git a/Source/WebCore/Modules/geolocation/PositionError.idl b/Source/WebCore/Modules/geolocation/PositionError.idl

index 98e036f..e1f23d6 100644 (file)
--- a/Source/WebCore/Modules/geolocation/PositionError.idl
+++ b/Source/WebCore/Modules/geolocation/PositionError.idl
@@ -23,17 +23,14 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
   */
  
-module core {
+interface [
+    Conditional=GEOLOCATION
+] PositionError {
+    readonly attribute unsigned short code;
+    readonly attribute DOMString message;
  
-    interface [
-        Conditional=GEOLOCATION
-    ] PositionError {
-        readonly attribute unsigned short code;
-        readonly attribute DOMString message;
+    const unsigned short PERMISSION_DENIED = 1;
+    const unsigned short POSITION_UNAVAILABLE = 2;
+    const unsigned short TIMEOUT = 3;
+};
  
-        const unsigned short PERMISSION_DENIED = 1;
-        const unsigned short POSITION_UNAVAILABLE = 2;
-        const unsigned short TIMEOUT = 3;
-    };
-
-}
diff --git a/Source/WebCore/Modules/geolocation/PositionErrorCallback.idl b/Source/WebCore/Modules/geolocation/PositionErrorCallback.idl

index a7dc932..cd4fa31 100644 (file)
--- a/Source/WebCore/Modules/geolocation/PositionErrorCallback.idl
+++ b/Source/WebCore/Modules/geolocation/PositionErrorCallback.idl
@@ -22,11 +22,9 @@
   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module core {
-    interface [
-        Conditional=GEOLOCATION,
-        Callback
-    ] PositionErrorCallback {
-        boolean handleEvent(in PositionError error);
-    };
-}
+interface [
+    Conditional=GEOLOCATION,
+    Callback
+] PositionErrorCallback {
+    boolean handleEvent(in PositionError error);
+};
diff --git a/Source/WebCore/Modules/indexeddb/DOMWindowIndexedDatabase.idl b/Source/WebCore/Modules/indexeddb/DOMWindowIndexedDatabase.idl

index de1d19a..5f3d656 100644 (file)
--- a/Source/WebCore/Modules/indexeddb/DOMWindowIndexedDatabase.idl
+++ b/Source/WebCore/Modules/indexeddb/DOMWindowIndexedDatabase.idl
@@ -24,38 +24,35 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module window {
+interface [
+    Conditional=INDEXED_DATABASE,
+    Supplemental=DOMWindow
+] DOMWindowIndexedDatabase {
+    readonly attribute [ImplementedAs=indexedDB,V8MeasureAs=PrefixedIndexedDB] IDBFactory webkitIndexedDB;
  
-    interface [
-        Conditional=INDEXED_DATABASE,
-        Supplemental=DOMWindow
-    ] DOMWindowIndexedDatabase {
-        readonly attribute [ImplementedAs=indexedDB,V8MeasureAs=PrefixedIndexedDB] IDBFactory webkitIndexedDB;
+    attribute IDBCursorConstructor webkitIDBCursor;
+    attribute IDBDatabaseConstructor webkitIDBDatabase;
+    attribute IDBDatabaseExceptionConstructor webkitIDBDatabaseException;
+    attribute IDBFactoryConstructor webkitIDBFactory;
+    attribute IDBIndexConstructor webkitIDBIndex;
+    attribute IDBKeyRangeConstructor webkitIDBKeyRange;
+    attribute IDBObjectStoreConstructor webkitIDBObjectStore;
+    attribute IDBRequestConstructor webkitIDBRequest;
+    attribute IDBTransactionConstructor webkitIDBTransaction;
  
-        attribute IDBCursorConstructor webkitIDBCursor;
-        attribute IDBDatabaseConstructor webkitIDBDatabase;
-        attribute IDBDatabaseExceptionConstructor webkitIDBDatabaseException;
-        attribute IDBFactoryConstructor webkitIDBFactory;
-        attribute IDBIndexConstructor webkitIDBIndex;
-        attribute IDBKeyRangeConstructor webkitIDBKeyRange;
-        attribute IDBObjectStoreConstructor webkitIDBObjectStore;
-        attribute IDBRequestConstructor webkitIDBRequest;
-        attribute IDBTransactionConstructor webkitIDBTransaction;
+    readonly attribute [V8MeasureAs=UnprefixedIndexedDB] IDBFactory indexedDB;
  
-        readonly attribute [V8MeasureAs=UnprefixedIndexedDB] IDBFactory indexedDB;
+    attribute IDBCursorConstructor IDBCursor;
+    attribute IDBCursorWithValueConstructor IDBCursorWithValue;
+    attribute IDBDatabaseConstructor IDBDatabase;
+    attribute IDBDatabaseExceptionConstructor IDBDatabaseException;
+    attribute IDBFactoryConstructor IDBFactory;
+    attribute IDBIndexConstructor IDBIndex;
+    attribute IDBKeyRangeConstructor IDBKeyRange;
+    attribute IDBObjectStoreConstructor IDBObjectStore;
+    attribute IDBOpenDBRequestConstructor IDBOpenDBRequest;
+    attribute IDBRequestConstructor IDBRequest;
+    attribute IDBTransactionConstructor IDBTransaction;
+    attribute IDBVersionChangeEventConstructor IDBVersionChangeEvent;
+};
  
-        attribute IDBCursorConstructor IDBCursor;
-        attribute IDBCursorWithValueConstructor IDBCursorWithValue;
-        attribute IDBDatabaseConstructor IDBDatabase;
-        attribute IDBDatabaseExceptionConstructor IDBDatabaseException;
-        attribute IDBFactoryConstructor IDBFactory;
-        attribute IDBIndexConstructor IDBIndex;
-        attribute IDBKeyRangeConstructor IDBKeyRange;
-        attribute IDBObjectStoreConstructor IDBObjectStore;
-        attribute IDBOpenDBRequestConstructor IDBOpenDBRequest;
-        attribute IDBRequestConstructor IDBRequest;
-        attribute IDBTransactionConstructor IDBTransaction;
-        attribute IDBVersionChangeEventConstructor IDBVersionChangeEvent;
-    };
-
-}
diff --git a/Source/WebCore/Modules/indexeddb/IDBAny.idl b/Source/WebCore/Modules/indexeddb/IDBAny.idl

index dd51c4d..de1897f 100644 (file)
--- a/Source/WebCore/Modules/indexeddb/IDBAny.idl
+++ b/Source/WebCore/Modules/indexeddb/IDBAny.idl
@@ -23,12 +23,9 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-
-    interface [
-        Conditional=INDEXED_DATABASE,
-        CustomToJSObject
-    ] IDBAny {
-        // This space is intentionally left blank.
-    };
-}
+interface [
+    Conditional=INDEXED_DATABASE,
+    CustomToJSObject
+] IDBAny {
+    // This space is intentionally left blank.
+};
diff --git a/Source/WebCore/Modules/indexeddb/IDBCursor.idl b/Source/WebCore/Modules/indexeddb/IDBCursor.idl

index 516ce1b..afe761d 100644 (file)
--- a/Source/WebCore/Modules/indexeddb/IDBCursor.idl
+++ b/Source/WebCore/Modules/indexeddb/IDBCursor.idl
@@ -23,29 +23,26 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
+interface [
+    Conditional=INDEXED_DATABASE,
+] IDBCursor {
+    // FIXME: Eventually remove legacy enum constants, see https://bugs.webkit.org/show_bug.cgi?id=85315
+    const unsigned short NEXT = 0;
+    const unsigned short NEXT_NO_DUPLICATE = 1;
+    const unsigned short PREV = 2;
+    const unsigned short PREV_NO_DUPLICATE = 3;
  
-    interface [
-        Conditional=INDEXED_DATABASE,
-    ] IDBCursor {
-        // FIXME: Eventually remove legacy enum constants, see https://bugs.webkit.org/show_bug.cgi?id=85315
-        const unsigned short NEXT = 0;
-        const unsigned short NEXT_NO_DUPLICATE = 1;
-        const unsigned short PREV = 2;
-        const unsigned short PREV_NO_DUPLICATE = 3;
+    readonly attribute DOMString direction;
+    readonly attribute IDBKey key;
+    readonly attribute IDBKey primaryKey;
+    readonly attribute IDBAny source;
  
-        readonly attribute DOMString direction;
-        readonly attribute IDBKey key;
-        readonly attribute IDBKey primaryKey;
-        readonly attribute IDBAny source;
-
-        [CallWith=ScriptExecutionContext] IDBRequest update(in any value)
-            raises (IDBDatabaseException);
-        void advance(in unsigned long count)
-            raises (IDBDatabaseException);
-        [ImplementedAs=continueFunction] void continue(in [Optional] IDBKey key)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext, ImplementedAs=deleteFunction] IDBRequest delete()
-            raises (IDBDatabaseException);
-    };
-}
+    [CallWith=ScriptExecutionContext] IDBRequest update(in any value)
+        raises (IDBDatabaseException);
+    void advance(in unsigned long count)
+        raises (IDBDatabaseException);
+    [ImplementedAs=continueFunction] void continue(in [Optional] IDBKey key)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext, ImplementedAs=deleteFunction] IDBRequest delete()
+        raises (IDBDatabaseException);
+};
diff --git a/Source/WebCore/Modules/indexeddb/IDBCursorWithValue.idl b/Source/WebCore/Modules/indexeddb/IDBCursorWithValue.idl

index 512ea40..7291f97 100644 (file)
--- a/Source/WebCore/Modules/indexeddb/IDBCursorWithValue.idl
+++ b/Source/WebCore/Modules/indexeddb/IDBCursorWithValue.idl
@@ -23,11 +23,8 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-
-    interface [
-        Conditional=INDEXED_DATABASE
-    ] IDBCursorWithValue : IDBCursor {
-        readonly attribute [V8CustomGetter] IDBAny value;
-    };
-}
+interface [
+    Conditional=INDEXED_DATABASE
+] IDBCursorWithValue : IDBCursor {
+    readonly attribute [V8CustomGetter] IDBAny value;
+};
diff --git a/Source/WebCore/Modules/indexeddb/IDBDatabase.idl b/Source/WebCore/Modules/indexeddb/IDBDatabase.idl

index 48f1f1c..cb9af4e 100644 (file)
--- a/Source/WebCore/Modules/indexeddb/IDBDatabase.idl
+++ b/Source/WebCore/Modules/indexeddb/IDBDatabase.idl
@@ -24,45 +24,42 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
+interface [
+    Conditional=INDEXED_DATABASE,
+    ActiveDOMObject,
+    EventTarget
+] IDBDatabase {
+    readonly attribute DOMString name;
+    readonly attribute IDBAny version;
+    readonly attribute DOMStringList objectStoreNames;
  
-    interface [
-        Conditional=INDEXED_DATABASE,
-        ActiveDOMObject,
-        EventTarget
-    ] IDBDatabase {
-        readonly attribute DOMString name;
-        readonly attribute IDBAny version;
-        readonly attribute DOMStringList objectStoreNames;
+    attribute EventListener onabort;
+    attribute EventListener onerror;
+    attribute EventListener onversionchange;
  
-        attribute EventListener onabort;
-        attribute EventListener onerror;
-        attribute EventListener onversionchange;
+    IDBObjectStore createObjectStore(in DOMString name, in [Optional] Dictionary options)
+        raises (IDBDatabaseException);
+    void deleteObjectStore(in DOMString name)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext] IDBVersionChangeRequest setVersion(in DOMString version)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext] IDBTransaction transaction(in DOMStringList storeNames, in [Optional=DefaultIsNullString] DOMString mode)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext] IDBTransaction transaction(in DOMString[] storeNames, in [Optional=DefaultIsNullString] DOMString mode)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext] IDBTransaction transaction(in DOMString storeName, in [Optional=DefaultIsNullString] DOMString mode)
+        raises (IDBDatabaseException);
  
-        IDBObjectStore createObjectStore(in DOMString name, in [Optional] Dictionary options)
-            raises (IDBDatabaseException);
-        void deleteObjectStore(in DOMString name)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBVersionChangeRequest setVersion(in DOMString version)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBTransaction transaction(in DOMStringList storeNames, in [Optional=DefaultIsNullString] DOMString mode)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBTransaction transaction(in DOMString[] storeNames, in [Optional=DefaultIsNullString] DOMString mode)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBTransaction transaction(in DOMString storeName, in [Optional=DefaultIsNullString] DOMString mode)
-            raises (IDBDatabaseException);
+    void close();
  
-        void close();
+    // EventTarget interface
+    void addEventListener(in DOMString type,
+                          in EventListener listener,
+                          in [Optional] boolean useCapture);
+    void removeEventListener(in DOMString type,
+                             in EventListener listener,
+                             in [Optional] boolean useCapture);
+    boolean dispatchEvent(in Event evt)
+        raises(EventException);
+};
  
-        // EventTarget interface
-        void addEventListener(in DOMString type,
-                              in EventListener listener,
-                              in [Optional] boolean useCapture);
-        void removeEventListener(in DOMString type,
-                                 in EventListener listener,
-                                 in [Optional] boolean useCapture);
-        boolean dispatchEvent(in Event evt)
-            raises(EventException);
-    };
-
-}
diff --git a/Source/WebCore/Modules/indexeddb/IDBDatabaseException.idl b/Source/WebCore/Modules/indexeddb/IDBDatabaseException.idl

index 67d811c..7baa6a2 100644 (file)
--- a/Source/WebCore/Modules/indexeddb/IDBDatabaseException.idl
+++ b/Source/WebCore/Modules/indexeddb/IDBDatabaseException.idl
@@ -23,36 +23,33 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
+exception [
+    Conditional=INDEXED_DATABASE,
+    DoNotCheckConstants
+] IDBDatabaseException {
  
-    exception [
-        Conditional=INDEXED_DATABASE,
-        DoNotCheckConstants
-    ] IDBDatabaseException {
-
-        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
-        [NotEnumerable] DOMString toString();
+    // Override in a Mozilla compatible format
+    [NotEnumerable] DOMString toString();
  #endif
  
-        const unsigned short NO_ERR = 0;
-        const unsigned short UNKNOWN_ERR = 1;
-        const unsigned short NON_TRANSIENT_ERR = 2;
-        const unsigned short CONSTRAINT_ERR = 4;
-        const unsigned short DATA_ERR = 5;
-        const unsigned short NOT_ALLOWED_ERR = 6;
-        const unsigned short TRANSACTION_INACTIVE_ERR = 7;
-        const unsigned short READ_ONLY_ERR = 9;
-        const unsigned short VER_ERR = 12;
+    const unsigned short NO_ERR = 0;
+    const unsigned short UNKNOWN_ERR = 1;
+    const unsigned short NON_TRANSIENT_ERR = 2;
+    const unsigned short CONSTRAINT_ERR = 4;
+    const unsigned short DATA_ERR = 5;
+    const unsigned short NOT_ALLOWED_ERR = 6;
+    const unsigned short TRANSACTION_INACTIVE_ERR = 7;
+    const unsigned short READ_ONLY_ERR = 9;
+    const unsigned short VER_ERR = 12;
  
-        const unsigned short NOT_FOUND_ERR = 8;
-        const unsigned short ABORT_ERR = 20;
-        const unsigned short TIMEOUT_ERR = 23;
-        const unsigned short QUOTA_ERR = 22;
-    };
+    const unsigned short NOT_FOUND_ERR = 8;
+    const unsigned short ABORT_ERR = 20;
+    const unsigned short TIMEOUT_ERR = 23;
+    const unsigned short QUOTA_ERR = 22;
+};
  
-}
diff --git a/Source/WebCore/Modules/indexeddb/IDBFactory.idl b/Source/WebCore/Modules/indexeddb/IDBFactory.idl

index bf71a2d..6430e82 100644 (file)
--- a/Source/WebCore/Modules/indexeddb/IDBFactory.idl
+++ b/Source/WebCore/Modules/indexeddb/IDBFactory.idl
@@ -23,20 +23,17 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
+interface [
+    Conditional=INDEXED_DATABASE
+] IDBFactory {
+    [CallWith=ScriptExecutionContext, ImplementedAs=getDatabaseNames] IDBRequest webkitGetDatabaseNames();
  
-    interface [
-        Conditional=INDEXED_DATABASE
-    ] IDBFactory {
-        [CallWith=ScriptExecutionContext, ImplementedAs=getDatabaseNames] IDBRequest webkitGetDatabaseNames();
+    [CallWith=ScriptExecutionContext] IDBOpenDBRequest open(in DOMString name, in [Optional] unsigned long long version)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext] IDBVersionChangeRequest deleteDatabase(in DOMString name)
+        raises (IDBDatabaseException);
  
-        [CallWith=ScriptExecutionContext] IDBOpenDBRequest open(in DOMString name, in [Optional] unsigned long long version)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBVersionChangeRequest deleteDatabase(in DOMString name)
-            raises (IDBDatabaseException);
+    short cmp(in IDBKey first, in IDBKey second)
+        raises (IDBDatabaseException);
+};
  
-        short cmp(in IDBKey first, in IDBKey second)
-            raises (IDBDatabaseException);
-    };
-
-}
diff --git a/Source/WebCore/Modules/indexeddb/IDBIndex.idl b/Source/WebCore/Modules/indexeddb/IDBIndex.idl

index eed1715..d097e8f 100644 (file)
--- a/Source/WebCore/Modules/indexeddb/IDBIndex.idl
+++ b/Source/WebCore/Modules/indexeddb/IDBIndex.idl
@@ -23,39 +23,36 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
+interface [
+    Conditional=INDEXED_DATABASE
+] IDBIndex {
+    readonly attribute DOMString name;
+    readonly attribute IDBObjectStore objectStore;
+    readonly attribute [ImplementedAs=keyPathAny] IDBAny keyPath;
+    readonly attribute boolean unique;
+    readonly attribute boolean multiEntry;
  
-    interface [
-        Conditional=INDEXED_DATABASE
-    ] IDBIndex {
-        readonly attribute DOMString name;
-        readonly attribute IDBObjectStore objectStore;
-        readonly attribute [ImplementedAs=keyPathAny] IDBAny keyPath;
-        readonly attribute boolean unique;
-        readonly attribute boolean multiEntry;
+    [CallWith=ScriptExecutionContext] IDBRequest openCursor(in [Optional] IDBKeyRange? range, in [Optional] DOMString direction)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext] IDBRequest openCursor(in IDBKey key, in [Optional] DOMString direction)
+        raises (IDBDatabaseException);
+    
+    [CallWith=ScriptExecutionContext] IDBRequest openKeyCursor(in [Optional] IDBKeyRange? range, in [Optional] DOMString  direction)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext] IDBRequest openKeyCursor(in IDBKey key, in [Optional] DOMString direction)
+        raises (IDBDatabaseException);
  
-        [CallWith=ScriptExecutionContext] IDBRequest openCursor(in [Optional] IDBKeyRange? range, in [Optional] DOMString direction)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBRequest openCursor(in IDBKey key, in [Optional] DOMString direction)
-            raises (IDBDatabaseException);
-        
-        [CallWith=ScriptExecutionContext] IDBRequest openKeyCursor(in [Optional] IDBKeyRange? range, in [Optional] DOMString  direction)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBRequest openKeyCursor(in IDBKey key, in [Optional] DOMString direction)
-            raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext] IDBRequest get(in IDBKeyRange? key)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext] IDBRequest get(in IDBKey key)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext] IDBRequest getKey(in IDBKeyRange? key)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext] IDBRequest getKey(in IDBKey key)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext] IDBRequest count(in [Optional] IDBKeyRange? range)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext] IDBRequest count(in IDBKey key)
+        raises (IDBDatabaseException);
+};
  
-        [CallWith=ScriptExecutionContext] IDBRequest get(in IDBKeyRange? key)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBRequest get(in IDBKey key)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBRequest getKey(in IDBKeyRange? key)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBRequest getKey(in IDBKey key)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBRequest count(in [Optional] IDBKeyRange? range)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBRequest count(in IDBKey key)
-            raises (IDBDatabaseException);
-    };
-
-}
diff --git a/Source/WebCore/Modules/indexeddb/IDBKey.idl b/Source/WebCore/Modules/indexeddb/IDBKey.idl

index 1464d9f..7c09874 100644 (file)
--- a/Source/WebCore/Modules/indexeddb/IDBKey.idl
+++ b/Source/WebCore/Modules/indexeddb/IDBKey.idl
@@ -23,12 +23,9 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-
-    interface [
-        Conditional=INDEXED_DATABASE,
-        CustomToJSObject
-    ] IDBKey {
-        // This space is intentionally left blank.
-    };
-}
+interface [
+    Conditional=INDEXED_DATABASE,
+    CustomToJSObject
+] IDBKey {
+    // This space is intentionally left blank.
+};
diff --git a/Source/WebCore/Modules/indexeddb/IDBKeyRange.idl b/Source/WebCore/Modules/indexeddb/IDBKeyRange.idl

index 161cb9c..56deefb 100644 (file)
--- a/Source/WebCore/Modules/indexeddb/IDBKeyRange.idl
+++ b/Source/WebCore/Modules/indexeddb/IDBKeyRange.idl
@@ -23,24 +23,21 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
+interface [
+    Conditional=INDEXED_DATABASE
+] IDBKeyRange {
+    readonly attribute IDBKey lower;
+    readonly attribute IDBKey upper;
+    readonly attribute boolean lowerOpen;
+    readonly attribute boolean upperOpen;
  
-    interface [
-        Conditional=INDEXED_DATABASE
-    ] IDBKeyRange {
-        readonly attribute IDBKey lower;
-        readonly attribute IDBKey upper;
-        readonly attribute boolean lowerOpen;
-        readonly attribute boolean upperOpen;
+    static IDBKeyRange only(in IDBKey value)
+        raises (IDBDatabaseException);
+    static IDBKeyRange lowerBound(in IDBKey bound, in [Optional] boolean open)
+        raises (IDBDatabaseException);
+    static IDBKeyRange upperBound(in IDBKey bound, in [Optional] boolean open)
+        raises (IDBDatabaseException);
+    static IDBKeyRange bound(in IDBKey lower, in IDBKey upper, in [Optional] boolean lowerOpen, in [Optional] boolean upperOpen)
+        raises (IDBDatabaseException);
+};
  
-        static IDBKeyRange only(in IDBKey value)
-            raises (IDBDatabaseException);
-        static IDBKeyRange lowerBound(in IDBKey bound, in [Optional] boolean open)
-            raises (IDBDatabaseException);
-        static IDBKeyRange upperBound(in IDBKey bound, in [Optional] boolean open)
-            raises (IDBDatabaseException);
-        static IDBKeyRange bound(in IDBKey lower, in IDBKey upper, in [Optional] boolean lowerOpen, in [Optional] boolean upperOpen)
-            raises (IDBDatabaseException);
-    };
-
-}
diff --git a/Source/WebCore/Modules/indexeddb/IDBObjectStore.idl b/Source/WebCore/Modules/indexeddb/IDBObjectStore.idl

index fc8537d..6e939de 100644 (file)
--- a/Source/WebCore/Modules/indexeddb/IDBObjectStore.idl
+++ b/Source/WebCore/Modules/indexeddb/IDBObjectStore.idl
@@ -23,47 +23,44 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
+interface [
+    Conditional=INDEXED_DATABASE
+] IDBObjectStore {
+    readonly attribute [TreatReturnedNullStringAs=Null] DOMString name;
+    readonly attribute [ImplementedAs=keyPathAny] IDBAny keyPath;
+    readonly attribute DOMStringList indexNames;
+    readonly attribute IDBTransaction transaction;
+    readonly attribute boolean autoIncrement;
  
-    interface [
-        Conditional=INDEXED_DATABASE
-    ] IDBObjectStore {
-        readonly attribute [TreatReturnedNullStringAs=Null] DOMString name;
-        readonly attribute [ImplementedAs=keyPathAny] IDBAny keyPath;
-        readonly attribute DOMStringList indexNames;
-        readonly attribute IDBTransaction transaction;
-        readonly attribute boolean autoIncrement;
+    [CallWith=ScriptExecutionContext] IDBRequest put(in any value, in [Optional] IDBKey key)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext] IDBRequest add(in any value, in [Optional] IDBKey key)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext, ImplementedAs=deleteFunction] IDBRequest delete(in IDBKeyRange? keyRange)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext, ImplementedAs=deleteFunction] IDBRequest delete(in IDBKey key)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext] IDBRequest clear()
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext] IDBRequest get(in IDBKeyRange? key)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext] IDBRequest get(in IDBKey key)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext] IDBRequest openCursor(in [Optional] IDBKeyRange? range, in [Optional] DOMString direction)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext] IDBRequest openCursor(in IDBKey key, in [Optional] DOMString direction)
+        raises (IDBDatabaseException);
  
-        [CallWith=ScriptExecutionContext] IDBRequest put(in any value, in [Optional] IDBKey key)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBRequest add(in any value, in [Optional] IDBKey key)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext, ImplementedAs=deleteFunction] IDBRequest delete(in IDBKeyRange? keyRange)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext, ImplementedAs=deleteFunction] IDBRequest delete(in IDBKey key)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBRequest clear()
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBRequest get(in IDBKeyRange? key)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBRequest get(in IDBKey key)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBRequest openCursor(in [Optional] IDBKeyRange? range, in [Optional] DOMString direction)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBRequest openCursor(in IDBKey key, in [Optional] DOMString direction)
-            raises (IDBDatabaseException);
-
-        [CallWith=ScriptExecutionContext] IDBIndex createIndex(in DOMString name, in DOMString[] keyPath, in [Optional] Dictionary options)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBIndex createIndex(in DOMString name, in DOMString keyPath, in [Optional] Dictionary options)
-            raises (IDBDatabaseException);
-        IDBIndex index(in DOMString name)
-            raises (IDBDatabaseException);
-        void deleteIndex(in DOMString name)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBRequest count(in [Optional] IDBKeyRange? range)
-            raises (IDBDatabaseException);
-        [CallWith=ScriptExecutionContext] IDBRequest count(in IDBKey key)
-            raises (IDBDatabaseException);
-    };
-}
+    [CallWith=ScriptExecutionContext] IDBIndex createIndex(in DOMString name, in DOMString[] keyPath, in [Optional] Dictionary options)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext] IDBIndex createIndex(in DOMString name, in DOMString keyPath, in [Optional] Dictionary options)
+        raises (IDBDatabaseException);
+    IDBIndex index(in DOMString name)
+        raises (IDBDatabaseException);
+    void deleteIndex(in DOMString name)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext] IDBRequest count(in [Optional] IDBKeyRange? range)
+        raises (IDBDatabaseException);
+    [CallWith=ScriptExecutionContext] IDBRequest count(in IDBKey key)
+        raises (IDBDatabaseException);
+};
diff --git a/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.idl b/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.idl

index 1e46a52..f21d023 100644 (file)
--- a/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.idl
+++ b/Source/WebCore/Modules/indexeddb/IDBOpenDBRequest.idl
@@ -23,14 +23,11 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-
-    interface [
-        Conditional=INDEXED_DATABASE,
-        ActiveDOMObject,
-        EventTarget
-    ] IDBOpenDBRequest : IDBRequest {
-        attribute EventListener onblocked;
-        attribute EventListener onupgradeneeded;
-    };
-}
+interface [
+    Conditional=INDEXED_DATABASE,
+    ActiveDOMObject,
+    EventTarget
+] IDBOpenDBRequest : IDBRequest {
+    attribute EventListener onblocked;
+    attribute EventListener onupgradeneeded;
+};
diff --git a/Source/WebCore/Modules/indexeddb/IDBRequest.idl b/Source/WebCore/Modules/indexeddb/IDBRequest.idl

index 1e49415..84c746f 100644 (file)
--- a/Source/WebCore/Modules/indexeddb/IDBRequest.idl
+++ b/Source/WebCore/Modules/indexeddb/IDBRequest.idl
@@ -27,40 +27,37 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
+interface [
+    Conditional=INDEXED_DATABASE,
+    ActiveDOMObject,
+    EventTarget
+] IDBRequest {
+    readonly attribute IDBAny result
+        getter raises (IDBDatabaseException);
+    readonly attribute unsigned short errorCode
+        getter raises (IDBDatabaseException);
+    readonly attribute DOMError error
+        getter raises (IDBDatabaseException);
+    readonly attribute [TreatReturnedNullStringAs=Undefined] DOMString webkitErrorMessage
+        getter raises (IDBDatabaseException);
  
-    interface [
-        Conditional=INDEXED_DATABASE,
-        ActiveDOMObject,
-        EventTarget
-    ] IDBRequest {
-        readonly attribute IDBAny result
-            getter raises (IDBDatabaseException);
-        readonly attribute unsigned short errorCode
-            getter raises (IDBDatabaseException);
-        readonly attribute DOMError error
-            getter raises (IDBDatabaseException);
-        readonly attribute [TreatReturnedNullStringAs=Undefined] DOMString webkitErrorMessage
-            getter raises (IDBDatabaseException);
+    readonly attribute IDBAny source;
+    readonly attribute IDBTransaction transaction;
  
-        readonly attribute IDBAny source;
-        readonly attribute IDBTransaction transaction;
+    // States
+    readonly attribute DOMString readyState;
  
-        // States
-        readonly attribute DOMString readyState;
+    // Events
+    attribute EventListener onsuccess;
+    attribute EventListener onerror;
  
-        // Events
-        attribute EventListener onsuccess;
-        attribute EventListener onerror;
-
-        // EventTarget interface
-        void addEventListener(in DOMString type,
-                              in EventListener listener,
-                              in [Optional] boolean useCapture);
-        void removeEventListener(in DOMString type,
-                                 in EventListener listener,
-                                 in [Optional] boolean useCapture);
-        boolean dispatchEvent(in Event evt)
-            raises(EventException);
-    };
-}
+    // EventTarget interface
+    void addEventListener(in DOMString type,
+                          in EventListener listener,
+                          in [Optional] boolean useCapture);
+    void removeEventListener(in DOMString type,
+                             in EventListener listener,
+                             in [Optional] boolean useCapture);
+    boolean dispatchEvent(in Event evt)
+        raises(EventException);
+};
diff --git a/Source/WebCore/Modules/indexeddb/IDBTransaction.idl b/Source/WebCore/Modules/indexeddb/IDBTransaction.idl

index b5c207d..342cd65 100644 (file)
--- a/Source/WebCore/Modules/indexeddb/IDBTransaction.idl
+++ b/Source/WebCore/Modules/indexeddb/IDBTransaction.idl
@@ -24,41 +24,38 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
+interface [
+    Conditional=INDEXED_DATABASE,
+    ActiveDOMObject,
+    EventTarget
+] IDBTransaction {
+    // FIXME: Eventually remove legacy enum constants, see https://bugs.webkit.org/show_bug.cgi?id=85315
+    const unsigned short READ_ONLY = 0;
+    const unsigned short READ_WRITE = 1;
+    const unsigned short VERSION_CHANGE = 2;
  
-    interface [
-        Conditional=INDEXED_DATABASE,
-        ActiveDOMObject,
-        EventTarget
-    ] IDBTransaction {
-        // FIXME: Eventually remove legacy enum constants, see https://bugs.webkit.org/show_bug.cgi?id=85315
-        const unsigned short READ_ONLY = 0;
-        const unsigned short READ_WRITE = 1;
-        const unsigned short VERSION_CHANGE = 2;
+    // Properties
+    readonly attribute DOMString mode;
+    readonly attribute IDBDatabase db;
+    readonly attribute DOMError error;
  
-        // Properties
-        readonly attribute DOMString mode;
-        readonly attribute IDBDatabase db;
-        readonly attribute DOMError error;
+    // Methods
+    IDBObjectStore objectStore (in DOMString name)
+        raises (IDBDatabaseException);
+    void abort ()
+        raises (IDBDatabaseException);
  
-        // Methods
-        IDBObjectStore objectStore (in DOMString name)
-            raises (IDBDatabaseException);
-        void abort ()
-            raises (IDBDatabaseException);
-
-        // Events
-        attribute EventListener onabort;
-        attribute EventListener oncomplete;
-        attribute EventListener onerror;
-        // EventTarget interface
-        void addEventListener(in DOMString type,
-                              in EventListener listener,
-                              in [Optional] boolean useCapture);
-        void removeEventListener(in DOMString type,
-                                 in EventListener listener,
-                                 in [Optional] boolean useCapture);
-        boolean dispatchEvent(in Event evt) 
-            raises(EventException);
-    };
-}
+    // Events
+    attribute EventListener onabort;
+    attribute EventListener oncomplete;
+    attribute EventListener onerror;
+    // EventTarget interface
+    void addEventListener(in DOMString type,
+                          in EventListener listener,
+                          in [Optional] boolean useCapture);
+    void removeEventListener(in DOMString type,
+                             in EventListener listener,
+                             in [Optional] boolean useCapture);
+    boolean dispatchEvent(in Event evt) 
+        raises(EventException);
+};
diff --git a/Source/WebCore/Modules/indexeddb/IDBUpgradeNeededEvent.idl b/Source/WebCore/Modules/indexeddb/IDBUpgradeNeededEvent.idl

index 3299954..e6ba93c 100644 (file)
--- a/Source/WebCore/Modules/indexeddb/IDBUpgradeNeededEvent.idl
+++ b/Source/WebCore/Modules/indexeddb/IDBUpgradeNeededEvent.idl
@@ -23,13 +23,10 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-
-    interface [
-        Conditional=INDEXED_DATABASE,
-        InterfaceName=IDBVersionChangeEvent
-    ] IDBUpgradeNeededEvent : Event {
-        readonly attribute unsigned long long oldVersion;
-        readonly attribute unsigned long long newVersion;
-    };
-}
+interface [
+    Conditional=INDEXED_DATABASE,
+    InterfaceName=IDBVersionChangeEvent
+] IDBUpgradeNeededEvent : Event {
+    readonly attribute unsigned long long oldVersion;
+    readonly attribute unsigned long long newVersion;
+};
diff --git a/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.idl b/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.idl

index c6a4171..f879ece 100644 (file)
--- a/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.idl
+++ b/Source/WebCore/Modules/indexeddb/IDBVersionChangeEvent.idl
@@ -23,11 +23,8 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-
-    interface [
-        Conditional=INDEXED_DATABASE
-    ] IDBVersionChangeEvent : Event {
-        readonly attribute DOMString version;
-    };
-}
+interface [
+    Conditional=INDEXED_DATABASE
+] IDBVersionChangeEvent : Event {
+    readonly attribute DOMString version;
+};
diff --git a/Source/WebCore/Modules/indexeddb/IDBVersionChangeRequest.idl b/Source/WebCore/Modules/indexeddb/IDBVersionChangeRequest.idl

index 2aa238a..fe2a05f 100644 (file)
--- a/Source/WebCore/Modules/indexeddb/IDBVersionChangeRequest.idl
+++ b/Source/WebCore/Modules/indexeddb/IDBVersionChangeRequest.idl
@@ -23,13 +23,10 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module storage {
-
-    interface [
-        Conditional=INDEXED_DATABASE,
-        ActiveDOMObject,
-        EventTarget
-    ] IDBVersionChangeRequest : IDBRequest {
-        attribute EventListener onblocked;
-    };
-}
+interface [
+    Conditional=INDEXED_DATABASE,
+    ActiveDOMObject,
+    EventTarget
+] IDBVersionChangeRequest : IDBRequest {
+    attribute EventListener onblocked;
+};
diff --git a/Source/WebCore/Modules/indexeddb/WorkerContextIndexedDatabase.idl b/Source/WebCore/Modules/indexeddb/WorkerContextIndexedDatabase.idl

index 68ade1f..24fd5e4 100644 (file)
--- a/Source/WebCore/Modules/indexeddb/WorkerContextIndexedDatabase.idl
+++ b/Source/WebCore/Modules/indexeddb/WorkerContextIndexedDatabase.idl
@@ -24,38 +24,35 @@
   *
   */
  
-module threads {
+interface [
+    Conditional=INDEXED_DATABASE,
+    Supplemental=WorkerContext
+] WorkerContextIndexedDatabase {
+    readonly attribute [ImplementedAs=indexedDB,V8EnabledAtRuntime] IDBFactory webkitIndexedDB;
  
-    interface [
-        Conditional=INDEXED_DATABASE,
-        Supplemental=WorkerContext
-    ] WorkerContextIndexedDatabase {
-        readonly attribute [ImplementedAs=indexedDB,V8EnabledAtRuntime] IDBFactory webkitIndexedDB;
+    attribute IDBCursorConstructor webkitIDBCursor;
+    attribute IDBDatabaseConstructor webkitIDBDatabase;
+    attribute IDBDatabaseExceptionConstructor webkitIDBDatabaseException;
+    attribute IDBFactoryConstructor webkitIDBFactory;
+    attribute IDBIndexConstructor webkitIDBIndex;
+    attribute IDBKeyRangeConstructor webkitIDBKeyRange;
+    attribute IDBObjectStoreConstructor webkitIDBObjectStore;
+    attribute IDBRequestConstructor webkitIDBRequest;
+    attribute IDBTransactionConstructor webkitIDBTransaction;
  
-        attribute IDBCursorConstructor webkitIDBCursor;
-        attribute IDBDatabaseConstructor webkitIDBDatabase;
-        attribute IDBDatabaseExceptionConstructor webkitIDBDatabaseException;
-        attribute IDBFactoryConstructor webkitIDBFactory;
-        attribute IDBIndexConstructor webkitIDBIndex;
-        attribute IDBKeyRangeConstructor webkitIDBKeyRange;
-        attribute IDBObjectStoreConstructor webkitIDBObjectStore;
-        attribute IDBRequestConstructor webkitIDBRequest;
-        attribute IDBTransactionConstructor webkitIDBTransaction;
+    readonly attribute [V8EnabledAtRuntime] IDBFactory indexedDB;
  
-        readonly attribute [V8EnabledAtRuntime] IDBFactory indexedDB;
+    attribute IDBCursorConstructor IDBCursor;
+    attribute IDBCursorWithValueConstructor IDBCursorWithValue;
+    attribute IDBDatabaseConstructor IDBDatabase;
+    attribute IDBDatabaseExceptionConstructor IDBDatabaseException;
+    attribute IDBFactoryConstructor IDBFactory;
+    attribute IDBIndexConstructor IDBIndex;
+    attribute IDBKeyRangeConstructor IDBKeyRange;
+    attribute IDBObjectStoreConstructor IDBObjectStore;
+    attribute IDBOpenDBRequestConstructor IDBOpenDBRequest;
+    attribute IDBRequestConstructor IDBRequest;
+    attribute IDBTransactionConstructor IDBTransaction;
+    attribute IDBVersionChangeEventConstructor IDBVersionChangeEvent;
+};
  
-        attribute IDBCursorConstructor IDBCursor;
-        attribute IDBCursorWithValueConstructor IDBCursorWithValue;
-        attribute IDBDatabaseConstructor IDBDatabase;
-        attribute IDBDatabaseExceptionConstructor IDBDatabaseException;
-        attribute IDBFactoryConstructor IDBFactory;
-        attribute IDBIndexConstructor IDBIndex;
-        attribute IDBKeyRangeConstructor IDBKeyRange;
-        attribute IDBObjectStoreConstructor IDBObjectStore;
-        attribute IDBOpenDBRequestConstructor IDBOpenDBRequest;
-        attribute IDBRequestConstructor IDBRequest;
-        attribute IDBTransactionConstructor IDBTransaction;
-        attribute IDBVersionChangeEventConstructor IDBVersionChangeEvent;
-    };
-
-}
diff --git a/Source/WebCore/Modules/intents/DOMWindowIntents.idl b/Source/WebCore/Modules/intents/DOMWindowIntents.idl

index d345209..7a9594c 100644 (file)
--- a/Source/WebCore/Modules/intents/DOMWindowIntents.idl
+++ b/Source/WebCore/Modules/intents/DOMWindowIntents.idl
@@ -24,15 +24,12 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module window {
+interface [
+    Conditional=WEB_INTENTS,
+    Supplemental=DOMWindow
+] DOMWindowIntents {
+    attribute IntentConstructor WebKitIntent;
  
-    interface [
-        Conditional=WEB_INTENTS,
-        Supplemental=DOMWindow
-    ] DOMWindowIntents {
-        attribute IntentConstructor WebKitIntent;
+    attribute [Replaceable] DeliveredIntent webkitIntent;
+};
  
-        attribute [Replaceable] DeliveredIntent webkitIntent;
-    };
-
-}
diff --git a/Source/WebCore/Modules/intents/DeliveredIntent.idl b/Source/WebCore/Modules/intents/DeliveredIntent.idl

index 25e978d..783cb79 100644 (file)
--- a/Source/WebCore/Modules/intents/DeliveredIntent.idl
+++ b/Source/WebCore/Modules/intents/DeliveredIntent.idl
@@ -23,14 +23,12 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module window {
-    interface [
-        Conditional=WEB_INTENTS,
-    ] DeliveredIntent : Intent {
-        readonly attribute MessagePortArray ports;
+interface [
+    Conditional=WEB_INTENTS,
+] DeliveredIntent : Intent {
+    readonly attribute MessagePortArray ports;
  
-        [TreatReturnedNullStringAs=Null] DOMString getExtra(in DOMString key);
-        void postResult(in SerializedScriptValue result);
-        void postFailure(in SerializedScriptValue result);
-    };
-}
+    [TreatReturnedNullStringAs=Null] DOMString getExtra(in DOMString key);
+    void postResult(in SerializedScriptValue result);
+    void postFailure(in SerializedScriptValue result);
+};
diff --git a/Source/WebCore/Modules/intents/Intent.idl b/Source/WebCore/Modules/intents/Intent.idl

index 92657b4..a2cf5da 100644 (file)
--- a/Source/WebCore/Modules/intents/Intent.idl
+++ b/Source/WebCore/Modules/intents/Intent.idl
@@ -23,15 +23,13 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module window {
    interface [
-      Conditional=WEB_INTENTS,
-      CustomConstructor,
-      Constructor(in DOMString action, in DOMString type, in [Optional=DefaultIsNullString, TransferList=transferList] SerializedScriptValue data, in [Optional=DefaultIsUndefined] Array transferList),
-      ConstructorRaisesException
+  Conditional=WEB_INTENTS,
+  CustomConstructor,
+  Constructor(in DOMString action, in DOMString type, in [Optional=DefaultIsNullString, TransferList=transferList] SerializedScriptValue data, in [Optional=DefaultIsUndefined] Array transferList),
+  ConstructorRaisesException
    ] Intent {
-        readonly attribute DOMString action;
-        readonly attribute DOMString type;
-        readonly attribute SerializedScriptValue data;
+    readonly attribute DOMString action;
+    readonly attribute DOMString type;
+    readonly attribute SerializedScriptValue data;
    };
-}
diff --git a/Source/WebCore/Modules/intents/IntentResultCallback.idl b/Source/WebCore/Modules/intents/IntentResultCallback.idl

index 0afa2ad..430fdd3 100644 (file)
--- a/Source/WebCore/Modules/intents/IntentResultCallback.idl
+++ b/Source/WebCore/Modules/intents/IntentResultCallback.idl
@@ -23,11 +23,9 @@
   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module window {
    interface [
-      Conditional=WEB_INTENTS,
-      Callback
+  Conditional=WEB_INTENTS,
+  Callback
    ] IntentResultCallback {
-      boolean handleEvent(in SerializedScriptValue result);
+  boolean handleEvent(in SerializedScriptValue result);
    };
-}
diff --git a/Source/WebCore/Modules/intents/NavigatorIntents.idl b/Source/WebCore/Modules/intents/NavigatorIntents.idl

index 206337a..210666e 100644 (file)
--- a/Source/WebCore/Modules/intents/NavigatorIntents.idl
+++ b/Source/WebCore/Modules/intents/NavigatorIntents.idl
@@ -17,16 +17,13 @@
   * Boston, MA 02110-1301, USA.
   */
  
-module window {
+interface [
+    Conditional=WEB_INTENTS,
+    Supplemental=Navigator
+] NavigatorIntents {
+    void webkitStartActivity(in Intent intent,
+                             in [Callback, Optional] IntentResultCallback successCallback,
+                             in [Callback, Optional] IntentResultCallback failureCallback)
+        raises(DOMException);
+};
  
-    interface [
-        Conditional=WEB_INTENTS,
-        Supplemental=Navigator
-    ] NavigatorIntents {
-        void webkitStartActivity(in Intent intent,
-                                 in [Callback, Optional] IntentResultCallback successCallback,
-                                 in [Callback, Optional] IntentResultCallback failureCallback)
-            raises(DOMException);
-    };
-
-}
diff --git a/Source/WebCore/Modules/mediasource/MediaSource.idl b/Source/WebCore/Modules/mediasource/MediaSource.idl

index fff6a6f..aadd290 100644 (file)
--- a/Source/WebCore/Modules/mediasource/MediaSource.idl
+++ b/Source/WebCore/Modules/mediasource/MediaSource.idl
@@ -28,40 +28,37 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
   
-module html {
+interface [
+    Conditional=MEDIA_SOURCE,
+    V8EnabledAtRuntime=mediaSource,
+    EventTarget,
+    Constructor,
+    CallWith=ScriptExecutionContext
+] MediaSource {
+    // All the source buffers created by this object.
+    readonly attribute SourceBufferList sourceBuffers;
  
-    interface [
-        Conditional=MEDIA_SOURCE,
-        V8EnabledAtRuntime=mediaSource,
-        EventTarget,
-        Constructor,
-        CallWith=ScriptExecutionContext
-    ] MediaSource {
-        // All the source buffers created by this object.
-        readonly attribute SourceBufferList sourceBuffers;
+    // Subset of sourceBuffers that provide data for the selected/enabled tracks.
+    readonly attribute SourceBufferList activeSourceBuffers;
  
-        // Subset of sourceBuffers that provide data for the selected/enabled tracks.
-        readonly attribute SourceBufferList activeSourceBuffers;
+    attribute double duration setter raises (DOMException);
  
-        attribute double duration setter raises (DOMException);
+    SourceBuffer addSourceBuffer(in DOMString type) raises (DOMException);
+    void removeSourceBuffer(in SourceBuffer buffer) raises (DOMException);
  
-        SourceBuffer addSourceBuffer(in DOMString type) raises (DOMException);
-        void removeSourceBuffer(in SourceBuffer buffer) raises (DOMException);
+    readonly attribute DOMString readyState;
+    
+    void endOfStream(in [Optional=DefaultIsNullString] DOMString error)
+        raises (DOMException);
+    
+    // EventTarget interface
+    void addEventListener(in DOMString type,
+                          in EventListener listener,
+                          in [Optional] boolean useCapture);
+    void removeEventListener(in DOMString type,
+                             in EventListener listener,
+                             in [Optional] boolean useCapture);
+    boolean dispatchEvent(in Event event)
+        raises(EventException);
+};
  
-        readonly attribute DOMString readyState;
-        
-        void endOfStream(in [Optional=DefaultIsNullString] DOMString error)
-            raises (DOMException);
-        
-        // EventTarget interface
-        void addEventListener(in DOMString type,
-                              in EventListener listener,
-                              in [Optional] boolean useCapture);
-        void removeEventListener(in DOMString type,
-                                 in EventListener listener,
-                                 in [Optional] boolean useCapture);
-        boolean dispatchEvent(in Event event)
-            raises(EventException);
-    };
-
-}
diff --git a/Source/WebCore/Modules/mediasource/SourceBuffer.idl b/Source/WebCore/Modules/mediasource/SourceBuffer.idl

index c7c6eb3..3bb4236 100644 (file)
--- a/Source/WebCore/Modules/mediasource/SourceBuffer.idl
+++ b/Source/WebCore/Modules/mediasource/SourceBuffer.idl
@@ -28,26 +28,23 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
   
-module html {
+interface [
+    Conditional=MEDIA_SOURCE,
+    V8EnabledAtRuntime=mediaSource
+] SourceBuffer {
  
-    interface [
-        Conditional=MEDIA_SOURCE,
-        V8EnabledAtRuntime=mediaSource
-    ] SourceBuffer {
+    // Returns the time ranges buffered.
+    readonly attribute TimeRanges buffered
+        getter raises(DOMException);
  
-        // Returns the time ranges buffered.
-        readonly attribute TimeRanges buffered
-            getter raises(DOMException);
+    // Applies an offset to media segment timestamps.
+    attribute double timestampOffset
+        setter raises(DOMException);
  
-        // Applies an offset to media segment timestamps.
-        attribute double timestampOffset
-            setter raises(DOMException);
+    // Append segment data.
+    void append(in Uint8Array data) raises (DOMException);
  
-        // Append segment data.
-        void append(in Uint8Array data) raises (DOMException);
+    // Abort the current segment append sequence.
+    void abort() raises (DOMException);
+};
  
-        // Abort the current segment append sequence.
-        void abort() raises (DOMException);
-    };
-
-}
diff --git a/Source/WebCore/Modules/mediasource/SourceBufferList.idl b/Source/WebCore/Modules/mediasource/SourceBufferList.idl

index 39eddca..787da09 100644 (file)
--- a/Source/WebCore/Modules/mediasource/SourceBufferList.idl
+++ b/Source/WebCore/Modules/mediasource/SourceBufferList.idl
@@ -28,27 +28,24 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
   
-module html {
+interface [
+    Conditional=MEDIA_SOURCE,
+    V8EnabledAtRuntime=mediaSource,
+    IndexedGetter,
+    EventTarget,
+    CallWith=ScriptExecutionContext
+] SourceBufferList {
+    readonly attribute unsigned long length;
+    SourceBuffer item(in unsigned long index);
  
-    interface [
-        Conditional=MEDIA_SOURCE,
-        V8EnabledAtRuntime=mediaSource,
-        IndexedGetter,
-        EventTarget,
-        CallWith=ScriptExecutionContext
-    ] SourceBufferList {
-        readonly attribute unsigned long length;
-        SourceBuffer item(in unsigned long index);
+    // EventTarget interface
+    void addEventListener(in DOMString type,
+                          in EventListener listener,
+                          in [Optional] boolean useCapture);
+    void removeEventListener(in DOMString type,
+                             in EventListener listener,
+                             in [Optional] boolean useCapture);
+    boolean dispatchEvent(in Event event)
+        raises(EventException);
+};
  
-        // EventTarget interface
-        void addEventListener(in DOMString type,
-                              in EventListener listener,
-                              in [Optional] boolean useCapture);
-        void removeEventListener(in DOMString type,
-                                 in EventListener listener,
-                                 in [Optional] boolean useCapture);
-        boolean dispatchEvent(in Event event)
-            raises(EventException);
-    };
-
-}
diff --git a/Source/WebCore/Modules/mediastream/DOMWindowMediaStream.idl b/Source/WebCore/Modules/mediastream/DOMWindowMediaStream.idl

index cf7ee1f..84a4da4 100644 (file)
--- a/Source/WebCore/Modules/mediastream/DOMWindowMediaStream.idl
+++ b/Source/WebCore/Modules/mediastream/DOMWindowMediaStream.idl
@@ -24,20 +24,17 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module window {
+interface [
+    Conditional=MEDIA_STREAM,
+    Supplemental=DOMWindow
+] DOMWindowMediaStream {
+    attribute [V8EnabledAtRuntime] MediaStreamConstructor webkitMediaStream;
+    attribute [V8EnabledAtRuntime] PeerConnection00Constructor webkitPeerConnection00;
+    attribute [V8EnabledAtRuntime] RTCPeerConnectionConstructor webkitRTCPeerConnection;
+    attribute SessionDescriptionConstructor SessionDescription;
+    attribute RTCSessionDescriptionConstructor RTCSessionDescription;
+    attribute IceCandidateConstructor IceCandidate;
+    attribute RTCIceCandidateConstructor RTCIceCandidate;
+    attribute MediaStreamEventConstructor MediaStreamEvent;
+};
  
-    interface [
-        Conditional=MEDIA_STREAM,
-        Supplemental=DOMWindow
-    ] DOMWindowMediaStream {
-        attribute [V8EnabledAtRuntime] MediaStreamConstructor webkitMediaStream;
-        attribute [V8EnabledAtRuntime] PeerConnection00Constructor webkitPeerConnection00;
-        attribute [V8EnabledAtRuntime] RTCPeerConnectionConstructor webkitRTCPeerConnection;
-        attribute SessionDescriptionConstructor SessionDescription;
-        attribute RTCSessionDescriptionConstructor RTCSessionDescription;
-        attribute IceCandidateConstructor IceCandidate;
-        attribute RTCIceCandidateConstructor RTCIceCandidate;
-        attribute MediaStreamEventConstructor MediaStreamEvent;
-    };
-
-}
diff --git a/Source/WebCore/Modules/mediastream/IceCallback.idl b/Source/WebCore/Modules/mediastream/IceCallback.idl

index 69d646f..a37e6a5 100644 (file)
--- a/Source/WebCore/Modules/mediastream/IceCallback.idl
+++ b/Source/WebCore/Modules/mediastream/IceCallback.idl
@@ -28,13 +28,10 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module p2p {
+interface [
+    Conditional=MEDIA_STREAM,
+    Callback
+] IceCallback {
+    boolean handleEvent(in IceCandidate candidate, in boolean moreToFollow, in PeerConnection00 source);
+};
  
-    interface [
-        Conditional=MEDIA_STREAM,
-        Callback
-    ] IceCallback {
-        boolean handleEvent(in IceCandidate candidate, in boolean moreToFollow, in PeerConnection00 source);
-    };
-
-}
diff --git a/Source/WebCore/Modules/mediastream/IceCandidate.idl b/Source/WebCore/Modules/mediastream/IceCandidate.idl

index e1c42fa..8cf8097 100644 (file)
--- a/Source/WebCore/Modules/mediastream/IceCandidate.idl
+++ b/Source/WebCore/Modules/mediastream/IceCandidate.idl
@@ -28,15 +28,12 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module p2p {
+interface [
+    Conditional=MEDIA_STREAM,
+    Constructor(in DOMString label, in DOMString candidateLine)
+] IceCandidate {
+    readonly attribute DOMString label;
  
-    interface [
-        Conditional=MEDIA_STREAM,
-        Constructor(in DOMString label, in DOMString candidateLine)
-    ] IceCandidate {
-        readonly attribute DOMString label;
+    DOMString toSdp();
+};
  
-        DOMString toSdp();
-    };
-
-}
diff --git a/Source/WebCore/Modules/mediastream/LocalMediaStream.idl b/Source/WebCore/Modules/mediastream/LocalMediaStream.idl

index 5e769af..c19d32e 100644 (file)
--- a/Source/WebCore/Modules/mediastream/LocalMediaStream.idl
+++ b/Source/WebCore/Modules/mediastream/LocalMediaStream.idl
@@ -22,15 +22,12 @@
   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module core {
+interface [
+    Conditional=MEDIA_STREAM,
+    EventTarget,
+    JSGenerateToNativeObject,
+    JSGenerateToJSObject
+] LocalMediaStream : MediaStream {
+    void stop();
+};
  
-    interface [
-        Conditional=MEDIA_STREAM,
-        EventTarget,
-        JSGenerateToNativeObject,
-        JSGenerateToJSObject
-    ] LocalMediaStream : MediaStream {
-        void stop();
-    };
-
-}
diff --git a/Source/WebCore/Modules/mediastream/MediaStream.idl b/Source/WebCore/Modules/mediastream/MediaStream.idl

index 65a1833..d7d0e31 100644 (file)
--- a/Source/WebCore/Modules/mediastream/MediaStream.idl
+++ b/Source/WebCore/Modules/mediastream/MediaStream.idl
@@ -22,35 +22,32 @@
   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module core {
-
-    interface [
-        Conditional=MEDIA_STREAM,
-        EventTarget,
-        Constructor(in MediaStreamTrackList audioTracks, in MediaStreamTrackList videoTracks),
-        CallWith=ScriptExecutionContext,
-        ConstructorRaisesException
+interface [
+    Conditional=MEDIA_STREAM,
+    EventTarget,
+    Constructor(in MediaStreamTrackList audioTracks, in MediaStreamTrackList videoTracks),
+    CallWith=ScriptExecutionContext,
+    ConstructorRaisesException
     ] MediaStream {
-        readonly attribute DOMString label;
-        readonly attribute MediaStreamTrackList audioTracks;
-        readonly attribute MediaStreamTrackList videoTracks;
+    readonly attribute DOMString label;
+    readonly attribute MediaStreamTrackList audioTracks;
+    readonly attribute MediaStreamTrackList videoTracks;
  
-        // FIXME: implement the record method when MediaStreamRecorder is available.
+    // FIXME: implement the record method when MediaStreamRecorder is available.
  
-        const unsigned short LIVE = 1;
-        const unsigned short ENDED = 2;
-        readonly attribute unsigned short readyState;
-                 attribute EventListener onended;
+    const unsigned short LIVE = 1;
+    const unsigned short ENDED = 2;
+    readonly attribute unsigned short readyState;
+             attribute EventListener onended;
  
-        // EventTarget interface
-        void addEventListener(in DOMString type,
-                              in EventListener listener,
-                              in [Optional] boolean useCapture);
-        void removeEventListener(in DOMString type,
-                                 in EventListener listener,
-                                 in [Optional] boolean useCapture);
-        boolean dispatchEvent(in Event event)
-            raises(EventException);
-    };
+    // EventTarget interface
+    void addEventListener(in DOMString type,
+                          in EventListener listener,
+                          in [Optional] boolean useCapture);
+    void removeEventListener(in DOMString type,
+                             in EventListener listener,
+                             in [Optional] boolean useCapture);
+    boolean dispatchEvent(in Event event)
+        raises(EventException);
+};
  
-}
diff --git a/Source/WebCore/Modules/mediastream/MediaStreamEvent.idl b/Source/WebCore/Modules/mediastream/MediaStreamEvent.idl

index a1930a4..67083ae 100644 (file)
--- a/Source/WebCore/Modules/mediastream/MediaStreamEvent.idl
+++ b/Source/WebCore/Modules/mediastream/MediaStreamEvent.idl
@@ -22,14 +22,11 @@
   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module events {
+// According to the WHATWG specification:
+// http://www.whatwg.org/specs/web-apps/current-work/multipage/video-conferencing-and-peer-to-peer-communication.html#mediastreamevent
+interface [
+    Conditional=MEDIA_STREAM,
+] MediaStreamEvent : Event {
+   readonly attribute MediaStream stream;
+};
  
-    // According to the WHATWG specification:
-    // http://www.whatwg.org/specs/web-apps/current-work/multipage/video-conferencing-and-peer-to-peer-communication.html#mediastreamevent
-    interface [
-        Conditional=MEDIA_STREAM,
-    ] MediaStreamEvent : Event {
-       readonly attribute MediaStream stream;
-    };
-
-}
diff --git a/Source/WebCore/Modules/mediastream/MediaStreamList.idl b/Source/WebCore/Modules/mediastream/MediaStreamList.idl

index d182e6f..e1c1c1e 100644 (file)
--- a/Source/WebCore/Modules/mediastream/MediaStreamList.idl
+++ b/Source/WebCore/Modules/mediastream/MediaStreamList.idl
@@ -22,15 +22,12 @@
   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module core {
+interface [
+    Conditional=MEDIA_STREAM,
+    IndexedGetter
+] MediaStreamList {
+    MediaStream item(in [IsIndex] unsigned long index);
  
-    interface [
-        Conditional=MEDIA_STREAM,
-        IndexedGetter
-    ] MediaStreamList {
-        MediaStream item(in [IsIndex] unsigned long index);
+    readonly attribute unsigned long length;
+};
  
-        readonly attribute unsigned long length;
-    };
-
-}
diff --git a/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl b/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl

index e103ce2..ff8bf5d 100644 (file)
--- a/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl
+++ b/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl
@@ -22,35 +22,32 @@
   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module core {
+interface [
+    Conditional=MEDIA_STREAM,
+    EventTarget,
+    ActiveDOMObject
+] MediaStreamTrack {
+    readonly attribute DOMString kind;
+    readonly attribute DOMString label;
+             attribute boolean enabled;
  
-    interface [
-        Conditional=MEDIA_STREAM,
-        EventTarget,
-        ActiveDOMObject
-    ] MediaStreamTrack {
-        readonly attribute DOMString kind;
-        readonly attribute DOMString label;
-                 attribute boolean enabled;
+    const unsigned short LIVE = 0;
+    const unsigned short MUTED = 1;
+    const unsigned short ENDED = 2;
+    readonly attribute unsigned short readyState;
  
-        const unsigned short LIVE = 0;
-        const unsigned short MUTED = 1;
-        const unsigned short ENDED = 2;
-        readonly attribute unsigned short readyState;
+    attribute EventListener onmute;
+    attribute EventListener onunmute;
+    attribute EventListener onended;
  
-        attribute EventListener onmute;
-        attribute EventListener onunmute;
-        attribute EventListener onended;
+    // EventTarget interface
+    void addEventListener(in DOMString type,
+                          in EventListener listener,
+                          in [Optional] boolean useCapture);
+    void removeEventListener(in DOMString type,
+                             in EventListener listener,
+                             in [Optional] boolean useCapture);
+    boolean dispatchEvent(in Event event)
+        raises(EventException);
+};
  
-        // EventTarget interface
-        void addEventListener(in DOMString type,
-                              in EventListener listener,
-                              in [Optional] boolean useCapture);
-        void removeEventListener(in DOMString type,
-                                 in EventListener listener,
-                                 in [Optional] boolean useCapture);
-        boolean dispatchEvent(in Event event)
-            raises(EventException);
-    };
-
-}
diff --git a/Source/WebCore/Modules/mediastream/MediaStreamTrackEvent.idl b/Source/WebCore/Modules/mediastream/MediaStreamTrackEvent.idl

index 320c603..960065d 100644 (file)
--- a/Source/WebCore/Modules/mediastream/MediaStreamTrackEvent.idl
+++ b/Source/WebCore/Modules/mediastream/MediaStreamTrackEvent.idl
@@ -22,12 +22,9 @@
   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module events {
+interface [
+    Conditional=MEDIA_STREAM,
+] MediaStreamTrackEvent : Event {
+   readonly attribute MediaStreamTrack track;
+};
  
-    interface [
-        Conditional=MEDIA_STREAM,
-    ] MediaStreamTrackEvent : Event {
-       readonly attribute MediaStreamTrack track;
-    };
-
-}
diff --git a/Source/WebCore/Modules/mediastream/MediaStreamTrackList.idl b/Source/WebCore/Modules/mediastream/MediaStreamTrackList.idl

index 957655d..0b13c21 100644 (file)
--- a/Source/WebCore/Modules/mediastream/MediaStreamTrackList.idl
+++ b/Source/WebCore/Modules/mediastream/MediaStreamTrackList.idl
@@ -22,33 +22,30 @@
   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module core {
+interface [
+    Conditional=MEDIA_STREAM,
+    IndexedGetter,
+    EventTarget
+] MediaStreamTrackList {
+    readonly attribute unsigned long length;
+    MediaStreamTrack item(in [IsIndex] unsigned long index);
  
-    interface [
-        Conditional=MEDIA_STREAM,
-        IndexedGetter,
-        EventTarget
-    ] MediaStreamTrackList {
-        readonly attribute unsigned long length;
-        MediaStreamTrack item(in [IsIndex] unsigned long index);
+    void add(in MediaStreamTrack track)
+        raises(DOMException);
+    void remove(in MediaStreamTrack track)
+        raises(DOMException);
  
-        void add(in MediaStreamTrack track)
-            raises(DOMException);
-        void remove(in MediaStreamTrack track)
-            raises(DOMException);
+    attribute EventListener onaddtrack;
+    attribute EventListener onremovetrack;
  
-        attribute EventListener onaddtrack;
-        attribute EventListener onremovetrack;
+    // EventTarget interface
+    void addEventListener(in DOMString type,
+                          in EventListener listener,
+                          in [Optional] boolean useCapture);
+    void removeEventListener(in DOMString type,
+                             in EventListener listener,
+                             in [Optional] boolean useCapture);
+    boolean dispatchEvent(in Event event)
+        raises(EventException);
+};
  
-        // EventTarget interface
-        void addEventListener(in DOMString type,
-                              in EventListener listener,
-                              in [Optional] boolean useCapture);
-        void removeEventListener(in DOMString type,
-                                 in EventListener listener,
-                                 in [Optional] boolean useCapture);
-        boolean dispatchEvent(in Event event)
-            raises(EventException);
-    };
-
-}
diff --git a/Source/WebCore/Modules/mediastream/NavigatorMediaStream.idl b/Source/WebCore/Modules/mediastream/NavigatorMediaStream.idl

index 40f8f0d..2bc748b 100644 (file)
--- a/Source/WebCore/Modules/mediastream/NavigatorMediaStream.idl
+++ b/Source/WebCore/Modules/mediastream/NavigatorMediaStream.idl
@@ -17,16 +17,13 @@
   * Boston, MA 02110-1301, USA.
   */
  
-module window {
+interface [
+    Conditional=MEDIA_STREAM,
+    Supplemental=Navigator
+] NavigatorMediaStream {
+    [V8EnabledAtRuntime] void webkitGetUserMedia(in Dictionary options,
+                                                 in [Callback] NavigatorUserMediaSuccessCallback successCallback,
+                                                 in [Callback, Optional] NavigatorUserMediaErrorCallback errorCallback)
+        raises(DOMException);
+};
  
-    interface [
-        Conditional=MEDIA_STREAM,
-        Supplemental=Navigator
-    ] NavigatorMediaStream {
-        [V8EnabledAtRuntime] void webkitGetUserMedia(in Dictionary options,
-                                                     in [Callback] NavigatorUserMediaSuccessCallback successCallback,
-                                                     in [Callback, Optional] NavigatorUserMediaErrorCallback errorCallback)
-            raises(DOMException);
-    };
-
-}
diff --git a/Source/WebCore/Modules/mediastream/NavigatorUserMediaError.idl b/Source/WebCore/Modules/mediastream/NavigatorUserMediaError.idl

index 293450b..7eb6baa 100644 (file)
--- a/Source/WebCore/Modules/mediastream/NavigatorUserMediaError.idl
+++ b/Source/WebCore/Modules/mediastream/NavigatorUserMediaError.idl
@@ -22,13 +22,10 @@
   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module window {
-    interface [
-        Conditional=MEDIA_STREAM
-    ] NavigatorUserMediaError {
-        const unsigned short PERMISSION_DENIED = 1;
-        readonly attribute unsigned short code;
-    };
-
-}
+interface [
+    Conditional=MEDIA_STREAM
+] NavigatorUserMediaError {
+    const unsigned short PERMISSION_DENIED = 1;
+    readonly attribute unsigned short code;
+};
  
diff --git a/Source/WebCore/Modules/mediastream/NavigatorUserMediaErrorCallback.idl b/Source/WebCore/Modules/mediastream/NavigatorUserMediaErrorCallback.idl

index 44928f8..d1ca558 100644 (file)
--- a/Source/WebCore/Modules/mediastream/NavigatorUserMediaErrorCallback.idl
+++ b/Source/WebCore/Modules/mediastream/NavigatorUserMediaErrorCallback.idl
@@ -22,12 +22,10 @@
   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module window {
-    interface [
-        Conditional=MEDIA_STREAM,
-        Callback
-    ] NavigatorUserMediaErrorCallback {
-        boolean handleEvent(in NavigatorUserMediaError error);
-    };
+interface [
+    Conditional=MEDIA_STREAM,
+    Callback
+] NavigatorUserMediaErrorCallback {
+    boolean handleEvent(in NavigatorUserMediaError error);
+};
  
-}
diff --git a/Source/WebCore/Modules/mediastream/NavigatorUserMediaSuccessCallback.idl b/Source/WebCore/Modules/mediastream/NavigatorUserMediaSuccessCallback.idl

index 0a66180..18ee4f9 100644 (file)
--- a/Source/WebCore/Modules/mediastream/NavigatorUserMediaSuccessCallback.idl
+++ b/Source/WebCore/Modules/mediastream/NavigatorUserMediaSuccessCallback.idl
@@ -22,12 +22,10 @@
   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module window {
-    interface [
-        Conditional=MEDIA_STREAM,
-        Callback
-    ] NavigatorUserMediaSuccessCallback {
-        boolean handleEvent(in LocalMediaStream stream);
-    };
+interface [
+    Conditional=MEDIA_STREAM,
+    Callback
+] NavigatorUserMediaSuccessCallback {
+    boolean handleEvent(in LocalMediaStream stream);
+};
  
-}
diff --git a/Source/WebCore/Modules/mediastream/PeerConnection00.idl b/Source/WebCore/Modules/mediastream/PeerConnection00.idl

index bd56c87..26e2412 100644 (file)
--- a/Source/WebCore/Modules/mediastream/PeerConnection00.idl
+++ b/Source/WebCore/Modules/mediastream/PeerConnection00.idl
@@ -28,81 +28,78 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module p2p {
+interface [
+    Conditional=MEDIA_STREAM,
+    ActiveDOMObject,
+    Constructor(in DOMString serverConfiguration, in [Callback] IceCallback iceCallback),
+    CallWith=ScriptExecutionContext,
+    ConstructorRaisesException,
+    EventTarget
+] PeerConnection00 {
+    SessionDescription createOffer(in [Optional] Dictionary mediaHints)
+        raises(DOMException);
+    SessionDescription createAnswer(in DOMString offer, in [Optional] Dictionary mediaHints)
+        raises(DOMException);
  
-    interface [
-        Conditional=MEDIA_STREAM,
-        ActiveDOMObject,
-        Constructor(in DOMString serverConfiguration, in [Callback] IceCallback iceCallback),
-        CallWith=ScriptExecutionContext,
-        ConstructorRaisesException,
-        EventTarget
-    ] PeerConnection00 {
-        SessionDescription createOffer(in [Optional] Dictionary mediaHints)
-            raises(DOMException);
-        SessionDescription createAnswer(in DOMString offer, in [Optional] Dictionary mediaHints)
-            raises(DOMException);
+    // Actions, for setLocalDescription/setRemoteDescription.
+    const unsigned short SDP_OFFER = 0x100;
+    const unsigned short SDP_PRANSWER = 0x200;
+    const unsigned short SDP_ANSWER = 0x300;
  
-        // Actions, for setLocalDescription/setRemoteDescription.
-        const unsigned short SDP_OFFER = 0x100;
-        const unsigned short SDP_PRANSWER = 0x200;
-        const unsigned short SDP_ANSWER = 0x300;
+    void setLocalDescription(in unsigned short action, in SessionDescription desc)
+        raises(DOMException);
+    void setRemoteDescription(in unsigned short action, in SessionDescription desc)
+        raises(DOMException);
  
-        void setLocalDescription(in unsigned short action, in SessionDescription desc)
-            raises(DOMException);
-        void setRemoteDescription(in unsigned short action, in SessionDescription desc)
-            raises(DOMException);
+    readonly attribute SessionDescription localDescription;
+    readonly attribute SessionDescription remoteDescription;
  
-        readonly attribute SessionDescription localDescription;
-        readonly attribute SessionDescription remoteDescription;
+    const unsigned short NEW = 0;
+    const unsigned short OPENING = 1;
+    const unsigned short ACTIVE = 2;
+    const unsigned short CLOSED = 3;
+    readonly attribute unsigned short readyState;
  
-        const unsigned short NEW = 0;
-        const unsigned short OPENING = 1;
-        const unsigned short ACTIVE = 2;
-        const unsigned short CLOSED = 3;
-        readonly attribute unsigned short readyState;
+    void startIce(in [Optional] Dictionary iceOptions)
+        raises(DOMException);
  
-        void startIce(in [Optional] Dictionary iceOptions)
-            raises(DOMException);
+    void processIceMessage(in IceCandidate candidate)
+        raises(DOMException);
  
-        void processIceMessage(in IceCandidate candidate)
-            raises(DOMException);
+    const unsigned short ICE_GATHERING = 0x100;
+    const unsigned short ICE_WAITING = 0x200;
+    const unsigned short ICE_CHECKING = 0x300;
+    const unsigned short ICE_CONNECTED = 0x400;
+    const unsigned short ICE_COMPLETED = 0x500;
+    const unsigned short ICE_FAILED = 0x600;
+    const unsigned short ICE_CLOSED = 0x700;
+    readonly attribute unsigned short iceState;
  
-        const unsigned short ICE_GATHERING = 0x100;
-        const unsigned short ICE_WAITING = 0x200;
-        const unsigned short ICE_CHECKING = 0x300;
-        const unsigned short ICE_CONNECTED = 0x400;
-        const unsigned short ICE_COMPLETED = 0x500;
-        const unsigned short ICE_FAILED = 0x600;
-        const unsigned short ICE_CLOSED = 0x700;
-        readonly attribute unsigned short iceState;
+    [StrictTypeChecking] void addStream(in MediaStream stream, in [Optional] Dictionary mediaStreamHints)
+        raises(DOMException);
+    [StrictTypeChecking] void removeStream(in MediaStream stream)
+        raises(DOMException);
  
-        [StrictTypeChecking] void addStream(in MediaStream stream, in [Optional] Dictionary mediaStreamHints)
-            raises(DOMException);
-        [StrictTypeChecking] void removeStream(in MediaStream stream)
-            raises(DOMException);
+    readonly attribute MediaStreamList localStreams;
+    readonly attribute MediaStreamList remoteStreams;
  
-        readonly attribute MediaStreamList localStreams;
-        readonly attribute MediaStreamList remoteStreams;
+    void close()
+        raises(DOMException);
  
-        void close()
-            raises(DOMException);
+    attribute EventListener onconnecting;
+    attribute EventListener onopen;
+    attribute EventListener onstatechange;
+    attribute EventListener onaddstream;
+    attribute EventListener onremovestream;
  
-        attribute EventListener onconnecting;
-        attribute EventListener onopen;
-        attribute EventListener onstatechange;
-        attribute EventListener onaddstream;
-        attribute EventListener onremovestream;
+    // EventTarget interface
+    void addEventListener(in DOMString type,
+                          in EventListener listener,
+                          in [Optional] boolean useCapture);
+    void removeEventListener(in DOMString type,
+                             in EventListener listener,
+                             in [Optional] boolean useCapture);
+    boolean dispatchEvent(in Event event)
+        raises(EventException);
+};
  
-        // EventTarget interface
-        void addEventListener(in DOMString type,
-                              in EventListener listener,
-                              in [Optional] boolean useCapture);
-        void removeEventListener(in DOMString type,
-                                 in EventListener listener,
-                                 in [Optional] boolean useCapture);
-        boolean dispatchEvent(in Event event)
-            raises(EventException);
-    };
-
-}
diff --git a/Source/WebCore/Modules/mediastream/RTCErrorCallback.idl b/Source/WebCore/Modules/mediastream/RTCErrorCallback.idl

index 812e274..8e877b5 100644 (file)
--- a/Source/WebCore/Modules/mediastream/RTCErrorCallback.idl
+++ b/Source/WebCore/Modules/mediastream/RTCErrorCallback.idl
@@ -28,13 +28,10 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module mediastream {
+interface [
+    Conditional=MEDIA_STREAM,
+    Callback
+] RTCErrorCallback {
+    boolean handleEvent(in DOMString errorInformation);
+};
  
-    interface [
-        Conditional=MEDIA_STREAM,
-        Callback
-    ] RTCErrorCallback {
-        boolean handleEvent(in DOMString errorInformation);
-    };
-
-}
diff --git a/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl b/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl

index 460db03..62c2d40 100644 (file)
--- a/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl
+++ b/Source/WebCore/Modules/mediastream/RTCIceCandidate.idl
@@ -28,16 +28,13 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module mediastream {
+interface [
+    Conditional=MEDIA_STREAM,
+    Constructor(in Dictionary dictionary),
+    ConstructorRaisesException
+] RTCIceCandidate {
+    readonly attribute DOMString candidate;
+    readonly attribute DOMString sdpMid;
+    readonly attribute unsigned short sdpMLineIndex;
+};
  
-    interface [
-        Conditional=MEDIA_STREAM,
-        Constructor(in Dictionary dictionary),
-        ConstructorRaisesException
-    ] RTCIceCandidate {
-        readonly attribute DOMString candidate;
-        readonly attribute DOMString sdpMid;
-        readonly attribute unsigned short sdpMLineIndex;
-    };
-
-}
diff --git a/Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.idl b/Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.idl

index c1047e0..6ad52f0 100644 (file)
--- a/Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.idl
+++ b/Source/WebCore/Modules/mediastream/RTCIceCandidateEvent.idl
@@ -22,12 +22,9 @@
   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module events {
+interface [
+    Conditional=MEDIA_STREAM,
+] RTCIceCandidateEvent : Event {
+    readonly attribute RTCIceCandidate candidate;
+};
  
-    interface [
-        Conditional=MEDIA_STREAM,
-    ] RTCIceCandidateEvent : Event {
-        readonly attribute RTCIceCandidate candidate;
-    };
-
-}
diff --git a/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl b/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl

index 56df47a..31269dd 100644 (file)
--- a/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl
+++ b/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl
@@ -28,72 +28,69 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module mediastream {
+interface [
+    Conditional=MEDIA_STREAM,
+    ActiveDOMObject,
+    Constructor(in Dictionary rtcIceServers, in [Optional=DefaultIsUndefined] Dictionary mediaConstraints),
+    ConstructorRaisesException,
+    CallWith=ScriptExecutionContext,
+    EventTarget
+] RTCPeerConnection {
+    void createOffer(in [Callback] RTCSessionDescriptionCallback successCallback, in [Callback,Optional=DefaultIsUndefined] RTCErrorCallback failureCallback, in [Optional=DefaultIsUndefined] Dictionary mediaConstraints)
+        raises(DOMException);
+
+    void createAnswer(in [Callback] RTCSessionDescriptionCallback successCallback, in [Callback, Optional=DefaultIsUndefined] RTCErrorCallback failureCallback, in [Optional=DefaultIsUndefined] Dictionary mediaConstraints)
+        raises(DOMException);
+
+    void setLocalDescription(in RTCSessionDescription description, in [Callback, Optional=DefaultIsUndefined] VoidCallback successCallback, in [Callback, Optional=DefaultIsUndefined] RTCErrorCallback failureCallback)
+        raises(DOMException);
+    readonly attribute RTCSessionDescription localDescription
+        getter raises(DOMException);
+
+    void setRemoteDescription(in RTCSessionDescription description, in [Callback, Optional=DefaultIsUndefined] VoidCallback successCallback, in [Callback, Optional=DefaultIsUndefined] RTCErrorCallback failureCallback)
+        raises(DOMException);
+    readonly attribute RTCSessionDescription remoteDescription
+        getter raises(DOMException);
+
+    readonly attribute DOMString readyState;
+
+    void updateIce(in [Optional=DefaultIsUndefined] Dictionary configuration, in [Optional=DefaultIsUndefined] Dictionary mediaConstraints)
+        raises(DOMException);
+
+    void addIceCandidate(in RTCIceCandidate candidate)
+        raises(DOMException);
+
+    readonly attribute DOMString iceState;
+
+    readonly attribute MediaStreamList localStreams;
+    readonly attribute MediaStreamList remoteStreams;
+
+    [StrictTypeChecking] void addStream(in MediaStream stream, in [Optional=DefaultIsUndefined] Dictionary mediaConstraints)
+        raises(DOMException);
+    [StrictTypeChecking] void removeStream(in MediaStream stream)
+        raises(DOMException);
+
+    void getStats(in [Callback] RTCStatsCallback successCallback, in [Optional=DefaultIsUndefined] MediaStreamTrack selector);
+
+    void close()
+        raises(DOMException);
+
+    attribute EventListener onnegotiationneeded;
+    attribute EventListener onicecandidate;
+    attribute EventListener onopen;
+    attribute EventListener onstatechange;
+    attribute EventListener onaddstream;
+    attribute EventListener onremovestream;
+    attribute EventListener onicechange;
+
+    // EventTarget interface
+    void addEventListener(in DOMString type,
+                          in EventListener listener,
+                          in [Optional] boolean useCapture);
+    void removeEventListener(in DOMString type,
+                             in EventListener listener,
+                             in [Optional] boolean useCapture);
+    boolean dispatchEvent(in Event event)
+        raises(EventException);
+};
  
-    interface [
-        Conditional=MEDIA_STREAM,
-        ActiveDOMObject,
-        Constructor(in Dictionary rtcIceServers, in [Optional=DefaultIsUndefined] Dictionary mediaConstraints),
-        ConstructorRaisesException,
-        CallWith=ScriptExecutionContext,
-        EventTarget
-    ] RTCPeerConnection {
-        void createOffer(in [Callback] RTCSessionDescriptionCallback successCallback, in [Callback,Optional=DefaultIsUndefined] RTCErrorCallback failureCallback, in [Optional=DefaultIsUndefined] Dictionary mediaConstraints)
-            raises(DOMException);
-
-        void createAnswer(in [Callback] RTCSessionDescriptionCallback successCallback, in [Callback, Optional=DefaultIsUndefined] RTCErrorCallback failureCallback, in [Optional=DefaultIsUndefined] Dictionary mediaConstraints)
-            raises(DOMException);
-
-        void setLocalDescription(in RTCSessionDescription description, in [Callback, Optional=DefaultIsUndefined] VoidCallback successCallback, in [Callback, Optional=DefaultIsUndefined] RTCErrorCallback failureCallback)
-            raises(DOMException);
-        readonly attribute RTCSessionDescription localDescription
-            getter raises(DOMException);
-
-        void setRemoteDescription(in RTCSessionDescription description, in [Callback, Optional=DefaultIsUndefined] VoidCallback successCallback, in [Callback, Optional=DefaultIsUndefined] RTCErrorCallback failureCallback)
-            raises(DOMException);
-        readonly attribute RTCSessionDescription remoteDescription
-            getter raises(DOMException);
-
-        readonly attribute DOMString readyState;
-
-        void updateIce(in [Optional=DefaultIsUndefined] Dictionary configuration, in [Optional=DefaultIsUndefined] Dictionary mediaConstraints)
-            raises(DOMException);
-
-        void addIceCandidate(in RTCIceCandidate candidate)
-            raises(DOMException);
-
-        readonly attribute DOMString iceState;
-
-        readonly attribute MediaStreamList localStreams;
-        readonly attribute MediaStreamList remoteStreams;
-
-        [StrictTypeChecking] void addStream(in MediaStream stream, in [Optional=DefaultIsUndefined] Dictionary mediaConstraints)
-            raises(DOMException);
-        [StrictTypeChecking] void removeStream(in MediaStream stream)
-            raises(DOMException);
-
-        void getStats(in [Callback] RTCStatsCallback successCallback, in [Optional=DefaultIsUndefined] MediaStreamTrack selector);
-
-        void close()
-            raises(DOMException);
-
-        attribute EventListener onnegotiationneeded;
-        attribute EventListener onicecandidate;
-        attribute EventListener onopen;
-        attribute EventListener onstatechange;
-        attribute EventListener onaddstream;
-        attribute EventListener onremovestream;
-        attribute EventListener onicechange;
-
-        // EventTarget interface
-        void addEventListener(in DOMString type,
-                              in EventListener listener,
-                              in [Optional] boolean useCapture);
-        void removeEventListener(in DOMString type,
-                                 in EventListener listener,
-                                 in [Optional] boolean useCapture);
-        boolean dispatchEvent(in Event event)
-            raises(EventException);
-    };
-
-}
diff --git a/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl b/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl

index e84dea2..8167a4c 100644 (file)
--- a/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl
+++ b/Source/WebCore/Modules/mediastream/RTCSessionDescription.idl
@@ -28,17 +28,14 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module mediastream {
+interface [
+    Conditional=MEDIA_STREAM,
+    Constructor(in Dictionary dictionary),
+    ConstructorRaisesException
+] RTCSessionDescription {
+    attribute DOMString type
+        setter raises(DOMException);
+    attribute DOMString sdp
+        setter raises(DOMException);
+};
  
-    interface [
-        Conditional=MEDIA_STREAM,
-        Constructor(in Dictionary dictionary),
-        ConstructorRaisesException
-    ] RTCSessionDescription {
-        attribute DOMString type
-            setter raises(DOMException);
-        attribute DOMString sdp
-            setter raises(DOMException);
-    };
-
-}
diff --git a/Source/WebCore/Modules/mediastream/RTCSessionDescriptionCallback.idl b/Source/WebCore/Modules/mediastream/RTCSessionDescriptionCallback.idl

index 5be75e9..6bcfc78 100644 (file)
--- a/Source/WebCore/Modules/mediastream/RTCSessionDescriptionCallback.idl
+++ b/Source/WebCore/Modules/mediastream/RTCSessionDescriptionCallback.idl
@@ -28,13 +28,10 @@
   * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module mediastream {
+interface [
+    Conditional=MEDIA_STREAM,
+    Callback
+] RTCSessionDescriptionCallback {
+    boolean handleEvent(in RTCSessionDescription sdp);
+};
  
-    interface [
-        Conditional=MEDIA_STREAM,
-        Callback
-    ] RTCSessionDescriptionCallback {
-        boolean handleEvent(in RTCSessionDescription sdp);
-    };
-
-}
diff --git a/Source/WebCore/Modules/mediastream/RTCStatsCallback.idl b/Source/WebCore/Modules/mediastream/RTCStatsCallback.idl

index 9829c18..87bae9f 100644 (file)
--- a/Source/WebCore/Modules/mediastream/RTCStatsCallback.idl
+++ b/Source/WebCore/Modules/mediastream/RTCStatsCallback.idl
@@ -22,13 +22,10 @@
   * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-module mediastream {
+interface [
+    Conditional=MEDIA_STREAM,
+    Callback
+] RTCStatsCallback {
+    boolean handleEvent(in RTCStatsResponse response);
+};
  
-    interface [
-        Conditional=MEDIA_STREAM,
-        Callback
-    ] RTCStatsCallback {
-        boolean handleEvent(in RTCStatsResponse response);
-    };
-
-}
diff --git a/Source/WebCore/Modules/mediastream/RTCStatsElement.idl b/Source/WebCore/Modules/mediastream/RTCStatsElement.idl

index 37d91a2..
author	commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Fri, 12 Oct 2012 06:10:17 +0000 (06:10 +0000)
committer	commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Fri, 12 Oct 2012 06:10:17 +0000 (06:10 +0000)