From fb296d2a4803fa1349aac2b22e3dcaa1ec020595 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Tue, 9 Jul 2013 10:54:05 -0400
Subject: [PATCH] Fix sorting on variables in WebIDL.mk, and also fix the wrong
 sorting order in Bindings.conf added in bug 855611

--HG--
extra : rebase_source : 87aa51d944193f73ea0a4e04c660785e6f5ddb4b
---
 dom/bindings/Bindings.conf |  46 +++++-----
 dom/webidl/WebIDL.mk       | 172 ++++++++++++++++++-------------------
 2 files changed, 109 insertions(+), 109 deletions(-)

diff --git a/dom/bindings/Bindings.conf b/dom/bindings/Bindings.conf
index 15cf309fb27e..75962959dcbc 100644
--- a/dom/bindings/Bindings.conf
+++ b/dom/bindings/Bindings.conf
@@ -657,6 +657,18 @@ DOMInterfaces = {
     'nativeType': 'nsDOMMessageEvent',
 },
 
+'MimeType': {
+    'headerFile' : 'nsMimeTypeArray.h',
+    'nativeType': 'nsMimeType',
+    'nativeOwnership': 'refcounted',
+    'resultNotAddRefed': [ 'enabledPlugin' ]
+},
+
+'MimeTypeArray': {
+    'nativeType': 'nsMimeTypeArray',
+    'resultNotAddRefed': [ 'item', 'namedItem' ]
+},
+
 'MouseEvent': {
     'nativeType': 'nsDOMMouseEvent',
 },
@@ -782,6 +794,17 @@ DOMInterfaces = {
     'nativeOwnership': 'refcounted'
 },
 
+'Plugin': {
+    'headerFile' : 'nsPluginArray.h',
+    'nativeType': 'nsPluginElement',
+    'resultNotAddRefed': [ 'item', 'namedItem' ]
+},
+
+'PluginArray': {
+    'nativeType': 'nsPluginArray',
+    'resultNotAddRefed': [ 'item', 'namedItem' ]
+},
+
 'Position': {
     'headerFile': 'nsGeoPosition.h'
 },
@@ -1376,29 +1399,6 @@ DOMInterfaces = {
     'resultNotAddRefed': [ 'controllers', 'style' ]
 },
 
-'Plugin': {
-    'headerFile' : 'nsPluginArray.h',
-    'nativeType': 'nsPluginElement',
-    'resultNotAddRefed': [ 'item', 'namedItem' ]
-},
-
-'PluginArray': {
-    'nativeType': 'nsPluginArray',
-    'resultNotAddRefed': [ 'item', 'namedItem' ]
-},
-
-'MimeType': {
-    'headerFile' : 'nsMimeTypeArray.h',
-    'nativeType': 'nsMimeType',
-    'nativeOwnership': 'refcounted',
-    'resultNotAddRefed': [ 'enabledPlugin' ]
-},
-
-'MimeTypeArray': {
-    'nativeType': 'nsMimeTypeArray',
-    'resultNotAddRefed': [ 'item', 'namedItem' ]
-},
-
 ####################################
 # Test Interfaces of various sorts #
 ####################################
diff --git a/dom/webidl/WebIDL.mk b/dom/webidl/WebIDL.mk
index 985518d10be5..ee6da032591d 100644
--- a/dom/webidl/WebIDL.mk
+++ b/dom/webidl/WebIDL.mk
@@ -21,17 +21,23 @@ webidl_files = \
   AudioListener.webidl \
   AudioNode.webidl \
   AudioParam.webidl \
-  AudioStreamTrack.webidl \
   AudioProcessingEvent.webidl \
+  AudioStreamTrack.webidl \
   BarProp.webidl \
   BatteryManager.webidl \
   BeforeUnloadEvent.webidl \
   BiquadFilterNode.webidl \
   Blob.webidl \
