Add m-esr52 at 52.6.0

1 files changed, 73 insertions, 0 deletions

diff --git a/dom/media/eme/DetailedPromise.h b/dom/media/eme/DetailedPromise.h
new file mode 100644
index 000000000..83e40c022
--- /dev/null
+++ b/dom/media/eme/DetailedPromise.h
@@ -0,0 +1,73 @@
+/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* vim: set ts=2 sts=2 et sw=2 tw=80: */
+/* 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 __DetailedPromise_h__
+#define __DetailedPromise_h__
+
+#include "mozilla/dom/Promise.h"
+#include "mozilla/Telemetry.h"
+#include "EMEUtils.h"
+
+namespace mozilla {
+namespace dom {
+
+/*
+ * This is pretty horrible; bug 1160445.
+ * Extend Promise to add custom DOMException messages on rejection.
+ * Get rid of this once we've ironed out EME errors in the wild.
+ */
+class DetailedPromise : public Promise
+{
+public:
+  static already_AddRefed<DetailedPromise>
+  Create(nsIGlobalObject* aGlobal,
+         ErrorResult& aRv,
+         const nsACString& aName);
+
+  static already_AddRefed<DetailedPromise>
+  Create(nsIGlobalObject* aGlobal, ErrorResult& aRv,
+         const nsACString& aName,
+         Telemetry::ID aSuccessLatencyProbe,
+         Telemetry::ID aFailureLatencyProbe);
+
+  template <typename T>
+  void MaybeResolve(const T& aArg)
+  {
+    EME_LOG("%s promise resolved", mName.get());
+    MaybeReportTelemetry(Succeeded);
+    Promise::MaybeResolve<T>(aArg);
+  }
+
+  void MaybeReject(nsresult aArg) = delete;
+  void MaybeReject(nsresult aArg, const nsACString& aReason);
+
+  void MaybeReject(ErrorResult& aArg) = delete;
+  void MaybeReject(ErrorResult&, const nsACString& aReason);
+
+private:
+  explicit DetailedPromise(nsIGlobalObject* aGlobal,
+                           const nsACString& aName);
+
+  explicit DetailedPromise(nsIGlobalObject* aGlobal,
+                           const nsACString& aName,
+                           Telemetry::ID aSuccessLatencyProbe,
+                           Telemetry::ID aFailureLatencyProbe);
+  virtual ~DetailedPromise();
+
+  enum Status { Succeeded, Failed };
+  void MaybeReportTelemetry(Status aStatus);
+
+  nsCString mName;
+  bool mResponded;
+  TimeStamp mStartTime;
+  Optional<Telemetry::ID> mSuccessLatencyProbe;
+  Optional<Telemetry::ID> mFailureLatencyProbe;
+};
+
+} // namespace dom
+} // namespace mozilla
+
+#endif // __DetailedPromise_h__