Bug 1146293 - Fix coding style break (intent and line length) caused by Bug 1117172 and Bug 1145631. r=shuang
authorJocelyn Liu <joliu@mozilla.com>
Mon, 23 Mar 2015 19:37:00 -0400
changeset 264171 97f2b63455b250eeda79f82c5f967d32c99b463e
parent 264170 d8c689def44e5fe3285888fdc72321694fd160b8
child 264172 1e86367b00238af5e0c4dfff2e9a893671d3f7fc
push id4718
push userraliiev@mozilla.com
push dateMon, 11 May 2015 18:39:53 +0000
treeherdermozilla-beta@c20c4ef55f08 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersshuang
bugs1146293, 1117172, 1145631
milestone39.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 1146293 - Fix coding style break (intent and line length) caused by Bug 1117172 and Bug 1145631. r=shuang
dom/bluetooth2/BluetoothAdapter.h
dom/bluetooth2/BluetoothClassOfDevice.cpp
dom/bluetooth2/BluetoothClassOfDevice.h
dom/bluetooth2/BluetoothDevice.cpp
dom/bluetooth2/BluetoothDevice.h
dom/bluetooth2/BluetoothDiscoveryHandle.cpp
dom/bluetooth2/BluetoothDiscoveryHandle.h
dom/bluetooth2/BluetoothGatt.cpp
dom/bluetooth2/BluetoothGatt.h
dom/bluetooth2/BluetoothManager.h
dom/bluetooth2/BluetoothPairingHandle.cpp
dom/bluetooth2/BluetoothPairingHandle.h
dom/bluetooth2/BluetoothPairingListener.cpp
dom/bluetooth2/BluetoothPairingListener.h
dom/bluetooth2/bluedroid/BluetoothGattManager.h
--- a/dom/bluetooth2/BluetoothAdapter.h
+++ b/dom/bluetooth2/BluetoothAdapter.h
@@ -159,17 +159,18 @@ public:
     Create(nsPIDOMWindow* aOwner, const BluetoothValue& aValue);
 
   void Notify(const BluetoothSignal& aParam); // BluetoothSignalObserver
   nsPIDOMWindow* GetParentObject() const
   {
      return GetOwner();
   }
 
-  virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
+  virtual JSObject* WrapObject(JSContext* aCx,
+                               JS::Handle<JSObject*> aGivenProto) override;
   virtual void DisconnectFromOwner() override;
 
   /**
    * Set this adapter's discovery handle in use (mDiscoveryHandleInUse).
    *
    * |mDiscoveryHandleInUse| is set to the latest discovery handle when adapter
    * just starts discovery, and is reset to nullptr when discovery is stopped
    * by some adapter.
--- a/dom/bluetooth2/BluetoothClassOfDevice.cpp
+++ b/dom/bluetooth2/BluetoothClassOfDevice.cpp
@@ -90,12 +90,13 @@ BluetoothClassOfDevice::Create(nsPIDOMWi
   MOZ_ASSERT(NS_IsMainThread());
   MOZ_ASSERT(aOwner);
 
   nsRefPtr<BluetoothClassOfDevice> cod = new BluetoothClassOfDevice(aOwner);
   return cod.forget();
 }
 
 JSObject*
-BluetoothClassOfDevice::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
+BluetoothClassOfDevice::WrapObject(JSContext* aCx,
+                                   JS::Handle<JSObject*> aGivenProto)
 {
   return BluetoothClassOfDeviceBinding::Wrap(aCx, this, aGivenProto);
 }
--- a/dom/bluetooth2/BluetoothClassOfDevice.h
+++ b/dom/bluetooth2/BluetoothClassOfDevice.h
@@ -13,18 +13,18 @@
 #include "nsCycleCollectionParticipant.h"
 #include "nsPIDOMWindow.h"
 #include "nsWrapperCache.h"
 
 struct JSContext;
 
 BEGIN_BLUETOOTH_NAMESPACE
 
-class BluetoothClassOfDevice final : public nsISupports,
-                                         public nsWrapperCache
+class BluetoothClassOfDevice final : public nsISupports
+                                   , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(BluetoothClassOfDevice)
 
   static already_AddRefed<BluetoothClassOfDevice>
     Create(nsPIDOMWindow* aOwner);
 
@@ -64,17 +64,18 @@ public:
    * @param aValue [in] CoD value to update
    */
   void Update(const uint32_t aValue);
 
   nsPIDOMWindow* GetParentObject() const
   {
     return mOwnerWindow;
   }
