Bug 1508298 - Disable the reformatting of the comment r=jya
authorSylvestre Ledru <sledru@mozilla.com>
Tue, 20 Nov 2018 14:21:48 +0000
changeset 503655 f70098015fd4612315f4d56b6aee4c54af6d4a7f
parent 503639 51c30c756ab0a558a97113b5a5ac77339857553a
child 503656 fd9a2224eb523e00beccac04e958719eae6b478a
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjya
bugs1508298
milestone65.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 1508298 - Disable the reformatting of the comment r=jya Differential Revision: https://phabricator.services.mozilla.com/D12415
dom/media/AudioNotificationReceiver.h
dom/media/DOMMediaStream.h
--- a/dom/media/AudioNotificationReceiver.h
+++ b/dom/media/AudioNotificationReceiver.h
@@ -2,25 +2,27 @@
 /* vim:set ts=2 sw=2 sts=2 et cindent: */
 /* 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/. */
 
 #ifndef MOZILLA_AUDIONOTIFICATIONRECEIVER_H_
 #define MOZILLA_AUDIONOTIFICATIONRECEIVER_H_
 
+// clang-format off
 /*
  * Architecture to send/receive default device-changed notification:
  *
  *  Chrome Process                       ContentProcess 1
  *  ------------------                   ------------------
  *
- *       AudioNotification               DeviceChangeListener 1
- * DeviceChangeListener N |      ^                             |      ^ ^ (4)|
- * |(2)                          |(3)   |(8)      . v      | v      |         v
+ *       AudioNotification               DeviceChangeListener 1   DeviceChangeListener N
+ *             |      ^                             |      ^         ^
+ *          (4)|      |(2)                          |(3)   |(8)      .
+ *             v      |                             v      |         v
  *   AudioNotificationSender                  AudioNotificationReceiver
  *     ^       |      ^                                ^
  *     .    (5)|      |(1)                             |(7)
  *     .       v      |                                |
  *     .  (P)ContentParent 1                   (P)ContentChild 1
  *     .          |                                    ^
  *     .       (6)|                                    |
  *     .          |                                    |
@@ -54,16 +56,17 @@
  * b) There is only one AudioNotificationReceiver and might be many
  *    DeviceChangeListeners in a content process.
  * c) There might be many ContentParent in a chrome process.
  * d) There is only one ContentChild in a content process.
  * e) All the DeviceChangeListeners are registered in the
  * AudioNotificationReceiver. f) All the ContentParents are registered in the
  * AudioNotificationSender.
  */
+// clang-format on
 
 namespace mozilla {
 namespace audio {
 
 // The base class that provides a ResetDefaultDevice interface that
 // will be called in AudioNotificationReceiver::NotifyDefaultDeviceChanged
 // when it receives device-changed notification from the chrome process.
 class DeviceChangeListener {
@@ -86,9 +89,9 @@ class AudioNotificationReceiver final {
 
   // Notify all the streams that the default device has been changed.
   static void NotifyDefaultDeviceChanged();
 };  // AudioNotificationReceiver
 
 }  // namespace audio
 }  // namespace mozilla
 
-#endif  // MOZILLA_AUDIONOTIFICATIONRECEIVER_H_
\ No newline at end of file
+#endif  // MOZILLA_AUDIONOTIFICATIONRECEIVER_H_
--- a/dom/media/DOMMediaStream.h
+++ b/dom/media/DOMMediaStream.h
@@ -82,16 +82,17 @@ class MediaStreamTrackSourceGetter : pub
 
   virtual already_AddRefed<dom::MediaStreamTrackSource>
   GetMediaStreamTrackSource(TrackID aInputTrackID) = 0;
 
  protected:
   virtual ~MediaStreamTrackSourceGetter() {}
 };
 
+// clang-format off
 /**
  * DOM wrapper for MediaStreams.
  *
  * To account for track operations such as clone(), addTrack() and
  * removeTrack(), a DOMMediaStream wraps three internal (and chained)
  * MediaStreams:
  *   1. mInputStream
  *      - Controlled by the owner/source of the DOMMediaStream.
@@ -171,31 +172,35 @@ class MediaStreamTrackSourceGetter : pub
  *    var Z = B.getTracks()[0];
  *    A.addTrack(Z);
  *    A.removeTrack(X);
  *    B.removeTrack(Z);
  *    var A' = A.clone();
  *
  * DOMStream A
  *           Input        Owned          Playback
- *            t1 ---------> t1                      <- MediaStreamTrack X
- * (removed) (pointing to t1 in A) t2 ---------> t2 ------------> t2     <-
- * MediaStreamTrack Y \                                       (pointing to t2 in
- * A) \                    ------> t3     <- MediaStreamTrack Z \ / (pointing to
- * t1 in B) DOMStream B    \                / Input \      Owned   / Playback t1
- * ---^-----> t1 ---                  <- MediaStreamTrack Z (removed) \    \
- * (pointing to t1 in B)
+ *            t1 ---------> t1                      <- MediaStreamTrack X (removed)
+ *                                                     (pointing to t1 in A)
+ *            t2 ---------> t2 ------------> t2     <- MediaStreamTrack Y
+ *             \                                       (pointing to t2 in A)
+ *              \                    ------> t3     <- MediaStreamTrack Z
+ *               \                  /                  (pointing to t1 in B)
+ * DOMStream B    \                /
+ *           Input \      Owned   /      Playback
+ *            t1 ---^-----> t1 ---                  <- MediaStreamTrack Z (removed)
+ *              \    \                                 (pointing to t1 in B)
  *               \    \
  * DOMStream A'   \    \
  *           Input \    \ Owned          Playback
  *                  \    -> t1 ------------> t1     <- MediaStreamTrack Y'
  *                   \                                 (pointing to t1 in A')
  *                    ----> t2 ------------> t2     <- MediaStreamTrack Z'
  *                                                     (pointing to t2 in A')
  */
+// clang-format on
 class DOMMediaStream
     : public DOMEventTargetHelper,
       public dom::PrincipalChangeObserver<dom::MediaStreamTrack>,
       public RelativeTimeline {
   friend class dom::MediaStreamTrack;
   typedef dom::MediaStreamTrack MediaStreamTrack;
   typedef dom::AudioStreamTrack AudioStreamTrack;
   typedef dom::VideoStreamTrack VideoStreamTrack;