+  CDATASection.webidl \
+  CSS.webidl \
+  CSSPrimitiveValue.webidl \
+  CSSStyleDeclaration.webidl \
+  CSSStyleSheet.webidl \
+  CSSValue.webidl \
+  CSSValueList.webidl \
   CameraManager.webidl \
   CanvasRenderingContext2D.webidl \
   CaretPosition.webidl \
-  CDATASection.webidl \
   ChannelMergerNode.webidl \
   ChannelSplitterNode.webidl \
   CharacterData.webidl \
@@ -44,20 +50,6 @@ webidl_files = \
   CompositionEvent.webidl \
   ConvolverNode.webidl \
   Coordinates.webidl \
-  CSS.webidl \
-  CSSPrimitiveValue.webidl \
-  CSSStyleDeclaration.webidl \
-  CSSStyleSheet.webidl \
-  CSSValue.webidl \
-  CSSValueList.webidl \
-  DataContainerEvent.webidl \
-  DelayNode.webidl \
-  DesktopNotification.webidl \
-  DeviceMotionEvent.webidl \
-  DeviceStorage.webidl \
-  Document.webidl \
-  DocumentFragment.webidl \
-  DocumentType.webidl \
   DOMCursor.webidl \
   DOMError.webidl \
   DOMImplementation.webidl \
@@ -68,6 +60,14 @@ webidl_files = \
   DOMStringMap.webidl \
   DOMTokenList.webidl \
   DOMTransaction.webidl \
+  DataContainerEvent.webidl \
+  DelayNode.webidl \
+  DesktopNotification.webidl \
+  DeviceMotionEvent.webidl \
+  DeviceStorage.webidl \
+  Document.webidl \
+  DocumentFragment.webidl \
+  DocumentType.webidl \
   DragEvent.webidl \
   DummyBinding.webidl \
   DynamicsCompressorNode.webidl \
@@ -94,17 +94,17 @@ webidl_files = \
   HTMLAppletElement.webidl \
   HTMLAreaElement.webidl \
   HTMLAudioElement.webidl \
+  HTMLBRElement.webidl \
   HTMLBaseElement.webidl \
   HTMLBodyElement.webidl \
-  HTMLBRElement.webidl \
   HTMLButtonElement.webidl \
   HTMLCanvasElement.webidl \
   HTMLCollection.webidl \
+  HTMLDListElement.webidl \
   HTMLDataElement.webidl \
   HTMLDataListElement.webidl \
   HTMLDirectoryElement.webidl \
   HTMLDivElement.webidl \
-  HTMLDListElement.webidl \
   HTMLDocument.webidl \
   HTMLElement.webidl \
   HTMLEmbedElement.webidl \
@@ -113,16 +113,16 @@ webidl_files = \
   HTMLFormElement.webidl \
   HTMLFrameElement.webidl \
   HTMLFrameSetElement.webidl \
+  HTMLHRElement.webidl \
   HTMLHeadElement.webidl \
   HTMLHeadingElement.webidl \
-  HTMLHRElement.webidl \
   HTMLHtmlElement.webidl \
   HTMLIFrameElement.webidl \
   HTMLImageElement.webidl \
   HTMLInputElement.webidl \
+  HTMLLIElement.webidl \
   HTMLLabelElement.webidl \
   HTMLLegendElement.webidl \
-  HTMLLIElement.webidl \
   HTMLLinkElement.webidl \
   HTMLMapElement.webidl \
   HTMLMediaElement.webidl \
@@ -131,8 +131,8 @@ webidl_files = \
   HTMLMetaElement.webidl \
   HTMLMeterElement.webidl \
   HTMLModElement.webidl \
-  HTMLObjectElement.webidl \
   HTMLOListElement.webidl \
+  HTMLObjectElement.webidl \
   HTMLOptGroupElement.webidl \
   HTMLOptionElement.webidl \
   HTMLOptionsCollection.webidl \