-  virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
+  virtual JSObject* WrapObject(JSContext* aCx,
+                               JS::Handle<JSObject*> aGivenProto) override;
 
 private:
   BluetoothClassOfDevice(nsPIDOMWindow* aOwner);
   ~BluetoothClassOfDevice();
 
   /**
    * Reset CoD to default value.
    */
--- a/dom/bluetooth2/BluetoothDevice.cpp
+++ b/dom/bluetooth2/BluetoothDevice.cpp
@@ -315,12 +315,13 @@ BluetoothDevice::GetGatt()
   if (!mGatt) {
     mGatt = new BluetoothGatt(GetOwner(), mAddress);
   }
 
   return mGatt;
 }
 
 JSObject*
-BluetoothDevice::WrapObject(JSContext* aContext, JS::Handle<JSObject*> aGivenProto)
+BluetoothDevice::WrapObject(JSContext* aContext,
+                            JS::Handle<JSObject*> aGivenProto)
 {
   return BluetoothDeviceBinding::Wrap(aContext, this, aGivenProto);
 }
--- a/dom/bluetooth2/BluetoothDevice.h
+++ b/dom/bluetooth2/BluetoothDevice.h
@@ -25,17 +25,17 @@ BEGIN_BLUETOOTH_NAMESPACE
 class BluetoothClassOfDevice;
 class BluetoothGatt;
 class BluetoothNamedValue;
 class BluetoothValue;
 class BluetoothSignal;
 class BluetoothSocket;
 
 class BluetoothDevice final : public DOMEventTargetHelper
-                                , public BluetoothSignalObserver
+                            , public BluetoothSignalObserver
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(BluetoothDevice,
                                            DOMEventTargetHelper)
 
   /****************************************************************************
    * Attribute Getters
@@ -89,17 +89,18 @@ public:
     Create(nsPIDOMWindow* aOwner, const BluetoothValue& aValue);
 
   void Notify(const BluetoothSignal& aParam); // BluetoothSignalObserver
   nsPIDOMWindow* GetParentObject() const
   {
      return GetOwner();
   }
 
-  virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
+  virtual JSObject* WrapObject(JSContext* aCx,
+                               JS::Handle<JSObject*> aGivenProto) override;
   virtual void DisconnectFromOwner() override;
 
 private:
   BluetoothDevice(nsPIDOMWindow* aOwner, const BluetoothValue& aValue);
   ~BluetoothDevice();
 
   /**
    * Set device properties according to properties array
--- a/dom/bluetooth2/BluetoothDiscoveryHandle.cpp
+++ b/dom/bluetooth2/BluetoothDiscoveryHandle.cpp
@@ -53,12 +53,13 @@ BluetoothDiscoveryHandle::DispatchDevice
   nsRefPtr<BluetoothDeviceEvent> event =
     BluetoothDeviceEvent::Constructor(this,
                                       NS_LITERAL_STRING("devicefound"),
                                       init);
   DispatchTrustedEvent(event);
 }
 
 JSObject*
-BluetoothDiscoveryHandle::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
+BluetoothDiscoveryHandle::WrapObject(JSContext* aCx,
+                                     JS::Handle<JSObject*> aGivenProto)
 {
   return BluetoothDiscoveryHandleBinding::Wrap(aCx, this, aGivenProto);
 }
--- a/dom/bluetooth2/BluetoothDiscoveryHandle.h
+++ b/dom/bluetooth2/BluetoothDiscoveryHandle.h
@@ -25,17 +25,18 @@ public:
 
   static already_AddRefed<BluetoothDiscoveryHandle>
     Create(nsPIDOMWindow* aWindow);
 
   void DispatchDeviceEvent(BluetoothDevice* aDevice);
 
   IMPL_EVENT_HANDLER(devicefound);
 
-  virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
+  virtual JSObject* WrapObject(JSContext* aCx,
+                               JS::Handle<JSObject*> aGivenProto) override;
 
 private:
   BluetoothDiscoveryHandle(nsPIDOMWindow* aWindow);
   ~BluetoothDiscoveryHandle();
 };
 
 END_BLUETOOTH_NAMESPACE
 
--- a/dom/bluetooth2/BluetoothGatt.cpp
+++ b/dom/bluetooth2/BluetoothGatt.cpp
@@ -309,12 +309,13 @@ BluetoothGatt::Notify(const BluetoothSig
     mDiscoveringServices = false;
   } else {
     BT_WARNING("Not handling GATT signal: %s",
                NS_ConvertUTF16toUTF8(aData.name()).get());
   }
 }
 
 JSObject*
-BluetoothGatt::WrapObject(JSContext* aContext, JS::Handle<JSObject*> aGivenProto)
+BluetoothGatt::WrapObject(JSContext* aContext,
+                          JS::Handle<JSObject*> aGivenProto)
 {
   return BluetoothGattBinding::Wrap(aContext, this, aGivenProto);
 }
--- a/dom/bluetooth2/BluetoothGatt.h
+++ b/dom/bluetooth2/BluetoothGatt.h
@@ -23,17 +23,17 @@ class Promise;
 BEGIN_BLUETOOTH_NAMESPACE
 
 class BluetoothReplyRunnable;
 class BluetoothService;
 class BluetoothSignal;
 class BluetoothValue;
 
 class BluetoothGatt final : public DOMEventTargetHelper
-                              , public BluetoothSignalObserver
+                          , public BluetoothSignalObserver
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(BluetoothGatt, DOMEventTargetHelper)
 
   /****************************************************************************
    * Attribute Getters
    ***************************************************************************/
