From 5b753da289cc0eec41da7bdfd3a6085bd326b75e Mon Sep 17 00:00:00 2001 From: Jeff Gilbert Date: Mon, 25 Jun 2018 14:20:54 -0700 Subject: [PATCH] Bug 1470325 - s/FooBinding/Foo_Binding/g - r=qdot MozReview-Commit-ID: JtTcLL5OPF0 --- accessible/aom/AccessibleNode.cpp | 2 +- accessible/base/nsCoreUtils.cpp | 2 +- accessible/generic/Accessible.cpp | 8 +- accessible/generic/DocAccessible.cpp | 8 +- accessible/xul/XULMenuAccessible.cpp | 8 +- accessible/xul/XULTreeGridAccessible.cpp | 12 +- .../shared/heapsnapshot/DominatorTree.cpp | 2 +- devtools/shared/heapsnapshot/HeapSnapshot.cpp | 2 +- docshell/shistory/ChildSHistory.cpp | 2 +- docshell/shistory/ParentSHistory.cpp | 2 +- dom/abort/AbortController.cpp | 2 +- dom/abort/AbortSignal.cpp | 2 +- dom/animation/Animation.cpp | 2 +- dom/animation/CSSPseudoElement.cpp | 2 +- dom/animation/DocumentTimeline.cpp | 2 +- dom/animation/KeyframeEffect.cpp | 2 +- dom/base/AnonymousContent.cpp | 2 +- dom/base/Attr.cpp | 2 +- dom/base/BarProps.cpp | 2 +- dom/base/ChildProcessMessageManager.h | 2 +- dom/base/ChromeMessageBroadcaster.cpp | 2 +- dom/base/ChromeMessageSender.cpp | 2 +- dom/base/ChromeNodeList.cpp | 2 +- dom/base/Comment.cpp | 2 +- dom/base/Crypto.cpp | 2 +- dom/base/CustomElementRegistry.cpp | 2 +- dom/base/DOMError.cpp | 2 +- dom/base/DOMException.cpp | 48 ++-- dom/base/DOMImplementation.cpp | 2 +- dom/base/DOMIntersectionObserver.h | 4 +- dom/base/DOMMatrix.cpp | 4 +- dom/base/DOMParser.h | 2 +- dom/base/DOMPoint.cpp | 4 +- dom/base/DOMQuad.cpp | 2 +- dom/base/DOMRect.cpp | 6 +- dom/base/DOMRequest.cpp | 2 +- dom/base/DOMStringList.cpp | 2 +- dom/base/DocumentFragment.cpp | 2 +- dom/base/DocumentType.cpp | 2 +- dom/base/Element.cpp | 16 +- dom/base/Element.h | 10 +- dom/base/EventSource.cpp | 2 +- dom/base/FormData.cpp | 2 +- dom/base/FragmentOrElement.cpp | 2 +- dom/base/IdleDeadline.cpp | 2 +- dom/base/IntlUtils.cpp | 2 +- dom/base/Location.cpp | 2 +- dom/base/MozQueryInterface.cpp | 2 +- dom/base/Navigator.cpp | 6 +- dom/base/Navigator.h | 2 +- dom/base/NodeIterator.cpp | 4 +- dom/base/ParentProcessMessageManager.cpp | 2 +- dom/base/ProcessGlobal.cpp | 6 +- dom/base/ProcessMessageManager.cpp | 2 +- dom/base/ScreenOrientation.cpp | 2 +- dom/base/Selection.cpp | 2 +- dom/base/ShadowRoot.cpp | 2 +- dom/base/StructuredCloneBlob.cpp | 2 +- dom/base/StyleSheetList.cpp | 2 +- dom/base/SubtleCrypto.cpp | 2 +- dom/base/TreeWalker.cpp | 30 +-- dom/base/WebKitCSSMatrix.cpp | 2 +- dom/base/WindowNamedPropertiesHandler.cpp | 2 +- dom/base/nsContentList.cpp | 12 +- dom/base/nsContentUtils.cpp | 16 +- dom/base/nsContentUtils.h | 2 +- dom/base/nsDOMAttributeMap.cpp | 2 +- dom/base/nsDOMCaretPosition.cpp | 2 +- dom/base/nsDOMDataChannel.cpp | 2 +- dom/base/nsDOMMutationObserver.h | 6 +- dom/base/nsDOMSerializer.h | 2 +- dom/base/nsDOMTokenList.cpp | 2 +- dom/base/nsDocument.cpp | 2 +- dom/base/nsFrameLoader.cpp | 2 +- dom/base/nsGenConImageContent.cpp | 2 +- dom/base/nsGlobalWindowInner.cpp | 8 +- dom/base/nsGlobalWindowOuter.cpp | 2 +- dom/base/nsHistory.cpp | 2 +- dom/base/nsINode.cpp | 38 +-- dom/base/nsINode.h | 24 +- dom/base/nsInProcessTabChildGlobal.cpp | 6 +- dom/base/nsMimeTypeArray.cpp | 4 +- dom/base/nsPluginArray.cpp | 4 +- dom/base/nsRange.cpp | 10 +- dom/base/nsScreen.cpp | 2 +- dom/base/nsStyledElement.cpp | 4 +- dom/base/nsTextNode.cpp | 2 +- dom/base/nsTraversal.cpp | 4 +- dom/base/nsTreeSanitizer.cpp | 6 +- dom/base/nsWindowRoot.cpp | 2 +- dom/battery/BatteryManager.cpp | 2 +- dom/bindings/BindingUtils.cpp | 14 +- dom/bindings/BindingUtils.h | 6 +- dom/bindings/test/TestFunctions.cpp | 2 +- .../test/TestInterfaceIterableDouble.cpp | 2 +- .../test/TestInterfaceIterableDoubleUnion.cpp | 2 +- .../test/TestInterfaceIterableSingle.cpp | 2 +- dom/bindings/test/TestInterfaceMaplike.cpp | 10 +- .../test/TestInterfaceMaplikeObject.cpp | 10 +- dom/bindings/test/TestInterfaceSetlike.cpp | 2 +- .../test/TestInterfaceSetlikeNode.cpp | 2 +- dom/broadcastchannel/BroadcastChannel.cpp | 2 +- dom/cache/Cache.cpp | 2 +- dom/cache/CacheStorage.cpp | 6 +- dom/canvas/CanvasGradient.h | 2 +- dom/canvas/CanvasPattern.h | 2 +- dom/canvas/CanvasRenderingContext2D.cpp | 16 +- dom/canvas/ImageBitmap.cpp | 6 +- dom/canvas/ImageBitmapRenderingContext.cpp | 2 +- dom/canvas/ImageData.cpp | 2 +- dom/canvas/OffscreenCanvas.cpp | 2 +- dom/canvas/TextMetrics.h | 2 +- dom/canvas/WebGL1Context.cpp | 2 +- dom/canvas/WebGL2Context.cpp | 2 +- dom/canvas/WebGLActiveInfo.cpp | 2 +- dom/canvas/WebGLBuffer.cpp | 2 +- dom/canvas/WebGLExtensions.h | 2 +- dom/canvas/WebGLFramebuffer.cpp | 2 +- dom/canvas/WebGLProgram.cpp | 2 +- dom/canvas/WebGLQuery.cpp | 2 +- dom/canvas/WebGLRenderbuffer.cpp | 2 +- dom/canvas/WebGLSampler.cpp | 2 +- dom/canvas/WebGLShader.cpp | 2 +- dom/canvas/WebGLShaderPrecisionFormat.cpp | 2 +- dom/canvas/WebGLSync.cpp | 2 +- dom/canvas/WebGLTexture.cpp | 2 +- dom/canvas/WebGLTransformFeedback.cpp | 2 +- dom/canvas/WebGLUniformLocation.cpp | 2 +- dom/canvas/WebGLVertexArray.cpp | 2 +- dom/canvas/WebGLVertexArrayObject.cpp | 2 +- .../test/webgl-conf/mochitest-errata.ini | 2 +- dom/clients/api/Client.cpp | 4 +- dom/clients/api/Clients.cpp | 2 +- dom/console/ConsoleInstance.cpp | 2 +- dom/credentialmanagement/Credential.cpp | 2 +- .../CredentialsContainer.cpp | 2 +- dom/crypto/CryptoKey.cpp | 2 +- dom/encoding/TextDecoder.h | 2 +- dom/encoding/TextEncoder.h | 2 +- dom/events/AnimationEvent.h | 2 +- dom/events/BeforeUnloadEvent.h | 2 +- dom/events/ClipboardEvent.h | 2 +- dom/events/CommandEvent.h | 2 +- dom/events/CompositionEvent.h | 2 +- dom/events/ConstructibleEventTarget.cpp | 2 +- dom/events/CustomEvent.cpp | 2 +- dom/events/DataTransfer.cpp | 4 +- dom/events/DataTransferItem.cpp | 2 +- dom/events/DataTransferItemList.cpp | 2 +- dom/events/DeviceMotionEvent.h | 6 +- dom/events/DragEvent.cpp | 2 +- dom/events/DragEvent.h | 2 +- dom/events/Event.cpp | 10 +- dom/events/EventStateManager.cpp | 36 +-- dom/events/FocusEvent.h | 2 +- dom/events/IMEStateManager.cpp | 2 +- dom/events/ImageCaptureError.cpp | 2 +- dom/events/InputEvent.h | 2 +- dom/events/KeyboardEvent.cpp | 2 +- dom/events/KeyboardEvent.h | 2 +- dom/events/MessageEvent.cpp | 4 +- dom/events/MouseEvent.cpp | 2 +- dom/events/MouseEvent.h | 2 +- dom/events/MouseScrollEvent.cpp | 8 +- dom/events/MouseScrollEvent.h | 2 +- dom/events/MutationEvent.h | 2 +- dom/events/NotifyPaintEvent.h | 2 +- dom/events/PaintRequest.cpp | 4 +- dom/events/PointerEvent.cpp | 18 +- dom/events/PointerEventHandler.cpp | 12 +- dom/events/PointerEventHandler.h | 2 +- dom/events/ScrollAreaEvent.h | 2 +- dom/events/SimpleGestureEvent.cpp | 2 +- dom/events/SimpleGestureEvent.h | 2 +- dom/events/SpeechRecognitionError.h | 2 +- dom/events/StorageEvent.cpp | 2 +- dom/events/TextClause.cpp | 2 +- dom/events/Touch.cpp | 2 +- dom/events/TouchEvent.cpp | 2 +- dom/events/TouchEvent.h | 2 +- dom/events/TransitionEvent.h | 2 +- dom/events/UIEvent.h | 2 +- dom/events/VirtualKeyCodeList.h | 6 +- dom/events/WheelEvent.cpp | 4 +- dom/events/WheelEvent.h | 2 +- dom/events/WheelHandlingHelper.cpp | 4 +- dom/events/XULCommandEvent.h | 2 +- dom/fetch/FetchObserver.cpp | 2 +- dom/fetch/Headers.cpp | 2 +- dom/fetch/Request.h | 2 +- dom/fetch/Response.h | 2 +- dom/file/Blob.cpp | 2 +- dom/file/File.cpp | 2 +- dom/file/FileList.cpp | 2 +- dom/file/FileReader.cpp | 4 +- dom/file/FileReaderSync.cpp | 2 +- dom/filesystem/Directory.cpp | 2 +- dom/filesystem/compat/FileSystem.cpp | 2 +- .../compat/FileSystemDirectoryEntry.cpp | 2 +- .../compat/FileSystemDirectoryReader.cpp | 2 +- dom/filesystem/compat/FileSystemEntry.cpp | 2 +- dom/filesystem/compat/FileSystemFileEntry.cpp | 2 +- dom/flex/Flex.cpp | 2 +- dom/flex/FlexItem.cpp | 2 +- dom/flex/FlexLine.cpp | 2 +- dom/gamepad/Gamepad.cpp | 6 +- dom/gamepad/GamepadButton.cpp | 2 +- dom/gamepad/GamepadHapticActuator.cpp | 2 +- dom/gamepad/GamepadPose.cpp | 2 +- dom/gamepad/GamepadServiceTest.cpp | 2 +- dom/geolocation/PositionError.cpp | 8 +- dom/geolocation/nsGeoPosition.cpp | 4 +- dom/geolocation/nsGeolocation.cpp | 14 +- dom/grid/Grid.cpp | 2 +- dom/grid/GridArea.cpp | 2 +- dom/grid/GridDimension.cpp | 2 +- dom/grid/GridLine.cpp | 2 +- dom/grid/GridLines.cpp | 2 +- dom/grid/GridTrack.cpp | 2 +- dom/grid/GridTracks.cpp | 2 +- dom/html/HTMLAllCollection.cpp | 2 +- dom/html/HTMLAnchorElement.cpp | 2 +- dom/html/HTMLAreaElement.cpp | 2 +- dom/html/HTMLAudioElement.cpp | 2 +- dom/html/HTMLBRElement.cpp | 2 +- dom/html/HTMLBodyElement.cpp | 2 +- dom/html/HTMLButtonElement.cpp | 2 +- dom/html/HTMLCanvasElement.cpp | 4 +- dom/html/HTMLDataElement.cpp | 2 +- dom/html/HTMLDataListElement.cpp | 2 +- dom/html/HTMLDetailsElement.cpp | 2 +- dom/html/HTMLDialogElement.cpp | 2 +- dom/html/HTMLDivElement.cpp | 2 +- dom/html/HTMLElement.cpp | 2 +- dom/html/HTMLEmbedElement.cpp | 2 +- dom/html/HTMLFieldSetElement.cpp | 2 +- dom/html/HTMLFontElement.cpp | 2 +- dom/html/HTMLFormControlsCollection.cpp | 2 +- dom/html/HTMLFormElement.cpp | 2 +- dom/html/HTMLFrameElement.cpp | 2 +- dom/html/HTMLFrameSetElement.cpp | 2 +- dom/html/HTMLHRElement.cpp | 2 +- dom/html/HTMLHeadingElement.cpp | 2 +- dom/html/HTMLIFrameElement.cpp | 2 +- dom/html/HTMLImageElement.cpp | 6 +- dom/html/HTMLInputElement.cpp | 8 +- dom/html/HTMLLIElement.cpp | 2 +- dom/html/HTMLLabelElement.cpp | 8 +- dom/html/HTMLLegendElement.cpp | 2 +- dom/html/HTMLLinkElement.cpp | 2 +- dom/html/HTMLMapElement.cpp | 2 +- dom/html/HTMLMediaElement.cpp | 2 +- dom/html/HTMLMediaElement.h | 4 +- dom/html/HTMLMenuElement.cpp | 2 +- dom/html/HTMLMenuItemElement.cpp | 2 +- dom/html/HTMLMetaElement.cpp | 2 +- dom/html/HTMLMeterElement.cpp | 2 +- dom/html/HTMLModElement.cpp | 2 +- dom/html/HTMLObjectElement.cpp | 2 +- dom/html/HTMLOptGroupElement.cpp | 2 +- dom/html/HTMLOptionElement.cpp | 2 +- dom/html/HTMLOptionsCollection.cpp | 2 +- dom/html/HTMLOutputElement.cpp | 2 +- dom/html/HTMLParagraphElement.cpp | 2 +- dom/html/HTMLPictureElement.cpp | 2 +- dom/html/HTMLPreElement.cpp | 2 +- dom/html/HTMLProgressElement.cpp | 2 +- dom/html/HTMLScriptElement.cpp | 2 +- dom/html/HTMLSelectElement.cpp | 2 +- dom/html/HTMLSharedElement.cpp | 12 +- dom/html/HTMLSharedListElement.cpp | 6 +- dom/html/HTMLSlotElement.cpp | 2 +- dom/html/HTMLSourceElement.cpp | 2 +- dom/html/HTMLSpanElement.cpp | 2 +- dom/html/HTMLStyleElement.cpp | 2 +- dom/html/HTMLSummaryElement.cpp | 2 +- dom/html/HTMLTableCaptionElement.cpp | 2 +- dom/html/HTMLTableCellElement.cpp | 2 +- dom/html/HTMLTableColElement.cpp | 2 +- dom/html/HTMLTableElement.cpp | 4 +- dom/html/HTMLTableRowElement.cpp | 2 +- dom/html/HTMLTableSectionElement.cpp | 2 +- dom/html/HTMLTemplateElement.cpp | 2 +- dom/html/HTMLTextAreaElement.cpp | 2 +- dom/html/HTMLTimeElement.cpp | 2 +- dom/html/HTMLTitleElement.cpp | 2 +- dom/html/HTMLTrackElement.cpp | 2 +- dom/html/HTMLUnknownElement.cpp | 2 +- dom/html/HTMLVideoElement.cpp | 2 +- dom/html/ImageDocument.cpp | 2 +- dom/html/MediaError.cpp | 2 +- dom/html/RadioNodeList.cpp | 2 +- dom/html/TimeRanges.cpp | 2 +- dom/html/ValidityState.cpp | 2 +- dom/html/nsDOMStringMap.cpp | 6 +- dom/html/nsGenericHTMLElement.cpp | 4 +- dom/html/nsHTMLDocument.cpp | 2 +- dom/indexedDB/IDBCursor.cpp | 4 +- dom/indexedDB/IDBDatabase.cpp | 2 +- dom/indexedDB/IDBEvents.cpp | 2 +- dom/indexedDB/IDBFactory.cpp | 2 +- dom/indexedDB/IDBFileHandle.cpp | 2 +- dom/indexedDB/IDBFileRequest.cpp | 2 +- dom/indexedDB/IDBIndex.cpp | 2 +- dom/indexedDB/IDBKeyRange.cpp | 4 +- dom/indexedDB/IDBMutableFile.cpp | 2 +- dom/indexedDB/IDBObjectStore.cpp | 2 +- dom/indexedDB/IDBRequest.cpp | 4 +- dom/indexedDB/IDBTransaction.cpp | 2 +- dom/indexedDB/IndexedDatabaseManager.cpp | 26 +- dom/interfaces/base/nsIDOMWindowUtils.idl | 2 +- dom/ipc/TabChild.cpp | 8 +- dom/mathml/nsMathMLElement.cpp | 2 +- dom/media/AudioStreamTrack.cpp | 2 +- dom/media/AudioTrack.cpp | 2 +- dom/media/AudioTrackList.cpp | 2 +- dom/media/CanvasCaptureMediaStream.cpp | 2 +- dom/media/DOMMediaStream.cpp | 4 +- dom/media/GetUserMediaRequest.cpp | 2 +- dom/media/MediaDeviceInfo.cpp | 2 +- dom/media/MediaDevices.cpp | 2 +- dom/media/MediaRecorder.cpp | 2 +- dom/media/MediaStreamError.cpp | 2 +- dom/media/TextTrack.cpp | 2 +- dom/media/TextTrackCue.cpp | 2 +- dom/media/TextTrackCueList.cpp | 2 +- dom/media/TextTrackList.cpp | 2 +- dom/media/TextTrackRegion.cpp | 2 +- dom/media/VideoPlaybackQuality.cpp | 2 +- dom/media/VideoStreamTrack.cpp | 2 +- dom/media/VideoTrack.cpp | 2 +- dom/media/VideoTrackList.cpp | 2 +- dom/media/eme/MediaEncryptedEvent.cpp | 2 +- dom/media/eme/MediaKeyError.cpp | 2 +- dom/media/eme/MediaKeyMessageEvent.cpp | 2 +- dom/media/eme/MediaKeySession.cpp | 2 +- dom/media/eme/MediaKeyStatusMap.cpp | 2 +- dom/media/eme/MediaKeySystemAccess.cpp | 2 +- dom/media/eme/MediaKeys.cpp | 2 +- dom/media/imagecapture/ImageCapture.h | 2 +- dom/media/mediasource/MediaSource.cpp | 2 +- dom/media/mediasource/SourceBuffer.cpp | 2 +- dom/media/mediasource/SourceBufferList.cpp | 2 +- dom/media/webaudio/AnalyserNode.cpp | 2 +- dom/media/webaudio/AudioBuffer.cpp | 2 +- dom/media/webaudio/AudioBufferSourceNode.cpp | 2 +- dom/media/webaudio/AudioContext.cpp | 4 +- dom/media/webaudio/AudioDestinationNode.cpp | 2 +- dom/media/webaudio/AudioListener.cpp | 2 +- dom/media/webaudio/AudioParam.cpp | 2 +- dom/media/webaudio/AudioParamMap.cpp | 2 +- dom/media/webaudio/AudioProcessingEvent.cpp | 2 +- .../webaudio/AudioScheduledSourceNode.cpp | 2 +- dom/media/webaudio/AudioWorkletNode.cpp | 2 +- dom/media/webaudio/BiquadFilterNode.cpp | 2 +- dom/media/webaudio/ChannelMergerNode.cpp | 2 +- dom/media/webaudio/ChannelSplitterNode.cpp | 2 +- dom/media/webaudio/ConstantSourceNode.cpp | 2 +- dom/media/webaudio/ConvolverNode.cpp | 2 +- dom/media/webaudio/DelayNode.cpp | 2 +- dom/media/webaudio/DynamicsCompressorNode.cpp | 2 +- dom/media/webaudio/GainNode.cpp | 2 +- dom/media/webaudio/IIRFilterNode.cpp | 2 +- .../webaudio/MediaElementAudioSourceNode.cpp | 2 +- .../MediaStreamAudioDestinationNode.cpp | 2 +- .../webaudio/MediaStreamAudioSourceNode.cpp | 2 +- dom/media/webaudio/OscillatorNode.cpp | 2 +- dom/media/webaudio/PannerNode.cpp | 2 +- dom/media/webaudio/PeriodicWave.cpp | 2 +- dom/media/webaudio/ScriptProcessorNode.cpp | 2 +- dom/media/webaudio/StereoPannerNode.cpp | 2 +- dom/media/webaudio/WaveShaperNode.cpp | 4 +- dom/media/webrtc/RTCCertificate.cpp | 2 +- .../webrtc/RTCIdentityProviderRegistrar.cpp | 2 +- .../webspeech/recognition/SpeechGrammar.cpp | 2 +- .../recognition/SpeechGrammarList.cpp | 2 +- .../recognition/SpeechRecognition.cpp | 2 +- .../SpeechRecognitionAlternative.cpp | 2 +- .../recognition/SpeechRecognitionResult.cpp | 2 +- .../SpeechRecognitionResultList.cpp | 2 +- dom/media/webspeech/synth/SpeechSynthesis.cpp | 2 +- .../synth/SpeechSynthesisUtterance.cpp | 2 +- .../webspeech/synth/SpeechSynthesisVoice.cpp | 2 +- dom/messagechannel/MessageChannel.cpp | 2 +- dom/messagechannel/MessagePort.cpp | 2 +- dom/midi/MIDIAccess.cpp | 26 +- dom/midi/MIDIInput.cpp | 2 +- dom/midi/MIDIInputMap.cpp | 2 +- dom/midi/MIDIMessageEvent.cpp | 2 +- dom/midi/MIDIOutput.cpp | 2 +- dom/midi/MIDIOutputMap.cpp | 2 +- dom/midi/MIDIPort.cpp | 2 +- dom/network/Connection.cpp | 2 +- dom/network/TCPServerSocket.cpp | 2 +- dom/network/TCPSocket.cpp | 4 +- dom/network/UDPSocket.cpp | 2 +- dom/notification/Notification.cpp | 2 +- dom/notification/NotificationEvent.h | 2 +- dom/offline/nsDOMOfflineResourceList.cpp | 2 +- dom/payments/PaymentAddress.cpp | 2 +- dom/payments/PaymentRequest.cpp | 2 +- dom/payments/PaymentRequestUpdateEvent.cpp | 2 +- dom/payments/PaymentResponse.cpp | 2 +- dom/performance/Performance.cpp | 2 +- dom/performance/PerformanceEntry.cpp | 2 +- dom/performance/PerformanceMark.cpp | 2 +- dom/performance/PerformanceMeasure.cpp | 2 +- dom/performance/PerformanceNavigation.cpp | 2 +- .../PerformanceNavigationTiming.cpp | 2 +- dom/performance/PerformanceObserver.cpp | 2 +- .../PerformanceObserverEntryList.cpp | 2 +- dom/performance/PerformanceResourceTiming.cpp | 2 +- dom/performance/PerformanceServerTiming.cpp | 2 +- dom/performance/PerformanceTiming.cpp | 2 +- dom/permission/PermissionStatus.cpp | 2 +- dom/permission/Permissions.cpp | 2 +- dom/plugins/base/nsPluginInstanceOwner.cpp | 12 +- dom/presentation/Presentation.cpp | 2 +- dom/presentation/PresentationAvailability.cpp | 2 +- dom/presentation/PresentationConnection.cpp | 2 +- .../PresentationConnectionList.cpp | 4 +- dom/presentation/PresentationReceiver.cpp | 2 +- dom/presentation/PresentationRequest.cpp | 2 +- dom/promise/Promise.cpp | 2 +- dom/push/PushManager.cpp | 2 +- dom/push/PushSubscription.cpp | 2 +- dom/push/PushSubscriptionOptions.cpp | 2 +- dom/quota/StorageManager.cpp | 2 +- dom/serviceworkers/ServiceWorker.cpp | 2 +- dom/serviceworkers/ServiceWorkerContainer.cpp | 2 +- dom/serviceworkers/ServiceWorkerEvents.cpp | 6 +- dom/serviceworkers/ServiceWorkerEvents.h | 6 +- .../ServiceWorkerRegistration.cpp | 2 +- dom/smil/TimeEvent.h | 2 +- dom/storage/Storage.cpp | 2 +- dom/svg/DOMSVGAnimatedLengthList.cpp | 2 +- dom/svg/DOMSVGAnimatedNumberList.cpp | 2 +- dom/svg/DOMSVGLength.cpp | 16 +- dom/svg/DOMSVGLengthList.cpp | 2 +- dom/svg/DOMSVGNumber.cpp | 2 +- dom/svg/DOMSVGNumberList.cpp | 2 +- dom/svg/DOMSVGPathSeg.cpp | 2 +- dom/svg/DOMSVGPathSeg.h | 42 +-- dom/svg/DOMSVGPathSegList.cpp | 2 +- dom/svg/DOMSVGPointList.cpp | 2 +- dom/svg/DOMSVGStringList.cpp | 2 +- dom/svg/DOMSVGTransformList.cpp | 2 +- dom/svg/SVGAElement.cpp | 2 +- dom/svg/SVGAngle.cpp | 2 +- dom/svg/SVGAnimateElement.cpp | 2 +- dom/svg/SVGAnimateMotionElement.cpp | 2 +- dom/svg/SVGAnimateTransformElement.cpp | 2 +- dom/svg/SVGAnimatedAngle.cpp | 2 +- dom/svg/SVGAnimatedBoolean.cpp | 2 +- dom/svg/SVGAnimatedEnumeration.cpp | 2 +- dom/svg/SVGAnimatedInteger.cpp | 2 +- dom/svg/SVGAnimatedLength.cpp | 2 +- dom/svg/SVGAnimatedLengthList.cpp | 6 +- dom/svg/SVGAnimatedNumber.cpp | 2 +- dom/svg/SVGAnimatedPreserveAspectRatio.cpp | 2 +- dom/svg/SVGAnimatedPreserveAspectRatio.h | 4 +- dom/svg/SVGAnimatedRect.cpp | 2 +- dom/svg/SVGAnimatedString.cpp | 2 +- dom/svg/SVGAnimatedTransformList.cpp | 2 +- dom/svg/SVGCircleElement.cpp | 8 +- dom/svg/SVGClipPathElement.cpp | 4 +- dom/svg/SVGContentUtils.cpp | 2 +- dom/svg/SVGDefsElement.cpp | 2 +- dom/svg/SVGDescElement.cpp | 2 +- dom/svg/SVGEllipseElement.cpp | 10 +- dom/svg/SVGFEBlendElement.cpp | 2 +- dom/svg/SVGFEColorMatrixElement.cpp | 2 +- dom/svg/SVGFEComponentTransferElement.cpp | 2 +- dom/svg/SVGFECompositeElement.cpp | 2 +- dom/svg/SVGFEConvolveMatrixElement.cpp | 2 +- dom/svg/SVGFEDiffuseLightingElement.cpp | 2 +- dom/svg/SVGFEDisplacementMapElement.cpp | 2 +- dom/svg/SVGFEDistantLightElement.cpp | 2 +- dom/svg/SVGFEDropShadowElement.cpp | 2 +- dom/svg/SVGFEFloodElement.cpp | 2 +- dom/svg/SVGFEGaussianBlurElement.cpp | 2 +- dom/svg/SVGFEImageElement.cpp | 2 +- dom/svg/SVGFEMergeElement.cpp | 2 +- dom/svg/SVGFEMergeNodeElement.cpp | 2 +- dom/svg/SVGFEMorphologyElement.cpp | 2 +- dom/svg/SVGFEOffsetElement.cpp | 2 +- dom/svg/SVGFEPointLightElement.cpp | 2 +- dom/svg/SVGFESpecularLightingElement.cpp | 2 +- dom/svg/SVGFESpotLightElement.cpp | 2 +- dom/svg/SVGFETileElement.cpp | 2 +- dom/svg/SVGFETurbulenceElement.cpp | 2 +- dom/svg/SVGFilterElement.cpp | 12 +- dom/svg/SVGForeignObjectElement.cpp | 10 +- dom/svg/SVGGElement.cpp | 2 +- dom/svg/SVGGeometryElement.cpp | 2 +- dom/svg/SVGGradientElement.cpp | 28 +- dom/svg/SVGIRect.h | 2 +- dom/svg/SVGImageElement.cpp | 10 +- dom/svg/SVGLength.cpp | 40 +-- dom/svg/SVGLength.h | 8 +- dom/svg/SVGLengthList.h | 2 +- dom/svg/SVGLineElement.cpp | 10 +- dom/svg/SVGMPathElement.cpp | 2 +- dom/svg/SVGMarkerElement.cpp | 14 +- dom/svg/SVGMarkerElement.h | 8 +- dom/svg/SVGMaskElement.cpp | 12 +- dom/svg/SVGMatrix.cpp | 2 +- dom/svg/SVGMetadataElement.cpp | 2 +- dom/svg/SVGMotionSMILAnimationFunction.cpp | 2 +- dom/svg/SVGOrientSMILType.cpp | 4 +- dom/svg/SVGPathData.cpp | 2 +- dom/svg/SVGPathElement.cpp | 2 +- dom/svg/SVGPathSegUtils.h | 32 +-- dom/svg/SVGPatternElement.cpp | 12 +- dom/svg/SVGPolygonElement.cpp | 2 +- dom/svg/SVGPolylineElement.cpp | 2 +- dom/svg/SVGPreserveAspectRatio.cpp | 4 +- dom/svg/SVGPreserveAspectRatio.h | 12 +- dom/svg/SVGRectElement.cpp | 14 +- dom/svg/SVGSVGElement.cpp | 6 +- dom/svg/SVGScriptElement.cpp | 2 +- dom/svg/SVGSetElement.cpp | 2 +- dom/svg/SVGStopElement.cpp | 2 +- dom/svg/SVGStyleElement.cpp | 2 +- dom/svg/SVGSwitchElement.cpp | 2 +- dom/svg/SVGSymbolElement.cpp | 2 +- dom/svg/SVGTSpanElement.cpp | 2 +- dom/svg/SVGTextContentElement.cpp | 4 +- dom/svg/SVGTextElement.cpp | 2 +- dom/svg/SVGTextPathElement.cpp | 10 +- dom/svg/SVGTitleElement.cpp | 2 +- dom/svg/SVGTransform.cpp | 4 +- dom/svg/SVGTransformListSMILType.cpp | 2 +- dom/svg/SVGTransformableElement.cpp | 12 +- dom/svg/SVGUseElement.cpp | 12 +- dom/svg/SVGViewElement.cpp | 4 +- dom/svg/SVGViewportElement.cpp | 8 +- dom/svg/nsISVGPoint.h | 2 +- dom/svg/nsSVGAngle.cpp | 4 +- dom/svg/nsSVGAngle.h | 2 +- dom/svg/nsSVGAnimatedTransformList.cpp | 8 +- dom/svg/nsSVGElement.cpp | 50 ++-- dom/svg/nsSVGFilters.cpp | 16 +- dom/svg/nsSVGLength2.cpp | 34 +-- dom/svg/nsSVGLength2.h | 4 +- dom/svg/nsSVGPathDataParser.cpp | 2 +- dom/svg/nsSVGTransform.cpp | 2 +- dom/svg/nsSVGTransform.h | 12 +- dom/system/linux/GpsdLocationProvider.cpp | 10 +- .../mac/CoreLocationLocationProvider.mm | 2 +- .../windows/WindowsLocationProvider.cpp | 4 +- dom/u2f/U2F.cpp | 2 +- dom/url/URL.cpp | 2 +- dom/url/URLSearchParams.cpp | 2 +- dom/vr/VRDisplay.cpp | 16 +- dom/vr/VRDisplayEvent.cpp | 2 +- dom/vr/VRServiceTest.cpp | 6 +- .../AuthenticatorAssertionResponse.cpp | 2 +- .../AuthenticatorAttestationResponse.cpp | 2 +- dom/webauthn/AuthenticatorResponse.cpp | 2 +- dom/webauthn/PublicKeyCredential.cpp | 2 +- .../WebBrowserPersistLocalDocument.cpp | 6 +- dom/websocket/WebSocket.cpp | 2 +- dom/workers/ChromeWorker.cpp | 2 +- dom/workers/SharedWorker.cpp | 2 +- dom/workers/Worker.cpp | 2 +- dom/workers/WorkerLocation.cpp | 2 +- dom/workers/WorkerNavigator.cpp | 4 +- dom/workers/WorkerScope.cpp | 8 +- dom/worklet/AudioWorkletGlobalScope.cpp | 2 +- dom/worklet/PaintWorkletGlobalScope.cpp | 2 +- dom/worklet/Worklet.cpp | 2 +- dom/xbl/XBLChildrenElement.cpp | 2 +- dom/xbl/nsXBLEventHandler.cpp | 4 +- dom/xbl/nsXBLProtoImpl.cpp | 4 +- dom/xbl/nsXBLPrototypeHandler.cpp | 20 +- dom/xbl/nsXBLPrototypeHandler.h | 2 +- dom/xbl/nsXBLWindowKeyHandler.cpp | 2 +- dom/xhr/XMLHttpRequest.h | 2 +- dom/xhr/XMLHttpRequestMainThread.cpp | 144 +++++----- dom/xhr/XMLHttpRequestUpload.cpp | 2 +- dom/xhr/XMLHttpRequestWorker.cpp | 10 +- dom/xml/CDATASection.cpp | 2 +- dom/xml/ProcessingInstruction.cpp | 2 +- dom/xml/XMLDocument.cpp | 4 +- dom/xml/nsXMLElement.cpp | 2 +- dom/xslt/xpath/XPathEvaluator.cpp | 2 +- dom/xslt/xpath/XPathExpression.cpp | 2 +- dom/xslt/xpath/XPathExpression.h | 2 +- dom/xslt/xpath/XPathResult.cpp | 2 +- dom/xslt/xslt/txMozillaXSLTProcessor.cpp | 2 +- dom/xslt/xslt/txMozillaXSLTProcessor.h | 2 +- dom/xul/XULDocument.cpp | 2 +- dom/xul/XULPopupElement.cpp | 2 +- dom/xul/nsXULElement.cpp | 12 +- dom/xul/nsXULPopupListener.cpp | 2 +- editor/libeditor/HTMLEditRules.cpp | 4 +- editor/libeditor/SelectionState.cpp | 4 +- editor/libeditor/TextEditRules.cpp | 2 +- .../spellcheck/src/mozInlineSpellChecker.cpp | 18 +- gfx/layers/apz/src/APZCTreeManager.cpp | 2 +- gfx/layers/apz/src/APZInputBridge.cpp | 10 +- gfx/layers/apz/util/APZCCallbackHelper.cpp | 2 +- gfx/layers/apz/util/APZEventState.cpp | 2 +- .../apz/util/CheckerboardReportService.cpp | 2 +- image/VectorImage.cpp | 2 +- js/xpconnect/loader/ChromeScriptLoader.cpp | 2 +- js/xpconnect/src/Sandbox.cpp | 50 ++-- js/xpconnect/wrappers/AccessCheck.cpp | 4 +- layout/base/AccessibleCaretEventHub.cpp | 4 +- layout/base/AccessibleCaretManager.cpp | 8 +- layout/base/AccessibleCaretManager.h | 2 +- layout/base/PositionedEventTargeting.cpp | 2 +- layout/base/nsLayoutUtils.cpp | 4 +- layout/forms/nsDateTimeControlFrame.cpp | 6 +- layout/forms/nsFileControlFrame.cpp | 2 +- layout/forms/nsListControlFrame.cpp | 2 +- layout/forms/nsNumberControlFrame.cpp | 6 +- layout/inspector/InspectorFontFace.h | 2 +- layout/inspector/ServoStyleRuleMap.cpp | 34 +-- layout/inspector/inDeepTreeWalker.cpp | 2 +- layout/mathml/nsMathMLContainerFrame.cpp | 6 +- layout/style/BindingStyleRule.cpp | 2 +- layout/style/CSSCounterStyleRule.cpp | 4 +- layout/style/CSSFontFaceRule.cpp | 6 +- layout/style/CSSFontFeatureValuesRule.cpp | 2 +- layout/style/CSSFontFeatureValuesRule.h | 2 +- layout/style/CSSImportRule.cpp | 2 +- layout/style/CSSImportRule.h | 2 +- layout/style/CSSKeyframeRule.cpp | 2 +- layout/style/CSSKeyframeRule.h | 2 +- layout/style/CSSKeyframesRule.cpp | 2 +- layout/style/CSSKeyframesRule.h | 2 +- layout/style/CSSMediaRule.cpp | 2 +- layout/style/CSSMediaRule.h | 2 +- layout/style/CSSMozDocumentRule.cpp | 2 +- layout/style/CSSMozDocumentRule.h | 2 +- layout/style/CSSNamespaceRule.h | 4 +- layout/style/CSSPageRule.cpp | 2 +- layout/style/CSSPageRule.h | 2 +- layout/style/CSSRuleList.cpp | 2 +- layout/style/CSSStyleRule.h | 2 +- layout/style/CSSSupportsRule.cpp | 2 +- layout/style/CSSSupportsRule.h | 2 +- layout/style/FontFace.cpp | 2 +- layout/style/FontFaceSet.cpp | 2 +- layout/style/FontFaceSetIterator.cpp | 2 +- layout/style/MediaList.cpp | 2 +- layout/style/MediaQueryList.cpp | 2 +- layout/style/Rule.h | 10 +- layout/style/ServoCSSRuleList.cpp | 4 +- layout/style/StyleSheet.cpp | 10 +- layout/style/nsAnimationManager.cpp | 2 +- layout/style/nsDOMCSSDeclaration.cpp | 2 +- layout/style/nsTransitionManager.cpp | 2 +- layout/svg/SVGFEImageFrame.cpp | 2 +- layout/svg/SVGTextFrame.cpp | 2 +- layout/svg/nsSVGAFrame.cpp | 2 +- layout/svg/nsSVGFilterInstance.cpp | 12 +- layout/svg/nsSVGGradientFrame.cpp | 4 +- layout/svg/nsSVGImageFrame.cpp | 2 +- layout/svg/nsSVGMaskFrame.cpp | 2 +- layout/svg/nsSVGPatternFrame.cpp | 2 +- layout/svg/nsSVGUtils.cpp | 2 +- layout/xul/BoxObject.cpp | 2 +- layout/xul/ListBoxObject.cpp | 2 +- layout/xul/MenuBoxObject.cpp | 10 +- layout/xul/ScrollBoxObject.cpp | 2 +- layout/xul/nsButtonBoxFrame.cpp | 2 +- layout/xul/nsMenuBarListener.cpp | 16 +- layout/xul/nsMenuPopupFrame.cpp | 2 +- layout/xul/nsScrollbarFrame.cpp | 4 +- layout/xul/nsXULPopupManager.cpp | 84 +++--- layout/xul/nsXULPopupManager.h | 2 +- layout/xul/nsXULTooltipListener.cpp | 2 +- layout/xul/tree/TreeBoxObject.cpp | 2 +- layout/xul/tree/nsTreeBodyFrame.cpp | 10 +- layout/xul/tree/nsTreeColumns.cpp | 12 +- layout/xul/tree/nsTreeContentView.cpp | 2 +- .../src/peerconnection/PeerConnectionImpl.cpp | 2 +- .../src/peerconnection/TransceiverImpl.cpp | 2 +- storage/mozStorageAsyncStatementParams.cpp | 2 +- storage/mozStorageStatementParams.cpp | 2 +- storage/mozStorageStatementRow.cpp | 2 +- .../autocomplete/nsAutoCompleteController.cpp | 28 +- .../components/extensions/MatchPattern.cpp | 6 +- .../extensions/WebExtensionPolicy.cpp | 8 +- .../extensions/webrequest/ChannelWrapper.cpp | 18 +- .../extensions/webrequest/StreamFilter.cpp | 2 +- .../webrequest/StreamFilterEvents.cpp | 2 +- .../KeyCodeConsensus_En_US.h | 254 +++++++++--------- .../resistfingerprinting/nsRFPService.cpp | 2 +- .../satchel/nsFormFillController.cpp | 48 ++-- .../typeaheadfind/nsTypeAheadFind.cpp | 6 +- widget/InputData.cpp | 16 +- widget/MouseEvents.h | 18 +- widget/TextEvents.h | 8 +- widget/WidgetEventImpl.cpp | 188 ++++++------- widget/android/nsWindow.cpp | 4 +- widget/cocoa/SwipeTracker.mm | 6 +- widget/cocoa/nsChildView.mm | 30 +-- widget/gtk/nsWindow.cpp | 2 +- widget/headless/HeadlessWidget.h | 8 +- widget/nsBaseDragService.cpp | 4 +- widget/uikit/nsWindow.mm | 2 +- widget/windows/WinMouseScrollHandler.cpp | 10 +- widget/windows/WinPointerEvents.cpp | 2 +- widget/windows/WinUtils.cpp | 6 +- widget/windows/WinUtils.h | 2 +- widget/windows/nsWinGesture.cpp | 6 +- widget/windows/nsWindow.cpp | 16 +- widget/windows/nsWindow.h | 2 +- 712 files changed, 1793 insertions(+), 1793 deletions(-) diff --git a/accessible/aom/AccessibleNode.cpp b/accessible/aom/AccessibleNode.cpp index db4523472115..95d34800ff8b 100644 --- a/accessible/aom/AccessibleNode.cpp +++ b/accessible/aom/AccessibleNode.cpp @@ -62,7 +62,7 @@ AccessibleNode::~AccessibleNode() /* virtual */ JSObject* AccessibleNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return AccessibleNodeBinding::Wrap(aCx, this, aGivenProto); + return AccessibleNode_Binding::Wrap(aCx, this, aGivenProto); } /* virtual */ ParentObject diff --git a/accessible/base/nsCoreUtils.cpp b/accessible/base/nsCoreUtils.cpp index a5c153ab99d0..f855da3a547e 100644 --- a/accessible/base/nsCoreUtils.cpp +++ b/accessible/base/nsCoreUtils.cpp @@ -143,7 +143,7 @@ nsCoreUtils::DispatchMouseEvent(EventMessage aMessage, int32_t aX, int32_t aY, event.mClickCount = 1; event.button = WidgetMouseEvent::eLeftButton; event.mTime = PR_IntervalNow(); - event.inputSource = dom::MouseEventBinding::MOZ_SOURCE_UNKNOWN; + event.inputSource = dom::MouseEvent_Binding::MOZ_SOURCE_UNKNOWN; nsEventStatus status = nsEventStatus_eIgnore; aPresShell->HandleEventWithTarget(&event, aFrame, aContent, &status); diff --git a/accessible/generic/Accessible.cpp b/accessible/generic/Accessible.cpp index ed4232266946..6f094a6942a9 100644 --- a/accessible/generic/Accessible.cpp +++ b/accessible/generic/Accessible.cpp @@ -256,13 +256,13 @@ Accessible::AccessKey() const switch (Preferences::GetInt("ui.key.generalAccessKey", -1)) { case -1: break; - case dom::KeyboardEventBinding::DOM_VK_SHIFT: + case dom::KeyboardEvent_Binding::DOM_VK_SHIFT: return KeyBinding(key, KeyBinding::kShift); - case dom::KeyboardEventBinding::DOM_VK_CONTROL: + case dom::KeyboardEvent_Binding::DOM_VK_CONTROL: return KeyBinding(key, KeyBinding::kControl); - case dom::KeyboardEventBinding::DOM_VK_ALT: + case dom::KeyboardEvent_Binding::DOM_VK_ALT: return KeyBinding(key, KeyBinding::kAlt); - case dom::KeyboardEventBinding::DOM_VK_META: + case dom::KeyboardEvent_Binding::DOM_VK_META: return KeyBinding(key, KeyBinding::kMeta); default: return KeyBinding(); diff --git a/accessible/generic/DocAccessible.cpp b/accessible/generic/DocAccessible.cpp index f6c90708cb31..c1f2764fa969 100644 --- a/accessible/generic/DocAccessible.cpp +++ b/accessible/generic/DocAccessible.cpp @@ -721,7 +721,7 @@ DocAccessible::AttributeWillChange(dom::Element* aElement, // Update dependent IDs cache. Take care of elements that are accessible // because dependent IDs cache doesn't contain IDs from non accessible // elements. - if (aModType != dom::MutationEventBinding::ADDITION) + if (aModType != dom::MutationEvent_Binding::ADDITION) RemoveDependentIDsFor(accessible, aAttribute); if (aAttribute == nsGkAtoms::id) { @@ -739,7 +739,7 @@ DocAccessible::AttributeWillChange(dom::Element* aElement, // need to newly expose it as a toggle button) etc. if (aAttribute == nsGkAtoms::aria_checked || aAttribute == nsGkAtoms::aria_pressed) { - mARIAAttrOldValue = (aModType != dom::MutationEventBinding::ADDITION) ? + mARIAAttrOldValue = (aModType != dom::MutationEvent_Binding::ADDITION) ? nsAccUtils::GetARIAToken(aElement, aAttribute) : nullptr; return; } @@ -794,8 +794,8 @@ DocAccessible::AttributeChanged(dom::Element* aElement, // its accessible will be created later. It doesn't make sense to keep // dependent IDs for non accessible elements. For the second case we'll update // dependent IDs cache when its accessible is created. - if (aModType == dom::MutationEventBinding::MODIFICATION || - aModType == dom::MutationEventBinding::ADDITION) { + if (aModType == dom::MutationEvent_Binding::MODIFICATION || + aModType == dom::MutationEvent_Binding::ADDITION) { AddDependentIDsFor(accessible, aAttribute); } } diff --git a/accessible/xul/XULMenuAccessible.cpp b/accessible/xul/XULMenuAccessible.cpp index ac125541f15d..3bf6d2a3aa21 100644 --- a/accessible/xul/XULMenuAccessible.cpp +++ b/accessible/xul/XULMenuAccessible.cpp @@ -173,16 +173,16 @@ XULMenuitemAccessible::AccessKey() const } switch (gMenuAccesskeyModifier) { - case dom::KeyboardEventBinding::DOM_VK_CONTROL: + case dom::KeyboardEvent_Binding::DOM_VK_CONTROL: modifierKey = KeyBinding::kControl; break; - case dom::KeyboardEventBinding::DOM_VK_ALT: + case dom::KeyboardEvent_Binding::DOM_VK_ALT: modifierKey = KeyBinding::kAlt; break; - case dom::KeyboardEventBinding::DOM_VK_META: + case dom::KeyboardEvent_Binding::DOM_VK_META: modifierKey = KeyBinding::kMeta; break; - case dom::KeyboardEventBinding::DOM_VK_WIN: + case dom::KeyboardEvent_Binding::DOM_VK_WIN: modifierKey = KeyBinding::kOS; break; } diff --git a/accessible/xul/XULTreeGridAccessible.cpp b/accessible/xul/XULTreeGridAccessible.cpp index bdf570c9cb0d..a14dfde67029 100644 --- a/accessible/xul/XULTreeGridAccessible.cpp +++ b/accessible/xul/XULTreeGridAccessible.cpp @@ -431,7 +431,7 @@ XULTreeGridCellAccessible:: NS_ASSERTION(mTreeView, "mTreeView is null"); - if (mColumn->Type() == dom::TreeColumnBinding::TYPE_CHECKBOX) + if (mColumn->Type() == dom::TreeColumn_Binding::TYPE_CHECKBOX) mTreeView->GetCellValue(mRow, mColumn, mCachedTextEquiv); else mTreeView->GetCellText(mRow, mColumn, mCachedTextEquiv); @@ -538,7 +538,7 @@ XULTreeGridCellAccessible::ActionCount() const if (mColumn->Cycler()) return 1; - if (mColumn->Type() == dom::TreeColumnBinding::TYPE_CHECKBOX && IsEditable()) + if (mColumn->Type() == dom::TreeColumn_Binding::TYPE_CHECKBOX && IsEditable()) return 1; return 0; @@ -557,7 +557,7 @@ XULTreeGridCellAccessible::ActionNameAt(uint8_t aIndex, nsAString& aName) return; } - if (mColumn->Type() == dom::TreeColumnBinding::TYPE_CHECKBOX && + if (mColumn->Type() == dom::TreeColumn_Binding::TYPE_CHECKBOX && IsEditable()) { nsAutoString value; mTreeView->GetCellValue(mRow, mColumn, value); @@ -579,7 +579,7 @@ XULTreeGridCellAccessible::DoAction(uint8_t aIndex) const return true; } - if (mColumn->Type() == dom::TreeColumnBinding::TYPE_CHECKBOX && + if (mColumn->Type() == dom::TreeColumn_Binding::TYPE_CHECKBOX && IsEditable()) { DoCommand(); return true; @@ -691,7 +691,7 @@ XULTreeGridCellAccessible::NativeState() const } // checked state - if (mColumn->Type() == dom::TreeColumnBinding::TYPE_CHECKBOX) { + if (mColumn->Type() == dom::TreeColumn_Binding::TYPE_CHECKBOX) { states |= states::CHECKABLE; nsAutoString checked; mTreeView->GetCellValue(mRow, mColumn, checked); @@ -729,7 +729,7 @@ XULTreeGridCellAccessible::CellInvalidated() nsAutoString textEquiv; - if (mColumn->Type() == dom::TreeColumnBinding::TYPE_CHECKBOX) { + if (mColumn->Type() == dom::TreeColumn_Binding::TYPE_CHECKBOX) { mTreeView->GetCellValue(mRow, mColumn, textEquiv); if (mCachedTextEquiv != textEquiv) { bool isEnabled = textEquiv.EqualsLiteral("true"); diff --git a/devtools/shared/heapsnapshot/DominatorTree.cpp b/devtools/shared/heapsnapshot/DominatorTree.cpp index e53c196cf3e1..e709f1fd7308 100644 --- a/devtools/shared/heapsnapshot/DominatorTree.cpp +++ b/devtools/shared/heapsnapshot/DominatorTree.cpp @@ -133,7 +133,7 @@ NS_INTERFACE_MAP_END /* virtual */ JSObject* DominatorTree::WrapObject(JSContext* aCx, JS::HandleObject aGivenProto) { - return dom::DominatorTreeBinding::Wrap(aCx, this, aGivenProto); + return dom::DominatorTree_Binding::Wrap(aCx, this, aGivenProto); } } // namespace devtools diff --git a/devtools/shared/heapsnapshot/HeapSnapshot.cpp b/devtools/shared/heapsnapshot/HeapSnapshot.cpp index 0ff618dd8f27..6301da1fde31 100644 --- a/devtools/shared/heapsnapshot/HeapSnapshot.cpp +++ b/devtools/shared/heapsnapshot/HeapSnapshot.cpp @@ -86,7 +86,7 @@ NS_INTERFACE_MAP_END /* virtual */ JSObject* HeapSnapshot::WrapObject(JSContext* aCx, HandleObject aGivenProto) { - return HeapSnapshotBinding::Wrap(aCx, this, aGivenProto); + return HeapSnapshot_Binding::Wrap(aCx, this, aGivenProto); } /*** Reading Heap Snapshots ***********************************************************************/ diff --git a/docshell/shistory/ChildSHistory.cpp b/docshell/shistory/ChildSHistory.cpp index 5a136f7edde8..588bd2b12c54 100644 --- a/docshell/shistory/ChildSHistory.cpp +++ b/docshell/shistory/ChildSHistory.cpp @@ -124,7 +124,7 @@ NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(ChildSHistory, JSObject* ChildSHistory::WrapObject(JSContext* cx, JS::Handle aGivenProto) { - return ChildSHistoryBinding::Wrap(cx, this, aGivenProto); + return ChildSHistory_Binding::Wrap(cx, this, aGivenProto); } nsISupports* diff --git a/docshell/shistory/ParentSHistory.cpp b/docshell/shistory/ParentSHistory.cpp index 55c36f02cb70..912efd49d156 100644 --- a/docshell/shistory/ParentSHistory.cpp +++ b/docshell/shistory/ParentSHistory.cpp @@ -60,7 +60,7 @@ NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(ParentSHistory, JSObject* ParentSHistory::WrapObject(JSContext* cx, JS::Handle aGivenProto) { - return ParentSHistoryBinding::Wrap(cx, this, aGivenProto); + return ParentSHistory_Binding::Wrap(cx, this, aGivenProto); } nsISupports* diff --git a/dom/abort/AbortController.cpp b/dom/abort/AbortController.cpp index bb5ce1241d62..bfe1d70d93df 100644 --- a/dom/abort/AbortController.cpp +++ b/dom/abort/AbortController.cpp @@ -43,7 +43,7 @@ AbortController::AbortController(nsIGlobalObject* aGlobal) JSObject* AbortController::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return AbortControllerBinding::Wrap(aCx, this, aGivenProto); + return AbortController_Binding::Wrap(aCx, this, aGivenProto); } nsIGlobalObject* diff --git a/dom/abort/AbortSignal.cpp b/dom/abort/AbortSignal.cpp index 047a44718a83..4baa8ee46b7d 100644 --- a/dom/abort/AbortSignal.cpp +++ b/dom/abort/AbortSignal.cpp @@ -45,7 +45,7 @@ AbortSignal::AbortSignal(bool aAborted) JSObject* AbortSignal::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return AbortSignalBinding::Wrap(aCx, this, aGivenProto); + return AbortSignal_Binding::Wrap(aCx, this, aGivenProto); } bool diff --git a/dom/animation/Animation.cpp b/dom/animation/Animation.cpp index 99773bee3bd1..e1bbec15a781 100644 --- a/dom/animation/Animation.cpp +++ b/dom/animation/Animation.cpp @@ -43,7 +43,7 @@ NS_INTERFACE_MAP_END_INHERITING(DOMEventTargetHelper) JSObject* Animation::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return dom::AnimationBinding::Wrap(aCx, this, aGivenProto); + return dom::Animation_Binding::Wrap(aCx, this, aGivenProto); } // --------------------------------------------------------------------------- diff --git a/dom/animation/CSSPseudoElement.cpp b/dom/animation/CSSPseudoElement.cpp index 6d53ac70be81..9d3f00a8806e 100644 --- a/dom/animation/CSSPseudoElement.cpp +++ b/dom/animation/CSSPseudoElement.cpp @@ -47,7 +47,7 @@ CSSPseudoElement::GetParentObject() const JSObject* CSSPseudoElement::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return CSSPseudoElementBinding::Wrap(aCx, this, aGivenProto); + return CSSPseudoElement_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/animation/DocumentTimeline.cpp b/dom/animation/DocumentTimeline.cpp index 42d0a603d1bd..c3f9557d7d60 100644 --- a/dom/animation/DocumentTimeline.cpp +++ b/dom/animation/DocumentTimeline.cpp @@ -45,7 +45,7 @@ NS_IMPL_RELEASE_INHERITED(DocumentTimeline, AnimationTimeline) JSObject* DocumentTimeline::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return DocumentTimelineBinding::Wrap(aCx, this, aGivenProto); + return DocumentTimeline_Binding::Wrap(aCx, this, aGivenProto); } /* static */ already_AddRefed diff --git a/dom/animation/KeyframeEffect.cpp b/dom/animation/KeyframeEffect.cpp index 302d9948a687..484db30b42ea 100644 --- a/dom/animation/KeyframeEffect.cpp +++ b/dom/animation/KeyframeEffect.cpp @@ -85,7 +85,7 @@ JSObject* KeyframeEffect::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return KeyframeEffectBinding::Wrap(aCx, this, aGivenProto); + return KeyframeEffect_Binding::Wrap(aCx, this, aGivenProto); } IterationCompositeOperation KeyframeEffect::IterationComposite( diff --git a/dom/base/AnonymousContent.cpp b/dom/base/AnonymousContent.cpp index 449ca68f1bfe..ddd9064293df 100644 --- a/dom/base/AnonymousContent.cpp +++ b/dom/base/AnonymousContent.cpp @@ -206,7 +206,7 @@ AnonymousContent::WrapObject(JSContext* aCx, JS::Handle aGivenProto, JS::MutableHandle aReflector) { - return AnonymousContentBinding::Wrap(aCx, this, aGivenProto, aReflector); + return AnonymousContent_Binding::Wrap(aCx, this, aGivenProto, aReflector); } void diff --git a/dom/base/Attr.cpp b/dom/base/Attr.cpp index aa262c45d0fe..31e4db93e6ea 100644 --- a/dom/base/Attr.cpp +++ b/dom/base/Attr.cpp @@ -315,7 +315,7 @@ Attr::Shutdown() JSObject* Attr::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return AttrBinding::Wrap(aCx, this, aGivenProto); + return Attr_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/base/BarProps.cpp b/dom/base/BarProps.cpp index 7f6a448f2c60..ba855a933bfc 100644 --- a/dom/base/BarProps.cpp +++ b/dom/base/BarProps.cpp @@ -36,7 +36,7 @@ BarProp::GetParentObject() const JSObject* BarProp::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return BarPropBinding::Wrap(aCx, this, aGivenProto); + return BarProp_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(BarProp, mDOMWindow) diff --git a/dom/base/ChildProcessMessageManager.h b/dom/base/ChildProcessMessageManager.h index a280f95aed3d..0c21dad24ec2 100644 --- a/dom/base/ChildProcessMessageManager.h +++ b/dom/base/ChildProcessMessageManager.h @@ -26,7 +26,7 @@ public: virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override { - return ChildProcessMessageManagerBinding::Wrap(aCx, this, aGivenProto); + return ChildProcessMessageManager_Binding::Wrap(aCx, this, aGivenProto); } protected: diff --git a/dom/base/ChromeMessageBroadcaster.cpp b/dom/base/ChromeMessageBroadcaster.cpp index c37ccbe87976..f44e34db5526 100644 --- a/dom/base/ChromeMessageBroadcaster.cpp +++ b/dom/base/ChromeMessageBroadcaster.cpp @@ -18,7 +18,7 @@ ChromeMessageBroadcaster::WrapObject(JSContext* aCx, { MOZ_ASSERT(nsContentUtils::IsSystemCaller(aCx)); - return ChromeMessageBroadcasterBinding::Wrap(aCx, this, aGivenProto); + return ChromeMessageBroadcaster_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/base/ChromeMessageSender.cpp b/dom/base/ChromeMessageSender.cpp index be17fb437ba4..2c5b61bc25ac 100644 --- a/dom/base/ChromeMessageSender.cpp +++ b/dom/base/ChromeMessageSender.cpp @@ -16,7 +16,7 @@ ChromeMessageSender::WrapObject(JSContext* aCx, { MOZ_ASSERT(nsContentUtils::IsSystemCaller(aCx)); - return ChromeMessageSenderBinding::Wrap(aCx, this, aGivenProto); + return ChromeMessageSender_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/base/ChromeNodeList.cpp b/dom/base/ChromeNodeList.cpp index ffa10197188f..c085725429df 100644 --- a/dom/base/ChromeNodeList.cpp +++ b/dom/base/ChromeNodeList.cpp @@ -22,7 +22,7 @@ ChromeNodeList::Constructor(const GlobalObject& aGlobal, ErrorResult& aRv) JSObject* ChromeNodeList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return ChromeNodeListBinding::Wrap(aCx, this, aGivenProto); + return ChromeNodeList_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/base/Comment.cpp b/dom/base/Comment.cpp index 6ef2b870671c..b5f544111e26 100644 --- a/dom/base/Comment.cpp +++ b/dom/base/Comment.cpp @@ -68,7 +68,7 @@ Comment::Constructor(const GlobalObject& aGlobal, JSObject* Comment::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return CommentBinding::Wrap(aCx, this, aGivenProto); + return Comment_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/base/Crypto.cpp b/dom/base/Crypto.cpp index 681833a3506d..d654112387bb 100644 --- a/dom/base/Crypto.cpp +++ b/dom/base/Crypto.cpp @@ -41,7 +41,7 @@ Crypto::~Crypto() /* virtual */ JSObject* Crypto::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return CryptoBinding::Wrap(aCx, this, aGivenProto); + return Crypto_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/base/CustomElementRegistry.cpp b/dom/base/CustomElementRegistry.cpp index 7b347a1fe644..a57ec5af0c75 100644 --- a/dom/base/CustomElementRegistry.cpp +++ b/dom/base/CustomElementRegistry.cpp @@ -658,7 +658,7 @@ CustomElementRegistry::UpgradeCandidates(nsAtom* aKey, JSObject* CustomElementRegistry::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return CustomElementRegistryBinding::Wrap(aCx, this, aGivenProto); + return CustomElementRegistry_Binding::Wrap(aCx, this, aGivenProto); } nsISupports* CustomElementRegistry::GetParentObject() const diff --git a/dom/base/DOMError.cpp b/dom/base/DOMError.cpp index 6967c586f75f..fcb88cb2bfcf 100644 --- a/dom/base/DOMError.cpp +++ b/dom/base/DOMError.cpp @@ -59,7 +59,7 @@ DOMError::~DOMError() JSObject* DOMError::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return DOMErrorBinding::Wrap(aCx, this, aGivenProto); + return DOMError_Binding::Wrap(aCx, this, aGivenProto); } /* static */ already_AddRefed diff --git a/dom/base/DOMException.cpp b/dom/base/DOMException.cpp index 7dcd13709ff9..2919c25bfb5e 100644 --- a/dom/base/DOMException.cpp +++ b/dom/base/DOMException.cpp @@ -24,29 +24,29 @@ using namespace mozilla::dom; enum DOM4ErrorTypeCodeMap { /* DOM4 errors from http://dvcs.w3.org/hg/domcore/raw-file/tip/Overview.html#domexception */ - IndexSizeError = DOMExceptionBinding::INDEX_SIZE_ERR, - HierarchyRequestError = DOMExceptionBinding::HIERARCHY_REQUEST_ERR, - WrongDocumentError = DOMExceptionBinding::WRONG_DOCUMENT_ERR, - InvalidCharacterError = DOMExceptionBinding::INVALID_CHARACTER_ERR, - NoModificationAllowedError = DOMExceptionBinding::NO_MODIFICATION_ALLOWED_ERR, - NotFoundError = DOMExceptionBinding::NOT_FOUND_ERR, - NotSupportedError = DOMExceptionBinding::NOT_SUPPORTED_ERR, + IndexSizeError = DOMException_Binding::INDEX_SIZE_ERR, + HierarchyRequestError = DOMException_Binding::HIERARCHY_REQUEST_ERR, + WrongDocumentError = DOMException_Binding::WRONG_DOCUMENT_ERR, + InvalidCharacterError = DOMException_Binding::INVALID_CHARACTER_ERR, + NoModificationAllowedError = DOMException_Binding::NO_MODIFICATION_ALLOWED_ERR, + NotFoundError = DOMException_Binding::NOT_FOUND_ERR, + NotSupportedError = DOMException_Binding::NOT_SUPPORTED_ERR, // Can't remove until setNamedItem is removed - InUseAttributeError = DOMExceptionBinding::INUSE_ATTRIBUTE_ERR, - InvalidStateError = DOMExceptionBinding::INVALID_STATE_ERR, - SyntaxError = DOMExceptionBinding::SYNTAX_ERR, - InvalidModificationError = DOMExceptionBinding::INVALID_MODIFICATION_ERR, - NamespaceError = DOMExceptionBinding::NAMESPACE_ERR, - InvalidAccessError = DOMExceptionBinding::INVALID_ACCESS_ERR, - TypeMismatchError = DOMExceptionBinding::TYPE_MISMATCH_ERR, - SecurityError = DOMExceptionBinding::SECURITY_ERR, - NetworkError = DOMExceptionBinding::NETWORK_ERR, - AbortError = DOMExceptionBinding::ABORT_ERR, - URLMismatchError = DOMExceptionBinding::URL_MISMATCH_ERR, - QuotaExceededError = DOMExceptionBinding::QUOTA_EXCEEDED_ERR, - TimeoutError = DOMExceptionBinding::TIMEOUT_ERR, - InvalidNodeTypeError = DOMExceptionBinding::INVALID_NODE_TYPE_ERR, - DataCloneError = DOMExceptionBinding::DATA_CLONE_ERR, + InUseAttributeError = DOMException_Binding::INUSE_ATTRIBUTE_ERR, + InvalidStateError = DOMException_Binding::INVALID_STATE_ERR, + SyntaxError = DOMException_Binding::SYNTAX_ERR, + InvalidModificationError = DOMException_Binding::INVALID_MODIFICATION_ERR, + NamespaceError = DOMException_Binding::NAMESPACE_ERR, + InvalidAccessError = DOMException_Binding::INVALID_ACCESS_ERR, + TypeMismatchError = DOMException_Binding::TYPE_MISMATCH_ERR, + SecurityError = DOMException_Binding::SECURITY_ERR, + NetworkError = DOMException_Binding::NETWORK_ERR, + AbortError = DOMException_Binding::ABORT_ERR, + URLMismatchError = DOMException_Binding::URL_MISMATCH_ERR, + QuotaExceededError = DOMException_Binding::QUOTA_EXCEEDED_ERR, + TimeoutError = DOMException_Binding::TIMEOUT_ERR, + InvalidNodeTypeError = DOMException_Binding::INVALID_NODE_TYPE_ERR, + DataCloneError = DOMException_Binding::DATA_CLONE_ERR, InvalidPointerId = 0, EncodingError = 0, @@ -295,7 +295,7 @@ Exception::ToString(JSContext* aCx, nsACString& _retval) JSObject* Exception::WrapObject(JSContext* cx, JS::Handle aGivenProto) { - return ExceptionBinding::Wrap(cx, this, aGivenProto); + return Exception_Binding::Wrap(cx, this, aGivenProto); } void @@ -424,7 +424,7 @@ DOMException::Constructor(GlobalObject& /* unused */, JSObject* DOMException::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return DOMExceptionBinding::Wrap(aCx, this, aGivenProto); + return DOMException_Binding::Wrap(aCx, this, aGivenProto); } /* static */already_AddRefed diff --git a/dom/base/DOMImplementation.cpp b/dom/base/DOMImplementation.cpp index fb5f8bd4f2ed..96e5c54fa4b9 100644 --- a/dom/base/DOMImplementation.cpp +++ b/dom/base/DOMImplementation.cpp @@ -30,7 +30,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMImplementation) JSObject* DOMImplementation::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return DOMImplementationBinding::Wrap(aCx, this, aGivenProto); + return DOMImplementation_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/base/DOMIntersectionObserver.h b/dom/base/DOMIntersectionObserver.h index 1d0cc5497581..26edad9084c9 100644 --- a/dom/base/DOMIntersectionObserver.h +++ b/dom/base/DOMIntersectionObserver.h @@ -53,7 +53,7 @@ public: virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override { - return mozilla::dom::IntersectionObserverEntryBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::IntersectionObserverEntry_Binding::Wrap(aCx, this, aGivenProto); } DOMHighResTimeStamp Time() @@ -135,7 +135,7 @@ public: virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override { - return mozilla::dom::IntersectionObserverBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::IntersectionObserver_Binding::Wrap(aCx, this, aGivenProto); } nsISupports* GetParentObject() const diff --git a/dom/base/DOMMatrix.cpp b/dom/base/DOMMatrix.cpp index 2c0e729c2ae5..6057c9bb06f6 100644 --- a/dom/base/DOMMatrix.cpp +++ b/dom/base/DOMMatrix.cpp @@ -36,7 +36,7 @@ NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(DOMMatrixReadOnly, Release) JSObject* DOMMatrixReadOnly::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return DOMMatrixReadOnlyBinding::Wrap(aCx, this, aGivenProto); + return DOMMatrixReadOnly_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed @@ -739,7 +739,7 @@ DOMMatrix::SetMatrixValue(const nsAString& aTransformList, ErrorResult& aRv) JSObject* DOMMatrix::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return DOMMatrixBinding::Wrap(aCx, this, aGivenProto); + return DOMMatrix_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/base/DOMParser.h b/dom/base/DOMParser.h index b7057a1bd102..3ac10fd5e4ea 100644 --- a/dom/base/DOMParser.h +++ b/dom/base/DOMParser.h @@ -68,7 +68,7 @@ public: virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override { - return mozilla::dom::DOMParserBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::DOMParser_Binding::Wrap(aCx, this, aGivenProto); } // A way to create a non-global-associated DOMParser from C++. diff --git a/dom/base/DOMPoint.cpp b/dom/base/DOMPoint.cpp index 5b78c81dce73..a3cfd9ebbb56 100644 --- a/dom/base/DOMPoint.cpp +++ b/dom/base/DOMPoint.cpp @@ -38,7 +38,7 @@ DOMPointReadOnly::Constructor(const GlobalObject& aGlobal, double aX, double aY, JSObject* DOMPointReadOnly::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return DOMPointReadOnlyBinding::Wrap(aCx, this, aGivenProto); + return DOMPointReadOnly_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed @@ -62,5 +62,5 @@ DOMPoint::Constructor(const GlobalObject& aGlobal, double aX, double aY, JSObject* DOMPoint::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return DOMPointBinding::Wrap(aCx, this, aGivenProto); + return DOMPoint_Binding::Wrap(aCx, this, aGivenProto); } diff --git a/dom/base/DOMQuad.cpp b/dom/base/DOMQuad.cpp index 9ffb4821b504..db3d5de824db 100644 --- a/dom/base/DOMQuad.cpp +++ b/dom/base/DOMQuad.cpp @@ -41,7 +41,7 @@ DOMQuad::~DOMQuad() JSObject* DOMQuad::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return DOMQuadBinding::Wrap(aCx, this, aGivenProto); + return DOMQuad_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/base/DOMRect.cpp b/dom/base/DOMRect.cpp index c74f13980052..7c0656f9b21c 100644 --- a/dom/base/DOMRect.cpp +++ b/dom/base/DOMRect.cpp @@ -25,7 +25,7 @@ JSObject* DOMRectReadOnly::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { MOZ_ASSERT(mParent); - return DOMRectReadOnlyBinding::Wrap(aCx, this, aGivenProto); + return DOMRectReadOnly_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed @@ -43,7 +43,7 @@ JSObject* DOMRect::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { MOZ_ASSERT(mParent); - return DOMRectBinding::Wrap(aCx, this, aGivenProto); + return DOMRect_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed @@ -71,7 +71,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(DOMRectList) JSObject* DOMRectList::WrapObject(JSContext *cx, JS::Handle aGivenProto) { - return mozilla::dom::DOMRectListBinding::Wrap(cx, this, aGivenProto); + return mozilla::dom::DOMRectList_Binding::Wrap(cx, this, aGivenProto); } static double diff --git a/dom/base/DOMRequest.cpp b/dom/base/DOMRequest.cpp index d1a1c5fe5f3f..ee903dfa9ac1 100644 --- a/dom/base/DOMRequest.cpp +++ b/dom/base/DOMRequest.cpp @@ -74,7 +74,7 @@ NS_IMPL_RELEASE_INHERITED(DOMRequest, DOMEventTargetHelper) /* virtual */ JSObject* DOMRequest::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return DOMRequestBinding::Wrap(aCx, this, aGivenProto); + return DOMRequest_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/base/DOMStringList.cpp b/dom/base/DOMStringList.cpp index cae00338ebad..0c39d48bcd16 100644 --- a/dom/base/DOMStringList.cpp +++ b/dom/base/DOMStringList.cpp @@ -27,7 +27,7 @@ DOMStringList::~DOMStringList() JSObject* DOMStringList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return DOMStringListBinding::Wrap(aCx, this, aGivenProto); + return DOMStringList_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/base/DocumentFragment.cpp b/dom/base/DocumentFragment.cpp index 26cc723b5d9e..5587e421e707 100644 --- a/dom/base/DocumentFragment.cpp +++ b/dom/base/DocumentFragment.cpp @@ -27,7 +27,7 @@ namespace dom { JSObject* DocumentFragment::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return DocumentFragmentBinding::Wrap(aCx, this, aGivenProto); + return DocumentFragment_Binding::Wrap(aCx, this, aGivenProto); } bool diff --git a/dom/base/DocumentType.cpp b/dom/base/DocumentType.cpp index 40ba323bc7de..dd7f5fc47f6b 100644 --- a/dom/base/DocumentType.cpp +++ b/dom/base/DocumentType.cpp @@ -43,7 +43,7 @@ namespace dom { JSObject* DocumentType::WrapNode(JSContext *cx, JS::Handle aGivenProto) { - return DocumentTypeBinding::Wrap(cx, this, aGivenProto); + return DocumentType_Binding::Wrap(cx, this, aGivenProto); } DocumentType::DocumentType(already_AddRefed& aNodeInfo, diff --git a/dom/base/Element.cpp b/dom/base/Element.cpp index 28b113bcef19..249ad7b3d621 100644 --- a/dom/base/Element.cpp +++ b/dom/base/Element.cpp @@ -2275,7 +2275,7 @@ Element::DispatchClickEvent(nsPresContext* aPresContext, inputSource = sourceMouseEvent->inputSource; } else if (aSourceEvent->mClass == eKeyboardEventClass) { event.mFlags.mIsPositionless = true; - inputSource = MouseEventBinding::MOZ_SOURCE_KEYBOARD; + inputSource = MouseEvent_Binding::MOZ_SOURCE_KEYBOARD; } event.pressure = pressure; event.mClickCount = clickCount; @@ -2424,8 +2424,8 @@ Element::MaybeCheckSameAttrVal(int32_t aNamespaceID, } } *aModType = modification ? - static_cast(MutationEventBinding::MODIFICATION) : - static_cast(MutationEventBinding::ADDITION); + static_cast(MutationEvent_Binding::MODIFICATION) : + static_cast(MutationEvent_Binding::ADDITION); return false; } @@ -2473,7 +2473,7 @@ Element::SetSingleClassFromParser(nsAtom* aSingleClassName) nullptr, // old value value, nullptr, - static_cast(MutationEventBinding::ADDITION), + static_cast(MutationEvent_Binding::ADDITION), false, // hasListeners false, // notify kCallAfterSetAttr, @@ -2689,7 +2689,7 @@ Element::SetAttrAndNotify(int32_t aNamespaceID, LifecycleCallbackArgs args = { nsDependentAtomString(aName), - aModType == MutationEventBinding::ADDITION ? + aModType == MutationEvent_Binding::ADDITION ? VoidString() : nsDependentAtomString(oldValueAtom), nsDependentAtomString(newValueAtom), (ns.IsEmpty() ? VoidString() : ns) @@ -2924,7 +2924,7 @@ Element::UnsetAttr(int32_t aNameSpaceID, nsAtom* aName, if (aNotify) { nsNodeUtils::AttributeWillChange(this, aNameSpaceID, aName, - MutationEventBinding::REMOVAL, + MutationEvent_Binding::REMOVAL, nullptr); } @@ -3007,7 +3007,7 @@ Element::UnsetAttr(int32_t aNameSpaceID, nsAtom* aName, // We can always pass oldValue here since there is no new value which could // have corrupted it. nsNodeUtils::AttributeChanged(this, aNameSpaceID, aName, - MutationEventBinding::REMOVAL, &oldValue); + MutationEvent_Binding::REMOVAL, &oldValue); } if (aNameSpaceID == kNameSpaceID_None && aName == nsGkAtoms::dir) { @@ -3024,7 +3024,7 @@ Element::UnsetAttr(int32_t aNameSpaceID, nsAtom* aName, oldValue.ToString(value); if (!value.IsEmpty()) mutation.mPrevAttrValue = NS_Atomize(value); - mutation.mAttrChange = MutationEventBinding::REMOVAL; + mutation.mAttrChange = MutationEvent_Binding::REMOVAL; mozAutoSubtreeModified subtree(OwnerDoc(), this); (new AsyncEventDispatcher(this, mutation))->RunDOMEventWhenSafe(); diff --git a/dom/base/Element.h b/dom/base/Element.h index e3cefab35104..d6ca27a5b0cd 100644 --- a/dom/base/Element.h +++ b/dom/base/Element.h @@ -680,8 +680,8 @@ public: * @param aOldValue [out] Set to the old value of the attribute, but only if * there are event listeners. If set, the type of aOldValue will be either * nsAttrValue::eString or nsAttrValue::eAtom. - * @param aModType [out] Set to MutationEventBinding::MODIFICATION or to - * MutationEventBinding::ADDITION, but only if this helper returns true + * @param aModType [out] Set to MutationEvent_Binding::MODIFICATION or to + * MutationEvent_Binding::ADDITION, but only if this helper returns true * @param aHasListeners [out] Set to true if there are mutation event * listeners listening for NS_EVENT_BITS_MUTATION_ATTRMODIFIED * @param aOldValueSet [out] Indicates whether an old attribute value has been @@ -707,8 +707,8 @@ public: * @param aOldValue [out] Set to the old value of the attribute, but only if * there are event listeners. If set, the type of aOldValue will be either * nsAttrValue::eString or nsAttrValue::eAtom. - * @param aModType [out] Set to MutationEventBinding::MODIFICATION or to - * MutationEventBinding::ADDITION, but only if this helper returns true + * @param aModType [out] Set to MutationEvent_Binding::MODIFICATION or to + * MutationEvent_Binding::ADDITION, but only if this helper returns true * @param aHasListeners [out] Set to true if there are mutation event * listeners listening for NS_EVENT_BITS_MUTATION_ATTRMODIFIED * @param aOldValueSet [out] Indicates whether an old attribute value has been @@ -1700,7 +1700,7 @@ protected: * non-null value does guarantee that a scripted caller * with the given principal is directly responsible for * the attribute change. - * @param aModType MutationEventBinding::MODIFICATION or ADDITION. Only + * @param aModType MutationEvent_Binding::MODIFICATION or ADDITION. Only * needed if aFireMutation or aNotify is true. * @param aFireMutation should mutation-events be fired? * @param aNotify should we notify document-observers? diff --git a/dom/base/EventSource.cpp b/dom/base/EventSource.cpp index eb69238b9cce..99ef1e5b60d9 100644 --- a/dom/base/EventSource.cpp +++ b/dom/base/EventSource.cpp @@ -2034,7 +2034,7 @@ JSObject* EventSource::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return EventSourceBinding::Wrap(aCx, this, aGivenProto); + return EventSource_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/base/FormData.cpp b/dom/base/FormData.cpp index c88937d12e3f..9064b52b832f 100644 --- a/dom/base/FormData.cpp +++ b/dom/base/FormData.cpp @@ -328,7 +328,7 @@ FormData::SetNameDirectoryPair(FormDataTuple* aData, /* virtual */ JSObject* FormData::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return FormDataBinding::Wrap(aCx, this, aGivenProto); + return FormData_Binding::Wrap(aCx, this, aGivenProto); } /* static */ already_AddRefed diff --git a/dom/base/FragmentOrElement.cpp b/dom/base/FragmentOrElement.cpp index 95d980e7c4e6..05ebbea420df 100644 --- a/dom/base/FragmentOrElement.cpp +++ b/dom/base/FragmentOrElement.cpp @@ -503,7 +503,7 @@ JSObject* nsAttrChildContentList::WrapObject(JSContext *cx, JS::Handle aGivenProto) { - return NodeListBinding::Wrap(cx, this, aGivenProto); + return NodeList_Binding::Wrap(cx, this, aGivenProto); } uint32_t diff --git a/dom/base/IdleDeadline.cpp b/dom/base/IdleDeadline.cpp index c589fa865fae..db2a847ae723 100644 --- a/dom/base/IdleDeadline.cpp +++ b/dom/base/IdleDeadline.cpp @@ -51,7 +51,7 @@ IdleDeadline::~IdleDeadline() JSObject* IdleDeadline::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return IdleDeadlineBinding::Wrap(aCx, this, aGivenProto); + return IdleDeadline_Binding::Wrap(aCx, this, aGivenProto); } DOMHighResTimeStamp diff --git a/dom/base/IntlUtils.cpp b/dom/base/IntlUtils.cpp index e6a0093bc97b..b0c5647401a7 100644 --- a/dom/base/IntlUtils.cpp +++ b/dom/base/IntlUtils.cpp @@ -33,7 +33,7 @@ IntlUtils::~IntlUtils() JSObject* IntlUtils::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return IntlUtilsBinding::Wrap(aCx, this, aGivenProto); + return IntlUtils_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/base/Location.cpp b/dom/base/Location.cpp index 1d46a0af032f..bd01cf47b3b5 100644 --- a/dom/base/Location.cpp +++ b/dom/base/Location.cpp @@ -1003,7 +1003,7 @@ Location::CallerSubsumes(nsIPrincipal* aSubjectPrincipal) JSObject* Location::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return LocationBinding::Wrap(aCx, this, aGivenProto); + return Location_Binding::Wrap(aCx, this, aGivenProto); } } // dom namespace diff --git a/dom/base/MozQueryInterface.cpp b/dom/base/MozQueryInterface.cpp index 5a5369e815cd..cd2836ec3b58 100644 --- a/dom/base/MozQueryInterface.cpp +++ b/dom/base/MozQueryInterface.cpp @@ -133,7 +133,7 @@ MozQueryInterface::LegacyCall(JSContext* cx, JS::Handle thisv, bool MozQueryInterface::WrapObject(JSContext* aCx, JS::Handle aGivenProto, JS::MutableHandle aReflector) { - return MozQueryInterfaceBinding::Wrap(aCx, this, aGivenProto, aReflector); + return MozQueryInterface_Binding::Wrap(aCx, this, aGivenProto, aReflector); } } // namespace dom diff --git a/dom/base/Navigator.cpp b/dom/base/Navigator.cpp index 5e87ff9d5aec..39e8215a136f 100644 --- a/dom/base/Navigator.cpp +++ b/dom/base/Navigator.cpp @@ -1379,7 +1379,7 @@ Navigator::NotifyVRDisplaysUpdated() void Navigator::NotifyActiveVRDisplaysChanged() { - NavigatorBinding::ClearCachedActiveVRDisplaysValue(this); + Navigator_Binding::ClearCachedActiveVRDisplaysValue(this); } VRServiceTest* @@ -1497,7 +1497,7 @@ Navigator::OnNavigation() JSObject* Navigator::WrapObject(JSContext* cx, JS::Handle aGivenProto) { - return NavigatorBinding::Wrap(cx, this, aGivenProto); + return Navigator_Binding::Wrap(cx, this, aGivenProto); } /* static */ @@ -1644,7 +1644,7 @@ Navigator::AppName(nsAString& aAppName, bool aUsePrefOverriddenValue) void Navigator::ClearUserAgentCache() { - NavigatorBinding::ClearCachedUserAgentValue(this); + Navigator_Binding::ClearCachedUserAgentValue(this); } nsresult diff --git a/dom/base/Navigator.h b/dom/base/Navigator.h index 8846663a39a9..334003d3d8b9 100644 --- a/dom/base/Navigator.h +++ b/dom/base/Navigator.h @@ -142,7 +142,7 @@ public: nsAString& aUserAgent); // Clears the user agent cache by calling: - // NavigatorBinding::ClearCachedUserAgentValue(this); + // Navigator_Binding::ClearCachedUserAgentValue(this); void ClearUserAgentCache(); bool Vibrate(uint32_t aDuration); diff --git a/dom/base/NodeIterator.cpp b/dom/base/NodeIterator.cpp index a2ab61dc49ec..28a69ff01a57 100644 --- a/dom/base/NodeIterator.cpp +++ b/dom/base/NodeIterator.cpp @@ -202,7 +202,7 @@ NodeIterator::NextOrPrevNode(NodePointer::MoveToMethodType aMove, return nullptr; } - if (filtered == NodeFilterBinding::FILTER_ACCEPT) { + if (filtered == NodeFilter_Binding::FILTER_ACCEPT) { mPointer = mWorkingPointer; return testNode.forget(); } @@ -235,7 +235,7 @@ void NodeIterator::ContentRemoved(nsIContent* aChild, bool NodeIterator::WrapObject(JSContext *cx, JS::Handle aGivenProto, JS::MutableHandle aReflector) { - return NodeIteratorBinding::Wrap(cx, this, aGivenProto, aReflector); + return NodeIterator_Binding::Wrap(cx, this, aGivenProto, aReflector); } } // namespace dom diff --git a/dom/base/ParentProcessMessageManager.cpp b/dom/base/ParentProcessMessageManager.cpp index 5dc7e565016a..282e00902a20 100644 --- a/dom/base/ParentProcessMessageManager.cpp +++ b/dom/base/ParentProcessMessageManager.cpp @@ -31,7 +31,7 @@ ParentProcessMessageManager::WrapObject(JSContext* aCx, { MOZ_ASSERT(nsContentUtils::IsSystemCaller(aCx)); - return ParentProcessMessageManagerBinding::Wrap(aCx, this, aGivenProto); + return ParentProcessMessageManager_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/base/ProcessGlobal.cpp b/dom/base/ProcessGlobal.cpp index 7b0c3d31c559..ae2068a3e40e 100644 --- a/dom/base/ProcessGlobal.cpp +++ b/dom/base/ProcessGlobal.cpp @@ -132,9 +132,9 @@ ProcessGlobal::WrapGlobalObject(JSContext* aCx, JS::RealmOptions& aOptions, JS::MutableHandle aReflector) { - bool ok = ContentProcessMessageManagerBinding::Wrap(aCx, this, this, aOptions, - nsJSPrincipals::get(mPrincipal), - true, aReflector); + bool ok = ContentProcessMessageManager_Binding::Wrap(aCx, this, this, aOptions, + nsJSPrincipals::get(mPrincipal), + true, aReflector); if (ok) { // Since we can't rewrap we have to preserve the global's wrapper here. PreserveWrapper(ToSupports(this)); diff --git a/dom/base/ProcessMessageManager.cpp b/dom/base/ProcessMessageManager.cpp index 7024307bb825..d99457306e6c 100644 --- a/dom/base/ProcessMessageManager.cpp +++ b/dom/base/ProcessMessageManager.cpp @@ -34,7 +34,7 @@ ProcessMessageManager::WrapObject(JSContext* aCx, { MOZ_ASSERT(nsContentUtils::IsSystemCaller(aCx)); - return ProcessMessageManagerBinding::Wrap(aCx, this, aGivenProto); + return ProcessMessageManager_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/base/ScreenOrientation.cpp b/dom/base/ScreenOrientation.cpp index 0378b6b18181..694d9cdd8d6d 100644 --- a/dom/base/ScreenOrientation.cpp +++ b/dom/base/ScreenOrientation.cpp @@ -584,7 +584,7 @@ ScreenOrientation::DispatchChangeEvent() JSObject* ScreenOrientation::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return ScreenOrientationBinding::Wrap(aCx, this, aGivenProto); + return ScreenOrientation_Binding::Wrap(aCx, this, aGivenProto); } bool diff --git a/dom/base/Selection.cpp b/dom/base/Selection.cpp index e7f7025edc48..11e0870125db 100644 --- a/dom/base/Selection.cpp +++ b/dom/base/Selection.cpp @@ -3863,7 +3863,7 @@ Selection::ResetColors(ErrorResult& aRv) JSObject* Selection::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return mozilla::dom::SelectionBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::Selection_Binding::Wrap(aCx, this, aGivenProto); } // AutoHideSelectionChanges diff --git a/dom/base/ShadowRoot.cpp b/dom/base/ShadowRoot.cpp index 7d13075d3464..350efc7b045a 100644 --- a/dom/base/ShadowRoot.cpp +++ b/dom/base/ShadowRoot.cpp @@ -122,7 +122,7 @@ ShadowRoot::SetIsComposedDocParticipant(bool aIsComposedDocParticipant) JSObject* ShadowRoot::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return mozilla::dom::ShadowRootBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::ShadowRoot_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/base/StructuredCloneBlob.cpp b/dom/base/StructuredCloneBlob.cpp index 6549a3f87bef..c1cea98a63f9 100644 --- a/dom/base/StructuredCloneBlob.cpp +++ b/dom/base/StructuredCloneBlob.cpp @@ -181,7 +181,7 @@ StructuredCloneBlob::WriteStructuredClone(JSContext* aCx, JSStructuredCloneWrite bool StructuredCloneBlob::WrapObject(JSContext* aCx, JS::HandleObject aGivenProto, JS::MutableHandleObject aResult) { - return StructuredCloneHolderBinding::Wrap(aCx, this, aGivenProto, aResult); + return StructuredCloneHolder_Binding::Wrap(aCx, this, aGivenProto, aResult); } diff --git a/dom/base/StyleSheetList.cpp b/dom/base/StyleSheetList.cpp index 7d5c28d6ac63..5e9da20506af 100644 --- a/dom/base/StyleSheetList.cpp +++ b/dom/base/StyleSheetList.cpp @@ -26,7 +26,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(StyleSheetList) /* virtual */ JSObject* StyleSheetList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return StyleSheetListBinding::Wrap(aCx, this, aGivenProto); + return StyleSheetList_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/base/SubtleCrypto.cpp b/dom/base/SubtleCrypto.cpp index c0f7e3891fb1..9140b93eae04 100644 --- a/dom/base/SubtleCrypto.cpp +++ b/dom/base/SubtleCrypto.cpp @@ -31,7 +31,7 @@ SubtleCrypto::SubtleCrypto(nsIGlobalObject* aParent) JSObject* SubtleCrypto::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SubtleCryptoBinding::Wrap(aCx, this, aGivenProto); + return SubtleCrypto_Binding::Wrap(aCx, this, aGivenProto); } #define SUBTLECRYPTO_METHOD_BODY(Operation, aRv, ...) \ diff --git a/dom/base/TreeWalker.cpp b/dom/base/TreeWalker.cpp index ab6ca901b506..fdba1fcc7c24 100644 --- a/dom/base/TreeWalker.cpp +++ b/dom/base/TreeWalker.cpp @@ -78,7 +78,7 @@ TreeWalker::ParentNode(ErrorResult& aResult) if (aResult.Failed()) { return nullptr; } - if (filtered == NodeFilterBinding::FILTER_ACCEPT) { + if (filtered == NodeFilter_Binding::FILTER_ACCEPT) { mCurrentNode = node; return node.forget(); } @@ -127,7 +127,7 @@ TreeWalker::PreviousNode(ErrorResult& aResult) } nsINode *lastChild; - while (filtered != NodeFilterBinding::FILTER_REJECT && + while (filtered != NodeFilter_Binding::FILTER_REJECT && (lastChild = node->GetLastChild())) { node = lastChild; filtered = TestNode(node, aResult); @@ -136,7 +136,7 @@ TreeWalker::PreviousNode(ErrorResult& aResult) } } - if (filtered == NodeFilterBinding::FILTER_ACCEPT) { + if (filtered == NodeFilter_Binding::FILTER_ACCEPT) { mCurrentNode = node; return node.forget(); } @@ -156,7 +156,7 @@ TreeWalker::PreviousNode(ErrorResult& aResult) return nullptr; } - if (filtered == NodeFilterBinding::FILTER_ACCEPT) { + if (filtered == NodeFilter_Binding::FILTER_ACCEPT) { mCurrentNode = node; return node.forget(); } @@ -168,14 +168,14 @@ TreeWalker::PreviousNode(ErrorResult& aResult) already_AddRefed TreeWalker::NextNode(ErrorResult& aResult) { - int16_t filtered = NodeFilterBinding::FILTER_ACCEPT; // pre-init for inner loop + int16_t filtered = NodeFilter_Binding::FILTER_ACCEPT; // pre-init for inner loop nsCOMPtr node = mCurrentNode; while (1) { nsINode *firstChild; - while (filtered != NodeFilterBinding::FILTER_REJECT && + while (filtered != NodeFilter_Binding::FILTER_REJECT && (firstChild = node->GetFirstChild())) { node = firstChild; @@ -184,7 +184,7 @@ TreeWalker::NextNode(ErrorResult& aResult) return nullptr; } - if (filtered == NodeFilterBinding::FILTER_ACCEPT) { + if (filtered == NodeFilter_Binding::FILTER_ACCEPT) { // Node found mCurrentNode = node; return node.forget(); @@ -215,7 +215,7 @@ TreeWalker::NextNode(ErrorResult& aResult) return nullptr; } - if (filtered == NodeFilterBinding::FILTER_ACCEPT) { + if (filtered == NodeFilter_Binding::FILTER_ACCEPT) { // Node found mCurrentNode = node; return node.forget(); @@ -249,11 +249,11 @@ TreeWalker::FirstChildInternal(bool aReversed, ErrorResult& aResult) } switch (filtered) { - case NodeFilterBinding::FILTER_ACCEPT: + case NodeFilter_Binding::FILTER_ACCEPT: // Node found mCurrentNode = node; return node.forget(); - case NodeFilterBinding::FILTER_SKIP: { + case NodeFilter_Binding::FILTER_SKIP: { nsINode *child = aReversed ? node->GetLastChild() : node->GetFirstChild(); if (child) { @@ -262,7 +262,7 @@ TreeWalker::FirstChildInternal(bool aReversed, ErrorResult& aResult) } break; } - case NodeFilterBinding::FILTER_REJECT: + case NodeFilter_Binding::FILTER_REJECT: // Keep searching break; } @@ -317,14 +317,14 @@ TreeWalker::NextSiblingInternal(bool aReversed, ErrorResult& aResult) return nullptr; } - if (filtered == NodeFilterBinding::FILTER_ACCEPT) { + if (filtered == NodeFilter_Binding::FILTER_ACCEPT) { // Node found mCurrentNode = node; return node.forget(); } // If rejected or no children, try a sibling - if (filtered == NodeFilterBinding::FILTER_REJECT || + if (filtered == NodeFilter_Binding::FILTER_REJECT || !(sibling = aReversed ? node->GetLastChild() : node->GetFirstChild())) { sibling = aReversed ? node->GetPreviousSibling() @@ -343,7 +343,7 @@ TreeWalker::NextSiblingInternal(bool aReversed, ErrorResult& aResult) if (aResult.Failed()) { return nullptr; } - if (filtered == NodeFilterBinding::FILTER_ACCEPT) { + if (filtered == NodeFilter_Binding::FILTER_ACCEPT) { return nullptr; } } @@ -352,7 +352,7 @@ TreeWalker::NextSiblingInternal(bool aReversed, ErrorResult& aResult) bool TreeWalker::WrapObject(JSContext *aCx, JS::Handle aGivenProto, JS::MutableHandle aReflector) { - return TreeWalkerBinding::Wrap(aCx, this, aGivenProto, aReflector); + return TreeWalker_Binding::Wrap(aCx, this, aGivenProto, aReflector); } } // namespace dom diff --git a/dom/base/WebKitCSSMatrix.cpp b/dom/base/WebKitCSSMatrix.cpp index 74b7fef57aa1..5b62560af816 100644 --- a/dom/base/WebKitCSSMatrix.cpp +++ b/dom/base/WebKitCSSMatrix.cpp @@ -52,7 +52,7 @@ WebKitCSSMatrix::Constructor(const GlobalObject& aGlobal, JSObject* WebKitCSSMatrix::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return WebKitCSSMatrixBinding::Wrap(aCx, this, aGivenProto); + return WebKitCSSMatrix_Binding::Wrap(aCx, this, aGivenProto); } WebKitCSSMatrix* diff --git a/dom/base/WindowNamedPropertiesHandler.cpp b/dom/base/WindowNamedPropertiesHandler.cpp index fbe9ff455a95..5278c528ba48 100644 --- a/dom/base/WindowNamedPropertiesHandler.cpp +++ b/dom/base/WindowNamedPropertiesHandler.cpp @@ -246,7 +246,7 @@ static const DOMIfaceAndProtoJSClass WindowNamedPropertiesClass = { 0, &sEmptyNativePropertyHooks, "[object WindowProperties]", - EventTargetBinding::GetProtoObject + EventTarget_Binding::GetProtoObject }; // static diff --git a/dom/base/nsContentList.cpp b/dom/base/nsContentList.cpp index 0b101813f893..7821edf9dc13 100644 --- a/dom/base/nsContentList.cpp +++ b/dom/base/nsContentList.cpp @@ -118,7 +118,7 @@ NS_IMPL_RELEASE_INHERITED(nsSimpleContentList, nsBaseContentList) JSObject* nsSimpleContentList::WrapObject(JSContext *cx, JS::Handle aGivenProto) { - return NodeListBinding::Wrap(cx, this, aGivenProto); + return NodeList_Binding::Wrap(cx, this, aGivenProto); } NS_IMPL_CYCLE_COLLECTION_INHERITED(nsEmptyContentList, nsBaseContentList, mRoot) @@ -134,7 +134,7 @@ NS_IMPL_RELEASE_INHERITED(nsEmptyContentList, nsBaseContentList) JSObject* nsEmptyContentList::WrapObject(JSContext *cx, JS::Handle aGivenProto) { - return HTMLCollectionBinding::Wrap(cx, this, aGivenProto); + return HTMLCollection_Binding::Wrap(cx, this, aGivenProto); } mozilla::dom::Element* @@ -461,7 +461,7 @@ nsContentList::~nsContentList() JSObject* nsContentList::WrapObject(JSContext *cx, JS::Handle aGivenProto) { - return HTMLCollectionBinding::Wrap(cx, this, aGivenProto); + return HTMLCollection_Binding::Wrap(cx, this, aGivenProto); } NS_IMPL_ISUPPORTS_INHERITED(nsContentList, nsBaseContentList, @@ -1037,7 +1037,7 @@ nsContentList::AssertInSync() JSObject* nsCachableElementsByNameNodeList::WrapObject(JSContext *cx, JS::Handle aGivenProto) { - return NodeListBinding::Wrap(cx, this, aGivenProto); + return NodeList_Binding::Wrap(cx, this, aGivenProto); } void @@ -1064,7 +1064,7 @@ nsCachableElementsByNameNodeList::AttributeChanged(Element* aElement, JSObject* nsCacheableFuncStringHTMLCollection::WrapObject(JSContext *cx, JS::Handle aGivenProto) { - return HTMLCollectionBinding::Wrap(cx, this, aGivenProto); + return HTMLCollection_Binding::Wrap(cx, this, aGivenProto); } //----------------------------------------------------- @@ -1073,7 +1073,7 @@ nsCacheableFuncStringHTMLCollection::WrapObject(JSContext *cx, JS::Handle aGivenProto) { - return NodeListBinding::Wrap(cx, this, aGivenProto); + return NodeList_Binding::Wrap(cx, this, aGivenProto); } void diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index 5e57c03037a5..8545490b4fae 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -2731,9 +2731,9 @@ bool nsContentUtils::PositionIsBefore(nsINode* aNode1, nsINode* aNode2) { return (aNode2->CompareDocumentPosition(*aNode1) & - (NodeBinding::DOCUMENT_POSITION_PRECEDING | - NodeBinding::DOCUMENT_POSITION_DISCONNECTED)) == - NodeBinding::DOCUMENT_POSITION_PRECEDING; + (Node_Binding::DOCUMENT_POSITION_PRECEDING | + Node_Binding::DOCUMENT_POSITION_DISCONNECTED)) == + Node_Binding::DOCUMENT_POSITION_PRECEDING; } /* static */ @@ -8509,8 +8509,8 @@ nsContentUtils::SendMouseEvent(const nsCOMPtr& aPresShell, return NS_ERROR_FAILURE; } - if (aInputSourceArg == MouseEventBinding::MOZ_SOURCE_UNKNOWN) { - aInputSourceArg = MouseEventBinding::MOZ_SOURCE_MOUSE; + if (aInputSourceArg == MouseEvent_Binding::MOZ_SOURCE_UNKNOWN) { + aInputSourceArg = MouseEvent_Binding::MOZ_SOURCE_MOUSE; } WidgetMouseEvent event(true, msg, widget, @@ -10430,8 +10430,8 @@ nsContentUtils::QueryTriggeringPrincipal(nsIContent* aLoadingNode, nsAutoString loadingStr; if (aLoadingNode->IsElement()) { aLoadingNode->AsElement()->GetAttr(kNameSpaceID_None, - nsGkAtoms::triggeringprincipal, - loadingStr); + nsGkAtoms::triggeringprincipal, + loadingStr); } // Fall back if 'triggeringprincipal' isn't specified, @@ -10862,7 +10862,7 @@ nsContentUtils::IsOverridingWindowName(const nsAString& aName) // wrapping our templated function in a macro. #define EXTRACT_EXN_VALUES(T, ...) \ ExtractExceptionValues(__VA_ARGS__).isOk() + T##_Binding::NativeType, T>(__VA_ARGS__).isOk() template static Result diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 40bc32e40876..19ab2659e4bf 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -2088,7 +2088,7 @@ public: bool aMeta = false, // Including MouseEventBinding here leads // to incude loops, unfortunately. - uint16_t inputSource = 0 /* MouseEventBinding::MOZ_SOURCE_UNKNOWN */); + uint16_t inputSource = 0 /* MouseEvent_Binding::MOZ_SOURCE_UNKNOWN */); static bool CheckMayLoad(nsIPrincipal* aPrincipal, nsIChannel* aChannel, bool aAllowIfInheritsPrincipal); diff --git a/dom/base/nsDOMAttributeMap.cpp b/dom/base/nsDOMAttributeMap.cpp index 1bab7c494f20..eb31c56b13d6 100644 --- a/dom/base/nsDOMAttributeMap.cpp +++ b/dom/base/nsDOMAttributeMap.cpp @@ -440,7 +440,7 @@ nsDOMAttributeMap::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const /* virtual */ JSObject* nsDOMAttributeMap::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return NamedNodeMapBinding::Wrap(aCx, this, aGivenProto); + return NamedNodeMap_Binding::Wrap(aCx, this, aGivenProto); } DocGroup* diff --git a/dom/base/nsDOMCaretPosition.cpp b/dom/base/nsDOMCaretPosition.cpp index 0ee7c305f5a7..040074ee2733 100644 --- a/dom/base/nsDOMCaretPosition.cpp +++ b/dom/base/nsDOMCaretPosition.cpp @@ -60,7 +60,7 @@ nsDOMCaretPosition::GetClientRect() const JSObject* nsDOMCaretPosition::WrapObject(JSContext *aCx, JS::Handle aGivenProto) { - return mozilla::dom::CaretPositionBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::CaretPosition_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(nsDOMCaretPosition, diff --git a/dom/base/nsDOMDataChannel.cpp b/dom/base/nsDOMDataChannel.cpp index 962160c399c6..85144692bf94 100644 --- a/dom/base/nsDOMDataChannel.cpp +++ b/dom/base/nsDOMDataChannel.cpp @@ -51,7 +51,7 @@ nsDOMDataChannel::~nsDOMDataChannel() /* virtual */ JSObject* nsDOMDataChannel::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return RTCDataChannelBinding::Wrap(aCx, this, aGivenProto); + return RTCDataChannel_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_CYCLE_COLLECTION_CLASS(nsDOMDataChannel) diff --git a/dom/base/nsDOMMutationObserver.h b/dom/base/nsDOMMutationObserver.h index 858f31f144cb..b8ffa1f2e1da 100644 --- a/dom/base/nsDOMMutationObserver.h +++ b/dom/base/nsDOMMutationObserver.h @@ -52,7 +52,7 @@ public: virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override { - return mozilla::dom::MutationRecordBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::MutationRecord_Binding::Wrap(aCx, this, aGivenProto); } NS_DECL_CYCLE_COLLECTING_ISUPPORTS @@ -411,7 +411,7 @@ public: { // We can reuse AttributeWillChange implementation. AttributeWillChange(aElement, aNameSpaceID, aAttribute, - mozilla::dom::MutationEventBinding::MODIFICATION, nullptr); + mozilla::dom::MutationEvent_Binding::MODIFICATION, nullptr); } protected: @@ -508,7 +508,7 @@ public: virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override { - return mozilla::dom::MutationObserverBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::MutationObserver_Binding::Wrap(aCx, this, aGivenProto); } nsISupports* GetParentObject() const diff --git a/dom/base/nsDOMSerializer.h b/dom/base/nsDOMSerializer.h index 5d0c9104f31a..a69588749e39 100644 --- a/dom/base/nsDOMSerializer.h +++ b/dom/base/nsDOMSerializer.h @@ -39,7 +39,7 @@ public: bool WrapObject(JSContext* aCx, JS::Handle aGivenProto, JS::MutableHandle aReflector) { - return mozilla::dom::XMLSerializerBinding::Wrap(aCx, this, aGivenProto, + return mozilla::dom::XMLSerializer_Binding::Wrap(aCx, this, aGivenProto, aReflector); } }; diff --git a/dom/base/nsDOMTokenList.cpp b/dom/base/nsDOMTokenList.cpp index b0763668a53c..1e353f104121 100644 --- a/dom/base/nsDOMTokenList.cpp +++ b/dom/base/nsDOMTokenList.cpp @@ -435,6 +435,6 @@ nsDOMTokenList::GetDocGroup() const JSObject* nsDOMTokenList::WrapObject(JSContext *cx, JS::Handle aGivenProto) { - return DOMTokenListBinding::Wrap(cx, this, aGivenProto); + return DOMTokenList_Binding::Wrap(cx, this, aGivenProto); } diff --git a/dom/base/nsDocument.cpp b/dom/base/nsDocument.cpp index c82ad7a52ca6..0fd86d65715c 100644 --- a/dom/base/nsDocument.cpp +++ b/dom/base/nsDocument.cpp @@ -658,7 +658,7 @@ public: virtual JSObject* WrapObject(JSContext *aCx, JS::Handle aGivenProto) override { - return HTMLCollectionBinding::Wrap(aCx, this, aGivenProto); + return HTMLCollection_Binding::Wrap(aCx, this, aGivenProto); } using nsBaseContentList::Item; diff --git a/dom/base/nsFrameLoader.cpp b/dom/base/nsFrameLoader.cpp index 7b1929026b74..cb3795b1f8cc 100644 --- a/dom/base/nsFrameLoader.cpp +++ b/dom/base/nsFrameLoader.cpp @@ -3400,6 +3400,6 @@ JSObject* nsFrameLoader::WrapObject(JSContext* cx, JS::Handle aGivenProto) { JS::RootedObject result(cx); - FrameLoaderBinding::Wrap(cx, this, this, aGivenProto, &result); + FrameLoader_Binding::Wrap(cx, this, this, aGivenProto, &result); return result; } diff --git a/dom/base/nsGenConImageContent.cpp b/dom/base/nsGenConImageContent.cpp index 324f83ee754a..ac020a7746c5 100644 --- a/dom/base/nsGenConImageContent.cpp +++ b/dom/base/nsGenConImageContent.cpp @@ -161,6 +161,6 @@ nsGenConImageContent::IntrinsicState() const JSObject* nsGenConImageContent::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return dom::HTMLElementBinding::Wrap(aCx, this, aGivenProto); + return dom::HTMLElement_Binding::Wrap(aCx, this, aGivenProto); } diff --git a/dom/base/nsGlobalWindowInner.cpp b/dom/base/nsGlobalWindowInner.cpp index eb641bfb751b..8ad643684d02 100644 --- a/dom/base/nsGlobalWindowInner.cpp +++ b/dom/base/nsGlobalWindowInner.cpp @@ -5899,8 +5899,8 @@ nsGlobalWindowInner::Observe(nsISupports* aSubject, const char* aTopic, // very likely situation where an event handler will try to read its value. if (mNavigator) { - NavigatorBinding::ClearCachedLanguageValue(mNavigator); - NavigatorBinding::ClearCachedLanguagesValue(mNavigator); + Navigator_Binding::ClearCachedLanguageValue(mNavigator); + Navigator_Binding::ClearCachedLanguagesValue(mNavigator); } // The event has to be dispatched only to the current inner window. @@ -7698,8 +7698,8 @@ void nsGlobalWindowInner::ClearDocumentDependentSlots(JSContext* aCx) { // If JSAPI OOMs here, there is basically nothing we can do to recover safely. - if (!WindowBinding::ClearCachedDocumentValue(aCx, this) || - !WindowBinding::ClearCachedPerformanceValue(aCx, this)) { + if (!Window_Binding::ClearCachedDocumentValue(aCx, this) || + !Window_Binding::ClearCachedPerformanceValue(aCx, this)) { MOZ_CRASH("Unhandlable OOM while clearing document dependent slots."); } } diff --git a/dom/base/nsGlobalWindowOuter.cpp b/dom/base/nsGlobalWindowOuter.cpp index 64cd974c1199..68eaab2feadc 100644 --- a/dom/base/nsGlobalWindowOuter.cpp +++ b/dom/base/nsGlobalWindowOuter.cpp @@ -1607,7 +1607,7 @@ CreateNativeGlobalForInner(JSContext* aCx, uint32_t flags = needComponents ? 0 : xpc::OMIT_COMPONENTS_OBJECT; flags |= xpc::DONT_FIRE_ONNEWGLOBALHOOK; - if (!WindowBinding::Wrap(aCx, aNewInner, aNewInner, options, + if (!Window_Binding::Wrap(aCx, aNewInner, aNewInner, options, nsJSPrincipals::get(aPrincipal), false, aGlobal) || !xpc::InitGlobalObject(aCx, aGlobal, flags)) { return NS_ERROR_FAILURE; diff --git a/dom/base/nsHistory.cpp b/dom/base/nsHistory.cpp index b63cddddd322..a26efacff42f 100644 --- a/dom/base/nsHistory.cpp +++ b/dom/base/nsHistory.cpp @@ -55,7 +55,7 @@ nsHistory::GetParentObject() const JSObject* nsHistory::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return HistoryBinding::Wrap(aCx, this, aGivenProto); + return History_Binding::Wrap(aCx, this, aGivenProto); } uint32_t diff --git a/dom/base/nsINode.cpp b/dom/base/nsINode.cpp index 238c7bea0608..cc6f89d2914b 100644 --- a/dom/base/nsINode.cpp +++ b/dom/base/nsINode.cpp @@ -737,11 +737,11 @@ nsINode::CompareDocumentPosition(nsINode& aOtherNode) const } if (GetPreviousSibling() == &aOtherNode) { MOZ_ASSERT(GetParentNode() == aOtherNode.GetParentNode()); - return NodeBinding::DOCUMENT_POSITION_PRECEDING; + return Node_Binding::DOCUMENT_POSITION_PRECEDING; } if (GetNextSibling() == &aOtherNode) { MOZ_ASSERT(GetParentNode() == aOtherNode.GetParentNode()); - return NodeBinding::DOCUMENT_POSITION_FOLLOWING; + return Node_Binding::DOCUMENT_POSITION_FOLLOWING; } AutoTArray parents1, parents2; @@ -772,16 +772,16 @@ nsINode::CompareDocumentPosition(nsINode& aOtherNode) const if (attrName->Equals(attr1->NodeInfo())) { NS_ASSERTION(!attrName->Equals(attr2->NodeInfo()), "Different attrs at same position"); - return NodeBinding::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC | - NodeBinding::DOCUMENT_POSITION_PRECEDING; + return Node_Binding::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC | + Node_Binding::DOCUMENT_POSITION_PRECEDING; } if (attrName->Equals(attr2->NodeInfo())) { - return NodeBinding::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC | - NodeBinding::DOCUMENT_POSITION_FOLLOWING; + return Node_Binding::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC | + Node_Binding::DOCUMENT_POSITION_FOLLOWING; } } MOZ_ASSERT_UNREACHABLE("neither attribute in the element"); - return NodeBinding::DOCUMENT_POSITION_DISCONNECTED; + return Node_Binding::DOCUMENT_POSITION_DISCONNECTED; } if (elem) { @@ -812,12 +812,12 @@ nsINode::CompareDocumentPosition(nsINode& aOtherNode) const const nsINode* top2 = parents2.ElementAt(--pos2); if (top1 != top2) { return top1 < top2 ? - (NodeBinding::DOCUMENT_POSITION_PRECEDING | - NodeBinding::DOCUMENT_POSITION_DISCONNECTED | - NodeBinding::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC) : - (NodeBinding::DOCUMENT_POSITION_FOLLOWING | - NodeBinding::DOCUMENT_POSITION_DISCONNECTED | - NodeBinding::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC); + (Node_Binding::DOCUMENT_POSITION_PRECEDING | + Node_Binding::DOCUMENT_POSITION_DISCONNECTED | + Node_Binding::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC) : + (Node_Binding::DOCUMENT_POSITION_FOLLOWING | + Node_Binding::DOCUMENT_POSITION_DISCONNECTED | + Node_Binding::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC); } // Find where the parent chain differs and check indices in the parent. @@ -831,8 +831,8 @@ nsINode::CompareDocumentPosition(nsINode& aOtherNode) const // ComputeIndexOf will return -1 for the attribute making the // attribute be considered before any child. return parent->ComputeIndexOf(child1) < parent->ComputeIndexOf(child2) ? - NodeBinding::DOCUMENT_POSITION_PRECEDING : - NodeBinding::DOCUMENT_POSITION_FOLLOWING; + Node_Binding::DOCUMENT_POSITION_PRECEDING : + Node_Binding::DOCUMENT_POSITION_FOLLOWING; } parent = child1; } @@ -841,10 +841,10 @@ nsINode::CompareDocumentPosition(nsINode& aOtherNode) const // between the chains. That must mean that one node is an ancestor of the // other. The one with the shortest chain must be the ancestor. return pos1 < pos2 ? - (NodeBinding::DOCUMENT_POSITION_PRECEDING | - NodeBinding::DOCUMENT_POSITION_CONTAINS) : - (NodeBinding::DOCUMENT_POSITION_FOLLOWING | - NodeBinding::DOCUMENT_POSITION_CONTAINED_BY); + (Node_Binding::DOCUMENT_POSITION_PRECEDING | + Node_Binding::DOCUMENT_POSITION_CONTAINS) : + (Node_Binding::DOCUMENT_POSITION_FOLLOWING | + Node_Binding::DOCUMENT_POSITION_CONTAINED_BY); } bool diff --git a/dom/base/nsINode.h b/dom/base/nsINode.h index 137ee6f34266..74f87b23bdb6 100644 --- a/dom/base/nsINode.h +++ b/dom/base/nsINode.h @@ -302,23 +302,23 @@ public: // XXXbz Maybe we should codegen a class holding these constants and // inherit from it... - static const auto ELEMENT_NODE = mozilla::dom::NodeBinding::ELEMENT_NODE; - static const auto ATTRIBUTE_NODE = mozilla::dom::NodeBinding::ATTRIBUTE_NODE; - static const auto TEXT_NODE = mozilla::dom::NodeBinding::TEXT_NODE; + static const auto ELEMENT_NODE = mozilla::dom::Node_Binding::ELEMENT_NODE; + static const auto ATTRIBUTE_NODE = mozilla::dom::Node_Binding::ATTRIBUTE_NODE; + static const auto TEXT_NODE = mozilla::dom::Node_Binding::TEXT_NODE; static const auto CDATA_SECTION_NODE = - mozilla::dom::NodeBinding::CDATA_SECTION_NODE; + mozilla::dom::Node_Binding::CDATA_SECTION_NODE; static const auto ENTITY_REFERENCE_NODE = - mozilla::dom::NodeBinding::ENTITY_REFERENCE_NODE; - static const auto ENTITY_NODE = mozilla::dom::NodeBinding::ENTITY_NODE; + mozilla::dom::Node_Binding::ENTITY_REFERENCE_NODE; + static const auto ENTITY_NODE = mozilla::dom::Node_Binding::ENTITY_NODE; static const auto PROCESSING_INSTRUCTION_NODE = - mozilla::dom::NodeBinding::PROCESSING_INSTRUCTION_NODE; - static const auto COMMENT_NODE = mozilla::dom::NodeBinding::COMMENT_NODE; - static const auto DOCUMENT_NODE = mozilla::dom::NodeBinding::DOCUMENT_NODE; + mozilla::dom::Node_Binding::PROCESSING_INSTRUCTION_NODE; + static const auto COMMENT_NODE = mozilla::dom::Node_Binding::COMMENT_NODE; + static const auto DOCUMENT_NODE = mozilla::dom::Node_Binding::DOCUMENT_NODE; static const auto DOCUMENT_TYPE_NODE = - mozilla::dom::NodeBinding::DOCUMENT_TYPE_NODE; + mozilla::dom::Node_Binding::DOCUMENT_TYPE_NODE; static const auto DOCUMENT_FRAGMENT_NODE = - mozilla::dom::NodeBinding::DOCUMENT_FRAGMENT_NODE; - static const auto NOTATION_NODE = mozilla::dom::NodeBinding::NOTATION_NODE; + mozilla::dom::Node_Binding::DOCUMENT_FRAGMENT_NODE; + static const auto NOTATION_NODE = mozilla::dom::Node_Binding::NOTATION_NODE; template using Sequence = mozilla::dom::Sequence; diff --git a/dom/base/nsInProcessTabChildGlobal.cpp b/dom/base/nsInProcessTabChildGlobal.cpp index dc00ca8bd1ad..97958a400140 100644 --- a/dom/base/nsInProcessTabChildGlobal.cpp +++ b/dom/base/nsInProcessTabChildGlobal.cpp @@ -181,9 +181,9 @@ nsInProcessTabChildGlobal::WrapGlobalObject(JSContext* aCx, JS::RealmOptions& aOptions, JS::MutableHandle aReflector) { - bool ok = ContentFrameMessageManagerBinding::Wrap(aCx, this, this, aOptions, - nsJSPrincipals::get(mPrincipal), - true, aReflector); + bool ok = ContentFrameMessageManager_Binding::Wrap(aCx, this, this, aOptions, + nsJSPrincipals::get(mPrincipal), + true, aReflector); if (ok) { // Since we can't rewrap we have to preserve the global's wrapper here. PreserveWrapper(ToSupports(this)); diff --git a/dom/base/nsMimeTypeArray.cpp b/dom/base/nsMimeTypeArray.cpp index 29ef328e9443..2ec7189afb3c 100644 --- a/dom/base/nsMimeTypeArray.cpp +++ b/dom/base/nsMimeTypeArray.cpp @@ -44,7 +44,7 @@ nsMimeTypeArray::~nsMimeTypeArray() JSObject* nsMimeTypeArray::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MimeTypeArrayBinding::Wrap(aCx, this, aGivenProto); + return MimeTypeArray_Binding::Wrap(aCx, this, aGivenProto); } void @@ -216,7 +216,7 @@ nsMimeType::GetParentObject() const JSObject* nsMimeType::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MimeTypeBinding::Wrap(aCx, this, aGivenProto); + return MimeType_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/base/nsPluginArray.cpp b/dom/base/nsPluginArray.cpp index ccf24c80e8a7..43e7c2e9ac1d 100644 --- a/dom/base/nsPluginArray.cpp +++ b/dom/base/nsPluginArray.cpp @@ -55,7 +55,7 @@ nsPluginArray::GetParentObject() const JSObject* nsPluginArray::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PluginArrayBinding::Wrap(aCx, this, aGivenProto); + return PluginArray_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_CYCLE_COLLECTING_ADDREF(nsPluginArray) @@ -435,7 +435,7 @@ nsPluginElement::GetParentObject() const JSObject* nsPluginElement::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PluginBinding::Wrap(aCx, this, aGivenProto); + return Plugin_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/base/nsRange.cpp b/dom/base/nsRange.cpp index cde28563c486..959140d18f0b 100644 --- a/dom/base/nsRange.cpp +++ b/dom/base/nsRange.cpp @@ -44,7 +44,7 @@ using namespace mozilla::dom; JSObject* nsRange::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return RangeBinding::Wrap(aCx, this, aGivenProto); + return Range_Binding::Wrap(aCx, this, aGivenProto); } DocGroup* @@ -2293,25 +2293,25 @@ nsRange::CompareBoundaryPoints(uint16_t aHow, nsRange& aOtherRange, uint32_t ourOffset, otherOffset; switch (aHow) { - case RangeBinding::START_TO_START: + case Range_Binding::START_TO_START: ourNode = mStart.Container(); ourOffset = mStart.Offset(); otherNode = aOtherRange.GetStartContainer(); otherOffset = aOtherRange.StartOffset(); break; - case RangeBinding::START_TO_END: + case Range_Binding::START_TO_END: ourNode = mEnd.Container(); ourOffset = mEnd.Offset(); otherNode = aOtherRange.GetStartContainer(); otherOffset = aOtherRange.StartOffset(); break; - case RangeBinding::END_TO_START: + case Range_Binding::END_TO_START: ourNode = mStart.Container(); ourOffset = mStart.Offset(); otherNode = aOtherRange.GetEndContainer(); otherOffset = aOtherRange.EndOffset(); break; - case RangeBinding::END_TO_END: + case Range_Binding::END_TO_END: ourNode = mEnd.Container(); ourOffset = mEnd.Offset(); otherNode = aOtherRange.GetEndContainer(); diff --git a/dom/base/nsScreen.cpp b/dom/base/nsScreen.cpp index 5172e4352054..f287a64a0562 100644 --- a/dom/base/nsScreen.cpp +++ b/dom/base/nsScreen.cpp @@ -299,7 +299,7 @@ nsScreen::IsDeviceSizePageSize() JSObject* nsScreen::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return ScreenBinding::Wrap(aCx, this, aGivenProto); + return Screen_Binding::Wrap(aCx, this, aGivenProto); } nsresult diff --git a/dom/base/nsStyledElement.cpp b/dom/base/nsStyledElement.cpp index 8dac33adafe5..7483eb758dda 100644 --- a/dom/base/nsStyledElement.cpp +++ b/dom/base/nsStyledElement.cpp @@ -101,8 +101,8 @@ nsStyledElement::InlineStyleDeclarationWillChange(MutationClosureData& aData) } aData.mModType = modification ? - static_cast(MutationEventBinding::MODIFICATION) : - static_cast(MutationEventBinding::ADDITION); + static_cast(MutationEvent_Binding::MODIFICATION) : + static_cast(MutationEvent_Binding::ADDITION); nsNodeUtils::AttributeWillChange(this, kNameSpaceID_None, nsGkAtoms::style, aData.mModType, nullptr); diff --git a/dom/base/nsTextNode.cpp b/dom/base/nsTextNode.cpp index fe143f8297e3..21930d586531 100644 --- a/dom/base/nsTextNode.cpp +++ b/dom/base/nsTextNode.cpp @@ -104,7 +104,7 @@ NS_IMPL_ISUPPORTS_CYCLE_COLLECTION_INHERITED_0(nsTextNode, CharacterData) JSObject* nsTextNode::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return TextBinding::Wrap(aCx, this, aGivenProto); + return Text_Binding::Wrap(aCx, this, aGivenProto); } bool diff --git a/dom/base/nsTraversal.cpp b/dom/base/nsTraversal.cpp index 60a3064a7c10..eca25fabb342 100644 --- a/dom/base/nsTraversal.cpp +++ b/dom/base/nsTraversal.cpp @@ -50,12 +50,12 @@ nsTraversal::TestNode(nsINode* aNode, mozilla::ErrorResult& aResult) uint16_t nodeType = aNode->NodeType(); if (nodeType <= 12 && !((1 << (nodeType-1)) & mWhatToShow)) { - return NodeFilterBinding::FILTER_SKIP; + return NodeFilter_Binding::FILTER_SKIP; } if (!mFilter) { // No filter, just accept - return NodeFilterBinding::FILTER_ACCEPT; + return NodeFilter_Binding::FILTER_ACCEPT; } AutoRestore inAcceptNode(mInAcceptNode); diff --git a/dom/base/nsTreeSanitizer.cpp b/dom/base/nsTreeSanitizer.cpp index cdf23b6021c9..b2a2066af3ff 100644 --- a/dom/base/nsTreeSanitizer.cpp +++ b/dom/base/nsTreeSanitizer.cpp @@ -1123,15 +1123,15 @@ nsTreeSanitizer::SanitizeStyleSheet(const nsAString& aOriginal, didSanitize = true; // Ignore these rule types. break; - case CSSRuleBinding::NAMESPACE_RULE: - case CSSRuleBinding::FONT_FACE_RULE: { + case CSSRule_Binding::NAMESPACE_RULE: + case CSSRule_Binding::FONT_FACE_RULE: { // Append @namespace and @font-face rules verbatim. nsAutoString cssText; rule->GetCssText(cssText); aSanitized.Append(cssText); break; } - case CSSRuleBinding::STYLE_RULE: { + case CSSRule_Binding::STYLE_RULE: { // For style rules, we will just look for and remove the // -moz-binding properties. auto styleRule = static_cast(rule); diff --git a/dom/base/nsWindowRoot.cpp b/dom/base/nsWindowRoot.cpp index 883b01c57222..c82865b324ec 100644 --- a/dom/base/nsWindowRoot.cpp +++ b/dom/base/nsWindowRoot.cpp @@ -331,7 +331,7 @@ nsWindowRoot::GetParentObject() JSObject* nsWindowRoot::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return mozilla::dom::WindowRootBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::WindowRoot_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/battery/BatteryManager.cpp b/dom/battery/BatteryManager.cpp index 246d998ecd2e..3bc4bd46192e 100644 --- a/dom/battery/BatteryManager.cpp +++ b/dom/battery/BatteryManager.cpp @@ -56,7 +56,7 @@ BatteryManager::Shutdown() JSObject* BatteryManager::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return BatteryManagerBinding::Wrap(aCx, this, aGivenProto); + return BatteryManager_Binding::Wrap(aCx, this, aGivenProto); } bool diff --git a/dom/bindings/BindingUtils.cpp b/dom/bindings/BindingUtils.cpp index 4a3ff0ee9b25..51b2a53c6ed1 100644 --- a/dom/bindings/BindingUtils.cpp +++ b/dom/bindings/BindingUtils.cpp @@ -66,7 +66,7 @@ namespace dom { // Forward declare GetConstructorObject methods. #define HTML_TAG(_tag, _classname, _interfacename) \ -namespace HTML##_interfacename##ElementBinding { \ +namespace HTML##_interfacename##Element_Binding { \ JSObject* GetConstructorObject(JSContext*); \ } #define HTML_OTHER(_tag) @@ -77,12 +77,12 @@ namespace HTML##_interfacename##ElementBinding { \ typedef JSObject* (*constructorGetterCallback)(JSContext*); // Mapping of html tag and GetConstructorObject methods. -#define HTML_TAG(_tag, _classname, _interfacename) HTML##_interfacename##ElementBinding::GetConstructorObject, +#define HTML_TAG(_tag, _classname, _interfacename) HTML##_interfacename##Element_Binding::GetConstructorObject, #define HTML_OTHER(_tag) nullptr, // We use eHTMLTag_foo (where foo is the tag) which is defined in nsHTMLTags.h // to index into this array. static const constructorGetterCallback sConstructorGetterCallback[] = { - HTMLUnknownElementBinding::GetConstructorObject, + HTMLUnknownElement_Binding::GetConstructorObject, #include "nsHTMLTagList.h" #undef HTML_TAG #undef HTML_OTHER @@ -3800,9 +3800,9 @@ HTMLConstructor(JSContext* aCx, unsigned aArgc, JS::Value* aVp, JS::Rooted constructor(aCx); if (ns == kNameSpaceID_XUL) { - constructor = XULElementBinding::GetConstructorObject(aCx); + constructor = XULElement_Binding::GetConstructorObject(aCx); } else { - constructor = HTMLElementBinding::GetConstructorObject(aCx); + constructor = HTMLElement_Binding::GetConstructorObject(aCx); } if (!constructor) { @@ -3833,9 +3833,9 @@ HTMLConstructor(JSContext* aCx, unsigned aArgc, JS::Value* aVp, definition->mLocalName == nsGkAtoms::popup || definition->mLocalName == nsGkAtoms::panel || definition->mLocalName == nsGkAtoms::tooltip) { - cb = XULPopupElementBinding::GetConstructorObject; + cb = XULPopupElement_Binding::GetConstructorObject; } else { - cb = XULElementBinding::GetConstructorObject; + cb = XULElement_Binding::GetConstructorObject; } } diff --git a/dom/bindings/BindingUtils.h b/dom/bindings/BindingUtils.h index ddc6ae5169ed..cb4b42ad0d07 100644 --- a/dom/bindings/BindingUtils.h +++ b/dom/bindings/BindingUtils.h @@ -194,19 +194,19 @@ IsDOMObject(JSObject* obj) // can be anything that converts to JSObject*. #define UNWRAP_OBJECT(Interface, obj, value) \ mozilla::dom::UnwrapObject(obj, value) + mozilla::dom::Interface##_Binding::NativeType>(obj, value) // Test whether the given object is an instance of the given interface. #define IS_INSTANCE_OF(Interface, obj) \ mozilla::dom::IsInstanceOf(obj) + mozilla::dom::Interface##_Binding::NativeType>(obj) // Unwrap the given non-wrapper object. This can be used with any obj that // converts to JSObject*; as long as that JSObject* is live the return value // will be valid. #define UNWRAP_NON_WRAPPER_OBJECT(Interface, obj, value) \ mozilla::dom::UnwrapNonWrapperObject(obj, value) + mozilla::dom::Interface##_Binding::NativeType>(obj, value) // Some callers don't want to set an exception when unwrapping fails // (for example, overload resolution uses unwrapping to tell what sort diff --git a/dom/bindings/test/TestFunctions.cpp b/dom/bindings/test/TestFunctions.cpp index d1905da762fb..ca662ff94b30 100644 --- a/dom/bindings/test/TestFunctions.cpp +++ b/dom/bindings/test/TestFunctions.cpp @@ -144,7 +144,7 @@ bool TestFunctions::WrapObject(JSContext* aCx, JS::Handle aGivenProto, JS::MutableHandle aWrapper) { - return TestFunctionsBinding::Wrap(aCx, this, aGivenProto, aWrapper); + return TestFunctions_Binding::Wrap(aCx, this, aGivenProto, aWrapper); } } diff --git a/dom/bindings/test/TestInterfaceIterableDouble.cpp b/dom/bindings/test/TestInterfaceIterableDouble.cpp index 4f1380a2fe57..c99391038e23 100644 --- a/dom/bindings/test/TestInterfaceIterableDouble.cpp +++ b/dom/bindings/test/TestInterfaceIterableDouble.cpp @@ -51,7 +51,7 @@ TestInterfaceIterableDouble::Constructor(const GlobalObject& aGlobal, JSObject* TestInterfaceIterableDouble::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return TestInterfaceIterableDoubleBinding::Wrap(aCx, this, aGivenProto); + return TestInterfaceIterableDouble_Binding::Wrap(aCx, this, aGivenProto); } nsPIDOMWindowInner* diff --git a/dom/bindings/test/TestInterfaceIterableDoubleUnion.cpp b/dom/bindings/test/TestInterfaceIterableDoubleUnion.cpp index 8b9c44d9380b..913f06856659 100644 --- a/dom/bindings/test/TestInterfaceIterableDoubleUnion.cpp +++ b/dom/bindings/test/TestInterfaceIterableDoubleUnion.cpp @@ -52,7 +52,7 @@ TestInterfaceIterableDoubleUnion::Constructor(const GlobalObject& aGlobal, JSObject* TestInterfaceIterableDoubleUnion::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return TestInterfaceIterableDoubleUnionBinding::Wrap(aCx, this, aGivenProto); + return TestInterfaceIterableDoubleUnion_Binding::Wrap(aCx, this, aGivenProto); } nsPIDOMWindowInner* diff --git a/dom/bindings/test/TestInterfaceIterableSingle.cpp b/dom/bindings/test/TestInterfaceIterableSingle.cpp index 929f90ae9018..b85334a99060 100644 --- a/dom/bindings/test/TestInterfaceIterableSingle.cpp +++ b/dom/bindings/test/TestInterfaceIterableSingle.cpp @@ -48,7 +48,7 @@ TestInterfaceIterableSingle::Constructor(const GlobalObject& aGlobal, JSObject* TestInterfaceIterableSingle::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return TestInterfaceIterableSingleBinding::Wrap(aCx, this, aGivenProto); + return TestInterfaceIterableSingle_Binding::Wrap(aCx, this, aGivenProto); } nsPIDOMWindowInner* diff --git a/dom/bindings/test/TestInterfaceMaplike.cpp b/dom/bindings/test/TestInterfaceMaplike.cpp index 33973d08f45d..b46d83432b7a 100644 --- a/dom/bindings/test/TestInterfaceMaplike.cpp +++ b/dom/bindings/test/TestInterfaceMaplike.cpp @@ -45,7 +45,7 @@ TestInterfaceMaplike::Constructor(const GlobalObject& aGlobal, JSObject* TestInterfaceMaplike::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return TestInterfaceMaplikeBinding::Wrap(aCx, this, aGivenProto); + return TestInterfaceMaplike_Binding::Wrap(aCx, this, aGivenProto); } nsPIDOMWindowInner* @@ -58,28 +58,28 @@ void TestInterfaceMaplike::SetInternal(const nsAString& aKey, int32_t aValue) { ErrorResult rv; - TestInterfaceMaplikeBinding::MaplikeHelpers::Set(this, aKey, aValue, rv); + TestInterfaceMaplike_Binding::MaplikeHelpers::Set(this, aKey, aValue, rv); } void TestInterfaceMaplike::ClearInternal() { ErrorResult rv; - TestInterfaceMaplikeBinding::MaplikeHelpers::Clear(this, rv); + TestInterfaceMaplike_Binding::MaplikeHelpers::Clear(this, rv); } bool TestInterfaceMaplike::DeleteInternal(const nsAString& aKey) { ErrorResult rv; - return TestInterfaceMaplikeBinding::MaplikeHelpers::Delete(this, aKey, rv); + return TestInterfaceMaplike_Binding::MaplikeHelpers::Delete(this, aKey, rv); } bool TestInterfaceMaplike::HasInternal(const nsAString& aKey) { ErrorResult rv; - return TestInterfaceMaplikeBinding::MaplikeHelpers::Has(this, aKey, rv); + return TestInterfaceMaplike_Binding::MaplikeHelpers::Has(this, aKey, rv); } } // namespace dom diff --git a/dom/bindings/test/TestInterfaceMaplikeObject.cpp b/dom/bindings/test/TestInterfaceMaplikeObject.cpp index a7a4346f62c2..0b8e896fc6c1 100644 --- a/dom/bindings/test/TestInterfaceMaplikeObject.cpp +++ b/dom/bindings/test/TestInterfaceMaplikeObject.cpp @@ -48,7 +48,7 @@ JSObject* TestInterfaceMaplikeObject::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return TestInterfaceMaplikeObjectBinding::Wrap(aCx, this, aGivenProto); + return TestInterfaceMaplikeObject_Binding::Wrap(aCx, this, aGivenProto); } nsPIDOMWindowInner* @@ -62,28 +62,28 @@ TestInterfaceMaplikeObject::SetInternal(const nsAString& aKey) { RefPtr p(new TestInterfaceMaplike(mParent)); ErrorResult rv; - TestInterfaceMaplikeObjectBinding::MaplikeHelpers::Set(this, aKey, *p, rv); + TestInterfaceMaplikeObject_Binding::MaplikeHelpers::Set(this, aKey, *p, rv); } void TestInterfaceMaplikeObject::ClearInternal() { ErrorResult rv; - TestInterfaceMaplikeObjectBinding::MaplikeHelpers::Clear(this, rv); + TestInterfaceMaplikeObject_Binding::MaplikeHelpers::Clear(this, rv); } bool TestInterfaceMaplikeObject::DeleteInternal(const nsAString& aKey) { ErrorResult rv; - return TestInterfaceMaplikeObjectBinding::MaplikeHelpers::Delete(this, aKey, rv); + return TestInterfaceMaplikeObject_Binding::MaplikeHelpers::Delete(this, aKey, rv); } bool TestInterfaceMaplikeObject::HasInternal(const nsAString& aKey) { ErrorResult rv; - return TestInterfaceMaplikeObjectBinding::MaplikeHelpers::Has(this, aKey, rv); + return TestInterfaceMaplikeObject_Binding::MaplikeHelpers::Has(this, aKey, rv); } } // namespace dom diff --git a/dom/bindings/test/TestInterfaceSetlike.cpp b/dom/bindings/test/TestInterfaceSetlike.cpp index d0fd2cbcac24..73f3f4139970 100644 --- a/dom/bindings/test/TestInterfaceSetlike.cpp +++ b/dom/bindings/test/TestInterfaceSetlike.cpp @@ -47,7 +47,7 @@ JSObject* TestInterfaceSetlike::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return TestInterfaceSetlikeBinding::Wrap(aCx, this, aGivenProto); + return TestInterfaceSetlike_Binding::Wrap(aCx, this, aGivenProto); } nsPIDOMWindowInner* diff --git a/dom/bindings/test/TestInterfaceSetlikeNode.cpp b/dom/bindings/test/TestInterfaceSetlikeNode.cpp index 348c620077fd..935c249850f3 100644 --- a/dom/bindings/test/TestInterfaceSetlikeNode.cpp +++ b/dom/bindings/test/TestInterfaceSetlikeNode.cpp @@ -47,7 +47,7 @@ JSObject* TestInterfaceSetlikeNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return TestInterfaceSetlikeNodeBinding::Wrap(aCx, this, aGivenProto); + return TestInterfaceSetlikeNode_Binding::Wrap(aCx, this, aGivenProto); } nsPIDOMWindowInner* diff --git a/dom/broadcastchannel/BroadcastChannel.cpp b/dom/broadcastchannel/BroadcastChannel.cpp index a2aa2cf4f023..0732e55d7d58 100644 --- a/dom/broadcastchannel/BroadcastChannel.cpp +++ b/dom/broadcastchannel/BroadcastChannel.cpp @@ -260,7 +260,7 @@ BroadcastChannel::~BroadcastChannel() JSObject* BroadcastChannel::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return BroadcastChannelBinding::Wrap(aCx, this, aGivenProto); + return BroadcastChannel_Binding::Wrap(aCx, this, aGivenProto); } /* static */ already_AddRefed diff --git a/dom/cache/Cache.cpp b/dom/cache/Cache.cpp index f815a6fa8e16..afddcef355ab 100644 --- a/dom/cache/Cache.cpp +++ b/dom/cache/Cache.cpp @@ -525,7 +525,7 @@ Cache::GetParentObject() const JSObject* Cache::WrapObject(JSContext* aContext, JS::Handle aGivenProto) { - return CacheBinding::Wrap(aContext, this, aGivenProto); + return Cache_Binding::Wrap(aContext, this, aGivenProto); } void diff --git a/dom/cache/CacheStorage.cpp b/dom/cache/CacheStorage.cpp index 411a68ab7e3a..f6ddb70ef3d2 100644 --- a/dom/cache/CacheStorage.cpp +++ b/dom/cache/CacheStorage.cpp @@ -244,8 +244,8 @@ CacheStorage::DefineCaches(JSContext* aCx, JS::Handle aGlobal) "Passed object is not a global object!"); js::AssertSameCompartment(aCx, aGlobal); - if (NS_WARN_IF(!CacheStorageBinding::GetConstructorObject(aCx) || - !CacheBinding::GetConstructorObject(aCx))) { + if (NS_WARN_IF(!CacheStorage_Binding::GetConstructorObject(aCx) || + !Cache_Binding::GetConstructorObject(aCx))) { return false; } @@ -490,7 +490,7 @@ CacheStorage::GetParentObject() const JSObject* CacheStorage::WrapObject(JSContext* aContext, JS::Handle aGivenProto) { - return mozilla::dom::CacheStorageBinding::Wrap(aContext, this, aGivenProto); + return mozilla::dom::CacheStorage_Binding::Wrap(aContext, this, aGivenProto); } void diff --git a/dom/canvas/CanvasGradient.h b/dom/canvas/CanvasGradient.h index 5a98ab13eed6..6d7925056ceb 100644 --- a/dom/canvas/CanvasGradient.h +++ b/dom/canvas/CanvasGradient.h @@ -53,7 +53,7 @@ public: JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override { - return CanvasGradientBinding::Wrap(aCx, this, aGivenProto); + return CanvasGradient_Binding::Wrap(aCx, this, aGivenProto); } CanvasRenderingContext2D* GetParentObject() diff --git a/dom/canvas/CanvasPattern.h b/dom/canvas/CanvasPattern.h index 98555485d452..dd233d890869 100644 --- a/dom/canvas/CanvasPattern.h +++ b/dom/canvas/CanvasPattern.h @@ -54,7 +54,7 @@ public: JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override { - return CanvasPatternBinding::Wrap(aCx, this, aGivenProto); + return CanvasPattern_Binding::Wrap(aCx, this, aGivenProto); } CanvasRenderingContext2D* GetParentObject() diff --git a/dom/canvas/CanvasRenderingContext2D.cpp b/dom/canvas/CanvasRenderingContext2D.cpp index e39bdb9554ab..0e51b9a00188 100644 --- a/dom/canvas/CanvasRenderingContext2D.cpp +++ b/dom/canvas/CanvasRenderingContext2D.cpp @@ -1138,7 +1138,7 @@ CanvasRenderingContext2D::~CanvasRenderingContext2D() JSObject* CanvasRenderingContext2D::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return CanvasRenderingContext2DBinding::Wrap(aCx, this, aGivenProto); + return CanvasRenderingContext2D_Binding::Wrap(aCx, this, aGivenProto); } bool @@ -5275,7 +5275,7 @@ CanvasRenderingContext2D::DrawWindow(nsGlobalWindowInner& aWindow, double aX, } // Flush layout updates - if (!(aFlags & CanvasRenderingContext2DBinding::DRAWWINDOW_DO_NOT_FLUSH)) { + if (!(aFlags & CanvasRenderingContext2D_Binding::DRAWWINDOW_DO_NOT_FLUSH)) { nsContentUtils::FlushLayoutForTree(aWindow.AsInner()->GetOuterWindow()); } @@ -5310,20 +5310,20 @@ CanvasRenderingContext2D::DrawWindow(nsGlobalWindowInner& aWindow, double aX, nsPresContext::CSSPixelsToAppUnits((float)aH)); uint32_t renderDocFlags = (nsIPresShell::RENDER_IGNORE_VIEWPORT_SCROLLING | nsIPresShell::RENDER_DOCUMENT_RELATIVE); - if (aFlags & CanvasRenderingContext2DBinding::DRAWWINDOW_DRAW_CARET) { + if (aFlags & CanvasRenderingContext2D_Binding::DRAWWINDOW_DRAW_CARET) { renderDocFlags |= nsIPresShell::RENDER_CARET; } - if (aFlags & CanvasRenderingContext2DBinding::DRAWWINDOW_DRAW_VIEW) { + if (aFlags & CanvasRenderingContext2D_Binding::DRAWWINDOW_DRAW_VIEW) { renderDocFlags &= ~(nsIPresShell::RENDER_IGNORE_VIEWPORT_SCROLLING | nsIPresShell::RENDER_DOCUMENT_RELATIVE); } - if (aFlags & CanvasRenderingContext2DBinding::DRAWWINDOW_USE_WIDGET_LAYERS) { + if (aFlags & CanvasRenderingContext2D_Binding::DRAWWINDOW_USE_WIDGET_LAYERS) { renderDocFlags |= nsIPresShell::RENDER_USE_WIDGET_LAYERS; } - if (aFlags & CanvasRenderingContext2DBinding::DRAWWINDOW_ASYNC_DECODE_IMAGES) { + if (aFlags & CanvasRenderingContext2D_Binding::DRAWWINDOW_ASYNC_DECODE_IMAGES) { renderDocFlags |= nsIPresShell::RENDER_ASYNC_DECODE_IMAGES; } - if (aFlags & CanvasRenderingContext2DBinding::DRAWWINDOW_DO_NOT_FLUSH) { + if (aFlags & CanvasRenderingContext2D_Binding::DRAWWINDOW_DO_NOT_FLUSH) { renderDocFlags |= nsIPresShell::RENDER_DRAWWINDOW_NOT_FLUSHING; } @@ -6131,7 +6131,7 @@ CanvasPath::CanvasPath(nsISupports* aParent, already_AddRefed aPath JSObject* CanvasPath::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return Path2DBinding::Wrap(aCx, this, aGivenProto); + return Path2D_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/canvas/ImageBitmap.cpp b/dom/canvas/ImageBitmap.cpp index 5535ffb854c7..88a4df49a126 100644 --- a/dom/canvas/ImageBitmap.cpp +++ b/dom/canvas/ImageBitmap.cpp @@ -25,8 +25,8 @@ using namespace mozilla::gfx; using namespace mozilla::layers; -using mozilla::dom::HTMLMediaElementBinding::NETWORK_EMPTY; -using mozilla::dom::HTMLMediaElementBinding::HAVE_METADATA; +using mozilla::dom::HTMLMediaElement_Binding::NETWORK_EMPTY; +using mozilla::dom::HTMLMediaElement_Binding::HAVE_METADATA; namespace mozilla { namespace dom { @@ -543,7 +543,7 @@ ImageBitmap::~ImageBitmap() JSObject* ImageBitmap::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return ImageBitmapBinding::Wrap(aCx, this, aGivenProto); + return ImageBitmap_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/canvas/ImageBitmapRenderingContext.cpp b/dom/canvas/ImageBitmapRenderingContext.cpp index b923d04cd509..2da197a5cfbe 100644 --- a/dom/canvas/ImageBitmapRenderingContext.cpp +++ b/dom/canvas/ImageBitmapRenderingContext.cpp @@ -25,7 +25,7 @@ ImageBitmapRenderingContext::~ImageBitmapRenderingContext() JSObject* ImageBitmapRenderingContext::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return ImageBitmapRenderingContextBinding::Wrap(aCx, this, aGivenProto); + return ImageBitmapRenderingContext_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/canvas/ImageData.cpp b/dom/canvas/ImageData.cpp index d24fbca9504a..6b5e7fa02ab1 100644 --- a/dom/canvas/ImageData.cpp +++ b/dom/canvas/ImageData.cpp @@ -115,7 +115,7 @@ ImageData::DropData() bool ImageData::WrapObject(JSContext* aCx, JS::Handle aGivenProto, JS::MutableHandle aReflector) { - return ImageDataBinding::Wrap(aCx, this, aGivenProto, aReflector); + return ImageData_Binding::Wrap(aCx, this, aGivenProto, aReflector); } } // namespace dom diff --git a/dom/canvas/OffscreenCanvas.cpp b/dom/canvas/OffscreenCanvas.cpp index bbc8bdd6b71b..7c665bffeb6a 100644 --- a/dom/canvas/OffscreenCanvas.cpp +++ b/dom/canvas/OffscreenCanvas.cpp @@ -64,7 +64,7 @@ JSObject* OffscreenCanvas::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return OffscreenCanvasBinding::Wrap(aCx, this, aGivenProto); + return OffscreenCanvas_Binding::Wrap(aCx, this, aGivenProto); } /* static */ already_AddRefed diff --git a/dom/canvas/TextMetrics.h b/dom/canvas/TextMetrics.h index ca38b7a4ee95..ab39e6cae019 100644 --- a/dom/canvas/TextMetrics.h +++ b/dom/canvas/TextMetrics.h @@ -32,7 +32,7 @@ public: bool WrapObject(JSContext* aCx, JS::Handle aGivenProto, JS::MutableHandle aReflector) { - return TextMetricsBinding::Wrap(aCx, this, aGivenProto, aReflector); + return TextMetrics_Binding::Wrap(aCx, this, aGivenProto, aReflector); } private: diff --git a/dom/canvas/WebGL1Context.cpp b/dom/canvas/WebGL1Context.cpp index e4e93841fb9b..36130dd1df89 100644 --- a/dom/canvas/WebGL1Context.cpp +++ b/dom/canvas/WebGL1Context.cpp @@ -35,7 +35,7 @@ WebGL1Context::CreateFormatUsage(gl::GLContext* gl) const JSObject* WebGL1Context::WrapObject(JSContext* cx, JS::Handle givenProto) { - return dom::WebGLRenderingContextBinding::Wrap(cx, this, givenProto); + return dom::WebGLRenderingContext_Binding::Wrap(cx, this, givenProto); } } // namespace mozilla diff --git a/dom/canvas/WebGL2Context.cpp b/dom/canvas/WebGL2Context.cpp index 89e71c86fc49..556b5e11ba1d 100644 --- a/dom/canvas/WebGL2Context.cpp +++ b/dom/canvas/WebGL2Context.cpp @@ -50,7 +50,7 @@ WebGL2Context::Create() JSObject* WebGL2Context::WrapObject(JSContext* cx, JS::Handle givenProto) { - return dom::WebGL2RenderingContextBinding::Wrap(cx, this, givenProto); + return dom::WebGL2RenderingContext_Binding::Wrap(cx, this, givenProto); } //////////////////////////////////////////////////////////////////////////////// diff --git a/dom/canvas/WebGLActiveInfo.cpp b/dom/canvas/WebGLActiveInfo.cpp index e13f47c0aa68..1b2211570f16 100644 --- a/dom/canvas/WebGLActiveInfo.cpp +++ b/dom/canvas/WebGLActiveInfo.cpp @@ -121,7 +121,7 @@ WebGLActiveInfo::IsSampler() const JSObject* WebGLActiveInfo::WrapObject(JSContext* js, JS::Handle givenProto) { - return dom::WebGLActiveInfoBinding::Wrap(js, this, givenProto); + return dom::WebGLActiveInfo_Binding::Wrap(js, this, givenProto); } NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(WebGLActiveInfo) diff --git a/dom/canvas/WebGLBuffer.cpp b/dom/canvas/WebGLBuffer.cpp index ac110e42547e..da323b77eb27 100644 --- a/dom/canvas/WebGLBuffer.cpp +++ b/dom/canvas/WebGLBuffer.cpp @@ -422,7 +422,7 @@ WebGLBuffer::ResetLastUpdateFenceId() const JSObject* WebGLBuffer::WrapObject(JSContext* cx, JS::Handle givenProto) { - return dom::WebGLBufferBinding::Wrap(cx, this, givenProto); + return dom::WebGLBuffer_Binding::Wrap(cx, this, givenProto); } NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(WebGLBuffer) diff --git a/dom/canvas/WebGLExtensions.h b/dom/canvas/WebGLExtensions.h index 7966b65f071b..5bce344c1242 100644 --- a/dom/canvas/WebGLExtensions.h +++ b/dom/canvas/WebGLExtensions.h @@ -60,7 +60,7 @@ protected: #define IMPL_WEBGL_EXTENSION_GOOP(WebGLExtensionType, WebGLBindingType)\ JSObject* \ WebGLExtensionType::WrapObject(JSContext* cx, JS::Handle givenProto) { \ - return dom::WebGLBindingType##Binding::Wrap(cx, this, givenProto); \ + return dom::WebGLBindingType##_Binding::Wrap(cx, this, givenProto); \ } //// diff --git a/dom/canvas/WebGLFramebuffer.cpp b/dom/canvas/WebGLFramebuffer.cpp index 2f6a5bc30a15..07b9f950c61d 100644 --- a/dom/canvas/WebGLFramebuffer.cpp +++ b/dom/canvas/WebGLFramebuffer.cpp @@ -1939,7 +1939,7 @@ WebGLFramebuffer::BlitFramebuffer(WebGLContext* webgl, JSObject* WebGLFramebuffer::WrapObject(JSContext* cx, JS::Handle givenProto) { - return dom::WebGLFramebufferBinding::Wrap(cx, this, givenProto); + return dom::WebGLFramebuffer_Binding::Wrap(cx, this, givenProto); } inline void diff --git a/dom/canvas/WebGLProgram.cpp b/dom/canvas/WebGLProgram.cpp index 1941b7aa767b..cec1baa3158a 100644 --- a/dom/canvas/WebGLProgram.cpp +++ b/dom/canvas/WebGLProgram.cpp @@ -1709,7 +1709,7 @@ webgl::LinkedProgramInfo::MapFragDataName(const nsCString& userName, JSObject* WebGLProgram::WrapObject(JSContext* js, JS::Handle givenProto) { - return dom::WebGLProgramBinding::Wrap(js, this, givenProto); + return dom::WebGLProgram_Binding::Wrap(js, this, givenProto); } NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(WebGLProgram, mVertShader, mFragShader) diff --git a/dom/canvas/WebGLQuery.cpp b/dom/canvas/WebGLQuery.cpp index 39ed105d5fa7..9d0ab69ef45b 100644 --- a/dom/canvas/WebGLQuery.cpp +++ b/dom/canvas/WebGLQuery.cpp @@ -235,7 +235,7 @@ WebGLQuery::QueryCounter(const char* funcName, GLenum target) JSObject* WebGLQuery::WrapObject(JSContext* cx, JS::Handle givenProto) { - return dom::WebGLQueryBinding::Wrap(cx, this, givenProto); + return dom::WebGLQuery_Binding::Wrap(cx, this, givenProto); } NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(WebGLQuery) diff --git a/dom/canvas/WebGLRenderbuffer.cpp b/dom/canvas/WebGLRenderbuffer.cpp index bc4afdd40f1a..1105a8857e09 100644 --- a/dom/canvas/WebGLRenderbuffer.cpp +++ b/dom/canvas/WebGLRenderbuffer.cpp @@ -27,7 +27,7 @@ DepthFormatForDepthStencilEmu(gl::GLContext* gl) JSObject* WebGLRenderbuffer::WrapObject(JSContext* cx, JS::Handle givenProto) { - return dom::WebGLRenderbufferBinding::Wrap(cx, this, givenProto); + return dom::WebGLRenderbuffer_Binding::Wrap(cx, this, givenProto); } static GLuint diff --git a/dom/canvas/WebGLSampler.cpp b/dom/canvas/WebGLSampler.cpp index 64bc5d9f0742..7ca26f4a3bc4 100644 --- a/dom/canvas/WebGLSampler.cpp +++ b/dom/canvas/WebGLSampler.cpp @@ -49,7 +49,7 @@ WebGLSampler::GetParentObject() const JSObject* WebGLSampler::WrapObject(JSContext* cx, JS::Handle givenProto) { - return dom::WebGLSamplerBinding::Wrap(cx, this, givenProto); + return dom::WebGLSampler_Binding::Wrap(cx, this, givenProto); } static bool diff --git a/dom/canvas/WebGLShader.cpp b/dom/canvas/WebGLShader.cpp index f5b4efefa302..d7f25c26840b 100644 --- a/dom/canvas/WebGLShader.cpp +++ b/dom/canvas/WebGLShader.cpp @@ -427,7 +427,7 @@ WebGLShader::MapTransformFeedbackVaryings(const std::vector& varyings, JSObject* WebGLShader::WrapObject(JSContext* js, JS::Handle givenProto) { - return dom::WebGLShaderBinding::Wrap(js, this, givenProto); + return dom::WebGLShader_Binding::Wrap(js, this, givenProto); } size_t diff --git a/dom/canvas/WebGLShaderPrecisionFormat.cpp b/dom/canvas/WebGLShaderPrecisionFormat.cpp index f1590878b67e..623a5d712d58 100644 --- a/dom/canvas/WebGLShaderPrecisionFormat.cpp +++ b/dom/canvas/WebGLShaderPrecisionFormat.cpp @@ -15,7 +15,7 @@ WebGLShaderPrecisionFormat::WrapObject(JSContext* cx, JS::Handle givenProto, JS::MutableHandle reflector) { - return dom::WebGLShaderPrecisionFormatBinding::Wrap(cx, this, givenProto, reflector); + return dom::WebGLShaderPrecisionFormat_Binding::Wrap(cx, this, givenProto, reflector); } } // namespace mozilla diff --git a/dom/canvas/WebGLSync.cpp b/dom/canvas/WebGLSync.cpp index c851aca0de48..6d2025f61d3c 100644 --- a/dom/canvas/WebGLSync.cpp +++ b/dom/canvas/WebGLSync.cpp @@ -51,7 +51,7 @@ WebGLSync::MarkSignaled() const JSObject* WebGLSync::WrapObject(JSContext* cx, JS::Handle givenProto) { - return dom::WebGLSyncBinding::Wrap(cx, this, givenProto); + return dom::WebGLSync_Binding::Wrap(cx, this, givenProto); } NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(WebGLSync) diff --git a/dom/canvas/WebGLTexture.cpp b/dom/canvas/WebGLTexture.cpp index e220aad99859..f1462fa79ebf 100644 --- a/dom/canvas/WebGLTexture.cpp +++ b/dom/canvas/WebGLTexture.cpp @@ -121,7 +121,7 @@ WebGLTexture::ImageInfo::SetIsDataInitialized(bool isDataInitialized, WebGLTextu JSObject* WebGLTexture::WrapObject(JSContext* cx, JS::Handle givenProto) { - return dom::WebGLTextureBinding::Wrap(cx, this, givenProto); + return dom::WebGLTexture_Binding::Wrap(cx, this, givenProto); } WebGLTexture::WebGLTexture(WebGLContext* webgl, GLuint tex) diff --git a/dom/canvas/WebGLTransformFeedback.cpp b/dom/canvas/WebGLTransformFeedback.cpp index c602bacc0198..549b4386a825 100644 --- a/dom/canvas/WebGLTransformFeedback.cpp +++ b/dom/canvas/WebGLTransformFeedback.cpp @@ -208,7 +208,7 @@ WebGLTransformFeedback::AddBufferBindCounts(int8_t addVal) const JSObject* WebGLTransformFeedback::WrapObject(JSContext* cx, JS::Handle givenProto) { - return dom::WebGLTransformFeedbackBinding::Wrap(cx, this, givenProto); + return dom::WebGLTransformFeedback_Binding::Wrap(cx, this, givenProto); } NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(WebGLTransformFeedback, AddRef) diff --git a/dom/canvas/WebGLUniformLocation.cpp b/dom/canvas/WebGLUniformLocation.cpp index e5cf414ba003..fe00fb9e4dae 100644 --- a/dom/canvas/WebGLUniformLocation.cpp +++ b/dom/canvas/WebGLUniformLocation.cpp @@ -306,7 +306,7 @@ WebGLUniformLocation::GetUniform(JSContext* js) const JSObject* WebGLUniformLocation::WrapObject(JSContext* js, JS::Handle givenProto) { - return dom::WebGLUniformLocationBinding::Wrap(js, this, givenProto); + return dom::WebGLUniformLocation_Binding::Wrap(js, this, givenProto); } NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(WebGLUniformLocation) diff --git a/dom/canvas/WebGLVertexArray.cpp b/dom/canvas/WebGLVertexArray.cpp index e0c30ab51eb9..a1f2beb82a0c 100644 --- a/dom/canvas/WebGLVertexArray.cpp +++ b/dom/canvas/WebGLVertexArray.cpp @@ -17,7 +17,7 @@ namespace mozilla { JSObject* WebGLVertexArray::WrapObject(JSContext* cx, JS::Handle givenProto) { - return dom::WebGLVertexArrayObjectBinding::Wrap(cx, this, givenProto); + return dom::WebGLVertexArrayObject_Binding::Wrap(cx, this, givenProto); } WebGLVertexArray::WebGLVertexArray(WebGLContext* webgl) diff --git a/dom/canvas/WebGLVertexArrayObject.cpp b/dom/canvas/WebGLVertexArrayObject.cpp index 5d43fcb6c792..851ed6c1edf7 100644 --- a/dom/canvas/WebGLVertexArrayObject.cpp +++ b/dom/canvas/WebGLVertexArrayObject.cpp @@ -30,7 +30,7 @@ JSObject* WebGLVertexArrayObject::WrapObject(JSContext* cx, JS::Handle givenProto) { - return dom::WebGLVertexArrayObjectBinding::Wrap(cx, this, givenProto); + return dom::WebGLVertexArrayObject_Binding::Wrap(cx, this, givenProto); } } // namespace dom diff --git a/dom/canvas/test/webgl-conf/mochitest-errata.ini b/dom/canvas/test/webgl-conf/mochitest-errata.ini index c932586f5e29..a32ef77e56b3 100644 --- a/dom/canvas/test/webgl-conf/mochitest-errata.ini +++ b/dom/canvas/test/webgl-conf/mochitest-errata.ini @@ -1040,7 +1040,7 @@ skip-if = (os == 'mac' && debug) #19:53:21 INFO - r13 = 0x00007fff52570bd0 r14 = 0x0000000000001908 #19:53:21 INFO - r15 = 0x0000000000000000 rip = 0x000000010feb6cfe #19:53:21 INFO - Found by: call frame info -#19:53:21 INFO - 10 XUL!mozilla::dom::WebGLRenderingContextBinding::texImage2D(JSContext*, JS::Handle, mozilla::WebGLContext*, JSJitMethodCallArgs const&) [WebGLContext.h:6c8751f7f673a9751917d907e630d37abefe186b : 1231 + 0x55] +#19:53:21 INFO - 10 XUL!mozilla::dom::WebGLRenderingContext_Binding::texImage2D(JSContext*, JS::Handle, mozilla::WebGLContext*, JSJitMethodCallArgs const&) [WebGLContext.h:6c8751f7f673a9751917d907e630d37abefe186b : 1231 + 0x55] #19:53:21 INFO - rbx = 0x00007fff52570c60 rbp = 0x00007fff52570cc0 #19:53:21 INFO - rsp = 0x00007fff52570b30 r12 = 0x00007fff52570c38 #19:53:21 INFO - r13 = 0x00007fff52570cf8 r14 = 0x000000011c125000 diff --git a/dom/clients/api/Client.cpp b/dom/clients/api/Client.cpp index 2275ad696189..fee640d08298 100644 --- a/dom/clients/api/Client.cpp +++ b/dom/clients/api/Client.cpp @@ -74,9 +74,9 @@ JSObject* Client::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { if (mData->info().type() == ClientType::Window) { - return WindowClientBinding::Wrap(aCx, this, aGivenProto); + return WindowClient_Binding::Wrap(aCx, this, aGivenProto); } - return ClientBinding::Wrap(aCx, this, aGivenProto); + return Client_Binding::Wrap(aCx, this, aGivenProto); } nsIGlobalObject* diff --git a/dom/clients/api/Clients.cpp b/dom/clients/api/Clients.cpp index 220fcccf15cc..7011604cf454 100644 --- a/dom/clients/api/Clients.cpp +++ b/dom/clients/api/Clients.cpp @@ -41,7 +41,7 @@ Clients::Clients(nsIGlobalObject* aGlobal) JSObject* Clients::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return ClientsBinding::Wrap(aCx, this, aGivenProto); + return Clients_Binding::Wrap(aCx, this, aGivenProto); } nsIGlobalObject* diff --git a/dom/console/ConsoleInstance.cpp b/dom/console/ConsoleInstance.cpp index d34b31095a55..614c74453dde 100644 --- a/dom/console/ConsoleInstance.cpp +++ b/dom/console/ConsoleInstance.cpp @@ -110,7 +110,7 @@ ConsoleInstance::~ConsoleInstance() JSObject* ConsoleInstance::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return ConsoleInstanceBinding::Wrap(aCx, this, aGivenProto); + return ConsoleInstance_Binding::Wrap(aCx, this, aGivenProto); } #define METHOD(name, string) \ diff --git a/dom/credentialmanagement/Credential.cpp b/dom/credentialmanagement/Credential.cpp index 87cdcb8c6ea8..954c76b516b2 100644 --- a/dom/credentialmanagement/Credential.cpp +++ b/dom/credentialmanagement/Credential.cpp @@ -31,7 +31,7 @@ Credential::~Credential() JSObject* Credential::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return CredentialBinding::Wrap(aCx, this, aGivenProto); + return Credential_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/credentialmanagement/CredentialsContainer.cpp b/dom/credentialmanagement/CredentialsContainer.cpp index 6ec992b9a176..51446ec5f7ba 100644 --- a/dom/credentialmanagement/CredentialsContainer.cpp +++ b/dom/credentialmanagement/CredentialsContainer.cpp @@ -144,7 +144,7 @@ CredentialsContainer::EnsureWebAuthnManager() JSObject* CredentialsContainer::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return CredentialsContainerBinding::Wrap(aCx, this, aGivenProto); + return CredentialsContainer_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/crypto/CryptoKey.cpp b/dom/crypto/CryptoKey.cpp index 17d83a93bad1..b312282e4d13 100644 --- a/dom/crypto/CryptoKey.cpp +++ b/dom/crypto/CryptoKey.cpp @@ -163,7 +163,7 @@ CryptoKey::CryptoKey(nsIGlobalObject* aGlobal) JSObject* CryptoKey::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return CryptoKeyBinding::Wrap(aCx, this, aGivenProto); + return CryptoKey_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/encoding/TextDecoder.h b/dom/encoding/TextDecoder.h index 602d9e2beea0..ead71cfafadd 100644 --- a/dom/encoding/TextDecoder.h +++ b/dom/encoding/TextDecoder.h @@ -53,7 +53,7 @@ public: bool WrapObject(JSContext* aCx, JS::Handle aGivenProto, JS::MutableHandle aReflector) { - return TextDecoderBinding::Wrap(aCx, this, aGivenProto, aReflector); + return TextDecoder_Binding::Wrap(aCx, this, aGivenProto, aReflector); } /** diff --git a/dom/encoding/TextEncoder.h b/dom/encoding/TextEncoder.h index 30c846a50b1c..a0e6abd6d142 100644 --- a/dom/encoding/TextEncoder.h +++ b/dom/encoding/TextEncoder.h @@ -41,7 +41,7 @@ public: bool WrapObject(JSContext* aCx, JS::Handle aGivenProto, JS::MutableHandle aReflector) { - return TextEncoderBinding::Wrap(aCx, this, aGivenProto, aReflector); + return TextEncoder_Binding::Wrap(aCx, this, aGivenProto, aReflector); } protected: diff --git a/dom/events/AnimationEvent.h b/dom/events/AnimationEvent.h index 3dd58403a4de..d4cd11be5433 100644 --- a/dom/events/AnimationEvent.h +++ b/dom/events/AnimationEvent.h @@ -31,7 +31,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return AnimationEventBinding::Wrap(aCx, this, aGivenProto); + return AnimationEvent_Binding::Wrap(aCx, this, aGivenProto); } void GetAnimationName(nsAString& aAnimationName); diff --git a/dom/events/BeforeUnloadEvent.h b/dom/events/BeforeUnloadEvent.h index 3fd9bcce278b..c2de01bd411f 100644 --- a/dom/events/BeforeUnloadEvent.h +++ b/dom/events/BeforeUnloadEvent.h @@ -30,7 +30,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return BeforeUnloadEventBinding::Wrap(aCx, this, aGivenProto); + return BeforeUnloadEvent_Binding::Wrap(aCx, this, aGivenProto); } NS_INLINE_DECL_REFCOUNTING_INHERITED(BeforeUnloadEvent, Event) diff --git a/dom/events/ClipboardEvent.h b/dom/events/ClipboardEvent.h index 282c6d35fec9..9bc198c3b269 100644 --- a/dom/events/ClipboardEvent.h +++ b/dom/events/ClipboardEvent.h @@ -26,7 +26,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return ClipboardEventBinding::Wrap(aCx, this, aGivenProto); + return ClipboardEvent_Binding::Wrap(aCx, this, aGivenProto); } static already_AddRefed diff --git a/dom/events/CommandEvent.h b/dom/events/CommandEvent.h index 1a98afc807e3..fa8fe88d648e 100644 --- a/dom/events/CommandEvent.h +++ b/dom/events/CommandEvent.h @@ -25,7 +25,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return CommandEventBinding::Wrap(aCx, this, aGivenProto); + return CommandEvent_Binding::Wrap(aCx, this, aGivenProto); } void GetCommand(nsAString& aCommand); diff --git a/dom/events/CompositionEvent.h b/dom/events/CompositionEvent.h index 5adda2de3dd2..627371f1d352 100644 --- a/dom/events/CompositionEvent.h +++ b/dom/events/CompositionEvent.h @@ -35,7 +35,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return CompositionEventBinding::Wrap(aCx, this, aGivenProto); + return CompositionEvent_Binding::Wrap(aCx, this, aGivenProto); } void InitCompositionEvent(const nsAString& aType, diff --git a/dom/events/ConstructibleEventTarget.cpp b/dom/events/ConstructibleEventTarget.cpp index bed718422e38..053ea787b0d4 100644 --- a/dom/events/ConstructibleEventTarget.cpp +++ b/dom/events/ConstructibleEventTarget.cpp @@ -13,7 +13,7 @@ namespace dom { JSObject* ConstructibleEventTarget::WrapObject(JSContext* cx, JS::Handle aGivenProto) { - return EventTargetBinding::Wrap(cx, this, aGivenProto); + return EventTarget_Binding::Wrap(cx, this, aGivenProto); } } // namespace dom diff --git a/dom/events/CustomEvent.cpp b/dom/events/CustomEvent.cpp index 21b0e8fcbeca..f17e3148018a 100644 --- a/dom/events/CustomEvent.cpp +++ b/dom/events/CustomEvent.cpp @@ -66,7 +66,7 @@ CustomEvent::Constructor(const GlobalObject& aGlobal, JSObject* CustomEvent::WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) { - return mozilla::dom::CustomEventBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::CustomEvent_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/events/DataTransfer.cpp b/dom/events/DataTransfer.cpp index 0db0bf4f7084..3b324b88194a 100644 --- a/dom/events/DataTransfer.cpp +++ b/dom/events/DataTransfer.cpp @@ -209,7 +209,7 @@ DataTransfer::Constructor(const GlobalObject& aGlobal, ErrorResult& aRv) JSObject* DataTransfer::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return DataTransferBinding::Wrap(aCx, this, aGivenProto); + return DataTransfer_Binding::Wrap(aCx, this, aGivenProto); } void @@ -586,7 +586,7 @@ DataTransfer::PrincipalMaySetData(const nsAString& aType, void DataTransfer::TypesListMayHaveChanged() { - DataTransferBinding::ClearCachedTypesValue(this); + DataTransfer_Binding::ClearCachedTypesValue(this); } already_AddRefed diff --git a/dom/events/DataTransferItem.cpp b/dom/events/DataTransferItem.cpp index 9aa9e1aa7093..f32240df1cf6 100644 --- a/dom/events/DataTransferItem.cpp +++ b/dom/events/DataTransferItem.cpp @@ -54,7 +54,7 @@ NS_INTERFACE_MAP_END JSObject* DataTransferItem::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return DataTransferItemBinding::Wrap(aCx, this, aGivenProto); + return DataTransferItem_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/events/DataTransferItemList.cpp b/dom/events/DataTransferItemList.cpp index 72e0f1a87c27..e26b49dd5c4f 100644 --- a/dom/events/DataTransferItemList.cpp +++ b/dom/events/DataTransferItemList.cpp @@ -37,7 +37,7 @@ JSObject* DataTransferItemList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return DataTransferItemListBinding::Wrap(aCx, this, aGivenProto); + return DataTransferItemList_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/events/DeviceMotionEvent.h b/dom/events/DeviceMotionEvent.h index 8449c26c9d9d..9a28c59a83d6 100644 --- a/dom/events/DeviceMotionEvent.h +++ b/dom/events/DeviceMotionEvent.h @@ -32,7 +32,7 @@ public: virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override { - return DeviceRotationRateBinding::Wrap(aCx, this, aGivenProto); + return DeviceRotationRate_Binding::Wrap(aCx, this, aGivenProto); } Nullable GetAlpha() const { return mAlpha; } @@ -65,7 +65,7 @@ public: virtual JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override { - return DeviceAccelerationBinding::Wrap(aCx, this, aGivenProto); + return DeviceAcceleration_Binding::Wrap(aCx, this, aGivenProto); } Nullable GetX() const { return mX; } @@ -97,7 +97,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return DeviceMotionEventBinding::Wrap(aCx, this, aGivenProto); + return DeviceMotionEvent_Binding::Wrap(aCx, this, aGivenProto); } DeviceAcceleration* GetAcceleration() const diff --git a/dom/events/DragEvent.cpp b/dom/events/DragEvent.cpp index f7df05c4b161..3556dd910da6 100644 --- a/dom/events/DragEvent.cpp +++ b/dom/events/DragEvent.cpp @@ -27,7 +27,7 @@ DragEvent::DragEvent(EventTarget* aOwner, mEventIsInternal = true; mEvent->mTime = PR_Now(); mEvent->mRefPoint = LayoutDeviceIntPoint(0, 0); - mEvent->AsMouseEvent()->inputSource = MouseEventBinding::MOZ_SOURCE_UNKNOWN; + mEvent->AsMouseEvent()->inputSource = MouseEvent_Binding::MOZ_SOURCE_UNKNOWN; } } diff --git a/dom/events/DragEvent.h b/dom/events/DragEvent.h index dcf3f1b96f45..dfda49b5ac91 100644 --- a/dom/events/DragEvent.h +++ b/dom/events/DragEvent.h @@ -27,7 +27,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return DragEventBinding::Wrap(aCx, this, aGivenProto); + return DragEvent_Binding::Wrap(aCx, this, aGivenProto); } DragEvent* AsDragEvent() override diff --git a/dom/events/Event.cpp b/dom/events/Event.cpp index a97e09a1ee9d..99e970664df7 100644 --- a/dom/events/Event.cpp +++ b/dom/events/Event.cpp @@ -219,7 +219,7 @@ Event::WrapObject(JSContext* aCx, JS::Handle aGivenProto) JSObject* Event::WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) { - return EventBinding::Wrap(aCx, this, aGivenProto); + return Event_Binding::Wrap(aCx, this, aGivenProto); } void @@ -357,15 +357,15 @@ Event::EventPhase() const if ((mEvent->mCurrentTarget && mEvent->mCurrentTarget == mEvent->mTarget) || mEvent->mFlags.InTargetPhase()) { - return EventBinding::AT_TARGET; + return Event_Binding::AT_TARGET; } if (mEvent->mFlags.mInCapturePhase) { - return EventBinding::CAPTURING_PHASE; + return Event_Binding::CAPTURING_PHASE; } if (mEvent->mFlags.mInBubblingPhase) { - return EventBinding::BUBBLING_PHASE; + return Event_Binding::BUBBLING_PHASE; } - return EventBinding::NONE; + return Event_Binding::NONE; } void diff --git a/dom/events/EventStateManager.cpp b/dom/events/EventStateManager.cpp index ab3fe9e7ecfb..58388e9cfd62 100644 --- a/dom/events/EventStateManager.cpp +++ b/dom/events/EventStateManager.cpp @@ -1912,7 +1912,7 @@ EventStateManager::GenerateDragGesture(nsPresContext* aPresContext, if (aEvent->AsMouseEvent()) { startEvent.inputSource = aEvent->AsMouseEvent()->inputSource; } else if (aEvent->AsTouchEvent()) { - startEvent.inputSource = MouseEventBinding::MOZ_SOURCE_TOUCH; + startEvent.inputSource = MouseEvent_Binding::MOZ_SOURCE_TOUCH; } else { MOZ_ASSERT(false); } @@ -2345,27 +2345,27 @@ EventStateManager::DispatchLegacyMouseScrollEvents(nsIFrame* aTargetFrame, // rare cases. int32_t scrollDeltaX, scrollDeltaY, pixelDeltaX, pixelDeltaY; switch (aEvent->mDeltaMode) { - case WheelEventBinding::DOM_DELTA_PAGE: + case WheelEvent_Binding::DOM_DELTA_PAGE: scrollDeltaX = !aEvent->mLineOrPageDeltaX ? 0 : - (aEvent->mLineOrPageDeltaX > 0 ? UIEventBinding::SCROLL_PAGE_DOWN : - UIEventBinding::SCROLL_PAGE_UP); + (aEvent->mLineOrPageDeltaX > 0 ? UIEvent_Binding::SCROLL_PAGE_DOWN : + UIEvent_Binding::SCROLL_PAGE_UP); scrollDeltaY = !aEvent->mLineOrPageDeltaY ? 0 : - (aEvent->mLineOrPageDeltaY > 0 ? UIEventBinding::SCROLL_PAGE_DOWN : - UIEventBinding::SCROLL_PAGE_UP); + (aEvent->mLineOrPageDeltaY > 0 ? UIEvent_Binding::SCROLL_PAGE_DOWN : + UIEvent_Binding::SCROLL_PAGE_UP); pixelDeltaX = RoundDown(aEvent->mDeltaX * scrollAmountInCSSPixels.width); pixelDeltaY = RoundDown(aEvent->mDeltaY * scrollAmountInCSSPixels.height); break; - case WheelEventBinding::DOM_DELTA_LINE: + case WheelEvent_Binding::DOM_DELTA_LINE: scrollDeltaX = aEvent->mLineOrPageDeltaX; scrollDeltaY = aEvent->mLineOrPageDeltaY; pixelDeltaX = RoundDown(aEvent->mDeltaX * scrollAmountInCSSPixels.width); pixelDeltaY = RoundDown(aEvent->mDeltaY * scrollAmountInCSSPixels.height); break; - case WheelEventBinding::DOM_DELTA_PIXEL: + case WheelEvent_Binding::DOM_DELTA_PIXEL: scrollDeltaX = aEvent->mLineOrPageDeltaX; scrollDeltaY = aEvent->mLineOrPageDeltaY; pixelDeltaX = RoundDown(aEvent->mDeltaX); @@ -2746,7 +2746,7 @@ EventStateManager::GetScrollAmount(nsPresContext* aPresContext, MOZ_ASSERT(aPresContext); MOZ_ASSERT(aEvent); - bool isPage = (aEvent->mDeltaMode == WheelEventBinding::DOM_DELTA_PAGE); + bool isPage = (aEvent->mDeltaMode == WheelEvent_Binding::DOM_DELTA_PAGE); if (aScrollableFrame) { return isPage ? aScrollableFrame->GetPageScrollAmount() : aScrollableFrame->GetLineScrollAmount(); @@ -2806,15 +2806,15 @@ EventStateManager::DoScrollText(nsIScrollableFrame* aScrollableFrame, nsIScrollbarMediator::ScrollSnapMode snapMode = nsIScrollbarMediator::DISABLE_SNAP; nsAtom* origin = nullptr; switch (aEvent->mDeltaMode) { - case WheelEventBinding::DOM_DELTA_LINE: + case WheelEvent_Binding::DOM_DELTA_LINE: origin = nsGkAtoms::mouseWheel; snapMode = nsIScrollableFrame::ENABLE_SNAP; break; - case WheelEventBinding::DOM_DELTA_PAGE: + case WheelEvent_Binding::DOM_DELTA_PAGE: origin = nsGkAtoms::pages; snapMode = nsIScrollableFrame::ENABLE_SNAP; break; - case WheelEventBinding::DOM_DELTA_PIXEL: + case WheelEvent_Binding::DOM_DELTA_PIXEL: origin = nsGkAtoms::pixels; break; default: @@ -2841,7 +2841,7 @@ EventStateManager::DoScrollText(nsIScrollableFrame* aScrollableFrame, } bool isDeltaModePixel = - (aEvent->mDeltaMode == WheelEventBinding::DOM_DELTA_PIXEL); + (aEvent->mDeltaMode == WheelEvent_Binding::DOM_DELTA_PIXEL); nsIScrollableFrame::ScrollMode mode; switch (aEvent->mScrollType) { @@ -3316,7 +3316,7 @@ EventStateManager::PostHandleEvent(nsPresContext* aPresContext, uint32_t flags = nsIFocusManager::FLAG_BYMOUSE | nsIFocusManager::FLAG_NOSCROLL; // If this was a touch-generated event, pass that information: - if (mouseEvent->inputSource == MouseEventBinding::MOZ_SOURCE_TOUCH) { + if (mouseEvent->inputSource == MouseEvent_Binding::MOZ_SOURCE_TOUCH) { flags |= nsIFocusManager::FLAG_BYTOUCH; } fm->SetFocus(newFocus->AsElement(), flags); @@ -3392,7 +3392,7 @@ EventStateManager::PostHandleEvent(nsPresContext* aPresContext, PointerEventHandler::ImplicitlyReleasePointerCapture(pointerEvent); if (pointerEvent->mMessage == ePointerCancel || - pointerEvent->inputSource == MouseEventBinding::MOZ_SOURCE_TOUCH) { + pointerEvent->inputSource == MouseEvent_Binding::MOZ_SOURCE_TOUCH) { // After pointercancel, pointer becomes invalid so we can remove relevant // helper from table. Regarding pointerup with non-hoverable device, the // pointer also becomes invalid. Hoverable (mouse/pen) pointers are valid @@ -5826,7 +5826,7 @@ EventStateManager::DeltaAccumulator::InitLineOrPageDelta( mX += aEvent->mDeltaX; mY += aEvent->mDeltaY; - if (mHandlingDeltaMode == WheelEventBinding::DOM_DELTA_PIXEL) { + if (mHandlingDeltaMode == WheelEvent_Binding::DOM_DELTA_PIXEL) { // Records pixel delta values and init mLineOrPageDeltaX and // mLineOrPageDeltaY for wheel events which are caused by pixel only // devices. Ignore mouse wheel transaction for computing this. The @@ -5880,12 +5880,12 @@ EventStateManager::DeltaAccumulator::ComputeScrollAmountForDefaultAction( // system settings, allow to override the system speed. bool allowScrollSpeedOverride = (!aEvent->mCustomizedByUserPrefs && - aEvent->mDeltaMode == WheelEventBinding::DOM_DELTA_LINE); + aEvent->mDeltaMode == WheelEvent_Binding::DOM_DELTA_LINE); DeltaValues acceleratedDelta = WheelTransaction::AccelerateWheelDelta(aEvent, allowScrollSpeedOverride); nsIntPoint result(0, 0); - if (aEvent->mDeltaMode == WheelEventBinding::DOM_DELTA_PIXEL) { + if (aEvent->mDeltaMode == WheelEvent_Binding::DOM_DELTA_PIXEL) { mPendingScrollAmountX += acceleratedDelta.deltaX; mPendingScrollAmountY += acceleratedDelta.deltaY; } else { diff --git a/dom/events/FocusEvent.h b/dom/events/FocusEvent.h index f236388bdeaa..b97742b2bfdd 100644 --- a/dom/events/FocusEvent.h +++ b/dom/events/FocusEvent.h @@ -20,7 +20,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return FocusEventBinding::Wrap(aCx, this, aGivenProto); + return FocusEvent_Binding::Wrap(aCx, this, aGivenProto); } FocusEvent(EventTarget* aOwner, diff --git a/dom/events/IMEStateManager.cpp b/dom/events/IMEStateManager.cpp index fc0d59e2b332..8bbc182cf4c1 100644 --- a/dom/events/IMEStateManager.cpp +++ b/dom/events/IMEStateManager.cpp @@ -844,7 +844,7 @@ IMEStateManager::OnClickInEditor(nsPresContext* aPresContext, } InputContextAction::Cause cause = - aMouseEvent->inputSource == MouseEventBinding::MOZ_SOURCE_TOUCH ? + aMouseEvent->inputSource == MouseEvent_Binding::MOZ_SOURCE_TOUCH ? InputContextAction::CAUSE_TOUCH : InputContextAction::CAUSE_MOUSE; InputContextAction action(cause, InputContextAction::FOCUS_NOT_CHANGED); diff --git a/dom/events/ImageCaptureError.cpp b/dom/events/ImageCaptureError.cpp index c68adfa859f8..47b6ae5b67ef 100644 --- a/dom/events/ImageCaptureError.cpp +++ b/dom/events/ImageCaptureError.cpp @@ -40,7 +40,7 @@ ImageCaptureError::GetParentObject() const JSObject* ImageCaptureError::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return ImageCaptureErrorBinding::Wrap(aCx, this, aGivenProto); + return ImageCaptureError_Binding::Wrap(aCx, this, aGivenProto); } uint16_t diff --git a/dom/events/InputEvent.h b/dom/events/InputEvent.h index ff5e1ffff499..3cf2506b0e0c 100644 --- a/dom/events/InputEvent.h +++ b/dom/events/InputEvent.h @@ -30,7 +30,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return InputEventBinding::Wrap(aCx, this, aGivenProto); + return InputEvent_Binding::Wrap(aCx, this, aGivenProto); } bool IsComposing(); diff --git a/dom/events/KeyboardEvent.cpp b/dom/events/KeyboardEvent.cpp index 407532c6a823..c26a894439d9 100644 --- a/dom/events/KeyboardEvent.cpp +++ b/dom/events/KeyboardEvent.cpp @@ -360,7 +360,7 @@ KeyboardEvent::ShouldResistFingerprinting(CallerType aCallerType) mEvent->mFlags.mInSystemGroup || !nsContentUtils::ShouldResistFingerprinting() || mEvent->AsKeyboardEvent()->mLocation == - KeyboardEventBinding::DOM_KEY_LOCATION_NUMPAD) { + KeyboardEvent_Binding::DOM_KEY_LOCATION_NUMPAD) { return false; } diff --git a/dom/events/KeyboardEvent.h b/dom/events/KeyboardEvent.h index 213f1b779f22..f1e400c2dd8d 100644 --- a/dom/events/KeyboardEvent.h +++ b/dom/events/KeyboardEvent.h @@ -39,7 +39,7 @@ public: WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return KeyboardEventBinding::Wrap(aCx, this, aGivenProto); + return KeyboardEvent_Binding::Wrap(aCx, this, aGivenProto); } bool AltKey(CallerType aCallerType = CallerType::System); diff --git a/dom/events/MessageEvent.cpp b/dom/events/MessageEvent.cpp index 848c4217b594..e450f3def54a 100644 --- a/dom/events/MessageEvent.cpp +++ b/dom/events/MessageEvent.cpp @@ -61,7 +61,7 @@ MessageEvent::~MessageEvent() JSObject* MessageEvent::WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) { - return mozilla::dom::MessageEventBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::MessageEvent_Binding::Wrap(aCx, this, aGivenProto); } void @@ -177,7 +177,7 @@ MessageEvent::InitMessageEvent(JSContext* aCx, const nsAString& aType, mPorts.Clear(); mPorts.AppendElements(aPorts); - MessageEventBinding::ClearCachedPortsValue(this); + MessageEvent_Binding::ClearCachedPortsValue(this); } void diff --git a/dom/events/MouseEvent.cpp b/dom/events/MouseEvent.cpp index e2bd6be5f4d1..bb273a999f68 100644 --- a/dom/events/MouseEvent.cpp +++ b/dom/events/MouseEvent.cpp @@ -33,7 +33,7 @@ MouseEvent::MouseEvent(EventTarget* aOwner, mEventIsInternal = true; mEvent->mTime = PR_Now(); mEvent->mRefPoint = LayoutDeviceIntPoint(0, 0); - mouseEvent->inputSource = MouseEventBinding::MOZ_SOURCE_UNKNOWN; + mouseEvent->inputSource = MouseEvent_Binding::MOZ_SOURCE_UNKNOWN; } if (mouseEvent) { diff --git a/dom/events/MouseEvent.h b/dom/events/MouseEvent.h index 75678934ead1..167a246196e4 100644 --- a/dom/events/MouseEvent.h +++ b/dom/events/MouseEvent.h @@ -26,7 +26,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return MouseEventBinding::Wrap(aCx, this, aGivenProto); + return MouseEvent_Binding::Wrap(aCx, this, aGivenProto); } virtual MouseEvent* AsMouseEvent() override diff --git a/dom/events/MouseScrollEvent.cpp b/dom/events/MouseScrollEvent.cpp index 66c16dbff814..bbbbf9469cd4 100644 --- a/dom/events/MouseScrollEvent.cpp +++ b/dom/events/MouseScrollEvent.cpp @@ -26,7 +26,7 @@ MouseScrollEvent::MouseScrollEvent(EventTarget* aOwner, mEvent->mTime = PR_Now(); mEvent->mRefPoint = LayoutDeviceIntPoint(0, 0); static_cast(mEvent)->inputSource = - MouseEventBinding::MOZ_SOURCE_UNKNOWN; + MouseEvent_Binding::MOZ_SOURCE_UNKNOWN; } mDetail = mEvent->AsMouseScrollEvent()->mDelta; @@ -57,15 +57,15 @@ MouseScrollEvent::InitMouseScrollEvent(const nsAString& aType, aCtrlKey, aAltKey, aShiftKey, aMetaKey, aButton, aRelatedTarget); mEvent->AsMouseScrollEvent()->mIsHorizontal = - (aAxis == MouseScrollEventBinding::HORIZONTAL_AXIS); + (aAxis == MouseScrollEvent_Binding::HORIZONTAL_AXIS); } int32_t MouseScrollEvent::Axis() { return mEvent->AsMouseScrollEvent()->mIsHorizontal ? - MouseScrollEventBinding::HORIZONTAL_AXIS : - MouseScrollEventBinding::VERTICAL_AXIS; + MouseScrollEvent_Binding::HORIZONTAL_AXIS : + MouseScrollEvent_Binding::VERTICAL_AXIS; } } // namespace dom diff --git a/dom/events/MouseScrollEvent.h b/dom/events/MouseScrollEvent.h index 555d2c747456..4f4266a6dbe1 100644 --- a/dom/events/MouseScrollEvent.h +++ b/dom/events/MouseScrollEvent.h @@ -24,7 +24,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return MouseScrollEventBinding::Wrap(aCx, this, aGivenProto); + return MouseScrollEvent_Binding::Wrap(aCx, this, aGivenProto); } int32_t Axis(); diff --git a/dom/events/MutationEvent.h b/dom/events/MutationEvent.h index e8c031bfa5b2..d57b15ea8f04 100644 --- a/dom/events/MutationEvent.h +++ b/dom/events/MutationEvent.h @@ -26,7 +26,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return MutationEventBinding::Wrap(aCx, this, aGivenProto); + return MutationEvent_Binding::Wrap(aCx, this, aGivenProto); } void GetPrevValue(nsAString& aPrevValue) const; diff --git a/dom/events/NotifyPaintEvent.h b/dom/events/NotifyPaintEvent.h index 515a9d189d39..140977ac4526 100644 --- a/dom/events/NotifyPaintEvent.h +++ b/dom/events/NotifyPaintEvent.h @@ -39,7 +39,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return NotifyPaintEventBinding::Wrap(aCx, this, aGivenProto); + return NotifyPaintEvent_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed ClientRects(SystemCallerGuarantee aGuarantee); diff --git a/dom/events/PaintRequest.cpp b/dom/events/PaintRequest.cpp index 858951afbf73..df3d167fbbfe 100644 --- a/dom/events/PaintRequest.cpp +++ b/dom/events/PaintRequest.cpp @@ -30,7 +30,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(PaintRequest) /* virtual */ JSObject* PaintRequest::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PaintRequestBinding::Wrap(aCx, this, aGivenProto); + return PaintRequest_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed @@ -58,7 +58,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(PaintRequestList) JSObject* PaintRequestList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PaintRequestListBinding::Wrap(aCx, this, aGivenProto); + return PaintRequestList_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/events/PointerEvent.cpp b/dom/events/PointerEvent.cpp index 71af42977671..7df2c8216c31 100644 --- a/dom/events/PointerEvent.cpp +++ b/dom/events/PointerEvent.cpp @@ -32,7 +32,7 @@ PointerEvent::PointerEvent(EventTarget* aOwner, mEventIsInternal = true; mEvent->mTime = PR_Now(); mEvent->mRefPoint = LayoutDeviceIntPoint(0, 0); - mouseEvent->inputSource = MouseEventBinding::MOZ_SOURCE_UNKNOWN; + mouseEvent->inputSource = MouseEvent_Binding::MOZ_SOURCE_UNKNOWN; } // 5.2 Pointer Event types, for all pointer events, |detail| attribute SHOULD // be 0. @@ -43,36 +43,36 @@ JSObject* PointerEvent::WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) { - return PointerEventBinding::Wrap(aCx, this, aGivenProto); + return PointerEvent_Binding::Wrap(aCx, this, aGivenProto); } static uint16_t ConvertStringToPointerType(const nsAString& aPointerTypeArg) { if (aPointerTypeArg.EqualsLiteral("mouse")) { - return MouseEventBinding::MOZ_SOURCE_MOUSE; + return MouseEvent_Binding::MOZ_SOURCE_MOUSE; } if (aPointerTypeArg.EqualsLiteral("pen")) { - return MouseEventBinding::MOZ_SOURCE_PEN; + return MouseEvent_Binding::MOZ_SOURCE_PEN; } if (aPointerTypeArg.EqualsLiteral("touch")) { - return MouseEventBinding::MOZ_SOURCE_TOUCH; + return MouseEvent_Binding::MOZ_SOURCE_TOUCH; } - return MouseEventBinding::MOZ_SOURCE_UNKNOWN; + return MouseEvent_Binding::MOZ_SOURCE_UNKNOWN; } void ConvertPointerTypeToString(uint16_t aPointerTypeSrc, nsAString& aPointerTypeDest) { switch (aPointerTypeSrc) { - case MouseEventBinding::MOZ_SOURCE_MOUSE: + case MouseEvent_Binding::MOZ_SOURCE_MOUSE: aPointerTypeDest.AssignLiteral("mouse"); break; - case MouseEventBinding::MOZ_SOURCE_PEN: + case MouseEvent_Binding::MOZ_SOURCE_PEN: aPointerTypeDest.AssignLiteral("pen"); break; - case MouseEventBinding::MOZ_SOURCE_TOUCH: + case MouseEvent_Binding::MOZ_SOURCE_TOUCH: aPointerTypeDest.AssignLiteral("touch"); break; default: diff --git a/dom/events/PointerEventHandler.cpp b/dom/events/PointerEventHandler.cpp index 75cc53aecb9d..a49096ece818 100644 --- a/dom/events/PointerEventHandler.cpp +++ b/dom/events/PointerEventHandler.cpp @@ -116,7 +116,7 @@ PointerEventHandler::UpdateActivePointerState(WidgetMouseEvent* aEvent) case ePointerUp: // In this case we remove information about pointer or turn off active state if (WidgetPointerEvent* pointerEvent = aEvent->AsPointerEvent()) { - if(pointerEvent->inputSource != MouseEventBinding::MOZ_SOURCE_TOUCH) { + if(pointerEvent->inputSource != MouseEvent_Binding::MOZ_SOURCE_TOUCH) { sActivePointersIds->Put(pointerEvent->pointerId, new PointerInfo(false, pointerEvent->inputSource, @@ -141,7 +141,7 @@ PointerEventHandler::SetPointerCaptureById(uint32_t aPointerId, nsIContent* aContent) { MOZ_ASSERT(aContent); - if (MouseEventBinding::MOZ_SOURCE_MOUSE == GetPointerType(aPointerId)) { + if (MouseEvent_Binding::MOZ_SOURCE_MOUSE == GetPointerType(aPointerId)) { nsIPresShell::SetCapturingContent(aContent, CAPTURE_PREVENTDRAG); } @@ -166,7 +166,7 @@ PointerEventHandler::ReleasePointerCaptureById(uint32_t aPointerId) { PointerCaptureInfo* pointerCaptureInfo = GetPointerCaptureInfo(aPointerId); if (pointerCaptureInfo && pointerCaptureInfo->mPendingContent) { - if (MouseEventBinding::MOZ_SOURCE_MOUSE == GetPointerType(aPointerId)) { + if (MouseEvent_Binding::MOZ_SOURCE_MOUSE == GetPointerType(aPointerId)) { nsIPresShell::SetCapturingContent(nullptr, CAPTURE_PREVENTDRAG); } pointerCaptureInfo->mPendingContent = nullptr; @@ -295,7 +295,7 @@ PointerEventHandler::ImplicitlyCapturePointer(nsIFrame* aFrame, WidgetPointerEvent* pointerEvent = aEvent->AsPointerEvent(); NS_WARNING_ASSERTION(pointerEvent, "Call ImplicitlyCapturePointer with non-pointer event"); - if (pointerEvent->inputSource != MouseEventBinding::MOZ_SOURCE_TOUCH) { + if (pointerEvent->inputSource != MouseEvent_Binding::MOZ_SOURCE_TOUCH) { // We only implicitly capture the pointer for touch device. return; } @@ -474,7 +474,7 @@ PointerEventHandler::InitPointerEventFromTouch( aPointerEvent->mFlags = aTouchEvent->mFlags; aPointerEvent->button = button; aPointerEvent->buttons = buttons; - aPointerEvent->inputSource = MouseEventBinding::MOZ_SOURCE_TOUCH; + aPointerEvent->inputSource = MouseEvent_Binding::MOZ_SOURCE_TOUCH; } /* static */ void @@ -607,7 +607,7 @@ PointerEventHandler::GetPointerType(uint32_t aPointerId) if (sActivePointersIds->Get(aPointerId, &pointerInfo) && pointerInfo) { return pointerInfo->mPointerType; } - return MouseEventBinding::MOZ_SOURCE_UNKNOWN; + return MouseEvent_Binding::MOZ_SOURCE_UNKNOWN; } /* static */ bool diff --git a/dom/events/PointerEventHandler.h b/dom/events/PointerEventHandler.h index 16fbaf78f9b2..b98e2bb0d5be 100644 --- a/dom/events/PointerEventHandler.h +++ b/dom/events/PointerEventHandler.h @@ -172,7 +172,7 @@ public: private: // GetPointerType returns pointer type like mouse, pen or touch for pointer // event with pointerId. The return value must be one of - // MouseEventBinding::MOZ_SOURCE_* + // MouseEvent_Binding::MOZ_SOURCE_* static uint16_t GetPointerType(uint32_t aPointerId); // GetPointerPrimaryState returns state of attribute isPrimary for pointer diff --git a/dom/events/ScrollAreaEvent.h b/dom/events/ScrollAreaEvent.h index 926c2a8c6dcd..af2d97b9f83a 100644 --- a/dom/events/ScrollAreaEvent.h +++ b/dom/events/ScrollAreaEvent.h @@ -31,7 +31,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return ScrollAreaEventBinding::Wrap(aCx, this, aGivenProto); + return ScrollAreaEvent_Binding::Wrap(aCx, this, aGivenProto); } float X() const diff --git a/dom/events/SimpleGestureEvent.cpp b/dom/events/SimpleGestureEvent.cpp index d2e2705569db..be1b54ab72db 100644 --- a/dom/events/SimpleGestureEvent.cpp +++ b/dom/events/SimpleGestureEvent.cpp @@ -30,7 +30,7 @@ SimpleGestureEvent::SimpleGestureEvent(EventTarget* aOwner, mEvent->mTime = PR_Now(); mEvent->mRefPoint = LayoutDeviceIntPoint(0, 0); static_cast(mEvent)->inputSource = - MouseEventBinding::MOZ_SOURCE_UNKNOWN; + MouseEvent_Binding::MOZ_SOURCE_UNKNOWN; } } diff --git a/dom/events/SimpleGestureEvent.h b/dom/events/SimpleGestureEvent.h index 62895e04d60b..694ee9fe0e45 100644 --- a/dom/events/SimpleGestureEvent.h +++ b/dom/events/SimpleGestureEvent.h @@ -27,7 +27,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return SimpleGestureEventBinding::Wrap(aCx, this, aGivenProto); + return SimpleGestureEvent_Binding::Wrap(aCx, this, aGivenProto); } uint32_t AllowedDirections() const; diff --git a/dom/events/SpeechRecognitionError.h b/dom/events/SpeechRecognitionError.h index ef43feffd133..a73312e11942 100644 --- a/dom/events/SpeechRecognitionError.h +++ b/dom/events/SpeechRecognitionError.h @@ -29,7 +29,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return mozilla::dom::SpeechRecognitionErrorBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::SpeechRecognitionError_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/events/StorageEvent.cpp b/dom/events/StorageEvent.cpp index 2c79d12b868e..dbb1d0b0a8e8 100644 --- a/dom/events/StorageEvent.cpp +++ b/dom/events/StorageEvent.cpp @@ -47,7 +47,7 @@ StorageEvent::AsStorageEvent() JSObject* StorageEvent::WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) { - return StorageEventBinding::Wrap(aCx, this, aGivenProto); + return StorageEvent_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/events/TextClause.cpp b/dom/events/TextClause.cpp index eb63e1a83d38..ed1ce1bd96f1 100644 --- a/dom/events/TextClause.cpp +++ b/dom/events/TextClause.cpp @@ -41,7 +41,7 @@ TextClause::TextClause(nsPIDOMWindowInner* aOwner, const TextRange& aRange, JSObject* TextClause::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return TextClauseBinding::Wrap(aCx, this, aGivenProto); + return TextClause_Binding::Wrap(aCx, this, aGivenProto); } TextClause::~TextClause() {} diff --git a/dom/events/Touch.cpp b/dom/events/Touch.cpp index e69523c540cf..55d7f3f6aada 100644 --- a/dom/events/Touch.cpp +++ b/dom/events/Touch.cpp @@ -239,7 +239,7 @@ Touch::Equals(Touch* aTouch) JSObject* Touch::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return TouchBinding::Wrap(aCx, this, aGivenProto); + return Touch_Binding::Wrap(aCx, this, aGivenProto); } // Parent ourselves to the global of the target. This achieves the desirable diff --git a/dom/events/TouchEvent.cpp b/dom/events/TouchEvent.cpp index 493214c26d25..3d037cf76377 100644 --- a/dom/events/TouchEvent.cpp +++ b/dom/events/TouchEvent.cpp @@ -35,7 +35,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(TouchList) JSObject* TouchList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return TouchListBinding::Wrap(aCx, this, aGivenProto); + return TouchList_Binding::Wrap(aCx, this, aGivenProto); } // static diff --git a/dom/events/TouchEvent.h b/dom/events/TouchEvent.h index 11c6d3079b51..15a6169ee143 100644 --- a/dom/events/TouchEvent.h +++ b/dom/events/TouchEvent.h @@ -94,7 +94,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return TouchEventBinding::Wrap(aCx, this, aGivenProto); + return TouchEvent_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/events/TransitionEvent.h b/dom/events/TransitionEvent.h index 1817cdbdd804..baf2b20de4b8 100644 --- a/dom/events/TransitionEvent.h +++ b/dom/events/TransitionEvent.h @@ -31,7 +31,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return TransitionEventBinding::Wrap(aCx, this, aGivenProto); + return TransitionEvent_Binding::Wrap(aCx, this, aGivenProto); } void GetPropertyName(nsAString& aPropertyName) const; diff --git a/dom/events/UIEvent.h b/dom/events/UIEvent.h index 12b88bc737e5..b3fc1eb7e6ad 100644 --- a/dom/events/UIEvent.h +++ b/dom/events/UIEvent.h @@ -42,7 +42,7 @@ public: WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return UIEventBinding::Wrap(aCx, this, aGivenProto); + return UIEvent_Binding::Wrap(aCx, this, aGivenProto); } UIEvent* AsUIEvent() override diff --git a/dom/events/VirtualKeyCodeList.h b/dom/events/VirtualKeyCodeList.h index 6660182fe7cd..34e632a214c0 100644 --- a/dom/events/VirtualKeyCodeList.h +++ b/dom/events/VirtualKeyCodeList.h @@ -11,7 +11,7 @@ * * It must have two arguments, (aDOMKeyName, aDOMKeyCode) * aDOMKeyName is a key name in DOM. - * aDOMKeyCode is one of mozilla::dom::KeyboardEventBinding::DOM_VK_*. + * aDOMKeyCode is one of mozilla::dom::KeyboardEvent_Binding::DOM_VK_*. * * Optionally, you can define NS_DISALLOW_SAME_KEYCODE. * @@ -20,11 +20,11 @@ */ #define DEFINE_VK_INTERNAL(aKeyName) \ - NS_DEFINE_VK(VK##aKeyName, mozilla::dom::KeyboardEventBinding::DOM_VK##aKeyName) + NS_DEFINE_VK(VK##aKeyName, mozilla::dom::KeyboardEvent_Binding::DOM_VK##aKeyName) // Some keycode may have different name in KeyboardEvent from its key name. #define DEFINE_VK_INTERNAL2(aKeyName, aKeyCodeName) \ - NS_DEFINE_VK(VK##aKeyName, mozilla::dom::KeyboardEventBinding::DOM_VK##aKeyCodeName) + NS_DEFINE_VK(VK##aKeyName, mozilla::dom::KeyboardEvent_Binding::DOM_VK##aKeyCodeName) DEFINE_VK_INTERNAL(_CANCEL) DEFINE_VK_INTERNAL(_HELP) diff --git a/dom/events/WheelEvent.cpp b/dom/events/WheelEvent.cpp index 21c8b7a2941c..d41c73a47113 100644 --- a/dom/events/WheelEvent.cpp +++ b/dom/events/WheelEvent.cpp @@ -26,14 +26,14 @@ WheelEvent::WheelEvent(EventTarget* aOwner, // device pixels. However, JS contents need the delta values in CSS pixels. // We should store the value of mAppUnitsPerDevPixel here because // it might be changed by changing zoom or something. - if (aWheelEvent->mDeltaMode == WheelEventBinding::DOM_DELTA_PIXEL) { + if (aWheelEvent->mDeltaMode == WheelEvent_Binding::DOM_DELTA_PIXEL) { mAppUnitsPerDevPixel = aPresContext->AppUnitsPerDevPixel(); } } else { mEventIsInternal = true; mEvent->mTime = PR_Now(); mEvent->mRefPoint = LayoutDeviceIntPoint(0, 0); - mEvent->AsWheelEvent()->inputSource = MouseEventBinding::MOZ_SOURCE_UNKNOWN; + mEvent->AsWheelEvent()->inputSource = MouseEvent_Binding::MOZ_SOURCE_UNKNOWN; } } diff --git a/dom/events/WheelEvent.h b/dom/events/WheelEvent.h index d2ad24e42da5..79f6e564b75a 100644 --- a/dom/events/WheelEvent.h +++ b/dom/events/WheelEvent.h @@ -31,7 +31,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return WheelEventBinding::Wrap(aCx, this, aGivenProto); + return WheelEvent_Binding::Wrap(aCx, this, aGivenProto); } // NOTE: DeltaX(), DeltaY() and DeltaZ() return CSS pixels when deltaMode is diff --git a/dom/events/WheelHandlingHelper.cpp b/dom/events/WheelHandlingHelper.cpp index d418b58a21f3..156d8d2189aa 100644 --- a/dom/events/WheelHandlingHelper.cpp +++ b/dom/events/WheelHandlingHelper.cpp @@ -386,7 +386,7 @@ WheelTransaction::AccelerateWheelDelta(WidgetWheelEvent* aEvent, DeltaValues result(aEvent); // Don't accelerate the delta values if the event isn't line scrolling. - if (aEvent->mDeltaMode != dom::WheelEventBinding::DOM_DELTA_LINE) { + if (aEvent->mDeltaMode != dom::WheelEvent_Binding::DOM_DELTA_LINE) { return result; } @@ -417,7 +417,7 @@ WheelTransaction::ComputeAcceleratedWheelDelta(double aDelta, int32_t aFactor) WheelTransaction::OverrideSystemScrollSpeed(WidgetWheelEvent* aEvent) { MOZ_ASSERT(sTargetFrame, "We don't have mouse scrolling transaction"); - MOZ_ASSERT(aEvent->mDeltaMode == WheelEventBinding::DOM_DELTA_LINE); + MOZ_ASSERT(aEvent->mDeltaMode == WheelEvent_Binding::DOM_DELTA_LINE); // If the event doesn't scroll to both X and Y, we don't need to do anything // here. diff --git a/dom/events/XULCommandEvent.h b/dom/events/XULCommandEvent.h index 498aca740164..2868f60369db 100644 --- a/dom/events/XULCommandEvent.h +++ b/dom/events/XULCommandEvent.h @@ -28,7 +28,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return XULCommandEventBinding::Wrap(aCx, this, aGivenProto); + return XULCommandEvent_Binding::Wrap(aCx, this, aGivenProto); } virtual XULCommandEvent* AsXULCommandEvent() override diff --git a/dom/fetch/FetchObserver.cpp b/dom/fetch/FetchObserver.cpp index 977427bd2eff..0e7afd18f0ec 100644 --- a/dom/fetch/FetchObserver.cpp +++ b/dom/fetch/FetchObserver.cpp @@ -39,7 +39,7 @@ FetchObserver::FetchObserver(nsIGlobalObject* aGlobal, JSObject* FetchObserver::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return FetchObserverBinding::Wrap(aCx, this, aGivenProto); + return FetchObserver_Binding::Wrap(aCx, this, aGivenProto); } FetchState diff --git a/dom/fetch/Headers.cpp b/dom/fetch/Headers.cpp index ca5aa57a62fd..3525585e2986 100644 --- a/dom/fetch/Headers.cpp +++ b/dom/fetch/Headers.cpp @@ -86,7 +86,7 @@ Headers::Create(nsIGlobalObject* aGlobal, JSObject* Headers::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return mozilla::dom::HeadersBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::Headers_Binding::Wrap(aCx, this, aGivenProto); } Headers::~Headers() diff --git a/dom/fetch/Request.h b/dom/fetch/Request.h index 472846c09df0..abad76958315 100644 --- a/dom/fetch/Request.h +++ b/dom/fetch/Request.h @@ -38,7 +38,7 @@ public: JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override { - return RequestBinding::Wrap(aCx, this, aGivenProto); + return Request_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/fetch/Response.h b/dom/fetch/Response.h index 6cfe468f4b01..18777acb9622 100644 --- a/dom/fetch/Response.h +++ b/dom/fetch/Response.h @@ -41,7 +41,7 @@ public: JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override { - return ResponseBinding::Wrap(aCx, this, aGivenProto); + return Response_Binding::Wrap(aCx, this, aGivenProto); } ResponseType diff --git a/dom/file/Blob.cpp b/dom/file/Blob.cpp index 2356acaf0126..3a2b1b17ba8f 100644 --- a/dom/file/Blob.cpp +++ b/dom/file/Blob.cpp @@ -230,7 +230,7 @@ Blob::SetMutable(bool aMutable) JSObject* Blob::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return BlobBinding::Wrap(aCx, this, aGivenProto); + return Blob_Binding::Wrap(aCx, this, aGivenProto); } /* static */ already_AddRefed diff --git a/dom/file/File.cpp b/dom/file/File.cpp index 217adf78ebea..c9fd0c4ddda8 100644 --- a/dom/file/File.cpp +++ b/dom/file/File.cpp @@ -79,7 +79,7 @@ File::CreateFromFile(nsISupports* aParent, nsIFile* aFile, JSObject* File::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return FileBinding::Wrap(aCx, this, aGivenProto); + return File_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/file/FileList.cpp b/dom/file/FileList.cpp index 87617fe158a4..27be0cb46ce3 100644 --- a/dom/file/FileList.cpp +++ b/dom/file/FileList.cpp @@ -25,7 +25,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(FileList) JSObject* FileList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return mozilla::dom::FileListBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::FileList_Binding::Wrap(aCx, this, aGivenProto); } File* diff --git a/dom/file/FileReader.cpp b/dom/file/FileReader.cpp index 7d442ef589bd..9e020f2e3137 100644 --- a/dom/file/FileReader.cpp +++ b/dom/file/FileReader.cpp @@ -234,7 +234,7 @@ FileReader::OnLoadEndArrayBuffer() // XXX Code selected arbitrarily mError = new DOMException(NS_ERROR_DOM_INVALID_STATE_ERR, errorMsg, - errorNameC, DOMExceptionBinding::INVALID_STATE_ERR); + errorNameC, DOMException_Binding::INVALID_STATE_ERR); FreeDataAndDispatchError(); } @@ -527,7 +527,7 @@ FileReader::GetAsDataURL(Blob *aBlob, /* virtual */ JSObject* FileReader::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return FileReaderBinding::Wrap(aCx, this, aGivenProto); + return FileReader_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/file/FileReaderSync.cpp b/dom/file/FileReaderSync.cpp index b18b320c0648..eb0773b0c3f1 100644 --- a/dom/file/FileReaderSync.cpp +++ b/dom/file/FileReaderSync.cpp @@ -47,7 +47,7 @@ FileReaderSync::WrapObject(JSContext* aCx, JS::Handle aGivenProto, JS::MutableHandle aReflector) { - return FileReaderSyncBinding::Wrap(aCx, this, aGivenProto, aReflector); + return FileReaderSync_Binding::Wrap(aCx, this, aGivenProto, aReflector); } void diff --git a/dom/filesystem/Directory.cpp b/dom/filesystem/Directory.cpp index bbc0af592dbd..9865325b783b 100644 --- a/dom/filesystem/Directory.cpp +++ b/dom/filesystem/Directory.cpp @@ -103,7 +103,7 @@ Directory::GetParentObject() const JSObject* Directory::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return DirectoryBinding::Wrap(aCx, this, aGivenProto); + return Directory_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/filesystem/compat/FileSystem.cpp b/dom/filesystem/compat/FileSystem.cpp index b45980fc6cc8..9d7d93a56fbe 100644 --- a/dom/filesystem/compat/FileSystem.cpp +++ b/dom/filesystem/compat/FileSystem.cpp @@ -61,7 +61,7 @@ FileSystem::~FileSystem() JSObject* FileSystem::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return FileSystemBinding::Wrap(aCx, this, aGivenProto); + return FileSystem_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/filesystem/compat/FileSystemDirectoryEntry.cpp b/dom/filesystem/compat/FileSystemDirectoryEntry.cpp index 5e65136e88ca..9a3fd62b75fc 100644 --- a/dom/filesystem/compat/FileSystemDirectoryEntry.cpp +++ b/dom/filesystem/compat/FileSystemDirectoryEntry.cpp @@ -40,7 +40,7 @@ JSObject* FileSystemDirectoryEntry::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return FileSystemDirectoryEntryBinding::Wrap(aCx, this, aGivenProto); + return FileSystemDirectoryEntry_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/filesystem/compat/FileSystemDirectoryReader.cpp b/dom/filesystem/compat/FileSystemDirectoryReader.cpp index b5b7f3c212ee..77384d26a3b4 100644 --- a/dom/filesystem/compat/FileSystemDirectoryReader.cpp +++ b/dom/filesystem/compat/FileSystemDirectoryReader.cpp @@ -150,7 +150,7 @@ JSObject* FileSystemDirectoryReader::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return FileSystemDirectoryReaderBinding::Wrap(aCx, this, aGivenProto); + return FileSystemDirectoryReader_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/filesystem/compat/FileSystemEntry.cpp b/dom/filesystem/compat/FileSystemEntry.cpp index db69063d9c46..16e6db724963 100644 --- a/dom/filesystem/compat/FileSystemEntry.cpp +++ b/dom/filesystem/compat/FileSystemEntry.cpp @@ -66,7 +66,7 @@ FileSystemEntry::~FileSystemEntry() JSObject* FileSystemEntry::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return FileSystemEntryBinding::Wrap(aCx, this, aGivenProto); + return FileSystemEntry_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/filesystem/compat/FileSystemFileEntry.cpp b/dom/filesystem/compat/FileSystemFileEntry.cpp index c52198f71743..57e91116e882 100644 --- a/dom/filesystem/compat/FileSystemFileEntry.cpp +++ b/dom/filesystem/compat/FileSystemFileEntry.cpp @@ -73,7 +73,7 @@ JSObject* FileSystemFileEntry::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return FileSystemFileEntryBinding::Wrap(aCx, this, aGivenProto); + return FileSystemFileEntry_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/flex/Flex.cpp b/dom/flex/Flex.cpp index bc690e2067c7..399779ee9937 100644 --- a/dom/flex/Flex.cpp +++ b/dom/flex/Flex.cpp @@ -46,7 +46,7 @@ Flex::Flex(Element* aParent, JSObject* Flex::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return FlexBinding::Wrap(aCx, this, aGivenProto); + return Flex_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/flex/FlexItem.cpp b/dom/flex/FlexItem.cpp index 73f737fd73b2..797a4e56b4c1 100644 --- a/dom/flex/FlexItem.cpp +++ b/dom/flex/FlexItem.cpp @@ -49,7 +49,7 @@ FlexItem::FlexItem(FlexLine* aParent, JSObject* FlexItem::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return FlexItemBinding::Wrap(aCx, this, aGivenProto); + return FlexItem_Binding::Wrap(aCx, this, aGivenProto); } nsINode* diff --git a/dom/flex/FlexLine.cpp b/dom/flex/FlexLine.cpp index e594dafa52f0..a24a30c89bcb 100644 --- a/dom/flex/FlexLine.cpp +++ b/dom/flex/FlexLine.cpp @@ -65,7 +65,7 @@ FlexLine::FlexLine(Flex* aParent, JSObject* FlexLine::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return FlexLineBinding::Wrap(aCx, this, aGivenProto); + return FlexLine_Binding::Wrap(aCx, this, aGivenProto); } FlexLineGrowthState diff --git a/dom/gamepad/Gamepad.cpp b/dom/gamepad/Gamepad.cpp index b91bf17324f1..7b2d310aed52 100644 --- a/dom/gamepad/Gamepad.cpp +++ b/dom/gamepad/Gamepad.cpp @@ -95,7 +95,7 @@ Gamepad::SetAxis(uint32_t aAxis, double aValue) MOZ_ASSERT(aAxis < mAxes.Length()); if (mAxes[aAxis] != aValue) { mAxes[aAxis] = aValue; - GamepadBinding::ClearCachedAxesValue(this); + Gamepad_Binding::ClearCachedAxesValue(this); } UpdateTimestamp(); } @@ -136,7 +136,7 @@ Gamepad::SyncState(Gamepad* aOther) mAxes[i] = aOther->mAxes[i]; } if (changed) { - GamepadBinding::ClearCachedAxesValue(this); + Gamepad_Binding::ClearCachedAxesValue(this); } if (Preferences::GetBool(kGamepadExtEnabledPref)) { @@ -165,7 +165,7 @@ Gamepad::Clone(nsISupports* aParent) /* virtual */ JSObject* Gamepad::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return GamepadBinding::Wrap(aCx, this, aGivenProto); + return Gamepad_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/gamepad/GamepadButton.cpp b/dom/gamepad/GamepadButton.cpp index 154a1398530c..ceaffcc6f855 100644 --- a/dom/gamepad/GamepadButton.cpp +++ b/dom/gamepad/GamepadButton.cpp @@ -23,7 +23,7 @@ NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(GamepadButton, mParent) /* virtual */ JSObject* GamepadButton::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return GamepadButtonBinding::Wrap(aCx, this, aGivenProto); + return GamepadButton_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/gamepad/GamepadHapticActuator.cpp b/dom/gamepad/GamepadHapticActuator.cpp index 0dc2e9bb9b89..75696f14adca 100644 --- a/dom/gamepad/GamepadHapticActuator.cpp +++ b/dom/gamepad/GamepadHapticActuator.cpp @@ -32,7 +32,7 @@ GamepadHapticActuator::GamepadHapticActuator(nsISupports* aParent, uint32_t aGam /* virtual */ JSObject* GamepadHapticActuator::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return GamepadHapticActuatorBinding::Wrap(aCx, this, aGivenProto); + return GamepadHapticActuator_Binding::Wrap(aCx, this, aGivenProto); } nsISupports* diff --git a/dom/gamepad/GamepadPose.cpp b/dom/gamepad/GamepadPose.cpp index a2fa82396f84..789f93f30c5c 100644 --- a/dom/gamepad/GamepadPose.cpp +++ b/dom/gamepad/GamepadPose.cpp @@ -35,7 +35,7 @@ GamepadPose::~GamepadPose() /* virtual */ JSObject* GamepadPose::WrapObject(JSContext* aJSContext, JS::Handle aGivenProto) { - return GamepadPoseBinding::Wrap(aJSContext, this, aGivenProto); + return GamepadPose_Binding::Wrap(aJSContext, this, aGivenProto); } bool diff --git a/dom/gamepad/GamepadServiceTest.cpp b/dom/gamepad/GamepadServiceTest.cpp index cd9518673841..412d30080031 100644 --- a/dom/gamepad/GamepadServiceTest.cpp +++ b/dom/gamepad/GamepadServiceTest.cpp @@ -277,7 +277,7 @@ GamepadServiceTest::NewPoseMove(uint32_t aIndex, JSObject* GamepadServiceTest::WrapObject(JSContext* aCx, JS::HandleObject aGivenProto) { - return GamepadServiceTestBinding::Wrap(aCx, this, aGivenProto); + return GamepadServiceTest_Binding::Wrap(aCx, this, aGivenProto); } } // dom diff --git a/dom/geolocation/PositionError.cpp b/dom/geolocation/PositionError.cpp index 7364f71837f6..19892232a3c7 100644 --- a/dom/geolocation/PositionError.cpp +++ b/dom/geolocation/PositionError.cpp @@ -30,13 +30,13 @@ PositionError::GetMessage(nsAString& aMessage) const { switch (mCode) { - case PositionErrorBinding::PERMISSION_DENIED: + case PositionError_Binding::PERMISSION_DENIED: aMessage = NS_LITERAL_STRING("User denied geolocation prompt"); break; - case PositionErrorBinding::POSITION_UNAVAILABLE: + case PositionError_Binding::POSITION_UNAVAILABLE: aMessage = NS_LITERAL_STRING("Unknown error acquiring position"); break; - case PositionErrorBinding::TIMEOUT: + case PositionError_Binding::TIMEOUT: aMessage = NS_LITERAL_STRING("Position acquisition timed out"); break; default: @@ -53,7 +53,7 @@ PositionError::GetParentObject() const JSObject* PositionError::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PositionErrorBinding::Wrap(aCx, this, aGivenProto); + return PositionError_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/geolocation/nsGeoPosition.cpp b/dom/geolocation/nsGeoPosition.cpp index 2bd146c14ebf..f671320b34f2 100644 --- a/dom/geolocation/nsGeoPosition.cpp +++ b/dom/geolocation/nsGeoPosition.cpp @@ -201,7 +201,7 @@ Position::GetParentObject() const JSObject* Position::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PositionBinding::Wrap(aCx, this, aGivenProto); + return Position_Binding::Wrap(aCx, this, aGivenProto); } Coordinates* @@ -254,7 +254,7 @@ Coordinates::GetParentObject() const JSObject* Coordinates::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return CoordinatesBinding::Wrap(aCx, this, aGivenProto); + return Coordinates_Binding::Wrap(aCx, this, aGivenProto); } #define GENERATE_COORDS_WRAPPED_GETTER(name) \ diff --git a/dom/geolocation/nsGeolocation.cpp b/dom/geolocation/nsGeolocation.cpp index 7149e8dd951f..7326d36b73e8 100644 --- a/dom/geolocation/nsGeolocation.cpp +++ b/dom/geolocation/nsGeolocation.cpp @@ -271,7 +271,7 @@ void nsGeolocationRequest::Notify() { SetTimeoutTimer(); - NotifyErrorAndShutdown(PositionErrorBinding::TIMEOUT); + NotifyErrorAndShutdown(PositionError_Binding::TIMEOUT); } void @@ -347,7 +347,7 @@ nsGeolocationRequest::Cancel() return NS_OK; } - NotifyError(PositionErrorBinding::PERMISSION_DENIED); + NotifyError(PositionError_Binding::PERMISSION_DENIED); return NS_OK; } @@ -415,7 +415,7 @@ nsGeolocationRequest::Allow(JS::HandleValue aChoices) // if it is not a watch request and timeout is 0, // invoke the errorCallback (if present) with TIMEOUT code if (mOptions && mOptions->mTimeout == 0 && !mIsWatchPositionRequest) { - NotifyError(PositionErrorBinding::TIMEOUT); + NotifyError(PositionError_Binding::TIMEOUT); return NS_OK; } @@ -426,7 +426,7 @@ nsGeolocationRequest::Allow(JS::HandleValue aChoices) if (NS_FAILED(rv)) { // Location provider error - NotifyError(PositionErrorBinding::POSITION_UNAVAILABLE); + NotifyError(PositionError_Binding::POSITION_UNAVAILABLE); return NS_OK; } @@ -505,7 +505,7 @@ nsGeolocationRequest::SendLocation(nsIDOMGeoPosition* aPosition) } if (!wrapped) { - NotifyError(PositionErrorBinding::POSITION_UNAVAILABLE); + NotifyError(PositionError_Binding::POSITION_UNAVAILABLE); return; } @@ -790,7 +790,7 @@ nsGeolocationService::StartDevice(nsIPrincipal *aPrincipal) if (NS_FAILED(rv = mProvider->Startup()) || NS_FAILED(rv = mProvider->Watch(this))) { - NotifyError(PositionErrorBinding::POSITION_UNAVAILABLE); + NotifyError(PositionError_Binding::POSITION_UNAVAILABLE); return rv; } @@ -1417,5 +1417,5 @@ Geolocation::RegisterRequestWithPrompt(nsGeolocationRequest* request) JSObject* Geolocation::WrapObject(JSContext *aCtx, JS::Handle aGivenProto) { - return GeolocationBinding::Wrap(aCtx, this, aGivenProto); + return Geolocation_Binding::Wrap(aCtx, this, aGivenProto); } diff --git a/dom/grid/Grid.cpp b/dom/grid/Grid.cpp index d10d8b581f02..c258cfd72e02 100644 --- a/dom/grid/Grid.cpp +++ b/dom/grid/Grid.cpp @@ -97,7 +97,7 @@ Grid::~Grid() JSObject* Grid::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return GridBinding::Wrap(aCx, this, aGivenProto); + return Grid_Binding::Wrap(aCx, this, aGivenProto); } GridDimension* diff --git a/dom/grid/GridArea.cpp b/dom/grid/GridArea.cpp index d8a7eca76d44..08a4fb5d3ad3 100644 --- a/dom/grid/GridArea.cpp +++ b/dom/grid/GridArea.cpp @@ -43,7 +43,7 @@ GridArea::~GridArea() JSObject* GridArea::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return GridAreaBinding::Wrap(aCx, this, aGivenProto); + return GridArea_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/grid/GridDimension.cpp b/dom/grid/GridDimension.cpp index 040f3a380304..ff94da9eb01c 100644 --- a/dom/grid/GridDimension.cpp +++ b/dom/grid/GridDimension.cpp @@ -38,7 +38,7 @@ GridDimension::~GridDimension() JSObject* GridDimension::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return GridDimensionBinding::Wrap(aCx, this, aGivenProto); + return GridDimension_Binding::Wrap(aCx, this, aGivenProto); } GridLines* diff --git a/dom/grid/GridLine.cpp b/dom/grid/GridLine.cpp index 70c249c7e6f2..dce750e2abb6 100644 --- a/dom/grid/GridLine.cpp +++ b/dom/grid/GridLine.cpp @@ -43,7 +43,7 @@ GridLine::GetNames(nsTArray& aNames) const JSObject* GridLine::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return GridLineBinding::Wrap(aCx, this, aGivenProto); + return GridLine_Binding::Wrap(aCx, this, aGivenProto); } double diff --git a/dom/grid/GridLines.cpp b/dom/grid/GridLines.cpp index 841439e22a3e..20d7a3e0f20f 100644 --- a/dom/grid/GridLines.cpp +++ b/dom/grid/GridLines.cpp @@ -36,7 +36,7 @@ GridLines::~GridLines() JSObject* GridLines::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return GridLinesBinding::Wrap(aCx, this, aGivenProto); + return GridLines_Binding::Wrap(aCx, this, aGivenProto); } uint32_t diff --git a/dom/grid/GridTrack.cpp b/dom/grid/GridTrack.cpp index 328af7d5c17e..d77e3ce7e366 100644 --- a/dom/grid/GridTrack.cpp +++ b/dom/grid/GridTrack.cpp @@ -37,7 +37,7 @@ GridTrack::~GridTrack() JSObject* GridTrack::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return GridTrackBinding::Wrap(aCx, this, aGivenProto); + return GridTrack_Binding::Wrap(aCx, this, aGivenProto); } double diff --git a/dom/grid/GridTracks.cpp b/dom/grid/GridTracks.cpp index 8b607973c71b..502235b37716 100644 --- a/dom/grid/GridTracks.cpp +++ b/dom/grid/GridTracks.cpp @@ -36,7 +36,7 @@ GridTracks::~GridTracks() JSObject* GridTracks::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return GridTracksBinding::Wrap(aCx, this, aGivenProto); + return GridTracks_Binding::Wrap(aCx, this, aGivenProto); } uint32_t diff --git a/dom/html/HTMLAllCollection.cpp b/dom/html/HTMLAllCollection.cpp index 3d3bc6dd87b8..5322fe1e39da 100644 --- a/dom/html/HTMLAllCollection.cpp +++ b/dom/html/HTMLAllCollection.cpp @@ -201,7 +201,7 @@ HTMLAllCollection::GetSupportedNames(nsTArray& aNames) JSObject* HTMLAllCollection::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLAllCollectionBinding::Wrap(aCx, this, aGivenProto); + return HTMLAllCollection_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLAnchorElement.cpp b/dom/html/HTMLAnchorElement.cpp index b54ef6b6d9e5..f732e0f85075 100644 --- a/dom/html/HTMLAnchorElement.cpp +++ b/dom/html/HTMLAnchorElement.cpp @@ -72,7 +72,7 @@ NS_IMPL_ELEMENT_CLONE(HTMLAnchorElement) JSObject* HTMLAnchorElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return HTMLAnchorElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLAnchorElement_Binding::Wrap(aCx, this, aGivenProto); } int32_t diff --git a/dom/html/HTMLAreaElement.cpp b/dom/html/HTMLAreaElement.cpp index 919dbdc7acc3..fbe876d86ee3 100644 --- a/dom/html/HTMLAreaElement.cpp +++ b/dom/html/HTMLAreaElement.cpp @@ -168,7 +168,7 @@ HTMLAreaElement::AddSizeOfExcludingThis(nsWindowSizes& aSizes, JSObject* HTMLAreaElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLAreaElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLAreaElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLAudioElement.cpp b/dom/html/HTMLAudioElement.cpp index 840d5528e220..a607eb02e615 100644 --- a/dom/html/HTMLAudioElement.cpp +++ b/dom/html/HTMLAudioElement.cpp @@ -93,7 +93,7 @@ nsresult HTMLAudioElement::SetAcceptHeader(nsIHttpChannel* aChannel) JSObject* HTMLAudioElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLAudioElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLAudioElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLBRElement.cpp b/dom/html/HTMLBRElement.cpp index 8c9250b9c508..68bd34798f43 100644 --- a/dom/html/HTMLBRElement.cpp +++ b/dom/html/HTMLBRElement.cpp @@ -88,7 +88,7 @@ HTMLBRElement::GetAttributeMappingFunction() const JSObject* HTMLBRElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return HTMLBRElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLBRElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLBodyElement.cpp b/dom/html/HTMLBodyElement.cpp index 5829ce876cb7..d9fbf0bb0f63 100644 --- a/dom/html/HTMLBodyElement.cpp +++ b/dom/html/HTMLBodyElement.cpp @@ -35,7 +35,7 @@ HTMLBodyElement::~HTMLBodyElement() JSObject* HTMLBodyElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return HTMLBodyElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLBodyElement_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_ELEMENT_CLONE(HTMLBodyElement) diff --git a/dom/html/HTMLButtonElement.cpp b/dom/html/HTMLButtonElement.cpp index 792f697e0f34..6e2d6bfee953 100644 --- a/dom/html/HTMLButtonElement.cpp +++ b/dom/html/HTMLButtonElement.cpp @@ -497,7 +497,7 @@ HTMLButtonElement::IntrinsicState() const JSObject* HTMLButtonElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLButtonElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLButtonElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLCanvasElement.cpp b/dom/html/HTMLCanvasElement.cpp index bd5d0757abf6..ac56d2843db1 100644 --- a/dom/html/HTMLCanvasElement.cpp +++ b/dom/html/HTMLCanvasElement.cpp @@ -246,7 +246,7 @@ HTMLCanvasPrintState::~HTMLCanvasPrintState() /* virtual */ JSObject* HTMLCanvasPrintState::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MozCanvasPrintStateBinding::Wrap(aCx, this, aGivenProto); + return MozCanvasPrintState_Binding::Wrap(aCx, this, aGivenProto); } nsISupports* @@ -428,7 +428,7 @@ NS_IMPL_ELEMENT_CLONE(HTMLCanvasElement) /* virtual */ JSObject* HTMLCanvasElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLCanvasElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLCanvasElement_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/html/HTMLDataElement.cpp b/dom/html/HTMLDataElement.cpp index e9d53e5730b0..e891b02330f2 100644 --- a/dom/html/HTMLDataElement.cpp +++ b/dom/html/HTMLDataElement.cpp @@ -27,7 +27,7 @@ NS_IMPL_ELEMENT_CLONE(HTMLDataElement) JSObject* HTMLDataElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLDataElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLDataElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLDataListElement.cpp b/dom/html/HTMLDataListElement.cpp index b209e401313a..904d8d90b743 100644 --- a/dom/html/HTMLDataListElement.cpp +++ b/dom/html/HTMLDataListElement.cpp @@ -19,7 +19,7 @@ HTMLDataListElement::~HTMLDataListElement() JSObject* HTMLDataListElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return HTMLDataListElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLDataListElement_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_CYCLE_COLLECTION_INHERITED(HTMLDataListElement, diff --git a/dom/html/HTMLDetailsElement.cpp b/dom/html/HTMLDetailsElement.cpp index af96b39a0947..ec2235d6c730 100644 --- a/dom/html/HTMLDetailsElement.cpp +++ b/dom/html/HTMLDetailsElement.cpp @@ -80,7 +80,7 @@ HTMLDetailsElement::AsyncEventRunning(AsyncEventDispatcher* aEvent) JSObject* HTMLDetailsElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLDetailsElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLDetailsElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLDialogElement.cpp b/dom/html/HTMLDialogElement.cpp index 04584be5a0c8..b4f33b5bd48d 100644 --- a/dom/html/HTMLDialogElement.cpp +++ b/dom/html/HTMLDialogElement.cpp @@ -88,7 +88,7 @@ HTMLDialogElement::ShowModal(ErrorResult& aError) JSObject* HTMLDialogElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLDialogElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLDialogElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLDivElement.cpp b/dom/html/HTMLDivElement.cpp index 892aabf349ca..77aad420e7f9 100644 --- a/dom/html/HTMLDivElement.cpp +++ b/dom/html/HTMLDivElement.cpp @@ -24,7 +24,7 @@ NS_IMPL_ELEMENT_CLONE(HTMLDivElement) JSObject* HTMLDivElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return dom::HTMLDivElementBinding::Wrap(aCx, this, aGivenProto); + return dom::HTMLDivElement_Binding::Wrap(aCx, this, aGivenProto); } bool diff --git a/dom/html/HTMLElement.cpp b/dom/html/HTMLElement.cpp index 4115c6568bb3..86865a1b48f6 100644 --- a/dom/html/HTMLElement.cpp +++ b/dom/html/HTMLElement.cpp @@ -42,7 +42,7 @@ NS_IMPL_ELEMENT_CLONE(HTMLElement) JSObject* HTMLElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return dom::HTMLElementBinding::Wrap(aCx, this, aGivenProto); + return dom::HTMLElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLEmbedElement.cpp b/dom/html/HTMLEmbedElement.cpp index ecaebb838a5c..8a56075f8015 100644 --- a/dom/html/HTMLEmbedElement.cpp +++ b/dom/html/HTMLEmbedElement.cpp @@ -332,7 +332,7 @@ JSObject* HTMLEmbedElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { JSObject* obj; - obj = HTMLEmbedElementBinding::Wrap(aCx, this, aGivenProto); + obj = HTMLEmbedElement_Binding::Wrap(aCx, this, aGivenProto); if (!obj) { return nullptr; diff --git a/dom/html/HTMLFieldSetElement.cpp b/dom/html/HTMLFieldSetElement.cpp index 152881bc76d2..de5c082da34a 100644 --- a/dom/html/HTMLFieldSetElement.cpp +++ b/dom/html/HTMLFieldSetElement.cpp @@ -343,7 +343,7 @@ HTMLFieldSetElement::IntrinsicState() const JSObject* HTMLFieldSetElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLFieldSetElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLFieldSetElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLFontElement.cpp b/dom/html/HTMLFontElement.cpp index bcb89c6c354b..a6bbbc686513 100644 --- a/dom/html/HTMLFontElement.cpp +++ b/dom/html/HTMLFontElement.cpp @@ -23,7 +23,7 @@ HTMLFontElement::~HTMLFontElement() JSObject* HTMLFontElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return HTMLFontElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLFontElement_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_ELEMENT_CLONE(HTMLFontElement) diff --git a/dom/html/HTMLFormControlsCollection.cpp b/dom/html/HTMLFormControlsCollection.cpp index 021a57720c15..d1c7d9e531f6 100644 --- a/dom/html/HTMLFormControlsCollection.cpp +++ b/dom/html/HTMLFormControlsCollection.cpp @@ -354,7 +354,7 @@ HTMLFormControlsCollection::GetSupportedNames(nsTArray& aNames) /* virtual */ JSObject* HTMLFormControlsCollection::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLFormControlsCollectionBinding::Wrap(aCx, this, aGivenProto); + return HTMLFormControlsCollection_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLFormElement.cpp b/dom/html/HTMLFormElement.cpp index 71bd8f0afb75..f6886e26e205 100644 --- a/dom/html/HTMLFormElement.cpp +++ b/dom/html/HTMLFormElement.cpp @@ -2548,7 +2548,7 @@ HTMLFormElement::RemoveElementFromPastNamesMap(Element* aElement) JSObject* HTMLFormElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLFormElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLFormElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLFrameElement.cpp b/dom/html/HTMLFrameElement.cpp index 0dc4773db8f6..872739ea39de 100644 --- a/dom/html/HTMLFrameElement.cpp +++ b/dom/html/HTMLFrameElement.cpp @@ -57,7 +57,7 @@ HTMLFrameElement::ParseAttribute(int32_t aNamespaceID, JSObject* HTMLFrameElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLFrameElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLFrameElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLFrameSetElement.cpp b/dom/html/HTMLFrameSetElement.cpp index d7d6d6cafeb1..40c00279a1bd 100644 --- a/dom/html/HTMLFrameSetElement.cpp +++ b/dom/html/HTMLFrameSetElement.cpp @@ -23,7 +23,7 @@ HTMLFrameSetElement::~HTMLFrameSetElement() JSObject* HTMLFrameSetElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return HTMLFrameSetElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLFrameSetElement_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_ELEMENT_CLONE(HTMLFrameSetElement) diff --git a/dom/html/HTMLHRElement.cpp b/dom/html/HTMLHRElement.cpp index 031667c4e74e..36bd3d6d6db7 100644 --- a/dom/html/HTMLHRElement.cpp +++ b/dom/html/HTMLHRElement.cpp @@ -199,7 +199,7 @@ HTMLHRElement::GetAttributeMappingFunction() const JSObject* HTMLHRElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLHRElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLHRElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLHeadingElement.cpp b/dom/html/HTMLHeadingElement.cpp index abfae1e7657a..b3f97cb8197a 100644 --- a/dom/html/HTMLHeadingElement.cpp +++ b/dom/html/HTMLHeadingElement.cpp @@ -27,7 +27,7 @@ NS_IMPL_ELEMENT_CLONE(HTMLHeadingElement) JSObject* HTMLHeadingElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return HTMLHeadingElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLHeadingElement_Binding::Wrap(aCx, this, aGivenProto); } bool diff --git a/dom/html/HTMLIFrameElement.cpp b/dom/html/HTMLIFrameElement.cpp index d313eb3b57f6..c5905882197d 100644 --- a/dom/html/HTMLIFrameElement.cpp +++ b/dom/html/HTMLIFrameElement.cpp @@ -196,7 +196,7 @@ HTMLIFrameElement::GetSandboxFlags() JSObject* HTMLIFrameElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLIFrameElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLIFrameElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLImageElement.cpp b/dom/html/HTMLImageElement.cpp index 118f7015d21a..6c8122cbbb8c 100644 --- a/dom/html/HTMLImageElement.cpp +++ b/dom/html/HTMLImageElement.cpp @@ -267,8 +267,8 @@ HTMLImageElement::GetAttributeChangeHint(const nsAtom* aAttribute, aAttribute == nsGkAtoms::ismap) { retval |= nsChangeHint_ReconstructFrame; } else if (aAttribute == nsGkAtoms::alt) { - if (aModType == MutationEventBinding::ADDITION || - aModType == MutationEventBinding::REMOVAL) { + if (aModType == MutationEvent_Binding::ADDITION || + aModType == MutationEvent_Binding::REMOVAL) { retval |= nsChangeHint_ReconstructFrame; } } @@ -852,7 +852,7 @@ HTMLImageElement::GetCORSMode() JSObject* HTMLImageElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLImageElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLImageElement_Binding::Wrap(aCx, this, aGivenProto); } #ifdef DEBUG diff --git a/dom/html/HTMLInputElement.cpp b/dom/html/HTMLInputElement.cpp index 7a9607853bdd..c84b2c5af5e4 100644 --- a/dom/html/HTMLInputElement.cpp +++ b/dom/html/HTMLInputElement.cpp @@ -2581,7 +2581,7 @@ HTMLInputElement::SetFilesOrDirectories(const nsTArray& a mFileData->ClearGetFilesHelpers(); if (IsWebkitFileSystemEnabled()) { - HTMLInputElementBinding::ClearCachedWebkitEntriesValue(this); + HTMLInputElement_Binding::ClearCachedWebkitEntriesValue(this); mFileData->mEntries.Clear(); } @@ -2601,7 +2601,7 @@ HTMLInputElement::SetFiles(FileList* aFiles, mFileData->ClearGetFilesHelpers(); if (IsWebkitFileSystemEnabled()) { - HTMLInputElementBinding::ClearCachedWebkitEntriesValue(this); + HTMLInputElement_Binding::ClearCachedWebkitEntriesValue(this); mFileData->mEntries.Clear(); } @@ -4399,7 +4399,7 @@ HTMLInputElement::PostHandleEvent(EventChainPostVisitor& aVisitor) if (!aVisitor.mEvent->DefaultPrevented() && aVisitor.mEvent->IsTrusted() && IsMutable() && wheelEvent && wheelEvent->mDeltaY != 0 && - wheelEvent->mDeltaMode != WheelEventBinding::DOM_DELTA_PIXEL) { + wheelEvent->mDeltaMode != WheelEvent_Binding::DOM_DELTA_PIXEL) { if (mType == NS_FORM_INPUT_NUMBER) { nsNumberControlFrame* numberControlFrame = do_QueryFrame(GetPrimaryFrame()); @@ -7599,7 +7599,7 @@ HTMLInputElement::PickerClosed() JSObject* HTMLInputElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLInputElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLInputElement_Binding::Wrap(aCx, this, aGivenProto); } GetFilesHelper* diff --git a/dom/html/HTMLLIElement.cpp b/dom/html/HTMLLIElement.cpp index 8661a8b4f9ab..c5c82b9ef61c 100644 --- a/dom/html/HTMLLIElement.cpp +++ b/dom/html/HTMLLIElement.cpp @@ -104,7 +104,7 @@ HTMLLIElement::GetAttributeMappingFunction() const JSObject* HTMLLIElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return HTMLLIElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLLIElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLLabelElement.cpp b/dom/html/HTMLLabelElement.cpp index bbca28ed2dec..68bf43f1fa90 100644 --- a/dom/html/HTMLLabelElement.cpp +++ b/dom/html/HTMLLabelElement.cpp @@ -31,7 +31,7 @@ HTMLLabelElement::~HTMLLabelElement() JSObject* HTMLLabelElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return HTMLLabelElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLLabelElement_Binding::Wrap(aCx, this, aGivenProto); } // nsIDOMHTMLLabelElement @@ -157,8 +157,8 @@ HTMLLabelElement::PostHandleEvent(EventChainPostVisitor& aVisitor) // pass FLAG_BYMOUSE so that we get correct focus ring behavior, // but we don't want to pass FLAG_BYMOUSE if this click event was // caused by the user pressing an accesskey. - bool byMouse = (mouseEvent->inputSource != MouseEventBinding::MOZ_SOURCE_KEYBOARD); - bool byTouch = (mouseEvent->inputSource == MouseEventBinding::MOZ_SOURCE_TOUCH); + bool byMouse = (mouseEvent->inputSource != MouseEvent_Binding::MOZ_SOURCE_KEYBOARD); + bool byTouch = (mouseEvent->inputSource == MouseEvent_Binding::MOZ_SOURCE_TOUCH); fm->SetFocus(content, nsIFocusManager::FLAG_BYMOVEFOCUS | (byMouse ? nsIFocusManager::FLAG_BYMOUSE : 0) | @@ -210,7 +210,7 @@ HTMLLabelElement::PerformAccesskey(bool aKeyCausesActivation, // Click on it if the users prefs indicate to do so. WidgetMouseEvent event(aIsTrustedEvent, eMouseClick, nullptr, WidgetMouseEvent::eReal); - event.inputSource = MouseEventBinding::MOZ_SOURCE_KEYBOARD; + event.inputSource = MouseEvent_Binding::MOZ_SOURCE_KEYBOARD; nsAutoPopupStatePusher popupStatePusher(aIsTrustedEvent ? openAllowed : openAbused); diff --git a/dom/html/HTMLLegendElement.cpp b/dom/html/HTMLLegendElement.cpp index bee45b9f6725..2494f338495d 100644 --- a/dom/html/HTMLLegendElement.cpp +++ b/dom/html/HTMLLegendElement.cpp @@ -135,7 +135,7 @@ HTMLLegendElement::GetForm() JSObject* HTMLLegendElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLLegendElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLLegendElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLLinkElement.cpp b/dom/html/HTMLLinkElement.cpp index 2088e481e3ef..bd0885c4d494 100644 --- a/dom/html/HTMLLinkElement.cpp +++ b/dom/html/HTMLLinkElement.cpp @@ -479,7 +479,7 @@ HTMLLinkElement::AddSizeOfExcludingThis(nsWindowSizes& aSizes, JSObject* HTMLLinkElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLLinkElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLLinkElement_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/html/HTMLMapElement.cpp b/dom/html/HTMLMapElement.cpp index c9fc2cd3bcdf..e19901bf15b6 100644 --- a/dom/html/HTMLMapElement.cpp +++ b/dom/html/HTMLMapElement.cpp @@ -53,7 +53,7 @@ HTMLMapElement::Areas() JSObject* HTMLMapElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLMapElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLMapElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLMediaElement.cpp b/dom/html/HTMLMediaElement.cpp index 3f48bfa2dce4..51e20a6ee528 100644 --- a/dom/html/HTMLMediaElement.cpp +++ b/dom/html/HTMLMediaElement.cpp @@ -130,7 +130,7 @@ static mozilla::LazyLogModule gMediaElementEventsLog("nsMediaElementEvents"); using namespace mozilla::layers; using mozilla::net::nsMediaFragmentURIParser; -using namespace mozilla::dom::HTMLMediaElementBinding; +using namespace mozilla::dom::HTMLMediaElement_Binding; namespace mozilla { namespace dom { diff --git a/dom/html/HTMLMediaElement.h b/dom/html/HTMLMediaElement.h index d7c9b4540770..196e34c687c6 100644 --- a/dom/html/HTMLMediaElement.h +++ b/dom/html/HTMLMediaElement.h @@ -1444,8 +1444,8 @@ protected: // Media loading flags. See: // http://www.whatwg.org/specs/web-apps/current-work/#video) - nsMediaNetworkState mNetworkState = HTMLMediaElementBinding::NETWORK_EMPTY; - nsMediaReadyState mReadyState = HTMLMediaElementBinding::HAVE_NOTHING; + nsMediaNetworkState mNetworkState = HTMLMediaElement_Binding::NETWORK_EMPTY; + nsMediaReadyState mReadyState = HTMLMediaElement_Binding::HAVE_NOTHING; enum LoadAlgorithmState { // No load algorithm instance is waiting for a source to be added to the diff --git a/dom/html/HTMLMenuElement.cpp b/dom/html/HTMLMenuElement.cpp index 866f1ccd24a6..6f7e367d3256 100644 --- a/dom/html/HTMLMenuElement.cpp +++ b/dom/html/HTMLMenuElement.cpp @@ -244,7 +244,7 @@ HTMLMenuElement::AddSeparator(nsIMenuBuilder* aBuilder, int8_t& aSeparator) JSObject* HTMLMenuElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLMenuElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLMenuElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLMenuItemElement.cpp b/dom/html/HTMLMenuItemElement.cpp index fdb6840c5c14..e30040bfa855 100644 --- a/dom/html/HTMLMenuItemElement.cpp +++ b/dom/html/HTMLMenuItemElement.cpp @@ -478,7 +478,7 @@ HTMLMenuItemElement::InitChecked() JSObject* HTMLMenuItemElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLMenuItemElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLMenuItemElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLMetaElement.cpp b/dom/html/HTMLMetaElement.cpp index 80b10af6c8f9..f7871af045d8 100644 --- a/dom/html/HTMLMetaElement.cpp +++ b/dom/html/HTMLMetaElement.cpp @@ -166,7 +166,7 @@ HTMLMetaElement::CreateAndDispatchEvent(nsIDocument* aDoc, JSObject* HTMLMetaElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLMetaElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLMetaElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLMeterElement.cpp b/dom/html/HTMLMeterElement.cpp index c85157f55dda..0176ad94628e 100644 --- a/dom/html/HTMLMeterElement.cpp +++ b/dom/html/HTMLMeterElement.cpp @@ -264,7 +264,7 @@ HTMLMeterElement::GetOptimumState() const JSObject* HTMLMeterElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLMeterElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLMeterElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLModElement.cpp b/dom/html/HTMLModElement.cpp index 074fa5d5b5dd..18a3d54640f4 100644 --- a/dom/html/HTMLModElement.cpp +++ b/dom/html/HTMLModElement.cpp @@ -27,7 +27,7 @@ NS_IMPL_ELEMENT_CLONE(HTMLModElement) JSObject* HTMLModElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLModElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLModElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLObjectElement.cpp b/dom/html/HTMLObjectElement.cpp index 15e6d6ea1fef..d23f88657a14 100644 --- a/dom/html/HTMLObjectElement.cpp +++ b/dom/html/HTMLObjectElement.cpp @@ -546,7 +546,7 @@ JSObject* HTMLObjectElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { JS::Rooted obj(aCx, - HTMLObjectElementBinding::Wrap(aCx, this, aGivenProto)); + HTMLObjectElement_Binding::Wrap(aCx, this, aGivenProto)); if (!obj) { return nullptr; } diff --git a/dom/html/HTMLOptGroupElement.cpp b/dom/html/HTMLOptGroupElement.cpp index 6792647195c9..4b79d8a86971 100644 --- a/dom/html/HTMLOptGroupElement.cpp +++ b/dom/html/HTMLOptGroupElement.cpp @@ -134,7 +134,7 @@ HTMLOptGroupElement::AfterSetAttr(int32_t aNameSpaceID, nsAtom* aName, JSObject* HTMLOptGroupElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLOptGroupElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLOptGroupElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLOptionElement.cpp b/dom/html/HTMLOptionElement.cpp index b3514c5c9b71..3d0045c1fcd2 100644 --- a/dom/html/HTMLOptionElement.cpp +++ b/dom/html/HTMLOptionElement.cpp @@ -404,7 +404,7 @@ HTMLOptionElement::CopyInnerTo(Element* aDest, bool aPreallocateChildren) JSObject* HTMLOptionElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLOptionElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLOptionElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLOptionsCollection.cpp b/dom/html/HTMLOptionsCollection.cpp index 40d1801859f8..252b56ff5ac8 100644 --- a/dom/html/HTMLOptionsCollection.cpp +++ b/dom/html/HTMLOptionsCollection.cpp @@ -105,7 +105,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(HTMLOptionsCollection) JSObject* HTMLOptionsCollection::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLOptionsCollectionBinding::Wrap(aCx, this, aGivenProto); + return HTMLOptionsCollection_Binding::Wrap(aCx, this, aGivenProto); } uint32_t diff --git a/dom/html/HTMLOutputElement.cpp b/dom/html/HTMLOutputElement.cpp index b3edb6c63f98..36edcd1b1318 100644 --- a/dom/html/HTMLOutputElement.cpp +++ b/dom/html/HTMLOutputElement.cpp @@ -204,7 +204,7 @@ void HTMLOutputElement::ContentRemoved(nsIContent* aChild, JSObject* HTMLOutputElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLOutputElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLOutputElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLParagraphElement.cpp b/dom/html/HTMLParagraphElement.cpp index b10c2b67255c..15cadecb61e4 100644 --- a/dom/html/HTMLParagraphElement.cpp +++ b/dom/html/HTMLParagraphElement.cpp @@ -67,7 +67,7 @@ HTMLParagraphElement::GetAttributeMappingFunction() const JSObject* HTMLParagraphElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return HTMLParagraphElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLParagraphElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLPictureElement.cpp b/dom/html/HTMLPictureElement.cpp index 7f172aa27b8f..e702ddf227fe 100644 --- a/dom/html/HTMLPictureElement.cpp +++ b/dom/html/HTMLPictureElement.cpp @@ -88,7 +88,7 @@ HTMLPictureElement::InsertChildBefore(nsIContent* aKid, nsIContent* aBeforeThis, JSObject* HTMLPictureElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLPictureElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLPictureElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLPreElement.cpp b/dom/html/HTMLPreElement.cpp index af9ec4a5429c..7c5233c95b94 100644 --- a/dom/html/HTMLPreElement.cpp +++ b/dom/html/HTMLPreElement.cpp @@ -87,7 +87,7 @@ HTMLPreElement::GetAttributeMappingFunction() const JSObject* HTMLPreElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return HTMLPreElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLPreElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLProgressElement.cpp b/dom/html/HTMLProgressElement.cpp index cb357619a85f..4fce2b5ee7a2 100644 --- a/dom/html/HTMLProgressElement.cpp +++ b/dom/html/HTMLProgressElement.cpp @@ -107,7 +107,7 @@ HTMLProgressElement::IsIndeterminate() const JSObject* HTMLProgressElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLProgressElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLProgressElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLScriptElement.cpp b/dom/html/HTMLScriptElement.cpp index d4cfb101242e..bce8ea5b1f9c 100644 --- a/dom/html/HTMLScriptElement.cpp +++ b/dom/html/HTMLScriptElement.cpp @@ -32,7 +32,7 @@ namespace dom { JSObject* HTMLScriptElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return HTMLScriptElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLScriptElement_Binding::Wrap(aCx, this, aGivenProto); } HTMLScriptElement::HTMLScriptElement(already_AddRefed& aNodeInfo, diff --git a/dom/html/HTMLSelectElement.cpp b/dom/html/HTMLSelectElement.cpp index 21210e62f239..11fc2db3b62f 100644 --- a/dom/html/HTMLSelectElement.cpp +++ b/dom/html/HTMLSelectElement.cpp @@ -1814,7 +1814,7 @@ HTMLSelectElement::SetPreviewValue(const nsAString& aValue) JSObject* HTMLSelectElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLSelectElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLSelectElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLSharedElement.cpp b/dom/html/HTMLSharedElement.cpp index d2853d0234bf..521f98ad48e3 100644 --- a/dom/html/HTMLSharedElement.cpp +++ b/dom/html/HTMLSharedElement.cpp @@ -283,23 +283,23 @@ JSObject* HTMLSharedElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { if (mNodeInfo->Equals(nsGkAtoms::param)) { - return HTMLParamElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLParamElement_Binding::Wrap(aCx, this, aGivenProto); } if (mNodeInfo->Equals(nsGkAtoms::base)) { - return HTMLBaseElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLBaseElement_Binding::Wrap(aCx, this, aGivenProto); } if (mNodeInfo->Equals(nsGkAtoms::dir)) { - return HTMLDirectoryElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLDirectoryElement_Binding::Wrap(aCx, this, aGivenProto); } if (mNodeInfo->Equals(nsGkAtoms::q) || mNodeInfo->Equals(nsGkAtoms::blockquote)) { - return HTMLQuoteElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLQuoteElement_Binding::Wrap(aCx, this, aGivenProto); } if (mNodeInfo->Equals(nsGkAtoms::head)) { - return HTMLHeadElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLHeadElement_Binding::Wrap(aCx, this, aGivenProto); } MOZ_ASSERT(mNodeInfo->Equals(nsGkAtoms::html)); - return HTMLHtmlElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLHtmlElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLSharedListElement.cpp b/dom/html/HTMLSharedListElement.cpp index fa6311e29d1d..c3092d6d0293 100644 --- a/dom/html/HTMLSharedListElement.cpp +++ b/dom/html/HTMLSharedListElement.cpp @@ -130,13 +130,13 @@ JSObject* HTMLSharedListElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { if (mNodeInfo->Equals(nsGkAtoms::ol)) { - return HTMLOListElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLOListElement_Binding::Wrap(aCx, this, aGivenProto); } if (mNodeInfo->Equals(nsGkAtoms::dl)) { - return HTMLDListElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLDListElement_Binding::Wrap(aCx, this, aGivenProto); } MOZ_ASSERT(mNodeInfo->Equals(nsGkAtoms::ul)); - return HTMLUListElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLUListElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLSlotElement.cpp b/dom/html/HTMLSlotElement.cpp index 0f0fb52dcf5c..830a36027eea 100644 --- a/dom/html/HTMLSlotElement.cpp +++ b/dom/html/HTMLSlotElement.cpp @@ -246,7 +246,7 @@ HTMLSlotElement::FireSlotChangeEvent() JSObject* HTMLSlotElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLSlotElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLSlotElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLSourceElement.cpp b/dom/html/HTMLSourceElement.cpp index a1c3c96f7d64..1ec4ea1985b5 100644 --- a/dom/html/HTMLSourceElement.cpp +++ b/dom/html/HTMLSourceElement.cpp @@ -162,7 +162,7 @@ HTMLSourceElement::BindToTree(nsIDocument *aDocument, JSObject* HTMLSourceElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLSourceElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLSourceElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLSpanElement.cpp b/dom/html/HTMLSpanElement.cpp index ccbd5a0806e0..a3c20adb6560 100644 --- a/dom/html/HTMLSpanElement.cpp +++ b/dom/html/HTMLSpanElement.cpp @@ -26,7 +26,7 @@ NS_IMPL_ELEMENT_CLONE(HTMLSpanElement) JSObject* HTMLSpanElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return HTMLSpanElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLSpanElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLStyleElement.cpp b/dom/html/HTMLStyleElement.cpp index 65ea7f7e67bc..3cd98334215a 100644 --- a/dom/html/HTMLStyleElement.cpp +++ b/dom/html/HTMLStyleElement.cpp @@ -223,7 +223,7 @@ HTMLStyleElement::GetStyleSheetInfo() JSObject* HTMLStyleElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return HTMLStyleElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLStyleElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLSummaryElement.cpp b/dom/html/HTMLSummaryElement.cpp index 4672b5f9a974..8319c191fd36 100644 --- a/dom/html/HTMLSummaryElement.cpp +++ b/dom/html/HTMLSummaryElement.cpp @@ -149,7 +149,7 @@ HTMLSummaryElement::GetDetails() const JSObject* HTMLSummaryElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLTableCaptionElement.cpp b/dom/html/HTMLTableCaptionElement.cpp index eaa65b35955f..e59c97a3d9ce 100644 --- a/dom/html/HTMLTableCaptionElement.cpp +++ b/dom/html/HTMLTableCaptionElement.cpp @@ -23,7 +23,7 @@ HTMLTableCaptionElement::~HTMLTableCaptionElement() JSObject* HTMLTableCaptionElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return HTMLTableCaptionElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLTableCaptionElement_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_ELEMENT_CLONE(HTMLTableCaptionElement) diff --git a/dom/html/HTMLTableCellElement.cpp b/dom/html/HTMLTableCellElement.cpp index 926bbd7601e4..120f4cbc91a4 100644 --- a/dom/html/HTMLTableCellElement.cpp +++ b/dom/html/HTMLTableCellElement.cpp @@ -25,7 +25,7 @@ HTMLTableCellElement::~HTMLTableCellElement() JSObject* HTMLTableCellElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return HTMLTableCellElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLTableCellElement_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_ELEMENT_CLONE(HTMLTableCellElement) diff --git a/dom/html/HTMLTableColElement.cpp b/dom/html/HTMLTableColElement.cpp index 3e6302ed9596..25b135294d60 100644 --- a/dom/html/HTMLTableColElement.cpp +++ b/dom/html/HTMLTableColElement.cpp @@ -26,7 +26,7 @@ HTMLTableColElement::~HTMLTableColElement() JSObject* HTMLTableColElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return HTMLTableColElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLTableColElement_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_ELEMENT_CLONE(HTMLTableColElement) diff --git a/dom/html/HTMLTableElement.cpp b/dom/html/HTMLTableElement.cpp index c1601cbda9b8..ec404cf78277 100644 --- a/dom/html/HTMLTableElement.cpp +++ b/dom/html/HTMLTableElement.cpp @@ -207,7 +207,7 @@ TableRowsCollection::CleanUp() JSObject* TableRowsCollection::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLCollectionBinding::Wrap(aCx, this, aGivenProto); + return HTMLCollection_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE(TableRowsCollection, mRows) @@ -557,7 +557,7 @@ HTMLTableElement::~HTMLTableElement() JSObject* HTMLTableElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return HTMLTableElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLTableElement_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_CYCLE_COLLECTION_CLASS(HTMLTableElement) diff --git a/dom/html/HTMLTableRowElement.cpp b/dom/html/HTMLTableRowElement.cpp index 8b87301600ae..dc5a8ba98a23 100644 --- a/dom/html/HTMLTableRowElement.cpp +++ b/dom/html/HTMLTableRowElement.cpp @@ -26,7 +26,7 @@ HTMLTableRowElement::~HTMLTableRowElement() JSObject* HTMLTableRowElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return HTMLTableRowElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLTableRowElement_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_CYCLE_COLLECTION_CLASS(HTMLTableRowElement) diff --git a/dom/html/HTMLTableSectionElement.cpp b/dom/html/HTMLTableSectionElement.cpp index 7008800d343f..04a9aeb58bf3 100644 --- a/dom/html/HTMLTableSectionElement.cpp +++ b/dom/html/HTMLTableSectionElement.cpp @@ -26,7 +26,7 @@ HTMLTableSectionElement::~HTMLTableSectionElement() JSObject* HTMLTableSectionElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return HTMLTableSectionElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLTableSectionElement_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_CYCLE_COLLECTION_CLASS(HTMLTableSectionElement) diff --git a/dom/html/HTMLTemplateElement.cpp b/dom/html/HTMLTemplateElement.cpp index 4e6f650e0b7e..fc91b0968bf2 100644 --- a/dom/html/HTMLTemplateElement.cpp +++ b/dom/html/HTMLTemplateElement.cpp @@ -61,7 +61,7 @@ NS_IMPL_ELEMENT_CLONE(HTMLTemplateElement) JSObject* HTMLTemplateElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return HTMLTemplateElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLTemplateElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLTextAreaElement.cpp b/dom/html/HTMLTextAreaElement.cpp index aa33d742ce88..93a8c493c9fb 100644 --- a/dom/html/HTMLTextAreaElement.cpp +++ b/dom/html/HTMLTextAreaElement.cpp @@ -1333,7 +1333,7 @@ HTMLTextAreaElement::FieldSetDisabledChanged(bool aNotify) JSObject* HTMLTextAreaElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLTextAreaElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLTextAreaElement_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/html/HTMLTimeElement.cpp b/dom/html/HTMLTimeElement.cpp index cf803ecedb36..faeb02b5410e 100644 --- a/dom/html/HTMLTimeElement.cpp +++ b/dom/html/HTMLTimeElement.cpp @@ -29,7 +29,7 @@ NS_IMPL_ELEMENT_CLONE(HTMLTimeElement) JSObject* HTMLTimeElement::WrapNode(JSContext* cx, JS::Handle aGivenProto) { - return HTMLTimeElementBinding::Wrap(cx, this, aGivenProto); + return HTMLTimeElement_Binding::Wrap(cx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/HTMLTitleElement.cpp b/dom/html/HTMLTitleElement.cpp index a6c9a9af6b82..0c8d9717a975 100644 --- a/dom/html/HTMLTitleElement.cpp +++ b/dom/html/HTMLTitleElement.cpp @@ -36,7 +36,7 @@ NS_IMPL_ELEMENT_CLONE(HTMLTitleElement) JSObject* HTMLTitleElement::WrapNode(JSContext* cx, JS::Handle aGivenProto) { - return HTMLTitleElementBinding::Wrap(cx, this, aGivenProto); + return HTMLTitleElement_Binding::Wrap(cx, this, aGivenProto); } void diff --git a/dom/html/HTMLTrackElement.cpp b/dom/html/HTMLTrackElement.cpp index 2a53299ab650..97d8c4d732f5 100644 --- a/dom/html/HTMLTrackElement.cpp +++ b/dom/html/HTMLTrackElement.cpp @@ -167,7 +167,7 @@ HTMLTrackElement::OnChannelRedirect(nsIChannel* aChannel, JSObject* HTMLTrackElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLTrackElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLTrackElement_Binding::Wrap(aCx, this, aGivenProto); } TextTrack* diff --git a/dom/html/HTMLUnknownElement.cpp b/dom/html/HTMLUnknownElement.cpp index 1e01d2ce2491..35c429dbd604 100644 --- a/dom/html/HTMLUnknownElement.cpp +++ b/dom/html/HTMLUnknownElement.cpp @@ -20,7 +20,7 @@ NS_IMPL_ISUPPORTS_INHERITED(HTMLUnknownElement, nsGenericHTMLElement, JSObject* HTMLUnknownElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return HTMLUnknownElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLUnknownElement_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_ELEMENT_CLONE(HTMLUnknownElement) diff --git a/dom/html/HTMLVideoElement.cpp b/dom/html/HTMLVideoElement.cpp index 1e7648c03f7b..b8ee27c67f9a 100644 --- a/dom/html/HTMLVideoElement.cpp +++ b/dom/html/HTMLVideoElement.cpp @@ -234,7 +234,7 @@ bool HTMLVideoElement::MozHasAudio() const JSObject* HTMLVideoElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLVideoElementBinding::Wrap(aCx, this, aGivenProto); + return HTMLVideoElement_Binding::Wrap(aCx, this, aGivenProto); } FrameStatistics* diff --git a/dom/html/ImageDocument.cpp b/dom/html/ImageDocument.cpp index 9dd14ec4f499..78349d9670d4 100644 --- a/dom/html/ImageDocument.cpp +++ b/dom/html/ImageDocument.cpp @@ -200,7 +200,7 @@ ImageDocument::Init() JSObject* ImageDocument::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return ImageDocumentBinding::Wrap(aCx, this, aGivenProto); + return ImageDocument_Binding::Wrap(aCx, this, aGivenProto); } nsresult diff --git a/dom/html/MediaError.cpp b/dom/html/MediaError.cpp index ab242503def8..8e27c8d8e40b 100644 --- a/dom/html/MediaError.cpp +++ b/dom/html/MediaError.cpp @@ -87,7 +87,7 @@ MediaError::GetMessage(nsAString& aResult) const JSObject* MediaError::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MediaErrorBinding::Wrap(aCx, this, aGivenProto); + return MediaError_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/RadioNodeList.cpp b/dom/html/RadioNodeList.cpp index 726858ed61c6..1f7cbc4509bd 100644 --- a/dom/html/RadioNodeList.cpp +++ b/dom/html/RadioNodeList.cpp @@ -18,7 +18,7 @@ namespace dom { /* virtual */ JSObject* RadioNodeList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return RadioNodeListBinding::Wrap(aCx, this, aGivenProto); + return RadioNodeList_Binding::Wrap(aCx, this, aGivenProto); } HTMLInputElement* diff --git a/dom/html/TimeRanges.cpp b/dom/html/TimeRanges.cpp index 422a763529e3..dab5904c88f4 100644 --- a/dom/html/TimeRanges.cpp +++ b/dom/html/TimeRanges.cpp @@ -185,7 +185,7 @@ TimeRanges::Find(double aTime, double aTolerance /* = 0 */) JSObject* TimeRanges::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return TimeRangesBinding::Wrap(aCx, this, aGivenProto); + return TimeRanges_Binding::Wrap(aCx, this, aGivenProto); } nsISupports* diff --git a/dom/html/ValidityState.cpp b/dom/html/ValidityState.cpp index 017c340de6be..2fac038b0bd0 100644 --- a/dom/html/ValidityState.cpp +++ b/dom/html/ValidityState.cpp @@ -29,7 +29,7 @@ ValidityState::ValidityState(nsIConstraintValidation* aConstraintValidation) JSObject* ValidityState::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return ValidityStateBinding::Wrap(aCx, this, aGivenProto); + return ValidityState_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/html/nsDOMStringMap.cpp b/dom/html/nsDOMStringMap.cpp index 63720a1ef42b..3e884bbdef83 100644 --- a/dom/html/nsDOMStringMap.cpp +++ b/dom/html/nsDOMStringMap.cpp @@ -72,7 +72,7 @@ nsDOMStringMap::GetDocGroup() const JSObject* nsDOMStringMap::WrapObject(JSContext *cx, JS::Handle aGivenProto) { - return DOMStringMapBinding::Wrap(cx, this, aGivenProto); + return DOMStringMap_Binding::Wrap(cx, this, aGivenProto); } void @@ -257,8 +257,8 @@ nsDOMStringMap::AttributeChanged(Element* aElement, int32_t aModType, const nsAttrValue* aOldValue) { - if ((aModType == MutationEventBinding::ADDITION || - aModType == MutationEventBinding::REMOVAL) && + if ((aModType == MutationEvent_Binding::ADDITION || + aModType == MutationEvent_Binding::REMOVAL) && aNameSpaceID == kNameSpaceID_None && StringBeginsWith(nsDependentAtomString(aAttribute), NS_LITERAL_STRING("data-"))) { diff --git a/dom/html/nsGenericHTMLElement.cpp b/dom/html/nsGenericHTMLElement.cpp index 7f9f287fe6d5..5ed2f83921a1 100644 --- a/dom/html/nsGenericHTMLElement.cpp +++ b/dom/html/nsGenericHTMLElement.cpp @@ -2442,7 +2442,7 @@ nsGenericHTMLElement::Click(CallerType aCallerType) WidgetMouseEvent event(aCallerType == CallerType::System, eMouseClick, nullptr, WidgetMouseEvent::eReal); event.mFlags.mIsPositionless = true; - event.inputSource = MouseEventBinding::MOZ_SOURCE_UNKNOWN; + event.inputSource = MouseEvent_Binding::MOZ_SOURCE_UNKNOWN; EventDispatcher::Dispatch(static_cast(this), context, &event); @@ -2565,7 +2565,7 @@ nsGenericHTMLElement::DispatchSimulatedClick(nsGenericHTMLElement* aElement, { WidgetMouseEvent event(aIsTrusted, eMouseClick, nullptr, WidgetMouseEvent::eReal); - event.inputSource = MouseEventBinding::MOZ_SOURCE_KEYBOARD; + event.inputSource = MouseEvent_Binding::MOZ_SOURCE_KEYBOARD; event.mFlags.mIsPositionless = true; return EventDispatcher::Dispatch(ToSupports(aElement), aPresContext, &event); } diff --git a/dom/html/nsHTMLDocument.cpp b/dom/html/nsHTMLDocument.cpp index 12e00919f364..fd1ca5e806e2 100644 --- a/dom/html/nsHTMLDocument.cpp +++ b/dom/html/nsHTMLDocument.cpp @@ -202,7 +202,7 @@ NS_IMPL_ISUPPORTS_CYCLE_COLLECTION_INHERITED(nsHTMLDocument, JSObject* nsHTMLDocument::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return HTMLDocumentBinding::Wrap(aCx, this, aGivenProto); + return HTMLDocument_Binding::Wrap(aCx, this, aGivenProto); } nsresult diff --git a/dom/indexedDB/IDBCursor.cpp b/dom/indexedDB/IDBCursor.cpp index dbd0028623b7..405e0e42db90 100644 --- a/dom/indexedDB/IDBCursor.cpp +++ b/dom/indexedDB/IDBCursor.cpp @@ -980,11 +980,11 @@ IDBCursor::WrapObject(JSContext* aCx, JS::Handle aGivenProto) switch (mType) { case Type_ObjectStore: case Type_Index: - return IDBCursorWithValueBinding::Wrap(aCx, this, aGivenProto); + return IDBCursorWithValue_Binding::Wrap(aCx, this, aGivenProto); case Type_ObjectStoreKey: case Type_IndexKey: - return IDBCursorBinding::Wrap(aCx, this, aGivenProto); + return IDBCursor_Binding::Wrap(aCx, this, aGivenProto); default: MOZ_CRASH("Bad type!"); diff --git a/dom/indexedDB/IDBDatabase.cpp b/dom/indexedDB/IDBDatabase.cpp index 874ee3f9081f..8fba786aa0b4 100644 --- a/dom/indexedDB/IDBDatabase.cpp +++ b/dom/indexedDB/IDBDatabase.cpp @@ -1231,7 +1231,7 @@ IDBDatabase::PostHandleEvent(EventChainPostVisitor& aVisitor) JSObject* IDBDatabase::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return IDBDatabaseBinding::Wrap(aCx, this, aGivenProto); + return IDBDatabase_Binding::Wrap(aCx, this, aGivenProto); } NS_IMETHODIMP diff --git a/dom/indexedDB/IDBEvents.cpp b/dom/indexedDB/IDBEvents.cpp index 438841082179..cf70081154fa 100644 --- a/dom/indexedDB/IDBEvents.cpp +++ b/dom/indexedDB/IDBEvents.cpp @@ -91,7 +91,7 @@ NS_INTERFACE_MAP_END_INHERITING(Event) JSObject* IDBVersionChangeEvent::WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) { - return IDBVersionChangeEventBinding::Wrap(aCx, this, aGivenProto); + return IDBVersionChangeEvent_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/indexedDB/IDBFactory.cpp b/dom/indexedDB/IDBFactory.cpp index 47b3710bd2aa..6532c189dffb 100644 --- a/dom/indexedDB/IDBFactory.cpp +++ b/dom/indexedDB/IDBFactory.cpp @@ -949,7 +949,7 @@ NS_IMPL_CYCLE_COLLECTION_TRACE_END JSObject* IDBFactory::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return IDBFactoryBinding::Wrap(aCx, this, aGivenProto); + return IDBFactory_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/indexedDB/IDBFileHandle.cpp b/dom/indexedDB/IDBFileHandle.cpp index 3d51b23d8721..289a35ca254f 100644 --- a/dom/indexedDB/IDBFileHandle.cpp +++ b/dom/indexedDB/IDBFileHandle.cpp @@ -796,7 +796,7 @@ IDBFileHandle::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { AssertIsOnOwningThread(); - return IDBFileHandleBinding::Wrap(aCx, this, aGivenProto); + return IDBFileHandle_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/indexedDB/IDBFileRequest.cpp b/dom/indexedDB/IDBFileRequest.cpp index cf779110623f..571b64fb543d 100644 --- a/dom/indexedDB/IDBFileRequest.cpp +++ b/dom/indexedDB/IDBFileRequest.cpp @@ -125,7 +125,7 @@ IDBFileRequest::WrapObject(JSContext* aCx, JS::Handle aGivenProto) if (mWrapAsDOMRequest) { return DOMRequest::WrapObject(aCx, aGivenProto); } - return IDBFileRequestBinding::Wrap(aCx, this, aGivenProto); + return IDBFileRequest_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/indexedDB/IDBIndex.cpp b/dom/indexedDB/IDBIndex.cpp index a0621d9f1bca..c9a269d5072c 100644 --- a/dom/indexedDB/IDBIndex.cpp +++ b/dom/indexedDB/IDBIndex.cpp @@ -673,7 +673,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END JSObject* IDBIndex::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return IDBIndexBinding::Wrap(aCx, this, aGivenProto); + return IDBIndex_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/indexedDB/IDBKeyRange.cpp b/dom/indexedDB/IDBKeyRange.cpp index 14a786c278c5..75883a1845d0 100644 --- a/dom/indexedDB/IDBKeyRange.cpp +++ b/dom/indexedDB/IDBKeyRange.cpp @@ -248,13 +248,13 @@ IDBKeyRange::DropJSObjects() bool IDBKeyRange::WrapObject(JSContext* aCx, JS::Handle aGivenProto, JS::MutableHandle aReflector) { - return IDBKeyRangeBinding::Wrap(aCx, this, aGivenProto, aReflector); + return IDBKeyRange_Binding::Wrap(aCx, this, aGivenProto, aReflector); } bool IDBLocaleAwareKeyRange::WrapObject(JSContext* aCx, JS::Handle aGivenProto, JS::MutableHandle aReflector) { - return IDBLocaleAwareKeyRangeBinding::Wrap(aCx, this, aGivenProto, aReflector); + return IDBLocaleAwareKeyRange_Binding::Wrap(aCx, this, aGivenProto, aReflector); } void diff --git a/dom/indexedDB/IDBMutableFile.cpp b/dom/indexedDB/IDBMutableFile.cpp index f3f77fd57cd1..cfc63e836b67 100644 --- a/dom/indexedDB/IDBMutableFile.cpp +++ b/dom/indexedDB/IDBMutableFile.cpp @@ -248,7 +248,7 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_END JSObject* IDBMutableFile::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return IDBMutableFileBinding::Wrap(aCx, this, aGivenProto); + return IDBMutableFile_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/indexedDB/IDBObjectStore.cpp b/dom/indexedDB/IDBObjectStore.cpp index 8545b577f04d..0f1fa8a03242 100644 --- a/dom/indexedDB/IDBObjectStore.cpp +++ b/dom/indexedDB/IDBObjectStore.cpp @@ -2188,7 +2188,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(IDBObjectStore) JSObject* IDBObjectStore::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return IDBObjectStoreBinding::Wrap(aCx, this, aGivenProto); + return IDBObjectStore_Binding::Wrap(aCx, this, aGivenProto); } nsPIDOMWindowInner* diff --git a/dom/indexedDB/IDBRequest.cpp b/dom/indexedDB/IDBRequest.cpp index bd0a251157f1..f25e0cc0252b 100644 --- a/dom/indexedDB/IDBRequest.cpp +++ b/dom/indexedDB/IDBRequest.cpp @@ -283,7 +283,7 @@ IDBRequest::SetSource(IDBCursor* aSource) JSObject* IDBRequest::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return IDBRequestBinding::Wrap(aCx, this, aGivenProto); + return IDBRequest_Binding::Wrap(aCx, this, aGivenProto); } void @@ -607,7 +607,7 @@ IDBOpenDBRequest::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { AssertIsOnOwningThread(); - return IDBOpenDBRequestBinding::Wrap(aCx, this, aGivenProto); + return IDBOpenDBRequest_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/indexedDB/IDBTransaction.cpp b/dom/indexedDB/IDBTransaction.cpp index 243f2c5041e2..5c4db13be215 100644 --- a/dom/indexedDB/IDBTransaction.cpp +++ b/dom/indexedDB/IDBTransaction.cpp @@ -1017,7 +1017,7 @@ IDBTransaction::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { AssertIsOnOwningThread(); - return IDBTransactionBinding::Wrap(aCx, this, aGivenProto); + return IDBTransaction_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/indexedDB/IndexedDatabaseManager.cpp b/dom/indexedDB/IndexedDatabaseManager.cpp index e8deaab4ed3e..4a9dc007b5cf 100644 --- a/dom/indexedDB/IndexedDatabaseManager.cpp +++ b/dom/indexedDB/IndexedDatabaseManager.cpp @@ -628,19 +628,19 @@ IndexedDatabaseManager::ResolveSandboxBinding(JSContext* aCx) return false; } - if (!IDBCursorBinding::GetConstructorObject(aCx) || - !IDBCursorWithValueBinding::GetConstructorObject(aCx) || - !IDBDatabaseBinding::GetConstructorObject(aCx) || - !IDBFactoryBinding::GetConstructorObject(aCx) || - !IDBIndexBinding::GetConstructorObject(aCx) || - !IDBKeyRangeBinding::GetConstructorObject(aCx) || - !IDBLocaleAwareKeyRangeBinding::GetConstructorObject(aCx) || - !IDBMutableFileBinding::GetConstructorObject(aCx) || - !IDBObjectStoreBinding::GetConstructorObject(aCx) || - !IDBOpenDBRequestBinding::GetConstructorObject(aCx) || - !IDBRequestBinding::GetConstructorObject(aCx) || - !IDBTransactionBinding::GetConstructorObject(aCx) || - !IDBVersionChangeEventBinding::GetConstructorObject(aCx)) + if (!IDBCursor_Binding::GetConstructorObject(aCx) || + !IDBCursorWithValue_Binding::GetConstructorObject(aCx) || + !IDBDatabase_Binding::GetConstructorObject(aCx) || + !IDBFactory_Binding::GetConstructorObject(aCx) || + !IDBIndex_Binding::GetConstructorObject(aCx) || + !IDBKeyRange_Binding::GetConstructorObject(aCx) || + !IDBLocaleAwareKeyRange_Binding::GetConstructorObject(aCx) || + !IDBMutableFile_Binding::GetConstructorObject(aCx) || + !IDBObjectStore_Binding::GetConstructorObject(aCx) || + !IDBOpenDBRequest_Binding::GetConstructorObject(aCx) || + !IDBRequest_Binding::GetConstructorObject(aCx) || + !IDBTransaction_Binding::GetConstructorObject(aCx) || + !IDBVersionChangeEvent_Binding::GetConstructorObject(aCx)) { return false; } diff --git a/dom/interfaces/base/nsIDOMWindowUtils.idl b/dom/interfaces/base/nsIDOMWindowUtils.idl index c3f7dda422c9..c879048222a1 100644 --- a/dom/interfaces/base/nsIDOMWindowUtils.idl +++ b/dom/interfaces/base/nsIDOMWindowUtils.idl @@ -263,7 +263,7 @@ interface nsIDOMWindowUtils : nsISupports { /** * Following modifiers are for sent*Event() except sendNative*Event(). * NOTE: MODIFIER_ALT, MODIFIER_CONTROL, MODIFIER_SHIFT and MODIFIER_META - * are must be same values as EventBinding::*_MASK for backward + * are must be same values as Event_Binding::*_MASK for backward * compatibility. */ const long MODIFIER_ALT = 0x0001; diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp index 88efc9256ec8..2484920f452f 100644 --- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -1540,7 +1540,7 @@ TabChild::RecvMouseEvent(const nsString& aType, APZCCallbackHelper::DispatchMouseEvent(GetPresShell(), aType, CSSPoint(aX, aY), aButton, aClickCount, aModifiers, aIgnoreRootScrollFrame, - MouseEventBinding::MOZ_SOURCE_UNKNOWN, + MouseEvent_Binding::MOZ_SOURCE_UNKNOWN, 0 /* Use the default value here. */); return IPC_OK(); } @@ -3543,9 +3543,9 @@ TabChildGlobal::WrapGlobalObject(JSContext* aCx, JS::RealmOptions& aOptions, JS::MutableHandle aReflector) { - bool ok = ContentFrameMessageManagerBinding::Wrap(aCx, this, this, aOptions, - nsJSPrincipals::get(mTabChild->GetPrincipal()), - true, aReflector); + bool ok = ContentFrameMessageManager_Binding::Wrap(aCx, this, this, aOptions, + nsJSPrincipals::get(mTabChild->GetPrincipal()), + true, aReflector); if (ok) { // Since we can't rewrap we have to preserve the global's wrapper here. PreserveWrapper(ToSupports(this)); diff --git a/dom/mathml/nsMathMLElement.cpp b/dom/mathml/nsMathMLElement.cpp index 3041c449f965..6090d192f763 100644 --- a/dom/mathml/nsMathMLElement.cpp +++ b/dom/mathml/nsMathMLElement.cpp @@ -1084,5 +1084,5 @@ nsMathMLElement::AfterSetAttr(int32_t aNameSpaceID, nsAtom* aName, JSObject* nsMathMLElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return ElementBinding::Wrap(aCx, this, aGivenProto); + return Element_Binding::Wrap(aCx, this, aGivenProto); } diff --git a/dom/media/AudioStreamTrack.cpp b/dom/media/AudioStreamTrack.cpp index 34a128ff92c6..b4ece2820e59 100644 --- a/dom/media/AudioStreamTrack.cpp +++ b/dom/media/AudioStreamTrack.cpp @@ -15,7 +15,7 @@ namespace dom { JSObject* AudioStreamTrack::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return AudioStreamTrackBinding::Wrap(aCx, this, aGivenProto); + return AudioStreamTrack_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/media/AudioTrack.cpp b/dom/media/AudioTrack.cpp index 518390802c52..7cdb34e991a6 100644 --- a/dom/media/AudioTrack.cpp +++ b/dom/media/AudioTrack.cpp @@ -26,7 +26,7 @@ AudioTrack::AudioTrack(nsIGlobalObject* aOwnerGlobal, JSObject* AudioTrack::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return AudioTrackBinding::Wrap(aCx, this, aGivenProto); + return AudioTrack_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/media/AudioTrackList.cpp b/dom/media/AudioTrackList.cpp index 500a633f2d82..1b124bc229ad 100644 --- a/dom/media/AudioTrackList.cpp +++ b/dom/media/AudioTrackList.cpp @@ -13,7 +13,7 @@ namespace dom { JSObject* AudioTrackList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return AudioTrackListBinding::Wrap(aCx, this, aGivenProto); + return AudioTrackList_Binding::Wrap(aCx, this, aGivenProto); } AudioTrack* diff --git a/dom/media/CanvasCaptureMediaStream.cpp b/dom/media/CanvasCaptureMediaStream.cpp index 35deaad8a9a8..027695632357 100644 --- a/dom/media/CanvasCaptureMediaStream.cpp +++ b/dom/media/CanvasCaptureMediaStream.cpp @@ -249,7 +249,7 @@ CanvasCaptureMediaStream::~CanvasCaptureMediaStream() JSObject* CanvasCaptureMediaStream::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return dom::CanvasCaptureMediaStreamBinding::Wrap(aCx, this, aGivenProto); + return dom::CanvasCaptureMediaStream_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/media/DOMMediaStream.cpp b/dom/media/DOMMediaStream.cpp index 18bf735913c3..3f2cfb814ae1 100644 --- a/dom/media/DOMMediaStream.cpp +++ b/dom/media/DOMMediaStream.cpp @@ -506,7 +506,7 @@ DOMMediaStream::Destroy() JSObject* DOMMediaStream::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return dom::MediaStreamBinding::Wrap(aCx, this, aGivenProto); + return dom::MediaStream_Binding::Wrap(aCx, this, aGivenProto); } /* static */ already_AddRefed @@ -1526,7 +1526,7 @@ DOMLocalMediaStream::~DOMLocalMediaStream() JSObject* DOMLocalMediaStream::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return dom::LocalMediaStreamBinding::Wrap(aCx, this, aGivenProto); + return dom::LocalMediaStream_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/media/GetUserMediaRequest.cpp b/dom/media/GetUserMediaRequest.cpp index 784cd827c2a1..4f829209a599 100644 --- a/dom/media/GetUserMediaRequest.cpp +++ b/dom/media/GetUserMediaRequest.cpp @@ -55,7 +55,7 @@ NS_INTERFACE_MAP_END JSObject* GetUserMediaRequest::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return GetUserMediaRequestBinding::Wrap(aCx, this, aGivenProto); + return GetUserMediaRequest_Binding::Wrap(aCx, this, aGivenProto); } nsISupports* GetUserMediaRequest::GetParentObject() diff --git a/dom/media/MediaDeviceInfo.cpp b/dom/media/MediaDeviceInfo.cpp index 4b5a0270902b..8f7a3f823eff 100644 --- a/dom/media/MediaDeviceInfo.cpp +++ b/dom/media/MediaDeviceInfo.cpp @@ -30,7 +30,7 @@ NS_INTERFACE_MAP_END JSObject* MediaDeviceInfo::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MediaDeviceInfoBinding::Wrap(aCx, this, aGivenProto); + return MediaDeviceInfo_Binding::Wrap(aCx, this, aGivenProto); } nsISupports* MediaDeviceInfo::GetParentObject() diff --git a/dom/media/MediaDevices.cpp b/dom/media/MediaDevices.cpp index 495db224fe54..8d8ba09ad959 100644 --- a/dom/media/MediaDevices.cpp +++ b/dom/media/MediaDevices.cpp @@ -281,7 +281,7 @@ MediaDevices::EventListenerAdded(nsAtom* aType) JSObject* MediaDevices::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MediaDevicesBinding::Wrap(aCx, this, aGivenProto); + return MediaDevices_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/media/MediaRecorder.cpp b/dom/media/MediaRecorder.cpp index 49a4d03c1f50..6e9e6aa0cda1 100644 --- a/dom/media/MediaRecorder.cpp +++ b/dom/media/MediaRecorder.cpp @@ -1434,7 +1434,7 @@ MediaRecorder::RequestData(ErrorResult& aResult) JSObject* MediaRecorder::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MediaRecorderBinding::Wrap(aCx, this, aGivenProto); + return MediaRecorder_Binding::Wrap(aCx, this, aGivenProto); } /* static */ already_AddRefed diff --git a/dom/media/MediaStreamError.cpp b/dom/media/MediaStreamError.cpp index 67df30418c95..28a27ed3c96c 100644 --- a/dom/media/MediaStreamError.cpp +++ b/dom/media/MediaStreamError.cpp @@ -72,7 +72,7 @@ NS_INTERFACE_MAP_END JSObject* MediaStreamError::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MediaStreamErrorBinding::Wrap(aCx, this, aGivenProto); + return MediaStreamError_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/media/TextTrack.cpp b/dom/media/TextTrack.cpp index 6858a952f6d5..564cd687b46b 100644 --- a/dom/media/TextTrack.cpp +++ b/dom/media/TextTrack.cpp @@ -85,7 +85,7 @@ TextTrack::SetDefaultSettings() JSObject* TextTrack::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return TextTrackBinding::Wrap(aCx, this, aGivenProto); + return TextTrack_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/media/TextTrackCue.cpp b/dom/media/TextTrackCue.cpp index cb5872347035..5c370675d81b 100644 --- a/dom/media/TextTrackCue.cpp +++ b/dom/media/TextTrackCue.cpp @@ -155,7 +155,7 @@ TextTrackCue::SetTrackElement(HTMLTrackElement* aTrackElement) JSObject* TextTrackCue::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return VTTCueBinding::Wrap(aCx, this, aGivenProto); + return VTTCue_Binding::Wrap(aCx, this, aGivenProto); } TextTrackRegion* diff --git a/dom/media/TextTrackCueList.cpp b/dom/media/TextTrackCueList.cpp index 18d4e6395f29..93abb03d6f78 100644 --- a/dom/media/TextTrackCueList.cpp +++ b/dom/media/TextTrackCueList.cpp @@ -42,7 +42,7 @@ TextTrackCueList::~TextTrackCueList() JSObject* TextTrackCueList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return TextTrackCueListBinding::Wrap(aCx, this, aGivenProto); + return TextTrackCueList_Binding::Wrap(aCx, this, aGivenProto); } TextTrackCue* diff --git a/dom/media/TextTrackList.cpp b/dom/media/TextTrackList.cpp index f49cca69c0db..425a30dc2bd0 100644 --- a/dom/media/TextTrackList.cpp +++ b/dom/media/TextTrackList.cpp @@ -61,7 +61,7 @@ TextTrackList::GetShowingCues(nsTArray >& aCues) JSObject* TextTrackList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return TextTrackListBinding::Wrap(aCx, this, aGivenProto); + return TextTrackList_Binding::Wrap(aCx, this, aGivenProto); } TextTrack* diff --git a/dom/media/TextTrackRegion.cpp b/dom/media/TextTrackRegion.cpp index 0ddfb20d1542..206c85d44705 100644 --- a/dom/media/TextTrackRegion.cpp +++ b/dom/media/TextTrackRegion.cpp @@ -20,7 +20,7 @@ NS_INTERFACE_MAP_END JSObject* TextTrackRegion::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return VTTRegionBinding::Wrap(aCx, this, aGivenProto); + return VTTRegion_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/media/VideoPlaybackQuality.cpp b/dom/media/VideoPlaybackQuality.cpp index 01fecfcb9510..cd9e11e03960 100644 --- a/dom/media/VideoPlaybackQuality.cpp +++ b/dom/media/VideoPlaybackQuality.cpp @@ -36,7 +36,7 @@ VideoPlaybackQuality::GetParentObject() const JSObject* VideoPlaybackQuality::WrapObject(JSContext *aCx, JS::Handle aGivenProto) { - return VideoPlaybackQualityBinding::Wrap(aCx, this, aGivenProto); + return VideoPlaybackQuality_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_CYCLE_COLLECTION_ROOT_NATIVE(VideoPlaybackQuality, AddRef) diff --git a/dom/media/VideoStreamTrack.cpp b/dom/media/VideoStreamTrack.cpp index f9f2a63638bb..0ddd1c5dbb1c 100644 --- a/dom/media/VideoStreamTrack.cpp +++ b/dom/media/VideoStreamTrack.cpp @@ -17,7 +17,7 @@ namespace dom { JSObject* VideoStreamTrack::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return VideoStreamTrackBinding::Wrap(aCx, this, aGivenProto); + return VideoStreamTrack_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/media/VideoTrack.cpp b/dom/media/VideoTrack.cpp index 52e6204709c4..aea05b7d02cb 100644 --- a/dom/media/VideoTrack.cpp +++ b/dom/media/VideoTrack.cpp @@ -39,7 +39,7 @@ NS_INTERFACE_MAP_END_INHERITING(MediaTrack) JSObject* VideoTrack::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return VideoTrackBinding::Wrap(aCx, this, aGivenProto); + return VideoTrack_Binding::Wrap(aCx, this, aGivenProto); } void VideoTrack::SetSelected(bool aSelected) diff --git a/dom/media/VideoTrackList.cpp b/dom/media/VideoTrackList.cpp index ad16b70866a0..54a76c1dd5ba 100644 --- a/dom/media/VideoTrackList.cpp +++ b/dom/media/VideoTrackList.cpp @@ -13,7 +13,7 @@ namespace dom { JSObject* VideoTrackList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return VideoTrackListBinding::Wrap(aCx, this, aGivenProto); + return VideoTrackList_Binding::Wrap(aCx, this, aGivenProto); } VideoTrack* diff --git a/dom/media/eme/MediaEncryptedEvent.cpp b/dom/media/eme/MediaEncryptedEvent.cpp index b3f1e8fc93fc..9f54e8eabc0c 100644 --- a/dom/media/eme/MediaEncryptedEvent.cpp +++ b/dom/media/eme/MediaEncryptedEvent.cpp @@ -49,7 +49,7 @@ MediaEncryptedEvent::~MediaEncryptedEvent() JSObject* MediaEncryptedEvent::WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) { - return MediaEncryptedEventBinding::Wrap(aCx, this, aGivenProto); + return MediaEncryptedEvent_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/media/eme/MediaKeyError.cpp b/dom/media/eme/MediaKeyError.cpp index 40868b24219b..dedd74b96047 100644 --- a/dom/media/eme/MediaKeyError.cpp +++ b/dom/media/eme/MediaKeyError.cpp @@ -31,7 +31,7 @@ MediaKeyError::SystemCode() const JSObject* MediaKeyError::WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) { - return MediaKeyErrorBinding::Wrap(aCx, this, aGivenProto); + return MediaKeyError_Binding::Wrap(aCx, this, aGivenProto); } diff --git a/dom/media/eme/MediaKeyMessageEvent.cpp b/dom/media/eme/MediaKeyMessageEvent.cpp index 0adf63b01d67..9b41e2d26fa6 100644 --- a/dom/media/eme/MediaKeyMessageEvent.cpp +++ b/dom/media/eme/MediaKeyMessageEvent.cpp @@ -60,7 +60,7 @@ MediaKeyMessageEvent::AsMediaKeyMessageEvent() JSObject* MediaKeyMessageEvent::WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) { - return MediaKeyMessageEventBinding::Wrap(aCx, this, aGivenProto); + return MediaKeyMessageEvent_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/media/eme/MediaKeySession.cpp b/dom/media/eme/MediaKeySession.cpp index f038d97bba61..0af787ac841d 100644 --- a/dom/media/eme/MediaKeySession.cpp +++ b/dom/media/eme/MediaKeySession.cpp @@ -114,7 +114,7 @@ MediaKeySession::GetSessionId() const JSObject* MediaKeySession::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MediaKeySessionBinding::Wrap(aCx, this, aGivenProto); + return MediaKeySession_Binding::Wrap(aCx, this, aGivenProto); } double diff --git a/dom/media/eme/MediaKeyStatusMap.cpp b/dom/media/eme/MediaKeyStatusMap.cpp index 5f735d90ded0..dbe0e6d09a6b 100644 --- a/dom/media/eme/MediaKeyStatusMap.cpp +++ b/dom/media/eme/MediaKeyStatusMap.cpp @@ -34,7 +34,7 @@ MediaKeyStatusMap::~MediaKeyStatusMap() JSObject* MediaKeyStatusMap::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MediaKeyStatusMapBinding::Wrap(aCx, this, aGivenProto); + return MediaKeyStatusMap_Binding::Wrap(aCx, this, aGivenProto); } nsPIDOMWindowInner* diff --git a/dom/media/eme/MediaKeySystemAccess.cpp b/dom/media/eme/MediaKeySystemAccess.cpp index 9b02e8524ba6..97db7d9bbe22 100644 --- a/dom/media/eme/MediaKeySystemAccess.cpp +++ b/dom/media/eme/MediaKeySystemAccess.cpp @@ -72,7 +72,7 @@ MediaKeySystemAccess::~MediaKeySystemAccess() JSObject* MediaKeySystemAccess::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MediaKeySystemAccessBinding::Wrap(aCx, this, aGivenProto); + return MediaKeySystemAccess_Binding::Wrap(aCx, this, aGivenProto); } nsPIDOMWindowInner* diff --git a/dom/media/eme/MediaKeys.cpp b/dom/media/eme/MediaKeys.cpp index e98e1ca2ebec..bbf5b72e6401 100644 --- a/dom/media/eme/MediaKeys.cpp +++ b/dom/media/eme/MediaKeys.cpp @@ -120,7 +120,7 @@ MediaKeys::GetParentObject() const JSObject* MediaKeys::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MediaKeysBinding::Wrap(aCx, this, aGivenProto); + return MediaKeys_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/media/imagecapture/ImageCapture.h b/dom/media/imagecapture/ImageCapture.h index f3256f59b7e4..d7f0a696ede1 100644 --- a/dom/media/imagecapture/ImageCapture.h +++ b/dom/media/imagecapture/ImageCapture.h @@ -55,7 +55,7 @@ public: // nsWrapperCache member JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override { - return ImageCaptureBinding::Wrap(aCx, this, aGivenProto); + return ImageCapture_Binding::Wrap(aCx, this, aGivenProto); } // ImageCapture class members diff --git a/dom/media/mediasource/MediaSource.cpp b/dom/media/mediasource/MediaSource.cpp index 7bbfeda2426a..e50ef2c0dd1a 100644 --- a/dom/media/mediasource/MediaSource.cpp +++ b/dom/media/mediasource/MediaSource.cpp @@ -634,7 +634,7 @@ MediaSource::GetParentObject() const JSObject* MediaSource::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MediaSourceBinding::Wrap(aCx, this, aGivenProto); + return MediaSource_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_CYCLE_COLLECTION_INHERITED(MediaSource, DOMEventTargetHelper, diff --git a/dom/media/mediasource/SourceBuffer.cpp b/dom/media/mediasource/SourceBuffer.cpp index c5649fb72524..3ce612cee38a 100644 --- a/dom/media/mediasource/SourceBuffer.cpp +++ b/dom/media/mediasource/SourceBuffer.cpp @@ -525,7 +525,7 @@ SourceBuffer::GetParentObject() const JSObject* SourceBuffer::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SourceBufferBinding::Wrap(aCx, this, aGivenProto); + return SourceBuffer_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/media/mediasource/SourceBufferList.cpp b/dom/media/mediasource/SourceBufferList.cpp index a01c7822ed68..6b8225a637c6 100644 --- a/dom/media/mediasource/SourceBufferList.cpp +++ b/dom/media/mediasource/SourceBufferList.cpp @@ -207,7 +207,7 @@ SourceBufferList::HighestEndTime() JSObject* SourceBufferList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SourceBufferListBinding::Wrap(aCx, this, aGivenProto); + return SourceBufferList_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_CYCLE_COLLECTION_INHERITED(SourceBufferList, DOMEventTargetHelper, diff --git a/dom/media/webaudio/AnalyserNode.cpp b/dom/media/webaudio/AnalyserNode.cpp index 5b90408f8332..9e330d930b62 100644 --- a/dom/media/webaudio/AnalyserNode.cpp +++ b/dom/media/webaudio/AnalyserNode.cpp @@ -177,7 +177,7 @@ AnalyserNode::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const JSObject* AnalyserNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return AnalyserNodeBinding::Wrap(aCx, this, aGivenProto); + return AnalyserNode_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/media/webaudio/AudioBuffer.cpp b/dom/media/webaudio/AudioBuffer.cpp index d42f9c0d7102..fa78c5b719bc 100644 --- a/dom/media/webaudio/AudioBuffer.cpp +++ b/dom/media/webaudio/AudioBuffer.cpp @@ -267,7 +267,7 @@ AudioBuffer::Create(nsPIDOMWindowInner* aWindow, float aSampleRate, JSObject* AudioBuffer::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return AudioBufferBinding::Wrap(aCx, this, aGivenProto); + return AudioBuffer_Binding::Wrap(aCx, this, aGivenProto); } static void diff --git a/dom/media/webaudio/AudioBufferSourceNode.cpp b/dom/media/webaudio/AudioBufferSourceNode.cpp index f67d2ef69836..d46c194ecd39 100644 --- a/dom/media/webaudio/AudioBufferSourceNode.cpp +++ b/dom/media/webaudio/AudioBufferSourceNode.cpp @@ -695,7 +695,7 @@ AudioBufferSourceNode::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const JSObject* AudioBufferSourceNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return AudioBufferSourceNodeBinding::Wrap(aCx, this, aGivenProto); + return AudioBufferSourceNode_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/media/webaudio/AudioContext.cpp b/dom/media/webaudio/AudioContext.cpp index 56fe85f98132..60176636aabf 100644 --- a/dom/media/webaudio/AudioContext.cpp +++ b/dom/media/webaudio/AudioContext.cpp @@ -209,9 +209,9 @@ JSObject* AudioContext::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { if (mIsOffline) { - return OfflineAudioContextBinding::Wrap(aCx, this, aGivenProto); + return OfflineAudioContext_Binding::Wrap(aCx, this, aGivenProto); } else { - return AudioContextBinding::Wrap(aCx, this, aGivenProto); + return AudioContext_Binding::Wrap(aCx, this, aGivenProto); } } diff --git a/dom/media/webaudio/AudioDestinationNode.cpp b/dom/media/webaudio/AudioDestinationNode.cpp index c9541d07dd67..a6bfe28f7685 100644 --- a/dom/media/webaudio/AudioDestinationNode.cpp +++ b/dom/media/webaudio/AudioDestinationNode.cpp @@ -493,7 +493,7 @@ AudioDestinationNode::OfflineShutdown() JSObject* AudioDestinationNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return AudioDestinationNodeBinding::Wrap(aCx, this, aGivenProto); + return AudioDestinationNode_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/media/webaudio/AudioListener.cpp b/dom/media/webaudio/AudioListener.cpp index 0bd11156a4f2..0ba4722c54e3 100644 --- a/dom/media/webaudio/AudioListener.cpp +++ b/dom/media/webaudio/AudioListener.cpp @@ -31,7 +31,7 @@ AudioListener::AudioListener(AudioContext* aContext) JSObject* AudioListener::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return AudioListenerBinding::Wrap(aCx, this, aGivenProto); + return AudioListener_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/media/webaudio/AudioParam.cpp b/dom/media/webaudio/AudioParam.cpp index 4e8606cc2e0d..cd67dc454a86 100644 --- a/dom/media/webaudio/AudioParam.cpp +++ b/dom/media/webaudio/AudioParam.cpp @@ -56,7 +56,7 @@ AudioParam::~AudioParam() JSObject* AudioParam::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return AudioParamBinding::Wrap(aCx, this, aGivenProto); + return AudioParam_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/media/webaudio/AudioParamMap.cpp b/dom/media/webaudio/AudioParamMap.cpp index e32133e4fb4a..6dbc6fb8e21a 100644 --- a/dom/media/webaudio/AudioParamMap.cpp +++ b/dom/media/webaudio/AudioParamMap.cpp @@ -23,7 +23,7 @@ AudioParamMap::AudioParamMap(nsPIDOMWindowInner* aParent) : JSObject* AudioParamMap::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return AudioParamMapBinding::Wrap(aCx, this, aGivenProto); + return AudioParamMap_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/media/webaudio/AudioProcessingEvent.cpp b/dom/media/webaudio/AudioProcessingEvent.cpp index f8211314508f..f3ad72c42682 100644 --- a/dom/media/webaudio/AudioProcessingEvent.cpp +++ b/dom/media/webaudio/AudioProcessingEvent.cpp @@ -37,7 +37,7 @@ AudioProcessingEvent::~AudioProcessingEvent() JSObject* AudioProcessingEvent::WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) { - return AudioProcessingEventBinding::Wrap(aCx, this, aGivenProto); + return AudioProcessingEvent_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/media/webaudio/AudioScheduledSourceNode.cpp b/dom/media/webaudio/AudioScheduledSourceNode.cpp index 4cb4e1514da7..64e3d062fd3b 100644 --- a/dom/media/webaudio/AudioScheduledSourceNode.cpp +++ b/dom/media/webaudio/AudioScheduledSourceNode.cpp @@ -22,7 +22,7 @@ JSObject* AudioScheduledSourceNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return AudioScheduledSourceNodeBinding::Wrap(aCx, this, aGivenProto); + return AudioScheduledSourceNode_Binding::Wrap(aCx, this, aGivenProto); } } // dom namespace diff --git a/dom/media/webaudio/AudioWorkletNode.cpp b/dom/media/webaudio/AudioWorkletNode.cpp index 8b00e003820c..ace527aa811a 100644 --- a/dom/media/webaudio/AudioWorkletNode.cpp +++ b/dom/media/webaudio/AudioWorkletNode.cpp @@ -83,7 +83,7 @@ MessagePort* AudioWorkletNode::GetPort(ErrorResult& aRv) const JSObject* AudioWorkletNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return AudioWorkletNodeBinding::Wrap(aCx, this, aGivenProto); + return AudioWorkletNode_Binding::Wrap(aCx, this, aGivenProto); } size_t diff --git a/dom/media/webaudio/BiquadFilterNode.cpp b/dom/media/webaudio/BiquadFilterNode.cpp index 24937b0951c5..b7ac72c7b85d 100644 --- a/dom/media/webaudio/BiquadFilterNode.cpp +++ b/dom/media/webaudio/BiquadFilterNode.cpp @@ -323,7 +323,7 @@ BiquadFilterNode::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const JSObject* BiquadFilterNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return BiquadFilterNodeBinding::Wrap(aCx, this, aGivenProto); + return BiquadFilterNode_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/media/webaudio/ChannelMergerNode.cpp b/dom/media/webaudio/ChannelMergerNode.cpp index 4b712c64b6af..d93b49d49d83 100644 --- a/dom/media/webaudio/ChannelMergerNode.cpp +++ b/dom/media/webaudio/ChannelMergerNode.cpp @@ -102,7 +102,7 @@ ChannelMergerNode::Create(AudioContext& aAudioContext, JSObject* ChannelMergerNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return ChannelMergerNodeBinding::Wrap(aCx, this, aGivenProto); + return ChannelMergerNode_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/media/webaudio/ChannelSplitterNode.cpp b/dom/media/webaudio/ChannelSplitterNode.cpp index 6aef8c2918a8..c97a3a07b67f 100644 --- a/dom/media/webaudio/ChannelSplitterNode.cpp +++ b/dom/media/webaudio/ChannelSplitterNode.cpp @@ -107,7 +107,7 @@ ChannelSplitterNode::Create(AudioContext& aAudioContext, JSObject* ChannelSplitterNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return ChannelSplitterNodeBinding::Wrap(aCx, this, aGivenProto); + return ChannelSplitterNode_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/media/webaudio/ConstantSourceNode.cpp b/dom/media/webaudio/ConstantSourceNode.cpp index 00ded3cd2d9b..0a766478d198 100644 --- a/dom/media/webaudio/ConstantSourceNode.cpp +++ b/dom/media/webaudio/ConstantSourceNode.cpp @@ -183,7 +183,7 @@ ConstantSourceNode::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const JSObject* ConstantSourceNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return ConstantSourceNodeBinding::Wrap(aCx, this, aGivenProto); + return ConstantSourceNode_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/media/webaudio/ConvolverNode.cpp b/dom/media/webaudio/ConvolverNode.cpp index d7100a690a42..6471a91a6a16 100644 --- a/dom/media/webaudio/ConvolverNode.cpp +++ b/dom/media/webaudio/ConvolverNode.cpp @@ -232,7 +232,7 @@ ConvolverNode::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const JSObject* ConvolverNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return ConvolverNodeBinding::Wrap(aCx, this, aGivenProto); + return ConvolverNode_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/media/webaudio/DelayNode.cpp b/dom/media/webaudio/DelayNode.cpp index 00e9800ff068..dffe9c03824a 100644 --- a/dom/media/webaudio/DelayNode.cpp +++ b/dom/media/webaudio/DelayNode.cpp @@ -248,7 +248,7 @@ DelayNode::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const JSObject* DelayNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return DelayNodeBinding::Wrap(aCx, this, aGivenProto); + return DelayNode_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/media/webaudio/DynamicsCompressorNode.cpp b/dom/media/webaudio/DynamicsCompressorNode.cpp index 8404bcd891f3..62f038c4cc78 100644 --- a/dom/media/webaudio/DynamicsCompressorNode.cpp +++ b/dom/media/webaudio/DynamicsCompressorNode.cpp @@ -253,7 +253,7 @@ DynamicsCompressorNode::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const JSObject* DynamicsCompressorNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return DynamicsCompressorNodeBinding::Wrap(aCx, this, aGivenProto); + return DynamicsCompressorNode_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/media/webaudio/GainNode.cpp b/dom/media/webaudio/GainNode.cpp index 4ee551aee177..900935bb89fd 100644 --- a/dom/media/webaudio/GainNode.cpp +++ b/dom/media/webaudio/GainNode.cpp @@ -165,7 +165,7 @@ GainNode::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const JSObject* GainNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return GainNodeBinding::Wrap(aCx, this, aGivenProto); + return GainNode_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/media/webaudio/IIRFilterNode.cpp b/dom/media/webaudio/IIRFilterNode.cpp index 5716d3025774..cfa2412407cb 100644 --- a/dom/media/webaudio/IIRFilterNode.cpp +++ b/dom/media/webaudio/IIRFilterNode.cpp @@ -226,7 +226,7 @@ IIRFilterNode::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const JSObject* IIRFilterNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return IIRFilterNodeBinding::Wrap(aCx, this, aGivenProto); + return IIRFilterNode_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/media/webaudio/MediaElementAudioSourceNode.cpp b/dom/media/webaudio/MediaElementAudioSourceNode.cpp index d0204efb7aa4..cf786f79f909 100644 --- a/dom/media/webaudio/MediaElementAudioSourceNode.cpp +++ b/dom/media/webaudio/MediaElementAudioSourceNode.cpp @@ -52,7 +52,7 @@ MediaElementAudioSourceNode::Create(AudioContext& aAudioContext, JSObject* MediaElementAudioSourceNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MediaElementAudioSourceNodeBinding::Wrap(aCx, this, aGivenProto); + return MediaElementAudioSourceNode_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp b/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp index c72b12683a52..da750e21a141 100644 --- a/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp +++ b/dom/media/webaudio/MediaStreamAudioDestinationNode.cpp @@ -164,7 +164,7 @@ MediaStreamAudioDestinationNode::DestroyMediaStream() JSObject* MediaStreamAudioDestinationNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MediaStreamAudioDestinationNodeBinding::Wrap(aCx, this, aGivenProto); + return MediaStreamAudioDestinationNode_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/media/webaudio/MediaStreamAudioSourceNode.cpp b/dom/media/webaudio/MediaStreamAudioSourceNode.cpp index cc3c8edb03cf..2ce7e82cd5a2 100644 --- a/dom/media/webaudio/MediaStreamAudioSourceNode.cpp +++ b/dom/media/webaudio/MediaStreamAudioSourceNode.cpp @@ -271,7 +271,7 @@ MediaStreamAudioSourceNode::DestroyMediaStream() JSObject* MediaStreamAudioSourceNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MediaStreamAudioSourceNodeBinding::Wrap(aCx, this, aGivenProto); + return MediaStreamAudioSourceNode_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/media/webaudio/OscillatorNode.cpp b/dom/media/webaudio/OscillatorNode.cpp index edce89d6a4e8..018bf0f6ba94 100644 --- a/dom/media/webaudio/OscillatorNode.cpp +++ b/dom/media/webaudio/OscillatorNode.cpp @@ -469,7 +469,7 @@ OscillatorNode::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const JSObject* OscillatorNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return OscillatorNodeBinding::Wrap(aCx, this, aGivenProto); + return OscillatorNode_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/media/webaudio/PannerNode.cpp b/dom/media/webaudio/PannerNode.cpp index 629603c26f22..cbf487dda8d7 100644 --- a/dom/media/webaudio/PannerNode.cpp +++ b/dom/media/webaudio/PannerNode.cpp @@ -391,7 +391,7 @@ PannerNode::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const JSObject* PannerNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PannerNodeBinding::Wrap(aCx, this, aGivenProto); + return PannerNode_Binding::Wrap(aCx, this, aGivenProto); } void PannerNode::DestroyMediaStream() diff --git a/dom/media/webaudio/PeriodicWave.cpp b/dom/media/webaudio/PeriodicWave.cpp index 478f9a54f5e7..bf979ae2245a 100644 --- a/dom/media/webaudio/PeriodicWave.cpp +++ b/dom/media/webaudio/PeriodicWave.cpp @@ -122,7 +122,7 @@ PeriodicWave::SizeOfIncludingThisIfNotShared(MallocSizeOf aMallocSizeOf) const JSObject* PeriodicWave::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PeriodicWaveBinding::Wrap(aCx, this, aGivenProto); + return PeriodicWave_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/media/webaudio/ScriptProcessorNode.cpp b/dom/media/webaudio/ScriptProcessorNode.cpp index 3f71ca25022c..33bd74635d9c 100644 --- a/dom/media/webaudio/ScriptProcessorNode.cpp +++ b/dom/media/webaudio/ScriptProcessorNode.cpp @@ -537,7 +537,7 @@ ScriptProcessorNode::EventListenerRemoved(nsAtom* aType) JSObject* ScriptProcessorNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return ScriptProcessorNodeBinding::Wrap(aCx, this, aGivenProto); + return ScriptProcessorNode_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/media/webaudio/StereoPannerNode.cpp b/dom/media/webaudio/StereoPannerNode.cpp index c7975513ce80..8c50c23dee92 100644 --- a/dom/media/webaudio/StereoPannerNode.cpp +++ b/dom/media/webaudio/StereoPannerNode.cpp @@ -220,7 +220,7 @@ StereoPannerNode::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const JSObject* StereoPannerNode::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return StereoPannerNodeBinding::Wrap(aCx, this, aGivenProto); + return StereoPannerNode_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/media/webaudio/WaveShaperNode.cpp b/dom/media/webaudio/WaveShaperNode.cpp index 8536534d59e1..56c636e65e6d 100644 --- a/dom/media/webaudio/WaveShaperNode.cpp +++ b/dom/media/webaudio/WaveShaperNode.cpp @@ -350,14 +350,14 @@ WaveShaperNode::Create(AudioContext& aAudioContext, JSObject* WaveShaperNode::WrapObject(JSContext *aCx, JS::Handle aGivenProto) { - return WaveShaperNodeBinding::Wrap(aCx, this, aGivenProto); + return WaveShaperNode_Binding::Wrap(aCx, this, aGivenProto); } void WaveShaperNode::SetCurve(const Nullable& aCurve, ErrorResult& aRv) { // Let's purge the cached value for the curve attribute. - WaveShaperNodeBinding::ClearCachedCurveValue(this); + WaveShaperNode_Binding::ClearCachedCurveValue(this); if (aCurve.IsNull()) { CleanCurveInternal(); diff --git a/dom/media/webrtc/RTCCertificate.cpp b/dom/media/webrtc/RTCCertificate.cpp index 5e8900caac44..4e3d2180a053 100644 --- a/dom/media/webrtc/RTCCertificate.cpp +++ b/dom/media/webrtc/RTCCertificate.cpp @@ -321,7 +321,7 @@ RTCCertificate::CreateDtlsIdentity() const JSObject* RTCCertificate::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return RTCCertificateBinding::Wrap(aCx, this, aGivenProto); + return RTCCertificate_Binding::Wrap(aCx, this, aGivenProto); } bool diff --git a/dom/media/webrtc/RTCIdentityProviderRegistrar.cpp b/dom/media/webrtc/RTCIdentityProviderRegistrar.cpp index 9ea0f0c5a836..2e33c194aa57 100644 --- a/dom/media/webrtc/RTCIdentityProviderRegistrar.cpp +++ b/dom/media/webrtc/RTCIdentityProviderRegistrar.cpp @@ -44,7 +44,7 @@ RTCIdentityProviderRegistrar::GetParentObject() const JSObject* RTCIdentityProviderRegistrar::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return RTCIdentityProviderRegistrarBinding::Wrap(aCx, this, aGivenProto); + return RTCIdentityProviderRegistrar_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/media/webspeech/recognition/SpeechGrammar.cpp b/dom/media/webspeech/recognition/SpeechGrammar.cpp index 50ef4391cbfc..fd8be7a11176 100644 --- a/dom/media/webspeech/recognition/SpeechGrammar.cpp +++ b/dom/media/webspeech/recognition/SpeechGrammar.cpp @@ -46,7 +46,7 @@ SpeechGrammar::GetParentObject() const JSObject* SpeechGrammar::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SpeechGrammarBinding::Wrap(aCx, this, aGivenProto); + return SpeechGrammar_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/media/webspeech/recognition/SpeechGrammarList.cpp b/dom/media/webspeech/recognition/SpeechGrammarList.cpp index 76672ec9a4bc..f899d855ccff 100644 --- a/dom/media/webspeech/recognition/SpeechGrammarList.cpp +++ b/dom/media/webspeech/recognition/SpeechGrammarList.cpp @@ -43,7 +43,7 @@ SpeechGrammarList::Constructor(const GlobalObject& aGlobal, JSObject* SpeechGrammarList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SpeechGrammarListBinding::Wrap(aCx, this, aGivenProto); + return SpeechGrammarList_Binding::Wrap(aCx, this, aGivenProto); } nsISupports* diff --git a/dom/media/webspeech/recognition/SpeechRecognition.cpp b/dom/media/webspeech/recognition/SpeechRecognition.cpp index 58543a6ce26d..cdba6c81f49a 100644 --- a/dom/media/webspeech/recognition/SpeechRecognition.cpp +++ b/dom/media/webspeech/recognition/SpeechRecognition.cpp @@ -156,7 +156,7 @@ SpeechRecognition::SetState(FSMState state) JSObject* SpeechRecognition::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SpeechRecognitionBinding::Wrap(aCx, this, aGivenProto); + return SpeechRecognition_Binding::Wrap(aCx, this, aGivenProto); } bool diff --git a/dom/media/webspeech/recognition/SpeechRecognitionAlternative.cpp b/dom/media/webspeech/recognition/SpeechRecognitionAlternative.cpp index 8526e0f003e3..933f289095a9 100644 --- a/dom/media/webspeech/recognition/SpeechRecognitionAlternative.cpp +++ b/dom/media/webspeech/recognition/SpeechRecognitionAlternative.cpp @@ -34,7 +34,7 @@ SpeechRecognitionAlternative::~SpeechRecognitionAlternative() JSObject* SpeechRecognitionAlternative::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SpeechRecognitionAlternativeBinding::Wrap(aCx, this, aGivenProto); + return SpeechRecognitionAlternative_Binding::Wrap(aCx, this, aGivenProto); } nsISupports* diff --git a/dom/media/webspeech/recognition/SpeechRecognitionResult.cpp b/dom/media/webspeech/recognition/SpeechRecognitionResult.cpp index 33ac1b806863..ff97b2ccf1b5 100644 --- a/dom/media/webspeech/recognition/SpeechRecognitionResult.cpp +++ b/dom/media/webspeech/recognition/SpeechRecognitionResult.cpp @@ -32,7 +32,7 @@ SpeechRecognitionResult::~SpeechRecognitionResult() JSObject* SpeechRecognitionResult::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SpeechRecognitionResultBinding::Wrap(aCx, this, aGivenProto); + return SpeechRecognitionResult_Binding::Wrap(aCx, this, aGivenProto); } nsISupports* diff --git a/dom/media/webspeech/recognition/SpeechRecognitionResultList.cpp b/dom/media/webspeech/recognition/SpeechRecognitionResultList.cpp index ba60553fc9af..aa187000ab7e 100644 --- a/dom/media/webspeech/recognition/SpeechRecognitionResultList.cpp +++ b/dom/media/webspeech/recognition/SpeechRecognitionResultList.cpp @@ -39,7 +39,7 @@ SpeechRecognitionResultList::GetParentObject() const JSObject* SpeechRecognitionResultList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SpeechRecognitionResultListBinding::Wrap(aCx, this, aGivenProto); + return SpeechRecognitionResultList_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/media/webspeech/synth/SpeechSynthesis.cpp b/dom/media/webspeech/synth/SpeechSynthesis.cpp index c4d75a5af898..e752736bacb8 100644 --- a/dom/media/webspeech/synth/SpeechSynthesis.cpp +++ b/dom/media/webspeech/synth/SpeechSynthesis.cpp @@ -78,7 +78,7 @@ SpeechSynthesis::~SpeechSynthesis() JSObject* SpeechSynthesis::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SpeechSynthesisBinding::Wrap(aCx, this, aGivenProto); + return SpeechSynthesis_Binding::Wrap(aCx, this, aGivenProto); } bool diff --git a/dom/media/webspeech/synth/SpeechSynthesisUtterance.cpp b/dom/media/webspeech/synth/SpeechSynthesisUtterance.cpp index 8f055f4657b9..a8405e612d7e 100644 --- a/dom/media/webspeech/synth/SpeechSynthesisUtterance.cpp +++ b/dom/media/webspeech/synth/SpeechSynthesisUtterance.cpp @@ -44,7 +44,7 @@ SpeechSynthesisUtterance::~SpeechSynthesisUtterance() {} JSObject* SpeechSynthesisUtterance::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SpeechSynthesisUtteranceBinding::Wrap(aCx, this, aGivenProto); + return SpeechSynthesisUtterance_Binding::Wrap(aCx, this, aGivenProto); } nsISupports* diff --git a/dom/media/webspeech/synth/SpeechSynthesisVoice.cpp b/dom/media/webspeech/synth/SpeechSynthesisVoice.cpp index 8c8f722841ff..11618faa260d 100644 --- a/dom/media/webspeech/synth/SpeechSynthesisVoice.cpp +++ b/dom/media/webspeech/synth/SpeechSynthesisVoice.cpp @@ -33,7 +33,7 @@ SpeechSynthesisVoice::~SpeechSynthesisVoice() JSObject* SpeechSynthesisVoice::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SpeechSynthesisVoiceBinding::Wrap(aCx, this, aGivenProto); + return SpeechSynthesisVoice_Binding::Wrap(aCx, this, aGivenProto); } nsISupports* diff --git a/dom/messagechannel/MessageChannel.cpp b/dom/messagechannel/MessageChannel.cpp index 0625b3e7293f..f14666d63982 100644 --- a/dom/messagechannel/MessageChannel.cpp +++ b/dom/messagechannel/MessageChannel.cpp @@ -41,7 +41,7 @@ MessageChannel::~MessageChannel() JSObject* MessageChannel::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MessageChannelBinding::Wrap(aCx, this, aGivenProto); + return MessageChannel_Binding::Wrap(aCx, this, aGivenProto); } /* static */ already_AddRefed diff --git a/dom/messagechannel/MessagePort.cpp b/dom/messagechannel/MessagePort.cpp index 0cf11cf2e88a..6267fdac0996 100644 --- a/dom/messagechannel/MessagePort.cpp +++ b/dom/messagechannel/MessagePort.cpp @@ -307,7 +307,7 @@ MessagePort::Initialize(const nsID& aUUID, JSObject* MessagePort::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MessagePortBinding::Wrap(aCx, this, aGivenProto); + return MessagePort_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/midi/MIDIAccess.cpp b/dom/midi/MIDIAccess.cpp index 94fcf05f0a6c..714e65ad3cbb 100644 --- a/dom/midi/MIDIAccess.cpp +++ b/dom/midi/MIDIAccess.cpp @@ -98,11 +98,11 @@ MIDIAccess::FireConnectionEvent(MIDIPort* aPort) ErrorResult rv; if (aPort->State() == MIDIPortDeviceState::Disconnected) { if (aPort->Type() == MIDIPortType::Input && - MIDIInputMapBinding::MaplikeHelpers::Has(mInputMap, id, rv)) { - MIDIInputMapBinding::MaplikeHelpers::Delete(mInputMap, id, rv); + MIDIInputMap_Binding::MaplikeHelpers::Has(mInputMap, id, rv)) { + MIDIInputMap_Binding::MaplikeHelpers::Delete(mInputMap, id, rv); } else if (aPort->Type() == MIDIPortType::Output && - MIDIOutputMapBinding::MaplikeHelpers::Has(mOutputMap, id, rv)) { - MIDIOutputMapBinding::MaplikeHelpers::Delete(mOutputMap, id, rv); + MIDIOutputMap_Binding::MaplikeHelpers::Has(mOutputMap, id, rv)) { + MIDIOutputMap_Binding::MaplikeHelpers::Delete(mOutputMap, id, rv); } // Check to make sure Has()/Delete() calls haven't failed. if(NS_WARN_IF(rv.Failed())) { @@ -114,11 +114,11 @@ MIDIAccess::FireConnectionEvent(MIDIPort* aPort) // owner holding the object during that time, and we should add that port // object to our maps again. if (aPort->Type() == MIDIPortType::Input && - !MIDIInputMapBinding::MaplikeHelpers::Has(mInputMap, id, rv)) { + !MIDIInputMap_Binding::MaplikeHelpers::Has(mInputMap, id, rv)) { if(NS_WARN_IF(rv.Failed())) { return; } - MIDIInputMapBinding::MaplikeHelpers::Set(mInputMap, + MIDIInputMap_Binding::MaplikeHelpers::Set(mInputMap, id, *(static_cast(aPort)), rv); @@ -126,11 +126,11 @@ MIDIAccess::FireConnectionEvent(MIDIPort* aPort) return; } } else if (aPort->Type() == MIDIPortType::Output && - !MIDIOutputMapBinding::MaplikeHelpers::Has(mOutputMap, id, rv)) { + !MIDIOutputMap_Binding::MaplikeHelpers::Has(mOutputMap, id, rv)) { if(NS_WARN_IF(rv.Failed())) { return; } - MIDIOutputMapBinding::MaplikeHelpers::Set(mOutputMap, + MIDIOutputMap_Binding::MaplikeHelpers::Set(mOutputMap, id, *(static_cast(aPort)), rv); @@ -151,7 +151,7 @@ MIDIAccess::MaybeCreateMIDIPort(const MIDIPortInfo& aInfo, ErrorResult& aRv) MIDIPortType type = static_cast(aInfo.type()); RefPtr port; if (type == MIDIPortType::Input) { - bool hasPort = MIDIInputMapBinding::MaplikeHelpers::Has(mInputMap, id, aRv); + bool hasPort = MIDIInputMap_Binding::MaplikeHelpers::Has(mInputMap, id, aRv); if (hasPort || NS_WARN_IF(aRv.Failed())) { // We already have the port in our map. return; @@ -161,7 +161,7 @@ MIDIAccess::MaybeCreateMIDIPort(const MIDIPortInfo& aInfo, ErrorResult& aRv) aRv.Throw(NS_ERROR_FAILURE); return; } - MIDIInputMapBinding::MaplikeHelpers::Set(mInputMap, + MIDIInputMap_Binding::MaplikeHelpers::Set(mInputMap, id, *(static_cast(port.get())), aRv); @@ -169,7 +169,7 @@ MIDIAccess::MaybeCreateMIDIPort(const MIDIPortInfo& aInfo, ErrorResult& aRv) return; } } else if (type == MIDIPortType::Output) { - bool hasPort = MIDIOutputMapBinding::MaplikeHelpers::Has(mOutputMap, id, aRv); + bool hasPort = MIDIOutputMap_Binding::MaplikeHelpers::Has(mOutputMap, id, aRv); if (hasPort || NS_WARN_IF(aRv.Failed())) { // We already have the port in our map. return; @@ -179,7 +179,7 @@ MIDIAccess::MaybeCreateMIDIPort(const MIDIPortInfo& aInfo, ErrorResult& aRv) aRv.Throw(NS_ERROR_FAILURE); return; } - MIDIOutputMapBinding::MaplikeHelpers::Set(mOutputMap, + MIDIOutputMap_Binding::MaplikeHelpers::Set(mOutputMap, id, *(static_cast(port.get())), aRv); @@ -231,7 +231,7 @@ MIDIAccess::Notify(const MIDIPortList& aEvent) JSObject* MIDIAccess::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MIDIAccessBinding::Wrap(aCx, this, aGivenProto); + return MIDIAccess_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/midi/MIDIInput.cpp b/dom/midi/MIDIInput.cpp index d4e8b1da55a0..19ad92d4069e 100644 --- a/dom/midi/MIDIInput.cpp +++ b/dom/midi/MIDIInput.cpp @@ -35,7 +35,7 @@ MIDIInput::Create(nsPIDOMWindowInner* aWindow, MIDIAccess* aMIDIAccessParent, JSObject* MIDIInput::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MIDIInputBinding::Wrap(aCx, this, aGivenProto); + return MIDIInput_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/midi/MIDIInputMap.cpp b/dom/midi/MIDIInputMap.cpp index e89fb0f0cff2..35b9c9aee8c4 100644 --- a/dom/midi/MIDIInputMap.cpp +++ b/dom/midi/MIDIInputMap.cpp @@ -28,7 +28,7 @@ MIDIInputMap::MIDIInputMap(nsPIDOMWindowInner* aParent) : JSObject* MIDIInputMap::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MIDIInputMapBinding::Wrap(aCx, this, aGivenProto); + return MIDIInputMap_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/midi/MIDIMessageEvent.cpp b/dom/midi/MIDIMessageEvent.cpp index 064180cbb1f3..6e2d34344e77 100644 --- a/dom/midi/MIDIMessageEvent.cpp +++ b/dom/midi/MIDIMessageEvent.cpp @@ -53,7 +53,7 @@ MIDIMessageEvent::~MIDIMessageEvent() JSObject* MIDIMessageEvent::WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) { - return MIDIMessageEventBinding::Wrap(aCx, this, aGivenProto); + return MIDIMessageEvent_Binding::Wrap(aCx, this, aGivenProto); } MIDIMessageEvent* diff --git a/dom/midi/MIDIOutput.cpp b/dom/midi/MIDIOutput.cpp index 59e3216f91a9..6df088b51d0f 100644 --- a/dom/midi/MIDIOutput.cpp +++ b/dom/midi/MIDIOutput.cpp @@ -38,7 +38,7 @@ MIDIOutput::Create(nsPIDOMWindowInner* aWindow, MIDIAccess* aMIDIAccessParent, JSObject* MIDIOutput::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MIDIOutputBinding::Wrap(aCx, this, aGivenProto); + return MIDIOutput_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/midi/MIDIOutputMap.cpp b/dom/midi/MIDIOutputMap.cpp index e23e3a0b1626..4153441ece76 100644 --- a/dom/midi/MIDIOutputMap.cpp +++ b/dom/midi/MIDIOutputMap.cpp @@ -28,7 +28,7 @@ MIDIOutputMap::MIDIOutputMap(nsPIDOMWindowInner* aParent) : JSObject* MIDIOutputMap::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MIDIOutputMapBinding::Wrap(aCx, this, aGivenProto); + return MIDIOutputMap_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/midi/MIDIPort.cpp b/dom/midi/MIDIPort.cpp index aec380c60a57..6d8b77403fd4 100644 --- a/dom/midi/MIDIPort.cpp +++ b/dom/midi/MIDIPort.cpp @@ -85,7 +85,7 @@ MIDIPort::UnsetIPCPort() JSObject* MIDIPort::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MIDIPortBinding::Wrap(aCx, this, aGivenProto); + return MIDIPort_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/network/Connection.cpp b/dom/network/Connection.cpp index 1158300dbbb6..56f91ac449df 100644 --- a/dom/network/Connection.cpp +++ b/dom/network/Connection.cpp @@ -82,7 +82,7 @@ Connection::GetDhcpGateway(uint32_t* aGW) JSObject* Connection::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return NetworkInformationBinding::Wrap(aCx, this, aGivenProto); + return NetworkInformation_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/network/TCPServerSocket.cpp b/dom/network/TCPServerSocket.cpp index 17ecdf5f2701..3c0df9d15939 100644 --- a/dom/network/TCPServerSocket.cpp +++ b/dom/network/TCPServerSocket.cpp @@ -188,5 +188,5 @@ TCPServerSocket::SetServerBridgeParent(TCPServerSocketParent* aBridgeParent) JSObject* TCPServerSocket::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return TCPServerSocketBinding::Wrap(aCx, this, aGivenProto); + return TCPServerSocket_Binding::Wrap(aCx, this, aGivenProto); } diff --git a/dom/network/TCPSocket.cpp b/dom/network/TCPSocket.cpp index 35a02b0fa7e6..b1e32d8334fd 100644 --- a/dom/network/TCPSocket.cpp +++ b/dom/network/TCPSocket.cpp @@ -90,7 +90,7 @@ LegacyMozTCPSocket::WrapObject(JSContext* aCx, JS::Handle aGivenProto, JS::MutableHandle aReflector) { - return LegacyMozTCPSocketBinding::Wrap(aCx, this, aGivenProto, aReflector); + return LegacyMozTCPSocket_Binding::Wrap(aCx, this, aGivenProto, aReflector); } NS_IMPL_CYCLE_COLLECTION_CLASS(TCPSocket) @@ -568,7 +568,7 @@ TCPSocket::FireDataEvent(JSContext* aCx, const nsAString& aType, JS::Handle aGivenProto) { - return TCPSocketBinding::Wrap(aCx, this, aGivenProto); + return TCPSocket_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/network/UDPSocket.cpp b/dom/network/UDPSocket.cpp index 246027e56ac0..b2064f30f42a 100644 --- a/dom/network/UDPSocket.cpp +++ b/dom/network/UDPSocket.cpp @@ -138,7 +138,7 @@ UDPSocket::~UDPSocket() JSObject* UDPSocket::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return UDPSocketBinding::Wrap(aCx, this, aGivenProto); + return UDPSocket_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/notification/Notification.cpp b/dom/notification/Notification.cpp index 6fb029363cc4..3b224c004035 100644 --- a/dom/notification/Notification.cpp +++ b/dom/notification/Notification.cpp @@ -2205,7 +2205,7 @@ Notification::WorkerGet(WorkerPrivate* aWorkerPrivate, JSObject* Notification::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return mozilla::dom::NotificationBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::Notification_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/notification/NotificationEvent.h b/dom/notification/NotificationEvent.h index 9bf498f0621a..fe0e9bbfdcf5 100644 --- a/dom/notification/NotificationEvent.h +++ b/dom/notification/NotificationEvent.h @@ -31,7 +31,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return NotificationEventBinding::Wrap(aCx, this, aGivenProto); + return NotificationEvent_Binding::Wrap(aCx, this, aGivenProto); } static already_AddRefed diff --git a/dom/offline/nsDOMOfflineResourceList.cpp b/dom/offline/nsDOMOfflineResourceList.cpp index 306c2fdb0c89..4485268d1fd0 100644 --- a/dom/offline/nsDOMOfflineResourceList.cpp +++ b/dom/offline/nsDOMOfflineResourceList.cpp @@ -95,7 +95,7 @@ nsDOMOfflineResourceList::~nsDOMOfflineResourceList() JSObject* nsDOMOfflineResourceList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return OfflineResourceListBinding::Wrap(aCx, this, aGivenProto); + return OfflineResourceList_Binding::Wrap(aCx, this, aGivenProto); } nsresult diff --git a/dom/payments/PaymentAddress.cpp b/dom/payments/PaymentAddress.cpp index 729a21f6634f..c1aa6b01a199 100644 --- a/dom/payments/PaymentAddress.cpp +++ b/dom/payments/PaymentAddress.cpp @@ -120,7 +120,7 @@ PaymentAddress::~PaymentAddress() JSObject* PaymentAddress::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PaymentAddressBinding::Wrap(aCx, this, aGivenProto); + return PaymentAddress_Binding::Wrap(aCx, this, aGivenProto); } diff --git a/dom/payments/PaymentRequest.cpp b/dom/payments/PaymentRequest.cpp index 8bbe109de319..3179353f196a 100644 --- a/dom/payments/PaymentRequest.cpp +++ b/dom/payments/PaymentRequest.cpp @@ -1070,7 +1070,7 @@ PaymentRequest::~PaymentRequest() JSObject* PaymentRequest::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PaymentRequestBinding::Wrap(aCx, this, aGivenProto); + return PaymentRequest_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/payments/PaymentRequestUpdateEvent.cpp b/dom/payments/PaymentRequestUpdateEvent.cpp index 87d38ec651d4..d5c631f949d2 100644 --- a/dom/payments/PaymentRequestUpdateEvent.cpp +++ b/dom/payments/PaymentRequestUpdateEvent.cpp @@ -140,7 +140,7 @@ JSObject* PaymentRequestUpdateEvent::WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) { - return PaymentRequestUpdateEventBinding::Wrap(aCx, this, aGivenProto); + return PaymentRequestUpdateEvent_Binding::Wrap(aCx, this, aGivenProto); } diff --git a/dom/payments/PaymentResponse.cpp b/dom/payments/PaymentResponse.cpp index 7fc264080302..5e63b8bf383f 100644 --- a/dom/payments/PaymentResponse.cpp +++ b/dom/payments/PaymentResponse.cpp @@ -58,7 +58,7 @@ PaymentResponse::~PaymentResponse() JSObject* PaymentResponse::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PaymentResponseBinding::Wrap(aCx, this, aGivenProto); + return PaymentResponse_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/performance/Performance.cpp b/dom/performance/Performance.cpp index 54aac623c1b5..6613f18981e5 100644 --- a/dom/performance/Performance.cpp +++ b/dom/performance/Performance.cpp @@ -130,7 +130,7 @@ Performance::TimeOrigin() JSObject* Performance::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PerformanceBinding::Wrap(aCx, this, aGivenProto); + return Performance_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/performance/PerformanceEntry.cpp b/dom/performance/PerformanceEntry.cpp index 1111c15a6ada..e0bab8b495c6 100644 --- a/dom/performance/PerformanceEntry.cpp +++ b/dom/performance/PerformanceEntry.cpp @@ -37,7 +37,7 @@ PerformanceEntry::~PerformanceEntry() JSObject* PerformanceEntry::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return mozilla::dom::PerformanceEntryBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::PerformanceEntry_Binding::Wrap(aCx, this, aGivenProto); } size_t diff --git a/dom/performance/PerformanceMark.cpp b/dom/performance/PerformanceMark.cpp index eb4648ae79f9..3ba3c7fdd8b4 100644 --- a/dom/performance/PerformanceMark.cpp +++ b/dom/performance/PerformanceMark.cpp @@ -25,7 +25,7 @@ PerformanceMark::~PerformanceMark() JSObject* PerformanceMark::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PerformanceMarkBinding::Wrap(aCx, this, aGivenProto); + return PerformanceMark_Binding::Wrap(aCx, this, aGivenProto); } size_t diff --git a/dom/performance/PerformanceMeasure.cpp b/dom/performance/PerformanceMeasure.cpp index 6b85e00836dd..0f8257dadc3c 100644 --- a/dom/performance/PerformanceMeasure.cpp +++ b/dom/performance/PerformanceMeasure.cpp @@ -27,7 +27,7 @@ PerformanceMeasure::~PerformanceMeasure() JSObject* PerformanceMeasure::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PerformanceMeasureBinding::Wrap(aCx, this, aGivenProto); + return PerformanceMeasure_Binding::Wrap(aCx, this, aGivenProto); } size_t diff --git a/dom/performance/PerformanceNavigation.cpp b/dom/performance/PerformanceNavigation.cpp index 6c564d7d3c4c..228027c49978 100644 --- a/dom/performance/PerformanceNavigation.cpp +++ b/dom/performance/PerformanceNavigation.cpp @@ -30,7 +30,7 @@ JSObject* PerformanceNavigation::WrapObject(JSContext *cx, JS::Handle aGivenProto) { - return PerformanceNavigationBinding::Wrap(cx, this, aGivenProto); + return PerformanceNavigation_Binding::Wrap(cx, this, aGivenProto); } uint16_t diff --git a/dom/performance/PerformanceNavigationTiming.cpp b/dom/performance/PerformanceNavigationTiming.cpp index 9f2ec5f77181..445906ec1b1c 100644 --- a/dom/performance/PerformanceNavigationTiming.cpp +++ b/dom/performance/PerformanceNavigationTiming.cpp @@ -18,7 +18,7 @@ NS_IMPL_RELEASE_INHERITED(PerformanceNavigationTiming, PerformanceResourceTiming JSObject* PerformanceNavigationTiming::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PerformanceNavigationTimingBinding::Wrap(aCx, this, aGivenProto); + return PerformanceNavigationTiming_Binding::Wrap(aCx, this, aGivenProto); } #define REDUCE_TIME_PRECISION \ diff --git a/dom/performance/PerformanceObserver.cpp b/dom/performance/PerformanceObserver.cpp index 727d25fb7bcb..557fded8700c 100644 --- a/dom/performance/PerformanceObserver.cpp +++ b/dom/performance/PerformanceObserver.cpp @@ -99,7 +99,7 @@ PerformanceObserver::Constructor(const GlobalObject& aGlobal, JSObject* PerformanceObserver::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PerformanceObserverBinding::Wrap(aCx, this, aGivenProto); + return PerformanceObserver_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/performance/PerformanceObserverEntryList.cpp b/dom/performance/PerformanceObserverEntryList.cpp index 20e818f3d765..52c754e27269 100644 --- a/dom/performance/PerformanceObserverEntryList.cpp +++ b/dom/performance/PerformanceObserverEntryList.cpp @@ -33,7 +33,7 @@ PerformanceObserverEntryList::~PerformanceObserverEntryList() JSObject* PerformanceObserverEntryList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PerformanceObserverEntryListBinding::Wrap(aCx, this, aGivenProto); + return PerformanceObserverEntryList_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/performance/PerformanceResourceTiming.cpp b/dom/performance/PerformanceResourceTiming.cpp index bce5120a439d..87bfcb12e479 100644 --- a/dom/performance/PerformanceResourceTiming.cpp +++ b/dom/performance/PerformanceResourceTiming.cpp @@ -69,7 +69,7 @@ PerformanceResourceTiming::StartTime() const JSObject* PerformanceResourceTiming::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PerformanceResourceTimingBinding::Wrap(aCx, this, aGivenProto); + return PerformanceResourceTiming_Binding::Wrap(aCx, this, aGivenProto); } size_t diff --git a/dom/performance/PerformanceServerTiming.cpp b/dom/performance/PerformanceServerTiming.cpp index 95a302d1c4ba..38750f1c9a7d 100644 --- a/dom/performance/PerformanceServerTiming.cpp +++ b/dom/performance/PerformanceServerTiming.cpp @@ -25,7 +25,7 @@ NS_INTERFACE_MAP_END JSObject* PerformanceServerTiming::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return mozilla::dom::PerformanceServerTimingBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::PerformanceServerTiming_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/performance/PerformanceTiming.cpp b/dom/performance/PerformanceTiming.cpp index ec15dc4bf6ed..b8a82f964efc 100644 --- a/dom/performance/PerformanceTiming.cpp +++ b/dom/performance/PerformanceTiming.cpp @@ -651,7 +651,7 @@ PerformanceTiming::ResponseEnd() JSObject* PerformanceTiming::WrapObject(JSContext *cx, JS::Handle aGivenProto) { - return PerformanceTimingBinding::Wrap(cx, this, aGivenProto); + return PerformanceTiming_Binding::Wrap(cx, this, aGivenProto); } bool diff --git a/dom/permission/PermissionStatus.cpp b/dom/permission/PermissionStatus.cpp index 5502c9cea421..0674eaa4afff 100644 --- a/dom/permission/PermissionStatus.cpp +++ b/dom/permission/PermissionStatus.cpp @@ -65,7 +65,7 @@ PermissionStatus::~PermissionStatus() JSObject* PermissionStatus::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PermissionStatusBinding::Wrap(aCx, this, aGivenProto); + return PermissionStatus_Binding::Wrap(aCx, this, aGivenProto); } nsresult diff --git a/dom/permission/Permissions.cpp b/dom/permission/Permissions.cpp index d5c755efa183..15ca592b0229 100644 --- a/dom/permission/Permissions.cpp +++ b/dom/permission/Permissions.cpp @@ -38,7 +38,7 @@ Permissions::~Permissions() JSObject* Permissions::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PermissionsBinding::Wrap(aCx, this, aGivenProto); + return Permissions_Binding::Wrap(aCx, this, aGivenProto); } namespace { diff --git a/dom/plugins/base/nsPluginInstanceOwner.cpp b/dom/plugins/base/nsPluginInstanceOwner.cpp index 096122de01e8..e78fe404676e 100644 --- a/dom/plugins/base/nsPluginInstanceOwner.cpp +++ b/dom/plugins/base/nsPluginInstanceOwner.cpp @@ -2141,11 +2141,11 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const WidgetGUIEvent& anEvent) int32_t delta = 0; if (wheelEvent->mLineOrPageDeltaY) { switch (wheelEvent->mDeltaMode) { - case WheelEventBinding::DOM_DELTA_PAGE: + case WheelEvent_Binding::DOM_DELTA_PAGE: pluginEvent.event = WM_MOUSEWHEEL; delta = -WHEEL_DELTA * wheelEvent->mLineOrPageDeltaY; break; - case WheelEventBinding::DOM_DELTA_LINE: { + case WheelEvent_Binding::DOM_DELTA_LINE: { UINT linesPerWheelDelta = 0; if (NS_WARN_IF(!::SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &linesPerWheelDelta, 0))) { @@ -2161,7 +2161,7 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const WidgetGUIEvent& anEvent) delta *= wheelEvent->mLineOrPageDeltaY; break; } - case WheelEventBinding::DOM_DELTA_PIXEL: + case WheelEvent_Binding::DOM_DELTA_PIXEL: default: // We don't support WM_GESTURE with this path. MOZ_ASSERT(!pluginEvent.event); @@ -2169,11 +2169,11 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const WidgetGUIEvent& anEvent) } } else if (wheelEvent->mLineOrPageDeltaX) { switch (wheelEvent->mDeltaMode) { - case WheelEventBinding::DOM_DELTA_PAGE: + case WheelEvent_Binding::DOM_DELTA_PAGE: pluginEvent.event = WM_MOUSEHWHEEL; delta = -WHEEL_DELTA * wheelEvent->mLineOrPageDeltaX; break; - case WheelEventBinding::DOM_DELTA_LINE: { + case WheelEvent_Binding::DOM_DELTA_LINE: { pluginEvent.event = WM_MOUSEHWHEEL; UINT charsPerWheelDelta = 0; // FYI: SPI_GETWHEELSCROLLCHARS is available on Vista or later. @@ -2190,7 +2190,7 @@ nsEventStatus nsPluginInstanceOwner::ProcessEvent(const WidgetGUIEvent& anEvent) delta *= wheelEvent->mLineOrPageDeltaX; break; } - case WheelEventBinding::DOM_DELTA_PIXEL: + case WheelEvent_Binding::DOM_DELTA_PIXEL: default: // We don't support WM_GESTURE with this path. MOZ_ASSERT(!pluginEvent.event); diff --git a/dom/presentation/Presentation.cpp b/dom/presentation/Presentation.cpp index 3b9adf0f05f5..3453c7808f8c 100644 --- a/dom/presentation/Presentation.cpp +++ b/dom/presentation/Presentation.cpp @@ -57,7 +57,7 @@ Presentation::~Presentation() Presentation::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PresentationBinding::Wrap(aCx, this, aGivenProto); + return Presentation_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/presentation/PresentationAvailability.cpp b/dom/presentation/PresentationAvailability.cpp index 5d16b13ac393..5bcde14c1de5 100644 --- a/dom/presentation/PresentationAvailability.cpp +++ b/dom/presentation/PresentationAvailability.cpp @@ -121,7 +121,7 @@ PresentationAvailability::DisconnectFromOwner() PresentationAvailability::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PresentationAvailabilityBinding::Wrap(aCx, this, aGivenProto); + return PresentationAvailability_Binding::Wrap(aCx, this, aGivenProto); } bool diff --git a/dom/presentation/PresentationConnection.cpp b/dom/presentation/PresentationConnection.cpp index a183033d0c4f..f2efc7000d7d 100644 --- a/dom/presentation/PresentationConnection.cpp +++ b/dom/presentation/PresentationConnection.cpp @@ -151,7 +151,7 @@ PresentationConnection::DisconnectFromOwner() PresentationConnection::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PresentationConnectionBinding::Wrap(aCx, this, aGivenProto); + return PresentationConnection_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/presentation/PresentationConnectionList.cpp b/dom/presentation/PresentationConnectionList.cpp index 858cb46feed6..af690c129190 100644 --- a/dom/presentation/PresentationConnectionList.cpp +++ b/dom/presentation/PresentationConnectionList.cpp @@ -39,7 +39,7 @@ PresentationConnectionList::PresentationConnectionList(nsPIDOMWindowInner* aWind PresentationConnectionList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PresentationConnectionListBinding::Wrap(aCx, this, aGivenProto); + return PresentationConnectionList_Binding::Wrap(aCx, this, aGivenProto); } void @@ -108,7 +108,7 @@ PresentationConnectionList::NotifyStateChange(const nsAString& aSessionId, bool connectionFound = FindConnectionById(aSessionId) != ConnectionArray::NoIndex ? true : false; - PresentationConnectionListBinding::ClearCachedConnectionsValue(this); + PresentationConnectionList_Binding::ClearCachedConnectionsValue(this); switch (aConnection->State()) { case PresentationConnectionState::Connected: if (!connectionFound) { diff --git a/dom/presentation/PresentationReceiver.cpp b/dom/presentation/PresentationReceiver.cpp index f0f63fbb22ee..0902367b0e9a 100644 --- a/dom/presentation/PresentationReceiver.cpp +++ b/dom/presentation/PresentationReceiver.cpp @@ -86,7 +86,7 @@ void PresentationReceiver::Shutdown() PresentationReceiver::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PresentationReceiverBinding::Wrap(aCx, this, aGivenProto); + return PresentationReceiver_Binding::Wrap(aCx, this, aGivenProto); } NS_IMETHODIMP diff --git a/dom/presentation/PresentationRequest.cpp b/dom/presentation/PresentationRequest.cpp index bc6c230f6ec0..91dee7c0fe90 100644 --- a/dom/presentation/PresentationRequest.cpp +++ b/dom/presentation/PresentationRequest.cpp @@ -134,7 +134,7 @@ PresentationRequest::Init() PresentationRequest::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PresentationRequestBinding::Wrap(aCx, this, aGivenProto); + return PresentationRequest_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/promise/Promise.cpp b/dom/promise/Promise.cpp index ad182f76581d..7895de1e0234 100644 --- a/dom/promise/Promise.cpp +++ b/dom/promise/Promise.cpp @@ -362,7 +362,7 @@ public: WrapObject(JSContext* aCx, JS::Handle aGivenProto, JS::MutableHandle aWrapper) { - return PromiseNativeHandlerBinding::Wrap(aCx, this, aGivenProto, aWrapper); + return PromiseNativeHandler_Binding::Wrap(aCx, this, aGivenProto, aWrapper); } NS_DECL_CYCLE_COLLECTING_ISUPPORTS diff --git a/dom/push/PushManager.cpp b/dom/push/PushManager.cpp index 8b14396381ba..d2d391ab6114 100644 --- a/dom/push/PushManager.cpp +++ b/dom/push/PushManager.cpp @@ -467,7 +467,7 @@ NS_INTERFACE_MAP_END JSObject* PushManager::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PushManagerBinding::Wrap(aCx, this, aGivenProto); + return PushManager_Binding::Wrap(aCx, this, aGivenProto); } // static diff --git a/dom/push/PushSubscription.cpp b/dom/push/PushSubscription.cpp index 032e1e008e71..c0a386b14bc5 100644 --- a/dom/push/PushSubscription.cpp +++ b/dom/push/PushSubscription.cpp @@ -234,7 +234,7 @@ NS_INTERFACE_MAP_END JSObject* PushSubscription::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PushSubscriptionBinding::Wrap(aCx, this, aGivenProto); + return PushSubscription_Binding::Wrap(aCx, this, aGivenProto); } // static diff --git a/dom/push/PushSubscriptionOptions.cpp b/dom/push/PushSubscriptionOptions.cpp index 2868d3983e6a..a20d87700bf9 100644 --- a/dom/push/PushSubscriptionOptions.cpp +++ b/dom/push/PushSubscriptionOptions.cpp @@ -56,7 +56,7 @@ JSObject* PushSubscriptionOptions::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PushSubscriptionOptionsBinding::Wrap(aCx, this, aGivenProto); + return PushSubscriptionOptions_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/quota/StorageManager.cpp b/dom/quota/StorageManager.cpp index 96d791d5d861..8685ce0e3ffa 100644 --- a/dom/quota/StorageManager.cpp +++ b/dom/quota/StorageManager.cpp @@ -878,7 +878,7 @@ JSObject* StorageManager::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return StorageManagerBinding::Wrap(aCx, this, aGivenProto); + return StorageManager_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/serviceworkers/ServiceWorker.cpp b/dom/serviceworkers/ServiceWorker.cpp index 726c81504afc..6921dd8867bb 100644 --- a/dom/serviceworkers/ServiceWorker.cpp +++ b/dom/serviceworkers/ServiceWorker.cpp @@ -106,7 +106,7 @@ ServiceWorker::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { MOZ_ASSERT(NS_IsMainThread()); - return ServiceWorkerBinding::Wrap(aCx, this, aGivenProto); + return ServiceWorker_Binding::Wrap(aCx, this, aGivenProto); } ServiceWorkerState diff --git a/dom/serviceworkers/ServiceWorkerContainer.cpp b/dom/serviceworkers/ServiceWorkerContainer.cpp index cd67b2da8190..1c51ac8303c7 100644 --- a/dom/serviceworkers/ServiceWorkerContainer.cpp +++ b/dom/serviceworkers/ServiceWorkerContainer.cpp @@ -112,7 +112,7 @@ ServiceWorkerContainer::ControllerChanged(ErrorResult& aRv) JSObject* ServiceWorkerContainer::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return ServiceWorkerContainerBinding::Wrap(aCx, this, aGivenProto); + return ServiceWorkerContainer_Binding::Wrap(aCx, this, aGivenProto); } namespace { diff --git a/dom/serviceworkers/ServiceWorkerEvents.cpp b/dom/serviceworkers/ServiceWorkerEvents.cpp index a463c13818d7..71420f12a120 100644 --- a/dom/serviceworkers/ServiceWorkerEvents.cpp +++ b/dom/serviceworkers/ServiceWorkerEvents.cpp @@ -803,7 +803,7 @@ RespondWithHandler::CancelRequest(nsresult aStatus) void FetchEvent::RespondWith(JSContext* aCx, Promise& aArg, ErrorResult& aRv) { - if (EventPhase() == EventBinding::NONE || mWaitToRespond) { + if (EventPhase() == Event_Binding::NONE || mWaitToRespond) { aRv.Throw(NS_ERROR_DOM_INVALID_STATE_ERR); return; } @@ -1093,7 +1093,7 @@ NS_INTERFACE_MAP_END JSObject* PushMessageData::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return mozilla::dom::PushMessageDataBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::PushMessageData_Binding::Wrap(aCx, this, aGivenProto); } void @@ -1209,7 +1209,7 @@ NS_IMPL_CYCLE_COLLECTION_INHERITED(PushEvent, ExtendableEvent, mData) JSObject* PushEvent::WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) { - return mozilla::dom::PushEventBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::PushEvent_Binding::Wrap(aCx, this, aGivenProto); } ExtendableMessageEvent::ExtendableMessageEvent(EventTarget* aOwner) diff --git a/dom/serviceworkers/ServiceWorkerEvents.h b/dom/serviceworkers/ServiceWorkerEvents.h index 20f9b9232ddc..1774a02839b9 100644 --- a/dom/serviceworkers/ServiceWorkerEvents.h +++ b/dom/serviceworkers/ServiceWorkerEvents.h @@ -80,7 +80,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return mozilla::dom::ExtendableEventBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::ExtendableEvent_Binding::Wrap(aCx, this, aGivenProto); } static already_AddRefed @@ -137,7 +137,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return FetchEventBinding::Wrap(aCx, this, aGivenProto); + return FetchEvent_Binding::Wrap(aCx, this, aGivenProto); } void PostInit(nsMainThreadPtrHandle& aChannel, @@ -284,7 +284,7 @@ public: virtual JSObject* WrapObjectInternal( JSContext* aCx, JS::Handle aGivenProto) override { - return mozilla::dom::ExtendableMessageEventBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::ExtendableMessageEvent_Binding::Wrap(aCx, this, aGivenProto); } static already_AddRefed diff --git a/dom/serviceworkers/ServiceWorkerRegistration.cpp b/dom/serviceworkers/ServiceWorkerRegistration.cpp index f5fa23c7b0b1..9c0db07714c1 100644 --- a/dom/serviceworkers/ServiceWorkerRegistration.cpp +++ b/dom/serviceworkers/ServiceWorkerRegistration.cpp @@ -59,7 +59,7 @@ JSObject* ServiceWorkerRegistration::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return ServiceWorkerRegistrationBinding::Wrap(aCx, this, aGivenProto); + return ServiceWorkerRegistration_Binding::Wrap(aCx, this, aGivenProto); } /* static */ already_AddRefed diff --git a/dom/smil/TimeEvent.h b/dom/smil/TimeEvent.h index 65541bfed27f..667f9a7afc03 100644 --- a/dom/smil/TimeEvent.h +++ b/dom/smil/TimeEvent.h @@ -28,7 +28,7 @@ public: virtual JSObject* WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) override { - return TimeEventBinding::Wrap(aCx, this, aGivenProto); + return TimeEvent_Binding::Wrap(aCx, this, aGivenProto); } void InitTimeEvent(const nsAString& aType, nsGlobalWindowInner* aView, diff --git a/dom/storage/Storage.cpp b/dom/storage/Storage.cpp index d5232d4f69e7..78269d5021ef 100644 --- a/dom/storage/Storage.cpp +++ b/dom/storage/Storage.cpp @@ -67,7 +67,7 @@ Storage::CanUseStorage(nsIPrincipal& aSubjectPrincipal) /* virtual */ JSObject* Storage::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return StorageBinding::Wrap(aCx, this, aGivenProto); + return Storage_Binding::Wrap(aCx, this, aGivenProto); } namespace { diff --git a/dom/svg/DOMSVGAnimatedLengthList.cpp b/dom/svg/DOMSVGAnimatedLengthList.cpp index 955d59602d9d..0a8474a49556 100644 --- a/dom/svg/DOMSVGAnimatedLengthList.cpp +++ b/dom/svg/DOMSVGAnimatedLengthList.cpp @@ -33,7 +33,7 @@ NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(DOMSVGAnimatedLengthList, Release) JSObject* DOMSVGAnimatedLengthList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return dom::SVGAnimatedLengthListBinding::Wrap(aCx, this, aGivenProto); + return dom::SVGAnimatedLengthList_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/svg/DOMSVGAnimatedNumberList.cpp b/dom/svg/DOMSVGAnimatedNumberList.cpp index 938216f2a840..c3e2e2355a29 100644 --- a/dom/svg/DOMSVGAnimatedNumberList.cpp +++ b/dom/svg/DOMSVGAnimatedNumberList.cpp @@ -38,7 +38,7 @@ NS_INTERFACE_MAP_END JSObject* DOMSVGAnimatedNumberList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return mozilla::dom::SVGAnimatedNumberListBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::SVGAnimatedNumberList_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/svg/DOMSVGLength.cpp b/dom/svg/DOMSVGLength.cpp index 21be7b035ecc..40911ba281bd 100644 --- a/dom/svg/DOMSVGLength.cpp +++ b/dom/svg/DOMSVGLength.cpp @@ -100,7 +100,7 @@ DOMSVGLength::DOMSVGLength(DOMSVGLengthList *aList, , mListIndex(aListIndex) , mAttrEnum(aAttrEnum) , mIsAnimValItem(aIsAnimValItem) - , mUnit(SVGLengthBinding::SVG_LENGTHTYPE_NUMBER) + , mUnit(SVGLength_Binding::SVG_LENGTHTYPE_NUMBER) , mValue(0.0f) , mVal(nullptr) { @@ -118,7 +118,7 @@ DOMSVGLength::DOMSVGLength() , mListIndex(0) , mAttrEnum(0) , mIsAnimValItem(false) - , mUnit(SVGLengthBinding::SVG_LENGTHTYPE_NUMBER) + , mUnit(SVGLength_Binding::SVG_LENGTHTYPE_NUMBER) , mValue(0.0f) , mVal(nullptr) { @@ -130,7 +130,7 @@ DOMSVGLength::DOMSVGLength(nsSVGLength2* aVal, nsSVGElement* aSVGElement, , mListIndex(0) , mAttrEnum(0) , mIsAnimValItem(aAnimVal) - , mUnit(SVGLengthBinding::SVG_LENGTHTYPE_NUMBER) + , mUnit(SVGLength_Binding::SVG_LENGTHTYPE_NUMBER) , mValue(0.0f) , mVal(aVal) , mSVGElement(aSVGElement) @@ -232,8 +232,8 @@ DOMSVGLength::GetValue(ErrorResult& aRv) aRv.Throw(NS_ERROR_FAILURE); } return value; - } else if (mUnit == SVGLengthBinding::SVG_LENGTHTYPE_NUMBER || - mUnit == SVGLengthBinding::SVG_LENGTHTYPE_PX) { + } else if (mUnit == SVGLength_Binding::SVG_LENGTHTYPE_NUMBER || + mUnit == SVGLength_Binding::SVG_LENGTHTYPE_PX) { return mValue; } // else [SVGWG issue] Can't convert this length's value to user units @@ -274,8 +274,8 @@ DOMSVGLength::SetValue(float aUserUnitValue, ErrorResult& aRv) return; } } - } else if (mUnit == SVGLengthBinding::SVG_LENGTHTYPE_NUMBER || - mUnit == SVGLengthBinding::SVG_LENGTHTYPE_PX) { + } else if (mUnit == SVGLength_Binding::SVG_LENGTHTYPE_NUMBER || + mUnit == SVGLength_Binding::SVG_LENGTHTYPE_PX) { mValue = aUserUnitValue; return; } @@ -454,7 +454,7 @@ DOMSVGLength::ConvertToSpecifiedUnits(uint16_t aUnit, ErrorResult& aRv) JSObject* DOMSVGLength::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SVGLengthBinding::Wrap(aCx, this, aGivenProto); + return SVGLength_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/svg/DOMSVGLengthList.cpp b/dom/svg/DOMSVGLengthList.cpp index 88ecd6007c5c..f1b9aacfabaf 100644 --- a/dom/svg/DOMSVGLengthList.cpp +++ b/dom/svg/DOMSVGLengthList.cpp @@ -71,7 +71,7 @@ NS_INTERFACE_MAP_END JSObject* DOMSVGLengthList::WrapObject(JSContext *cx, JS::Handle aGivenProto) { - return mozilla::dom::SVGLengthListBinding::Wrap(cx, this, aGivenProto); + return mozilla::dom::SVGLengthList_Binding::Wrap(cx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/DOMSVGNumber.cpp b/dom/svg/DOMSVGNumber.cpp index e748ec9f5cf0..60ccb2b05169 100644 --- a/dom/svg/DOMSVGNumber.cpp +++ b/dom/svg/DOMSVGNumber.cpp @@ -194,7 +194,7 @@ DOMSVGNumber::IndexIsValid() JSObject* DOMSVGNumber::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return dom::SVGNumberBinding::Wrap(aCx, this, aGivenProto); + return dom::SVGNumber_Binding::Wrap(aCx, this, aGivenProto); } } // namespace mozilla diff --git a/dom/svg/DOMSVGNumberList.cpp b/dom/svg/DOMSVGNumberList.cpp index 85322688fc91..21c71f843935 100644 --- a/dom/svg/DOMSVGNumberList.cpp +++ b/dom/svg/DOMSVGNumberList.cpp @@ -72,7 +72,7 @@ NS_INTERFACE_MAP_END JSObject* DOMSVGNumberList::WrapObject(JSContext *cx, JS::Handle aGivenProto) { - return mozilla::dom::SVGNumberListBinding::Wrap(cx, this, aGivenProto); + return mozilla::dom::SVGNumberList_Binding::Wrap(cx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/DOMSVGPathSeg.cpp b/dom/svg/DOMSVGPathSeg.cpp index f382055b4a30..0164b9a6121f 100644 --- a/dom/svg/DOMSVGPathSeg.cpp +++ b/dom/svg/DOMSVGPathSeg.cpp @@ -14,7 +14,7 @@ namespace mozilla { -using namespace dom::SVGPathSegBinding; +using namespace dom::SVGPathSeg_Binding; // We could use NS_IMPL_CYCLE_COLLECTION(, except that in Unlink() we need to // clear our list's weak ref to us to be safe. (The other option would be to diff --git a/dom/svg/DOMSVGPathSeg.h b/dom/svg/DOMSVGPathSeg.h index 986c4ae41e2e..6cbd07310948 100644 --- a/dom/svg/DOMSVGPathSeg.h +++ b/dom/svg/DOMSVGPathSeg.h @@ -22,7 +22,7 @@ namespace mozilla { #define CHECK_ARG_COUNT_IN_SYNC(segType) \ MOZ_ASSERT(ArrayLength(mArgs) == \ SVGPathSegUtils::ArgCountForType(uint32_t(segType)) || \ - uint32_t(segType) == dom::SVGPathSegBinding::PATHSEG_CLOSEPATH, \ + uint32_t(segType) == dom::SVGPathSeg_Binding::PATHSEG_CLOSEPATH, \ "Arg count/array size out of sync") #define IMPL_SVGPATHSEG_SUBCLASS_COMMON(segName, segType) \ @@ -62,7 +62,7 @@ namespace mozilla { virtual JSObject* \ WrapObject(JSContext* aCx, JS::Handle aGivenProto) override \ { \ - return dom::SVGPathSeg##segName##Binding::Wrap(aCx, this, aGivenProto); \ + return dom::SVGPathSeg##segName##_Binding::Wrap(aCx, this, aGivenProto); \ } @@ -234,7 +234,7 @@ public: } IMPL_SVGPATHSEG_SUBCLASS_COMMON( - ClosePath, dom::SVGPathSegBinding::PATHSEG_CLOSEPATH) + ClosePath, dom::SVGPathSeg_Binding::PATHSEG_CLOSEPATH) protected: // To allow IMPL_SVGPATHSEG_SUBCLASS_COMMON above to compile we need an @@ -255,7 +255,7 @@ public: } IMPL_SVGPATHSEG_SUBCLASS_COMMON( - MovetoAbs, dom::SVGPathSegBinding::PATHSEG_MOVETO_ABS) + MovetoAbs, dom::SVGPathSeg_Binding::PATHSEG_MOVETO_ABS) float X(); void SetX(float aX, ErrorResult& rv); @@ -278,7 +278,7 @@ public: } IMPL_SVGPATHSEG_SUBCLASS_COMMON( - MovetoRel, dom::SVGPathSegBinding::PATHSEG_MOVETO_REL) + MovetoRel, dom::SVGPathSeg_Binding::PATHSEG_MOVETO_REL) float X(); void SetX(float aX, ErrorResult& rv); @@ -301,7 +301,7 @@ public: } IMPL_SVGPATHSEG_SUBCLASS_COMMON( - LinetoAbs, dom::SVGPathSegBinding::PATHSEG_LINETO_ABS) + LinetoAbs, dom::SVGPathSeg_Binding::PATHSEG_LINETO_ABS) float X(); void SetX(float aX, ErrorResult& rv); @@ -324,7 +324,7 @@ public: } IMPL_SVGPATHSEG_SUBCLASS_COMMON( - LinetoRel, dom::SVGPathSegBinding::PATHSEG_LINETO_REL) + LinetoRel, dom::SVGPathSeg_Binding::PATHSEG_LINETO_REL) float X(); void SetX(float aX, ErrorResult& rv); @@ -366,7 +366,7 @@ public: void SetY2(float aY2, ErrorResult& rv); IMPL_SVGPATHSEG_SUBCLASS_COMMON( - CurvetoCubicAbs, dom::SVGPathSegBinding::PATHSEG_CURVETO_CUBIC_ABS) + CurvetoCubicAbs, dom::SVGPathSeg_Binding::PATHSEG_CURVETO_CUBIC_ABS) protected: float mArgs[6]; @@ -390,7 +390,7 @@ public: } IMPL_SVGPATHSEG_SUBCLASS_COMMON( - CurvetoCubicRel, dom::SVGPathSegBinding::PATHSEG_CURVETO_CUBIC_REL) + CurvetoCubicRel, dom::SVGPathSeg_Binding::PATHSEG_CURVETO_CUBIC_REL) float X(); void SetX(float aX, ErrorResult& rv); @@ -424,7 +424,7 @@ public: } IMPL_SVGPATHSEG_SUBCLASS_COMMON( - CurvetoQuadraticAbs, dom::SVGPathSegBinding::PATHSEG_CURVETO_QUADRATIC_ABS) + CurvetoQuadraticAbs, dom::SVGPathSeg_Binding::PATHSEG_CURVETO_QUADRATIC_ABS) float X(); void SetX(float aX, ErrorResult& rv); @@ -454,7 +454,7 @@ public: } IMPL_SVGPATHSEG_SUBCLASS_COMMON( - CurvetoQuadraticRel, dom::SVGPathSegBinding::PATHSEG_CURVETO_QUADRATIC_REL) + CurvetoQuadraticRel, dom::SVGPathSeg_Binding::PATHSEG_CURVETO_QUADRATIC_REL) float X(); void SetX(float aX, ErrorResult& rv); @@ -488,7 +488,7 @@ public: } IMPL_SVGPATHSEG_SUBCLASS_COMMON( - ArcAbs, dom::SVGPathSegBinding::PATHSEG_ARC_ABS) + ArcAbs, dom::SVGPathSeg_Binding::PATHSEG_ARC_ABS) float X(); void SetX(float aX, ErrorResult& rv); @@ -528,7 +528,7 @@ public: } IMPL_SVGPATHSEG_SUBCLASS_COMMON( - ArcRel, dom::SVGPathSegBinding::PATHSEG_ARC_REL) + ArcRel, dom::SVGPathSeg_Binding::PATHSEG_ARC_REL) float X(); void SetX(float aX, ErrorResult& rv); @@ -560,7 +560,7 @@ public: } IMPL_SVGPATHSEG_SUBCLASS_COMMON( - LinetoHorizontalAbs, dom::SVGPathSegBinding::PATHSEG_LINETO_HORIZONTAL_ABS) + LinetoHorizontalAbs, dom::SVGPathSeg_Binding::PATHSEG_LINETO_HORIZONTAL_ABS) float X(); void SetX(float aX, ErrorResult& rv); @@ -580,7 +580,7 @@ public: } IMPL_SVGPATHSEG_SUBCLASS_COMMON( - LinetoHorizontalRel, dom::SVGPathSegBinding::PATHSEG_LINETO_HORIZONTAL_REL) + LinetoHorizontalRel, dom::SVGPathSeg_Binding::PATHSEG_LINETO_HORIZONTAL_REL) float X(); void SetX(float aX, ErrorResult& rv); @@ -600,7 +600,7 @@ public: } IMPL_SVGPATHSEG_SUBCLASS_COMMON( - LinetoVerticalAbs, dom::SVGPathSegBinding::PATHSEG_LINETO_VERTICAL_ABS) + LinetoVerticalAbs, dom::SVGPathSeg_Binding::PATHSEG_LINETO_VERTICAL_ABS) float Y(); void SetY(float aY, ErrorResult& rv); @@ -620,7 +620,7 @@ public: } IMPL_SVGPATHSEG_SUBCLASS_COMMON( - LinetoVerticalRel, dom::SVGPathSegBinding::PATHSEG_LINETO_VERTICAL_REL) + LinetoVerticalRel, dom::SVGPathSeg_Binding::PATHSEG_LINETO_VERTICAL_REL) float Y(); void SetY(float aY, ErrorResult& rv); @@ -644,7 +644,7 @@ public: } IMPL_SVGPATHSEG_SUBCLASS_COMMON( - CurvetoCubicSmoothAbs, dom::SVGPathSegBinding::PATHSEG_CURVETO_CUBIC_SMOOTH_ABS) + CurvetoCubicSmoothAbs, dom::SVGPathSeg_Binding::PATHSEG_CURVETO_CUBIC_SMOOTH_ABS) float X(); void SetX(float aX, ErrorResult& rv); @@ -674,7 +674,7 @@ public: } IMPL_SVGPATHSEG_SUBCLASS_COMMON( - CurvetoCubicSmoothRel, dom::SVGPathSegBinding::PATHSEG_CURVETO_CUBIC_SMOOTH_REL) + CurvetoCubicSmoothRel, dom::SVGPathSeg_Binding::PATHSEG_CURVETO_CUBIC_SMOOTH_REL) float X(); void SetX(float aX, ErrorResult& rv); @@ -701,7 +701,7 @@ public: } IMPL_SVGPATHSEG_SUBCLASS_COMMON( - CurvetoQuadraticSmoothAbs, dom::SVGPathSegBinding::PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS) + CurvetoQuadraticSmoothAbs, dom::SVGPathSeg_Binding::PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS) float X(); void SetX(float aX, ErrorResult& rv); @@ -724,7 +724,7 @@ public: } IMPL_SVGPATHSEG_SUBCLASS_COMMON( - CurvetoQuadraticSmoothRel, dom::SVGPathSegBinding::PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL) + CurvetoQuadraticSmoothRel, dom::SVGPathSeg_Binding::PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL) float X(); void SetX(float aX, ErrorResult& rv); diff --git a/dom/svg/DOMSVGPathSegList.cpp b/dom/svg/DOMSVGPathSegList.cpp index 542db5de707f..bbbc053f4715 100644 --- a/dom/svg/DOMSVGPathSegList.cpp +++ b/dom/svg/DOMSVGPathSegList.cpp @@ -113,7 +113,7 @@ DOMSVGPathSegList::~DOMSVGPathSegList() JSObject* DOMSVGPathSegList::WrapObject(JSContext *cx, JS::Handle aGivenProto) { - return mozilla::dom::SVGPathSegListBinding::Wrap(cx, this, aGivenProto); + return mozilla::dom::SVGPathSegList_Binding::Wrap(cx, this, aGivenProto); } void diff --git a/dom/svg/DOMSVGPointList.cpp b/dom/svg/DOMSVGPointList.cpp index ca06bd27006b..19bf89c14d61 100644 --- a/dom/svg/DOMSVGPointList.cpp +++ b/dom/svg/DOMSVGPointList.cpp @@ -132,7 +132,7 @@ DOMSVGPointList::~DOMSVGPointList() JSObject* DOMSVGPointList::WrapObject(JSContext *cx, JS::Handle aGivenProto) { - return mozilla::dom::SVGPointListBinding::Wrap(cx, this, aGivenProto); + return mozilla::dom::SVGPointList_Binding::Wrap(cx, this, aGivenProto); } void diff --git a/dom/svg/DOMSVGStringList.cpp b/dom/svg/DOMSVGStringList.cpp index b476f85e295c..e79c1a195d50 100644 --- a/dom/svg/DOMSVGStringList.cpp +++ b/dom/svg/DOMSVGStringList.cpp @@ -94,7 +94,7 @@ DOMSVGStringList::~DOMSVGStringList() /* virtual */ JSObject* DOMSVGStringList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SVGStringListBinding::Wrap(aCx, this, aGivenProto); + return SVGStringList_Binding::Wrap(aCx, this, aGivenProto); } // ---------------------------------------------------------------------------- diff --git a/dom/svg/DOMSVGTransformList.cpp b/dom/svg/DOMSVGTransformList.cpp index e4bde9aeb806..c7f487b96a45 100644 --- a/dom/svg/DOMSVGTransformList.cpp +++ b/dom/svg/DOMSVGTransformList.cpp @@ -73,7 +73,7 @@ NS_INTERFACE_MAP_END JSObject* DOMSVGTransformList::WrapObject(JSContext *cx, JS::Handle aGivenProto) { - return mozilla::dom::SVGTransformListBinding::Wrap(cx, this, aGivenProto); + return mozilla::dom::SVGTransformList_Binding::Wrap(cx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/SVGAElement.cpp b/dom/svg/SVGAElement.cpp index 6eac22f08785..bb015e522b7f 100644 --- a/dom/svg/SVGAElement.cpp +++ b/dom/svg/SVGAElement.cpp @@ -25,7 +25,7 @@ namespace dom { JSObject* SVGAElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGAElementBinding::Wrap(aCx, this, aGivenProto); + return SVGAElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::StringInfo SVGAElement::sStringInfo[3] = diff --git a/dom/svg/SVGAngle.cpp b/dom/svg/SVGAngle.cpp index 83d5f7ce1509..d99929f477fd 100644 --- a/dom/svg/SVGAngle.cpp +++ b/dom/svg/SVGAngle.cpp @@ -19,7 +19,7 @@ NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(SVGAngle, Release) JSObject* SVGAngle::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SVGAngleBinding::Wrap(aCx, this, aGivenProto); + return SVGAngle_Binding::Wrap(aCx, this, aGivenProto); } uint16_t diff --git a/dom/svg/SVGAnimateElement.cpp b/dom/svg/SVGAnimateElement.cpp index 150f789a5e8a..546bd8b893c7 100644 --- a/dom/svg/SVGAnimateElement.cpp +++ b/dom/svg/SVGAnimateElement.cpp @@ -15,7 +15,7 @@ namespace dom { JSObject* SVGAnimateElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGAnimateElementBinding::Wrap(aCx, this, aGivenProto); + return SVGAnimateElement_Binding::Wrap(aCx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/SVGAnimateMotionElement.cpp b/dom/svg/SVGAnimateMotionElement.cpp index c8fc5d4673e6..5f8e43d1e9af 100644 --- a/dom/svg/SVGAnimateMotionElement.cpp +++ b/dom/svg/SVGAnimateMotionElement.cpp @@ -15,7 +15,7 @@ namespace dom { JSObject* SVGAnimateMotionElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGAnimateMotionElementBinding::Wrap(aCx, this, aGivenProto); + return SVGAnimateMotionElement_Binding::Wrap(aCx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/SVGAnimateTransformElement.cpp b/dom/svg/SVGAnimateTransformElement.cpp index ca7e0599a4f8..580f6735279c 100644 --- a/dom/svg/SVGAnimateTransformElement.cpp +++ b/dom/svg/SVGAnimateTransformElement.cpp @@ -15,7 +15,7 @@ namespace dom { JSObject* SVGAnimateTransformElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGAnimateTransformElementBinding::Wrap(aCx, this, aGivenProto); + return SVGAnimateTransformElement_Binding::Wrap(aCx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/SVGAnimatedAngle.cpp b/dom/svg/SVGAnimatedAngle.cpp index febc8ead371a..ac56493ffec5 100644 --- a/dom/svg/SVGAnimatedAngle.cpp +++ b/dom/svg/SVGAnimatedAngle.cpp @@ -19,7 +19,7 @@ NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(SVGAnimatedAngle, Release) JSObject* SVGAnimatedAngle::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SVGAnimatedAngleBinding::Wrap(aCx, this, aGivenProto); + return SVGAnimatedAngle_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/svg/SVGAnimatedBoolean.cpp b/dom/svg/SVGAnimatedBoolean.cpp index 102846e36be8..de96c6f08070 100644 --- a/dom/svg/SVGAnimatedBoolean.cpp +++ b/dom/svg/SVGAnimatedBoolean.cpp @@ -18,6 +18,6 @@ NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(SVGAnimatedBoolean, Release) JSObject* SVGAnimatedBoolean::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SVGAnimatedBooleanBinding::Wrap(aCx, this, aGivenProto); + return SVGAnimatedBoolean_Binding::Wrap(aCx, this, aGivenProto); } diff --git a/dom/svg/SVGAnimatedEnumeration.cpp b/dom/svg/SVGAnimatedEnumeration.cpp index 103985f060aa..e5ab2f5b3793 100644 --- a/dom/svg/SVGAnimatedEnumeration.cpp +++ b/dom/svg/SVGAnimatedEnumeration.cpp @@ -25,7 +25,7 @@ NS_INTERFACE_MAP_END JSObject* SVGAnimatedEnumeration::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SVGAnimatedEnumerationBinding::Wrap(aCx, this, aGivenProto); + return SVGAnimatedEnumeration_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/svg/SVGAnimatedInteger.cpp b/dom/svg/SVGAnimatedInteger.cpp index b7eb41ec090f..4fbdf94c0c2e 100644 --- a/dom/svg/SVGAnimatedInteger.cpp +++ b/dom/svg/SVGAnimatedInteger.cpp @@ -25,7 +25,7 @@ NS_INTERFACE_MAP_END JSObject* SVGAnimatedInteger::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SVGAnimatedIntegerBinding::Wrap(aCx, this, aGivenProto); + return SVGAnimatedInteger_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/svg/SVGAnimatedLength.cpp b/dom/svg/SVGAnimatedLength.cpp index 9efea0c4852b..9ab85507d44d 100644 --- a/dom/svg/SVGAnimatedLength.cpp +++ b/dom/svg/SVGAnimatedLength.cpp @@ -20,7 +20,7 @@ NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(SVGAnimatedLength, Release) JSObject* SVGAnimatedLength::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SVGAnimatedLengthBinding::Wrap(aCx, this, aGivenProto); + return SVGAnimatedLength_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/svg/SVGAnimatedLengthList.cpp b/dom/svg/SVGAnimatedLengthList.cpp index fe80551b4781..27ed322b213a 100644 --- a/dom/svg/SVGAnimatedLengthList.cpp +++ b/dom/svg/SVGAnimatedLengthList.cpp @@ -163,9 +163,9 @@ SVGAnimatedLengthList:: aPreventCachingOfSandwich = false; for (uint32_t i = 0; i < llai->Length(); ++i) { uint8_t unit = (*llai)[i].GetUnit(); - if (unit == SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE || - unit == SVGLengthBinding::SVG_LENGTHTYPE_EMS || - unit == SVGLengthBinding::SVG_LENGTHTYPE_EXS) { + if (unit == SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE || + unit == SVGLength_Binding::SVG_LENGTHTYPE_EMS || + unit == SVGLength_Binding::SVG_LENGTHTYPE_EXS) { aPreventCachingOfSandwich = true; break; } diff --git a/dom/svg/SVGAnimatedNumber.cpp b/dom/svg/SVGAnimatedNumber.cpp index b14bfb5582df..66c0724d68ef 100644 --- a/dom/svg/SVGAnimatedNumber.cpp +++ b/dom/svg/SVGAnimatedNumber.cpp @@ -25,7 +25,7 @@ NS_INTERFACE_MAP_END JSObject* SVGAnimatedNumber::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SVGAnimatedNumberBinding::Wrap(aCx, this, aGivenProto); + return SVGAnimatedNumber_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/svg/SVGAnimatedPreserveAspectRatio.cpp b/dom/svg/SVGAnimatedPreserveAspectRatio.cpp index 51cc559e6333..ab2f56a7ea4a 100644 --- a/dom/svg/SVGAnimatedPreserveAspectRatio.cpp +++ b/dom/svg/SVGAnimatedPreserveAspectRatio.cpp @@ -31,7 +31,7 @@ NS_INTERFACE_MAP_END JSObject* DOMSVGAnimatedPreserveAspectRatio::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SVGAnimatedPreserveAspectRatioBinding::Wrap(aCx, this, aGivenProto); + return SVGAnimatedPreserveAspectRatio_Binding::Wrap(aCx, this, aGivenProto); } /* Implementation */ diff --git a/dom/svg/SVGAnimatedPreserveAspectRatio.h b/dom/svg/SVGAnimatedPreserveAspectRatio.h index c29026a23157..5f2a52937494 100644 --- a/dom/svg/SVGAnimatedPreserveAspectRatio.h +++ b/dom/svg/SVGAnimatedPreserveAspectRatio.h @@ -28,9 +28,9 @@ class SVGAnimatedPreserveAspectRatio final public: void Init() { mBaseVal.mAlign = - dom::SVGPreserveAspectRatioBinding::SVG_PRESERVEASPECTRATIO_XMIDYMID; + dom::SVGPreserveAspectRatio_Binding::SVG_PRESERVEASPECTRATIO_XMIDYMID; mBaseVal.mMeetOrSlice = - dom::SVGPreserveAspectRatioBinding::SVG_MEETORSLICE_MEET; + dom::SVGPreserveAspectRatio_Binding::SVG_MEETORSLICE_MEET; mAnimVal = mBaseVal; mIsAnimated = false; mIsBaseSet = false; diff --git a/dom/svg/SVGAnimatedRect.cpp b/dom/svg/SVGAnimatedRect.cpp index f2406a7263c0..350b742b6ac4 100644 --- a/dom/svg/SVGAnimatedRect.cpp +++ b/dom/svg/SVGAnimatedRect.cpp @@ -44,7 +44,7 @@ SVGAnimatedRect::GetAnimVal() JSObject* SVGAnimatedRect::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SVGAnimatedRectBinding::Wrap(aCx, this, aGivenProto); + return SVGAnimatedRect_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/svg/SVGAnimatedString.cpp b/dom/svg/SVGAnimatedString.cpp index 040d6484ee44..d8197a75533a 100644 --- a/dom/svg/SVGAnimatedString.cpp +++ b/dom/svg/SVGAnimatedString.cpp @@ -13,7 +13,7 @@ namespace dom { JSObject* SVGAnimatedString::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SVGAnimatedStringBinding::Wrap(aCx, this, aGivenProto); + return SVGAnimatedString_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/svg/SVGAnimatedTransformList.cpp b/dom/svg/SVGAnimatedTransformList.cpp index 1e4451a986d9..8bc6ba8237a3 100644 --- a/dom/svg/SVGAnimatedTransformList.cpp +++ b/dom/svg/SVGAnimatedTransformList.cpp @@ -25,7 +25,7 @@ NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(SVGAnimatedTransformList, Release) JSObject* SVGAnimatedTransformList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SVGAnimatedTransformListBinding::Wrap(aCx, this, aGivenProto); + return SVGAnimatedTransformList_Binding::Wrap(aCx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/SVGCircleElement.cpp b/dom/svg/SVGCircleElement.cpp index 2f797fb036a4..8d5761081d5d 100644 --- a/dom/svg/SVGCircleElement.cpp +++ b/dom/svg/SVGCircleElement.cpp @@ -20,14 +20,14 @@ namespace dom { JSObject* SVGCircleElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGCircleElementBinding::Wrap(aCx, this, aGivenProto); + return SVGCircleElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::LengthInfo SVGCircleElement::sLengthInfo[3] = { - { &nsGkAtoms::cx, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, - { &nsGkAtoms::cy, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, - { &nsGkAtoms::r, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::XY } + { &nsGkAtoms::cx, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, + { &nsGkAtoms::cy, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, + { &nsGkAtoms::r, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::XY } }; //---------------------------------------------------------------------- diff --git a/dom/svg/SVGClipPathElement.cpp b/dom/svg/SVGClipPathElement.cpp index 0013d950a5a4..83adce65077d 100644 --- a/dom/svg/SVGClipPathElement.cpp +++ b/dom/svg/SVGClipPathElement.cpp @@ -16,12 +16,12 @@ NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(ClipPath) namespace mozilla { namespace dom { -using namespace SVGUnitTypesBinding; +using namespace SVGUnitTypes_Binding; JSObject* SVGClipPathElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGClipPathElementBinding::Wrap(aCx, this, aGivenProto); + return SVGClipPathElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::EnumInfo SVGClipPathElement::sEnumInfo[1] = diff --git a/dom/svg/SVGContentUtils.cpp b/dom/svg/SVGContentUtils.cpp index 0b2eea878590..fe5244b328e6 100644 --- a/dom/svg/SVGContentUtils.cpp +++ b/dom/svg/SVGContentUtils.cpp @@ -35,7 +35,7 @@ using namespace mozilla; using namespace mozilla::dom; -using namespace mozilla::dom::SVGPreserveAspectRatioBinding; +using namespace mozilla::dom::SVGPreserveAspectRatio_Binding; using namespace mozilla::gfx; SVGSVGElement* diff --git a/dom/svg/SVGDefsElement.cpp b/dom/svg/SVGDefsElement.cpp index 284317e25acb..76745f00ff7f 100644 --- a/dom/svg/SVGDefsElement.cpp +++ b/dom/svg/SVGDefsElement.cpp @@ -15,7 +15,7 @@ namespace dom { JSObject* SVGDefsElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGDefsElementBinding::Wrap(aCx, this, aGivenProto); + return SVGDefsElement_Binding::Wrap(aCx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/SVGDescElement.cpp b/dom/svg/SVGDescElement.cpp index c78526c30ce4..2981482f5d09 100644 --- a/dom/svg/SVGDescElement.cpp +++ b/dom/svg/SVGDescElement.cpp @@ -15,7 +15,7 @@ namespace dom { JSObject* SVGDescElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGDescElementBinding::Wrap(aCx, this, aGivenProto); + return SVGDescElement_Binding::Wrap(aCx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/SVGEllipseElement.cpp b/dom/svg/SVGEllipseElement.cpp index c3f2bfcd09ff..d64c40704ecc 100644 --- a/dom/svg/SVGEllipseElement.cpp +++ b/dom/svg/SVGEllipseElement.cpp @@ -21,15 +21,15 @@ namespace dom { JSObject* SVGEllipseElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGEllipseElementBinding::Wrap(aCx, this, aGivenProto); + return SVGEllipseElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::LengthInfo SVGEllipseElement::sLengthInfo[4] = { - { &nsGkAtoms::cx, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, - { &nsGkAtoms::cy, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, - { &nsGkAtoms::rx, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, - { &nsGkAtoms::ry, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, + { &nsGkAtoms::cx, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, + { &nsGkAtoms::cy, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, + { &nsGkAtoms::rx, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, + { &nsGkAtoms::ry, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, }; //---------------------------------------------------------------------- diff --git a/dom/svg/SVGFEBlendElement.cpp b/dom/svg/SVGFEBlendElement.cpp index b323f2bf9a2f..fa673cf8cbaa 100644 --- a/dom/svg/SVGFEBlendElement.cpp +++ b/dom/svg/SVGFEBlendElement.cpp @@ -18,7 +18,7 @@ namespace dom { JSObject* SVGFEBlendElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGFEBlendElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFEBlendElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGEnumMapping SVGFEBlendElement::sModeMap[] = { diff --git a/dom/svg/SVGFEColorMatrixElement.cpp b/dom/svg/SVGFEColorMatrixElement.cpp index d3848a22dad3..2082a4ac5150 100644 --- a/dom/svg/SVGFEColorMatrixElement.cpp +++ b/dom/svg/SVGFEColorMatrixElement.cpp @@ -21,7 +21,7 @@ namespace dom { JSObject* SVGFEColorMatrixElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGFEColorMatrixElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFEColorMatrixElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGEnumMapping SVGFEColorMatrixElement::sTypeMap[] = { diff --git a/dom/svg/SVGFEComponentTransferElement.cpp b/dom/svg/SVGFEComponentTransferElement.cpp index 494d06db1713..f526ac25bbb3 100644 --- a/dom/svg/SVGFEComponentTransferElement.cpp +++ b/dom/svg/SVGFEComponentTransferElement.cpp @@ -20,7 +20,7 @@ namespace dom { JSObject* SVGFEComponentTransferElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGFEComponentTransferElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFEComponentTransferElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::StringInfo SVGFEComponentTransferElement::sStringInfo[2] = diff --git a/dom/svg/SVGFECompositeElement.cpp b/dom/svg/SVGFECompositeElement.cpp index 58ae1c3c97b3..2e17623140bf 100644 --- a/dom/svg/SVGFECompositeElement.cpp +++ b/dom/svg/SVGFECompositeElement.cpp @@ -17,7 +17,7 @@ namespace dom { JSObject* SVGFECompositeElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGFECompositeElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFECompositeElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::NumberInfo SVGFECompositeElement::sNumberInfo[4] = diff --git a/dom/svg/SVGFEConvolveMatrixElement.cpp b/dom/svg/SVGFEConvolveMatrixElement.cpp index a98a2f21090c..5f87b2d5c93f 100644 --- a/dom/svg/SVGFEConvolveMatrixElement.cpp +++ b/dom/svg/SVGFEConvolveMatrixElement.cpp @@ -22,7 +22,7 @@ namespace dom { JSObject* SVGFEConvolveMatrixElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGFEConvolveMatrixElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFEConvolveMatrixElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::NumberInfo SVGFEConvolveMatrixElement::sNumberInfo[2] = diff --git a/dom/svg/SVGFEDiffuseLightingElement.cpp b/dom/svg/SVGFEDiffuseLightingElement.cpp index fa0f07ce7a24..1537a28c8ef4 100644 --- a/dom/svg/SVGFEDiffuseLightingElement.cpp +++ b/dom/svg/SVGFEDiffuseLightingElement.cpp @@ -19,7 +19,7 @@ namespace dom { JSObject* SVGFEDiffuseLightingElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGFEDiffuseLightingElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFEDiffuseLightingElement_Binding::Wrap(aCx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/SVGFEDisplacementMapElement.cpp b/dom/svg/SVGFEDisplacementMapElement.cpp index 74bcec5b269e..bf043eb3e8ed 100644 --- a/dom/svg/SVGFEDisplacementMapElement.cpp +++ b/dom/svg/SVGFEDisplacementMapElement.cpp @@ -19,7 +19,7 @@ namespace dom { JSObject* SVGFEDisplacementMapElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGFEDisplacementMapElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFEDisplacementMapElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::NumberInfo SVGFEDisplacementMapElement::sNumberInfo[1] = diff --git a/dom/svg/SVGFEDistantLightElement.cpp b/dom/svg/SVGFEDistantLightElement.cpp index c7eb927c5726..cbbb528b5440 100644 --- a/dom/svg/SVGFEDistantLightElement.cpp +++ b/dom/svg/SVGFEDistantLightElement.cpp @@ -18,7 +18,7 @@ namespace dom { JSObject* SVGFEDistantLightElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGFEDistantLightElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFEDistantLightElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::NumberInfo SVGFEDistantLightElement::sNumberInfo[2] = diff --git a/dom/svg/SVGFEDropShadowElement.cpp b/dom/svg/SVGFEDropShadowElement.cpp index aa86ede2d59a..8c1c45b83dd6 100644 --- a/dom/svg/SVGFEDropShadowElement.cpp +++ b/dom/svg/SVGFEDropShadowElement.cpp @@ -19,7 +19,7 @@ namespace dom { JSObject* SVGFEDropShadowElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGFEDropShadowElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFEDropShadowElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::NumberInfo SVGFEDropShadowElement::sNumberInfo[2] = diff --git a/dom/svg/SVGFEFloodElement.cpp b/dom/svg/SVGFEFloodElement.cpp index 861e087578d3..5ddf7530f570 100644 --- a/dom/svg/SVGFEFloodElement.cpp +++ b/dom/svg/SVGFEFloodElement.cpp @@ -21,7 +21,7 @@ namespace dom { JSObject* SVGFEFloodElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGFEFloodElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFEFloodElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::StringInfo SVGFEFloodElement::sStringInfo[1] = diff --git a/dom/svg/SVGFEGaussianBlurElement.cpp b/dom/svg/SVGFEGaussianBlurElement.cpp index 4584bdca9c5a..c52b8d71839d 100644 --- a/dom/svg/SVGFEGaussianBlurElement.cpp +++ b/dom/svg/SVGFEGaussianBlurElement.cpp @@ -19,7 +19,7 @@ namespace dom { JSObject* SVGFEGaussianBlurElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGFEGaussianBlurElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFEGaussianBlurElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::NumberPairInfo SVGFEGaussianBlurElement::sNumberPairInfo[1] = diff --git a/dom/svg/SVGFEImageElement.cpp b/dom/svg/SVGFEImageElement.cpp index 35c96304ef09..08d45fa96fbe 100644 --- a/dom/svg/SVGFEImageElement.cpp +++ b/dom/svg/SVGFEImageElement.cpp @@ -29,7 +29,7 @@ namespace dom { JSObject* SVGFEImageElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGFEImageElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFEImageElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::StringInfo SVGFEImageElement::sStringInfo[3] = diff --git a/dom/svg/SVGFEMergeElement.cpp b/dom/svg/SVGFEMergeElement.cpp index 3147648b5589..49a0a82daaed 100644 --- a/dom/svg/SVGFEMergeElement.cpp +++ b/dom/svg/SVGFEMergeElement.cpp @@ -18,7 +18,7 @@ namespace dom { JSObject* SVGFEMergeElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGFEMergeElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFEMergeElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::StringInfo SVGFEMergeElement::sStringInfo[1] = diff --git a/dom/svg/SVGFEMergeNodeElement.cpp b/dom/svg/SVGFEMergeNodeElement.cpp index b04326a5ed60..2fe12024fb91 100644 --- a/dom/svg/SVGFEMergeNodeElement.cpp +++ b/dom/svg/SVGFEMergeNodeElement.cpp @@ -15,7 +15,7 @@ namespace dom { JSObject* SVGFEMergeNodeElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGFEMergeNodeElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFEMergeNodeElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::StringInfo SVGFEMergeNodeElement::sStringInfo[1] = diff --git a/dom/svg/SVGFEMorphologyElement.cpp b/dom/svg/SVGFEMorphologyElement.cpp index fa0c210c2fed..6c581882d6b0 100644 --- a/dom/svg/SVGFEMorphologyElement.cpp +++ b/dom/svg/SVGFEMorphologyElement.cpp @@ -18,7 +18,7 @@ namespace dom { JSObject* SVGFEMorphologyElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGFEMorphologyElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFEMorphologyElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::NumberPairInfo SVGFEMorphologyElement::sNumberPairInfo[1] = diff --git a/dom/svg/SVGFEOffsetElement.cpp b/dom/svg/SVGFEOffsetElement.cpp index 7fc0eff81df8..1526d076f00b 100644 --- a/dom/svg/SVGFEOffsetElement.cpp +++ b/dom/svg/SVGFEOffsetElement.cpp @@ -18,7 +18,7 @@ namespace dom { JSObject* SVGFEOffsetElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGFEOffsetElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFEOffsetElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::NumberInfo SVGFEOffsetElement::sNumberInfo[2] = diff --git a/dom/svg/SVGFEPointLightElement.cpp b/dom/svg/SVGFEPointLightElement.cpp index 65c4f73c7ffe..772bb136c873 100644 --- a/dom/svg/SVGFEPointLightElement.cpp +++ b/dom/svg/SVGFEPointLightElement.cpp @@ -18,7 +18,7 @@ namespace dom { JSObject* SVGFEPointLightElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGFEPointLightElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFEPointLightElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::NumberInfo SVGFEPointLightElement::sNumberInfo[3] = diff --git a/dom/svg/SVGFESpecularLightingElement.cpp b/dom/svg/SVGFESpecularLightingElement.cpp index 2dd03ae54975..9f5d100b0894 100644 --- a/dom/svg/SVGFESpecularLightingElement.cpp +++ b/dom/svg/SVGFESpecularLightingElement.cpp @@ -19,7 +19,7 @@ namespace dom { JSObject* SVGFESpecularLightingElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGFESpecularLightingElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFESpecularLightingElement_Binding::Wrap(aCx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/SVGFESpotLightElement.cpp b/dom/svg/SVGFESpotLightElement.cpp index 22b755ec596a..e50392a8529c 100644 --- a/dom/svg/SVGFESpotLightElement.cpp +++ b/dom/svg/SVGFESpotLightElement.cpp @@ -18,7 +18,7 @@ namespace dom { JSObject* SVGFESpotLightElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGFESpotLightElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFESpotLightElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::NumberInfo SVGFESpotLightElement::sNumberInfo[8] = diff --git a/dom/svg/SVGFETileElement.cpp b/dom/svg/SVGFETileElement.cpp index c72c3850ce91..0b39a8a91067 100644 --- a/dom/svg/SVGFETileElement.cpp +++ b/dom/svg/SVGFETileElement.cpp @@ -18,7 +18,7 @@ namespace dom { JSObject* SVGFETileElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGFETileElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFETileElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::StringInfo SVGFETileElement::sStringInfo[2] = diff --git a/dom/svg/SVGFETurbulenceElement.cpp b/dom/svg/SVGFETurbulenceElement.cpp index 86da580ee3e1..5a6f0a0718e2 100644 --- a/dom/svg/SVGFETurbulenceElement.cpp +++ b/dom/svg/SVGFETurbulenceElement.cpp @@ -25,7 +25,7 @@ static const int32_t MAX_OCTAVES = 10; JSObject* SVGFETurbulenceElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGFETurbulenceElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFETurbulenceElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::NumberInfo SVGFETurbulenceElement::sNumberInfo[1] = diff --git a/dom/svg/SVGFilterElement.cpp b/dom/svg/SVGFilterElement.cpp index 6f5e8e390292..b10fd1693144 100644 --- a/dom/svg/SVGFilterElement.cpp +++ b/dom/svg/SVGFilterElement.cpp @@ -19,20 +19,20 @@ NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(Filter) namespace mozilla { namespace dom { -using namespace SVGUnitTypesBinding; +using namespace SVGUnitTypes_Binding; JSObject* SVGFilterElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGFilterElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFilterElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::LengthInfo SVGFilterElement::sLengthInfo[4] = { - { &nsGkAtoms::x, -10, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, - { &nsGkAtoms::y, -10, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, - { &nsGkAtoms::width, 120, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, - { &nsGkAtoms::height, 120, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, + { &nsGkAtoms::x, -10, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, + { &nsGkAtoms::y, -10, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, + { &nsGkAtoms::width, 120, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, + { &nsGkAtoms::height, 120, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, }; nsSVGElement::EnumInfo SVGFilterElement::sEnumInfo[2] = diff --git a/dom/svg/SVGForeignObjectElement.cpp b/dom/svg/SVGForeignObjectElement.cpp index 45b617c61e22..6247852f8602 100644 --- a/dom/svg/SVGForeignObjectElement.cpp +++ b/dom/svg/SVGForeignObjectElement.cpp @@ -20,15 +20,15 @@ namespace dom { JSObject* SVGForeignObjectElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGForeignObjectElementBinding::Wrap(aCx, this, aGivenProto); + return SVGForeignObjectElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::LengthInfo SVGForeignObjectElement::sLengthInfo[4] = { - { &nsGkAtoms::x, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, - { &nsGkAtoms::y, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, - { &nsGkAtoms::width, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, - { &nsGkAtoms::height, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, + { &nsGkAtoms::x, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, + { &nsGkAtoms::y, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, + { &nsGkAtoms::width, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, + { &nsGkAtoms::height, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, }; //---------------------------------------------------------------------- diff --git a/dom/svg/SVGGElement.cpp b/dom/svg/SVGGElement.cpp index 04c6a0df38fd..1dfb2b3eaa63 100644 --- a/dom/svg/SVGGElement.cpp +++ b/dom/svg/SVGGElement.cpp @@ -15,7 +15,7 @@ namespace dom { JSObject* SVGGElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGGElementBinding::Wrap(aCx, this, aGivenProto); + return SVGGElement_Binding::Wrap(aCx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/SVGGeometryElement.cpp b/dom/svg/SVGGeometryElement.cpp index 6047aaddcaba..4071002ef100 100644 --- a/dom/svg/SVGGeometryElement.cpp +++ b/dom/svg/SVGGeometryElement.cpp @@ -85,7 +85,7 @@ SVGGeometryElement::GeometryDependsOnCoordCtx() LengthAttributesInfo info = const_cast(this)->GetLengthInfo(); for (uint32_t i = 0; i < info.mLengthCount; i++) { if (info.mLengths[i].GetSpecifiedUnitType() == - SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE) { + SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE) { return true; } } diff --git a/dom/svg/SVGGradientElement.cpp b/dom/svg/SVGGradientElement.cpp index d2be6fd657f2..eb961583a6db 100644 --- a/dom/svg/SVGGradientElement.cpp +++ b/dom/svg/SVGGradientElement.cpp @@ -23,8 +23,8 @@ NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(RadialGradient) namespace mozilla { namespace dom { -using namespace SVGGradientElementBinding; -using namespace SVGUnitTypesBinding; +using namespace SVGGradientElement_Binding; +using namespace SVGUnitTypes_Binding; //--------------------- Gradients------------------------ @@ -127,15 +127,15 @@ SVGGradientElement::IsAttributeMapped(const nsAtom* name) const JSObject* SVGLinearGradientElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGLinearGradientElementBinding::Wrap(aCx, this, aGivenProto); + return SVGLinearGradientElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::LengthInfo SVGLinearGradientElement::sLengthInfo[4] = { - { &nsGkAtoms::x1, 0, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, - { &nsGkAtoms::y1, 0, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, - { &nsGkAtoms::x2, 100, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, - { &nsGkAtoms::y2, 0, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, + { &nsGkAtoms::x1, 0, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, + { &nsGkAtoms::y1, 0, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, + { &nsGkAtoms::x2, 100, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, + { &nsGkAtoms::y2, 0, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, }; //---------------------------------------------------------------------- @@ -201,17 +201,17 @@ SVGLinearGradientElement::GetLengthInfo() JSObject* SVGRadialGradientElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGRadialGradientElementBinding::Wrap(aCx, this, aGivenProto); + return SVGRadialGradientElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::LengthInfo SVGRadialGradientElement::sLengthInfo[6] = { - { &nsGkAtoms::cx, 50, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, - { &nsGkAtoms::cy, 50, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, - { &nsGkAtoms::r, 50, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::XY }, - { &nsGkAtoms::fx, 50, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, - { &nsGkAtoms::fy, 50, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, - { &nsGkAtoms::fr, 0, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::XY }, + { &nsGkAtoms::cx, 50, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, + { &nsGkAtoms::cy, 50, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, + { &nsGkAtoms::r, 50, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::XY }, + { &nsGkAtoms::fx, 50, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, + { &nsGkAtoms::fy, 50, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, + { &nsGkAtoms::fr, 0, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::XY }, }; //---------------------------------------------------------------------- diff --git a/dom/svg/SVGIRect.h b/dom/svg/SVGIRect.h index d34860095c56..a69a576d1933 100644 --- a/dom/svg/SVGIRect.h +++ b/dom/svg/SVGIRect.h @@ -28,7 +28,7 @@ public: JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) override { - return SVGRectBinding::Wrap(aCx, this, aGivenProto); + return SVGRect_Binding::Wrap(aCx, this, aGivenProto); } virtual nsIContent* GetParentObject() const = 0; diff --git a/dom/svg/SVGImageElement.cpp b/dom/svg/SVGImageElement.cpp index f3de71b72999..dbf6f79a6ba7 100644 --- a/dom/svg/SVGImageElement.cpp +++ b/dom/svg/SVGImageElement.cpp @@ -28,15 +28,15 @@ namespace dom { JSObject* SVGImageElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGImageElementBinding::Wrap(aCx, this, aGivenProto); + return SVGImageElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::LengthInfo SVGImageElement::sLengthInfo[4] = { - { &nsGkAtoms::x, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, - { &nsGkAtoms::y, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, - { &nsGkAtoms::width, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, - { &nsGkAtoms::height, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, + { &nsGkAtoms::x, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, + { &nsGkAtoms::y, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, + { &nsGkAtoms::width, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, + { &nsGkAtoms::height, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, }; nsSVGElement::StringInfo SVGImageElement::sStringInfo[2] = diff --git a/dom/svg/SVGLength.cpp b/dom/svg/SVGLength.cpp index cfb4d11a1d6b..3d91b9509780 100644 --- a/dom/svg/SVGLength.cpp +++ b/dom/svg/SVGLength.cpp @@ -59,8 +59,8 @@ SVGLength::SetValueFromString(const nsAString &aString) inline static bool IsAbsoluteUnit(uint8_t aUnit) { - return aUnit >= SVGLengthBinding::SVG_LENGTHTYPE_CM && - aUnit <= SVGLengthBinding::SVG_LENGTHTYPE_PC; + return aUnit >= SVGLength_Binding::SVG_LENGTHTYPE_CM && + aUnit <= SVGLength_Binding::SVG_LENGTHTYPE_PC; } /** @@ -71,8 +71,8 @@ IsAbsoluteUnit(uint8_t aUnit) * * Example usage: to find out how many centimeters there are per inch: * - * GetAbsUnitsPerAbsUnit(SVGLengthBinding::SVG_LENGTHTYPE_CM, - * SVGLengthBinding::SVG_LENGTHTYPE_IN) + * GetAbsUnitsPerAbsUnit(SVGLength_Binding::SVG_LENGTHTYPE_CM, + * SVGLength_Binding::SVG_LENGTHTYPE_IN) */ inline static float GetAbsUnitsPerAbsUnit(uint8_t aUnits, uint8_t aPerUnit) { @@ -104,10 +104,10 @@ SVGLength::GetValueInSpecifiedUnit(uint8_t aUnit, if (aUnit == mUnit) { return mValue; } - if ((aUnit == SVGLengthBinding::SVG_LENGTHTYPE_NUMBER && - mUnit == SVGLengthBinding::SVG_LENGTHTYPE_PX) || - (aUnit == SVGLengthBinding::SVG_LENGTHTYPE_PX && - mUnit == SVGLengthBinding::SVG_LENGTHTYPE_NUMBER)) { + if ((aUnit == SVGLength_Binding::SVG_LENGTHTYPE_NUMBER && + mUnit == SVGLength_Binding::SVG_LENGTHTYPE_PX) || + (aUnit == SVGLength_Binding::SVG_LENGTHTYPE_PX && + mUnit == SVGLength_Binding::SVG_LENGTHTYPE_NUMBER)) { return mValue; } if (IsAbsoluteUnit(aUnit) && IsAbsoluteUnit(mUnit)) { @@ -146,24 +146,24 @@ float SVGLength::GetUserUnitsPerUnit(const nsSVGElement *aElement, uint8_t aAxis) const { switch (mUnit) { - case SVGLengthBinding::SVG_LENGTHTYPE_NUMBER: - case SVGLengthBinding::SVG_LENGTHTYPE_PX: + case SVGLength_Binding::SVG_LENGTHTYPE_NUMBER: + case SVGLength_Binding::SVG_LENGTHTYPE_PX: return 1.0f; - case SVGLengthBinding::SVG_LENGTHTYPE_MM: + case SVGLength_Binding::SVG_LENGTHTYPE_MM: return INCHES_PER_MM_FLOAT * GetUserUnitsPerInch(); - case SVGLengthBinding::SVG_LENGTHTYPE_CM: + case SVGLength_Binding::SVG_LENGTHTYPE_CM: return INCHES_PER_CM_FLOAT * GetUserUnitsPerInch(); - case SVGLengthBinding::SVG_LENGTHTYPE_IN: + case SVGLength_Binding::SVG_LENGTHTYPE_IN: return GetUserUnitsPerInch(); - case SVGLengthBinding::SVG_LENGTHTYPE_PT: + case SVGLength_Binding::SVG_LENGTHTYPE_PT: return (1.0f/POINTS_PER_INCH_FLOAT) * GetUserUnitsPerInch(); - case SVGLengthBinding::SVG_LENGTHTYPE_PC: + case SVGLength_Binding::SVG_LENGTHTYPE_PC: return (12.0f/POINTS_PER_INCH_FLOAT) * GetUserUnitsPerInch(); - case SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE: + case SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE: return GetUserUnitsPerPercent(aElement, aAxis); - case SVGLengthBinding::SVG_LENGTHTYPE_EMS: + case SVGLength_Binding::SVG_LENGTHTYPE_EMS: return SVGContentUtils::GetFontSize(const_cast(aElement)); - case SVGLengthBinding::SVG_LENGTHTYPE_EXS: + case SVGLength_Binding::SVG_LENGTHTYPE_EXS: return SVGContentUtils::GetFontXHeight(const_cast(aElement)); default: MOZ_ASSERT_UNREACHABLE("Unknown unit type"); @@ -218,7 +218,7 @@ static uint16_t GetUnitTypeForString(const nsAString& unitStr) { if (unitStr.IsEmpty()) - return SVGLengthBinding::SVG_LENGTHTYPE_NUMBER; + return SVGLength_Binding::SVG_LENGTHTYPE_NUMBER; nsAtom* unitAtom = NS_GetStaticAtom(unitStr); @@ -229,7 +229,7 @@ GetUnitTypeForString(const nsAString& unitStr) } } } - return SVGLengthBinding::SVG_LENGTHTYPE_UNKNOWN; + return SVGLength_Binding::SVG_LENGTHTYPE_UNKNOWN; } } // namespace mozilla diff --git a/dom/svg/SVGLength.h b/dom/svg/SVGLength.h index 6f4847be184e..b3cb8fe95218 100644 --- a/dom/svg/SVGLength.h +++ b/dom/svg/SVGLength.h @@ -34,7 +34,7 @@ public: SVGLength() : mValue(0.0f) - , mUnit(dom::SVGLengthBinding::SVG_LENGTHTYPE_UNKNOWN) // caught by IsValid() + , mUnit(dom::SVGLength_Binding::SVG_LENGTHTYPE_UNKNOWN) // caught by IsValid() {} SVGLength(float aValue, uint8_t aUnit) @@ -118,12 +118,12 @@ public: uint8_t aAxis) const; bool IsPercentage() const { - return mUnit == dom::SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE; + return mUnit == dom::SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE; } static bool IsValidUnitType(uint16_t unit) { - return unit > dom::SVGLengthBinding::SVG_LENGTHTYPE_UNKNOWN && - unit <= dom::SVGLengthBinding::SVG_LENGTHTYPE_PC; + return unit > dom::SVGLength_Binding::SVG_LENGTHTYPE_UNKNOWN && + unit <= dom::SVGLength_Binding::SVG_LENGTHTYPE_PC; } /** diff --git a/dom/svg/SVGLengthList.h b/dom/svg/SVGLengthList.h index f74fb5ba6cf3..b9acb58d287e 100644 --- a/dom/svg/SVGLengthList.h +++ b/dom/svg/SVGLengthList.h @@ -340,7 +340,7 @@ public: bool HasPercentageValueAt(uint32_t aIndex) const { const SVGLength& length = (*mList)[aIndex]; - return length.GetUnit() == dom::SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE; + return length.GetUnit() == dom::SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE; } private: diff --git a/dom/svg/SVGLineElement.cpp b/dom/svg/SVGLineElement.cpp index 8316b65c7dfa..a164cda3c142 100644 --- a/dom/svg/SVGLineElement.cpp +++ b/dom/svg/SVGLineElement.cpp @@ -19,15 +19,15 @@ namespace dom { JSObject* SVGLineElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGLineElementBinding::Wrap(aCx, this, aGivenProto); + return SVGLineElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::LengthInfo SVGLineElement::sLengthInfo[4] = { - { &nsGkAtoms::x1, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, - { &nsGkAtoms::y1, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, - { &nsGkAtoms::x2, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, - { &nsGkAtoms::y2, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, + { &nsGkAtoms::x1, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, + { &nsGkAtoms::y1, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, + { &nsGkAtoms::x2, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, + { &nsGkAtoms::y2, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, }; //---------------------------------------------------------------------- diff --git a/dom/svg/SVGMPathElement.cpp b/dom/svg/SVGMPathElement.cpp index ed4b0e4f7abb..1750c7928aee 100644 --- a/dom/svg/SVGMPathElement.cpp +++ b/dom/svg/SVGMPathElement.cpp @@ -22,7 +22,7 @@ namespace dom { JSObject* SVGMPathElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGMPathElementBinding::Wrap(aCx, this, aGivenProto); + return SVGMPathElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::StringInfo SVGMPathElement::sStringInfo[2] = diff --git a/dom/svg/SVGMarkerElement.cpp b/dom/svg/SVGMarkerElement.cpp index 702f12aac136..b2d71599b1ee 100644 --- a/dom/svg/SVGMarkerElement.cpp +++ b/dom/svg/SVGMarkerElement.cpp @@ -20,27 +20,27 @@ #include "SVGContentUtils.h" using namespace mozilla::gfx; -using namespace mozilla::dom::SVGMarkerElementBinding; +using namespace mozilla::dom::SVGMarkerElement_Binding; NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(Marker) namespace mozilla { namespace dom { -using namespace SVGAngleBinding; +using namespace SVGAngle_Binding; JSObject* SVGMarkerElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGMarkerElementBinding::Wrap(aCx, this, aGivenProto); + return SVGMarkerElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::LengthInfo SVGMarkerElement::sLengthInfo[4] = { - { &nsGkAtoms::refX, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, - { &nsGkAtoms::refY, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, - { &nsGkAtoms::markerWidth, 3, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, - { &nsGkAtoms::markerHeight, 3, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, + { &nsGkAtoms::refX, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, + { &nsGkAtoms::refY, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, + { &nsGkAtoms::markerWidth, 3, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, + { &nsGkAtoms::markerHeight, 3, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, }; nsSVGEnumMapping SVGMarkerElement::sUnitsMap[] = { diff --git a/dom/svg/SVGMarkerElement.h b/dom/svg/SVGMarkerElement.h index c5e80f0f222b..28c4b644ab4e 100644 --- a/dom/svg/SVGMarkerElement.h +++ b/dom/svg/SVGMarkerElement.h @@ -34,8 +34,8 @@ class nsSVGOrientType { public: nsSVGOrientType() - : mAnimVal(SVGMarkerElementBinding::SVG_MARKER_ORIENT_ANGLE), - mBaseVal(SVGMarkerElementBinding::SVG_MARKER_ORIENT_ANGLE) {} + : mAnimVal(SVGMarkerElement_Binding::SVG_MARKER_ORIENT_ANGLE), + mBaseVal(SVGMarkerElement_Binding::SVG_MARKER_ORIENT_ANGLE) {} nsresult SetBaseValue(uint16_t aValue, nsSVGElement *aSVGElement); @@ -52,10 +52,10 @@ public: // Web content uint16_t GetBaseValue() const { return mAnimVal == SVG_MARKER_ORIENT_AUTO_START_REVERSE ? - SVGMarkerElementBinding::SVG_MARKER_ORIENT_UNKNOWN : mBaseVal; } + SVGMarkerElement_Binding::SVG_MARKER_ORIENT_UNKNOWN : mBaseVal; } uint16_t GetAnimValue() const { return mAnimVal == SVG_MARKER_ORIENT_AUTO_START_REVERSE ? - SVGMarkerElementBinding::SVG_MARKER_ORIENT_UNKNOWN : mAnimVal; } + SVGMarkerElement_Binding::SVG_MARKER_ORIENT_UNKNOWN : mAnimVal; } uint16_t GetAnimValueInternal() const { return mAnimVal; } diff --git a/dom/svg/SVGMaskElement.cpp b/dom/svg/SVGMaskElement.cpp index cc53416d55c9..3249cff080ce 100644 --- a/dom/svg/SVGMaskElement.cpp +++ b/dom/svg/SVGMaskElement.cpp @@ -18,22 +18,22 @@ NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(Mask) namespace mozilla { namespace dom { -using namespace SVGUnitTypesBinding; +using namespace SVGUnitTypes_Binding; JSObject* SVGMaskElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGMaskElementBinding::Wrap(aCx, this, aGivenProto); + return SVGMaskElement_Binding::Wrap(aCx, this, aGivenProto); } //--------------------- Masks ------------------------ nsSVGElement::LengthInfo SVGMaskElement::sLengthInfo[4] = { - { &nsGkAtoms::x, -10, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, - { &nsGkAtoms::y, -10, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, - { &nsGkAtoms::width, 120, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, - { &nsGkAtoms::height, 120, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, + { &nsGkAtoms::x, -10, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, + { &nsGkAtoms::y, -10, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, + { &nsGkAtoms::width, 120, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, + { &nsGkAtoms::height, 120, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, }; nsSVGElement::EnumInfo SVGMaskElement::sEnumInfo[2] = diff --git a/dom/svg/SVGMatrix.cpp b/dom/svg/SVGMatrix.cpp index 7d511638252b..19083fdcab09 100644 --- a/dom/svg/SVGMatrix.cpp +++ b/dom/svg/SVGMatrix.cpp @@ -29,7 +29,7 @@ SVGMatrix::GetParentObject() const JSObject* SVGMatrix::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SVGMatrixBinding::Wrap(aCx, this, aGivenProto); + return SVGMatrix_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/svg/SVGMetadataElement.cpp b/dom/svg/SVGMetadataElement.cpp index 87b9cd156aa2..c10300ed6954 100644 --- a/dom/svg/SVGMetadataElement.cpp +++ b/dom/svg/SVGMetadataElement.cpp @@ -15,7 +15,7 @@ namespace dom { JSObject* SVGMetadataElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGMetadataElementBinding::Wrap(aCx, this, aGivenProto); + return SVGMetadataElement_Binding::Wrap(aCx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/SVGMotionSMILAnimationFunction.cpp b/dom/svg/SVGMotionSMILAnimationFunction.cpp index c62e697da4b6..657976845693 100644 --- a/dom/svg/SVGMotionSMILAnimationFunction.cpp +++ b/dom/svg/SVGMotionSMILAnimationFunction.cpp @@ -18,7 +18,7 @@ #include "SVGMotionSMILPathUtils.h" using namespace mozilla::dom; -using namespace mozilla::dom::SVGAngleBinding; +using namespace mozilla::dom::SVGAngle_Binding; using namespace mozilla::gfx; namespace mozilla { diff --git a/dom/svg/SVGOrientSMILType.cpp b/dom/svg/SVGOrientSMILType.cpp index 408e1c63b3f9..577a435c9661 100644 --- a/dom/svg/SVGOrientSMILType.cpp +++ b/dom/svg/SVGOrientSMILType.cpp @@ -13,8 +13,8 @@ namespace mozilla { -using namespace dom::SVGAngleBinding; -using namespace dom::SVGMarkerElementBinding; +using namespace dom::SVGAngle_Binding; +using namespace dom::SVGMarkerElement_Binding; /*static*/ SVGOrientSMILType SVGOrientSMILType::sSingleton; diff --git a/dom/svg/SVGPathData.cpp b/dom/svg/SVGPathData.cpp index 07351f0df8db..85a14bbbb8f6 100644 --- a/dom/svg/SVGPathData.cpp +++ b/dom/svg/SVGPathData.cpp @@ -23,7 +23,7 @@ #include using namespace mozilla; -using namespace mozilla::dom::SVGPathSegBinding; +using namespace mozilla::dom::SVGPathSeg_Binding; using namespace mozilla::gfx; static bool IsMoveto(uint16_t aSegType) diff --git a/dom/svg/SVGPathElement.cpp b/dom/svg/SVGPathElement.cpp index 7863735f2cfe..6532090b53e1 100644 --- a/dom/svg/SVGPathElement.cpp +++ b/dom/svg/SVGPathElement.cpp @@ -33,7 +33,7 @@ namespace dom { JSObject* SVGPathElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGPathElementBinding::Wrap(aCx, this, aGivenProto); + return SVGPathElement_Binding::Wrap(aCx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/SVGPathSegUtils.h b/dom/svg/SVGPathSegUtils.h index 1c461e40e73b..4f45286d444b 100644 --- a/dom/svg/SVGPathSegUtils.h +++ b/dom/svg/SVGPathSegUtils.h @@ -15,8 +15,8 @@ namespace mozilla { #define NS_SVG_PATH_SEG_MAX_ARGS 7 -#define NS_SVG_PATH_SEG_FIRST_VALID_TYPE dom::SVGPathSegBinding::PATHSEG_CLOSEPATH -#define NS_SVG_PATH_SEG_LAST_VALID_TYPE dom::SVGPathSegBinding::PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL +#define NS_SVG_PATH_SEG_FIRST_VALID_TYPE dom::SVGPathSeg_Binding::PATHSEG_CLOSEPATH +#define NS_SVG_PATH_SEG_LAST_VALID_TYPE dom::SVGPathSeg_Binding::PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL #define NS_SVG_PATH_SEG_TYPE_COUNT (NS_SVG_PATH_SEG_LAST_VALID_TYPE + 1) /** @@ -180,22 +180,22 @@ public: } static bool IsCubicType(uint32_t aType) { - return aType == dom::SVGPathSegBinding::PATHSEG_CURVETO_CUBIC_REL || - aType == dom::SVGPathSegBinding::PATHSEG_CURVETO_CUBIC_ABS || - aType == dom::SVGPathSegBinding::PATHSEG_CURVETO_CUBIC_SMOOTH_REL || - aType == dom::SVGPathSegBinding::PATHSEG_CURVETO_CUBIC_SMOOTH_ABS; + return aType == dom::SVGPathSeg_Binding::PATHSEG_CURVETO_CUBIC_REL || + aType == dom::SVGPathSeg_Binding::PATHSEG_CURVETO_CUBIC_ABS || + aType == dom::SVGPathSeg_Binding::PATHSEG_CURVETO_CUBIC_SMOOTH_REL || + aType == dom::SVGPathSeg_Binding::PATHSEG_CURVETO_CUBIC_SMOOTH_ABS; } static bool IsQuadraticType(uint32_t aType) { - return aType == dom::SVGPathSegBinding::PATHSEG_CURVETO_QUADRATIC_REL || - aType == dom::SVGPathSegBinding::PATHSEG_CURVETO_QUADRATIC_ABS || - aType == dom::SVGPathSegBinding::PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL || - aType == dom::SVGPathSegBinding::PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS; + return aType == dom::SVGPathSeg_Binding::PATHSEG_CURVETO_QUADRATIC_REL || + aType == dom::SVGPathSeg_Binding::PATHSEG_CURVETO_QUADRATIC_ABS || + aType == dom::SVGPathSeg_Binding::PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL || + aType == dom::SVGPathSeg_Binding::PATHSEG_CURVETO_QUADRATIC_SMOOTH_ABS; } static bool IsArcType(uint32_t aType) { - return aType == dom::SVGPathSegBinding::PATHSEG_ARC_ABS || - aType == dom::SVGPathSegBinding::PATHSEG_ARC_REL; + return aType == dom::SVGPathSeg_Binding::PATHSEG_ARC_ABS || + aType == dom::SVGPathSeg_Binding::PATHSEG_ARC_REL; } static bool IsRelativeOrAbsoluteType(uint32_t aType) { @@ -204,10 +204,10 @@ public: // When adding a new path segment type, ensure that the returned condition // below is still correct. static_assert(NS_SVG_PATH_SEG_LAST_VALID_TYPE == - dom::SVGPathSegBinding::PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL, + dom::SVGPathSeg_Binding::PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL, "Unexpected type"); - return aType >= dom::SVGPathSegBinding::PATHSEG_MOVETO_ABS; + return aType >= dom::SVGPathSeg_Binding::PATHSEG_MOVETO_ABS; } static bool IsRelativeType(uint32_t aType) { @@ -218,7 +218,7 @@ public: // When adding a new path segment type, ensure that the returned condition // below is still correct. static_assert(NS_SVG_PATH_SEG_LAST_VALID_TYPE == - dom::SVGPathSegBinding::PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL, + dom::SVGPathSeg_Binding::PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL, "Unexpected type"); return aType & 1; @@ -232,7 +232,7 @@ public: // When adding a new path segment type, ensure that the returned condition // below is still correct. static_assert(NS_SVG_PATH_SEG_LAST_VALID_TYPE == - dom::SVGPathSegBinding::PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL, + dom::SVGPathSeg_Binding::PATHSEG_CURVETO_QUADRATIC_SMOOTH_REL, "Unexpected type"); return aType | 1; diff --git a/dom/svg/SVGPatternElement.cpp b/dom/svg/SVGPatternElement.cpp index 1a7e2b819763..77e07d39ba61 100644 --- a/dom/svg/SVGPatternElement.cpp +++ b/dom/svg/SVGPatternElement.cpp @@ -19,22 +19,22 @@ NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(Pattern) namespace mozilla { namespace dom { -using namespace SVGUnitTypesBinding; +using namespace SVGUnitTypes_Binding; JSObject* SVGPatternElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGPatternElementBinding::Wrap(aCx, this, aGivenProto); + return SVGPatternElement_Binding::Wrap(aCx, this, aGivenProto); } //--------------------- Patterns ------------------------ nsSVGElement::LengthInfo SVGPatternElement::sLengthInfo[4] = { - { &nsGkAtoms::x, 0, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, - { &nsGkAtoms::y, 0, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, - { &nsGkAtoms::width, 0, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, - { &nsGkAtoms::height, 0, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, + { &nsGkAtoms::x, 0, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, + { &nsGkAtoms::y, 0, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, + { &nsGkAtoms::width, 0, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, + { &nsGkAtoms::height, 0, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, }; nsSVGElement::EnumInfo SVGPatternElement::sEnumInfo[2] = diff --git a/dom/svg/SVGPolygonElement.cpp b/dom/svg/SVGPolygonElement.cpp index 0fe168f276f0..8cc24fcc4f7c 100644 --- a/dom/svg/SVGPolygonElement.cpp +++ b/dom/svg/SVGPolygonElement.cpp @@ -20,7 +20,7 @@ namespace dom { JSObject* SVGPolygonElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGPolygonElementBinding::Wrap(aCx, this, aGivenProto); + return SVGPolygonElement_Binding::Wrap(aCx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/SVGPolylineElement.cpp b/dom/svg/SVGPolylineElement.cpp index c7a92dd84d4d..2e92d9cdb500 100644 --- a/dom/svg/SVGPolylineElement.cpp +++ b/dom/svg/SVGPolylineElement.cpp @@ -19,7 +19,7 @@ namespace dom { JSObject* SVGPolylineElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGPolylineElementBinding::Wrap(aCx, this, aGivenProto); + return SVGPolylineElement_Binding::Wrap(aCx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/SVGPreserveAspectRatio.cpp b/dom/svg/SVGPreserveAspectRatio.cpp index a0b47731bd70..2a912098785b 100644 --- a/dom/svg/SVGPreserveAspectRatio.cpp +++ b/dom/svg/SVGPreserveAspectRatio.cpp @@ -13,7 +13,7 @@ using namespace mozilla; using namespace dom; -using namespace SVGPreserveAspectRatioBinding; +using namespace SVGPreserveAspectRatio_Binding; NS_SVG_VAL_IMPL_CYCLE_COLLECTION_WRAPPERCACHED(DOMSVGPreserveAspectRatio, mSVGElement) @@ -119,7 +119,7 @@ SVGPreserveAspectRatio::operator==(const SVGPreserveAspectRatio& aOther) const JSObject* DOMSVGPreserveAspectRatio::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return mozilla::dom::SVGPreserveAspectRatioBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::SVGPreserveAspectRatio_Binding::Wrap(aCx, this, aGivenProto); } uint16_t diff --git a/dom/svg/SVGPreserveAspectRatio.h b/dom/svg/SVGPreserveAspectRatio.h index 670b50fc58c6..025f9ae85c20 100644 --- a/dom/svg/SVGPreserveAspectRatio.h +++ b/dom/svg/SVGPreserveAspectRatio.h @@ -20,16 +20,16 @@ namespace mozilla { // These constants represent the range of valid enum values for the // parameter. They exclude the sentinel _UNKNOWN value. const uint16_t SVG_ALIGN_MIN_VALID = - dom::SVGPreserveAspectRatioBinding::SVG_PRESERVEASPECTRATIO_NONE; + dom::SVGPreserveAspectRatio_Binding::SVG_PRESERVEASPECTRATIO_NONE; const uint16_t SVG_ALIGN_MAX_VALID = - dom::SVGPreserveAspectRatioBinding::SVG_PRESERVEASPECTRATIO_XMAXYMAX; + dom::SVGPreserveAspectRatio_Binding::SVG_PRESERVEASPECTRATIO_XMAXYMAX; // These constants represent the range of valid enum values for the // parameter. They exclude the sentinel _UNKNOWN value. const uint16_t SVG_MEETORSLICE_MIN_VALID = - dom::SVGPreserveAspectRatioBinding::SVG_MEETORSLICE_MEET; + dom::SVGPreserveAspectRatio_Binding::SVG_MEETORSLICE_MEET; const uint16_t SVG_MEETORSLICE_MAX_VALID = - dom::SVGPreserveAspectRatioBinding::SVG_MEETORSLICE_SLICE; + dom::SVGPreserveAspectRatio_Binding::SVG_MEETORSLICE_SLICE; class SVGAnimatedPreserveAspectRatio; @@ -38,8 +38,8 @@ class SVGPreserveAspectRatio final friend class SVGAnimatedPreserveAspectRatio; public: explicit SVGPreserveAspectRatio() - : mAlign(dom::SVGPreserveAspectRatioBinding::SVG_PRESERVEASPECTRATIO_UNKNOWN) - , mMeetOrSlice(dom::SVGPreserveAspectRatioBinding::SVG_MEETORSLICE_UNKNOWN) + : mAlign(dom::SVGPreserveAspectRatio_Binding::SVG_PRESERVEASPECTRATIO_UNKNOWN) + , mMeetOrSlice(dom::SVGPreserveAspectRatio_Binding::SVG_MEETORSLICE_UNKNOWN) {} SVGPreserveAspectRatio(uint16_t aAlign, uint16_t aMeetOrSlice) diff --git a/dom/svg/SVGRectElement.cpp b/dom/svg/SVGRectElement.cpp index 750e3dafa3ff..acf4ab8d2ea6 100644 --- a/dom/svg/SVGRectElement.cpp +++ b/dom/svg/SVGRectElement.cpp @@ -26,17 +26,17 @@ class SVGAnimatedLength; JSObject* SVGRectElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGRectElementBinding::Wrap(aCx, this, aGivenProto); + return SVGRectElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::LengthInfo SVGRectElement::sLengthInfo[6] = { - { &nsGkAtoms::x, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, - { &nsGkAtoms::y, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, - { &nsGkAtoms::width, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, - { &nsGkAtoms::height, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, - { &nsGkAtoms::rx, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, - { &nsGkAtoms::ry, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y } + { &nsGkAtoms::x, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, + { &nsGkAtoms::y, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, + { &nsGkAtoms::width, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, + { &nsGkAtoms::height, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, + { &nsGkAtoms::rx, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, + { &nsGkAtoms::ry, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y } }; //---------------------------------------------------------------------- diff --git a/dom/svg/SVGSVGElement.cpp b/dom/svg/SVGSVGElement.cpp index 829077625e27..59f983569b15 100644 --- a/dom/svg/SVGSVGElement.cpp +++ b/dom/svg/SVGSVGElement.cpp @@ -32,8 +32,8 @@ using namespace mozilla::gfx; namespace mozilla { namespace dom { -using namespace SVGPreserveAspectRatioBinding; -using namespace SVGSVGElementBinding; +using namespace SVGPreserveAspectRatio_Binding; +using namespace SVGSVGElement_Binding; nsSVGEnumMapping SVGSVGElement::sZoomAndPanMap[] = { {&nsGkAtoms::disable, SVG_ZOOMANDPAN_DISABLE}, @@ -102,7 +102,7 @@ DOMSVGTranslatePoint::MatrixTransform(SVGMatrix& matrix) JSObject* SVGSVGElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGSVGElementBinding::Wrap(aCx, this, aGivenProto); + return SVGSVGElement_Binding::Wrap(aCx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/SVGScriptElement.cpp b/dom/svg/SVGScriptElement.cpp index 30e195a57c08..499442cdc538 100644 --- a/dom/svg/SVGScriptElement.cpp +++ b/dom/svg/SVGScriptElement.cpp @@ -19,7 +19,7 @@ namespace dom { JSObject* SVGScriptElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGScriptElementBinding::Wrap(aCx, this, aGivenProto); + return SVGScriptElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::StringInfo SVGScriptElement::sStringInfo[2] = diff --git a/dom/svg/SVGSetElement.cpp b/dom/svg/SVGSetElement.cpp index 4254fef92994..81c6b0e9a8b4 100644 --- a/dom/svg/SVGSetElement.cpp +++ b/dom/svg/SVGSetElement.cpp @@ -15,7 +15,7 @@ namespace dom { JSObject* SVGSetElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGSetElementBinding::Wrap(aCx, this, aGivenProto); + return SVGSetElement_Binding::Wrap(aCx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/SVGStopElement.cpp b/dom/svg/SVGStopElement.cpp index caea8738a28d..230b313a3552 100644 --- a/dom/svg/SVGStopElement.cpp +++ b/dom/svg/SVGStopElement.cpp @@ -15,7 +15,7 @@ namespace dom { JSObject* SVGStopElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGStopElementBinding::Wrap(aCx, this, aGivenProto); + return SVGStopElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::NumberInfo SVGStopElement::sNumberInfo = diff --git a/dom/svg/SVGStyleElement.cpp b/dom/svg/SVGStyleElement.cpp index a7b46cda5ae7..ec44d852118b 100644 --- a/dom/svg/SVGStyleElement.cpp +++ b/dom/svg/SVGStyleElement.cpp @@ -17,7 +17,7 @@ namespace dom { JSObject* SVGStyleElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGStyleElementBinding::Wrap(aCx, this, aGivenProto); + return SVGStyleElement_Binding::Wrap(aCx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/SVGSwitchElement.cpp b/dom/svg/SVGSwitchElement.cpp index 258964467393..02e44935651a 100644 --- a/dom/svg/SVGSwitchElement.cpp +++ b/dom/svg/SVGSwitchElement.cpp @@ -21,7 +21,7 @@ namespace dom { JSObject* SVGSwitchElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGSwitchElementBinding::Wrap(aCx, this, aGivenProto); + return SVGSwitchElement_Binding::Wrap(aCx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/SVGSymbolElement.cpp b/dom/svg/SVGSymbolElement.cpp index 182da6e6ba9a..c8b316b7b0df 100644 --- a/dom/svg/SVGSymbolElement.cpp +++ b/dom/svg/SVGSymbolElement.cpp @@ -15,7 +15,7 @@ namespace dom { JSObject* SVGSymbolElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGSymbolElementBinding::Wrap(aCx, this, aGivenProto); + return SVGSymbolElement_Binding::Wrap(aCx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/SVGTSpanElement.cpp b/dom/svg/SVGTSpanElement.cpp index e2fb613ba318..d0dbd0ad19a4 100644 --- a/dom/svg/SVGTSpanElement.cpp +++ b/dom/svg/SVGTSpanElement.cpp @@ -15,7 +15,7 @@ namespace dom { JSObject* SVGTSpanElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGTSpanElementBinding::Wrap(aCx, this, aGivenProto); + return SVGTSpanElement_Binding::Wrap(aCx, this, aGivenProto); } diff --git a/dom/svg/SVGTextContentElement.cpp b/dom/svg/SVGTextContentElement.cpp index 5d09a7052ef5..44e91faafb18 100644 --- a/dom/svg/SVGTextContentElement.cpp +++ b/dom/svg/SVGTextContentElement.cpp @@ -19,7 +19,7 @@ namespace mozilla { namespace dom { -using namespace SVGTextContentElementBinding; +using namespace SVGTextContentElement_Binding; nsSVGEnumMapping SVGTextContentElement::sLengthAdjustMap[] = { { &nsGkAtoms::spacing, LENGTHADJUST_SPACING }, @@ -34,7 +34,7 @@ nsSVGElement::EnumInfo SVGTextContentElement::sEnumInfo[1] = nsSVGElement::LengthInfo SVGTextContentElement::sLengthInfo[1] = { - { &nsGkAtoms::textLength, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::XY } + { &nsGkAtoms::textLength, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::XY } }; SVGTextFrame* diff --git a/dom/svg/SVGTextElement.cpp b/dom/svg/SVGTextElement.cpp index 95d58496de37..c1f1163a809c 100644 --- a/dom/svg/SVGTextElement.cpp +++ b/dom/svg/SVGTextElement.cpp @@ -15,7 +15,7 @@ namespace dom { JSObject* SVGTextElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGTextElementBinding::Wrap(aCx, this, aGivenProto); + return SVGTextElement_Binding::Wrap(aCx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/SVGTextPathElement.cpp b/dom/svg/SVGTextPathElement.cpp index 9d5a9f688c1d..972c8554d524 100644 --- a/dom/svg/SVGTextPathElement.cpp +++ b/dom/svg/SVGTextPathElement.cpp @@ -17,23 +17,23 @@ NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(TextPath) namespace mozilla { namespace dom { -using namespace SVGTextContentElementBinding; -using namespace SVGTextPathElementBinding; +using namespace SVGTextContentElement_Binding; +using namespace SVGTextPathElement_Binding; class SVGAnimatedLength; JSObject* SVGTextPathElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGTextPathElementBinding::Wrap(aCx, this, aGivenProto); + return SVGTextPathElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGElement::LengthInfo SVGTextPathElement::sLengthInfo[2] = { // from SVGTextContentElement: - { &nsGkAtoms::textLength, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::XY }, + { &nsGkAtoms::textLength, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::XY }, // from SVGTextPathElement: - { &nsGkAtoms::startOffset, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X } + { &nsGkAtoms::startOffset, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X } }; nsSVGEnumMapping SVGTextPathElement::sMethodMap[] = { diff --git a/dom/svg/SVGTitleElement.cpp b/dom/svg/SVGTitleElement.cpp index df43d4494d41..7d86c4e411ee 100644 --- a/dom/svg/SVGTitleElement.cpp +++ b/dom/svg/SVGTitleElement.cpp @@ -15,7 +15,7 @@ namespace dom { JSObject* SVGTitleElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGTitleElementBinding::Wrap(aCx, this, aGivenProto); + return SVGTitleElement_Binding::Wrap(aCx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/SVGTransform.cpp b/dom/svg/SVGTransform.cpp index ec83d2c68d82..435b6794ebcc 100644 --- a/dom/svg/SVGTransform.cpp +++ b/dom/svg/SVGTransform.cpp @@ -22,7 +22,7 @@ namespace { namespace mozilla { namespace dom { -using namespace SVGTransformBinding; +using namespace SVGTransform_Binding; static nsSVGAttrTearoffTable& SVGMatrixTearoffTable() @@ -65,7 +65,7 @@ NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(SVGTransform, Release) JSObject* SVGTransform::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return SVGTransformBinding::Wrap(aCx, this, aGivenProto); + return SVGTransform_Binding::Wrap(aCx, this, aGivenProto); } //---------------------------------------------------------------------- diff --git a/dom/svg/SVGTransformListSMILType.cpp b/dom/svg/SVGTransformListSMILType.cpp index 16bbe87344e1..17cccc9194e9 100644 --- a/dom/svg/SVGTransformListSMILType.cpp +++ b/dom/svg/SVGTransformListSMILType.cpp @@ -12,7 +12,7 @@ #include using namespace mozilla; -using namespace dom::SVGTransformBinding; +using namespace dom::SVGTransform_Binding; typedef FallibleTArray TransformArray; diff --git a/dom/svg/SVGTransformableElement.cpp b/dom/svg/SVGTransformableElement.cpp index b71ab7ed53c9..7564b36682a1 100644 --- a/dom/svg/SVGTransformableElement.cpp +++ b/dom/svg/SVGTransformableElement.cpp @@ -65,11 +65,11 @@ SVGTransformableElement::GetAttributeChangeHint(const nsAtom* aAttribute, } bool isAdditionOrRemoval = false; - if (aModType == MutationEventBinding::ADDITION || - aModType == MutationEventBinding::REMOVAL) { + if (aModType == MutationEvent_Binding::ADDITION || + aModType == MutationEvent_Binding::REMOVAL) { isAdditionOrRemoval = true; } else { - MOZ_ASSERT(aModType == MutationEventBinding::MODIFICATION, + MOZ_ASSERT(aModType == MutationEvent_Binding::MODIFICATION, "Unknown modification type."); if (!mTransforms || !mTransforms->HasTransform()) { @@ -133,11 +133,11 @@ SVGTransformableElement::SetAnimateMotionTransform(const gfx::Matrix* aMatrix) bool nowSet = mAnimateMotionTransform || transformSet; int32_t modType; if (prevSet && !nowSet) { - modType = MutationEventBinding::REMOVAL; + modType = MutationEvent_Binding::REMOVAL; } else if(!prevSet && nowSet) { - modType = MutationEventBinding::ADDITION; + modType = MutationEvent_Binding::ADDITION; } else { - modType = MutationEventBinding::MODIFICATION; + modType = MutationEvent_Binding::MODIFICATION; } DidAnimateTransformList(modType); nsIFrame* frame = GetPrimaryFrame(); diff --git a/dom/svg/SVGUseElement.cpp b/dom/svg/SVGUseElement.cpp index 00fc14bc39c0..332e3454eed3 100644 --- a/dom/svg/SVGUseElement.cpp +++ b/dom/svg/SVGUseElement.cpp @@ -29,7 +29,7 @@ namespace dom { JSObject* SVGUseElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGUseElementBinding::Wrap(aCx, this, aGivenProto); + return SVGUseElement_Binding::Wrap(aCx, this, aGivenProto); } //////////////////////////////////////////////////////////////////////// @@ -37,10 +37,10 @@ SVGUseElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) nsSVGElement::LengthInfo SVGUseElement::sLengthInfo[4] = { - { &nsGkAtoms::x, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, - { &nsGkAtoms::y, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, - { &nsGkAtoms::width, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, - { &nsGkAtoms::height, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, + { &nsGkAtoms::x, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, + { &nsGkAtoms::y, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, + { &nsGkAtoms::width, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, + { &nsGkAtoms::height, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, }; nsSVGElement::StringInfo SVGUseElement::sStringInfo[2] = @@ -346,7 +346,7 @@ SVGUseElement::SyncWidthOrHeight(nsAtom* aName) // need to set the value to 100% nsSVGLength2 length; length.Init(SVGContentUtils::XY, 0xff, - 100, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE); + 100, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE); target->SetLength(aName, length); return; } diff --git a/dom/svg/SVGViewElement.cpp b/dom/svg/SVGViewElement.cpp index 77af15a24e65..7f1eeda0f928 100644 --- a/dom/svg/SVGViewElement.cpp +++ b/dom/svg/SVGViewElement.cpp @@ -12,12 +12,12 @@ NS_IMPL_NS_NEW_NAMESPACED_SVG_ELEMENT(View) namespace mozilla { namespace dom { -using namespace SVGViewElementBinding; +using namespace SVGViewElement_Binding; JSObject* SVGViewElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGViewElementBinding::Wrap(aCx, this, aGivenProto); + return SVGViewElement_Binding::Wrap(aCx, this, aGivenProto); } nsSVGEnumMapping SVGViewElement::sZoomAndPanMap[] = { diff --git a/dom/svg/SVGViewportElement.cpp b/dom/svg/SVGViewportElement.cpp index 7292f3ac6646..8d121f0658ff 100644 --- a/dom/svg/SVGViewportElement.cpp +++ b/dom/svg/SVGViewportElement.cpp @@ -40,10 +40,10 @@ namespace dom { nsSVGElement::LengthInfo SVGViewportElement::sLengthInfo[4] = { - { &nsGkAtoms::x, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, - { &nsGkAtoms::y, 0, SVGLengthBinding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, - { &nsGkAtoms::width, 100, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, - { &nsGkAtoms::height, 100, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, + { &nsGkAtoms::x, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::X }, + { &nsGkAtoms::y, 0, SVGLength_Binding::SVG_LENGTHTYPE_NUMBER, SVGContentUtils::Y }, + { &nsGkAtoms::width, 100, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, + { &nsGkAtoms::height, 100, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, }; //---------------------------------------------------------------------- diff --git a/dom/svg/nsISVGPoint.h b/dom/svg/nsISVGPoint.h index 4c075e8d37c7..e482cad8c010 100644 --- a/dom/svg/nsISVGPoint.h +++ b/dom/svg/nsISVGPoint.h @@ -144,7 +144,7 @@ public: virtual void SetY(float aY, ErrorResult& rv) = 0; virtual already_AddRefed MatrixTransform(dom::SVGMatrix& matrix) = 0; virtual JSObject* WrapObject(JSContext *cx, JS::Handle aGivenProto) override - { return dom::SVGPointBinding::Wrap(cx, this, aGivenProto); } + { return dom::SVGPoint_Binding::Wrap(cx, this, aGivenProto); } virtual nsISupports* GetParentObject() = 0; diff --git a/dom/svg/nsSVGAngle.cpp b/dom/svg/nsSVGAngle.cpp index 4226731c19d2..fa7de6e75a9c 100644 --- a/dom/svg/nsSVGAngle.cpp +++ b/dom/svg/nsSVGAngle.cpp @@ -19,8 +19,8 @@ using namespace mozilla; using namespace mozilla::dom; -using namespace mozilla::dom::SVGAngleBinding; -using namespace mozilla::dom::SVGMarkerElementBinding; +using namespace mozilla::dom::SVGAngle_Binding; +using namespace mozilla::dom::SVGMarkerElement_Binding; static nsStaticAtom** const unitMap[] = { diff --git a/dom/svg/nsSVGAngle.h b/dom/svg/nsSVGAngle.h index 0f3cfb06a6cc..35a7b995ea0e 100644 --- a/dom/svg/nsSVGAngle.h +++ b/dom/svg/nsSVGAngle.h @@ -37,7 +37,7 @@ public: void Init(uint8_t aAttrEnum = 0xff, float aValue = 0, uint8_t aUnitType = - mozilla::dom::SVGAngleBinding::SVG_ANGLETYPE_UNSPECIFIED) { + mozilla::dom::SVGAngle_Binding::SVG_ANGLETYPE_UNSPECIFIED) { mAnimVal = mBaseVal = aValue; mAnimValUnit = mBaseValUnit = aUnitType; mAttrEnum = aAttrEnum; diff --git a/dom/svg/nsSVGAnimatedTransformList.cpp b/dom/svg/nsSVGAnimatedTransformList.cpp index a76601eabeda..5a1e375eff22 100644 --- a/dom/svg/nsSVGAnimatedTransformList.cpp +++ b/dom/svg/nsSVGAnimatedTransformList.cpp @@ -124,9 +124,9 @@ nsSVGAnimatedTransformList::SetAnimValue(const SVGTransformList& aValue, } int32_t modType; if(prevSet) { - modType = MutationEventBinding::MODIFICATION; + modType = MutationEvent_Binding::MODIFICATION; } else { - modType = MutationEventBinding::ADDITION; + modType = MutationEvent_Binding::ADDITION; } aElement->DidAnimateTransformList(modType); return NS_OK; @@ -148,9 +148,9 @@ nsSVGAnimatedTransformList::ClearAnimValue(nsSVGElement *aElement) mAnimVal = nullptr; int32_t modType; if (HasTransform() || aElement->GetAnimateMotionTransform()) { - modType = MutationEventBinding::MODIFICATION; + modType = MutationEvent_Binding::MODIFICATION; } else { - modType = MutationEventBinding::REMOVAL; + modType = MutationEvent_Binding::REMOVAL; } aElement->DidAnimateTransformList(modType); } diff --git a/dom/svg/nsSVGElement.cpp b/dom/svg/nsSVGElement.cpp index 1e4ff1b319c8..b135e02d3c5c 100644 --- a/dom/svg/nsSVGElement.cpp +++ b/dom/svg/nsSVGElement.cpp @@ -58,7 +58,7 @@ using namespace mozilla; using namespace mozilla::dom; -using namespace mozilla::dom::SVGUnitTypesBinding; +using namespace mozilla::dom::SVGUnitTypes_Binding; // This is needed to ensure correct handling of calls to the // vararg-list methods in this file: @@ -102,7 +102,7 @@ nsSVGElement::~nsSVGElement() JSObject* nsSVGElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return SVGElementBinding::Wrap(aCx, this, aGivenProto); + return SVGElement_Binding::Wrap(aCx, this, aGivenProto); } //---------------------------------------------------------------------- @@ -1377,8 +1377,8 @@ nsSVGElement::WillChangeValue(nsAtom* aName) } uint8_t modType = attrValue - ? static_cast(MutationEventBinding::MODIFICATION) - : static_cast(MutationEventBinding::ADDITION); + ? static_cast(MutationEvent_Binding::MODIFICATION) + : static_cast(MutationEvent_Binding::ADDITION); nsNodeUtils::AttributeWillChange(this, kNameSpaceID_None, aName, modType, nullptr); @@ -1423,8 +1423,8 @@ nsSVGElement::DidChangeValue(nsAtom* aName, NS_EVENT_BITS_MUTATION_ATTRMODIFIED, this); uint8_t modType = HasAttr(kNameSpaceID_None, aName) - ? static_cast(MutationEventBinding::MODIFICATION) - : static_cast(MutationEventBinding::ADDITION); + ? static_cast(MutationEvent_Binding::MODIFICATION) + : static_cast(MutationEvent_Binding::ADDITION); nsIDocument* document = GetComposedDoc(); mozAutoDocUpdate updateBatch(document, kNotifyDocumentObservers); @@ -1558,7 +1558,7 @@ nsSVGElement::DidAnimateLength(uint8_t aAttrEnum) LengthAttributesInfo info = GetLengthInfo(); frame->AttributeChanged(kNameSpaceID_None, *info.mLengthInfo[aAttrEnum].mName, - MutationEventBinding::SMIL); + MutationEvent_Binding::SMIL); } } @@ -1595,12 +1595,12 @@ nsSVGElement::GetAnimatedLengthValues(float *aFirst, ...) while (f && i < info.mLengthCount) { uint8_t type = info.mLengths[i].GetSpecifiedUnitType(); if (!ctx) { - if (type != SVGLengthBinding::SVG_LENGTHTYPE_NUMBER && - type != SVGLengthBinding::SVG_LENGTHTYPE_PX) + if (type != SVGLength_Binding::SVG_LENGTHTYPE_NUMBER && + type != SVGLength_Binding::SVG_LENGTHTYPE_PX) ctx = GetCtx(); } - if (type == SVGLengthBinding::SVG_LENGTHTYPE_EMS || - type == SVGLengthBinding::SVG_LENGTHTYPE_EXS) + if (type == SVGLength_Binding::SVG_LENGTHTYPE_EMS || + type == SVGLength_Binding::SVG_LENGTHTYPE_EXS) *f = info.mLengths[i++].GetAnimValue(this); else *f = info.mLengths[i++].GetAnimValue(ctx); @@ -1655,7 +1655,7 @@ nsSVGElement::DidAnimateLengthList(uint8_t aAttrEnum) LengthListAttributesInfo info = GetLengthListInfo(); frame->AttributeChanged(kNameSpaceID_None, *info.mLengthListInfo[aAttrEnum].mName, - MutationEventBinding::SMIL); + MutationEvent_Binding::SMIL); } } @@ -1743,7 +1743,7 @@ nsSVGElement::DidAnimateNumberList(uint8_t aAttrEnum) frame->AttributeChanged(kNameSpaceID_None, *info.mNumberListInfo[aAttrEnum].mName, - MutationEventBinding::SMIL); + MutationEvent_Binding::SMIL); } } @@ -1804,7 +1804,7 @@ nsSVGElement::DidAnimatePointList() if (frame) { frame->AttributeChanged(kNameSpaceID_None, GetPointListAttrName(), - MutationEventBinding::SMIL); + MutationEvent_Binding::SMIL); } } @@ -1841,7 +1841,7 @@ nsSVGElement::DidAnimatePathSegList() if (frame) { frame->AttributeChanged(kNameSpaceID_None, GetPathDataAttrName(), - MutationEventBinding::SMIL); + MutationEvent_Binding::SMIL); } } @@ -1883,7 +1883,7 @@ nsSVGElement::DidAnimateNumber(uint8_t aAttrEnum) NumberAttributesInfo info = GetNumberInfo(); frame->AttributeChanged(kNameSpaceID_None, *info.mNumberInfo[aAttrEnum].mName, - MutationEventBinding::SMIL); + MutationEvent_Binding::SMIL); } } @@ -1954,7 +1954,7 @@ nsSVGElement::DidAnimateNumberPair(uint8_t aAttrEnum) NumberPairAttributesInfo info = GetNumberPairInfo(); frame->AttributeChanged(kNameSpaceID_None, *info.mNumberPairInfo[aAttrEnum].mName, - MutationEventBinding::SMIL); + MutationEvent_Binding::SMIL); } } @@ -1996,7 +1996,7 @@ nsSVGElement::DidAnimateInteger(uint8_t aAttrEnum) IntegerAttributesInfo info = GetIntegerInfo(); frame->AttributeChanged(kNameSpaceID_None, *info.mIntegerInfo[aAttrEnum].mName, - MutationEventBinding::SMIL); + MutationEvent_Binding::SMIL); } } @@ -2068,7 +2068,7 @@ nsSVGElement::DidAnimateIntegerPair(uint8_t aAttrEnum) IntegerPairAttributesInfo info = GetIntegerPairInfo(); frame->AttributeChanged(kNameSpaceID_None, *info.mIntegerPairInfo[aAttrEnum].mName, - MutationEventBinding::SMIL); + MutationEvent_Binding::SMIL); } } @@ -2117,7 +2117,7 @@ nsSVGElement::DidAnimateAngle(uint8_t aAttrEnum) AngleAttributesInfo info = GetAngleInfo(); frame->AttributeChanged(kNameSpaceID_None, *info.mAngleInfo[aAttrEnum].mName, - MutationEventBinding::SMIL); + MutationEvent_Binding::SMIL); } } @@ -2157,7 +2157,7 @@ nsSVGElement::DidAnimateBoolean(uint8_t aAttrEnum) BooleanAttributesInfo info = GetBooleanInfo(); frame->AttributeChanged(kNameSpaceID_None, *info.mBooleanInfo[aAttrEnum].mName, - MutationEventBinding::SMIL); + MutationEvent_Binding::SMIL); } } @@ -2204,7 +2204,7 @@ nsSVGElement::DidAnimateEnum(uint8_t aAttrEnum) EnumAttributesInfo info = GetEnumInfo(); frame->AttributeChanged(kNameSpaceID_None, *info.mEnumInfo[aAttrEnum].mName, - MutationEventBinding::SMIL); + MutationEvent_Binding::SMIL); } } @@ -2241,7 +2241,7 @@ nsSVGElement::DidAnimateViewBox() if (frame) { frame->AttributeChanged(kNameSpaceID_None, nsGkAtoms::viewBox, - MutationEventBinding::SMIL); + MutationEvent_Binding::SMIL); } } @@ -2281,7 +2281,7 @@ nsSVGElement::DidAnimatePreserveAspectRatio() if (frame) { frame->AttributeChanged(kNameSpaceID_None, nsGkAtoms::preserveAspectRatio, - MutationEventBinding::SMIL); + MutationEvent_Binding::SMIL); } } @@ -2382,7 +2382,7 @@ nsSVGElement::DidAnimateString(uint8_t aAttrEnum) StringAttributesInfo info = GetStringInfo(); frame->AttributeChanged(info.mStringInfo[aAttrEnum].mNamespaceID, *info.mStringInfo[aAttrEnum].mName, - MutationEventBinding::SMIL); + MutationEvent_Binding::SMIL); } } diff --git a/dom/svg/nsSVGFilters.cpp b/dom/svg/nsSVGFilters.cpp index 79755383dd11..3666424dd8fd 100644 --- a/dom/svg/nsSVGFilters.cpp +++ b/dom/svg/nsSVGFilters.cpp @@ -53,10 +53,10 @@ using namespace mozilla::gfx; nsSVGElement::LengthInfo nsSVGFE::sLengthInfo[4] = { - { &nsGkAtoms::x, 0, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, - { &nsGkAtoms::y, 0, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, - { &nsGkAtoms::width, 100, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, - { &nsGkAtoms::height, 100, SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y } + { &nsGkAtoms::x, 0, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, + { &nsGkAtoms::y, 0, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y }, + { &nsGkAtoms::width, 100, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::X }, + { &nsGkAtoms::height, 100, SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE, SVGContentUtils::Y } }; //---------------------------------------------------------------------- @@ -361,7 +361,7 @@ SVGComponentTransferFunctionElement::GetNumberInfo() /* virtual */ JSObject* SVGFEFuncRElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGFEFuncRElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFEFuncRElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom @@ -377,7 +377,7 @@ NS_IMPL_ELEMENT_CLONE_WITH_INIT(SVGFEFuncRElement) /* virtual */ JSObject* SVGFEFuncGElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGFEFuncGElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFEFuncGElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom @@ -393,7 +393,7 @@ NS_IMPL_ELEMENT_CLONE_WITH_INIT(SVGFEFuncGElement) /* virtual */ JSObject* SVGFEFuncBElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGFEFuncBElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFEFuncBElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom @@ -409,7 +409,7 @@ NS_IMPL_ELEMENT_CLONE_WITH_INIT(SVGFEFuncBElement) /* virtual */ JSObject* SVGFEFuncAElement::WrapNode(JSContext* aCx, JS::Handle aGivenProto) { - return SVGFEFuncAElementBinding::Wrap(aCx, this, aGivenProto); + return SVGFEFuncAElement_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/svg/nsSVGLength2.cpp b/dom/svg/nsSVGLength2.cpp index 3a34f1ed8196..674af1430b21 100644 --- a/dom/svg/nsSVGLength2.cpp +++ b/dom/svg/nsSVGLength2.cpp @@ -45,8 +45,8 @@ static nsSVGAttrTearoffTable static bool IsValidUnitType(uint16_t unit) { - if (unit > SVGLengthBinding::SVG_LENGTHTYPE_UNKNOWN && - unit <= SVGLengthBinding::SVG_LENGTHTYPE_PC) + if (unit > SVGLength_Binding::SVG_LENGTHTYPE_UNKNOWN && + unit <= SVGLength_Binding::SVG_LENGTHTYPE_PC) return true; return false; @@ -69,7 +69,7 @@ static uint16_t GetUnitTypeForString(const nsAString& unitStr) { if (unitStr.IsEmpty()) - return SVGLengthBinding::SVG_LENGTHTYPE_NUMBER; + return SVGLength_Binding::SVG_LENGTHTYPE_NUMBER; nsAtom *unitAtom = NS_GetStaticAtom(unitStr); if (unitAtom) { @@ -80,7 +80,7 @@ GetUnitTypeForString(const nsAString& unitStr) } } - return SVGLengthBinding::SVG_LENGTHTYPE_UNKNOWN; + return SVGLength_Binding::SVG_LENGTHTYPE_UNKNOWN; } static void @@ -243,24 +243,24 @@ nsSVGLength2::GetPixelsPerUnit(const UserSpaceMetrics& aMetrics, uint8_t aUnitType) const { switch (aUnitType) { - case SVGLengthBinding::SVG_LENGTHTYPE_NUMBER: - case SVGLengthBinding::SVG_LENGTHTYPE_PX: + case SVGLength_Binding::SVG_LENGTHTYPE_NUMBER: + case SVGLength_Binding::SVG_LENGTHTYPE_PX: return 1; - case SVGLengthBinding::SVG_LENGTHTYPE_MM: + case SVGLength_Binding::SVG_LENGTHTYPE_MM: return DPI / MM_PER_INCH_FLOAT; - case SVGLengthBinding::SVG_LENGTHTYPE_CM: + case SVGLength_Binding::SVG_LENGTHTYPE_CM: return 10.0f * DPI / MM_PER_INCH_FLOAT; - case SVGLengthBinding::SVG_LENGTHTYPE_IN: + case SVGLength_Binding::SVG_LENGTHTYPE_IN: return DPI; - case SVGLengthBinding::SVG_LENGTHTYPE_PT: + case SVGLength_Binding::SVG_LENGTHTYPE_PT: return DPI / POINTS_PER_INCH_FLOAT; - case SVGLengthBinding::SVG_LENGTHTYPE_PC: + case SVGLength_Binding::SVG_LENGTHTYPE_PC: return 12.0f * DPI / POINTS_PER_INCH_FLOAT; - case SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE: + case SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE: return aMetrics.GetAxisLength(mCtxType) / 100.0f; - case SVGLengthBinding::SVG_LENGTHTYPE_EMS: + case SVGLength_Binding::SVG_LENGTHTYPE_EMS: return aMetrics.GetEmLength(); - case SVGLengthBinding::SVG_LENGTHTYPE_EXS: + case SVGLength_Binding::SVG_LENGTHTYPE_EXS: return aMetrics.GetExLength(); default: MOZ_ASSERT_UNREACHABLE("Unknown unit type"); @@ -518,9 +518,9 @@ nsSVGLength2::SMILLength::ValueFromString(const nsAString& aStr, val.mU.mDouble = value * mVal->GetPixelsPerUnit(mSVGElement, unitType); aValue = val; aPreventCachingOfSandwich = - (unitType == SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE || - unitType == SVGLengthBinding::SVG_LENGTHTYPE_EMS || - unitType == SVGLengthBinding::SVG_LENGTHTYPE_EXS); + (unitType == SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE || + unitType == SVGLength_Binding::SVG_LENGTHTYPE_EMS || + unitType == SVGLength_Binding::SVG_LENGTHTYPE_EXS); return NS_OK; } diff --git a/dom/svg/nsSVGLength2.h b/dom/svg/nsSVGLength2.h index 3f526371b7fc..dc322659e67d 100644 --- a/dom/svg/nsSVGLength2.h +++ b/dom/svg/nsSVGLength2.h @@ -98,7 +98,7 @@ public: uint8_t aAttrEnum = 0xff, float aValue = 0, uint8_t aUnitType = - mozilla::dom::SVGLengthBinding::SVG_LENGTHTYPE_NUMBER) { + mozilla::dom::SVGLength_Binding::SVG_LENGTHTYPE_NUMBER) { mAnimVal = mBaseVal = aValue; mSpecifiedUnitType = aUnitType; mAttrEnum = aAttrEnum; @@ -138,7 +138,7 @@ public: uint8_t GetSpecifiedUnitType() const { return mSpecifiedUnitType; } bool IsPercentage() const { return mSpecifiedUnitType == - mozilla::dom::SVGLengthBinding::SVG_LENGTHTYPE_PERCENTAGE; } + mozilla::dom::SVGLength_Binding::SVG_LENGTHTYPE_PERCENTAGE; } float GetAnimValInSpecifiedUnits() const { return mAnimVal; } float GetBaseValInSpecifiedUnits() const { return mBaseVal; } diff --git a/dom/svg/nsSVGPathDataParser.cpp b/dom/svg/nsSVGPathDataParser.cpp index dad32b69424d..be927655a781 100644 --- a/dom/svg/nsSVGPathDataParser.cpp +++ b/dom/svg/nsSVGPathDataParser.cpp @@ -13,7 +13,7 @@ #include "SVGPathSegUtils.h" using namespace mozilla; -using namespace mozilla::dom::SVGPathSegBinding; +using namespace mozilla::dom::SVGPathSeg_Binding; using namespace mozilla::gfx; static inline char16_t ToUpper(char16_t aCh) diff --git a/dom/svg/nsSVGTransform.cpp b/dom/svg/nsSVGTransform.cpp index e6c784fbc62a..8f79b6238d49 100644 --- a/dom/svg/nsSVGTransform.cpp +++ b/dom/svg/nsSVGTransform.cpp @@ -15,7 +15,7 @@ namespace { namespace mozilla { -using namespace dom::SVGTransformBinding; +using namespace dom::SVGTransform_Binding; void nsSVGTransform::GetValueAsString(nsAString& aValue) const diff --git a/dom/svg/nsSVGTransform.h b/dom/svg/nsSVGTransform.h index 81cc1717cbae..b028a9e9206d 100644 --- a/dom/svg/nsSVGTransform.h +++ b/dom/svg/nsSVGTransform.h @@ -26,7 +26,7 @@ public: , mAngle(0.f) , mOriginX(0.f) , mOriginY(0.f) - , mType(dom::SVGTransformBinding::SVG_TRANSFORM_MATRIX) + , mType(dom::SVGTransform_Binding::SVG_TRANSFORM_MATRIX) { } explicit nsSVGTransform(const gfxMatrix& aMatrix) @@ -34,7 +34,7 @@ public: , mAngle(0.f) , mOriginX(0.f) , mOriginY(0.f) - , mType(dom::SVGTransformBinding::SVG_TRANSFORM_MATRIX) + , mType(dom::SVGTransform_Binding::SVG_TRANSFORM_MATRIX) { } bool operator==(const nsSVGTransform& rhs) const { @@ -119,8 +119,8 @@ public: explicit SVGTransformSMILData(uint16_t aType) : mTransformType(aType) { - MOZ_ASSERT(aType >=dom::SVGTransformBinding:: SVG_TRANSFORM_MATRIX && - aType <= dom::SVGTransformBinding::SVG_TRANSFORM_SKEWY, + MOZ_ASSERT(aType >=dom::SVGTransform_Binding:: SVG_TRANSFORM_MATRIX && + aType <= dom::SVGTransform_Binding::SVG_TRANSFORM_SKEWY, "Unexpected transform type"); for (uint32_t i = 0; i < NUM_STORED_PARAMS; ++i) { mParams[i] = 0.f; @@ -130,8 +130,8 @@ public: SVGTransformSMILData(uint16_t aType, float (&aParams)[NUM_SIMPLE_PARAMS]) : mTransformType(aType) { - MOZ_ASSERT(aType >= dom::SVGTransformBinding::SVG_TRANSFORM_TRANSLATE && - aType <= dom::SVGTransformBinding::SVG_TRANSFORM_SKEWY, + MOZ_ASSERT(aType >= dom::SVGTransform_Binding::SVG_TRANSFORM_TRANSLATE && + aType <= dom::SVGTransform_Binding::SVG_TRANSFORM_SKEWY, "Expected 'simple' transform type"); for (uint32_t i = 0; i < NUM_SIMPLE_PARAMS; ++i) { mParams[i] = aParams[i]; diff --git a/dom/system/linux/GpsdLocationProvider.cpp b/dom/system/linux/GpsdLocationProvider.cpp index 49f7433abdd4..6ea384061229 100644 --- a/dom/system/linux/GpsdLocationProvider.cpp +++ b/dom/system/linux/GpsdLocationProvider.cpp @@ -185,7 +185,7 @@ public: err = PollLoop5(); break; default: - err = PositionErrorBinding::POSITION_UNAVAILABLE; + err = PositionError_Binding::POSITION_UNAVAILABLE; break; } @@ -303,7 +303,7 @@ protected: return err; #else - return PositionErrorBinding::POSITION_UNAVAILABLE; + return PositionError_Binding::POSITION_UNAVAILABLE; #endif // GPSD_MAJOR_API_VERSION } @@ -315,13 +315,13 @@ protected: case EPERM: MOZ_FALLTHROUGH; case EROFS: - return PositionErrorBinding::PERMISSION_DENIED; + return PositionError_Binding::PERMISSION_DENIED; case ETIME: MOZ_FALLTHROUGH; case ETIMEDOUT: - return PositionErrorBinding::TIMEOUT; + return PositionError_Binding::TIMEOUT; default: - return PositionErrorBinding::POSITION_UNAVAILABLE; + return PositionError_Binding::POSITION_UNAVAILABLE; } } diff --git a/dom/system/mac/CoreLocationLocationProvider.mm b/dom/system/mac/CoreLocationLocationProvider.mm index 4c6e10b3153e..d7c34ccbe5b8 100644 --- a/dom/system/mac/CoreLocationLocationProvider.mm +++ b/dom/system/mac/CoreLocationLocationProvider.mm @@ -68,7 +68,7 @@ static const CLLocationAccuracy kDEFAULT_ACCURACY = kCLLocationAccuracyNearestTe console->LogStringMessage(NS_ConvertUTF8toUTF16([message UTF8String]).get()); if ([aError code] == kCLErrorDenied) { - mProvider->NotifyError(dom::PositionErrorBinding::PERMISSION_DENIED); + mProvider->NotifyError(dom::PositionError_Binding::PERMISSION_DENIED); return; } diff --git a/dom/system/windows/WindowsLocationProvider.cpp b/dom/system/windows/WindowsLocationProvider.cpp index 5bf429973603..f2d277d78d7f 100644 --- a/dom/system/windows/WindowsLocationProvider.cpp +++ b/dom/system/windows/WindowsLocationProvider.cpp @@ -129,11 +129,11 @@ LocationEvent::OnStatusChanged(REFIID aReportType, uint16_t err; switch (aStatus) { case REPORT_ACCESS_DENIED: - err = PositionErrorBinding::PERMISSION_DENIED; + err = PositionError_Binding::PERMISSION_DENIED; break; case REPORT_NOT_SUPPORTED: case REPORT_ERROR: - err = PositionErrorBinding::POSITION_UNAVAILABLE; + err = PositionError_Binding::POSITION_UNAVAILABLE; break; default: return S_OK; diff --git a/dom/u2f/U2F.cpp b/dom/u2f/U2F.cpp index 49eeb7a6c6a4..904e12606aaa 100644 --- a/dom/u2f/U2F.cpp +++ b/dom/u2f/U2F.cpp @@ -171,7 +171,7 @@ U2F::Init(ErrorResult& aRv) /* virtual */ JSObject* U2F::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return U2FBinding::Wrap(aCx, this, aGivenProto); + return U2F_Binding::Wrap(aCx, this, aGivenProto); } template diff --git a/dom/url/URL.cpp b/dom/url/URL.cpp index dcfcba020377..eba80989b59e 100644 --- a/dom/url/URL.cpp +++ b/dom/url/URL.cpp @@ -31,7 +31,7 @@ NS_INTERFACE_MAP_END JSObject* URL::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return URLBinding::Wrap(aCx, this, aGivenProto); + return URL_Binding::Wrap(aCx, this, aGivenProto); } /* static */ already_AddRefed diff --git a/dom/url/URLSearchParams.cpp b/dom/url/URLSearchParams.cpp index 243c2d9cd493..76b3c2b7101d 100644 --- a/dom/url/URLSearchParams.cpp +++ b/dom/url/URLSearchParams.cpp @@ -359,7 +359,7 @@ URLSearchParams::~URLSearchParams() JSObject* URLSearchParams::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return URLSearchParamsBinding::Wrap(aCx, this, aGivenProto); + return URLSearchParams_Binding::Wrap(aCx, this, aGivenProto); } /* static */ already_AddRefed diff --git a/dom/vr/VRDisplay.cpp b/dom/vr/VRDisplay.cpp index 579335055c50..d5ab29b2724e 100644 --- a/dom/vr/VRDisplay.cpp +++ b/dom/vr/VRDisplay.cpp @@ -124,7 +124,7 @@ JSObject* VRFieldOfView::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return VRFieldOfViewBinding::Wrap(aCx, this, aGivenProto); + return VRFieldOfView_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_CYCLE_COLLECTION_CLASS(VREyeParameters) @@ -187,7 +187,7 @@ VREyeParameters::GetOffset(JSContext* aCx, JS::MutableHandle aRetval, JSObject* VREyeParameters::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return VREyeParametersBinding::Wrap(aCx, this, aGivenProto); + return VREyeParameters_Binding::Wrap(aCx, this, aGivenProto); } VRStageParameters::VRStageParameters(nsISupports* aParent, @@ -209,7 +209,7 @@ VRStageParameters::~VRStageParameters() JSObject* VRStageParameters::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return VRStageParametersBinding::Wrap(aCx, this, aGivenProto); + return VRStageParameters_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_CYCLE_COLLECTION_CLASS(VRStageParameters) @@ -256,7 +256,7 @@ NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(VRDisplayCapabilities, Release) JSObject* VRDisplayCapabilities::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return VRDisplayCapabilitiesBinding::Wrap(aCx, this, aGivenProto); + return VRDisplayCapabilities_Binding::Wrap(aCx, this, aGivenProto); } VRPose::VRPose(nsISupports* aParent, const gfx::VRHMDSensorState& aState) @@ -344,13 +344,13 @@ VRPose::GetAngularAcceleration(JSContext* aCx, JSObject* VRPose::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return VRPoseBinding::Wrap(aCx, this, aGivenProto); + return VRPose_Binding::Wrap(aCx, this, aGivenProto); } /* virtual */ JSObject* VRDisplay::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return VRDisplayBinding::Wrap(aCx, this, aGivenProto); + return VRDisplay_Binding::Wrap(aCx, this, aGivenProto); } VRDisplay::VRDisplay(nsPIDOMWindowInner* aWindow, gfx::VRDisplayClient* aClient) @@ -803,7 +803,7 @@ JSObject* VRFrameData::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return VRFrameDataBinding::Wrap(aCx, this, aGivenProto); + return VRFrameData_Binding::Wrap(aCx, this, aGivenProto); } VRPose* @@ -970,7 +970,7 @@ JSObject* VRSubmitFrameResult::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return VRSubmitFrameResultBinding::Wrap(aCx, this, aGivenProto); + return VRSubmitFrameResult_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/vr/VRDisplayEvent.cpp b/dom/vr/VRDisplayEvent.cpp index 0fcab46b2074..ea5b9c9f5de7 100644 --- a/dom/vr/VRDisplayEvent.cpp +++ b/dom/vr/VRDisplayEvent.cpp @@ -46,7 +46,7 @@ JSObject* VRDisplayEvent::WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) { - return VRDisplayEventBinding::Wrap(aCx, this, aGivenProto); + return VRDisplayEvent_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/vr/VRServiceTest.cpp b/dom/vr/VRServiceTest.cpp index 1e137dcd1063..a654468a5457 100644 --- a/dom/vr/VRServiceTest.cpp +++ b/dom/vr/VRServiceTest.cpp @@ -51,7 +51,7 @@ VRMockDisplay::VRMockDisplay(const nsCString& aID, uint32_t aDeviceID) JSObject* VRMockDisplay::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return VRMockDisplayBinding::Wrap(aCx, this, aGivenProto); + return VRMockDisplay_Binding::Wrap(aCx, this, aGivenProto); } void VRMockDisplay::SetEyeResolution(unsigned long aRenderWidth, unsigned long aRenderHeight) @@ -175,7 +175,7 @@ VRMockController::VRMockController(const nsCString& aID, uint32_t aDeviceID) JSObject* VRMockController::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return VRMockControllerBinding::Wrap(aCx, this, aGivenProto); + return VRMockController_Binding::Wrap(aCx, this, aGivenProto); } void @@ -281,7 +281,7 @@ NS_IMPL_RELEASE_INHERITED(VRServiceTest, DOMEventTargetHelper) JSObject* VRServiceTest::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return VRServiceTestBinding::Wrap(aCx, this, aGivenProto); + return VRServiceTest_Binding::Wrap(aCx, this, aGivenProto); } // static diff --git a/dom/webauthn/AuthenticatorAssertionResponse.cpp b/dom/webauthn/AuthenticatorAssertionResponse.cpp index db84f367dc34..1c3666d4995c 100644 --- a/dom/webauthn/AuthenticatorAssertionResponse.cpp +++ b/dom/webauthn/AuthenticatorAssertionResponse.cpp @@ -54,7 +54,7 @@ JSObject* AuthenticatorAssertionResponse::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return AuthenticatorAssertionResponseBinding::Wrap(aCx, this, aGivenProto); + return AuthenticatorAssertionResponse_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/webauthn/AuthenticatorAttestationResponse.cpp b/dom/webauthn/AuthenticatorAttestationResponse.cpp index 47c630f9a86a..249903735e3f 100644 --- a/dom/webauthn/AuthenticatorAttestationResponse.cpp +++ b/dom/webauthn/AuthenticatorAttestationResponse.cpp @@ -48,7 +48,7 @@ JSObject* AuthenticatorAttestationResponse::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return AuthenticatorAttestationResponseBinding::Wrap(aCx, this, aGivenProto); + return AuthenticatorAttestationResponse_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/webauthn/AuthenticatorResponse.cpp b/dom/webauthn/AuthenticatorResponse.cpp index 8bb219b95fc6..5c1e1acc973e 100644 --- a/dom/webauthn/AuthenticatorResponse.cpp +++ b/dom/webauthn/AuthenticatorResponse.cpp @@ -50,7 +50,7 @@ JSObject* AuthenticatorResponse::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return AuthenticatorResponseBinding::Wrap(aCx, this, aGivenProto); + return AuthenticatorResponse_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/webauthn/PublicKeyCredential.cpp b/dom/webauthn/PublicKeyCredential.cpp index 23632fe3e567..db3c88ed34e9 100644 --- a/dom/webauthn/PublicKeyCredential.cpp +++ b/dom/webauthn/PublicKeyCredential.cpp @@ -48,7 +48,7 @@ JSObject* PublicKeyCredential::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return PublicKeyCredentialBinding::Wrap(aCx, this, aGivenProto); + return PublicKeyCredential_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/webbrowserpersist/WebBrowserPersistLocalDocument.cpp b/dom/webbrowserpersist/WebBrowserPersistLocalDocument.cpp index 76aa73709650..2027151e1d06 100644 --- a/dom/webbrowserpersist/WebBrowserPersistLocalDocument.cpp +++ b/dom/webbrowserpersist/WebBrowserPersistLocalDocument.cpp @@ -1141,9 +1141,9 @@ WebBrowserPersistLocalDocument::ReadResources(nsIWebBrowserPersistResourceVisito ErrorResult err; RefPtr walker = mDocument->CreateTreeWalker(*mDocument, - dom::NodeFilterBinding::SHOW_ELEMENT | - dom::NodeFilterBinding::SHOW_DOCUMENT | - dom::NodeFilterBinding::SHOW_PROCESSING_INSTRUCTION, + dom::NodeFilter_Binding::SHOW_ELEMENT | + dom::NodeFilter_Binding::SHOW_DOCUMENT | + dom::NodeFilter_Binding::SHOW_PROCESSING_INSTRUCTION, nullptr, err); if (NS_WARN_IF(err.Failed())) { diff --git a/dom/websocket/WebSocket.cpp b/dom/websocket/WebSocket.cpp index 2148fac16d40..8d81615da18e 100644 --- a/dom/websocket/WebSocket.cpp +++ b/dom/websocket/WebSocket.cpp @@ -951,7 +951,7 @@ WebSocket::~WebSocket() JSObject* WebSocket::WrapObject(JSContext* cx, JS::Handle aGivenProto) { - return WebSocketBinding::Wrap(cx, this, aGivenProto); + return WebSocket_Binding::Wrap(cx, this, aGivenProto); } void diff --git a/dom/workers/ChromeWorker.cpp b/dom/workers/ChromeWorker.cpp index cc823d370130..4dc12c3f5c52 100644 --- a/dom/workers/ChromeWorker.cpp +++ b/dom/workers/ChromeWorker.cpp @@ -61,7 +61,7 @@ JSObject* ChromeWorker::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { JS::Rooted wrapper(aCx, - ChromeWorkerBinding::Wrap(aCx, this, aGivenProto)); + ChromeWorker_Binding::Wrap(aCx, this, aGivenProto)); if (wrapper) { // Most DOM objects don't assume they have a reflector. If they don't have // one and need one, they create it. But in workers code, we assume that the diff --git a/dom/workers/SharedWorker.cpp b/dom/workers/SharedWorker.cpp index 715367efaffa..93ca54f31ecd 100644 --- a/dom/workers/SharedWorker.cpp +++ b/dom/workers/SharedWorker.cpp @@ -184,7 +184,7 @@ SharedWorker::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { AssertIsOnMainThread(); - return SharedWorkerBinding::Wrap(aCx, this, aGivenProto); + return SharedWorker_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/workers/Worker.cpp b/dom/workers/Worker.cpp index 3aadb2a0f1cc..d8b123bf9098 100644 --- a/dom/workers/Worker.cpp +++ b/dom/workers/Worker.cpp @@ -55,7 +55,7 @@ JSObject* Worker::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { JS::Rooted wrapper(aCx, - WorkerBinding::Wrap(aCx, this, aGivenProto)); + Worker_Binding::Wrap(aCx, this, aGivenProto)); if (wrapper) { // Most DOM objects don't assume they have a reflector. If they don't have // one and need one, they create it. But in workers code, we assume that the diff --git a/dom/workers/WorkerLocation.cpp b/dom/workers/WorkerLocation.cpp index aef489ac7357..ba8ca5a4bd71 100644 --- a/dom/workers/WorkerLocation.cpp +++ b/dom/workers/WorkerLocation.cpp @@ -36,7 +36,7 @@ WorkerLocation::Create(WorkerPrivate::LocationInfo& aInfo) JSObject* WorkerLocation::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return WorkerLocationBinding::Wrap(aCx, this, aGivenProto); + return WorkerLocation_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/workers/WorkerNavigator.cpp b/dom/workers/WorkerNavigator.cpp index dfe9f353d998..3b011ae13f3c 100644 --- a/dom/workers/WorkerNavigator.cpp +++ b/dom/workers/WorkerNavigator.cpp @@ -65,13 +65,13 @@ WorkerNavigator::Create(bool aOnLine) JSObject* WorkerNavigator::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return WorkerNavigatorBinding::Wrap(aCx, this, aGivenProto); + return WorkerNavigator_Binding::Wrap(aCx, this, aGivenProto); } void WorkerNavigator::SetLanguages(const nsTArray& aLanguages) { - WorkerNavigatorBinding::ClearCachedLanguagesValue(this); + WorkerNavigator_Binding::ClearCachedLanguagesValue(this); mProperties.mLanguages = aLanguages; } diff --git a/dom/workers/WorkerScope.cpp b/dom/workers/WorkerScope.cpp index 82c18bda53e6..8979b670cded 100644 --- a/dom/workers/WorkerScope.cpp +++ b/dom/workers/WorkerScope.cpp @@ -616,7 +616,7 @@ DedicatedWorkerGlobalScope::WrapGlobalObject(JSContext* aCx, JS::RealmCreationOptions& creationOptions = options.creationOptions(); creationOptions.setSharedMemoryAndAtomicsEnabled(sharedMemoryEnabled); - return DedicatedWorkerGlobalScopeBinding::Wrap(aCx, this, this, + return DedicatedWorkerGlobalScope_Binding::Wrap(aCx, this, this, options, GetWorkerPrincipal(), true, aReflector); @@ -655,7 +655,7 @@ SharedWorkerGlobalScope::WrapGlobalObject(JSContext* aCx, JS::RealmOptions options; mWorkerPrivate->CopyJSRealmOptions(options); - return SharedWorkerGlobalScopeBinding::Wrap(aCx, this, this, options, + return SharedWorkerGlobalScope_Binding::Wrap(aCx, this, this, options, GetWorkerPrincipal(), true, aReflector); } @@ -701,7 +701,7 @@ ServiceWorkerGlobalScope::WrapGlobalObject(JSContext* aCx, JS::RealmOptions options; mWorkerPrivate->CopyJSRealmOptions(options); - return ServiceWorkerGlobalScopeBinding::Wrap(aCx, this, this, options, + return ServiceWorkerGlobalScope_Binding::Wrap(aCx, this, this, options, GetWorkerPrincipal(), true, aReflector); } @@ -957,7 +957,7 @@ WorkerDebuggerGlobalScope::WrapGlobalObject(JSContext* aCx, JS::RealmOptions options; mWorkerPrivate->CopyJSRealmOptions(options); - return WorkerDebuggerGlobalScopeBinding::Wrap(aCx, this, this, options, + return WorkerDebuggerGlobalScope_Binding::Wrap(aCx, this, this, options, GetWorkerPrincipal(), true, aReflector); } diff --git a/dom/worklet/AudioWorkletGlobalScope.cpp b/dom/worklet/AudioWorkletGlobalScope.cpp index 0046690c0aa0..c459c96fd031 100644 --- a/dom/worklet/AudioWorkletGlobalScope.cpp +++ b/dom/worklet/AudioWorkletGlobalScope.cpp @@ -23,7 +23,7 @@ AudioWorkletGlobalScope::WrapGlobalObject(JSContext* aCx, JS::MutableHandle aReflector) { JS::RealmOptions options; - return AudioWorkletGlobalScopeBinding::Wrap(aCx, this, this, + return AudioWorkletGlobalScope_Binding::Wrap(aCx, this, this, options, WorkletPrincipal::GetWorkletPrincipal(), true, aReflector); diff --git a/dom/worklet/PaintWorkletGlobalScope.cpp b/dom/worklet/PaintWorkletGlobalScope.cpp index b0d8c893f41e..7a7d20a51eb0 100644 --- a/dom/worklet/PaintWorkletGlobalScope.cpp +++ b/dom/worklet/PaintWorkletGlobalScope.cpp @@ -19,7 +19,7 @@ PaintWorkletGlobalScope::WrapGlobalObject(JSContext* aCx, JS::MutableHandle aReflector) { JS::RealmOptions options; - return PaintWorkletGlobalScopeBinding::Wrap(aCx, this, this, + return PaintWorkletGlobalScope_Binding::Wrap(aCx, this, this, options, WorkletPrincipal::GetWorkletPrincipal(), true, aReflector); diff --git a/dom/worklet/Worklet.cpp b/dom/worklet/Worklet.cpp index 9537bd29c560..011be5ec8e61 100644 --- a/dom/worklet/Worklet.cpp +++ b/dom/worklet/Worklet.cpp @@ -508,7 +508,7 @@ JSObject* Worklet::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { MOZ_ASSERT(NS_IsMainThread()); - return WorkletBinding::Wrap(aCx, this, aGivenProto); + return Worklet_Binding::Wrap(aCx, this, aGivenProto); } already_AddRefed diff --git a/dom/xbl/XBLChildrenElement.cpp b/dom/xbl/XBLChildrenElement.cpp index b953362d5463..5570be2c5840 100644 --- a/dom/xbl/XBLChildrenElement.cpp +++ b/dom/xbl/XBLChildrenElement.cpp @@ -193,5 +193,5 @@ nsAnonymousContentList::IndexOf(nsIContent* aContent) JSObject* nsAnonymousContentList::WrapObject(JSContext *cx, JS::Handle aGivenProto) { - return mozilla::dom::NodeListBinding::Wrap(cx, this, aGivenProto); + return mozilla::dom::NodeList_Binding::Wrap(cx, this, aGivenProto); } diff --git a/dom/xbl/nsXBLEventHandler.cpp b/dom/xbl/nsXBLEventHandler.cpp index 3ffcfdf2ccbd..52eb5cdb8f20 100644 --- a/dom/xbl/nsXBLEventHandler.cpp +++ b/dom/xbl/nsXBLEventHandler.cpp @@ -37,7 +37,7 @@ nsXBLEventHandler::HandleEvent(Event* aEvent) uint8_t phase = mProtoHandler->GetPhase(); if (phase == NS_PHASE_TARGET) { - if (aEvent->EventPhase() != EventBinding::AT_TARGET) { + if (aEvent->EventPhase() != Event_Binding::AT_TARGET) { return NS_OK; } } @@ -128,7 +128,7 @@ nsXBLKeyEventHandler::HandleEvent(Event* aEvent) return NS_ERROR_FAILURE; if (mPhase == NS_PHASE_TARGET) { - if (aEvent->EventPhase() != EventBinding::AT_TARGET) { + if (aEvent->EventPhase() != Event_Binding::AT_TARGET) { return NS_OK; } } diff --git a/dom/xbl/nsXBLProtoImpl.cpp b/dom/xbl/nsXBLProtoImpl.cpp index f9bf9f012529..626e29e16166 100644 --- a/dom/xbl/nsXBLProtoImpl.cpp +++ b/dom/xbl/nsXBLProtoImpl.cpp @@ -208,8 +208,8 @@ nsXBLProtoImpl::InitTargetObjects(nsXBLPrototypeBinding* aBinding, JSAutoRealm ar(cx, global); // Make sure the interface object is created before the prototype object // so that XULElement is hidden from content. See bug 909340. - bool defineOnGlobal = dom::XULElementBinding::ConstructorEnabled(cx, global); - dom::XULElementBinding::GetConstructorObjectHandle(cx, defineOnGlobal); + bool defineOnGlobal = dom::XULElement_Binding::ConstructorEnabled(cx, global); + dom::XULElement_Binding::GetConstructorObjectHandle(cx, defineOnGlobal); rv = nsContentUtils::WrapNative(cx, aBoundElement, &v, /* aAllowWrapping = */ false); diff --git a/dom/xbl/nsXBLPrototypeHandler.cpp b/dom/xbl/nsXBLPrototypeHandler.cpp index 8971301feb53..d584dd5f2e25 100644 --- a/dom/xbl/nsXBLPrototypeHandler.cpp +++ b/dom/xbl/nsXBLPrototypeHandler.cpp @@ -246,7 +246,7 @@ nsXBLPrototypeHandler::InitAccessKeys() #ifdef XP_MACOSX kMenuAccessKey = 0; #else - kMenuAccessKey = KeyboardEventBinding::DOM_VK_ALT; + kMenuAccessKey = KeyboardEvent_Binding::DOM_VK_ALT; #endif // Get the menu access key value from prefs, overriding the default: @@ -525,7 +525,7 @@ nsXBLPrototypeHandler::DispatchXBLCommand(EventTarget* aTarget, Event* aEvent) aEvent->PreventDefault(); if (mEventName == nsGkAtoms::keypress && - mDetail == KeyboardEventBinding::DOM_VK_SPACE && + mDetail == KeyboardEvent_Binding::DOM_VK_SPACE && mMisc == 1) { // get the focused element so that we can pageDown only at // certain times. @@ -787,16 +787,16 @@ int32_t nsXBLPrototypeHandler::KeyToMask(int32_t key) { switch (key) { - case KeyboardEventBinding::DOM_VK_META: + case KeyboardEvent_Binding::DOM_VK_META: return cMeta | cMetaMask; - case KeyboardEventBinding::DOM_VK_WIN: + case KeyboardEvent_Binding::DOM_VK_WIN: return cOS | cOSMask; - case KeyboardEventBinding::DOM_VK_ALT: + case KeyboardEvent_Binding::DOM_VK_ALT: return cAlt | cAltMask; - case KeyboardEventBinding::DOM_VK_CONTROL: + case KeyboardEvent_Binding::DOM_VK_CONTROL: default: return cControl | cControlMask; } @@ -809,13 +809,13 @@ nsXBLPrototypeHandler::AccelKeyMask() { switch (WidgetInputEvent::AccelModifier()) { case MODIFIER_ALT: - return KeyToMask(KeyboardEventBinding::DOM_VK_ALT); + return KeyToMask(KeyboardEvent_Binding::DOM_VK_ALT); case MODIFIER_CONTROL: - return KeyToMask(KeyboardEventBinding::DOM_VK_CONTROL); + return KeyToMask(KeyboardEvent_Binding::DOM_VK_CONTROL); case MODIFIER_META: - return KeyToMask(KeyboardEventBinding::DOM_VK_META); + return KeyToMask(KeyboardEvent_Binding::DOM_VK_META); case MODIFIER_OS: - return KeyToMask(KeyboardEventBinding::DOM_VK_WIN); + return KeyToMask(KeyboardEvent_Binding::DOM_VK_WIN); default: MOZ_CRASH("Handle the new result of WidgetInputEvent::AccelModifier()"); return 0; diff --git a/dom/xbl/nsXBLPrototypeHandler.h b/dom/xbl/nsXBLPrototypeHandler.h index c2b4747ceb56..f5ff81f78c41 100644 --- a/dom/xbl/nsXBLPrototypeHandler.h +++ b/dom/xbl/nsXBLPrototypeHandler.h @@ -51,7 +51,7 @@ class KeyboardShortcut; #define NS_HANDLER_TYPE_SYSTEM (1 << 6) #define NS_HANDLER_TYPE_PREVENTDEFAULT (1 << 7) -// XXX Use EventBinding:: codes? +// XXX Use Event_Binding:: codes? #define NS_PHASE_CAPTURING 1 #define NS_PHASE_TARGET 2 #define NS_PHASE_BUBBLING 3 diff --git a/dom/xbl/nsXBLWindowKeyHandler.cpp b/dom/xbl/nsXBLWindowKeyHandler.cpp index 8221ee07dd4f..ebfa2da72264 100644 --- a/dom/xbl/nsXBLWindowKeyHandler.cpp +++ b/dom/xbl/nsXBLWindowKeyHandler.cpp @@ -452,7 +452,7 @@ nsXBLWindowKeyHandler::HandleEvent(Event* aEvent) RefPtr keyEvent = aEvent->AsKeyboardEvent(); NS_ENSURE_TRUE(keyEvent, NS_ERROR_INVALID_ARG); - if (aEvent->EventPhase() == EventBinding::CAPTURING_PHASE) { + if (aEvent->EventPhase() == Event_Binding::CAPTURING_PHASE) { if (aEvent->WidgetEventPtr()->mFlags.mInSystemGroup) { HandleEventOnCaptureInSystemEventGroup(keyEvent); } else { diff --git a/dom/xhr/XMLHttpRequest.h b/dom/xhr/XMLHttpRequest.h index a2a956e28dd7..0404bf28f967 100644 --- a/dom/xhr/XMLHttpRequest.h +++ b/dom/xhr/XMLHttpRequest.h @@ -153,7 +153,7 @@ public: virtual JSObject* WrapObject(JSContext *aCx, JS::Handle aGivenProto) override { - return mozilla::dom::XMLHttpRequestBinding::Wrap(aCx, this, aGivenProto); + return mozilla::dom::XMLHttpRequest_Binding::Wrap(aCx, this, aGivenProto); } }; diff --git a/dom/xhr/XMLHttpRequestMainThread.cpp b/dom/xhr/XMLHttpRequestMainThread.cpp index b8f89f3dfb1a..89695714b551 100644 --- a/dom/xhr/XMLHttpRequestMainThread.cpp +++ b/dom/xhr/XMLHttpRequestMainThread.cpp @@ -196,7 +196,7 @@ XMLHttpRequestMainThread::XMLHttpRequestMainThread() mResponseCharset(nullptr), mResponseType(XMLHttpRequestResponseType::_empty), mRequestObserver(nullptr), - mState(XMLHttpRequestBinding::UNSENT), + mState(XMLHttpRequest_Binding::UNSENT), mFlagSynchronous(false), mFlagAborted(false), mFlagParseBody(false), mFlagSyncLooping(false), mFlagBackgroundRequest(false), mFlagHadUploadListenersOnSend(false), mFlagACwithCredentials(false), @@ -227,8 +227,8 @@ XMLHttpRequestMainThread::~XMLHttpRequestMainThread() { mFlagDeleted = true; - if ((mState == XMLHttpRequestBinding::OPENED && mFlagSend) || - mState == XMLHttpRequestBinding::LOADING) { + if ((mState == XMLHttpRequest_Binding::OPENED && mFlagSend) || + mState == XMLHttpRequest_Binding::LOADING) { Abort(); } @@ -441,7 +441,7 @@ XMLHttpRequestMainThread::GetResponseXML(ErrorResult& aRv) mWarnAboutSyncHtml = false; LogMessage("HTMLSyncXHRWarning", GetOwner()); } - if (mState != XMLHttpRequestBinding::DONE) { + if (mState != XMLHttpRequest_Binding::DONE) { return nullptr; } return mResponseXML; @@ -555,8 +555,8 @@ XMLHttpRequestMainThread::GetResponseText(XMLHttpRequestStringSnapshot& aSnapsho return; } - if (mState != XMLHttpRequestBinding::LOADING && - mState != XMLHttpRequestBinding::DONE) { + if (mState != XMLHttpRequest_Binding::LOADING && + mState != XMLHttpRequest_Binding::DONE) { return; } @@ -587,7 +587,7 @@ XMLHttpRequestMainThread::GetResponseText(XMLHttpRequestStringSnapshot& aSnapsho mResponseBodyDecodedPos = mResponseBody.Length(); - if (mState == XMLHttpRequestBinding::DONE) { + if (mState == XMLHttpRequest_Binding::DONE) { // Free memory buffer which we no longer need mResponseBody.Truncate(); mResponseBodyDecodedPos = 0; @@ -624,15 +624,15 @@ XMLHttpRequestMainThread::SetResponseType(XMLHttpRequestResponseType aResponseTy { NOT_CALLABLE_IN_SYNC_SEND_RV - if (mState == XMLHttpRequestBinding::LOADING || - mState == XMLHttpRequestBinding::DONE) { + if (mState == XMLHttpRequest_Binding::LOADING || + mState == XMLHttpRequest_Binding::DONE) { aRv.Throw(NS_ERROR_DOM_INVALID_STATE_XHR_MUST_NOT_BE_LOADING_OR_DONE); return; } // sync request is not allowed setting responseType in window context if (HasOrHasHadOwner() && - mState != XMLHttpRequestBinding::UNSENT && mFlagSynchronous) { + mState != XMLHttpRequest_Binding::UNSENT && mFlagSynchronous) { LogMessage("ResponseTypeSyncXHRWarning", GetOwner()); aRv.Throw(NS_ERROR_DOM_INVALID_ACCESS_XHR_TIMEOUT_AND_RESPONSETYPE_UNSUPPORTED_FOR_SYNC); return; @@ -677,7 +677,7 @@ XMLHttpRequestMainThread::GetResponse(JSContext* aCx, case XMLHttpRequestResponseType::Moz_chunked_arraybuffer: { if (!(mResponseType == XMLHttpRequestResponseType::Arraybuffer && - mState == XMLHttpRequestBinding::DONE) && + mState == XMLHttpRequest_Binding::DONE) && !(mResponseType == XMLHttpRequestResponseType::Moz_chunked_arraybuffer && mInLoadProgressEvent)) { aResponse.setNull(); @@ -696,7 +696,7 @@ XMLHttpRequestMainThread::GetResponse(JSContext* aCx, } case XMLHttpRequestResponseType::Blob: { - if (mState != XMLHttpRequestBinding::DONE) { + if (mState != XMLHttpRequest_Binding::DONE) { aResponse.setNull(); return; } @@ -711,7 +711,7 @@ XMLHttpRequestMainThread::GetResponse(JSContext* aCx, } case XMLHttpRequestResponseType::Document: { - if (!mResponseXML || mState != XMLHttpRequestBinding::DONE) { + if (!mResponseXML || mState != XMLHttpRequest_Binding::DONE) { aResponse.setNull(); return; } @@ -721,7 +721,7 @@ XMLHttpRequestMainThread::GetResponse(JSContext* aCx, } case XMLHttpRequestResponseType::Json: { - if (mState != XMLHttpRequestBinding::DONE) { + if (mState != XMLHttpRequest_Binding::DONE) { aResponse.setNull(); return; } @@ -783,8 +783,8 @@ XMLHttpRequestMainThread::GetResponseURL(nsAString& aUrl) { aUrl.Truncate(); - if ((mState == XMLHttpRequestBinding::UNSENT || - mState == XMLHttpRequestBinding::OPENED) || !mChannel) { + if ((mState == XMLHttpRequest_Binding::UNSENT || + mState == XMLHttpRequest_Binding::OPENED) || !mChannel) { return; } @@ -815,8 +815,8 @@ XMLHttpRequestMainThread::GetStatus(ErrorResult& aRv) return 0; } - if (mState == XMLHttpRequestBinding::UNSENT || - mState == XMLHttpRequestBinding::OPENED) { + if (mState == XMLHttpRequest_Binding::UNSENT || + mState == XMLHttpRequest_Binding::OPENED) { return 0; } @@ -869,8 +869,8 @@ XMLHttpRequestMainThread::GetStatusText(nsACString& aStatusText, // value. This check is to prevent the status text for redirects from being // available before all the redirects have been followed and HTTP headers have // been received. - if (mState == XMLHttpRequestBinding::UNSENT || - mState == XMLHttpRequestBinding::OPENED) { + if (mState == XMLHttpRequest_Binding::UNSENT || + mState == XMLHttpRequest_Binding::OPENED) { return; } @@ -888,9 +888,9 @@ XMLHttpRequestMainThread::GetStatusText(nsACString& aStatusText, void XMLHttpRequestMainThread::TerminateOngoingFetch() { - if ((mState == XMLHttpRequestBinding::OPENED && mFlagSend) || - mState == XMLHttpRequestBinding::HEADERS_RECEIVED || - mState == XMLHttpRequestBinding::LOADING) { + if ((mState == XMLHttpRequest_Binding::OPENED && mFlagSend) || + mState == XMLHttpRequest_Binding::HEADERS_RECEIVED || + mState == XMLHttpRequest_Binding::LOADING) { CloseRequest(); } } @@ -921,10 +921,10 @@ XMLHttpRequestMainThread::CloseRequestWithError(const ProgressEventType aType) return; } - if (mState != XMLHttpRequestBinding::UNSENT && - !(mState == XMLHttpRequestBinding::OPENED && !mFlagSend) && - mState != XMLHttpRequestBinding::DONE) { - ChangeState(XMLHttpRequestBinding::DONE, true); + if (mState != XMLHttpRequest_Binding::UNSENT && + !(mState == XMLHttpRequest_Binding::OPENED && !mFlagSend) && + mState != XMLHttpRequest_Binding::DONE) { + ChangeState(XMLHttpRequest_Binding::DONE, true); if (!mFlagSyncLooping) { if (mUpload && !mUploadComplete) { @@ -939,7 +939,7 @@ XMLHttpRequestMainThread::CloseRequestWithError(const ProgressEventType aType) // if they load a new url will cause XMLHttpRequestMainThread::Open to clear // the abort state bit. If this occurs we're not uninitialized (bug 361773). if (mFlagAborted) { - ChangeState(XMLHttpRequestBinding::UNSENT, false); // IE seems to do it + ChangeState(XMLHttpRequest_Binding::UNSENT, false); // IE seems to do it } mFlagSyncLooping = false; @@ -951,7 +951,7 @@ XMLHttpRequestMainThread::RequestErrorSteps(const ProgressEventType aEventType, ErrorResult& aRv) { // Step 1 - mState = XMLHttpRequestBinding::DONE; + mState = XMLHttpRequest_Binding::DONE; StopProgressEventTimer(); @@ -1010,15 +1010,15 @@ XMLHttpRequestMainThread::AbortInternal(ErrorResult& aRv) TerminateOngoingFetch(); // Step 2 - if ((mState == XMLHttpRequestBinding::OPENED && mFlagSend) || - mState == XMLHttpRequestBinding::HEADERS_RECEIVED || - mState == XMLHttpRequestBinding::LOADING) { + if ((mState == XMLHttpRequest_Binding::OPENED && mFlagSend) || + mState == XMLHttpRequest_Binding::HEADERS_RECEIVED || + mState == XMLHttpRequest_Binding::LOADING) { RequestErrorSteps(ProgressEventType::abort, NS_OK, aRv); } // Step 3 - if (mState == XMLHttpRequestBinding::DONE) { - ChangeState(XMLHttpRequestBinding::UNSENT, false); // no ReadystateChange event + if (mState == XMLHttpRequest_Binding::DONE) { + ChangeState(XMLHttpRequest_Binding::UNSENT, false); // no ReadystateChange event } mFlagSyncLooping = false; @@ -1091,8 +1091,8 @@ XMLHttpRequestMainThread::GetAllResponseHeaders(nsACString& aResponseHeaders, // If the state is UNSENT or OPENED, // return the empty string and terminate these steps. - if (mState == XMLHttpRequestBinding::UNSENT || - mState == XMLHttpRequestBinding::OPENED) { + if (mState == XMLHttpRequest_Binding::UNSENT || + mState == XMLHttpRequest_Binding::OPENED) { return; } @@ -1153,8 +1153,8 @@ XMLHttpRequestMainThread::GetResponseHeader(const nsACString& header, if (!httpChannel) { // If the state is UNSENT or OPENED, // return null and terminate these steps. - if (mState == XMLHttpRequestBinding::UNSENT || - mState == XMLHttpRequestBinding::OPENED) { + if (mState == XMLHttpRequest_Binding::UNSENT || + mState == XMLHttpRequest_Binding::OPENED) { return; } @@ -1231,7 +1231,7 @@ XMLHttpRequestMainThread::GetLoadGroup() const nsresult XMLHttpRequestMainThread::FireReadystatechangeEvent() { - MOZ_ASSERT(mState != XMLHttpRequestBinding::UNSENT); + MOZ_ASSERT(mState != XMLHttpRequest_Binding::UNSENT); RefPtr event = NS_NewDOMEvent(this, nullptr, nullptr); event->InitEvent(kLiteralString_readystatechange, false, false); // We assume anyone who managed to call CreateReadystatechangeEvent is trusted @@ -1371,7 +1371,7 @@ bool XMLHttpRequestMainThread::InUploadPhase() const { // We're in the upload phase while our state is OPENED. - return mState == XMLHttpRequestBinding::OPENED; + return mState == XMLHttpRequest_Binding::OPENED; } // This case is hit when the async parameter is outright omitted, which @@ -1516,8 +1516,8 @@ XMLHttpRequestMainThread::Open(const nsACString& aMethod, CreateChannel(); // Step 12 - if (mState != XMLHttpRequestBinding::OPENED) { - mState = XMLHttpRequestBinding::OPENED; + if (mState != XMLHttpRequest_Binding::OPENED) { + mState = XMLHttpRequest_Binding::OPENED; FireReadystatechangeEvent(); } @@ -1527,7 +1527,7 @@ XMLHttpRequestMainThread::Open(const nsACString& aMethod, void XMLHttpRequestMainThread::SetOriginAttributes(const OriginAttributesDictionary& aAttrs) { - MOZ_ASSERT((mState == XMLHttpRequestBinding::OPENED) && !mFlagSend); + MOZ_ASSERT((mState == XMLHttpRequest_Binding::OPENED) && !mFlagSend); OriginAttributes attrs(aAttrs); @@ -1718,7 +1718,7 @@ NS_IMPL_ISUPPORTS0(FileCreationHandler) void XMLHttpRequestMainThread::LocalFileToBlobCompleted(Blob* aBlob) { - MOZ_ASSERT(mState != XMLHttpRequestBinding::DONE); + MOZ_ASSERT(mState != XMLHttpRequest_Binding::DONE); mResponseBlob = aBlob; mBlobStorage = nullptr; @@ -1739,7 +1739,7 @@ XMLHttpRequestMainThread::OnDataAvailable(nsIRequest *request, MOZ_ASSERT(mContext.get() == ctxt,"start context different from OnDataAvailable context"); mProgressSinceLastProgressEvent = true; - XMLHttpRequestBinding::ClearCachedResponseTextValue(this); + XMLHttpRequest_Binding::ClearCachedResponseTextValue(this); nsresult rv; @@ -1761,7 +1761,7 @@ XMLHttpRequestMainThread::OnDataAvailable(nsIRequest *request, inStr->ReadSegments(DummyStreamReaderFunc, nullptr, count, &totalRead); NS_ENSURE_SUCCESS(rv, rv); - ChangeState(XMLHttpRequestBinding::LOADING); + ChangeState(XMLHttpRequest_Binding::LOADING); // Cancel() must be called with an error. We use // NS_ERROR_FILE_ALREADY_EXISTS to know that we've aborted the operation @@ -1776,8 +1776,8 @@ XMLHttpRequestMainThread::OnDataAvailable(nsIRequest *request, NS_ENSURE_SUCCESS(rv, rv); // Fire the first progress event/loading state change - if (mState == XMLHttpRequestBinding::HEADERS_RECEIVED) { - ChangeState(XMLHttpRequestBinding::LOADING); + if (mState == XMLHttpRequest_Binding::HEADERS_RECEIVED) { + ChangeState(XMLHttpRequest_Binding::LOADING); if (!mFlagSynchronous) { DispatchProgressEvent(this, ProgressEventType::progress, mLoadTransferred, mLoadTotal); @@ -1809,7 +1809,7 @@ XMLHttpRequestMainThread::OnStartRequest(nsIRequest *request, nsISupports *ctxt) } // Don't do anything if we have been aborted - if (mState == XMLHttpRequestBinding::UNSENT) { + if (mState == XMLHttpRequest_Binding::UNSENT) { return NS_OK; } @@ -1855,7 +1855,7 @@ XMLHttpRequestMainThread::OnStartRequest(nsIRequest *request, nsISupports *ctxt) mContext = ctxt; mFlagParseBody = true; - ChangeState(XMLHttpRequestBinding::HEADERS_RECEIVED); + ChangeState(XMLHttpRequest_Binding::HEADERS_RECEIVED); ResetResponse(); @@ -2083,7 +2083,7 @@ XMLHttpRequestMainThread::OnStopRequest(nsIRequest *request, nsISupports *ctxt, // make sure to notify the listener if we were aborted // XXX in fact, why don't we do the cleanup below in this case?? // UNSENT is for abort calls. See OnStartRequest above. - if (mState == XMLHttpRequestBinding::UNSENT || mFlagTimedOut) { + if (mState == XMLHttpRequest_Binding::UNSENT || mFlagTimedOut) { if (mXMLParserStreamListener) (void) mXMLParserStreamListener->OnStopRequest(request, ctxt, status); return NS_OK; @@ -2192,8 +2192,8 @@ XMLHttpRequestMainThread::OnStopRequest(nsIRequest *request, nsISupports *ctxt, // If we're uninitialized at this point, we encountered an error // earlier and listeners have already been notified. Also we do // not want to do this if we already completed. - if (mState == XMLHttpRequestBinding::UNSENT || - mState == XMLHttpRequestBinding::DONE) { + if (mState == XMLHttpRequest_Binding::UNSENT || + mState == XMLHttpRequest_Binding::DONE) { return NS_OK; } @@ -2279,7 +2279,7 @@ XMLHttpRequestMainThread::ChangeStateToDone() } // Per spec, fire readystatechange=4/done before final error events. - ChangeState(XMLHttpRequestBinding::DONE, true); + ChangeState(XMLHttpRequest_Binding::DONE, true); // Per spec, if we failed in the upload phase, fire a final error // and loadend events for the upload after readystatechange=4/done. @@ -2642,7 +2642,7 @@ XMLHttpRequestMainThread::InitiateFetch(already_AddRefed aUpload // Per spec, we throw on sync errors, but not async. if (mFlagSynchronous) { - mState = XMLHttpRequestBinding::DONE; + mState = XMLHttpRequest_Binding::DONE; return NS_ERROR_DOM_NETWORK_ERR; } } @@ -2729,7 +2729,7 @@ XMLHttpRequestMainThread::MaybeSilentSendFailure(nsresult aRv) { // Per spec, silently fail on async request failures; throw for sync. if (mFlagSynchronous) { - mState = XMLHttpRequestBinding::DONE; + mState = XMLHttpRequest_Binding::DONE; return NS_ERROR_DOM_NETWORK_ERR; } @@ -2752,7 +2752,7 @@ XMLHttpRequestMainThread::SendInternal(const BodyExtractorBase* aBody) NS_ENSURE_TRUE(mPrincipal, NS_ERROR_NOT_INITIALIZED); // Step 1 - if (mState != XMLHttpRequestBinding::OPENED) { + if (mState != XMLHttpRequest_Binding::OPENED) { return NS_ERROR_DOM_INVALID_STATE_XHR_MUST_BE_OPENED; } @@ -2971,7 +2971,7 @@ XMLHttpRequestMainThread::SetRequestHeader(const nsACString& aName, NOT_CALLABLE_IN_SYNC_SEND_RV // Step 1 - if (mState != XMLHttpRequestBinding::OPENED) { + if (mState != XMLHttpRequest_Binding::OPENED) { aRv.Throw(NS_ERROR_DOM_INVALID_STATE_XHR_MUST_BE_OPENED); return; } @@ -3022,7 +3022,7 @@ XMLHttpRequestMainThread::SetTimeout(uint32_t aTimeout, ErrorResult& aRv) NOT_CALLABLE_IN_SYNC_SEND_RV if (mFlagSynchronous && - mState != XMLHttpRequestBinding::UNSENT && HasOrHasHadOwner()) { + mState != XMLHttpRequest_Binding::UNSENT && HasOrHasHadOwner()) { /* Timeout is not supported for synchronous requests with an owning window, per XHR2 spec. */ LogMessage("TimeoutSyncXHRWarning", GetOwner()); @@ -3063,7 +3063,7 @@ XMLHttpRequestMainThread::StartTimeoutTimer() { MOZ_ASSERT(mRequestSentTime, "StartTimeoutTimer mustn't be called before the request was sent!"); - if (mState == XMLHttpRequestBinding::DONE) { + if (mState == XMLHttpRequest_Binding::DONE) { // do nothing! return; } @@ -3101,8 +3101,8 @@ XMLHttpRequestMainThread::OverrideMimeType(const nsAString& aMimeType, { NOT_CALLABLE_IN_SYNC_SEND_RV - if (mState == XMLHttpRequestBinding::LOADING || - mState == XMLHttpRequestBinding::DONE) { + if (mState == XMLHttpRequest_Binding::LOADING || + mState == XMLHttpRequest_Binding::DONE) { ResetResponse(); aRv.Throw(NS_ERROR_DOM_INVALID_STATE_XHR_MUST_NOT_BE_LOADING_OR_DONE); return; @@ -3124,7 +3124,7 @@ XMLHttpRequestMainThread::SetMozBackgroundRequest(bool aMozBackgroundRequest) return NS_ERROR_DOM_SECURITY_ERR; } - if (mState != XMLHttpRequestBinding::UNSENT) { + if (mState != XMLHttpRequest_Binding::UNSENT) { // Can't change this while we're in the middle of something. return NS_ERROR_DOM_INVALID_STATE_XHR_MUST_NOT_BE_SENDING; } @@ -3157,8 +3157,8 @@ XMLHttpRequestMainThread::SetWithCredentials(bool aWithCredentials, ErrorResult& // ReadyState() here, because it can't differentiate between "opened" and // "sent", so we use mState directly. - if ((mState != XMLHttpRequestBinding::UNSENT && - mState != XMLHttpRequestBinding::OPENED) || + if ((mState != XMLHttpRequest_Binding::UNSENT && + mState != XMLHttpRequest_Binding::OPENED) || mFlagSend || mIsAnon) { aRv.Throw(NS_ERROR_DOM_INVALID_STATE_XHR_MUST_NOT_BE_SENDING); return; @@ -3173,15 +3173,15 @@ XMLHttpRequestMainThread::ChangeState(uint16_t aState, bool aBroadcast) mState = aState; nsresult rv = NS_OK; - if (aState != XMLHttpRequestBinding::HEADERS_RECEIVED && - aState != XMLHttpRequestBinding::LOADING) { + if (aState != XMLHttpRequest_Binding::HEADERS_RECEIVED && + aState != XMLHttpRequest_Binding::LOADING) { StopProgressEventTimer(); } if (aBroadcast && (!mFlagSynchronous || - aState == XMLHttpRequestBinding::OPENED || - aState == XMLHttpRequestBinding::DONE)) { + aState == XMLHttpRequest_Binding::OPENED || + aState == XMLHttpRequest_Binding::DONE)) { rv = FireReadystatechangeEvent(); } @@ -3414,7 +3414,7 @@ XMLHttpRequestMainThread::MozSystem() const void XMLHttpRequestMainThread::HandleTimeoutCallback() { - if (mState == XMLHttpRequestBinding::DONE) { + if (mState == XMLHttpRequest_Binding::DONE) { MOZ_ASSERT_UNREACHABLE("XMLHttpRequestMainThread::HandleTimeoutCallback " "with completed request"); // do nothing! @@ -3599,7 +3599,7 @@ void XMLHttpRequestMainThread::TruncateResponseText() { mResponseText.Truncate(); - XMLHttpRequestBinding::ClearCachedResponseTextValue(this); + XMLHttpRequest_Binding::ClearCachedResponseTextValue(this); } NS_IMPL_ISUPPORTS(XMLHttpRequestMainThread::nsHeaderVisitor, nsIHttpHeaderVisitor) @@ -3657,7 +3657,7 @@ XMLHttpRequestMainThread::BlobStoreCompleted(MutableBlobStorage* aBlobStorage, return; } - MOZ_ASSERT(mState != XMLHttpRequestBinding::DONE); + MOZ_ASSERT(mState != XMLHttpRequest_Binding::DONE); mResponseBlob = aBlob; mBlobStorage = nullptr; diff --git a/dom/xhr/XMLHttpRequestUpload.cpp b/dom/xhr/XMLHttpRequestUpload.cpp index 07cd20bc0719..7ae6040089ce 100644 --- a/dom/xhr/XMLHttpRequestUpload.cpp +++ b/dom/xhr/XMLHttpRequestUpload.cpp @@ -19,7 +19,7 @@ NS_IMPL_RELEASE_INHERITED(XMLHttpRequestUpload, XMLHttpRequestEventTarget) /* virtual */ JSObject* XMLHttpRequestUpload::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return XMLHttpRequestUploadBinding::Wrap(aCx, this, aGivenProto); + return XMLHttpRequestUpload_Binding::Wrap(aCx, this, aGivenProto); } } // dom namespace diff --git a/dom/xhr/XMLHttpRequestWorker.cpp b/dom/xhr/XMLHttpRequestWorker.cpp index d3e6face2190..cf1df442685b 100644 --- a/dom/xhr/XMLHttpRequestWorker.cpp +++ b/dom/xhr/XMLHttpRequestWorker.cpp @@ -2167,10 +2167,10 @@ XMLHttpRequestWorker::Abort(ErrorResult& aRv) // Set our status to 0 and statusText to "" if we // will be aborting an ongoing fetch, so the upcoming // abort events we dispatch have the correct info. - if ((mStateData.mReadyState == XMLHttpRequestBinding::OPENED && mStateData.mFlagSend) || - mStateData.mReadyState == XMLHttpRequestBinding::HEADERS_RECEIVED || - mStateData.mReadyState == XMLHttpRequestBinding::LOADING || - mStateData.mReadyState == XMLHttpRequestBinding::DONE) { + if ((mStateData.mReadyState == XMLHttpRequest_Binding::OPENED && mStateData.mFlagSend) || + mStateData.mReadyState == XMLHttpRequest_Binding::HEADERS_RECEIVED || + mStateData.mReadyState == XMLHttpRequest_Binding::LOADING || + mStateData.mReadyState == XMLHttpRequest_Binding::DONE) { mStateData.mStatus = 0; mStateData.mStatusText.Truncate(); } @@ -2377,7 +2377,7 @@ XMLHttpRequestWorker::UpdateState(const StateData& aStateData, mStateData = aStateData; } - XMLHttpRequestBinding::ClearCachedResponseTextValue(this); + XMLHttpRequest_Binding::ClearCachedResponseTextValue(this); } } // dom namespace diff --git a/dom/xml/CDATASection.cpp b/dom/xml/CDATASection.cpp index c9a88dfb3037..f9d0182e7ed2 100644 --- a/dom/xml/CDATASection.cpp +++ b/dom/xml/CDATASection.cpp @@ -18,7 +18,7 @@ CDATASection::~CDATASection() JSObject* CDATASection::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return CDATASectionBinding::Wrap(aCx, this, aGivenProto); + return CDATASection_Binding::Wrap(aCx, this, aGivenProto); } bool diff --git a/dom/xml/ProcessingInstruction.cpp b/dom/xml/ProcessingInstruction.cpp index 929ea476f51a..33ef5de65607 100644 --- a/dom/xml/ProcessingInstruction.cpp +++ b/dom/xml/ProcessingInstruction.cpp @@ -69,7 +69,7 @@ NS_IMPL_ISUPPORTS_INHERITED0(ProcessingInstruction, CharacterData) JSObject* ProcessingInstruction::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return ProcessingInstructionBinding::Wrap(aCx, this, aGivenProto); + return ProcessingInstruction_Binding::Wrap(aCx, this, aGivenProto); } bool diff --git a/dom/xml/XMLDocument.cpp b/dom/xml/XMLDocument.cpp index 927ed9bfbd85..76b3355214ea 100644 --- a/dom/xml/XMLDocument.cpp +++ b/dom/xml/XMLDocument.cpp @@ -629,10 +629,10 @@ JSObject* XMLDocument::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { if (mIsPlainDocument) { - return DocumentBinding::Wrap(aCx, this, aGivenProto); + return Document_Binding::Wrap(aCx, this, aGivenProto); } - return XMLDocumentBinding::Wrap(aCx, this, aGivenProto); + return XMLDocument_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/xml/nsXMLElement.cpp b/dom/xml/nsXMLElement.cpp index 8fe908cee69c..43d9864ff6d1 100644 --- a/dom/xml/nsXMLElement.cpp +++ b/dom/xml/nsXMLElement.cpp @@ -24,7 +24,7 @@ NS_NewXMLElement(Element** aInstancePtrResult, JSObject* nsXMLElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return ElementBinding::Wrap(aCx, this, aGivenProto); + return Element_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/xslt/xpath/XPathEvaluator.cpp b/dom/xslt/xpath/XPathEvaluator.cpp index 00c6d2223829..d7bc3b517d76 100644 --- a/dom/xslt/xpath/XPathEvaluator.cpp +++ b/dom/xslt/xpath/XPathEvaluator.cpp @@ -124,7 +124,7 @@ XPathEvaluator::WrapObject(JSContext* aCx, JS::Handle aGivenProto, JS::MutableHandle aReflector) { - return dom::XPathEvaluatorBinding::Wrap(aCx, this, aGivenProto, aReflector); + return dom::XPathEvaluator_Binding::Wrap(aCx, this, aGivenProto, aReflector); } /* static */ XPathEvaluator* diff --git a/dom/xslt/xpath/XPathExpression.cpp b/dom/xslt/xpath/XPathExpression.cpp index d07060067ba4..aca2ea7e1753 100644 --- a/dom/xslt/xpath/XPathExpression.cpp +++ b/dom/xslt/xpath/XPathExpression.cpp @@ -98,7 +98,7 @@ XPathExpression::EvaluateWithContext(nsINode& aContextNode, return nullptr; } - if (aType > XPathResultBinding::FIRST_ORDERED_NODE_TYPE) { + if (aType > XPathResult_Binding::FIRST_ORDERED_NODE_TYPE) { aRv.Throw(NS_ERROR_DOM_NOT_SUPPORTED_ERR); return nullptr; } diff --git a/dom/xslt/xpath/XPathExpression.h b/dom/xslt/xpath/XPathExpression.h index bfe478bdb431..f5955c025ef0 100644 --- a/dom/xslt/xpath/XPathExpression.h +++ b/dom/xslt/xpath/XPathExpression.h @@ -35,7 +35,7 @@ public: bool WrapObject(JSContext* aCx, JS::Handle aGivenProto, JS::MutableHandle aReflector) { - return XPathExpressionBinding::Wrap(aCx, this, aGivenProto, aReflector); + return XPathExpression_Binding::Wrap(aCx, this, aGivenProto, aReflector); } already_AddRefed diff --git a/dom/xslt/xpath/XPathResult.cpp b/dom/xslt/xpath/XPathResult.cpp index 75ba9a418207..12c6917e097e 100644 --- a/dom/xslt/xpath/XPathResult.cpp +++ b/dom/xslt/xpath/XPathResult.cpp @@ -78,7 +78,7 @@ NS_INTERFACE_MAP_END JSObject* XPathResult::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return XPathResultBinding::Wrap(aCx, this, aGivenProto); + return XPathResult_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/dom/xslt/xslt/txMozillaXSLTProcessor.cpp b/dom/xslt/xslt/txMozillaXSLTProcessor.cpp index f586a6fc108d..60ec13068bf8 100644 --- a/dom/xslt/xslt/txMozillaXSLTProcessor.cpp +++ b/dom/xslt/xslt/txMozillaXSLTProcessor.cpp @@ -1246,7 +1246,7 @@ txMozillaXSLTProcessor::ContentRemoved(nsIContent* aChild, /* virtual */ JSObject* txMozillaXSLTProcessor::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return XSLTProcessorBinding::Wrap(aCx, this, aGivenProto); + return XSLTProcessor_Binding::Wrap(aCx, this, aGivenProto); } DocGroup* diff --git a/dom/xslt/xslt/txMozillaXSLTProcessor.h b/dom/xslt/xslt/txMozillaXSLTProcessor.h index 671809ea9996..9a7f0243757d 100644 --- a/dom/xslt/xslt/txMozillaXSLTProcessor.h +++ b/dom/xslt/xslt/txMozillaXSLTProcessor.h @@ -131,7 +131,7 @@ public: bool IsLoadDisabled() { - return (mFlags & mozilla::dom::XSLTProcessorBinding::DISABLE_ALL_LOADS) != 0; + return (mFlags & mozilla::dom::XSLTProcessor_Binding::DISABLE_ALL_LOADS) != 0; } static nsresult Startup(); diff --git a/dom/xul/XULDocument.cpp b/dom/xul/XULDocument.cpp index 786852d8ff7b..8b55540bdd98 100644 --- a/dom/xul/XULDocument.cpp +++ b/dom/xul/XULDocument.cpp @@ -4086,7 +4086,7 @@ XULDocument::ThreadSafeGetDocumentLWTheme() const JSObject* XULDocument::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return XULDocumentBinding::Wrap(aCx, this, aGivenProto); + return XULDocument_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/dom/xul/XULPopupElement.cpp b/dom/xul/XULPopupElement.cpp index 6e47305b0e7a..4f153296a42c 100644 --- a/dom/xul/XULPopupElement.cpp +++ b/dom/xul/XULPopupElement.cpp @@ -31,7 +31,7 @@ NS_NewXULPopupElement(already_AddRefed&& aNodeInfo) JSObject* XULPopupElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return XULPopupElementBinding::Wrap(aCx, this, aGivenProto); + return XULPopupElement_Binding::Wrap(aCx, this, aGivenProto); } nsIFrame* diff --git a/dom/xul/nsXULElement.cpp b/dom/xul/nsXULElement.cpp index 400f058b9494..3392d30c244d 100644 --- a/dom/xul/nsXULElement.cpp +++ b/dom/xul/nsXULElement.cpp @@ -630,7 +630,7 @@ nsXULElement::PerformAccesskey(bool aKeyCausesActivation, } if (aKeyCausesActivation && !content->IsAnyOfXULElements(nsGkAtoms::textbox, nsGkAtoms::menulist)) { - elm->ClickWithInputSource(MouseEventBinding::MOZ_SOURCE_KEYBOARD, aIsTrustedEvent); + elm->ClickWithInputSource(MouseEvent_Binding::MOZ_SOURCE_KEYBOARD, aIsTrustedEvent); } } else { return content->PerformAccesskey(aKeyCausesActivation, aIsTrustedEvent); @@ -1216,7 +1216,7 @@ nsXULElement::DispatchXULCommand(const EventChainVisitor& aVisitor, // sourceEvent will be the original command event that we're // handling. RefPtr event = aVisitor.mDOMEvent; - uint16_t inputSource = MouseEventBinding::MOZ_SOURCE_UNKNOWN; + uint16_t inputSource = MouseEvent_Binding::MOZ_SOURCE_UNKNOWN; while (event) { NS_ENSURE_STATE(event->GetOriginalTarget() != commandElt); RefPtr commandEvent = event->AsXULCommandEvent(); @@ -1305,8 +1305,8 @@ nsXULElement::GetAttributeChangeHint(const nsAtom* aAttribute, nsChangeHint retval(nsChangeHint(0)); if (aAttribute == nsGkAtoms::value && - (aModType == MutationEventBinding::REMOVAL || - aModType == MutationEventBinding::ADDITION)) { + (aModType == MutationEvent_Binding::REMOVAL || + aModType == MutationEvent_Binding::ADDITION)) { if (IsAnyOfXULElements(nsGkAtoms::label, nsGkAtoms::description)) // Label and description dynamically morph between a normal // block and a cropping single-line XUL text frame. If the @@ -1505,7 +1505,7 @@ nsXULElement::GetParentTree(nsIDOMXULMultiSelectControlElement** aTreeElement) void nsXULElement::Click(CallerType aCallerType) { - ClickWithInputSource(MouseEventBinding::MOZ_SOURCE_UNKNOWN, + ClickWithInputSource(MouseEvent_Binding::MOZ_SOURCE_UNKNOWN, aCallerType == CallerType::System); } @@ -1874,7 +1874,7 @@ nsXULElement::IsEventAttributeNameInternal(nsAtom *aName) JSObject* nsXULElement::WrapNode(JSContext *aCx, JS::Handle aGivenProto) { - return dom::XULElementBinding::Wrap(aCx, this, aGivenProto); + return dom::XULElement_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_CYCLE_COLLECTION_CLASS(nsXULPrototypeNode) diff --git a/dom/xul/nsXULPopupListener.cpp b/dom/xul/nsXULPopupListener.cpp index 72fc8448b401..a71df6771838 100644 --- a/dom/xul/nsXULPopupListener.cpp +++ b/dom/xul/nsXULPopupListener.cpp @@ -168,7 +168,7 @@ nsXULPopupListener::HandleEvent(Event* aEvent) if (mIsContext) { #ifndef NS_CONTEXT_MENU_IS_MOUSEUP uint16_t inputSource = mouseEvent->MozInputSource(); - bool isTouch = inputSource == MouseEventBinding::MOZ_SOURCE_TOUCH; + bool isTouch = inputSource == MouseEvent_Binding::MOZ_SOURCE_TOUCH; // If the context menu launches on mousedown, // we have to fire focus on the content we clicked on FireFocusOnTargetContent(targetContent, isTouch); diff --git a/editor/libeditor/HTMLEditRules.cpp b/editor/libeditor/HTMLEditRules.cpp index 5996d92397f5..b7b2ec617014 100644 --- a/editor/libeditor/HTMLEditRules.cpp +++ b/editor/libeditor/HTMLEditRules.cpp @@ -10325,7 +10325,7 @@ HTMLEditRules::UpdateDocChangeRange(nsRange* aRange) // compare starts of ranges ErrorResult error; int16_t result = - mDocChangeRange->CompareBoundaryPoints(RangeBinding::START_TO_START, + mDocChangeRange->CompareBoundaryPoints(Range_Binding::START_TO_START, *aRange, error); if (error.ErrorCodeIs(NS_ERROR_NOT_INITIALIZED)) { // This will happen is mDocChangeRange is non-null, but the range is @@ -10349,7 +10349,7 @@ HTMLEditRules::UpdateDocChangeRange(nsRange* aRange) // compare ends of ranges result = - mDocChangeRange->CompareBoundaryPoints(RangeBinding::END_TO_END, + mDocChangeRange->CompareBoundaryPoints(Range_Binding::END_TO_END, *aRange, error); if (NS_WARN_IF(error.Failed())) { return error.StealNSResult(); diff --git a/editor/libeditor/SelectionState.cpp b/editor/libeditor/SelectionState.cpp index 0e631556b1eb..9a8b8d0e19b1 100644 --- a/editor/libeditor/SelectionState.cpp +++ b/editor/libeditor/SelectionState.cpp @@ -126,12 +126,12 @@ SelectionState::IsEqual(SelectionState* aSelState) IgnoredErrorResult rv; int16_t compResult = - myRange->CompareBoundaryPoints(RangeBinding::START_TO_START, *itsRange, rv); + myRange->CompareBoundaryPoints(Range_Binding::START_TO_START, *itsRange, rv); if (rv.Failed() || compResult) { return false; } compResult = - myRange->CompareBoundaryPoints(RangeBinding::END_TO_END, *itsRange, rv); + myRange->CompareBoundaryPoints(Range_Binding::END_TO_END, *itsRange, rv); if (rv.Failed() || compResult) { return false; } diff --git a/editor/libeditor/TextEditRules.cpp b/editor/libeditor/TextEditRules.cpp index e30a15983076..6d102fc4df19 100644 --- a/editor/libeditor/TextEditRules.cpp +++ b/editor/libeditor/TextEditRules.cpp @@ -574,7 +574,7 @@ TextEditRules::GetTextNodeAroundSelectionStartContainer() // It's too expensive if this is called from a hot path. nsCOMPtr node = selectionStartPoint.GetContainer(); RefPtr iter = - new NodeIterator(node, NodeFilterBinding::SHOW_TEXT, nullptr); + new NodeIterator(node, NodeFilter_Binding::SHOW_TEXT, nullptr); while (!EditorBase::IsTextNode(node)) { node = iter->NextNode(IgnoreErrors()); if (!node) { diff --git a/extensions/spellcheck/src/mozInlineSpellChecker.cpp b/extensions/spellcheck/src/mozInlineSpellChecker.cpp index 6aaf65909e78..c3147b0f222e 100644 --- a/extensions/spellcheck/src/mozInlineSpellChecker.cpp +++ b/extensions/spellcheck/src/mozInlineSpellChecker.cpp @@ -1866,18 +1866,18 @@ mozInlineSpellChecker::OnKeyPress(Event* aKeyEvent) // we only care about navigation keys that moved selection switch (keyCode) { - case KeyboardEventBinding::DOM_VK_RIGHT: - case KeyboardEventBinding::DOM_VK_LEFT: + case KeyboardEvent_Binding::DOM_VK_RIGHT: + case KeyboardEvent_Binding::DOM_VK_LEFT: HandleNavigationEvent(false, - keyCode == KeyboardEventBinding::DOM_VK_RIGHT ? + keyCode == KeyboardEvent_Binding::DOM_VK_RIGHT ? 1 : -1); break; - case KeyboardEventBinding::DOM_VK_UP: - case KeyboardEventBinding::DOM_VK_DOWN: - case KeyboardEventBinding::DOM_VK_HOME: - case KeyboardEventBinding::DOM_VK_END: - case KeyboardEventBinding::DOM_VK_PAGE_UP: - case KeyboardEventBinding::DOM_VK_PAGE_DOWN: + case KeyboardEvent_Binding::DOM_VK_UP: + case KeyboardEvent_Binding::DOM_VK_DOWN: + case KeyboardEvent_Binding::DOM_VK_HOME: + case KeyboardEvent_Binding::DOM_VK_END: + case KeyboardEvent_Binding::DOM_VK_PAGE_UP: + case KeyboardEvent_Binding::DOM_VK_PAGE_DOWN: HandleNavigationEvent(true /* force a spelling correction */); break; } diff --git a/gfx/layers/apz/src/APZCTreeManager.cpp b/gfx/layers/apz/src/APZCTreeManager.cpp index 752fcaea3f2b..3af6204e248d 100644 --- a/gfx/layers/apz/src/APZCTreeManager.cpp +++ b/gfx/layers/apz/src/APZCTreeManager.cpp @@ -1746,7 +1746,7 @@ APZCTreeManager::ProcessTouchInputForScrollbarDrag(MultiTouchInput& aTouchInput, // reuse code in InputQueue and APZC for handling scrollbar mouse-drags. MouseInput mouseInput{MultiTouchTypeToMouseType(aTouchInput.mType), MouseInput::LEFT_BUTTON, - dom::MouseEventBinding::MOZ_SOURCE_TOUCH, + dom::MouseEvent_Binding::MOZ_SOURCE_TOUCH, WidgetMouseEvent::eLeftButtonFlag, aTouchInput.mTouches[0].mScreenPoint, aTouchInput.mTime, diff --git a/gfx/layers/apz/src/APZInputBridge.cpp b/gfx/layers/apz/src/APZInputBridge.cpp index 5ed2c471a176..1086ab794ba0 100644 --- a/gfx/layers/apz/src/APZInputBridge.cpp +++ b/gfx/layers/apz/src/APZInputBridge.cpp @@ -33,9 +33,9 @@ WillHandleMouseEvent(const WidgetMouseEventBase& aEvent) /* static */ Maybe APZInputBridge::ActionForWheelEvent(WidgetWheelEvent* aEvent) { - if (!(aEvent->mDeltaMode == dom::WheelEventBinding::DOM_DELTA_LINE || - aEvent->mDeltaMode == dom::WheelEventBinding::DOM_DELTA_PIXEL || - aEvent->mDeltaMode == dom::WheelEventBinding::DOM_DELTA_PAGE)) { + if (!(aEvent->mDeltaMode == dom::WheelEvent_Binding::DOM_DELTA_LINE || + aEvent->mDeltaMode == dom::WheelEvent_Binding::DOM_DELTA_PIXEL || + aEvent->mDeltaMode == dom::WheelEvent_Binding::DOM_DELTA_PAGE)) { return Nothing(); } return EventStateManager::APZWheelActionFor(aEvent); @@ -111,9 +111,9 @@ APZInputBridge::ReceiveInputEvent( ScrollWheelInput::ScrollMode scrollMode = ScrollWheelInput::SCROLLMODE_INSTANT; if (gfxPrefs::SmoothScrollEnabled() && - ((wheelEvent.mDeltaMode == dom::WheelEventBinding::DOM_DELTA_LINE && + ((wheelEvent.mDeltaMode == dom::WheelEvent_Binding::DOM_DELTA_LINE && gfxPrefs::WheelSmoothScrollEnabled()) || - (wheelEvent.mDeltaMode == dom::WheelEventBinding::DOM_DELTA_PAGE && + (wheelEvent.mDeltaMode == dom::WheelEvent_Binding::DOM_DELTA_PAGE && gfxPrefs::PageSmoothScrollEnabled()))) { scrollMode = ScrollWheelInput::SCROLLMODE_SMOOTH; diff --git a/gfx/layers/apz/util/APZCCallbackHelper.cpp b/gfx/layers/apz/util/APZCCallbackHelper.cpp index c01e121f36ce..cf30ef04f15a 100644 --- a/gfx/layers/apz/util/APZCCallbackHelper.cpp +++ b/gfx/layers/apz/util/APZCCallbackHelper.cpp @@ -518,7 +518,7 @@ APZCCallbackHelper::DispatchSynthesizedMouseEvent(EventMessage aMsg, event.mRefPoint = LayoutDeviceIntPoint::Truncate(aRefPoint.x, aRefPoint.y); event.mTime = aTime; event.button = WidgetMouseEvent::eLeftButton; - event.inputSource = dom::MouseEventBinding::MOZ_SOURCE_TOUCH; + event.inputSource = dom::MouseEvent_Binding::MOZ_SOURCE_TOUCH; if (aMsg == eMouseLongTap) { event.mFlags.mOnlyChromeDispatch = true; } diff --git a/gfx/layers/apz/util/APZEventState.cpp b/gfx/layers/apz/util/APZEventState.cpp index b9ed305d1e61..547b53f431bc 100644 --- a/gfx/layers/apz/util/APZEventState.cpp +++ b/gfx/layers/apz/util/APZEventState.cpp @@ -241,7 +241,7 @@ APZEventState::FireContextmenuEvents(const nsCOMPtr& aPresShell, bool eventHandled = APZCCallbackHelper::DispatchMouseEvent(aPresShell, NS_LITERAL_STRING("contextmenu"), aPoint, 2, 1, WidgetModifiersToDOMModifiers(aModifiers), true, - dom::MouseEventBinding::MOZ_SOURCE_TOUCH, + dom::MouseEvent_Binding::MOZ_SOURCE_TOUCH, 0 /* Use the default value here. */); APZES_LOG("Contextmenu event handled: %d\n", eventHandled); diff --git a/gfx/layers/apz/util/CheckerboardReportService.cpp b/gfx/layers/apz/util/CheckerboardReportService.cpp index 8931b58a3797..08e5779a75a5 100644 --- a/gfx/layers/apz/util/CheckerboardReportService.cpp +++ b/gfx/layers/apz/util/CheckerboardReportService.cpp @@ -180,7 +180,7 @@ CheckerboardReportService::CheckerboardReportService(nsISupports* aParent) JSObject* CheckerboardReportService::WrapObject(JSContext* aCtx, JS::Handle aGivenProto) { - return CheckerboardReportServiceBinding::Wrap(aCtx, this, aGivenProto); + return CheckerboardReportService_Binding::Wrap(aCtx, this, aGivenProto); } nsISupports* diff --git a/image/VectorImage.cpp b/image/VectorImage.cpp index 2cf9509fb905..ea65c6f79779 100644 --- a/image/VectorImage.cpp +++ b/image/VectorImage.cpp @@ -44,7 +44,7 @@ namespace mozilla { using namespace dom; -using namespace dom::SVGPreserveAspectRatioBinding; +using namespace dom::SVGPreserveAspectRatio_Binding; using namespace gfx; using namespace layers; diff --git a/js/xpconnect/loader/ChromeScriptLoader.cpp b/js/xpconnect/loader/ChromeScriptLoader.cpp index 315b45211b7a..6fa5cbdde586 100644 --- a/js/xpconnect/loader/ChromeScriptLoader.cpp +++ b/js/xpconnect/loader/ChromeScriptLoader.cpp @@ -338,7 +338,7 @@ PrecompiledScript::HasReturnValue() JSObject* PrecompiledScript::WrapObject(JSContext* aCx, HandleObject aGivenProto) { - return PrecompiledScriptBinding::Wrap(aCx, this, aGivenProto); + return PrecompiledScript_Binding::Wrap(aCx, this, aGivenProto); } bool diff --git a/js/xpconnect/src/Sandbox.cpp b/js/xpconnect/src/Sandbox.cpp index 623dcff59c84..348eab6093e2 100644 --- a/js/xpconnect/src/Sandbox.cpp +++ b/js/xpconnect/src/Sandbox.cpp @@ -333,9 +333,9 @@ SandboxCreateFetch(JSContext* cx, HandleObject obj) MOZ_ASSERT(JS_IsGlobalObject(obj)); return JS_DefineFunction(cx, obj, "fetch", SandboxFetchPromise, 2, 0) && - dom::RequestBinding::GetConstructorObject(cx) && - dom::ResponseBinding::GetConstructorObject(cx) && - dom::HeadersBinding::GetConstructorObject(cx); + dom::Request_Binding::GetConstructorObject(cx) && + dom::Response_Binding::GetConstructorObject(cx) && + dom::Headers_Binding::GetConstructorObject(cx); } static bool @@ -932,82 +932,82 @@ xpc::GlobalProperties::Define(JSContext* cx, JS::HandleObject obj) // to be requested either in |Cu.importGlobalProperties| or // |wantGlobalProperties| of a sandbox. if (Blob && - !dom::BlobBinding::GetConstructorObject(cx)) + !dom::Blob_Binding::GetConstructorObject(cx)) return false; - if (ChromeUtils && !dom::ChromeUtilsBinding::GetConstructorObject(cx)) + if (ChromeUtils && !dom::ChromeUtils_Binding::GetConstructorObject(cx)) return false; - if (CSS && !dom::CSSBinding::GetConstructorObject(cx)) + if (CSS && !dom::CSS_Binding::GetConstructorObject(cx)) return false; - if (CSSRule && !dom::CSSRuleBinding::GetConstructorObject(cx)) + if (CSSRule && !dom::CSSRule_Binding::GetConstructorObject(cx)) return false; if (Directory && - !dom::DirectoryBinding::GetConstructorObject(cx)) + !dom::Directory_Binding::GetConstructorObject(cx)) return false; if (DOMParser && - !dom::DOMParserBinding::GetConstructorObject(cx)) + !dom::DOMParser_Binding::GetConstructorObject(cx)) return false; if (Element && - !dom::ElementBinding::GetConstructorObject(cx)) + !dom::Element_Binding::GetConstructorObject(cx)) return false; if (Event && - !dom::EventBinding::GetConstructorObject(cx)) + !dom::Event_Binding::GetConstructorObject(cx)) return false; if (File && - !dom::FileBinding::GetConstructorObject(cx)) + !dom::File_Binding::GetConstructorObject(cx)) return false; - if (FileReader && !dom::FileReaderBinding::GetConstructorObject(cx)) + if (FileReader && !dom::FileReader_Binding::GetConstructorObject(cx)) return false; if (FormData && - !dom::FormDataBinding::GetConstructorObject(cx)) + !dom::FormData_Binding::GetConstructorObject(cx)) return false; if (InspectorUtils && - !dom::InspectorUtilsBinding::GetConstructorObject(cx)) + !dom::InspectorUtils_Binding::GetConstructorObject(cx)) return false; if (MessageChannel && - (!dom::MessageChannelBinding::GetConstructorObject(cx) || - !dom::MessagePortBinding::GetConstructorObject(cx))) + (!dom::MessageChannel_Binding::GetConstructorObject(cx) || + !dom::MessagePort_Binding::GetConstructorObject(cx))) return false; - if (Node && !dom::NodeBinding::GetConstructorObject(cx)) + if (Node && !dom::Node_Binding::GetConstructorObject(cx)) return false; - if (NodeFilter && !dom::NodeFilterBinding::GetConstructorObject(cx)) + if (NodeFilter && !dom::NodeFilter_Binding::GetConstructorObject(cx)) return false; if (TextDecoder && - !dom::TextDecoderBinding::GetConstructorObject(cx)) + !dom::TextDecoder_Binding::GetConstructorObject(cx)) return false; if (TextEncoder && - !dom::TextEncoderBinding::GetConstructorObject(cx)) + !dom::TextEncoder_Binding::GetConstructorObject(cx)) return false; if (URL && - !dom::URLBinding::GetConstructorObject(cx)) + !dom::URL_Binding::GetConstructorObject(cx)) return false; if (URLSearchParams && - !dom::URLSearchParamsBinding::GetConstructorObject(cx)) + !dom::URLSearchParams_Binding::GetConstructorObject(cx)) return false; if (XMLHttpRequest && - !dom::XMLHttpRequestBinding::GetConstructorObject(cx)) + !dom::XMLHttpRequest_Binding::GetConstructorObject(cx)) return false; if (XMLSerializer && - !dom::XMLSerializerBinding::GetConstructorObject(cx)) + !dom::XMLSerializer_Binding::GetConstructorObject(cx)) return false; if (atob && diff --git a/js/xpconnect/wrappers/AccessCheck.cpp b/js/xpconnect/wrappers/AccessCheck.cpp index f1e5dabc49a4..67882e455ba8 100644 --- a/js/xpconnect/wrappers/AccessCheck.cpp +++ b/js/xpconnect/wrappers/AccessCheck.cpp @@ -122,9 +122,9 @@ IsPermitted(CrossOriginObjectType type, JSFlatString* prop, bool set) char16_t propChar0 = JS_GetFlatStringCharAt(prop, 0); if (type == CrossOriginLocation) - return dom::LocationBinding::IsPermitted(prop, propChar0, set); + return dom::Location_Binding::IsPermitted(prop, propChar0, set); if (type == CrossOriginWindow) - return dom::WindowBinding::IsPermitted(prop, propChar0, set); + return dom::Window_Binding::IsPermitted(prop, propChar0, set); return false; } diff --git a/layout/base/AccessibleCaretEventHub.cpp b/layout/base/AccessibleCaretEventHub.cpp index a23e52459425..475c17846972 100644 --- a/layout/base/AccessibleCaretEventHub.cpp +++ b/layout/base/AccessibleCaretEventHub.cpp @@ -554,7 +554,7 @@ AccessibleCaretEventHub::HandleTouchEvent(WidgetTouchEvent* aEvent) : mActiveTouchId); nsPoint point = GetTouchEventPosition(aEvent, id); - mManager->SetLastInputSource(MouseEventBinding::MOZ_SOURCE_TOUCH); + mManager->SetLastInputSource(MouseEvent_Binding::MOZ_SOURCE_TOUCH); switch (aEvent->mMessage) { case eTouchStart: @@ -590,7 +590,7 @@ AccessibleCaretEventHub::HandleTouchEvent(WidgetTouchEvent* aEvent) nsEventStatus AccessibleCaretEventHub::HandleKeyboardEvent(WidgetKeyboardEvent* aEvent) { - mManager->SetLastInputSource(MouseEventBinding::MOZ_SOURCE_KEYBOARD); + mManager->SetLastInputSource(MouseEvent_Binding::MOZ_SOURCE_KEYBOARD); switch (aEvent->mMessage) { case eKeyUp: diff --git a/layout/base/AccessibleCaretManager.cpp b/layout/base/AccessibleCaretManager.cpp index d3eccc98b400..503543a6c0d6 100644 --- a/layout/base/AccessibleCaretManager.cpp +++ b/layout/base/AccessibleCaretManager.cpp @@ -191,7 +191,7 @@ AccessibleCaretManager::OnSelectionChanged(nsIDocument* aDoc, // For mouse input we don't want to show the carets. if (sHideCaretsForMouseInput && - mLastInputSource == MouseEventBinding::MOZ_SOURCE_MOUSE) { + mLastInputSource == MouseEvent_Binding::MOZ_SOURCE_MOUSE) { HideCarets(); return NS_OK; } @@ -199,7 +199,7 @@ AccessibleCaretManager::OnSelectionChanged(nsIDocument* aDoc, // When we want to hide the carets for mouse input, hide them for select // all action fired by keyboard as well. if (sHideCaretsForMouseInput && - mLastInputSource == MouseEventBinding::MOZ_SOURCE_KEYBOARD && + mLastInputSource == MouseEvent_Binding::MOZ_SOURCE_KEYBOARD && (aReason & nsISelectionListener::SELECTALL_REASON)) { HideCarets(); return NS_OK; @@ -677,7 +677,7 @@ AccessibleCaretManager::OnScrollEnd() // For mouse input we don't want to show the carets. if (sHideCaretsForMouseInput && - mLastInputSource == MouseEventBinding::MOZ_SOURCE_MOUSE) { + mLastInputSource == MouseEvent_Binding::MOZ_SOURCE_MOUSE) { AC_LOG("%s: HideCarets()", __FUNCTION__); HideCarets(); return; @@ -1073,7 +1073,7 @@ AccessibleCaretManager::GetFrameForFirstRangeStartOrLastRangeEnd( if (!startFrame) { ErrorResult err; RefPtr walker = mPresShell->GetDocument()->CreateTreeWalker( - *startNode, dom::NodeFilterBinding::SHOW_ALL, nullptr, err); + *startNode, dom::NodeFilter_Binding::SHOW_ALL, nullptr, err); if (!walker) { return nullptr; diff --git a/layout/base/AccessibleCaretManager.h b/layout/base/AccessibleCaretManager.h index a27ae566114f..331f0df64214 100644 --- a/layout/base/AccessibleCaretManager.h +++ b/layout/base/AccessibleCaretManager.h @@ -315,7 +315,7 @@ protected: // or not show the carets when the selection is updated, as we want to hide // the carets for mouse-triggered selection changes but show them for other // input types such as touch. - uint16_t mLastInputSource = dom::MouseEventBinding::MOZ_SOURCE_UNKNOWN; + uint16_t mLastInputSource = dom::MouseEvent_Binding::MOZ_SOURCE_UNKNOWN; // Set to true in OnScrollStart() and set to false in OnScrollEnd(). bool mIsScrollStarted = false; diff --git a/layout/base/PositionedEventTargeting.cpp b/layout/base/PositionedEventTargeting.cpp index 41b0b437187d..c83c72b116ad 100644 --- a/layout/base/PositionedEventTargeting.cpp +++ b/layout/base/PositionedEventTargeting.cpp @@ -580,7 +580,7 @@ FindFrameTargetedByInputEvent(WidgetGUIEvent* aEvent, if (aEvent->mClass == eMouseEventClass && prefs->mTouchOnly && aEvent->AsMouseEvent()->inputSource != - MouseEventBinding::MOZ_SOURCE_TOUCH) { + MouseEvent_Binding::MOZ_SOURCE_TOUCH) { PET_LOG("Mouse input event is not from a touch source\n"); return target; } diff --git a/layout/base/nsLayoutUtils.cpp b/layout/base/nsLayoutUtils.cpp index e1f033866969..3f04c7b48f29 100644 --- a/layout/base/nsLayoutUtils.cpp +++ b/layout/base/nsLayoutUtils.cpp @@ -156,8 +156,8 @@ using namespace mozilla::image; using namespace mozilla::layers; using namespace mozilla::layout; using namespace mozilla::gfx; -using mozilla::dom::HTMLMediaElementBinding::HAVE_NOTHING; -using mozilla::dom::HTMLMediaElementBinding::HAVE_METADATA; +using mozilla::dom::HTMLMediaElement_Binding::HAVE_NOTHING; +using mozilla::dom::HTMLMediaElement_Binding::HAVE_METADATA; #define INTERCHARACTER_RUBY_ENABLED_PREF_NAME "layout.css.ruby.intercharacter.enabled" #define CONTENT_SELECT_ENABLED_PREF_NAME "dom.select_popup_in_content.enabled" diff --git a/layout/forms/nsDateTimeControlFrame.cpp b/layout/forms/nsDateTimeControlFrame.cpp index 3c363a8b2224..a8504f725bd3 100644 --- a/layout/forms/nsDateTimeControlFrame.cpp +++ b/layout/forms/nsDateTimeControlFrame.cpp @@ -421,14 +421,14 @@ nsDateTimeControlFrame::AttributeChanged(int32_t aNameSpaceID, &nsIDateTimeInputArea::NotifyInputElementValueChanged)); } } else { - if (aModType == MutationEventBinding::REMOVAL) { + if (aModType == MutationEvent_Binding::REMOVAL) { if (inputAreaContent) { nsAtomString name(aAttribute); inputAreaContent->RemoveEditAttribute(name); } } else { - MOZ_ASSERT(aModType == MutationEventBinding::ADDITION || - aModType == MutationEventBinding::MODIFICATION); + MOZ_ASSERT(aModType == MutationEvent_Binding::ADDITION || + aModType == MutationEvent_Binding::MODIFICATION); if (inputAreaContent) { nsAtomString name(aAttribute); nsAutoString value; diff --git a/layout/forms/nsFileControlFrame.cpp b/layout/forms/nsFileControlFrame.cpp index ee931863a435..92e8732a983c 100644 --- a/layout/forms/nsFileControlFrame.cpp +++ b/layout/forms/nsFileControlFrame.cpp @@ -440,7 +440,7 @@ nsFileControlFrame::AttributeChanged(int32_t aNameSpaceID, int32_t aModType) { if (aNameSpaceID == kNameSpaceID_None && aAttribute == nsGkAtoms::tabindex) { - if (aModType == MutationEventBinding::REMOVAL) { + if (aModType == MutationEvent_Binding::REMOVAL) { mBrowseFilesOrDirs->UnsetAttr(aNameSpaceID, aAttribute, true); } else { nsAutoString value; diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp index ff64eb0f73df..524304e6f489 100644 --- a/layout/forms/nsListControlFrame.cpp +++ b/layout/forms/nsListControlFrame.cpp @@ -1855,7 +1855,7 @@ nsListControlFrame::MouseDown(dom::Event* aMouseEvent) } uint16_t inputSource = mouseEvent->MozInputSource(); - bool isSourceTouchEvent = inputSource == MouseEventBinding::MOZ_SOURCE_TOUCH; + bool isSourceTouchEvent = inputSource == MouseEvent_Binding::MOZ_SOURCE_TOUCH; if (FireShowDropDownEvent(mContent, !mComboboxFrame->IsDroppedDownOrHasParentPopup(), isSourceTouchEvent)) { return NS_OK; diff --git a/layout/forms/nsNumberControlFrame.cpp b/layout/forms/nsNumberControlFrame.cpp index 305121cdb118..d6135614ef77 100644 --- a/layout/forms/nsNumberControlFrame.cpp +++ b/layout/forms/nsNumberControlFrame.cpp @@ -267,11 +267,11 @@ nsNumberControlFrame::AttributeChanged(int32_t aNameSpaceID, if (aAttribute == nsGkAtoms::placeholder || aAttribute == nsGkAtoms::readonly || aAttribute == nsGkAtoms::tabindex) { - if (aModType == MutationEventBinding::REMOVAL) { + if (aModType == MutationEvent_Binding::REMOVAL) { mTextField->UnsetAttr(aNameSpaceID, aAttribute, true); } else { - MOZ_ASSERT(aModType == MutationEventBinding::ADDITION || - aModType == MutationEventBinding::MODIFICATION); + MOZ_ASSERT(aModType == MutationEvent_Binding::ADDITION || + aModType == MutationEvent_Binding::MODIFICATION); nsAutoString value; mContent->AsElement()->GetAttr(aNameSpaceID, aAttribute, value); mTextField->SetAttr(aNameSpaceID, aAttribute, value, true); diff --git a/layout/inspector/InspectorFontFace.h b/layout/inspector/InspectorFontFace.h index cddc0a6fd728..f912e2baa2ed 100644 --- a/layout/inspector/InspectorFontFace.h +++ b/layout/inspector/InspectorFontFace.h @@ -77,7 +77,7 @@ public: JS::Handle aGivenProto, JS::MutableHandle aReflector) { - return InspectorFontFaceBinding::Wrap(aCx, this, aGivenProto, aReflector); + return InspectorFontFace_Binding::Wrap(aCx, this, aGivenProto, aReflector); } protected: diff --git a/layout/inspector/ServoStyleRuleMap.cpp b/layout/inspector/ServoStyleRuleMap.cpp index 2bcf1cba0d7c..5f4115be685b 100644 --- a/layout/inspector/ServoStyleRuleMap.cpp +++ b/layout/inspector/ServoStyleRuleMap.cpp @@ -91,26 +91,26 @@ ServoStyleRuleMap::RuleRemoved(StyleSheet& aStyleSheet, } switch (aStyleRule.Type()) { - case CSSRuleBinding::STYLE_RULE: { + case CSSRule_Binding::STYLE_RULE: { auto& rule = static_cast(aStyleRule); mTable.Remove(rule.Raw()); break; } - case CSSRuleBinding::IMPORT_RULE: - case CSSRuleBinding::MEDIA_RULE: - case CSSRuleBinding::SUPPORTS_RULE: - case CSSRuleBinding::DOCUMENT_RULE: { + case CSSRule_Binding::IMPORT_RULE: + case CSSRule_Binding::MEDIA_RULE: + case CSSRule_Binding::SUPPORTS_RULE: + case CSSRule_Binding::DOCUMENT_RULE: { // See the comment in StyleSheetRemoved. mTable.Clear(); break; } - case CSSRuleBinding::FONT_FACE_RULE: - case CSSRuleBinding::PAGE_RULE: - case CSSRuleBinding::KEYFRAMES_RULE: - case CSSRuleBinding::KEYFRAME_RULE: - case CSSRuleBinding::NAMESPACE_RULE: - case CSSRuleBinding::COUNTER_STYLE_RULE: - case CSSRuleBinding::FONT_FEATURE_VALUES_RULE: + case CSSRule_Binding::FONT_FACE_RULE: + case CSSRule_Binding::PAGE_RULE: + case CSSRule_Binding::KEYFRAMES_RULE: + case CSSRule_Binding::KEYFRAME_RULE: + case CSSRule_Binding::NAMESPACE_RULE: + case CSSRule_Binding::COUNTER_STYLE_RULE: + case CSSRule_Binding::FONT_FEATURE_VALUES_RULE: break; default: MOZ_ASSERT_UNREACHABLE("Unhandled rule"); @@ -129,20 +129,20 @@ void ServoStyleRuleMap::FillTableFromRule(css::Rule& aRule) { switch (aRule.Type()) { - case CSSRuleBinding::STYLE_RULE: { + case CSSRule_Binding::STYLE_RULE: { auto& rule = static_cast(aRule); mTable.Put(rule.Raw(), &rule); break; } - case CSSRuleBinding::MEDIA_RULE: - case CSSRuleBinding::SUPPORTS_RULE: - case CSSRuleBinding::DOCUMENT_RULE: { + case CSSRule_Binding::MEDIA_RULE: + case CSSRule_Binding::SUPPORTS_RULE: + case CSSRule_Binding::DOCUMENT_RULE: { auto& rule = static_cast(aRule); auto ruleList = static_cast(rule.CssRules()); FillTableFromRuleList(*ruleList); break; } - case CSSRuleBinding::IMPORT_RULE: { + case CSSRule_Binding::IMPORT_RULE: { auto& rule = static_cast(aRule); MOZ_ASSERT(aRule.GetStyleSheet()); FillTableFromStyleSheet(*rule.GetStyleSheet()); diff --git a/layout/inspector/inDeepTreeWalker.cpp b/layout/inspector/inDeepTreeWalker.cpp index 5621074ee79a..26f302d63f6c 100644 --- a/layout/inspector/inDeepTreeWalker.cpp +++ b/layout/inspector/inDeepTreeWalker.cpp @@ -28,7 +28,7 @@ inDeepTreeWalker::inDeepTreeWalker() : mShowAnonymousContent(false), mShowSubDocuments(false), mShowDocumentsAsNodes(false), - mWhatToShow(mozilla::dom::NodeFilterBinding::SHOW_ALL) + mWhatToShow(mozilla::dom::NodeFilter_Binding::SHOW_ALL) { } diff --git a/layout/mathml/nsMathMLContainerFrame.cpp b/layout/mathml/nsMathMLContainerFrame.cpp index d568dec90914..ad558caeddd6 100644 --- a/layout/mathml/nsMathMLContainerFrame.cpp +++ b/layout/mathml/nsMathMLContainerFrame.cpp @@ -739,7 +739,7 @@ nsMathMLContainerFrame::AppendFrames(ChildListID aListID, { MOZ_ASSERT(aListID == kPrincipalList); mFrames.AppendFrames(this, aFrameList); - ChildListChanged(dom::MutationEventBinding::ADDITION); + ChildListChanged(dom::MutationEvent_Binding::ADDITION); } void @@ -749,7 +749,7 @@ nsMathMLContainerFrame::InsertFrames(ChildListID aListID, { MOZ_ASSERT(aListID == kPrincipalList); mFrames.InsertFrames(this, aPrevFrame, aFrameList); - ChildListChanged(dom::MutationEventBinding::ADDITION); + ChildListChanged(dom::MutationEvent_Binding::ADDITION); } void @@ -758,7 +758,7 @@ nsMathMLContainerFrame::RemoveFrame(ChildListID aListID, { MOZ_ASSERT(aListID == kPrincipalList); mFrames.DestroyFrame(aOldFrame); - ChildListChanged(dom::MutationEventBinding::REMOVAL); + ChildListChanged(dom::MutationEvent_Binding::REMOVAL); } nsresult diff --git a/layout/style/BindingStyleRule.cpp b/layout/style/BindingStyleRule.cpp index 6475d923798c..0e40b0796d65 100644 --- a/layout/style/BindingStyleRule.cpp +++ b/layout/style/BindingStyleRule.cpp @@ -13,7 +13,7 @@ namespace mozilla { BindingStyleRule::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return dom::CSSStyleRuleBinding::Wrap(aCx, this, aGivenProto); + return dom::CSSStyleRule_Binding::Wrap(aCx, this, aGivenProto); } } // namespace mozilla diff --git a/layout/style/CSSCounterStyleRule.cpp b/layout/style/CSSCounterStyleRule.cpp index 0ee3853ec731..797834d2b9ad 100644 --- a/layout/style/CSSCounterStyleRule.cpp +++ b/layout/style/CSSCounterStyleRule.cpp @@ -36,7 +36,7 @@ CSSCounterStyleRule::List(FILE* out, int32_t aIndent) const uint16_t CSSCounterStyleRule::Type() const { - return CSSRuleBinding::COUNTER_STYLE_RULE; + return CSSRule_Binding::COUNTER_STYLE_RULE; } void @@ -97,7 +97,7 @@ CSSCounterStyleRule::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const CSSCounterStyleRule::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return CSSCounterStyleRuleBinding::Wrap(aCx, this, aGivenProto); + return CSSCounterStyleRule_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/layout/style/CSSFontFaceRule.cpp b/layout/style/CSSFontFaceRule.cpp index d9f7bbc17775..bd1c2d1a439f 100644 --- a/layout/style/CSSFontFaceRule.cpp +++ b/layout/style/CSSFontFaceRule.cpp @@ -138,7 +138,7 @@ CSSFontFaceRuleDecl::GetParentObject() JSObject* CSSFontFaceRuleDecl::WrapObject(JSContext *cx, JS::Handle aGivenProto) { - return CSSStyleDeclarationBinding::Wrap(cx, this, aGivenProto); + return CSSStyleDeclaration_Binding::Wrap(cx, this, aGivenProto); } // ------------------------------------------- @@ -200,7 +200,7 @@ CSSFontFaceRule::List(FILE* out, int32_t aIndent) const uint16_t CSSFontFaceRule::Type() const { - return CSSRuleBinding::FONT_FACE_RULE; + return CSSRule_Binding::FONT_FACE_RULE; } void @@ -226,5 +226,5 @@ CSSFontFaceRule::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const CSSFontFaceRule::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return CSSFontFaceRuleBinding::Wrap(aCx, this, aGivenProto); + return CSSFontFaceRule_Binding::Wrap(aCx, this, aGivenProto); } diff --git a/layout/style/CSSFontFeatureValuesRule.cpp b/layout/style/CSSFontFeatureValuesRule.cpp index 5cdfd76b76de..03a32519fe14 100644 --- a/layout/style/CSSFontFeatureValuesRule.cpp +++ b/layout/style/CSSFontFeatureValuesRule.cpp @@ -87,7 +87,7 @@ CSSFontFeatureValuesRule::IsCCLeaf() const CSSFontFeatureValuesRule::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return CSSFontFeatureValuesRuleBinding::Wrap(aCx, this, aGivenProto); + return CSSFontFeatureValuesRule_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/layout/style/CSSFontFeatureValuesRule.h b/layout/style/CSSFontFeatureValuesRule.h index fc2845dfbf62..cee39f261ba0 100644 --- a/layout/style/CSSFontFeatureValuesRule.h +++ b/layout/style/CSSFontFeatureValuesRule.h @@ -26,7 +26,7 @@ public: RawServoFontFeatureValuesRule* Raw() const { return mRawRule; } // WebIDL interfaces - uint16_t Type() const final { return CSSRuleBinding::FONT_FEATURE_VALUES_RULE; } + uint16_t Type() const final { return CSSRule_Binding::FONT_FEATURE_VALUES_RULE; } void GetCssText(nsAString& aCssText) const override; void GetFontFamily(nsAString& aFamily); void SetFontFamily(const nsAString& aFamily, mozilla::ErrorResult& aRv); diff --git a/layout/style/CSSImportRule.cpp b/layout/style/CSSImportRule.cpp index b93683c1c91e..7dfce25067c4 100644 --- a/layout/style/CSSImportRule.cpp +++ b/layout/style/CSSImportRule.cpp @@ -112,7 +112,7 @@ CSSImportRule::IsCCLeaf() const CSSImportRule::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return CSSImportRuleBinding::Wrap(aCx, this, aGivenProto); + return CSSImportRule_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/layout/style/CSSImportRule.h b/layout/style/CSSImportRule.h index f66d6e8166ec..b5f4cd6a08e8 100644 --- a/layout/style/CSSImportRule.h +++ b/layout/style/CSSImportRule.h @@ -34,7 +34,7 @@ public: const override; // WebIDL interface - uint16_t Type() const final { return CSSRuleBinding::IMPORT_RULE; } + uint16_t Type() const final { return CSSRule_Binding::IMPORT_RULE; } void GetCssText(nsAString& aCssText) const override; void GetHref(nsAString& aHref) const; dom::MediaList* GetMedia() const; diff --git a/layout/style/CSSKeyframeRule.cpp b/layout/style/CSSKeyframeRule.cpp index f6c4ca67f6da..ead970039890 100644 --- a/layout/style/CSSKeyframeRule.cpp +++ b/layout/style/CSSKeyframeRule.cpp @@ -207,7 +207,7 @@ CSSKeyframeRule::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const CSSKeyframeRule::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return CSSKeyframeRuleBinding::Wrap(aCx, this, aGivenProto); + return CSSKeyframeRule_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/layout/style/CSSKeyframeRule.h b/layout/style/CSSKeyframeRule.h index e794f51c8c8d..4d0bf73a9a32 100644 --- a/layout/style/CSSKeyframeRule.h +++ b/layout/style/CSSKeyframeRule.h @@ -36,7 +36,7 @@ public: RawServoKeyframe* Raw() const { return mRaw; } // WebIDL interface - uint16_t Type() const final { return CSSRuleBinding::KEYFRAME_RULE; } + uint16_t Type() const final { return CSSRule_Binding::KEYFRAME_RULE; } void GetCssText(nsAString& aCssText) const final; void GetKeyText(nsAString& aKey); void SetKeyText(const nsAString& aKey); diff --git a/layout/style/CSSKeyframesRule.cpp b/layout/style/CSSKeyframesRule.cpp index 43e63ad7e3ab..b00a94e94be3 100644 --- a/layout/style/CSSKeyframesRule.cpp +++ b/layout/style/CSSKeyframesRule.cpp @@ -339,7 +339,7 @@ CSSKeyframesRule::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const /* virtual */ JSObject* CSSKeyframesRule::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return CSSKeyframesRuleBinding::Wrap(aCx, this, aGivenProto); + return CSSKeyframesRule_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/layout/style/CSSKeyframesRule.h b/layout/style/CSSKeyframesRule.h index e4ac8e7815d5..22dceb655312 100644 --- a/layout/style/CSSKeyframesRule.h +++ b/layout/style/CSSKeyframesRule.h @@ -34,7 +34,7 @@ public: void SetStyleSheet(StyleSheet* aSheet) final; // WebIDL interface - uint16_t Type() const final { return CSSRuleBinding::KEYFRAMES_RULE; } + uint16_t Type() const final { return CSSRule_Binding::KEYFRAMES_RULE; } void GetCssText(nsAString& aCssText) const final; void GetName(nsAString& aName) const; void SetName(const nsAString& aName); diff --git a/layout/style/CSSMediaRule.cpp b/layout/style/CSSMediaRule.cpp index 4a1c59885644..40ef55335174 100644 --- a/layout/style/CSSMediaRule.cpp +++ b/layout/style/CSSMediaRule.cpp @@ -107,7 +107,7 @@ CSSMediaRule::SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const /* virtual */ JSObject* CSSMediaRule::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return CSSMediaRuleBinding::Wrap(aCx, this, aGivenProto); + return CSSMediaRule_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/layout/style/CSSMediaRule.h b/layout/style/CSSMediaRule.h index fdbf17ce4854..1a7e789e3b7b 100644 --- a/layout/style/CSSMediaRule.h +++ b/layout/style/CSSMediaRule.h @@ -31,7 +31,7 @@ public: RawServoMediaRule* Raw() const { return mRawRule; } // WebIDL interface - uint16_t Type() const override { return CSSRuleBinding::MEDIA_RULE; } + uint16_t Type() const override { return CSSRule_Binding::MEDIA_RULE; } // WebIDL interface void GetCssText(nsAString& aCssText) const final; void GetConditionText(nsAString& aConditionText) final; diff --git a/layout/style/CSSMozDocumentRule.cpp b/layout/style/CSSMozDocumentRule.cpp index 093f0a4bd564..403c3b1e5f67 100644 --- a/layout/style/CSSMozDocumentRule.cpp +++ b/layout/style/CSSMozDocumentRule.cpp @@ -17,7 +17,7 @@ using namespace mozilla::css; CSSMozDocumentRule::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return CSSMozDocumentRuleBinding::Wrap(aCx, this, aGivenProto); + return CSSMozDocumentRule_Binding::Wrap(aCx, this, aGivenProto); } bool diff --git a/layout/style/CSSMozDocumentRule.h b/layout/style/CSSMozDocumentRule.h index 1c8774d812a5..257c621a1e5a 100644 --- a/layout/style/CSSMozDocumentRule.h +++ b/layout/style/CSSMozDocumentRule.h @@ -35,7 +35,7 @@ public: RawServoMozDocumentRule* Raw() const { return mRawRule; } // WebIDL interface - uint16_t Type() const final { return CSSRuleBinding::DOCUMENT_RULE; } + uint16_t Type() const final { return CSSRule_Binding::DOCUMENT_RULE; } void GetCssText(nsAString& aCssText) const final; void GetConditionText(nsAString& aConditionText) final; void SetConditionText(const nsAString& aConditionText, diff --git a/layout/style/CSSNamespaceRule.h b/layout/style/CSSNamespaceRule.h index c44bcda5fe13..8ac904054fb4 100644 --- a/layout/style/CSSNamespaceRule.h +++ b/layout/style/CSSNamespaceRule.h @@ -41,7 +41,7 @@ public: void GetCssText(nsAString& aCssText) const final; // WebIDL interfaces - uint16_t Type() const final { return CSSRuleBinding::NAMESPACE_RULE; } + uint16_t Type() const final { return CSSRule_Binding::NAMESPACE_RULE; } void GetNamespaceURI(nsString& aNamespaceURI) { GetURLSpec(aNamespaceURI); @@ -55,7 +55,7 @@ public: JSObject* WrapObject(JSContext* aCx, JS::Handle aGivenProto) final { - return CSSNamespaceRuleBinding::Wrap(aCx, this, aGivenProto); + return CSSNamespaceRule_Binding::Wrap(aCx, this, aGivenProto); } private: diff --git a/layout/style/CSSPageRule.cpp b/layout/style/CSSPageRule.cpp index ff62bca72984..9bb1d0464667 100644 --- a/layout/style/CSSPageRule.cpp +++ b/layout/style/CSSPageRule.cpp @@ -184,7 +184,7 @@ CSSPageRule::Style() JSObject* CSSPageRule::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return CSSPageRuleBinding::Wrap(aCx, this, aGivenProto); + return CSSPageRule_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/layout/style/CSSPageRule.h b/layout/style/CSSPageRule.h index 2dccf4ea62c7..0802f55d8d64 100644 --- a/layout/style/CSSPageRule.h +++ b/layout/style/CSSPageRule.h @@ -67,7 +67,7 @@ public: RawServoPageRule* Raw() const { return mRawRule; } // WebIDL interfaces - uint16_t Type() const final { return CSSRuleBinding::PAGE_RULE; } + uint16_t Type() const final { return CSSRule_Binding::PAGE_RULE; } void GetCssText(nsAString& aCssText) const final; nsICSSDeclaration* Style(); diff --git a/layout/style/CSSRuleList.cpp b/layout/style/CSSRuleList.cpp index a7904d0cd7a4..d50c6533660e 100644 --- a/layout/style/CSSRuleList.cpp +++ b/layout/style/CSSRuleList.cpp @@ -25,7 +25,7 @@ NS_IMPL_CYCLE_COLLECTING_RELEASE(CSSRuleList) /* virtual */ JSObject* CSSRuleList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return CSSRuleListBinding::Wrap(aCx, this, aGivenProto); + return CSSRuleList_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/layout/style/CSSStyleRule.h b/layout/style/CSSStyleRule.h index 820f511be617..d36677a1ea47 100644 --- a/layout/style/CSSStyleRule.h +++ b/layout/style/CSSStyleRule.h @@ -78,7 +78,7 @@ public: NotNull GetDeclarationBlock() const override; // WebIDL interface - uint16_t Type() const final { return dom::CSSRuleBinding::STYLE_RULE; } + uint16_t Type() const final { return dom::CSSRule_Binding::STYLE_RULE; } void GetCssText(nsAString& aCssText) const final; void GetSelectorText(nsAString& aSelectorText) final; void SetSelectorText(const nsAString& aSelectorText) final; diff --git a/layout/style/CSSSupportsRule.cpp b/layout/style/CSSSupportsRule.cpp index 3490e7268228..874ede1a121d 100644 --- a/layout/style/CSSSupportsRule.cpp +++ b/layout/style/CSSSupportsRule.cpp @@ -73,7 +73,7 @@ CSSSupportsRule::SizeOfIncludingThis(MallocSizeOf aMallocSizeOf) const CSSSupportsRule::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return CSSSupportsRuleBinding::Wrap(aCx, this, aGivenProto); + return CSSSupportsRule_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/layout/style/CSSSupportsRule.h b/layout/style/CSSSupportsRule.h index 324c3b412bb8..a901da7fc6cc 100644 --- a/layout/style/CSSSupportsRule.h +++ b/layout/style/CSSSupportsRule.h @@ -28,7 +28,7 @@ public: RawServoSupportsRule* Raw() const { return mRawRule; } // WebIDL interface - uint16_t Type() const override { return CSSRuleBinding::SUPPORTS_RULE; } + uint16_t Type() const override { return CSSRule_Binding::SUPPORTS_RULE; } void GetCssText(nsAString& aCssText) const final; void GetConditionText(nsAString& aConditionText) final; void SetConditionText(const nsAString& aConditionText, diff --git a/layout/style/FontFace.cpp b/layout/style/FontFace.cpp index e4132d24f530..c8310bf39fb0 100644 --- a/layout/style/FontFace.cpp +++ b/layout/style/FontFace.cpp @@ -130,7 +130,7 @@ FontFace::~FontFace() JSObject* FontFace::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return FontFaceBinding::Wrap(aCx, this, aGivenProto); + return FontFace_Binding::Wrap(aCx, this, aGivenProto); } static FontFaceLoadStatus diff --git a/layout/style/FontFaceSet.cpp b/layout/style/FontFaceSet.cpp index 2b890cc87572..d0edec1faf21 100644 --- a/layout/style/FontFaceSet.cpp +++ b/layout/style/FontFaceSet.cpp @@ -176,7 +176,7 @@ FontFaceSet::~FontFaceSet() JSObject* FontFaceSet::WrapObject(JSContext* aContext, JS::Handle aGivenProto) { - return FontFaceSetBinding::Wrap(aContext, this, aGivenProto); + return FontFaceSet_Binding::Wrap(aContext, this, aGivenProto); } void diff --git a/layout/style/FontFaceSetIterator.cpp b/layout/style/FontFaceSetIterator.cpp index 7ef60036eb5d..5c6675c843f2 100644 --- a/layout/style/FontFaceSetIterator.cpp +++ b/layout/style/FontFaceSetIterator.cpp @@ -33,7 +33,7 @@ FontFaceSetIterator::WrapObject(JSContext* aCx, JS::Handle aGivenProto, JS::MutableHandle aReflector) { - return FontFaceSetIteratorBinding::Wrap(aCx, this, aGivenProto, aReflector); + return FontFaceSetIterator_Binding::Wrap(aCx, this, aGivenProto, aReflector); } void diff --git a/layout/style/MediaList.cpp b/layout/style/MediaList.cpp index e5e9b815c652..0aa6adc2bd11 100644 --- a/layout/style/MediaList.cpp +++ b/layout/style/MediaList.cpp @@ -30,7 +30,7 @@ NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_0(MediaList) JSObject* MediaList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MediaListBinding::Wrap(aCx, this, aGivenProto); + return MediaList_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/layout/style/MediaQueryList.cpp b/layout/style/MediaQueryList.cpp index d2eaab49f18f..880d7c8b0c8a 100644 --- a/layout/style/MediaQueryList.cpp +++ b/layout/style/MediaQueryList.cpp @@ -166,7 +166,7 @@ MediaQueryList::GetParentObject() const JSObject* MediaQueryList::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MediaQueryListBinding::Wrap(aCx, this, aGivenProto); + return MediaQueryList_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/layout/style/Rule.h b/layout/style/Rule.h index c2455cdf2832..4b7f135a6cd3 100644 --- a/layout/style/Rule.h +++ b/layout/style/Rule.h @@ -77,11 +77,11 @@ public: #ifdef DEBUG if (aRule) { int16_t type = aRule->Type(); - MOZ_ASSERT(type == dom::CSSRuleBinding::MEDIA_RULE || - type == dom::CSSRuleBinding::DOCUMENT_RULE || - type == dom::CSSRuleBinding::SUPPORTS_RULE || - (type == dom::CSSRuleBinding::KEYFRAMES_RULE && - Type() == dom::CSSRuleBinding::KEYFRAME_RULE)); + MOZ_ASSERT(type == dom::CSSRule_Binding::MEDIA_RULE || + type == dom::CSSRule_Binding::DOCUMENT_RULE || + type == dom::CSSRule_Binding::SUPPORTS_RULE || + (type == dom::CSSRule_Binding::KEYFRAMES_RULE && + Type() == dom::CSSRule_Binding::KEYFRAME_RULE)); } #endif mParentRule = aRule; diff --git a/layout/style/ServoCSSRuleList.cpp b/layout/style/ServoCSSRuleList.cpp index 003849883167..f3040b6f01a2 100644 --- a/layout/style/ServoCSSRuleList.cpp +++ b/layout/style/ServoCSSRuleList.cpp @@ -83,7 +83,7 @@ ServoCSSRuleList::GetRule(uint32_t aIndex) RefPtr ruleObj = nullptr; switch (rule) { #define CASE_RULE(const_, name_) \ - case CSSRuleBinding::const_##_RULE: { \ + case CSSRule_Binding::const_##_RULE: { \ uint32_t line = 0, column = 0; \ RefPtr rule = \ Servo_CssRules_Get##name_##RuleAt( \ @@ -105,7 +105,7 @@ ServoCSSRuleList::GetRule(uint32_t aIndex) CASE_RULE(FONT_FACE, FontFace) CASE_RULE(COUNTER_STYLE, CounterStyle) #undef CASE_RULE - case CSSRuleBinding::KEYFRAME_RULE: + case CSSRule_Binding::KEYFRAME_RULE: MOZ_ASSERT_UNREACHABLE("keyframe rule cannot be here"); return nullptr; default: diff --git a/layout/style/StyleSheet.cpp b/layout/style/StyleSheet.cpp index 773894acb8db..5fdd130558e9 100644 --- a/layout/style/StyleSheet.cpp +++ b/layout/style/StyleSheet.cpp @@ -919,13 +919,13 @@ StyleSheet::Media() JSObject* StyleSheet::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return dom::CSSStyleSheetBinding::Wrap(aCx, this, aGivenProto); + return dom::CSSStyleSheet_Binding::Wrap(aCx, this, aGivenProto); } /* static */ bool StyleSheet::RuleHasPendingChildSheet(css::Rule* aRule) { - MOZ_ASSERT(aRule->Type() == dom::CSSRuleBinding::IMPORT_RULE); + MOZ_ASSERT(aRule->Type() == dom::CSSRule_Binding::IMPORT_RULE); auto rule = static_cast(aRule); if (StyleSheet* childSheet = rule->GetStyleSheet()) { return !childSheet->IsComplete(); @@ -1154,7 +1154,7 @@ StyleSheet::ReparseSheet(const nsAString& aInput) for (uint32_t i = 0; i < ruleCount; ++i) { css::Rule* rule = ruleList->GetRule(i); MOZ_ASSERT(rule); - if (rule->Type() == dom::CSSRuleBinding::IMPORT_RULE && + if (rule->Type() == dom::CSSRule_Binding::IMPORT_RULE && RuleHasPendingChildSheet(rule)) { continue; // notify when loaded (see StyleSheetLoaded) } @@ -1180,7 +1180,7 @@ StyleSheet::ReparseSheet(const nsAString& aInput) for (uint32_t i = 0; i < ruleCount; ++i) { css::Rule* rule = ruleList->GetRule(i); MOZ_ASSERT(rule); - if (rule->Type() == CSSRuleBinding::IMPORT_RULE && + if (rule->Type() == CSSRule_Binding::IMPORT_RULE && RuleHasPendingChildSheet(rule)) { continue; // notify when loaded (see StyleSheetLoaded) } @@ -1268,7 +1268,7 @@ StyleSheet::InsertRuleInternal(const nsAString& aRule, // XXX We may not want to get the rule when stylesheet change event // is not enabled. css::Rule* rule = mRuleList->GetRule(aIndex); - if (rule->Type() != CSSRuleBinding::IMPORT_RULE || + if (rule->Type() != CSSRule_Binding::IMPORT_RULE || !RuleHasPendingChildSheet(rule)) { RuleAdded(*rule); } diff --git a/layout/style/nsAnimationManager.cpp b/layout/style/nsAnimationManager.cpp index 171d342c4d38..1f541c3b6923 100755 --- a/layout/style/nsAnimationManager.cpp +++ b/layout/style/nsAnimationManager.cpp @@ -47,7 +47,7 @@ typedef mozilla::ComputedTiming::AnimationPhase AnimationPhase; JSObject* CSSAnimation::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return dom::CSSAnimationBinding::Wrap(aCx, this, aGivenProto); + return dom::CSSAnimation_Binding::Wrap(aCx, this, aGivenProto); } mozilla::dom::Promise* diff --git a/layout/style/nsDOMCSSDeclaration.cpp b/layout/style/nsDOMCSSDeclaration.cpp index 6563530df7eb..5460ddd093a6 100644 --- a/layout/style/nsDOMCSSDeclaration.cpp +++ b/layout/style/nsDOMCSSDeclaration.cpp @@ -29,7 +29,7 @@ nsDOMCSSDeclaration::~nsDOMCSSDeclaration() = default; /* virtual */ JSObject* nsDOMCSSDeclaration::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return dom::CSS2PropertiesBinding::Wrap(aCx, this, aGivenProto); + return dom::CSS2Properties_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_QUERY_INTERFACE(nsDOMCSSDeclaration, diff --git a/layout/style/nsTransitionManager.cpp b/layout/style/nsTransitionManager.cpp index 56438b8da0ef..5ccbc35c2a55 100755 --- a/layout/style/nsTransitionManager.cpp +++ b/layout/style/nsTransitionManager.cpp @@ -131,7 +131,7 @@ ElementPropertyTransition::UpdateStartValueFromReplacedTransition() JSObject* CSSTransition::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return dom::CSSTransitionBinding::Wrap(aCx, this, aGivenProto); + return dom::CSSTransition_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/layout/svg/SVGFEImageFrame.cpp b/layout/svg/SVGFEImageFrame.cpp index b3a060b1d1e0..3943cf023beb 100644 --- a/layout/svg/SVGFEImageFrame.cpp +++ b/layout/svg/SVGFEImageFrame.cpp @@ -132,7 +132,7 @@ SVGFEImageFrame::AttributeChanged(int32_t aNameSpaceID, // Currently our SMIL implementation does not modify the DOM attributes. Once // we implement the SVG 2 SMIL behaviour this can be removed // SVGFEImageElement::AfterSetAttr's implementation will be sufficient. - if (aModType == MutationEventBinding::SMIL && + if (aModType == MutationEvent_Binding::SMIL && aAttribute == nsGkAtoms::href && (aNameSpaceID == kNameSpaceID_XLink || aNameSpaceID == kNameSpaceID_None)) { diff --git a/layout/svg/SVGTextFrame.cpp b/layout/svg/SVGTextFrame.cpp index 67a6c87f0c3e..6cd8c3f78af2 100644 --- a/layout/svg/SVGTextFrame.cpp +++ b/layout/svg/SVGTextFrame.cpp @@ -53,7 +53,7 @@ using namespace mozilla; using namespace mozilla::dom; -using namespace mozilla::dom::SVGTextContentElementBinding; +using namespace mozilla::dom::SVGTextContentElement_Binding; using namespace mozilla::gfx; using namespace mozilla::image; diff --git a/layout/svg/nsSVGAFrame.cpp b/layout/svg/nsSVGAFrame.cpp index f96316848c2d..ad6efbe59c0e 100644 --- a/layout/svg/nsSVGAFrame.cpp +++ b/layout/svg/nsSVGAFrame.cpp @@ -91,7 +91,7 @@ nsSVGAFrame::AttributeChanged(int32_t aNameSpaceID, // Currently our SMIL implementation does not modify the DOM attributes. Once // we implement the SVG 2 SMIL behaviour this can be removed // SVGAElement::SetAttr/UnsetAttr's ResetLinkState() call will be sufficient. - if (aModType == dom::MutationEventBinding::SMIL && + if (aModType == dom::MutationEvent_Binding::SMIL && aAttribute == nsGkAtoms::href && (aNameSpaceID == kNameSpaceID_None || aNameSpaceID == kNameSpaceID_XLink)) { diff --git a/layout/svg/nsSVGFilterInstance.cpp b/layout/svg/nsSVGFilterInstance.cpp index c8c76ab5c0a4..672633463777 100644 --- a/layout/svg/nsSVGFilterInstance.cpp +++ b/layout/svg/nsSVGFilterInstance.cpp @@ -25,7 +25,7 @@ using namespace mozilla; using namespace mozilla::dom; -using namespace mozilla::dom::SVGUnitTypesBinding; +using namespace mozilla::dom::SVGUnitTypes_Binding; using namespace mozilla::gfx; nsSVGFilterInstance::nsSVGFilterInstance(const nsStyleFilter& aFilter, @@ -164,7 +164,7 @@ nsSVGFilterInstance::GetPrimitiveNumber(uint8_t aCtxType, float aValue) const { nsSVGLength2 val; val.Init(aCtxType, 0xff, aValue, - SVGLengthBinding::SVG_LENGTHTYPE_NUMBER); + SVGLength_Binding::SVG_LENGTHTYPE_NUMBER); float value; if (mPrimitiveUnits == SVG_UNIT_TYPE_OBJECTBOUNDINGBOX) { @@ -191,14 +191,14 @@ nsSVGFilterInstance::ConvertLocation(const Point3D& aPoint) const { nsSVGLength2 val[4]; val[0].Init(SVGContentUtils::X, 0xff, aPoint.x, - SVGLengthBinding::SVG_LENGTHTYPE_NUMBER); + SVGLength_Binding::SVG_LENGTHTYPE_NUMBER); val[1].Init(SVGContentUtils::Y, 0xff, aPoint.y, - SVGLengthBinding::SVG_LENGTHTYPE_NUMBER); + SVGLength_Binding::SVG_LENGTHTYPE_NUMBER); // Dummy width/height values val[2].Init(SVGContentUtils::X, 0xff, 0, - SVGLengthBinding::SVG_LENGTHTYPE_NUMBER); + SVGLength_Binding::SVG_LENGTHTYPE_NUMBER); val[3].Init(SVGContentUtils::Y, 0xff, 0, - SVGLengthBinding::SVG_LENGTHTYPE_NUMBER); + SVGLength_Binding::SVG_LENGTHTYPE_NUMBER); gfxRect feArea = nsSVGUtils::GetRelativeRect(mPrimitiveUnits, val, mTargetBBox, mMetrics); diff --git a/layout/svg/nsSVGGradientFrame.cpp b/layout/svg/nsSVGGradientFrame.cpp index deb74e67f4ac..5e2d92e3afd8 100644 --- a/layout/svg/nsSVGGradientFrame.cpp +++ b/layout/svg/nsSVGGradientFrame.cpp @@ -23,8 +23,8 @@ using namespace mozilla; using namespace mozilla::dom; -using namespace mozilla::dom::SVGGradientElementBinding; -using namespace mozilla::dom::SVGUnitTypesBinding; +using namespace mozilla::dom::SVGGradientElement_Binding; +using namespace mozilla::dom::SVGUnitTypes_Binding; using namespace mozilla::gfx; //---------------------------------------------------------------------- diff --git a/layout/svg/nsSVGImageFrame.cpp b/layout/svg/nsSVGImageFrame.cpp index e3939f9418d6..946f2851bacd 100644 --- a/layout/svg/nsSVGImageFrame.cpp +++ b/layout/svg/nsSVGImageFrame.cpp @@ -147,7 +147,7 @@ nsSVGImageFrame::AttributeChanged(int32_t aNameSpaceID, // Currently our SMIL implementation does not modify the DOM attributes. Once // we implement the SVG 2 SMIL behaviour this can be removed // SVGImageElement::AfterSetAttr's implementation will be sufficient. - if (aModType == MutationEventBinding::SMIL && + if (aModType == MutationEvent_Binding::SMIL && aAttribute == nsGkAtoms::href && (aNameSpaceID == kNameSpaceID_XLink || aNameSpaceID == kNameSpaceID_None)) { diff --git a/layout/svg/nsSVGMaskFrame.cpp b/layout/svg/nsSVGMaskFrame.cpp index c1ab6563bcfc..a328a7747113 100644 --- a/layout/svg/nsSVGMaskFrame.cpp +++ b/layout/svg/nsSVGMaskFrame.cpp @@ -19,7 +19,7 @@ using namespace mozilla; using namespace mozilla::dom; -using namespace mozilla::dom::SVGUnitTypesBinding; +using namespace mozilla::dom::SVGUnitTypes_Binding; using namespace mozilla::gfx; using namespace mozilla::image; diff --git a/layout/svg/nsSVGPatternFrame.cpp b/layout/svg/nsSVGPatternFrame.cpp index ce03859faffc..6b5bb2d111e3 100644 --- a/layout/svg/nsSVGPatternFrame.cpp +++ b/layout/svg/nsSVGPatternFrame.cpp @@ -29,7 +29,7 @@ using namespace mozilla; using namespace mozilla::dom; -using namespace mozilla::dom::SVGUnitTypesBinding; +using namespace mozilla::dom::SVGUnitTypes_Binding; using namespace mozilla::gfx; using namespace mozilla::image; diff --git a/layout/svg/nsSVGUtils.cpp b/layout/svg/nsSVGUtils.cpp index e3477720a4f8..83d650458858 100644 --- a/layout/svg/nsSVGUtils.cpp +++ b/layout/svg/nsSVGUtils.cpp @@ -59,7 +59,7 @@ using namespace mozilla; using namespace mozilla::dom; -using namespace mozilla::dom::SVGUnitTypesBinding; +using namespace mozilla::dom::SVGUnitTypes_Binding; using namespace mozilla::gfx; using namespace mozilla::image; diff --git a/layout/xul/BoxObject.cpp b/layout/xul/BoxObject.cpp index 87086020d520..7cbe13d979a4 100644 --- a/layout/xul/BoxObject.cpp +++ b/layout/xul/BoxObject.cpp @@ -472,7 +472,7 @@ BoxObject::GetParentObject() const JSObject* BoxObject::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return BoxObjectBinding::Wrap(aCx, this, aGivenProto); + return BoxObject_Binding::Wrap(aCx, this, aGivenProto); } Element* diff --git a/layout/xul/ListBoxObject.cpp b/layout/xul/ListBoxObject.cpp index b0249158841d..1609c74c565a 100644 --- a/layout/xul/ListBoxObject.cpp +++ b/layout/xul/ListBoxObject.cpp @@ -31,7 +31,7 @@ ListBoxObject::~ListBoxObject() JSObject* ListBoxObject::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return ListBoxObjectBinding::Wrap(aCx, this, aGivenProto); + return ListBoxObject_Binding::Wrap(aCx, this, aGivenProto); } // nsIListBoxObject diff --git a/layout/xul/MenuBoxObject.cpp b/layout/xul/MenuBoxObject.cpp index a88a7c2e7640..5663bc792d59 100644 --- a/layout/xul/MenuBoxObject.cpp +++ b/layout/xul/MenuBoxObject.cpp @@ -29,7 +29,7 @@ MenuBoxObject::~MenuBoxObject() JSObject* MenuBoxObject::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return MenuBoxObjectBinding::Wrap(aCx, this, aGivenProto); + return MenuBoxObject_Binding::Wrap(aCx, this, aGivenProto); } void MenuBoxObject::OpenMenu(bool aOpenFlag) @@ -101,10 +101,10 @@ bool MenuBoxObject::HandleKeyPress(KeyboardEvent& keyEvent) uint32_t keyCode = keyEvent.KeyCode(); switch (keyCode) { - case KeyboardEventBinding::DOM_VK_UP: - case KeyboardEventBinding::DOM_VK_DOWN: - case KeyboardEventBinding::DOM_VK_HOME: - case KeyboardEventBinding::DOM_VK_END: + case KeyboardEvent_Binding::DOM_VK_UP: + case KeyboardEvent_Binding::DOM_VK_DOWN: + case KeyboardEvent_Binding::DOM_VK_HOME: + case KeyboardEvent_Binding::DOM_VK_END: { nsNavigationDirection theDirection; theDirection = NS_DIRECTION_FROM_KEY_CODE(popupFrame, keyCode); diff --git a/layout/xul/ScrollBoxObject.cpp b/layout/xul/ScrollBoxObject.cpp index 82a6ead7c4b7..80717c9e1dc3 100644 --- a/layout/xul/ScrollBoxObject.cpp +++ b/layout/xul/ScrollBoxObject.cpp @@ -28,7 +28,7 @@ ScrollBoxObject::~ScrollBoxObject() JSObject* ScrollBoxObject::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return ScrollBoxObjectBinding::Wrap(aCx, this, aGivenProto); + return ScrollBoxObject_Binding::Wrap(aCx, this, aGivenProto); } nsIScrollableFrame* ScrollBoxObject::GetScrollFrame() diff --git a/layout/xul/nsButtonBoxFrame.cpp b/layout/xul/nsButtonBoxFrame.cpp index fd27bc3f82b8..b05acbfbe44e 100644 --- a/layout/xul/nsButtonBoxFrame.cpp +++ b/layout/xul/nsButtonBoxFrame.cpp @@ -217,5 +217,5 @@ nsButtonBoxFrame::MouseClicked(WidgetGUIEvent* aEvent) inputEvent->IsAlt(), inputEvent->IsShift(), inputEvent->IsMeta(), mouseEvent ? mouseEvent->inputSource - : MouseEventBinding::MOZ_SOURCE_UNKNOWN); + : MouseEvent_Binding::MOZ_SOURCE_UNKNOWN); } diff --git a/layout/xul/nsMenuBarListener.cpp b/layout/xul/nsMenuBarListener.cpp index 7d50b750602f..de1635eca71a 100644 --- a/layout/xul/nsMenuBarListener.cpp +++ b/layout/xul/nsMenuBarListener.cpp @@ -149,26 +149,26 @@ void nsMenuBarListener::InitAccessKey() mAccessKey = 0; mAccessKeyMask = 0; #else - mAccessKey = dom::KeyboardEventBinding::DOM_VK_ALT; + mAccessKey = dom::KeyboardEvent_Binding::DOM_VK_ALT; mAccessKeyMask = MODIFIER_ALT; #endif // Get the menu access key value from prefs, overriding the default: mAccessKey = Preferences::GetInt("ui.key.menuAccessKey", mAccessKey); switch (mAccessKey) { - case dom::KeyboardEventBinding::DOM_VK_SHIFT: + case dom::KeyboardEvent_Binding::DOM_VK_SHIFT: mAccessKeyMask = MODIFIER_SHIFT; break; - case dom::KeyboardEventBinding::DOM_VK_CONTROL: + case dom::KeyboardEvent_Binding::DOM_VK_CONTROL: mAccessKeyMask = MODIFIER_CONTROL; break; - case dom::KeyboardEventBinding::DOM_VK_ALT: + case dom::KeyboardEvent_Binding::DOM_VK_ALT: mAccessKeyMask = MODIFIER_ALT; break; - case dom::KeyboardEventBinding::DOM_VK_META: + case dom::KeyboardEvent_Binding::DOM_VK_META: mAccessKeyMask = MODIFIER_META; break; - case dom::KeyboardEventBinding::DOM_VK_WIN: + case dom::KeyboardEvent_Binding::DOM_VK_WIN: mAccessKeyMask = MODIFIER_OS; break; default: @@ -435,7 +435,7 @@ nsMenuBarListener::KeyDown(Event* aKeyEvent) uint32_t theChar = keyEvent->KeyCode(); uint16_t eventPhase = keyEvent->EventPhase(); - bool capturing = (eventPhase == dom::EventBinding::CAPTURING_PHASE); + bool capturing = (eventPhase == dom::Event_Binding::CAPTURING_PHASE); #ifndef XP_MACOSX if (capturing && !mAccessKeyDown && theChar == NS_VK_F10 && @@ -529,7 +529,7 @@ nsMenuBarListener::MouseDown(Event* aMouseEvent) } // Don't do anything at capturing phase, any behavior should be cancelable. - if (aMouseEvent->EventPhase() == dom::EventBinding::CAPTURING_PHASE) { + if (aMouseEvent->EventPhase() == dom::Event_Binding::CAPTURING_PHASE) { return NS_OK; } diff --git a/layout/xul/nsMenuPopupFrame.cpp b/layout/xul/nsMenuPopupFrame.cpp index 192356b4351c..ce090f244937 100644 --- a/layout/xul/nsMenuPopupFrame.cpp +++ b/layout/xul/nsMenuPopupFrame.cpp @@ -2055,7 +2055,7 @@ nsMenuPopupFrame::FindMenuWithShortcut(KeyboardEvent* aKeyEvent, bool& doAction) DOMTimeStamp keyTime = aKeyEvent->TimeStamp(); if (charCode == 0) { - if (keyCode == dom::KeyboardEventBinding::DOM_VK_BACK_SPACE) { + if (keyCode == dom::KeyboardEvent_Binding::DOM_VK_BACK_SPACE) { if (!isMenu && !mIncrementalString.IsEmpty()) { mIncrementalString.SetLength(mIncrementalString.Length() - 1); return nullptr; diff --git a/layout/xul/nsScrollbarFrame.cpp b/layout/xul/nsScrollbarFrame.cpp index b78e945720c5..8819ddbd4d54 100644 --- a/layout/xul/nsScrollbarFrame.cpp +++ b/layout/xul/nsScrollbarFrame.cpp @@ -283,7 +283,7 @@ nsScrollbarFrame::MoveToNewPosition() content->SetAttr(kNameSpaceID_None, nsGkAtoms::curpos, curposStr, false); // notify the nsScrollbarFrame of the change AttributeChanged(kNameSpaceID_None, nsGkAtoms::curpos, - dom::MutationEventBinding::MODIFICATION); + dom::MutationEvent_Binding::MODIFICATION); if (!weakFrame.IsAlive()) { return curpos; } @@ -296,7 +296,7 @@ nsScrollbarFrame::MoveToNewPosition() nsSliderFrame* sliderFrame = do_QueryFrame(f); if (sliderFrame) { sliderFrame->AttributeChanged(kNameSpaceID_None, nsGkAtoms::curpos, - dom::MutationEventBinding::MODIFICATION); + dom::MutationEvent_Binding::MODIFICATION); if (!weakFrame.IsAlive()) { return curpos; } diff --git a/layout/xul/nsXULPopupManager.cpp b/layout/xul/nsXULPopupManager.cpp index ff71c7aeaf12..944eba133869 100644 --- a/layout/xul/nsXULPopupManager.cpp +++ b/layout/xul/nsXULPopupManager.cpp @@ -47,34 +47,34 @@ using namespace mozilla; using namespace mozilla::dom; -static_assert(KeyboardEventBinding::DOM_VK_HOME == - KeyboardEventBinding::DOM_VK_END + 1 && - KeyboardEventBinding::DOM_VK_LEFT == - KeyboardEventBinding::DOM_VK_END + 2 && - KeyboardEventBinding::DOM_VK_UP == - KeyboardEventBinding::DOM_VK_END + 3 && - KeyboardEventBinding::DOM_VK_RIGHT == - KeyboardEventBinding::DOM_VK_END + 4 && - KeyboardEventBinding::DOM_VK_DOWN == - KeyboardEventBinding::DOM_VK_END + 5, +static_assert(KeyboardEvent_Binding::DOM_VK_HOME == + KeyboardEvent_Binding::DOM_VK_END + 1 && + KeyboardEvent_Binding::DOM_VK_LEFT == + KeyboardEvent_Binding::DOM_VK_END + 2 && + KeyboardEvent_Binding::DOM_VK_UP == + KeyboardEvent_Binding::DOM_VK_END + 3 && + KeyboardEvent_Binding::DOM_VK_RIGHT == + KeyboardEvent_Binding::DOM_VK_END + 4 && + KeyboardEvent_Binding::DOM_VK_DOWN == + KeyboardEvent_Binding::DOM_VK_END + 5, "nsXULPopupManager assumes some keyCode values are consecutive"); const nsNavigationDirection DirectionFromKeyCodeTable[2][6] = { { - eNavigationDirection_Last, // KeyboardEventBinding::DOM_VK_END - eNavigationDirection_First, // KeyboardEventBinding::DOM_VK_HOME - eNavigationDirection_Start, // KeyboardEventBinding::DOM_VK_LEFT - eNavigationDirection_Before, // KeyboardEventBinding::DOM_VK_UP - eNavigationDirection_End, // KeyboardEventBinding::DOM_VK_RIGHT - eNavigationDirection_After // KeyboardEventBinding::DOM_VK_DOWN + eNavigationDirection_Last, // KeyboardEvent_Binding::DOM_VK_END + eNavigationDirection_First, // KeyboardEvent_Binding::DOM_VK_HOME + eNavigationDirection_Start, // KeyboardEvent_Binding::DOM_VK_LEFT + eNavigationDirection_Before, // KeyboardEvent_Binding::DOM_VK_UP + eNavigationDirection_End, // KeyboardEvent_Binding::DOM_VK_RIGHT + eNavigationDirection_After // KeyboardEvent_Binding::DOM_VK_DOWN }, { - eNavigationDirection_Last, // KeyboardEventBinding::DOM_VK_END - eNavigationDirection_First, // KeyboardEventBinding::DOM_VK_HOME - eNavigationDirection_End, // KeyboardEventBinding::DOM_VK_LEFT - eNavigationDirection_Before, // KeyboardEventBinding::DOM_VK_UP - eNavigationDirection_Start, // KeyboardEventBinding::DOM_VK_RIGHT - eNavigationDirection_After // KeyboardEventBinding::DOM_VK_DOWN + eNavigationDirection_Last, // KeyboardEvent_Binding::DOM_VK_END + eNavigationDirection_First, // KeyboardEvent_Binding::DOM_VK_HOME + eNavigationDirection_End, // KeyboardEvent_Binding::DOM_VK_LEFT + eNavigationDirection_Before, // KeyboardEvent_Binding::DOM_VK_UP + eNavigationDirection_Start, // KeyboardEvent_Binding::DOM_VK_RIGHT + eNavigationDirection_After // KeyboardEvent_Binding::DOM_VK_DOWN } }; @@ -2162,8 +2162,8 @@ nsXULPopupManager::HandleKeyboardNavigation(uint32_t aKeyCode) return false; nsNavigationDirection theDirection; - NS_ASSERTION(aKeyCode >= KeyboardEventBinding::DOM_VK_END && - aKeyCode <= KeyboardEventBinding::DOM_VK_DOWN, "Illegal key code"); + NS_ASSERTION(aKeyCode >= KeyboardEvent_Binding::DOM_VK_END && + aKeyCode <= KeyboardEvent_Binding::DOM_VK_DOWN, "Illegal key code"); theDirection = NS_DIRECTION_FROM_KEY_CODE(itemFrame, aKeyCode); bool selectFirstItem = true; @@ -2312,7 +2312,7 @@ nsXULPopupManager::HandleKeyboardEventWithKeyCode( // Escape should close panels, but the other keys should have no effect. if (aTopVisibleMenuItem && aTopVisibleMenuItem->PopupType() != ePopupTypeMenu) { - if (keyCode == KeyboardEventBinding::DOM_VK_ESCAPE) { + if (keyCode == KeyboardEvent_Binding::DOM_VK_ESCAPE) { HidePopup(aTopVisibleMenuItem->Content(), false, false, false, true); aKeyEvent->StopPropagation(); aKeyEvent->StopCrossProcessForwarding(); @@ -2323,8 +2323,8 @@ nsXULPopupManager::HandleKeyboardEventWithKeyCode( bool consume = (aTopVisibleMenuItem || mActiveMenuBar); switch (keyCode) { - case KeyboardEventBinding::DOM_VK_UP: - case KeyboardEventBinding::DOM_VK_DOWN: + case KeyboardEvent_Binding::DOM_VK_UP: + case KeyboardEvent_Binding::DOM_VK_DOWN: #ifndef XP_MACOSX // roll up the popup when alt+up/down are pressed within a menulist. if (aKeyEvent->AltKey() && @@ -2336,22 +2336,22 @@ nsXULPopupManager::HandleKeyboardEventWithKeyCode( MOZ_FALLTHROUGH; #endif - case KeyboardEventBinding::DOM_VK_LEFT: - case KeyboardEventBinding::DOM_VK_RIGHT: - case KeyboardEventBinding::DOM_VK_HOME: - case KeyboardEventBinding::DOM_VK_END: + case KeyboardEvent_Binding::DOM_VK_LEFT: + case KeyboardEvent_Binding::DOM_VK_RIGHT: + case KeyboardEvent_Binding::DOM_VK_HOME: + case KeyboardEvent_Binding::DOM_VK_END: HandleKeyboardNavigation(keyCode); break; - case KeyboardEventBinding::DOM_VK_PAGE_DOWN: - case KeyboardEventBinding::DOM_VK_PAGE_UP: + case KeyboardEvent_Binding::DOM_VK_PAGE_DOWN: + case KeyboardEvent_Binding::DOM_VK_PAGE_UP: if (aTopVisibleMenuItem) { aTopVisibleMenuItem->Frame()->ChangeByPage( - keyCode == KeyboardEventBinding::DOM_VK_PAGE_UP); + keyCode == KeyboardEvent_Binding::DOM_VK_PAGE_UP); } break; - case KeyboardEventBinding::DOM_VK_ESCAPE: + case KeyboardEvent_Binding::DOM_VK_ESCAPE: // Pressing Escape hides one level of menus only. If no menu is open, // check if a menubar is active and inform it that a menu closed. Even // though in this latter case, a menu didn't actually close, the effect @@ -2363,9 +2363,9 @@ nsXULPopupManager::HandleKeyboardEventWithKeyCode( } break; - case KeyboardEventBinding::DOM_VK_TAB: + case KeyboardEvent_Binding::DOM_VK_TAB: #ifndef XP_MACOSX - case KeyboardEventBinding::DOM_VK_F10: + case KeyboardEvent_Binding::DOM_VK_F10: #endif if (aTopVisibleMenuItem && !aTopVisibleMenuItem->Frame()->GetContent()->AsElement()->AttrValueIs( @@ -2381,7 +2381,7 @@ nsXULPopupManager::HandleKeyboardEventWithKeyCode( // Intentional fall-through to RETURN case MOZ_FALLTHROUGH; - case KeyboardEventBinding::DOM_VK_RETURN: { + case KeyboardEvent_Binding::DOM_VK_RETURN: { // If there is a popup open, check if the current item needs to be opened. // Otherwise, tell the active menubar, if any, to activate the menu. The // Enter method will return a menu if one needs to be opened as a result. @@ -2675,13 +2675,13 @@ nsXULPopupManager::KeyDown(KeyboardEvent* aKeyEvent) uint32_t theChar = aKeyEvent->KeyCode(); if (theChar == (uint32_t)menuAccessKey) { - bool ctrl = (menuAccessKey != KeyboardEventBinding::DOM_VK_CONTROL && + bool ctrl = (menuAccessKey != KeyboardEvent_Binding::DOM_VK_CONTROL && aKeyEvent->CtrlKey()); - bool alt = (menuAccessKey != KeyboardEventBinding::DOM_VK_ALT && + bool alt = (menuAccessKey != KeyboardEvent_Binding::DOM_VK_ALT && aKeyEvent->AltKey()); - bool shift = (menuAccessKey != KeyboardEventBinding::DOM_VK_SHIFT && + bool shift = (menuAccessKey != KeyboardEvent_Binding::DOM_VK_SHIFT && aKeyEvent->ShiftKey()); - bool meta = (menuAccessKey != KeyboardEventBinding::DOM_VK_META && + bool meta = (menuAccessKey != KeyboardEvent_Binding::DOM_VK_META && aKeyEvent->MetaKey()); if (!(ctrl || alt || shift || meta)) { // The access key just went down and no other diff --git a/layout/xul/nsXULPopupManager.h b/layout/xul/nsXULPopupManager.h index b5ccc8326efc..4f1e5ba3bbc2 100644 --- a/layout/xul/nsXULPopupManager.h +++ b/layout/xul/nsXULPopupManager.h @@ -131,7 +131,7 @@ extern const nsNavigationDirection DirectionFromKeyCodeTable[2][6]; #define NS_DIRECTION_FROM_KEY_CODE(frame, keycode) \ (DirectionFromKeyCodeTable[frame->StyleVisibility()->mDirection] \ - [keycode - mozilla::dom::KeyboardEventBinding::DOM_VK_END]) + [keycode - mozilla::dom::KeyboardEvent_Binding::DOM_VK_END]) // nsMenuChainItem holds info about an open popup. Items are stored in a // doubly linked list. Note that the linked list is stored beginning from diff --git a/layout/xul/nsXULTooltipListener.cpp b/layout/xul/nsXULTooltipListener.cpp index 2e4c9ecb362a..0ec66c84f4f2 100644 --- a/layout/xul/nsXULTooltipListener.cpp +++ b/layout/xul/nsXULTooltipListener.cpp @@ -372,7 +372,7 @@ nsXULTooltipListener::CheckTreeBodyMove(MouseEvent* aMouseEvent) colType = col->Type(); } if (row >= 0 && obj.EqualsLiteral("text") && - colType != TreeColumnBinding::TYPE_PASSWORD) { + colType != TreeColumn_Binding::TYPE_PASSWORD) { obx->IsCellCropped(row, col, &mNeedTitletip); } diff --git a/layout/xul/tree/TreeBoxObject.cpp b/layout/xul/tree/TreeBoxObject.cpp index 5c44ebea436e..63226e95706d 100644 --- a/layout/xul/tree/TreeBoxObject.cpp +++ b/layout/xul/tree/TreeBoxObject.cpp @@ -618,7 +618,7 @@ TreeBoxObject::ClearCachedValues() JSObject* TreeBoxObject::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return TreeBoxObjectBinding::Wrap(aCx, this, aGivenProto); + return TreeBoxObject_Binding::Wrap(aCx, this, aGivenProto); } } // namespace dom diff --git a/layout/xul/tree/nsTreeBodyFrame.cpp b/layout/xul/tree/nsTreeBodyFrame.cpp index 9c642085af90..8b515839bc22 100644 --- a/layout/xul/tree/nsTreeBodyFrame.cpp +++ b/layout/xul/tree/nsTreeBodyFrame.cpp @@ -1975,7 +1975,7 @@ nsTreeBodyFrame::PrefillPropertyArray(int32_t aRowIndex, nsTreeColumn* aCol) if (aCol->IsPrimary()) mScratchArray.AppendElement(nsGkAtoms::primary); - if (aCol->GetType() == TreeColumnBinding::TYPE_CHECKBOX) { + if (aCol->GetType() == TreeColumn_Binding::TYPE_CHECKBOX) { mScratchArray.AppendElement(nsGkAtoms::checkbox); if (aRowIndex != -1) { @@ -3347,12 +3347,12 @@ nsTreeBodyFrame::PaintCell(int32_t aRowIndex, nsRect dirtyRect; if (dirtyRect.IntersectRect(aDirtyRect, elementRect)) { switch (aColumn->GetType()) { - case TreeColumnBinding::TYPE_TEXT: - case TreeColumnBinding::TYPE_PASSWORD: + case TreeColumn_Binding::TYPE_TEXT: + case TreeColumn_Binding::TYPE_PASSWORD: result &= PaintText(aRowIndex, aColumn, elementRect, aPresContext, aRenderingContext, aDirtyRect, currX); break; - case TreeColumnBinding::TYPE_CHECKBOX: + case TreeColumn_Binding::TYPE_CHECKBOX: result &= PaintCheckbox(aRowIndex, aColumn, elementRect, aPresContext, aRenderingContext, aDirtyRect); break; @@ -3665,7 +3665,7 @@ nsTreeBodyFrame::PaintText(int32_t aRowIndex, nsAutoString text; mView->GetCellText(aRowIndex, aColumn, text); - if (aColumn->Type() == TreeColumnBinding::TYPE_PASSWORD) { + if (aColumn->Type() == TreeColumn_Binding::TYPE_PASSWORD) { TextEditRules::FillBufWithPWChars(&text, text.Length()); } diff --git a/layout/xul/tree/nsTreeColumns.cpp b/layout/xul/tree/nsTreeColumns.cpp index 882dc8b14dc6..bbdcf323ad8b 100644 --- a/layout/xul/tree/nsTreeColumns.cpp +++ b/layout/xul/tree/nsTreeColumns.cpp @@ -211,7 +211,7 @@ nsTreeColumn::Invalidate(ErrorResult& aRv) nsGkAtoms::_true, eCaseMatters); // Figure out our column type. Default type is text. - mType = TreeColumnBinding::TYPE_TEXT; + mType = TreeColumn_Binding::TYPE_TEXT; static Element::AttrValuesArray typestrings[] = {&nsGkAtoms::checkbox, &nsGkAtoms::password, nullptr}; @@ -219,8 +219,8 @@ nsTreeColumn::Invalidate(ErrorResult& aRv) nsGkAtoms::type, typestrings, eCaseMatters)) { - case 0: mType = TreeColumnBinding::TYPE_CHECKBOX; break; - case 1: mType = TreeColumnBinding::TYPE_PASSWORD; break; + case 0: mType = TreeColumn_Binding::TYPE_CHECKBOX; break; + case 1: mType = TreeColumn_Binding::TYPE_PASSWORD; break; } // Fetch the crop style. @@ -249,7 +249,7 @@ nsTreeColumn::GetParentObject() const /* virtual */ JSObject* nsTreeColumn::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return dom::TreeColumnBinding::Wrap(aCx, this, aGivenProto); + return dom::TreeColumn_Binding::Wrap(aCx, this, aGivenProto); } Element* @@ -312,7 +312,7 @@ nsTreeColumns::GetParentObject() const /* virtual */ JSObject* nsTreeColumns::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return dom::TreeColumnsBinding::Wrap(aCx, this, aGivenProto); + return dom::TreeColumns_Binding::Wrap(aCx, this, aGivenProto); } dom::TreeBoxObject* @@ -378,7 +378,7 @@ nsTreeColumns::GetKeyColumn() continue; // Skip non-text column - if (currCol->GetType() != TreeColumnBinding::TYPE_TEXT) + if (currCol->GetType() != TreeColumn_Binding::TYPE_TEXT) continue; if (!first) diff --git a/layout/xul/tree/nsTreeContentView.cpp b/layout/xul/tree/nsTreeContentView.cpp index cfad48643e6d..fec3f886e304 100644 --- a/layout/xul/tree/nsTreeContentView.cpp +++ b/layout/xul/tree/nsTreeContentView.cpp @@ -127,7 +127,7 @@ JSObject* nsTreeContentView::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return TreeContentViewBinding::Wrap(aCx, this, aGivenProto); + return TreeContentView_Binding::Wrap(aCx, this, aGivenProto); } nsISupports* diff --git a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp index 40742b3f97e0..9eaae715275d 100644 --- a/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp +++ b/media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.cpp @@ -271,7 +271,7 @@ PeerConnectionImpl::WrapObject(JSContext* aCx, JS::Handle aGivenProto, JS::MutableHandle aReflector) { - return PeerConnectionImplBinding::Wrap(aCx, this, aGivenProto, aReflector); + return PeerConnectionImpl_Binding::Wrap(aCx, this, aGivenProto, aReflector); } bool PCUuidGenerator::Generate(std::string* idp) { diff --git a/media/webrtc/signaling/src/peerconnection/TransceiverImpl.cpp b/media/webrtc/signaling/src/peerconnection/TransceiverImpl.cpp index 90e7d42880d0..a08d9486b3a2 100644 --- a/media/webrtc/signaling/src/peerconnection/TransceiverImpl.cpp +++ b/media/webrtc/signaling/src/peerconnection/TransceiverImpl.cpp @@ -609,7 +609,7 @@ bool TransceiverImpl::WrapObject(JSContext* aCx, JS::Handle aGivenProto, JS::MutableHandle aReflector) { - return dom::TransceiverImplBinding::Wrap(aCx, this, aGivenProto, aReflector); + return dom::TransceiverImpl_Binding::Wrap(aCx, this, aGivenProto, aReflector); } already_AddRefed diff --git a/storage/mozStorageAsyncStatementParams.cpp b/storage/mozStorageAsyncStatementParams.cpp index 692324eeafed..2cc0463fbb07 100644 --- a/storage/mozStorageAsyncStatementParams.cpp +++ b/storage/mozStorageAsyncStatementParams.cpp @@ -40,7 +40,7 @@ AsyncStatementParams::AsyncStatementParams(nsPIDOMWindowInner* aWindow, AsyncSta JSObject* AsyncStatementParams::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return dom::MozStorageAsyncStatementParamsBinding::Wrap(aCx, this, aGivenProto); + return dom::MozStorageAsyncStatementParams_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/storage/mozStorageStatementParams.cpp b/storage/mozStorageStatementParams.cpp index a4718e35aa68..adfb175a47c7 100644 --- a/storage/mozStorageStatementParams.cpp +++ b/storage/mozStorageStatementParams.cpp @@ -42,7 +42,7 @@ StatementParams::StatementParams(nsPIDOMWindowInner* aWindow, Statement *aStatem JSObject* StatementParams::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return dom::MozStorageStatementParamsBinding::Wrap(aCx, this, aGivenProto); + return dom::MozStorageStatementParams_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/storage/mozStorageStatementRow.cpp b/storage/mozStorageStatementRow.cpp index 3ff752b4e7b8..9309c0bebe43 100644 --- a/storage/mozStorageStatementRow.cpp +++ b/storage/mozStorageStatementRow.cpp @@ -41,7 +41,7 @@ StatementRow::StatementRow(nsPIDOMWindowInner* aWindow, Statement *aStatement) JSObject* StatementRow::WrapObject(JSContext* aCx, JS::Handle aGivenProto) { - return dom::MozStorageStatementRowBinding::Wrap(aCx, this, aGivenProto); + return dom::MozStorageStatementRow_Binding::Wrap(aCx, this, aGivenProto); } void diff --git a/toolkit/components/autocomplete/nsAutoCompleteController.cpp b/toolkit/components/autocomplete/nsAutoCompleteController.cpp index 3651ff5886e6..4e97a1b19f17 100644 --- a/toolkit/components/autocomplete/nsAutoCompleteController.cpp +++ b/toolkit/components/autocomplete/nsAutoCompleteController.cpp @@ -285,7 +285,7 @@ nsAutoCompleteController::HandleText(bool *_retval) // we should reopen it forcibly even if the value is empty. if (popupClosedByCompositionStart && handlingCompositionCommit) { bool cancel; - HandleKeyNavigation(dom::KeyboardEventBinding::DOM_VK_DOWN, &cancel); + HandleKeyNavigation(dom::KeyboardEvent_Binding::DOM_VK_DOWN, &cancel); return NS_OK; } ClosePopup(); @@ -435,10 +435,10 @@ nsAutoCompleteController::HandleKeyNavigation(uint32_t aKey, bool *_retval) input->GetDisableAutoComplete(&disabled); NS_ENSURE_TRUE(!disabled, NS_OK); - if (aKey == dom::KeyboardEventBinding::DOM_VK_UP || - aKey == dom::KeyboardEventBinding::DOM_VK_DOWN || - aKey == dom::KeyboardEventBinding::DOM_VK_PAGE_UP || - aKey == dom::KeyboardEventBinding::DOM_VK_PAGE_DOWN) + if (aKey == dom::KeyboardEvent_Binding::DOM_VK_UP || + aKey == dom::KeyboardEvent_Binding::DOM_VK_DOWN || + aKey == dom::KeyboardEvent_Binding::DOM_VK_PAGE_UP || + aKey == dom::KeyboardEvent_Binding::DOM_VK_PAGE_DOWN) { // Prevent the input from handling up/down events, as it may move // the cursor to home/end on some systems @@ -447,10 +447,10 @@ nsAutoCompleteController::HandleKeyNavigation(uint32_t aKey, bool *_retval) bool isOpen = false; input->GetPopupOpen(&isOpen); if (isOpen) { - bool reverse = aKey == dom::KeyboardEventBinding::DOM_VK_UP || - aKey == dom::KeyboardEventBinding::DOM_VK_PAGE_UP ? true : false; - bool page = aKey == dom::KeyboardEventBinding::DOM_VK_PAGE_UP || - aKey == dom::KeyboardEventBinding::DOM_VK_PAGE_DOWN ? true : false; + bool reverse = aKey == dom::KeyboardEvent_Binding::DOM_VK_UP || + aKey == dom::KeyboardEvent_Binding::DOM_VK_PAGE_UP ? true : false; + bool page = aKey == dom::KeyboardEvent_Binding::DOM_VK_PAGE_UP || + aKey == dom::KeyboardEvent_Binding::DOM_VK_PAGE_DOWN ? true : false; // Fill in the value of the textbox with whatever is selected in the popup // if the completeSelectedIndex attribute is set. We check this before @@ -508,13 +508,13 @@ nsAutoCompleteController::HandleKeyNavigation(uint32_t aKey, bool *_retval) // shortcuts for up and down move to the beginning and end of the field // otherwise. int32_t start, end; - if (aKey == dom::KeyboardEventBinding::DOM_VK_UP) { + if (aKey == dom::KeyboardEvent_Binding::DOM_VK_UP) { input->GetSelectionStart(&start); input->GetSelectionEnd(&end); if (start > 0 || start != end) *_retval = false; } - else if (aKey == dom::KeyboardEventBinding::DOM_VK_DOWN) { + else if (aKey == dom::KeyboardEvent_Binding::DOM_VK_DOWN) { nsAutoString text; input->GetTextValue(text); input->GetSelectionStart(&start); @@ -554,10 +554,10 @@ nsAutoCompleteController::HandleKeyNavigation(uint32_t aKey, bool *_retval) } } } - } else if ( aKey == dom::KeyboardEventBinding::DOM_VK_LEFT - || aKey == dom::KeyboardEventBinding::DOM_VK_RIGHT + } else if ( aKey == dom::KeyboardEvent_Binding::DOM_VK_LEFT + || aKey == dom::KeyboardEvent_Binding::DOM_VK_RIGHT #ifndef XP_MACOSX - || aKey == dom::KeyboardEventBinding::DOM_VK_HOME + || aKey == dom::KeyboardEvent_Binding::DOM_VK_HOME #endif ) { diff --git a/toolkit/components/extensions/MatchPattern.cpp b/toolkit/components/extensions/MatchPattern.cpp index 467406efd3c1..c234429ac66b 100644 --- a/toolkit/components/extensions/MatchPattern.cpp +++ b/toolkit/components/extensions/MatchPattern.cpp @@ -504,7 +504,7 @@ MatchPattern::Overlaps(const MatchPattern& aPattern) const JSObject* MatchPattern::WrapObject(JSContext* aCx, JS::HandleObject aGivenProto) { - return MatchPatternBinding::Wrap(aCx, this, aGivenProto); + return MatchPattern_Binding::Wrap(aCx, this, aGivenProto); } /* static */ bool @@ -641,7 +641,7 @@ MatchPatternSet::OverlapsAll(const MatchPatternSet& aPatternSet) const JSObject* MatchPatternSet::WrapObject(JSContext* aCx, JS::HandleObject aGivenProto) { - return MatchPatternSetBinding::Wrap(aCx, this, aGivenProto); + return MatchPatternSet_Binding::Wrap(aCx, this, aGivenProto); } @@ -767,7 +767,7 @@ MatchGlob::Matches(const nsAString& aString) const JSObject* MatchGlob::WrapObject(JSContext* aCx, JS::HandleObject aGivenProto) { - return MatchGlobBinding::Wrap(aCx, this, aGivenProto); + return MatchGlob_Binding::Wrap(aCx, this, aGivenProto); } diff --git a/toolkit/components/extensions/WebExtensionPolicy.cpp b/toolkit/components/extensions/WebExtensionPolicy.cpp index 30d13c820d9c..7a26035e6c1d 100644 --- a/toolkit/components/extensions/WebExtensionPolicy.cpp +++ b/toolkit/components/extensions/WebExtensionPolicy.cpp @@ -242,7 +242,7 @@ WebExtensionPolicy::RegisterContentScript(WebExtensionContentScript& script, return; } - WebExtensionPolicyBinding::ClearCachedContentScriptsValue(this); + WebExtensionPolicy_Binding::ClearCachedContentScriptsValue(this); } void @@ -254,7 +254,7 @@ WebExtensionPolicy::UnregisterContentScript(const WebExtensionContentScript& scr return; } - WebExtensionPolicyBinding::ClearCachedContentScriptsValue(this); + WebExtensionPolicy_Binding::ClearCachedContentScriptsValue(this); } /* static */ bool @@ -402,7 +402,7 @@ WebExtensionPolicy::Localize(const nsAString& aInput, nsString& aOutput) const JSObject* WebExtensionPolicy::WrapObject(JSContext* aCx, JS::HandleObject aGivenProto) { - return WebExtensionPolicyBinding::Wrap(aCx, this, aGivenProto); + return WebExtensionPolicy_Binding::Wrap(aCx, this, aGivenProto); } void @@ -537,7 +537,7 @@ WebExtensionContentScript::MatchesURI(const URLInfo& aURL) const JSObject* WebExtensionContentScript::WrapObject(JSContext* aCx, JS::HandleObject aGivenProto) { - return WebExtensionContentScriptBinding::Wrap(aCx, this, aGivenProto); + return WebExtensionContentScript_Binding::Wrap(aCx, this, aGivenProto); } diff --git a/toolkit/components/extensions/webrequest/ChannelWrapper.cpp b/toolkit/components/extensions/webrequest/ChannelWrapper.cpp index d408856b25e4..6b8905d1dbd6 100644 --- a/toolkit/components/extensions/webrequest/ChannelWrapper.cpp +++ b/toolkit/components/extensions/webrequest/ChannelWrapper.cpp @@ -102,20 +102,20 @@ ChannelWrapper::SetChannel(nsIChannel* aChannel) { detail::ChannelHolder::SetChannel(aChannel); ClearCachedAttributes(); - ChannelWrapperBinding::ClearCachedFinalURIValue(this); - ChannelWrapperBinding::ClearCachedFinalURLValue(this); + ChannelWrapper_Binding::ClearCachedFinalURIValue(this); + ChannelWrapper_Binding::ClearCachedFinalURLValue(this); mFinalURLInfo.reset(); - ChannelWrapperBinding::ClearCachedProxyInfoValue(this); + ChannelWrapper_Binding::ClearCachedProxyInfoValue(this); } void ChannelWrapper::ClearCachedAttributes() { - ChannelWrapperBinding::ClearCachedRemoteAddressValue(this); - ChannelWrapperBinding::ClearCachedStatusCodeValue(this); - ChannelWrapperBinding::ClearCachedStatusLineValue(this); + ChannelWrapper_Binding::ClearCachedRemoteAddressValue(this); + ChannelWrapper_Binding::ClearCachedStatusCodeValue(this); + ChannelWrapper_Binding::ClearCachedStatusLineValue(this); if (!mFiredErrorEvent) { - ChannelWrapperBinding::ClearCachedErrorStringValue(this); + ChannelWrapper_Binding::ClearCachedErrorStringValue(this); } } @@ -915,7 +915,7 @@ ChannelWrapper::ErrorCheck() if (error.Length()) { mChannelEntry = nullptr; mFiredErrorEvent = true; - ChannelWrapperBinding::ClearCachedErrorStringValue(this); + ChannelWrapper_Binding::ClearCachedErrorStringValue(this); FireEvent(NS_LITERAL_STRING("error")); } } @@ -1042,7 +1042,7 @@ ChannelWrapper::EventListenerRemoved(nsAtom* aType) JSObject* ChannelWrapper::WrapObject(JSContext* aCx, HandleObject aGivenProto) { - return ChannelWrapperBinding::Wrap(aCx, this, aGivenProto); + return ChannelWrapper_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_CYCLE_COLLECTION_CLASS(ChannelWrapper) diff --git a/toolkit/components/extensions/webrequest/StreamFilter.cpp b/toolkit/components/extensions/webrequest/StreamFilter.cpp index 8c92681d83ed..c16e60820db8 100644 --- a/toolkit/components/extensions/webrequest/StreamFilter.cpp +++ b/toolkit/components/extensions/webrequest/StreamFilter.cpp @@ -295,7 +295,7 @@ StreamFilter::IsAllowedInContext(JSContext* aCx, JSObject* /* unused */) JSObject* StreamFilter::WrapObject(JSContext* aCx, HandleObject aGivenProto) { - return StreamFilterBinding::Wrap(aCx, this, aGivenProto); + return StreamFilter_Binding::Wrap(aCx, this, aGivenProto); } NS_IMPL_CYCLE_COLLECTION_CLASS(StreamFilter) diff --git a/toolkit/components/extensions/webrequest/StreamFilterEvents.cpp b/toolkit/components/extensions/webrequest/StreamFilterEvents.cpp index 1c1f07c88674..7fb082de35f3 100644 --- a/toolkit/components/extensions/webrequest/StreamFilterEvents.cpp +++ b/toolkit/components/extensions/webrequest/StreamFilterEvents.cpp @@ -49,7 +49,7 @@ StreamFilterDataEvent::Constructor(EventTarget* aEventTarget, JSObject* StreamFilterDataEvent::WrapObjectInternal(JSContext* aCx, JS::Handle aGivenProto) { - return StreamFilterDataEventBinding::Wrap(aCx, this, aGivenProto); + return StreamFilterDataEvent_Binding::Wrap(aCx, this, aGivenProto); } } // namespace extensions diff --git a/toolkit/components/resistfingerprinting/KeyCodeConsensus_En_US.h b/toolkit/components/resistfingerprinting/KeyCodeConsensus_En_US.h index f6cfc335e6ff..a899d14c8f31 100644 --- a/toolkit/components/resistfingerprinting/KeyCodeConsensus_En_US.h +++ b/toolkit/components/resistfingerprinting/KeyCodeConsensus_En_US.h @@ -33,140 +33,140 @@ * Spoofed keycodes for English content (US English keyboard layout). */ -CONTROL(Alt, AltLeft, dom::KeyboardEventBinding::DOM_VK_ALT) -CONTROL(ArrowDown, ArrowDown, dom::KeyboardEventBinding::DOM_VK_DOWN) -CONTROL(ArrowLeft, ArrowLeft, dom::KeyboardEventBinding::DOM_VK_LEFT) -CONTROL(ArrowRight, ArrowRight, dom::KeyboardEventBinding::DOM_VK_RIGHT) -CONTROL(ArrowUp, ArrowUp, dom::KeyboardEventBinding::DOM_VK_UP) -CONTROL(Backspace, Backspace, dom::KeyboardEventBinding::DOM_VK_BACK_SPACE) -CONTROL(CapsLock, CapsLock, dom::KeyboardEventBinding::DOM_VK_CAPS_LOCK) +CONTROL(Alt, AltLeft, dom::KeyboardEvent_Binding::DOM_VK_ALT) +CONTROL(ArrowDown, ArrowDown, dom::KeyboardEvent_Binding::DOM_VK_DOWN) +CONTROL(ArrowLeft, ArrowLeft, dom::KeyboardEvent_Binding::DOM_VK_LEFT) +CONTROL(ArrowRight, ArrowRight, dom::KeyboardEvent_Binding::DOM_VK_RIGHT) +CONTROL(ArrowUp, ArrowUp, dom::KeyboardEvent_Binding::DOM_VK_UP) +CONTROL(Backspace, Backspace, dom::KeyboardEvent_Binding::DOM_VK_BACK_SPACE) +CONTROL(CapsLock, CapsLock, dom::KeyboardEvent_Binding::DOM_VK_CAPS_LOCK) // Leaving "ContextMenu" key unimplemented; not every english keyboard has this. // For example, MACOS doesn't have this. -CONTROL(Control, ControlLeft, dom::KeyboardEventBinding::DOM_VK_CONTROL) -CONTROL(Delete, Delete, dom::KeyboardEventBinding::DOM_VK_DELETE) -CONTROL(End, End, dom::KeyboardEventBinding::DOM_VK_END) -CONTROL(Enter, Enter, dom::KeyboardEventBinding::DOM_VK_RETURN) -CONTROL(Escape, Escape, dom::KeyboardEventBinding::DOM_VK_ESCAPE) +CONTROL(Control, ControlLeft, dom::KeyboardEvent_Binding::DOM_VK_CONTROL) +CONTROL(Delete, Delete, dom::KeyboardEvent_Binding::DOM_VK_DELETE) +CONTROL(End, End, dom::KeyboardEvent_Binding::DOM_VK_END) +CONTROL(Enter, Enter, dom::KeyboardEvent_Binding::DOM_VK_RETURN) +CONTROL(Escape, Escape, dom::KeyboardEvent_Binding::DOM_VK_ESCAPE) // Leaving "Help" key unimplemented; it only appears in some keyboard in Linux. -CONTROL(Home, Home, dom::KeyboardEventBinding::DOM_VK_HOME) -CONTROL(Insert, Insert, dom::KeyboardEventBinding::DOM_VK_INSERT) -CONTROL(Meta, OSLeft, dom::KeyboardEventBinding::DOM_VK_WIN) -CONTROL(OS, OSLeft, dom::KeyboardEventBinding::DOM_VK_WIN) -CONTROL(PageDown, PageDown, dom::KeyboardEventBinding::DOM_VK_PAGE_DOWN) -CONTROL(PageUp, PageUp, dom::KeyboardEventBinding::DOM_VK_PAGE_UP) +CONTROL(Home, Home, dom::KeyboardEvent_Binding::DOM_VK_HOME) +CONTROL(Insert, Insert, dom::KeyboardEvent_Binding::DOM_VK_INSERT) +CONTROL(Meta, OSLeft, dom::KeyboardEvent_Binding::DOM_VK_WIN) +CONTROL(OS, OSLeft, dom::KeyboardEvent_Binding::DOM_VK_WIN) +CONTROL(PageDown, PageDown, dom::KeyboardEvent_Binding::DOM_VK_PAGE_DOWN) +CONTROL(PageUp, PageUp, dom::KeyboardEvent_Binding::DOM_VK_PAGE_UP) // Leaving "Pause", "PrintScreen" and "ScrollLock" keys unimplemented; they are // non-MACOS only. -CONTROL(Shift, ShiftLeft, dom::KeyboardEventBinding::DOM_VK_SHIFT) -CONTROL(Tab, Tab, dom::KeyboardEventBinding::DOM_VK_TAB) -CONTROL(F1, F1, dom::KeyboardEventBinding::DOM_VK_F1) -CONTROL(F2, F2, dom::KeyboardEventBinding::DOM_VK_F2) -CONTROL(F3, F3, dom::KeyboardEventBinding::DOM_VK_F3) -CONTROL(F4, F4, dom::KeyboardEventBinding::DOM_VK_F4) -CONTROL(F5, F5, dom::KeyboardEventBinding::DOM_VK_F5) -CONTROL(F6, F6, dom::KeyboardEventBinding::DOM_VK_F6) -CONTROL(F7, F7, dom::KeyboardEventBinding::DOM_VK_F7) -CONTROL(F8, F8, dom::KeyboardEventBinding::DOM_VK_F8) -CONTROL(F9, F9, dom::KeyboardEventBinding::DOM_VK_F9) -CONTROL(F10, F10, dom::KeyboardEventBinding::DOM_VK_F10) -CONTROL(F11, F11, dom::KeyboardEventBinding::DOM_VK_F11) -CONTROL(F12, F12, dom::KeyboardEventBinding::DOM_VK_F12) +CONTROL(Shift, ShiftLeft, dom::KeyboardEvent_Binding::DOM_VK_SHIFT) +CONTROL(Tab, Tab, dom::KeyboardEvent_Binding::DOM_VK_TAB) +CONTROL(F1, F1, dom::KeyboardEvent_Binding::DOM_VK_F1) +CONTROL(F2, F2, dom::KeyboardEvent_Binding::DOM_VK_F2) +CONTROL(F3, F3, dom::KeyboardEvent_Binding::DOM_VK_F3) +CONTROL(F4, F4, dom::KeyboardEvent_Binding::DOM_VK_F4) +CONTROL(F5, F5, dom::KeyboardEvent_Binding::DOM_VK_F5) +CONTROL(F6, F6, dom::KeyboardEvent_Binding::DOM_VK_F6) +CONTROL(F7, F7, dom::KeyboardEvent_Binding::DOM_VK_F7) +CONTROL(F8, F8, dom::KeyboardEvent_Binding::DOM_VK_F8) +CONTROL(F9, F9, dom::KeyboardEvent_Binding::DOM_VK_F9) +CONTROL(F10, F10, dom::KeyboardEvent_Binding::DOM_VK_F10) +CONTROL(F11, F11, dom::KeyboardEvent_Binding::DOM_VK_F11) +CONTROL(F12, F12, dom::KeyboardEvent_Binding::DOM_VK_F12) // Leaving "F13" to "F35" key unimplemented; they are some how platform dependent. // "F13" to "F19" are on MAC's full keyboard but may not exist on usual keyboard. // "F20" to "F24" are only available on Windows and Linux. // "F25" to "F35" are Linux only. // Leaving "Clear" key unimplemented; it's inconsistent between platforms. -KEY(" ", Space, dom::KeyboardEventBinding::DOM_VK_SPACE, MODIFIER_NONE) -KEY(",", Comma, dom::KeyboardEventBinding::DOM_VK_COMMA, MODIFIER_NONE) -KEY("<", Comma, dom::KeyboardEventBinding::DOM_VK_COMMA, MODIFIER_SHIFT) -KEY(".", Period, dom::KeyboardEventBinding::DOM_VK_PERIOD, MODIFIER_NONE) -KEY(">", Period, dom::KeyboardEventBinding::DOM_VK_PERIOD, MODIFIER_SHIFT) -KEY("/", Slash, dom::KeyboardEventBinding::DOM_VK_SLASH, MODIFIER_NONE) -KEY("?", Slash, dom::KeyboardEventBinding::DOM_VK_SLASH, MODIFIER_SHIFT) -KEY(";", Semicolon, dom::KeyboardEventBinding::DOM_VK_SEMICOLON, MODIFIER_NONE) -KEY(":", Semicolon, dom::KeyboardEventBinding::DOM_VK_SEMICOLON, MODIFIER_SHIFT) -KEY("'", Quote, dom::KeyboardEventBinding::DOM_VK_QUOTE, MODIFIER_NONE) -KEY("\"", Quote, dom::KeyboardEventBinding::DOM_VK_QUOTE, MODIFIER_SHIFT) -KEY("[", BracketLeft, dom::KeyboardEventBinding::DOM_VK_OPEN_BRACKET, MODIFIER_NONE) -KEY("{", BracketLeft, dom::KeyboardEventBinding::DOM_VK_OPEN_BRACKET, MODIFIER_SHIFT) -KEY("]", BracketRight, dom::KeyboardEventBinding::DOM_VK_CLOSE_BRACKET, MODIFIER_NONE) -KEY("}", BracketRight, dom::KeyboardEventBinding::DOM_VK_CLOSE_BRACKET, MODIFIER_SHIFT) -KEY("`", Backquote, dom::KeyboardEventBinding::DOM_VK_BACK_QUOTE, MODIFIER_NONE) -KEY("~", Backquote, dom::KeyboardEventBinding::DOM_VK_BACK_QUOTE, MODIFIER_SHIFT) -KEY("\\", Backslash, dom::KeyboardEventBinding::DOM_VK_BACK_SLASH, MODIFIER_NONE) -KEY("|", Backslash, dom::KeyboardEventBinding::DOM_VK_BACK_SLASH, MODIFIER_SHIFT) -KEY("-", Minus, dom::KeyboardEventBinding::DOM_VK_HYPHEN_MINUS, MODIFIER_NONE) -KEY("_", Minus, dom::KeyboardEventBinding::DOM_VK_HYPHEN_MINUS, MODIFIER_SHIFT) -KEY("=", Equal, dom::KeyboardEventBinding::DOM_VK_EQUALS, MODIFIER_NONE) -KEY("+", Equal, dom::KeyboardEventBinding::DOM_VK_EQUALS, MODIFIER_SHIFT) -KEY("A", KeyA, dom::KeyboardEventBinding::DOM_VK_A, MODIFIER_SHIFT) -KEY("B", KeyB, dom::KeyboardEventBinding::DOM_VK_B, MODIFIER_SHIFT) -KEY("C", KeyC, dom::KeyboardEventBinding::DOM_VK_C, MODIFIER_SHIFT) -KEY("D", KeyD, dom::KeyboardEventBinding::DOM_VK_D, MODIFIER_SHIFT) -KEY("E", KeyE, dom::KeyboardEventBinding::DOM_VK_E, MODIFIER_SHIFT) -KEY("F", KeyF, dom::KeyboardEventBinding::DOM_VK_F, MODIFIER_SHIFT) -KEY("G", KeyG, dom::KeyboardEventBinding::DOM_VK_G, MODIFIER_SHIFT) -KEY("H", KeyH, dom::KeyboardEventBinding::DOM_VK_H, MODIFIER_SHIFT) -KEY("I", KeyI, dom::KeyboardEventBinding::DOM_VK_I, MODIFIER_SHIFT) -KEY("J", KeyJ, dom::KeyboardEventBinding::DOM_VK_J, MODIFIER_SHIFT) -KEY("K", KeyK, dom::KeyboardEventBinding::DOM_VK_K, MODIFIER_SHIFT) -KEY("L", KeyL, dom::KeyboardEventBinding::DOM_VK_L, MODIFIER_SHIFT) -KEY("M", KeyM, dom::KeyboardEventBinding::DOM_VK_M, MODIFIER_SHIFT) -KEY("N", KeyN, dom::KeyboardEventBinding::DOM_VK_N, MODIFIER_SHIFT) -KEY("O", KeyO, dom::KeyboardEventBinding::DOM_VK_O, MODIFIER_SHIFT) -KEY("P", KeyP, dom::KeyboardEventBinding::DOM_VK_P, MODIFIER_SHIFT) -KEY("Q", KeyQ, dom::KeyboardEventBinding::DOM_VK_Q, MODIFIER_SHIFT) -KEY("R", KeyR, dom::KeyboardEventBinding::DOM_VK_R, MODIFIER_SHIFT) -KEY("S", KeyS, dom::KeyboardEventBinding::DOM_VK_S, MODIFIER_SHIFT) -KEY("T", KeyT, dom::KeyboardEventBinding::DOM_VK_T, MODIFIER_SHIFT) -KEY("U", KeyU, dom::KeyboardEventBinding::DOM_VK_U, MODIFIER_SHIFT) -KEY("V", KeyV, dom::KeyboardEventBinding::DOM_VK_V, MODIFIER_SHIFT) -KEY("W", KeyW, dom::KeyboardEventBinding::DOM_VK_W, MODIFIER_SHIFT) -KEY("X", KeyX, dom::KeyboardEventBinding::DOM_VK_X, MODIFIER_SHIFT) -KEY("Y", KeyY, dom::KeyboardEventBinding::DOM_VK_Y, MODIFIER_SHIFT) -KEY("Z", KeyZ, dom::KeyboardEventBinding::DOM_VK_Z, MODIFIER_SHIFT) -KEY("a", KeyA, dom::KeyboardEventBinding::DOM_VK_A, MODIFIER_NONE) -KEY("b", KeyB, dom::KeyboardEventBinding::DOM_VK_B, MODIFIER_NONE) -KEY("c", KeyC, dom::KeyboardEventBinding::DOM_VK_C, MODIFIER_NONE) -KEY("d", KeyD, dom::KeyboardEventBinding::DOM_VK_D, MODIFIER_NONE) -KEY("e", KeyE, dom::KeyboardEventBinding::DOM_VK_E, MODIFIER_NONE) -KEY("f", KeyF, dom::KeyboardEventBinding::DOM_VK_F, MODIFIER_NONE) -KEY("g", KeyG, dom::KeyboardEventBinding::DOM_VK_G, MODIFIER_NONE) -KEY("h", KeyH, dom::KeyboardEventBinding::DOM_VK_H, MODIFIER_NONE) -KEY("i", KeyI, dom::KeyboardEventBinding::DOM_VK_I, MODIFIER_NONE) -KEY("j", KeyJ, dom::KeyboardEventBinding::DOM_VK_J, MODIFIER_NONE) -KEY("k", KeyK, dom::KeyboardEventBinding::DOM_VK_K, MODIFIER_NONE) -KEY("l", KeyL, dom::KeyboardEventBinding::DOM_VK_L, MODIFIER_NONE) -KEY("m", KeyM, dom::KeyboardEventBinding::DOM_VK_M, MODIFIER_NONE) -KEY("n", KeyN, dom::KeyboardEventBinding::DOM_VK_N, MODIFIER_NONE) -KEY("o", KeyO, dom::KeyboardEventBinding::DOM_VK_O, MODIFIER_NONE) -KEY("p", KeyP, dom::KeyboardEventBinding::DOM_VK_P, MODIFIER_NONE) -KEY("q", KeyQ, dom::KeyboardEventBinding::DOM_VK_Q, MODIFIER_NONE) -KEY("r", KeyR, dom::KeyboardEventBinding::DOM_VK_R, MODIFIER_NONE) -KEY("s", KeyS, dom::KeyboardEventBinding::DOM_VK_S, MODIFIER_NONE) -KEY("t", KeyT, dom::KeyboardEventBinding::DOM_VK_T, MODIFIER_NONE) -KEY("u", KeyU, dom::KeyboardEventBinding::DOM_VK_U, MODIFIER_NONE) -KEY("v", KeyV, dom::KeyboardEventBinding::DOM_VK_V, MODIFIER_NONE) -KEY("w", KeyW, dom::KeyboardEventBinding::DOM_VK_W, MODIFIER_NONE) -KEY("x", KeyX, dom::KeyboardEventBinding::DOM_VK_X, MODIFIER_NONE) -KEY("y", KeyY, dom::KeyboardEventBinding::DOM_VK_Y, MODIFIER_NONE) -KEY("z", KeyZ, dom::KeyboardEventBinding::DOM_VK_Z, MODIFIER_NONE) -KEY("0", Digit0, dom::KeyboardEventBinding::DOM_VK_0, MODIFIER_NONE) -KEY("1", Digit1, dom::KeyboardEventBinding::DOM_VK_1, MODIFIER_NONE) -KEY("2", Digit2, dom::KeyboardEventBinding::DOM_VK_2, MODIFIER_NONE) -KEY("3", Digit3, dom::KeyboardEventBinding::DOM_VK_3, MODIFIER_NONE) -KEY("4", Digit4, dom::KeyboardEventBinding::DOM_VK_4, MODIFIER_NONE) -KEY("5", Digit5, dom::KeyboardEventBinding::DOM_VK_5, MODIFIER_NONE) -KEY("6", Digit6, dom::KeyboardEventBinding::DOM_VK_6, MODIFIER_NONE) -KEY("7", Digit7, dom::KeyboardEventBinding::DOM_VK_7, MODIFIER_NONE) -KEY("8", Digit8, dom::KeyboardEventBinding::DOM_VK_8, MODIFIER_NONE) -KEY("9", Digit9, dom::KeyboardEventBinding::DOM_VK_9, MODIFIER_NONE) -KEY(")", Digit0, dom::KeyboardEventBinding::DOM_VK_0, MODIFIER_SHIFT) -KEY("!", Digit1, dom::KeyboardEventBinding::DOM_VK_1, MODIFIER_SHIFT) -KEY("@", Digit2, dom::KeyboardEventBinding::DOM_VK_2, MODIFIER_SHIFT) -KEY("#", Digit3, dom::KeyboardEventBinding::DOM_VK_3, MODIFIER_SHIFT) -KEY("$", Digit4, dom::KeyboardEventBinding::DOM_VK_4, MODIFIER_SHIFT) -KEY("%", Digit5, dom::KeyboardEventBinding::DOM_VK_5, MODIFIER_SHIFT) -KEY("^", Digit6, dom::KeyboardEventBinding::DOM_VK_6, MODIFIER_SHIFT) -KEY("&", Digit7, dom::KeyboardEventBinding::DOM_VK_7, MODIFIER_SHIFT) -KEY("*", Digit8, dom::KeyboardEventBinding::DOM_VK_8, MODIFIER_SHIFT) -KEY("(", Digit9, dom::KeyboardEventBinding::DOM_VK_9, MODIFIER_SHIFT) +KEY(" ", Space, dom::KeyboardEvent_Binding::DOM_VK_SPACE, MODIFIER_NONE) +KEY(",", Comma, dom::KeyboardEvent_Binding::DOM_VK_COMMA, MODIFIER_NONE) +KEY("<", Comma, dom::KeyboardEvent_Binding::DOM_VK_COMMA, MODIFIER_SHIFT) +KEY(".", Period, dom::KeyboardEvent_Binding::DOM_VK_PERIOD, MODIFIER_NONE) +KEY(">", Period, dom::KeyboardEvent_Binding::DOM_VK_PERIOD, MODIFIER_SHIFT) +KEY("/", Slash, dom::KeyboardEvent_Binding::DOM_VK_SLASH, MODIFIER_NONE) +KEY("?", Slash, dom::KeyboardEvent_Binding::DOM_VK_SLASH, MODIFIER_SHIFT) +KEY(";", Semicolon, dom::KeyboardEvent_Binding::DOM_VK_SEMICOLON, MODIFIER_NONE) +KEY(":", Semicolon, dom::KeyboardEvent_Binding::DOM_VK_SEMICOLON, MODIFIER_SHIFT) +KEY("'", Quote, dom::KeyboardEvent_Binding::DOM_VK_QUOTE, MODIFIER_NONE) +KEY("\"", Quote, dom::KeyboardEvent_Binding::DOM_VK_QUOTE, MODIFIER_SHIFT) +KEY("[", BracketLeft, dom::KeyboardEvent_Binding::DOM_VK_OPEN_BRACKET, MODIFIER_NONE) +KEY("{", BracketLeft, dom::KeyboardEvent_Binding::DOM_VK_OPEN_BRACKET, MODIFIER_SHIFT) +KEY("]", BracketRight, dom::KeyboardEvent_Binding::DOM_VK_CLOSE_BRACKET, MODIFIER_NONE) +KEY("}", BracketRight, dom::KeyboardEvent_Binding::DOM_VK_CLOSE_BRACKET, MODIFIER_SHIFT) +KEY("`", Backquote, dom::KeyboardEvent_Binding::DOM_VK_BACK_QUOTE, MODIFIER_NONE) +KEY("~", Backquote, dom::KeyboardEvent_Binding::DOM_VK_BACK_QUOTE, MODIFIER_SHIFT) +KEY("\\", Backslash, dom::KeyboardEvent_Binding::DOM_VK_BACK_SLASH, MODIFIER_NONE) +KEY("|", Backslash, dom::KeyboardEvent_Binding::DOM_VK_BACK_SLASH, MODIFIER_SHIFT) +KEY("-", Minus, dom::KeyboardEvent_Binding::DOM_VK_HYPHEN_MINUS, MODIFIER_NONE) +KEY("_", Minus, dom::KeyboardEvent_Binding::DOM_VK_HYPHEN_MINUS, MODIFIER_SHIFT) +KEY("=", Equal, dom::KeyboardEvent_Binding::DOM_VK_EQUALS, MODIFIER_NONE) +KEY("+", Equal, dom::KeyboardEvent_Binding::DOM_VK_EQUALS, MODIFIER_SHIFT) +KEY("A", KeyA, dom::KeyboardEvent_Binding::DOM_VK_A, MODIFIER_SHIFT) +KEY("B", KeyB, dom::KeyboardEvent_Binding::DOM_VK_B, MODIFIER_SHIFT) +KEY("C", KeyC, dom::KeyboardEvent_Binding::DOM_VK_C, MODIFIER_SHIFT) +KEY("D", KeyD, dom::KeyboardEvent_Binding::DOM_VK_D, MODIFIER_SHIFT) +KEY("E", KeyE, dom::KeyboardEvent_Binding::DOM_VK_E, MODIFIER_SHIFT) +KEY("F", KeyF, dom::KeyboardEvent_Binding::DOM_VK_F, MODIFIER_SHIFT) +KEY("G", KeyG, dom::KeyboardEvent_Binding::DOM_VK_G, MODIFIER_SHIFT) +KEY("H", KeyH, dom::KeyboardEvent_Binding::DOM_VK_H, MODIFIER_SHIFT) +KEY("I", KeyI, dom::KeyboardEvent_Binding::DOM_VK_I, MODIFIER_SHIFT) +KEY("J", KeyJ, dom::KeyboardEvent_Binding::DOM_VK_J, MODIFIER_SHIFT) +KEY("K", KeyK, dom::KeyboardEvent_Binding::DOM_VK_K, MODIFIER_SHIFT) +KEY("L", KeyL, dom::KeyboardEvent_Binding::DOM_VK_L, MODIFIER_SHIFT) +KEY("M", KeyM, dom::KeyboardEvent_Binding::DOM_VK_M, MODIFIER_SHIFT) +KEY("N", KeyN, dom::KeyboardEvent_Binding::DOM_VK_N, MODIFIER_SHIFT) +KEY("O", KeyO, dom::KeyboardEvent_Binding::DOM_VK_O, MODIFIER_SHIFT) +KEY("P", KeyP, dom::KeyboardEvent_Binding::DOM_VK_P, MODIFIER_SHIFT) +KEY("Q", KeyQ, dom::KeyboardEvent_Binding::DOM_VK_Q, MODIFIER_SHIFT) +KEY("R", KeyR, dom::KeyboardEvent_Binding::DOM_VK_R, MODIFIER_SHIFT) +KEY("S", KeyS, dom::KeyboardEvent_Binding::DOM_VK_S, MODIFIER_SHIFT) +KEY("T", KeyT, dom::KeyboardEvent_Binding::DOM_VK_T, MODIFIER_SHIFT) +KEY("U", KeyU, dom::KeyboardEvent_Binding::DOM_VK_U, MODIFIER_SHIFT) +KEY("V", KeyV, dom::KeyboardEvent_Binding::DOM_VK_V, MODIFIER_SHIFT) +KEY("W", KeyW, dom::KeyboardEvent_Binding::DOM_VK_W, MODIFIER_SHIFT) +KEY("X", KeyX, dom::KeyboardEvent_Binding::DOM_VK_X, MODIFIER_SHIFT) +KEY("Y", KeyY, dom::KeyboardEvent_Binding::DOM_VK_Y, MODIFIER_SHIFT) +KEY("Z", KeyZ, dom::KeyboardEvent_Binding::DOM_VK_Z, MODIFIER_SHIFT) +KEY("a", KeyA, dom::KeyboardEvent_Binding::DOM_VK_A, MODIFIER_NONE) +KEY("b", KeyB, dom::KeyboardEvent_Binding::DOM_VK_B, MODIFIER_NONE) +KEY("c", KeyC, dom::KeyboardEvent_Binding::DOM_VK_C, MODIFIER_NONE) +KEY("d", KeyD, dom::KeyboardEvent_Binding::DOM_VK_D, MODIFIER_NONE) +KEY("e", KeyE, dom::KeyboardEvent_Binding::DOM_VK_E, MODIFIER_NONE) +KEY("f", KeyF, dom::KeyboardEvent_Binding::DOM_VK_F, MODIFIER_NONE) +KEY("g", KeyG, dom::KeyboardEvent_Binding::DOM_VK_G, MODIFIER_NONE) +KEY("h", KeyH, dom::KeyboardEvent_Binding::DOM_VK_H, MODIFIER_NONE) +KEY("i", KeyI, dom::KeyboardEvent_Binding::DOM_VK_I, MODIFIER_NONE) +KEY("j", KeyJ, dom::KeyboardEvent_Binding::DOM_VK_J, MODIFIER_NONE) +KEY("k", KeyK, dom::KeyboardEvent_Binding::DOM_VK_K, MODIFIER_NONE) +KEY("l", KeyL, dom::KeyboardEvent_Binding::DOM_VK_L, MODIFIER_NONE) +KEY("m", KeyM, dom::KeyboardEvent_Binding::DOM_VK_M, MODIFIER_NONE) +KEY("n", KeyN, dom::KeyboardEvent_Binding::DOM_VK_N, MODIFIER_NONE) +KEY("o", KeyO, dom::KeyboardEvent_Binding::DOM_VK_O, MODIFIER_NONE) +KEY("p", KeyP, dom::KeyboardEvent_Binding::DOM_VK_P, MODIFIER_NONE) +KEY("q", KeyQ, dom::KeyboardEvent_Binding::DOM_VK_Q, MODIFIER_NONE) +KEY("r", KeyR, dom::KeyboardEvent_Binding::DOM_VK_R, MODIFIER_NONE) +KEY("s", KeyS, dom::KeyboardEvent_Binding::DOM_VK_S, MODIFIER_NONE) +KEY("t", KeyT, dom::KeyboardEvent_Binding::DOM_VK_T, MODIFIER_NONE) +KEY("u", KeyU, dom::KeyboardEvent_Binding::DOM_VK_U, MODIFIER_NONE) +KEY("v", KeyV, dom::KeyboardEvent_Binding::DOM_VK_V, MODIFIER_NONE) +KEY("w", KeyW, dom::KeyboardEvent_Binding::DOM_VK_W, MODIFIER_NONE) +KEY("x", KeyX, dom::KeyboardEvent_Binding::DOM_VK_X, MODIFIER_NONE) +KEY("y", KeyY, dom::KeyboardEvent_Binding::DOM_VK_Y, MODIFIER_NONE) +KEY("z", KeyZ, dom::KeyboardEvent_Binding::DOM_VK_Z, MODIFIER_NONE) +KEY("0", Digit0, dom::KeyboardEvent_Binding::DOM_VK_0, MODIFIER_NONE) +KEY("1", Digit1, dom::KeyboardEvent_Binding::DOM_VK_1, MODIFIER_NONE) +KEY("2", Digit2, dom::KeyboardEvent_Binding::DOM_VK_2, MODIFIER_NONE) +KEY("3", Digit3, dom::KeyboardEvent_Binding::DOM_VK_3, MODIFIER_NONE) +KEY("4", Digit4, dom::KeyboardEvent_Binding::DOM_VK_4, MODIFIER_NONE) +KEY("5", Digit5, dom::KeyboardEvent_Binding::DOM_VK_5, MODIFIER_NONE) +KEY("6", Digit6, dom::KeyboardEvent_Binding::DOM_VK_6, MODIFIER_NONE) +KEY("7", Digit7, dom::KeyboardEvent_Binding::DOM_VK_7, MODIFIER_NONE) +KEY("8", Digit8, dom::KeyboardEvent_Binding::DOM_VK_8, MODIFIER_NONE) +KEY("9", Digit9, dom::KeyboardEvent_Binding::DOM_VK_9, MODIFIER_NONE) +KEY(")", Digit0, dom::KeyboardEvent_Binding::DOM_VK_0, MODIFIER_SHIFT) +KEY("!", Digit1, dom::KeyboardEvent_Binding::DOM_VK_1, MODIFIER_SHIFT) +KEY("@", Digit2, dom::KeyboardEvent_Binding::DOM_VK_2, MODIFIER_SHIFT) +KEY("#", Digit3, dom::KeyboardEvent_Binding::DOM_VK_3, MODIFIER_SHIFT) +KEY("$", Digit4, dom::KeyboardEvent_Binding::DOM_VK_4, MODIFIER_SHIFT) +KEY("%", Digit5, dom::KeyboardEvent_Binding::DOM_VK_5, MODIFIER_SHIFT) +KEY("^", Digit6, dom::KeyboardEvent_Binding::DOM_VK_6, MODIFIER_SHIFT) +KEY("&", Digit7, dom::KeyboardEvent_Binding::DOM_VK_7, MODIFIER_SHIFT) +KEY("*", Digit8, dom::KeyboardEvent_Binding::DOM_VK_8, MODIFIER_SHIFT) +KEY("(", Digit9, dom::KeyboardEvent_Binding::DOM_VK_9, MODIFIER_SHIFT) diff --git a/toolkit/components/resistfingerprinting/nsRFPService.cpp b/toolkit/components/resistfingerprinting/nsRFPService.cpp index ea428c42aaa9..fc62b61fe1ad 100644 --- a/toolkit/components/resistfingerprinting/nsRFPService.cpp +++ b/toolkit/components/resistfingerprinting/nsRFPService.cpp @@ -1068,7 +1068,7 @@ nsRFPService::GetSpoofedCode(const nsIDocument* aDoc, // We need to change the 'Left' with 'Right' if the location indicates // it's a right key. if (aKeyboardEvent->mLocation == - dom::KeyboardEventBinding::DOM_KEY_LOCATION_RIGHT && + dom::KeyboardEvent_Binding::DOM_KEY_LOCATION_RIGHT && StringEndsWith(aOut, NS_LITERAL_STRING("Left"))) { aOut.ReplaceLiteral(aOut.Length() - 4, 4, u"Right"); } diff --git a/toolkit/components/satchel/nsFormFillController.cpp b/toolkit/components/satchel/nsFormFillController.cpp index 0d0a28f0758b..d219e65712f3 100644 --- a/toolkit/components/satchel/nsFormFillController.cpp +++ b/toolkit/components/satchel/nsFormFillController.cpp @@ -1078,15 +1078,15 @@ nsFormFillController::KeyPress(Event* aEvent) uint32_t k = keyEvent->KeyCode(); switch (k) { - case KeyboardEventBinding::DOM_VK_DELETE: + case KeyboardEvent_Binding::DOM_VK_DELETE: #ifndef XP_MACOSX mController->HandleDelete(&cancel); break; - case KeyboardEventBinding::DOM_VK_BACK_SPACE: + case KeyboardEvent_Binding::DOM_VK_BACK_SPACE: mController->HandleText(&unused); break; #else - case KeyboardEventBinding::DOM_VK_BACK_SPACE: + case KeyboardEvent_Binding::DOM_VK_BACK_SPACE: { if (keyEvent->ShiftKey()) { mController->HandleDelete(&cancel); @@ -1097,8 +1097,8 @@ nsFormFillController::KeyPress(Event* aEvent) break; } #endif - case KeyboardEventBinding::DOM_VK_PAGE_UP: - case KeyboardEventBinding::DOM_VK_PAGE_DOWN: + case KeyboardEvent_Binding::DOM_VK_PAGE_UP: + case KeyboardEvent_Binding::DOM_VK_PAGE_DOWN: { if (keyEvent->CtrlKey() || keyEvent->AltKey() || @@ -1107,10 +1107,10 @@ nsFormFillController::KeyPress(Event* aEvent) } } MOZ_FALLTHROUGH; - case KeyboardEventBinding::DOM_VK_UP: - case KeyboardEventBinding::DOM_VK_DOWN: - case KeyboardEventBinding::DOM_VK_LEFT: - case KeyboardEventBinding::DOM_VK_RIGHT: + case KeyboardEvent_Binding::DOM_VK_UP: + case KeyboardEvent_Binding::DOM_VK_DOWN: + case KeyboardEvent_Binding::DOM_VK_LEFT: + case KeyboardEvent_Binding::DOM_VK_RIGHT: { // Get the writing-mode of the relevant input element, // so that we can remap arrow keys if necessary. @@ -1123,33 +1123,33 @@ nsFormFillController::KeyPress(Event* aEvent) } if (wm.IsVertical()) { switch (k) { - case KeyboardEventBinding::DOM_VK_LEFT: - k = wm.IsVerticalLR() ? KeyboardEventBinding::DOM_VK_UP - : KeyboardEventBinding::DOM_VK_DOWN; + case KeyboardEvent_Binding::DOM_VK_LEFT: + k = wm.IsVerticalLR() ? KeyboardEvent_Binding::DOM_VK_UP + : KeyboardEvent_Binding::DOM_VK_DOWN; break; - case KeyboardEventBinding::DOM_VK_RIGHT: - k = wm.IsVerticalLR() ? KeyboardEventBinding::DOM_VK_DOWN - : KeyboardEventBinding::DOM_VK_UP; + case KeyboardEvent_Binding::DOM_VK_RIGHT: + k = wm.IsVerticalLR() ? KeyboardEvent_Binding::DOM_VK_DOWN + : KeyboardEvent_Binding::DOM_VK_UP; break; - case KeyboardEventBinding::DOM_VK_UP: - k = KeyboardEventBinding::DOM_VK_LEFT; + case KeyboardEvent_Binding::DOM_VK_UP: + k = KeyboardEvent_Binding::DOM_VK_LEFT; break; - case KeyboardEventBinding::DOM_VK_DOWN: - k = KeyboardEventBinding::DOM_VK_RIGHT; + case KeyboardEvent_Binding::DOM_VK_DOWN: + k = KeyboardEvent_Binding::DOM_VK_RIGHT; break; } } } mController->HandleKeyNavigation(k, &cancel); break; - case KeyboardEventBinding::DOM_VK_ESCAPE: + case KeyboardEvent_Binding::DOM_VK_ESCAPE: mController->HandleEscape(&cancel); break; - case KeyboardEventBinding::DOM_VK_TAB: + case KeyboardEvent_Binding::DOM_VK_TAB: mController->HandleTab(); cancel = false; break; - case KeyboardEventBinding::DOM_VK_RETURN: + case KeyboardEvent_Binding::DOM_VK_RETURN: mController->HandleEnter(false, aEvent, &cancel); break; } @@ -1160,7 +1160,7 @@ nsFormFillController::KeyPress(Event* aEvent) // (indicated by cancel=true) so sites don't manually submit forms // (e.g. via submit.click()) without the autocompleted value being filled. // Bug 286933 will fix this for other key events. - if (k == KeyboardEventBinding::DOM_VK_RETURN) { + if (k == KeyboardEvent_Binding::DOM_VK_RETURN) { aEvent->StopPropagation(); } } @@ -1224,7 +1224,7 @@ nsFormFillController::ShowPopup() // Show the popup with the complete result set. Can't use HandleText() // because it doesn't display the popup if the input is blank. bool cancel = false; - mController->HandleKeyNavigation(KeyboardEventBinding::DOM_VK_DOWN, &cancel); + mController->HandleKeyNavigation(KeyboardEvent_Binding::DOM_VK_DOWN, &cancel); } return NS_OK; diff --git a/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp b/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp index 24766254e852..075f2659e47e 100644 --- a/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp +++ b/toolkit/components/typeaheadfind/nsTypeAheadFind.cpp @@ -440,7 +440,7 @@ nsTypeAheadFind::FindItNow(nsIPresShell *aPresShell, bool aIsLinksOnly, // XXXbz Should this really be ignoring errors? int16_t rangeCompareResult = - mStartPointRange->CompareBoundaryPoints(RangeBinding::START_TO_START, + mStartPointRange->CompareBoundaryPoints(Range_Binding::START_TO_START, *mSearchRange, IgnoreErrors()); // No need to wrap find in doc if starting at beginning bool hasWrapped = (rangeCompareResult < 0); @@ -494,7 +494,7 @@ nsTypeAheadFind::FindItNow(nsIPresShell *aPresShell, bool aIsLinksOnly, // to continue at the start of returnRange. IgnoredErrorResult rv; int16_t compareResult = - mStartPointRange->CompareBoundaryPoints(RangeBinding::START_TO_END, + mStartPointRange->CompareBoundaryPoints(Range_Binding::START_TO_END, *returnRange, rv); if (!rv.Failed() && compareResult <= 0) { // OK to start at the end of mStartPointRange @@ -510,7 +510,7 @@ nsTypeAheadFind::FindItNow(nsIPresShell *aPresShell, bool aIsLinksOnly, // need to continue at the end of returnRange. IgnoredErrorResult rv; int16_t compareResult = - mStartPointRange->CompareBoundaryPoints(RangeBinding::END_TO_START, + mStartPointRange->CompareBoundaryPoints(Range_Binding::END_TO_START, *returnRange, rv); if (!rv.Failed() && compareResult >= 0) { // OK to start at the start of mStartPointRange diff --git a/widget/InputData.cpp b/widget/InputData.cpp index 4f95a99bbc63..9590791d1a98 100644 --- a/widget/InputData.cpp +++ b/widget/InputData.cpp @@ -277,7 +277,7 @@ MultiTouchInput::ToWidgetMouseEvent(nsIWidget* aWidget) const event.mTime = mTime; event.button = WidgetMouseEvent::eLeftButton; - event.inputSource = MouseEventBinding::MOZ_SOURCE_TOUCH; + event.inputSource = MouseEvent_Binding::MOZ_SOURCE_TOUCH; event.mModifiers = modifiers; event.mFlags.mHandledByAPZ = mHandledByAPZ; event.mFocusSequenceNumber = mFocusSequenceNumber; @@ -551,7 +551,7 @@ PanGestureInput::ToWidgetWheelEvent(nsIWidget* aWidget) const RoundedToInt(ViewAs(mPanStartPoint, PixelCastJustification::LayoutDeviceIsScreenForUntransformedEvent)); wheelEvent.buttons = 0; - wheelEvent.mDeltaMode = WheelEventBinding::DOM_DELTA_PIXEL; + wheelEvent.mDeltaMode = WheelEvent_Binding::DOM_DELTA_PIXEL; wheelEvent.mMayHaveMomentum = true; // pan inputs may have momentum wheelEvent.mIsMomentum = IsMomentum(); wheelEvent.mLineOrPageDeltaX = mLineOrPageDeltaX; @@ -756,11 +756,11 @@ ScrollWheelInput::ScrollDeltaType ScrollWheelInput::DeltaTypeForDeltaMode(uint32_t aDeltaMode) { switch (aDeltaMode) { - case WheelEventBinding::DOM_DELTA_LINE: + case WheelEvent_Binding::DOM_DELTA_LINE: return SCROLLDELTA_LINE; - case WheelEventBinding::DOM_DELTA_PAGE: + case WheelEvent_Binding::DOM_DELTA_PAGE: return SCROLLDELTA_PAGE; - case WheelEventBinding::DOM_DELTA_PIXEL: + case WheelEvent_Binding::DOM_DELTA_PIXEL: return SCROLLDELTA_PIXEL; default: MOZ_CRASH(); @@ -773,12 +773,12 @@ ScrollWheelInput::DeltaModeForDeltaType(ScrollDeltaType aDeltaType) { switch (aDeltaType) { case ScrollWheelInput::SCROLLDELTA_LINE: - return WheelEventBinding::DOM_DELTA_LINE; + return WheelEvent_Binding::DOM_DELTA_LINE; case ScrollWheelInput::SCROLLDELTA_PAGE: - return WheelEventBinding::DOM_DELTA_PAGE; + return WheelEvent_Binding::DOM_DELTA_PAGE; case ScrollWheelInput::SCROLLDELTA_PIXEL: default: - return WheelEventBinding::DOM_DELTA_PIXEL; + return WheelEvent_Binding::DOM_DELTA_PIXEL; } } diff --git a/widget/MouseEvents.h b/widget/MouseEvents.h index dc4f7c64b298..c649209e8b91 100644 --- a/widget/MouseEvents.h +++ b/widget/MouseEvents.h @@ -110,8 +110,8 @@ protected: , pressure(0) , hitCluster(false) // Including MouseEventBinding.h here leads to an include loop, so - // we have to hardcode MouseEventBinding::MOZ_SOURCE_MOUSE. - , inputSource(/* MouseEventBinding::MOZ_SOURCE_MOUSE = */ 1) + // we have to hardcode MouseEvent_Binding::MOZ_SOURCE_MOUSE. + , inputSource(/* MouseEvent_Binding::MOZ_SOURCE_MOUSE = */ 1) { } @@ -123,8 +123,8 @@ protected: , pressure(0) , hitCluster(false) // Including MouseEventBinding.h here leads to an include loop, so - // we have to hardcode MouseEventBinding::MOZ_SOURCE_MOUSE. - , inputSource(/* MouseEventBinding::MOZ_SOURCE_MOUSE = */ 1) + // we have to hardcode MouseEvent_Binding::MOZ_SOURCE_MOUSE. + , inputSource(/* MouseEvent_Binding::MOZ_SOURCE_MOUSE = */ 1) { } @@ -492,8 +492,8 @@ private: , mOverflowDeltaX(0.0) , mOverflowDeltaY(0.0) // Including WheelEventBinding.h here leads to an include loop, so - // we have to hardcode WheelEventBinding::DOM_DELTA_PIXEL. - , mDeltaMode(/* WheelEventBinding::DOM_DELTA_PIXEL = */ 0) + // we have to hardcode WheelEvent_Binding::DOM_DELTA_PIXEL. + , mDeltaMode(/* WheelEvent_Binding::DOM_DELTA_PIXEL = */ 0) , mLineOrPageDeltaX(0) , mLineOrPageDeltaY(0) , mScrollType(SCROLL_DEFAULT) @@ -519,8 +519,8 @@ public: , mOverflowDeltaX(0.0) , mOverflowDeltaY(0.0) // Including WheelEventBinding.h here leads to an include loop, so - // we have to hardcode WheelEventBinding::DOM_DELTA_PIXEL. - , mDeltaMode(/* WheelEventBinding::DOM_DELTA_PIXEL = */ 0) + // we have to hardcode WheelEvent_Binding::DOM_DELTA_PIXEL. + , mDeltaMode(/* WheelEvent_Binding::DOM_DELTA_PIXEL = */ 0) , mLineOrPageDeltaX(0) , mLineOrPageDeltaY(0) , mScrollType(SCROLL_DEFAULT) @@ -576,7 +576,7 @@ public: double mOverflowDeltaX; double mOverflowDeltaY; - // Should be one of WheelEventBinding::DOM_DELTA_* + // Should be one of WheelEvent_Binding::DOM_DELTA_* uint32_t mDeltaMode; // If widget sets mLineOrPageDelta, EventStateManager will dispatch diff --git a/widget/TextEvents.h b/widget/TextEvents.h index d99b28afc07d..c4770aa8ec99 100644 --- a/widget/TextEvents.h +++ b/widget/TextEvents.h @@ -43,10 +43,10 @@ namespace mozilla { enum : uint32_t { - eKeyLocationStandard = dom::KeyboardEventBinding::DOM_KEY_LOCATION_STANDARD, - eKeyLocationLeft = dom::KeyboardEventBinding::DOM_KEY_LOCATION_LEFT, - eKeyLocationRight = dom::KeyboardEventBinding::DOM_KEY_LOCATION_RIGHT, - eKeyLocationNumpad = dom::KeyboardEventBinding::DOM_KEY_LOCATION_NUMPAD + eKeyLocationStandard = dom::KeyboardEvent_Binding::DOM_KEY_LOCATION_STANDARD, + eKeyLocationLeft = dom::KeyboardEvent_Binding::DOM_KEY_LOCATION_LEFT, + eKeyLocationRight = dom::KeyboardEvent_Binding::DOM_KEY_LOCATION_RIGHT, + eKeyLocationNumpad = dom::KeyboardEvent_Binding::DOM_KEY_LOCATION_NUMPAD }; const nsCString GetDOMKeyCodeName(uint32_t aKeyCode); diff --git a/widget/WidgetEventImpl.cpp b/widget/WidgetEventImpl.cpp index 92fcc70a7aaf..2f77d08f5fd4 100644 --- a/widget/WidgetEventImpl.cpp +++ b/widget/WidgetEventImpl.cpp @@ -626,16 +626,16 @@ WidgetInputEvent::AccelModifier() static Modifier sAccelModifier = MODIFIER_NONE; if (sAccelModifier == MODIFIER_NONE) { switch (Preferences::GetInt("ui.key.accelKey", 0)) { - case dom::KeyboardEventBinding::DOM_VK_META: + case dom::KeyboardEvent_Binding::DOM_VK_META: sAccelModifier = MODIFIER_META; break; - case dom::KeyboardEventBinding::DOM_VK_WIN: + case dom::KeyboardEvent_Binding::DOM_VK_WIN: sAccelModifier = MODIFIER_OS; break; - case dom::KeyboardEventBinding::DOM_VK_ALT: + case dom::KeyboardEvent_Binding::DOM_VK_ALT: sAccelModifier = MODIFIER_ALT; break; - case dom::KeyboardEventBinding::DOM_VK_CONTROL: + case dom::KeyboardEvent_Binding::DOM_VK_CONTROL: sAccelModifier = MODIFIER_CONTROL; break; default: @@ -1178,31 +1178,31 @@ WidgetKeyboardEvent::GetFallbackKeyCodeOfPunctuationKey( { switch (aCodeNameIndex) { case CODE_NAME_INDEX_Semicolon: // VK_OEM_1 on Windows - return dom::KeyboardEventBinding::DOM_VK_SEMICOLON; + return dom::KeyboardEvent_Binding::DOM_VK_SEMICOLON; case CODE_NAME_INDEX_Equal: // VK_OEM_PLUS on Windows - return dom::KeyboardEventBinding::DOM_VK_EQUALS; + return dom::KeyboardEvent_Binding::DOM_VK_EQUALS; case CODE_NAME_INDEX_Comma: // VK_OEM_COMMA on Windows - return dom::KeyboardEventBinding::DOM_VK_COMMA; + return dom::KeyboardEvent_Binding::DOM_VK_COMMA; case CODE_NAME_INDEX_Minus: // VK_OEM_MINUS on Windows - return dom::KeyboardEventBinding::DOM_VK_HYPHEN_MINUS; + return dom::KeyboardEvent_Binding::DOM_VK_HYPHEN_MINUS; case CODE_NAME_INDEX_Period: // VK_OEM_PERIOD on Windows - return dom::KeyboardEventBinding::DOM_VK_PERIOD; + return dom::KeyboardEvent_Binding::DOM_VK_PERIOD; case CODE_NAME_INDEX_Slash: // VK_OEM_2 on Windows - return dom::KeyboardEventBinding::DOM_VK_SLASH; + return dom::KeyboardEvent_Binding::DOM_VK_SLASH; case CODE_NAME_INDEX_Backquote: // VK_OEM_3 on Windows - return dom::KeyboardEventBinding::DOM_VK_BACK_QUOTE; + return dom::KeyboardEvent_Binding::DOM_VK_BACK_QUOTE; case CODE_NAME_INDEX_BracketLeft: // VK_OEM_4 on Windows - return dom::KeyboardEventBinding::DOM_VK_OPEN_BRACKET; + return dom::KeyboardEvent_Binding::DOM_VK_OPEN_BRACKET; case CODE_NAME_INDEX_Backslash: // VK_OEM_5 on Windows - return dom::KeyboardEventBinding::DOM_VK_BACK_SLASH; + return dom::KeyboardEvent_Binding::DOM_VK_BACK_SLASH; case CODE_NAME_INDEX_BracketRight: // VK_OEM_6 on Windows - return dom::KeyboardEventBinding::DOM_VK_CLOSE_BRACKET; + return dom::KeyboardEvent_Binding::DOM_VK_CLOSE_BRACKET; case CODE_NAME_INDEX_Quote: // VK_OEM_7 on Windows - return dom::KeyboardEventBinding::DOM_VK_QUOTE; + return dom::KeyboardEvent_Binding::DOM_VK_QUOTE; case CODE_NAME_INDEX_IntlBackslash: // VK_OEM_5 on Windows (ABNT, etc) case CODE_NAME_INDEX_IntlYen: // VK_OEM_5 on Windows (JIS) case CODE_NAME_INDEX_IntlRo: // VK_OEM_102 on Windows - return dom::KeyboardEventBinding::DOM_VK_BACK_SLASH; + return dom::KeyboardEvent_Binding::DOM_VK_BACK_SLASH; default: return 0; } @@ -1281,168 +1281,168 @@ WidgetKeyboardEvent::ComputeKeyCodeFromKeyNameIndex(KeyNameIndex aKeyNameIndex) { switch (aKeyNameIndex) { case KEY_NAME_INDEX_Cancel: - return dom::KeyboardEventBinding::DOM_VK_CANCEL; + return dom::KeyboardEvent_Binding::DOM_VK_CANCEL; case KEY_NAME_INDEX_Help: - return dom::KeyboardEventBinding::DOM_VK_HELP; + return dom::KeyboardEvent_Binding::DOM_VK_HELP; case KEY_NAME_INDEX_Backspace: - return dom::KeyboardEventBinding::DOM_VK_BACK_SPACE; + return dom::KeyboardEvent_Binding::DOM_VK_BACK_SPACE; case KEY_NAME_INDEX_Tab: - return dom::KeyboardEventBinding::DOM_VK_TAB; + return dom::KeyboardEvent_Binding::DOM_VK_TAB; case KEY_NAME_INDEX_Clear: - return dom::KeyboardEventBinding::DOM_VK_CLEAR; + return dom::KeyboardEvent_Binding::DOM_VK_CLEAR; case KEY_NAME_INDEX_Enter: - return dom::KeyboardEventBinding::DOM_VK_RETURN; + return dom::KeyboardEvent_Binding::DOM_VK_RETURN; case KEY_NAME_INDEX_Shift: - return dom::KeyboardEventBinding::DOM_VK_SHIFT; + return dom::KeyboardEvent_Binding::DOM_VK_SHIFT; case KEY_NAME_INDEX_Control: - return dom::KeyboardEventBinding::DOM_VK_CONTROL; + return dom::KeyboardEvent_Binding::DOM_VK_CONTROL; case KEY_NAME_INDEX_Alt: - return dom::KeyboardEventBinding::DOM_VK_ALT; + return dom::KeyboardEvent_Binding::DOM_VK_ALT; case KEY_NAME_INDEX_Pause: - return dom::KeyboardEventBinding::DOM_VK_PAUSE; + return dom::KeyboardEvent_Binding::DOM_VK_PAUSE; case KEY_NAME_INDEX_CapsLock: - return dom::KeyboardEventBinding::DOM_VK_CAPS_LOCK; + return dom::KeyboardEvent_Binding::DOM_VK_CAPS_LOCK; case KEY_NAME_INDEX_Hiragana: case KEY_NAME_INDEX_Katakana: case KEY_NAME_INDEX_HiraganaKatakana: case KEY_NAME_INDEX_KanaMode: - return dom::KeyboardEventBinding::DOM_VK_KANA; + return dom::KeyboardEvent_Binding::DOM_VK_KANA; case KEY_NAME_INDEX_HangulMode: - return dom::KeyboardEventBinding::DOM_VK_HANGUL; + return dom::KeyboardEvent_Binding::DOM_VK_HANGUL; case KEY_NAME_INDEX_Eisu: - return dom::KeyboardEventBinding::DOM_VK_EISU; + return dom::KeyboardEvent_Binding::DOM_VK_EISU; case KEY_NAME_INDEX_JunjaMode: - return dom::KeyboardEventBinding::DOM_VK_JUNJA; + return dom::KeyboardEvent_Binding::DOM_VK_JUNJA; case KEY_NAME_INDEX_FinalMode: - return dom::KeyboardEventBinding::DOM_VK_FINAL; + return dom::KeyboardEvent_Binding::DOM_VK_FINAL; case KEY_NAME_INDEX_HanjaMode: - return dom::KeyboardEventBinding::DOM_VK_HANJA; + return dom::KeyboardEvent_Binding::DOM_VK_HANJA; case KEY_NAME_INDEX_KanjiMode: - return dom::KeyboardEventBinding::DOM_VK_KANJI; + return dom::KeyboardEvent_Binding::DOM_VK_KANJI; case KEY_NAME_INDEX_Escape: - return dom::KeyboardEventBinding::DOM_VK_ESCAPE; + return dom::KeyboardEvent_Binding::DOM_VK_ESCAPE; case KEY_NAME_INDEX_Convert: - return dom::KeyboardEventBinding::DOM_VK_CONVERT; + return dom::KeyboardEvent_Binding::DOM_VK_CONVERT; case KEY_NAME_INDEX_NonConvert: - return dom::KeyboardEventBinding::DOM_VK_NONCONVERT; + return dom::KeyboardEvent_Binding::DOM_VK_NONCONVERT; case KEY_NAME_INDEX_Accept: - return dom::KeyboardEventBinding::DOM_VK_ACCEPT; + return dom::KeyboardEvent_Binding::DOM_VK_ACCEPT; case KEY_NAME_INDEX_ModeChange: - return dom::KeyboardEventBinding::DOM_VK_MODECHANGE; + return dom::KeyboardEvent_Binding::DOM_VK_MODECHANGE; case KEY_NAME_INDEX_PageUp: - return dom::KeyboardEventBinding::DOM_VK_PAGE_UP; + return dom::KeyboardEvent_Binding::DOM_VK_PAGE_UP; case KEY_NAME_INDEX_PageDown: - return dom::KeyboardEventBinding::DOM_VK_PAGE_DOWN; + return dom::KeyboardEvent_Binding::DOM_VK_PAGE_DOWN; case KEY_NAME_INDEX_End: - return dom::KeyboardEventBinding::DOM_VK_END; + return dom::KeyboardEvent_Binding::DOM_VK_END; case KEY_NAME_INDEX_Home: - return dom::KeyboardEventBinding::DOM_VK_HOME; + return dom::KeyboardEvent_Binding::DOM_VK_HOME; case KEY_NAME_INDEX_ArrowLeft: - return dom::KeyboardEventBinding::DOM_VK_LEFT; + return dom::KeyboardEvent_Binding::DOM_VK_LEFT; case KEY_NAME_INDEX_ArrowUp: - return dom::KeyboardEventBinding::DOM_VK_UP; + return dom::KeyboardEvent_Binding::DOM_VK_UP; case KEY_NAME_INDEX_ArrowRight: - return dom::KeyboardEventBinding::DOM_VK_RIGHT; + return dom::KeyboardEvent_Binding::DOM_VK_RIGHT; case KEY_NAME_INDEX_ArrowDown: - return dom::KeyboardEventBinding::DOM_VK_DOWN; + return dom::KeyboardEvent_Binding::DOM_VK_DOWN; case KEY_NAME_INDEX_Select: - return dom::KeyboardEventBinding::DOM_VK_SELECT; + return dom::KeyboardEvent_Binding::DOM_VK_SELECT; case KEY_NAME_INDEX_Print: - return dom::KeyboardEventBinding::DOM_VK_PRINT; + return dom::KeyboardEvent_Binding::DOM_VK_PRINT; case KEY_NAME_INDEX_Execute: - return dom::KeyboardEventBinding::DOM_VK_EXECUTE; + return dom::KeyboardEvent_Binding::DOM_VK_EXECUTE; case KEY_NAME_INDEX_PrintScreen: - return dom::KeyboardEventBinding::DOM_VK_PRINTSCREEN; + return dom::KeyboardEvent_Binding::DOM_VK_PRINTSCREEN; case KEY_NAME_INDEX_Insert: - return dom::KeyboardEventBinding::DOM_VK_INSERT; + return dom::KeyboardEvent_Binding::DOM_VK_INSERT; case KEY_NAME_INDEX_Delete: - return dom::KeyboardEventBinding::DOM_VK_DELETE; + return dom::KeyboardEvent_Binding::DOM_VK_DELETE; case KEY_NAME_INDEX_OS: // case KEY_NAME_INDEX_Super: // case KEY_NAME_INDEX_Hyper: - return dom::KeyboardEventBinding::DOM_VK_WIN; + return dom::KeyboardEvent_Binding::DOM_VK_WIN; case KEY_NAME_INDEX_ContextMenu: - return dom::KeyboardEventBinding::DOM_VK_CONTEXT_MENU; + return dom::KeyboardEvent_Binding::DOM_VK_CONTEXT_MENU; case KEY_NAME_INDEX_Standby: - return dom::KeyboardEventBinding::DOM_VK_SLEEP; + return dom::KeyboardEvent_Binding::DOM_VK_SLEEP; case KEY_NAME_INDEX_F1: - return dom::KeyboardEventBinding::DOM_VK_F1; + return dom::KeyboardEvent_Binding::DOM_VK_F1; case KEY_NAME_INDEX_F2: - return dom::KeyboardEventBinding::DOM_VK_F2; + return dom::KeyboardEvent_Binding::DOM_VK_F2; case KEY_NAME_INDEX_F3: - return dom::KeyboardEventBinding::DOM_VK_F3; + return dom::KeyboardEvent_Binding::DOM_VK_F3; case KEY_NAME_INDEX_F4: - return dom::KeyboardEventBinding::DOM_VK_F4; + return dom::KeyboardEvent_Binding::DOM_VK_F4; case KEY_NAME_INDEX_F5: - return dom::KeyboardEventBinding::DOM_VK_F5; + return dom::KeyboardEvent_Binding::DOM_VK_F5; case KEY_NAME_INDEX_F6: - return dom::KeyboardEventBinding::DOM_VK_F6; + return dom::KeyboardEvent_Binding::DOM_VK_F6; case KEY_NAME_INDEX_F7: - return dom::KeyboardEventBinding::DOM_VK_F7; + return dom::KeyboardEvent_Binding::DOM_VK_F7; case KEY_NAME_INDEX_F8: - return dom::KeyboardEventBinding::DOM_VK_F8; + return dom::KeyboardEvent_Binding::DOM_VK_F8; case KEY_NAME_INDEX_F9: - return dom::KeyboardEventBinding::DOM_VK_F9; + return dom::KeyboardEvent_Binding::DOM_VK_F9; case KEY_NAME_INDEX_F10: - return dom::KeyboardEventBinding::DOM_VK_F10; + return dom::KeyboardEvent_Binding::DOM_VK_F10; case KEY_NAME_INDEX_F11: - return dom::KeyboardEventBinding::DOM_VK_F11; + return dom::KeyboardEvent_Binding::DOM_VK_F11; case KEY_NAME_INDEX_F12: - return dom::KeyboardEventBinding::DOM_VK_F12; + return dom::KeyboardEvent_Binding::DOM_VK_F12; case KEY_NAME_INDEX_F13: - return dom::KeyboardEventBinding::DOM_VK_F13; + return dom::KeyboardEvent_Binding::DOM_VK_F13; case KEY_NAME_INDEX_F14: - return dom::KeyboardEventBinding::DOM_VK_F14; + return dom::KeyboardEvent_Binding::DOM_VK_F14; case KEY_NAME_INDEX_F15: - return dom::KeyboardEventBinding::DOM_VK_F15; + return dom::KeyboardEvent_Binding::DOM_VK_F15; case KEY_NAME_INDEX_F16: - return dom::KeyboardEventBinding::DOM_VK_F16; + return dom::KeyboardEvent_Binding::DOM_VK_F16; case KEY_NAME_INDEX_F17: - return dom::KeyboardEventBinding::DOM_VK_F17; + return dom::KeyboardEvent_Binding::DOM_VK_F17; case KEY_NAME_INDEX_F18: - return dom::KeyboardEventBinding::DOM_VK_F18; + return dom::KeyboardEvent_Binding::DOM_VK_F18; case KEY_NAME_INDEX_F19: - return dom::KeyboardEventBinding::DOM_VK_F19; + return dom::KeyboardEvent_Binding::DOM_VK_F19; case KEY_NAME_INDEX_F20: - return dom::KeyboardEventBinding::DOM_VK_F20; + return dom::KeyboardEvent_Binding::DOM_VK_F20; case KEY_NAME_INDEX_F21: - return dom::KeyboardEventBinding::DOM_VK_F21; + return dom::KeyboardEvent_Binding::DOM_VK_F21; case KEY_NAME_INDEX_F22: - return dom::KeyboardEventBinding::DOM_VK_F22; + return dom::KeyboardEvent_Binding::DOM_VK_F22; case KEY_NAME_INDEX_F23: - return dom::KeyboardEventBinding::DOM_VK_F23; + return dom::KeyboardEvent_Binding::DOM_VK_F23; case KEY_NAME_INDEX_F24: - return dom::KeyboardEventBinding::DOM_VK_F24; + return dom::KeyboardEvent_Binding::DOM_VK_F24; case KEY_NAME_INDEX_NumLock: - return dom::KeyboardEventBinding::DOM_VK_NUM_LOCK; + return dom::KeyboardEvent_Binding::DOM_VK_NUM_LOCK; case KEY_NAME_INDEX_ScrollLock: - return dom::KeyboardEventBinding::DOM_VK_SCROLL_LOCK; + return dom::KeyboardEvent_Binding::DOM_VK_SCROLL_LOCK; case KEY_NAME_INDEX_AudioVolumeMute: - return dom::KeyboardEventBinding::DOM_VK_VOLUME_MUTE; + return dom::KeyboardEvent_Binding::DOM_VK_VOLUME_MUTE; case KEY_NAME_INDEX_AudioVolumeDown: - return dom::KeyboardEventBinding::DOM_VK_VOLUME_DOWN; + return dom::KeyboardEvent_Binding::DOM_VK_VOLUME_DOWN; case KEY_NAME_INDEX_AudioVolumeUp: - return dom::KeyboardEventBinding::DOM_VK_VOLUME_UP; + return dom::KeyboardEvent_Binding::DOM_VK_VOLUME_UP; case KEY_NAME_INDEX_Meta: - return dom::KeyboardEventBinding::DOM_VK_META; + return dom::KeyboardEvent_Binding::DOM_VK_META; case KEY_NAME_INDEX_AltGraph: - return dom::KeyboardEventBinding::DOM_VK_ALTGR; + return dom::KeyboardEvent_Binding::DOM_VK_ALTGR; case KEY_NAME_INDEX_Process: - return dom::KeyboardEventBinding::DOM_VK_PROCESSKEY; + return dom::KeyboardEvent_Binding::DOM_VK_PROCESSKEY; case KEY_NAME_INDEX_Attn: - return dom::KeyboardEventBinding::DOM_VK_ATTN; + return dom::KeyboardEvent_Binding::DOM_VK_ATTN; case KEY_NAME_INDEX_CrSel: - return dom::KeyboardEventBinding::DOM_VK_CRSEL; + return dom::KeyboardEvent_Binding::DOM_VK_CRSEL; case KEY_NAME_INDEX_ExSel: - return dom::KeyboardEventBinding::DOM_VK_EXSEL; + return dom::KeyboardEvent_Binding::DOM_VK_EXSEL; case KEY_NAME_INDEX_EraseEof: - return dom::KeyboardEventBinding::DOM_VK_EREOF; + return dom::KeyboardEvent_Binding::DOM_VK_EREOF; case KEY_NAME_INDEX_Play: - return dom::KeyboardEventBinding::DOM_VK_PLAY; + return dom::KeyboardEvent_Binding::DOM_VK_PLAY; case KEY_NAME_INDEX_ZoomToggle: case KEY_NAME_INDEX_ZoomIn: case KEY_NAME_INDEX_ZoomOut: - return dom::KeyboardEventBinding::DOM_VK_ZOOM; + return dom::KeyboardEvent_Binding::DOM_VK_ZOOM; default: return 0; } diff --git a/widget/android/nsWindow.cpp b/widget/android/nsWindow.cpp index 33b6d9ad122b..dc4dff33ed27 100644 --- a/widget/android/nsWindow.cpp +++ b/widget/android/nsWindow.cpp @@ -609,7 +609,7 @@ public: ScreenPoint origin = ScreenPoint(aX, aY); - MouseInput input(mouseType, buttonType, MouseEventBinding::MOZ_SOURCE_MOUSE, ConvertButtons(buttons), origin, aTime, GetEventTimeStamp(aTime), GetModifiers(aMetaState)); + MouseInput input(mouseType, buttonType, MouseEvent_Binding::MOZ_SOURCE_MOUSE, ConvertButtons(buttons), origin, aTime, GetEventTimeStamp(aTime), GetModifiers(aMetaState)); ScrollableLayerGuid guid; uint64_t blockId; @@ -2006,7 +2006,7 @@ nsWindow::DispatchHitTest(const WidgetTouchEvent& aEvent) WidgetMouseEvent::eReal); hittest.mRefPoint = aEvent.mTouches[0]->mRefPoint; hittest.mIgnoreRootScrollFrame = true; - hittest.inputSource = MouseEventBinding::MOZ_SOURCE_TOUCH; + hittest.inputSource = MouseEvent_Binding::MOZ_SOURCE_TOUCH; nsEventStatus status; DispatchEvent(&hittest, status); diff --git a/widget/cocoa/SwipeTracker.mm b/widget/cocoa/SwipeTracker.mm index 84989237aa07..fa9637747377 100644 --- a/widget/cocoa/SwipeTracker.mm +++ b/widget/cocoa/SwipeTracker.mm @@ -71,7 +71,7 @@ SwipeTracker::~SwipeTracker() double SwipeTracker::SwipeSuccessTargetValue() const { - return (mSwipeDirection == dom::SimpleGestureEventBinding::DIRECTION_RIGHT) ? + return (mSwipeDirection == dom::SimpleGestureEvent_Binding::DIRECTION_RIGHT) ? -1.0 : 1.0; } @@ -81,10 +81,10 @@ SwipeTracker::ClampToAllowedRange(double aGestureAmount) const // gestureAmount needs to stay between -1 and 0 when swiping right and // between 0 and 1 when swiping left. double min = - (mSwipeDirection == dom::SimpleGestureEventBinding::DIRECTION_RIGHT) ? + (mSwipeDirection == dom::SimpleGestureEvent_Binding::DIRECTION_RIGHT) ? -1.0 : 0.0; double max = - (mSwipeDirection == dom::SimpleGestureEventBinding::DIRECTION_LEFT) ? + (mSwipeDirection == dom::SimpleGestureEvent_Binding::DIRECTION_LEFT) ? 1.0 : 0.0; return clamped(aGestureAmount, min, max); } diff --git a/widget/cocoa/nsChildView.mm b/widget/cocoa/nsChildView.mm index 5a3a9bb6ab01..8dc433f4ddea 100644 --- a/widget/cocoa/nsChildView.mm +++ b/widget/cocoa/nsChildView.mm @@ -2712,8 +2712,8 @@ nsChildView::SendMayStartSwipe(const mozilla::PanGestureInput& aSwipeStartEvent) nsCOMPtr kungFuDeathGrip(this); uint32_t direction = (aSwipeStartEvent.mPanDisplacement.x > 0.0) - ? (uint32_t)dom::SimpleGestureEventBinding::DIRECTION_RIGHT - : (uint32_t)dom::SimpleGestureEventBinding::DIRECTION_LEFT; + ? (uint32_t)dom::SimpleGestureEvent_Binding::DIRECTION_RIGHT + : (uint32_t)dom::SimpleGestureEvent_Binding::DIRECTION_LEFT; // We're ready to start the animation. Tell Gecko about it, and at the same // time ask it if it really wants to start an animation for this event. @@ -2746,8 +2746,8 @@ nsChildView::TrackScrollEventAsSwipe(const mozilla::PanGestureInput& aSwipeStart } uint32_t direction = (aSwipeStartEvent.mPanDisplacement.x > 0.0) - ? (uint32_t)dom::SimpleGestureEventBinding::DIRECTION_RIGHT - : (uint32_t)dom::SimpleGestureEventBinding::DIRECTION_LEFT; + ? (uint32_t)dom::SimpleGestureEvent_Binding::DIRECTION_RIGHT + : (uint32_t)dom::SimpleGestureEvent_Binding::DIRECTION_LEFT; mSwipeTracker = new SwipeTracker(*this, aSwipeStartEvent, aAllowedDirections, direction); @@ -4173,15 +4173,15 @@ NSEvent* gLastDragMouseDownEvent = nil; // Record the left/right direction. if (deltaX > 0.0) - geckoEvent.mDirection |= dom::SimpleGestureEventBinding::DIRECTION_LEFT; + geckoEvent.mDirection |= dom::SimpleGestureEvent_Binding::DIRECTION_LEFT; else if (deltaX < 0.0) - geckoEvent.mDirection |= dom::SimpleGestureEventBinding::DIRECTION_RIGHT; + geckoEvent.mDirection |= dom::SimpleGestureEvent_Binding::DIRECTION_RIGHT; // Record the up/down direction. if (deltaY > 0.0) - geckoEvent.mDirection |= dom::SimpleGestureEventBinding::DIRECTION_UP; + geckoEvent.mDirection |= dom::SimpleGestureEvent_Binding::DIRECTION_UP; else if (deltaY < 0.0) - geckoEvent.mDirection |= dom::SimpleGestureEventBinding::DIRECTION_DOWN; + geckoEvent.mDirection |= dom::SimpleGestureEvent_Binding::DIRECTION_DOWN; // Send the event. mGeckoChild->DispatchWindowEvent(geckoEvent); @@ -4372,9 +4372,9 @@ NSEvent* gLastDragMouseDownEvent = nil; geckoEvent.mDelta = -rotation; if (rotation > 0.0) { geckoEvent.mDirection = - dom::SimpleGestureEventBinding::ROTATION_COUNTERCLOCKWISE; + dom::SimpleGestureEvent_Binding::ROTATION_COUNTERCLOCKWISE; } else { - geckoEvent.mDirection = dom::SimpleGestureEventBinding::ROTATION_CLOCKWISE; + geckoEvent.mDirection = dom::SimpleGestureEvent_Binding::ROTATION_CLOCKWISE; } // Send the event. @@ -4465,10 +4465,10 @@ NSEvent* gLastDragMouseDownEvent = nil; geckoEvent.mDelta = -mCumulativeRotation; if (mCumulativeRotation > 0.0) { geckoEvent.mDirection = - dom::SimpleGestureEventBinding::ROTATION_COUNTERCLOCKWISE; + dom::SimpleGestureEvent_Binding::ROTATION_COUNTERCLOCKWISE; } else { geckoEvent.mDirection = - dom::SimpleGestureEventBinding::ROTATION_CLOCKWISE; + dom::SimpleGestureEvent_Binding::ROTATION_CLOCKWISE; } // Send the event. @@ -5289,8 +5289,8 @@ GetIntegerDeltaForEvent(NSEvent* aEvent) Preferences::GetBool("mousewheel.enable_pixel_scrolling", true); outWheelEvent->mDeltaMode = - usePreciseDeltas ? dom::WheelEventBinding::DOM_DELTA_PIXEL - : dom::WheelEventBinding::DOM_DELTA_LINE; + usePreciseDeltas ? dom::WheelEvent_Binding::DOM_DELTA_PIXEL + : dom::WheelEvent_Binding::DOM_DELTA_LINE; outWheelEvent->mIsMomentum = nsCocoaUtils::IsMomentumScrollEvent(aMouseEvent); } @@ -5367,7 +5367,7 @@ GetIntegerDeltaForEvent(NSEvent* aEvent) MOZ_ASSERT(aOutGeckoEvent->pressure >= 0.0 && aOutGeckoEvent->pressure <= 1.0); } - aOutGeckoEvent->inputSource = dom::MouseEventBinding::MOZ_SOURCE_PEN; + aOutGeckoEvent->inputSource = dom::MouseEvent_Binding::MOZ_SOURCE_PEN; aOutGeckoEvent->tiltX = lround([aPointerEvent tilt].x * 90); aOutGeckoEvent->tiltY = lround([aPointerEvent tilt].y * 90); aOutGeckoEvent->tangentialPressure = [aPointerEvent tangentialPressure]; diff --git a/widget/gtk/nsWindow.cpp b/widget/gtk/nsWindow.cpp index 382bda10e25c..622ee8a37e42 100644 --- a/widget/gtk/nsWindow.cpp +++ b/widget/gtk/nsWindow.cpp @@ -3244,7 +3244,7 @@ nsWindow::OnScrollEvent(GdkEventScroll *aEvent) return; #endif WidgetWheelEvent wheelEvent(true, eWheel, this); - wheelEvent.mDeltaMode = dom::WheelEventBinding::DOM_DELTA_LINE; + wheelEvent.mDeltaMode = dom::WheelEvent_Binding::DOM_DELTA_LINE; switch (aEvent->direction) { #if GTK_CHECK_VERSION(3,4,0) case GDK_SCROLL_SMOOTH: diff --git a/widget/headless/HeadlessWidget.h b/widget/headless/HeadlessWidget.h index e59f7fe0000e..19002f4c0eab 100644 --- a/widget/headless/HeadlessWidget.h +++ b/widget/headless/HeadlessWidget.h @@ -19,25 +19,25 @@ #define MOZ_HEADLESS_MOUSE_DOWN 4 // GDK_BUTTON_PRESS #define MOZ_HEADLESS_MOUSE_UP 7 // GDK_BUTTON_RELEASE #define MOZ_HEADLESS_SCROLL_MULTIPLIER 3 -#define MOZ_HEADLESS_SCROLL_DELTA_MODE mozilla::dom::WheelEventBinding::DOM_DELTA_LINE +#define MOZ_HEADLESS_SCROLL_DELTA_MODE mozilla::dom::WheelEvent_Binding::DOM_DELTA_LINE #elif defined(XP_WIN) #define MOZ_HEADLESS_MOUSE_MOVE 1 // MOUSEEVENTF_MOVE #define MOZ_HEADLESS_MOUSE_DOWN 2 // MOUSEEVENTF_LEFTDOWN #define MOZ_HEADLESS_MOUSE_UP 4 // MOUSEEVENTF_LEFTUP #define MOZ_HEADLESS_SCROLL_MULTIPLIER .025 // default scroll lines (3) / WHEEL_DELTA (120) -#define MOZ_HEADLESS_SCROLL_DELTA_MODE mozilla::dom::WheelEventBinding::DOM_DELTA_LINE +#define MOZ_HEADLESS_SCROLL_DELTA_MODE mozilla::dom::WheelEvent_Binding::DOM_DELTA_LINE #elif defined(XP_MACOSX) #define MOZ_HEADLESS_MOUSE_MOVE 5 // NSMouseMoved #define MOZ_HEADLESS_MOUSE_DOWN 1 // NSLeftMouseDown #define MOZ_HEADLESS_MOUSE_UP 2 // NSLeftMouseUp #define MOZ_HEADLESS_SCROLL_MULTIPLIER 1 -#define MOZ_HEADLESS_SCROLL_DELTA_MODE mozilla::dom::WheelEventBinding::DOM_DELTA_PIXEL +#define MOZ_HEADLESS_SCROLL_DELTA_MODE mozilla::dom::WheelEvent_Binding::DOM_DELTA_PIXEL #elif defined(ANDROID) #define MOZ_HEADLESS_MOUSE_MOVE 7 // ACTION_HOVER_MOVE #define MOZ_HEADLESS_MOUSE_DOWN 5 // ACTION_POINTER_DOWN #define MOZ_HEADLESS_MOUSE_UP 6 // ACTION_POINTER_UP #define MOZ_HEADLESS_SCROLL_MULTIPLIER 1 -#define MOZ_HEADLESS_SCROLL_DELTA_MODE mozilla::dom::WheelEventBinding::DOM_DELTA_LINE +#define MOZ_HEADLESS_SCROLL_DELTA_MODE mozilla::dom::WheelEvent_Binding::DOM_DELTA_LINE #else #define MOZ_HEADLESS_MOUSE_MOVE -1 #define MOZ_HEADLESS_MOUSE_DOWN -1 diff --git a/widget/nsBaseDragService.cpp b/widget/nsBaseDragService.cpp index 676525d820b7..b6acc8db6a4a 100644 --- a/widget/nsBaseDragService.cpp +++ b/widget/nsBaseDragService.cpp @@ -60,7 +60,7 @@ nsBaseDragService::nsBaseDragService() mDragAction(DRAGDROP_ACTION_NONE), mDragActionFromChildProcess(DRAGDROP_ACTION_UNINITIALIZED), mTargetSize(0,0), mContentPolicyType(nsIContentPolicy::TYPE_OTHER), - mSuppressLevel(0), mInputSource(MouseEventBinding::MOZ_SOURCE_MOUSE) + mSuppressLevel(0), mInputSource(MouseEvent_Binding::MOZ_SOURCE_MOUSE) { } @@ -463,7 +463,7 @@ nsBaseDragService::EndDragSession(bool aDoneDrag, uint32_t aKeyModifiers) mImageOffset = CSSIntPoint(); mScreenPosition = CSSIntPoint(); mEndDragPoint = LayoutDeviceIntPoint(0, 0); - mInputSource = MouseEventBinding::MOZ_SOURCE_MOUSE; + mInputSource = MouseEvent_Binding::MOZ_SOURCE_MOUSE; return NS_OK; } diff --git a/widget/uikit/nsWindow.mm b/widget/uikit/nsWindow.mm index 62832e917410..3f57384807c9 100644 --- a/widget/uikit/nsWindow.mm +++ b/widget/uikit/nsWindow.mm @@ -148,7 +148,7 @@ private: event.mClickCount = 1; event.button = WidgetMouseEvent::eLeftButton; event.mTime = PR_IntervalNow(); - event.inputSource = MouseEventBinding::MOZ_SOURCE_UNKNOWN; + event.inputSource = MouseEvent_Binding::MOZ_SOURCE_UNKNOWN; nsEventStatus status; aWindow->DispatchEvent(&event, status); diff --git a/widget/windows/WinMouseScrollHandler.cpp b/widget/windows/WinMouseScrollHandler.cpp index 0d885a2ca3d0..104756e261e8 100644 --- a/widget/windows/WinMouseScrollHandler.cpp +++ b/widget/windows/WinMouseScrollHandler.cpp @@ -697,14 +697,14 @@ MouseScrollHandler::HandleScrollMessageAsMouseWheelMessage(nsWindowBase* aWidget delta = -1.0; lineOrPageDelta = -1; case SB_PAGEDOWN: - wheelEvent.mDeltaMode = dom::WheelEventBinding::DOM_DELTA_PAGE; + wheelEvent.mDeltaMode = dom::WheelEvent_Binding::DOM_DELTA_PAGE; break; case SB_LINEUP: delta = -1.0; lineOrPageDelta = -1; case SB_LINEDOWN: - wheelEvent.mDeltaMode = dom::WheelEventBinding::DOM_DELTA_LINE; + wheelEvent.mDeltaMode = dom::WheelEvent_Binding::DOM_DELTA_LINE; break; default: @@ -853,8 +853,8 @@ MouseScrollHandler::LastEventInfo::InitWheelEvent( // Use orienter for computing our delta value with native delta value. int32_t orienter = mIsVertical ? -1 : 1; - aWheelEvent.mDeltaMode = mIsPage ? dom::WheelEventBinding::DOM_DELTA_PAGE : - dom::WheelEventBinding::DOM_DELTA_LINE; + aWheelEvent.mDeltaMode = mIsPage ? dom::WheelEvent_Binding::DOM_DELTA_PAGE : + dom::WheelEvent_Binding::DOM_DELTA_LINE; double& delta = mIsVertical ? aWheelEvent.mDeltaY : aWheelEvent.mDeltaX; int32_t& lineOrPageDelta = mIsVertical ? aWheelEvent.mLineOrPageDeltaY : @@ -871,7 +871,7 @@ MouseScrollHandler::LastEventInfo::InitWheelEvent( mAccumulatedDelta -= lineOrPageDelta * orienter * RoundDelta(nativeDeltaPerUnit); - if (aWheelEvent.mDeltaMode != dom::WheelEventBinding::DOM_DELTA_LINE) { + if (aWheelEvent.mDeltaMode != dom::WheelEvent_Binding::DOM_DELTA_LINE) { // If the scroll delta mode isn't per line scroll, we shouldn't allow to // override the system scroll speed setting. aWheelEvent.mAllowToOverrideSystemScrollSpeed = false; diff --git a/widget/windows/WinPointerEvents.cpp b/widget/windows/WinPointerEvents.cpp index 71ec5678935c..16d58f0f821d 100644 --- a/widget/windows/WinPointerEvents.cpp +++ b/widget/windows/WinPointerEvents.cpp @@ -159,7 +159,7 @@ WinPointerInfo* WinPointerEvents::GetCachedPointerInfo(UINT aMsg, WPARAM aWParam) { if (!sLibraryHandle || !sPointerEventEnabled || - MOUSE_INPUT_SOURCE() != dom::MouseEventBinding::MOZ_SOURCE_PEN || + MOUSE_INPUT_SOURCE() != dom::MouseEvent_Binding::MOZ_SOURCE_PEN || ShouldFirePointerEventByWinPointerMessages()) { return nullptr; } diff --git a/widget/windows/WinUtils.cpp b/widget/windows/WinUtils.cpp index 13cc5686ffbb..ffe6addf57b2 100644 --- a/widget/windows/WinUtils.cpp +++ b/widget/windows/WinUtils.cpp @@ -1078,12 +1078,12 @@ WinUtils::GetNativeMessage(UINT aInternalMessage) uint16_t WinUtils::GetMouseInputSource() { - int32_t inputSource = dom::MouseEventBinding::MOZ_SOURCE_MOUSE; + int32_t inputSource = dom::MouseEvent_Binding::MOZ_SOURCE_MOUSE; LPARAM lParamExtraInfo = ::GetMessageExtraInfo(); if ((lParamExtraInfo & TABLET_INK_SIGNATURE) == TABLET_INK_CHECK) { inputSource = (lParamExtraInfo & TABLET_INK_TOUCH) ? - dom::MouseEventBinding::MOZ_SOURCE_TOUCH : - dom::MouseEventBinding::MOZ_SOURCE_PEN; + dom::MouseEvent_Binding::MOZ_SOURCE_TOUCH : + dom::MouseEvent_Binding::MOZ_SOURCE_PEN; } return static_cast(inputSource); } diff --git a/widget/windows/WinUtils.h b/widget/windows/WinUtils.h index 9ac058db8f1e..7100130e5719 100644 --- a/widget/windows/WinUtils.h +++ b/widget/windows/WinUtils.h @@ -394,7 +394,7 @@ public: /** * GetMouseInputSource() returns a pointing device information. The value is - * one of MouseEventBinding::MOZ_SOURCE_*. This method MUST be called during + * one of MouseEvent_Binding::MOZ_SOURCE_*. This method MUST be called during * mouse message handling. */ static uint16_t GetMouseInputSource(); diff --git a/widget/windows/nsWinGesture.cpp b/widget/windows/nsWinGesture.cpp index d7596e68b53f..666ff945bcc1 100644 --- a/widget/windows/nsWinGesture.cpp +++ b/widget/windows/nsWinGesture.cpp @@ -209,10 +209,10 @@ nsWinGesture::ProcessGestureMessage(HWND hWnd, WPARAM wParam, LPARAM lParam, if (evt.mDelta > 0) { evt.mDirection = - dom::SimpleGestureEventBinding::ROTATION_COUNTERCLOCKWISE; + dom::SimpleGestureEvent_Binding::ROTATION_COUNTERCLOCKWISE; } else if (evt.mDelta < 0) { - evt.mDirection = dom::SimpleGestureEventBinding::ROTATION_CLOCKWISE; + evt.mDirection = dom::SimpleGestureEvent_Binding::ROTATION_CLOCKWISE; } if (gi.dwFlags & GF_BEGIN) { @@ -399,7 +399,7 @@ nsWinGesture::PanDeltaToPixelScroll(WidgetWheelEvent& aWheelEvent) aWheelEvent.mLineOrPageDeltaX = aWheelEvent.mLineOrPageDeltaY = 0; aWheelEvent.mRefPoint = LayoutDeviceIntPoint(mPanRefPoint.x, mPanRefPoint.y); - aWheelEvent.mDeltaMode = dom::WheelEventBinding::DOM_DELTA_PIXEL; + aWheelEvent.mDeltaMode = dom::WheelEvent_Binding::DOM_DELTA_PIXEL; aWheelEvent.mScrollType = WidgetWheelEvent::SCROLL_SYNCHRONOUSLY; aWheelEvent.mIsNoLineOrPageDelta = true; diff --git a/widget/windows/nsWindow.cpp b/widget/windows/nsWindow.cpp index fe4b31db4e35..db0389563b1e 100644 --- a/widget/windows/nsWindow.cpp +++ b/widget/windows/nsWindow.cpp @@ -4333,7 +4333,7 @@ bool nsWindow::TouchEventShouldStartDrag(EventMessage aEventMessage, WidgetMouseEvent::eReal); hittest.mRefPoint = aEventPoint; hittest.mIgnoreRootScrollFrame = true; - hittest.inputSource = MouseEventBinding::MOZ_SOURCE_TOUCH; + hittest.inputSource = MouseEvent_Binding::MOZ_SOURCE_TOUCH; DispatchInputEvent(&hittest); EventTarget* target = hittest.GetDOMEventTarget(); @@ -4437,7 +4437,7 @@ nsWindow::DispatchMouseEvent(EventMessage aEventMessage, WPARAM wParam, // Since it is unclear whether a user will use the digitizer, // Postpone initialization until first PEN message will be found. - if (MouseEventBinding::MOZ_SOURCE_PEN == aInputSource + if (MouseEvent_Binding::MOZ_SOURCE_PEN == aInputSource // Messages should be only at topLevel window. && nsWindowType::eWindowType_toplevel == mWindowType // Currently this scheme is used only when pointer events is enabled. @@ -5695,7 +5695,7 @@ nsWindow::ProcessMessage(UINT msg, WPARAM& wParam, LPARAM& lParam, pointerInfo.pointerId = pointerId; DispatchMouseEvent(eMouseExitFromWidget, wParam, pos, false, WidgetMouseEvent::eLeftButton, - MouseEventBinding::MOZ_SOURCE_PEN, &pointerInfo); + MouseEvent_Binding::MOZ_SOURCE_PEN, &pointerInfo); InkCollector::sInkCollector->ClearTarget(); InkCollector::sInkCollector->ClearPointerId(); } @@ -5707,7 +5707,7 @@ nsWindow::ProcessMessage(UINT msg, WPARAM& wParam, LPARAM& lParam, // If the context menu is brought up by a touch long-press, then // the APZ code is responsible for dealing with this, so we don't // need to do anything. - if (mTouchWindow && MOUSE_INPUT_SOURCE() == MouseEventBinding::MOZ_SOURCE_TOUCH) { + if (mTouchWindow && MOUSE_INPUT_SOURCE() == MouseEvent_Binding::MOZ_SOURCE_TOUCH) { MOZ_ASSERT(mAPZC); // since mTouchWindow is true, APZ must be enabled result = true; break; @@ -7054,7 +7054,7 @@ bool nsWindow::OnGesture(WPARAM wParam, LPARAM lParam) wheelEvent.button = 0; wheelEvent.mTime = ::GetMessageTime(); wheelEvent.mTimeStamp = GetMessageTimeStamp(wheelEvent.mTime); - wheelEvent.inputSource = MouseEventBinding::MOZ_SOURCE_TOUCH; + wheelEvent.inputSource = MouseEvent_Binding::MOZ_SOURCE_TOUCH; bool endFeedback = true; @@ -7091,7 +7091,7 @@ bool nsWindow::OnGesture(WPARAM wParam, LPARAM lParam) event.button = 0; event.mTime = ::GetMessageTime(); event.mTimeStamp = GetMessageTimeStamp(event.mTime); - event.inputSource = MouseEventBinding::MOZ_SOURCE_TOUCH; + event.inputSource = MouseEvent_Binding::MOZ_SOURCE_TOUCH; nsEventStatus status; DispatchEvent(&event, status); @@ -7975,7 +7975,7 @@ nsWindow::DealWithPopups(HWND aWnd, UINT aMessage, case WM_NCMBUTTONDOWN: if (nativeMessage != WM_TOUCH && IsTouchSupportEnabled(aWnd) && - MOUSE_INPUT_SOURCE() == MouseEventBinding::MOZ_SOURCE_TOUCH) { + MOUSE_INPUT_SOURCE() == MouseEvent_Binding::MOZ_SOURCE_TOUCH) { // If any of these mouse events are really compatibility events that // Windows is sending for touch inputs, then don't allow them to dismiss // popups when APZ is enabled (instead we do the dismissing as part of @@ -8524,7 +8524,7 @@ bool nsWindow::OnPointerEvents(UINT msg, WPARAM aWParam, LPARAM aLParam) // location LPARAM newLParam = lParamToClient(aLParam); DispatchMouseEvent(message, aWParam, newLParam, false, button, - MouseEventBinding::MOZ_SOURCE_PEN, &pointerInfo); + MouseEvent_Binding::MOZ_SOURCE_PEN, &pointerInfo); // Consume WM_POINTER* to stop Windows fires WM_*BUTTONDOWN / WM_*BUTTONUP // WM_MOUSEMOVE. return true; diff --git a/widget/windows/nsWindow.h b/widget/windows/nsWindow.h index 56c3fc36da52..4b0e741e92d9 100644 --- a/widget/windows/nsWindow.h +++ b/widget/windows/nsWindow.h @@ -236,7 +236,7 @@ public: int16_t aButton = mozilla::WidgetMouseEvent::eLeftButton, uint16_t aInputSource = - mozilla::dom::MouseEventBinding::MOZ_SOURCE_MOUSE, + mozilla::dom::MouseEvent_Binding::MOZ_SOURCE_MOUSE, WinPointerInfo* aPointerInfo = nullptr); virtual bool DispatchWindowEvent(mozilla::WidgetGUIEvent* aEvent, nsEventStatus& aStatus);