@@ -156,9 +156,9 @@ webidl_files = \
   HTMLTableSectionElement.webidl \
   HTMLTemplateElement.webidl \
   HTMLTextAreaElement.webidl \
-  HTMLTrackElement.webidl \
   HTMLTimeElement.webidl \
   HTMLTitleElement.webidl \
+  HTMLTrackElement.webidl \
   HTMLUListElement.webidl \
   HTMLVideoElement.webidl \
   IDBDatabase.webidl \
@@ -168,8 +168,8 @@ webidl_files = \
   ImageData.webidl \
   ImageDocument.webidl \
   InspectorUtils.webidl \
-  KeyboardEvent.webidl \
   KeyEvent.webidl \
+  KeyboardEvent.webidl \
   LinkStyle.webidl \
   LocalMediaStream.webidl \
   Location.webidl \
@@ -181,6 +181,8 @@ webidl_files = \
   MediaStreamEvent.webidl \
   MediaStreamTrack.webidl \
   MessageEvent.webidl \
+  MimeType.webidl \
+  MimeTypeArray.webidl \
   MobileMessageManager.webidl \
   MouseEvent.webidl \
   MouseScrollEvent.webidl \
@@ -208,11 +210,11 @@ webidl_files = \
   PerformanceNavigation.webidl \
   PerformanceTiming.webidl \
   PeriodicWave.webidl \
+  Plugin.webidl \
+  PluginArray.webidl \
   Position.webidl \
   PositionError.webidl \
   ProcessingInstruction.webidl \
-  Range.webidl \
-  Rect.webidl \
   RGBColor.webidl \
   RTCConfiguration.webidl \
   RTCDataChannelEvent.webidl \
@@ -220,16 +222,14 @@ webidl_files = \
   RTCPeerConnection.webidl \
   RTCPeerConnectionIceEvent.webidl \
   RTCSessionDescription.webidl \
-  Screen.webidl \
-  ScriptProcessorNode.webidl \
-  ScrollAreaEvent.webidl \
-  SimpleGestureEvent.webidl \
-  SourceBufferList.webidl \
-  SourceBuffer.webidl \
-  StyleSheet.webidl \
+  Range.webidl \
+  Rect.webidl \
   SVGAElement.webidl \
   SVGAltGlyphElement.webidl \
   SVGAngle.webidl \
+  SVGAnimateElement.webidl \
+  SVGAnimateMotionElement.webidl \
+  SVGAnimateTransformElement.webidl \
   SVGAnimatedAngle.webidl \
   SVGAnimatedBoolean.webidl \
   SVGAnimatedEnumeration.webidl \
@@ -244,9 +244,6 @@ webidl_files = \
   SVGAnimatedRect.webidl \
   SVGAnimatedString.webidl \
   SVGAnimatedTransformList.webidl \
-  SVGAnimateElement.webidl \
-  SVGAnimateMotionElement.webidl \
-  SVGAnimateTransformElement.webidl \
   SVGAnimationElement.webidl \
   SVGCircleElement.webidl \
   SVGClipPathElement.webidl \
@@ -256,8 +253,6 @@ webidl_files = \
   SVGDocument.webidl \
   SVGElement.webidl \
   SVGEllipseElement.webidl \
-  SVGFilterElement.webidl \
-  SVGFilterPrimitiveStandardAttributes.webidl \
   SVGFEBlendElement.webidl \
   SVGFEColorMatrixElement.webidl \
   SVGFEComponentTransferElement.webidl \
@@ -282,6 +277,8 @@ webidl_files = \
   SVGFESpotLightElement.webidl \
   SVGFETileElement.webidl \
   SVGFETurbulenceElement.webidl \
+  SVGFilterElement.webidl \
+  SVGFilterPrimitiveStandardAttributes.webidl \
   SVGFitToViewBox.webidl \
   SVGForeignObjectElement.webidl \
   SVGGElement.webidl \