@@ -65,17 +65,18 @@ public:
    ***************************************************************************/
   void Notify(const BluetoothSignal& aParam); // BluetoothSignalObserver
 
   nsPIDOMWindow* GetParentObject() const
   {
      return GetOwner();
   }
 
-  virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
+  virtual JSObject* WrapObject(JSContext* aCx,
+                               JS::Handle<JSObject*> aGivenProto) override;
   virtual void DisconnectFromOwner() override;
 
   BluetoothGatt(nsPIDOMWindow* aOwner,
                 const nsAString& aDeviceAddr);
 
 private:
   ~BluetoothGatt();
 
--- a/dom/bluetooth2/BluetoothManager.h
+++ b/dom/bluetooth2/BluetoothManager.h
@@ -15,18 +15,18 @@
 #include "mozilla/Observer.h"
 #include "nsISupportsImpl.h"
 
 BEGIN_BLUETOOTH_NAMESPACE
 
 class BluetoothAdapter;
 class BluetoothValue;
 
-class BluetoothManager : public DOMEventTargetHelper
-                       , public BluetoothSignalObserver
+class BluetoothManager final : public DOMEventTargetHelper
+                             , public BluetoothSignalObserver
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
 
   /****************************************************************************
    * Event Handlers
    ***************************************************************************/
   IMPL_EVENT_HANDLER(attributechanged);
@@ -58,17 +58,18 @@ public:
   static bool CheckPermission(nsPIDOMWindow* aWindow);
 
   void Notify(const BluetoothSignal& aData); // BluetoothSignalObserver
   nsPIDOMWindow* GetParentObject() const
   {
     return GetOwner();
   }
 
-  virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
+  virtual JSObject* WrapObject(JSContext* aCx,
+                               JS::Handle<JSObject*> aGivenProto) override;
   virtual void DisconnectFromOwner() override;
 
   /**
    * Create a BluetoothAdapter object based on properties array
    * and append it into adapters array.
    *
    * @param aValue [in] Properties array to create BluetoothAdapter object
    */
--- a/dom/bluetooth2/BluetoothPairingHandle.cpp
+++ b/dom/bluetooth2/BluetoothPairingHandle.cpp
@@ -116,12 +116,13 @@ BluetoothPairingHandle::SetPairingConfir
 
   bs->SetPairingConfirmationInternal(mDeviceAddress,
                                      aConfirm,
                                      result);
   return promise.forget();
 }
 
 JSObject*
-BluetoothPairingHandle::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
+BluetoothPairingHandle::WrapObject(JSContext* aCx,
+                                   JS::Handle<JSObject*> aGivenProto)
 {
   return BluetoothPairingHandleBinding::Wrap(aCx, this, aGivenProto);
 }
