Bug 925812 - rm nsIDOMGamepad.idl. r=smaug
authorTed Mielczarek <ted@mielczarek.org>
Thu, 17 Oct 2013 15:07:16 -0400
changeset 151474 695c4a84c53860665ac121046a43f9bcd26c8dc0
parent 151473 6c453628ae3125946034d41793d51617f6ecd4ff
child 151475 2c7feaa3d1be7d2a761237fa926722895fa253f7
push id25495
push userphilringnalda@gmail.com
push dateMon, 21 Oct 2013 02:25:32 +0000
treeherdermozilla-central@7823e2985daf [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssmaug
bugs925812
milestone27.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 925812 - rm nsIDOMGamepad.idl. r=smaug
dom/gamepad/Gamepad.cpp
dom/gamepad/Gamepad.h
dom/interfaces/gamepad/moz.build
dom/interfaces/gamepad/nsIDOMGamepad.idl
--- a/dom/gamepad/Gamepad.cpp
+++ b/dom/gamepad/Gamepad.cpp
@@ -12,17 +12,16 @@ namespace mozilla {
 namespace dom {
 
 NS_IMPL_CYCLE_COLLECTING_ADDREF(Gamepad)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(Gamepad)
 
 NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(Gamepad)
   NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY
   NS_INTERFACE_MAP_ENTRY(nsISupports)
-  NS_INTERFACE_MAP_ENTRY(nsIDOMGamepad)
 NS_INTERFACE_MAP_END
 
 NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_1(Gamepad, mParent)
 
 Gamepad::Gamepad(nsISupports* aParent,
                  const nsAString& aID, uint32_t aIndex,
                  GamepadMappingType aMapping,
                  uint32_t aNumButtons, uint32_t aNumAxes)
--- a/dom/gamepad/Gamepad.h
+++ b/dom/gamepad/Gamepad.h
@@ -3,17 +3,16 @@
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_dom_gamepad_Gamepad_h
 #define mozilla_dom_gamepad_Gamepad_h
 
 #include "mozilla/ErrorResult.h"
 #include <stdint.h>
 #include "nsCOMPtr.h"
-#include "nsIDOMGamepad.h"
 #include "nsIVariant.h"
 #include "nsString.h"
 #include "nsTArray.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
 namespace dom {
 
@@ -28,18 +27,18 @@ enum GamepadMappingType
 struct GamepadButton
 {
   bool pressed;
   double value;
 
   GamepadButton(): pressed(false), value(0.0) {}
 };
 
-class Gamepad : public nsIDOMGamepad
-              , public nsWrapperCache
+class Gamepad : public nsISupports,
+                public nsWrapperCache
 {
 public:
   Gamepad(nsISupports* aParent,
           const nsAString& aID, uint32_t aIndex,
           GamepadMappingType aMapping,
           uint32_t aNumButtons, uint32_t aNumAxes);
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(Gamepad)
--- a/dom/interfaces/gamepad/moz.build
+++ b/dom/interfaces/gamepad/moz.build
@@ -2,11 +2,10 @@
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 XPIDL_MODULE = 'dom_gamepad'
 
 XPIDL_SOURCES = [
-  'nsIDOMGamepad.idl',
   'nsIGamepadServiceTest.idl',
   ]
deleted file mode 100644
--- a/dom/interfaces/gamepad/nsIDOMGamepad.idl
+++ /dev/null
@@ -1,12 +0,0 @@
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this file,
- * You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-#include "nsISupports.idl"
-
-interface nsIVariant;
-
-[builtinclass, scriptable, uuid(ff13acd9-11da-4817-8f2a-4a5700dfd13e)]
-interface nsIDOMGamepad : nsISupports
-{
-};