@@ -289,13 +286,13 @@ webidl_files = \
   SVGGraphicsElement.webidl \
   SVGImageElement.webidl \
   SVGLengthList.webidl \
-  SVGLinearGradientElement.webidl \
   SVGLineElement.webidl \
+  SVGLinearGradientElement.webidl \
+  SVGMPathElement.webidl \
   SVGMarkerElement.webidl \
   SVGMaskElement.webidl \
   SVGMatrix.webidl \
   SVGMetadataElement.webidl \
-  SVGMPathElement.webidl \
   SVGNumberList.webidl \
   SVGPathElement.webidl \
   SVGPathSeg.webidl \
@@ -309,14 +306,15 @@ webidl_files = \
   SVGRadialGradientElement.webidl \
   SVGRect.webidl \
   SVGRectElement.webidl \
+  SVGSVGElement.webidl \
   SVGScriptElement.webidl \
   SVGSetElement.webidl \
   SVGStopElement.webidl \
   SVGStringList.webidl \
   SVGStyleElement.webidl \
-  SVGSVGElement.webidl \
   SVGSwitchElement.webidl \
   SVGSymbolElement.webidl \
+  SVGTSpanElement.webidl \
   SVGTests.webidl \
   SVGTextContentElement.webidl \
   SVGTextElement.webidl \
@@ -325,13 +323,19 @@ webidl_files = \
   SVGTitleElement.webidl \
   SVGTransform.webidl \
   SVGTransformList.webidl \
-  SVGTSpanElement.webidl \
+  SVGURIReference.webidl \
   SVGUnitTypes.webidl \
   SVGUseElement.webidl \
-  SVGURIReference.webidl \
   SVGViewElement.webidl \
   SVGZoomAndPan.webidl \
   SVGZoomEvent.webidl \
+  Screen.webidl \
+  ScriptProcessorNode.webidl \
+  ScrollAreaEvent.webidl \
+  SimpleGestureEvent.webidl \
+  SourceBuffer.webidl \
+  SourceBufferList.webidl \
+  StyleSheet.webidl \
   Text.webidl \
   TextDecoder.webidl \
   TextEncoder.webidl \
@@ -348,15 +352,15 @@ webidl_files = \
   TreeWalker.webidl \
   UIEvent.webidl \
   URL.webidl \
-  ValidityState.webidl \
-  WebComponents.webidl \
-  WebSocket.webidl \
-  WheelEvent.webidl \
-  UndoManager.webidl \
   URLUtils.webidl \
+  UndoManager.webidl \
+  ValidityState.webidl \
   VideoPlaybackQuality.webidl \
   VideoStreamTrack.webidl \
   WaveShaperNode.webidl \
+  WebComponents.webidl \
+  WebSocket.webidl \
+  WheelEvent.webidl \
   Window.webidl \
   XMLDocument.webidl \
   XMLHttpRequest.webidl \
@@ -368,10 +372,6 @@ webidl_files = \
   XULCommandEvent.webidl \
   XULDocument.webidl \
   XULElement.webidl \
-  Plugin.webidl \
-  PluginArray.webidl \
-  MimeType.webidl \
-  MimeTypeArray.webidl \
   $(NULL)
 
 ifdef MOZ_AUDIO_CHANNEL_MANAGER
@@ -397,14 +397,14 @@ ifdef MOZ_WEBSPEECH
 webidl_files += \
   SpeechGrammar.webidl \
   SpeechGrammarList.webidl \
-  SpeechRecognitionAlternative.webidl \
-  SpeechRecognitionResultList.webidl \
-  SpeechRecognitionResult.webidl \
   SpeechRecognition.webidl \
-  SpeechSynthesisUtterance.webidl \
-  SpeechSynthesisVoice.webidl \
+  SpeechRecognitionAlternative.webidl \
+  SpeechRecognitionResult.webidl \
+  SpeechRecognitionResultList.webidl \
   SpeechSynthesis.webidl \
   SpeechSynthesisEvent.webidl \