--- a/dom/bluetooth2/BluetoothPairingHandle.h
+++ b/dom/bluetooth2/BluetoothPairingHandle.h
@@ -16,35 +16,36 @@ namespace dom {
 class Promise;
 }
 }
 
 BEGIN_BLUETOOTH_NAMESPACE
 
 class BluetoothDevice;
 
-class BluetoothPairingHandle final : public nsISupports,
-                                         public nsWrapperCache
+class BluetoothPairingHandle final : public nsISupports
+                                   , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(BluetoothPairingHandle)
 
   static already_AddRefed<BluetoothPairingHandle>
     Create(nsPIDOMWindow* aOwner,
            const nsAString& aDeviceAddress,
            const nsAString& aType,
            const nsAString& aPasskey);
 
   nsPIDOMWindow* GetParentObject() const
   {
     return mOwner;
   }
 
-  virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
+  virtual JSObject* WrapObject(JSContext* aCx,
+                               JS::Handle<JSObject*> aGivenProto) override;
 
   void GetPasskey(nsString& aPasskey) const
   {
     aPasskey = mPasskey;
   }
 
   already_AddRefed<Promise>
     SetPinCode(const nsAString& aPinCode, ErrorResult& aRv);
--- a/dom/bluetooth2/BluetoothPairingListener.cpp
+++ b/dom/bluetooth2/BluetoothPairingListener.cpp
@@ -103,17 +103,18 @@ BluetoothPairingListener::Notify(const B
     DispatchPairingEvent(name, address, passkey, type);
   } else {
     BT_WARNING("Not handling pairing listener signal: %s",
                NS_ConvertUTF16toUTF8(aData.name()).get());
   }
 }
 
 JSObject*
-BluetoothPairingListener::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
+BluetoothPairingListener::WrapObject(JSContext* aCx,
+                                     JS::Handle<JSObject*> aGivenProto)
 {
   return BluetoothPairingListenerBinding::Wrap(aCx, this, aGivenProto);
 }
 
 void
 BluetoothPairingListener::DisconnectFromOwner()
 {
   DOMEventTargetHelper::DisconnectFromOwner();
--- a/dom/bluetooth2/BluetoothPairingListener.h
+++ b/dom/bluetooth2/BluetoothPairingListener.h
@@ -12,17 +12,17 @@
 #include "mozilla/DOMEventTargetHelper.h"
 
 BEGIN_BLUETOOTH_NAMESPACE
 
 class BluetoothDevice;
 class BluetoothSignal;
 
 class BluetoothPairingListener final : public DOMEventTargetHelper
-                                         , public BluetoothSignalObserver
+                                     , public BluetoothSignalObserver
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
 
   static already_AddRefed<BluetoothPairingListener>
     Create(nsPIDOMWindow* aWindow);
 
   void DispatchPairingEvent(const nsAString& aName,
@@ -32,17 +32,18 @@ public:
 
   void Notify(const BluetoothSignal& aParam); // BluetoothSignalObserver
 
   nsPIDOMWindow* GetParentObject() const
   {
     return GetOwner();
   }
 
-  virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
+  virtual JSObject* WrapObject(JSContext* aCx,
+                               JS::Handle<JSObject*> aGivenProto) override;
   virtual void DisconnectFromOwner() override;
   virtual void EventListenerAdded(nsIAtom* aType) override;
 
   IMPL_EVENT_HANDLER(displaypasskeyreq);
   IMPL_EVENT_HANDLER(enterpincodereq);
   IMPL_EVENT_HANDLER(pairingconfirmationreq);
   IMPL_EVENT_HANDLER(pairingconsentreq);
 
--- a/dom/bluetooth2/bluedroid/BluetoothGattManager.h
+++ b/dom/bluetooth2/bluedroid/BluetoothGattManager.h
@@ -12,17 +12,17 @@
 #include "BluetoothProfileManagerBase.h"
 
 BEGIN_BLUETOOTH_NAMESPACE
 
 class BluetoothGattClient;
 class BluetoothReplyRunnable;
 
 class BluetoothGattManager final : public nsIObserver
-                                     , public BluetoothGattNotificationHandler
+                                 , public BluetoothGattNotificationHandler
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIOBSERVER
 
   static BluetoothGattManager* Get();
   static void InitGattInterface(BluetoothProfileResultHandler* aRes);
   static void DeinitGattInterface(BluetoothProfileResultHandler* aRes);