+  SpeechSynthesisUtterance.webidl \
+  SpeechSynthesisVoice.webidl \
   $(NULL)
 endif
 
@@ -421,32 +421,32 @@ webidl_files += \
 endif
 
 webidl_files += \
-  ProgressEvent.webidl \
-  StorageEvent.webidl \
-  DeviceProximityEvent.webidl \
-  MozSettingsEvent.webidl \
-  UserProximityEvent.webidl \
-  CustomEvent.webidl \
-  PageTransitionEvent.webidl \
-  DOMTransactionEvent.webidl \
-  PopStateEvent.webidl \
-  HashChangeEvent.webidl \
-  CloseEvent.webidl \
-  MozContactChangeEvent.webidl \
-  DeviceOrientationEvent.webidl \
-  DeviceLightEvent.webidl \
-  MozApplicationEvent.webidl \
-  SmartCardEvent.webidl \
-  StyleRuleChangeEvent.webidl \
-  StyleSheetChangeEvent.webidl \
-  StyleSheetApplicableStateChangeEvent.webidl \
-  ElementReplaceEvent.webidl \
-  MozSmsEvent.webidl \
-  MozMmsEvent.webidl \
-  DeviceStorageChangeEvent.webidl \
-  PopupBlockedEvent.webidl \
   BlobEvent.webidl \
+  CloseEvent.webidl \
+  CustomEvent.webidl \
+  DOMTransactionEvent.webidl \
+  DeviceLightEvent.webidl \
+  DeviceOrientationEvent.webidl \
+  DeviceProximityEvent.webidl \
+  DeviceStorageChangeEvent.webidl \
+  ElementReplaceEvent.webidl \
+  HashChangeEvent.webidl \
+  MozApplicationEvent.webidl \
+  MozContactChangeEvent.webidl \
+  MozMmsEvent.webidl \
+  MozSettingsEvent.webidl \
+  MozSmsEvent.webidl \
+  PageTransitionEvent.webidl \
+  PopStateEvent.webidl \
+  PopupBlockedEvent.webidl \
+  ProgressEvent.webidl \
   RecordErrorEvent.webidl \
+  SmartCardEvent.webidl \
+  StorageEvent.webidl \
+  StyleRuleChangeEvent.webidl \
+  StyleSheetApplicableStateChangeEvent.webidl \
+  StyleSheetChangeEvent.webidl \
+  UserProximityEvent.webidl \
   $(NULL)
 
 ifdef MOZ_B2G_BT
@@ -457,30 +457,30 @@ endif
 
 ifdef MOZ_B2G_RIL
 webidl_files += \
-  CallEvent.webidl \
   CFStateChangeEvent.webidl \
+  CallEvent.webidl \
   DataErrorEvent.webidl \
   IccCardLockErrorEvent.webidl \
-  MozWifiStatusChangeEvent.webidl \
-  MozWifiConnectionInfoEvent.webidl \
   MozCellBroadcastEvent.webidl \
   MozVoicemailEvent.webidl \
+  MozWifiConnectionInfoEvent.webidl \
+  MozWifiStatusChangeEvent.webidl \
   USSDReceivedEvent.webidl \
   $(NULL)
 endif
 
 ifdef MOZ_GAMEPAD
 webidl_files += \
-  GamepadEvent.webidl \
-  GamepadButtonEvent.webidl \
   GamepadAxisMoveEvent.webidl \
+  GamepadButtonEvent.webidl \
+  GamepadEvent.webidl \
   $(NULL)
 endif
 
 ifdef MOZ_WEBSPEECH
 webidl_files += \
-  SpeechRecognitionEvent.webidl \
   SpeechRecognitionError.webidl \
+  SpeechRecognitionEvent.webidl \
   $(NULL)
 endif