Bug 1271846 - Drop old Frame Timing interfaces. r?baku draft
authorHiroyuki Ikezoe <hiikezoe@mozilla-japan.org>
Fri, 13 May 2016 18:54:26 +0900
changeset 366773 b4aae874a8a606285bbf21fd6ea75878bd4e345e
parent 366346 c3f5e6079284a7b7053c41f05d0fe06ff031db03
child 520852 fb8cc30063465e059f73326a981a86b061a8210d
push id18068
push userbmo:hiikezoe@mozilla-japan.org
push dateFri, 13 May 2016 09:54:48 +0000
reviewersbaku
bugs1271846
milestone49.0a1
Bug 1271846 - Drop old Frame Timing interfaces. r?baku MozReview-Commit-ID: FXihZGbeCHq
dom/base/PerformanceCompositeTiming.cpp
dom/base/PerformanceCompositeTiming.h
dom/base/PerformanceObserver.cpp
dom/base/PerformanceRenderTiming.cpp
dom/base/PerformanceRenderTiming.h
dom/base/moz.build
dom/webidl/PerformanceCompositeTiming.webidl
dom/webidl/PerformanceRenderTiming.webidl
dom/webidl/moz.build
deleted file mode 100644
--- a/dom/base/PerformanceCompositeTiming.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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 "PerformanceCompositeTiming.h"
-#include "mozilla/dom/PerformanceCompositeTimingBinding.h"
-
-using namespace mozilla::dom;
-
-PerformanceCompositeTiming::PerformanceCompositeTiming(nsISupports* aParent,
-                                                       const nsAString& aName,
-                                                       const DOMHighResTimeStamp& aStartTime,
-                                                       uint32_t aSourceFrameNumber)
-: PerformanceEntry(aParent, aName, NS_LITERAL_STRING("composite"))
-, mStartTime(aStartTime)
-, mSourceFrameNumber(aSourceFrameNumber)
-{
-  MOZ_ASSERT(aParent, "Parent performance object should be provided");
-}
-
-PerformanceCompositeTiming::~PerformanceCompositeTiming()
-{
-}
-
-JSObject*
-PerformanceCompositeTiming::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
-{
-  return PerformanceCompositeTimingBinding::Wrap(aCx, this, aGivenProto);
-}
deleted file mode 100644
--- a/dom/base/PerformanceCompositeTiming.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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_dom_performancecompositetiming_h___
-#define mozilla_dom_performancecompositetiming_h___
-
-#include "mozilla/dom/PerformanceEntry.h"
-
-namespace mozilla {
-namespace dom {
-
-// http://www.w3.org/TR/frame-timing/#performancecompositetiming
-class PerformanceCompositeTiming final : public PerformanceEntry
-{
-public:
-  PerformanceCompositeTiming(nsISupports* aParent,
-                             const nsAString& aName,
-                             const DOMHighResTimeStamp& aStartTime,
-                             uint32_t aSourceFrameNumber);
-
-  virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
-
-  virtual DOMHighResTimeStamp StartTime() const override
-  {
-    return mStartTime;
-  }
-
-  uint32_t SourceFrameNumber() const
-  {
-    return mSourceFrameNumber;
-  }
-
-protected:
-  virtual ~PerformanceCompositeTiming();
-  DOMHighResTimeStamp mStartTime;
-  uint32_t mSourceFrameNumber;
-};
-
-} // namespace dom
-} // namespace mozilla
-
-#endif /* mozilla_dom_performancecompositetiming_h___ */
--- a/dom/base/PerformanceObserver.cpp
+++ b/dom/base/PerformanceObserver.cpp
@@ -130,22 +130,20 @@ PerformanceObserver::QueueEntry(Performa
   aEntry->GetEntryType(entryType);
   if (!mEntryTypes.Contains<nsString>(entryType)) {
     return;
   }
 
   mQueuedEntries.AppendElement(aEntry);
 }
 
-static const char16_t* sValidTypeNames[7] = {
-  MOZ_UTF16("composite"),
+static const char16_t* sValidTypeNames[5] = {
   MOZ_UTF16("mark"),
   MOZ_UTF16("measure"),
   MOZ_UTF16("navigation"),
-  MOZ_UTF16("render"),
   MOZ_UTF16("resource"),
   MOZ_UTF16("server")
 };
 
 void
 PerformanceObserver::Observe(const PerformanceObserverInit& aOptions,
                              ErrorResult& aRv)
 {
deleted file mode 100644
--- a/dom/base/PerformanceRenderTiming.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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 "PerformanceRenderTiming.h"
-#include "mozilla/dom/PerformanceRenderTimingBinding.h"
-
-using namespace mozilla::dom;
-
-PerformanceRenderTiming::PerformanceRenderTiming(nsISupports* aParent,
-                                                 const nsAString& aName,
-                                                 const DOMHighResTimeStamp& aStartTime,
-                                                 const DOMHighResTimeStamp& aDuration,
-                                                 uint32_t aSourceFrameNumber)
-: PerformanceEntry(aParent, aName, NS_LITERAL_STRING("render"))
-, mStartTime(aStartTime)
-, mDuration(aDuration)
-, mSourceFrameNumber(aSourceFrameNumber)
-{
-  MOZ_ASSERT(aParent, "Parent performance object should be provided");
-}
-
-PerformanceRenderTiming::~PerformanceRenderTiming()
-{
-}
-
-JSObject*
-PerformanceRenderTiming::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto)
-{
-  return PerformanceRenderTimingBinding::Wrap(aCx, this, aGivenProto);
-}
deleted file mode 100644
--- a/dom/base/PerformanceRenderTiming.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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_dom_performancerendertiming_h___
-#define mozilla_dom_performancerendertiming_h___
-
-#include "mozilla/dom/PerformanceEntry.h"
-
-namespace mozilla {
-namespace dom {
-
-// http://www.w3.org/TR/frame-timing/#performancerendertiming
-class PerformanceRenderTiming final : public PerformanceEntry
-{
-public:
-  PerformanceRenderTiming(nsISupports* aParent,
-                          const nsAString& aName,
-                          const DOMHighResTimeStamp& aStartTime,
-                          const DOMHighResTimeStamp& aDuration,
-                          uint32_t aSourceFrameNumber);
-
-  virtual JSObject* WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override;
-
-  virtual DOMHighResTimeStamp StartTime() const override
-  {
-    return mStartTime;
-  }
-
-  virtual DOMHighResTimeStamp Duration() const override
-  {
-    return mDuration;
-  }
-
-  uint32_t SourceFrameNumber() const
-  {
-    return mSourceFrameNumber;
-  }
-
-protected:
-  virtual ~PerformanceRenderTiming();
-  DOMHighResTimeStamp mStartTime;
-  DOMHighResTimeStamp mDuration;
-  uint32_t mSourceFrameNumber;
-};
-
-} // namespace dom
-} // namespace mozilla
-
-#endif /* mozilla_dom_performancerendertiming_h___ */
--- a/dom/base/moz.build
+++ b/dom/base/moz.build
@@ -189,23 +189,21 @@ EXPORTS.mozilla.dom += [
     'ImageEncoder.h',
     'ImportManager.h',
     'Link.h',
     'NameSpaceConstants.h',
     'Navigator.h',
     'NodeInfo.h',
     'NodeInfoInlines.h',
     'NodeIterator.h',
-    'PerformanceCompositeTiming.h',
     'PerformanceEntry.h',
     'PerformanceMark.h',
     'PerformanceMeasure.h',
     'PerformanceObserver.h',
     'PerformanceObserverEntryList.h',
-    'PerformanceRenderTiming.h',
     'PerformanceResourceTiming.h',
     'ProcessGlobal.h',
     'ResponsiveImageSelector.h',
     'SameProcessMessageQueue.h',
     'ScreenOrientation.h',
     'ScriptSettings.h',
     'ShadowRoot.h',
     'StructuredCloneHolder.h',
@@ -334,23 +332,21 @@ UNIFIED_SOURCES += [
     'nsViewportInfo.cpp',
     'nsWindowMemoryReporter.cpp',
     'nsWindowRoot.cpp',
     'nsWrapperCache.cpp',
     'nsXHTMLContentSerializer.cpp',
     'nsXMLContentSerializer.cpp',
     'nsXMLHttpRequest.cpp',
     'nsXMLNameSpaceMap.cpp',
-    'PerformanceCompositeTiming.cpp',
     'PerformanceEntry.cpp',
     'PerformanceMark.cpp',
     'PerformanceMeasure.cpp',
     'PerformanceObserver.cpp',
     'PerformanceObserverEntryList.cpp',
-    'PerformanceRenderTiming.cpp',
     'PerformanceResourceTiming.cpp',
     'PostMessageEvent.cpp',
     'ProcessGlobal.cpp',
     'ResponsiveImageSelector.cpp',
     'SameProcessMessageQueue.cpp',
     'ScreenOrientation.cpp',
     'ScriptSettings.cpp',
     'ShadowRoot.cpp',
deleted file mode 100644
--- a/dom/webidl/PerformanceCompositeTiming.webidl
+++ /dev/null
@@ -1,19 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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/.
- *
- * The origin of this IDL file is
- * http://www.w3.org/TR/frame-timing/#performancecompositetiming
- *
- * Copyright © 2015 W3C® (MIT, ERCIM, Keio, Beihang), All Rights Reserved. W3C
- * liability, trademark and document use rules apply.
- */
-
-[Pref="dom.enable_frame_timing"]
-interface PerformanceCompositeTiming : PerformanceEntry
-{
-  readonly attribute unsigned long sourceFrameNumber;
-
-  jsonifier;
-};
deleted file mode 100644
--- a/dom/webidl/PerformanceRenderTiming.webidl
+++ /dev/null
@@ -1,19 +0,0 @@
-/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* 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/.
- *
- * The origin of this IDL file is
- * http://www.w3.org/TR/frame-timing/#performancerendertiming
- *
- * Copyright © 2015 W3C® (MIT, ERCIM, Keio, Beihang), All Rights Reserved. W3C
- * liability, trademark and document use rules apply.
- */
-
-[Pref="dom.enable_frame_timing"]
-interface PerformanceRenderTiming : PerformanceEntry
-{
-  readonly attribute unsigned long sourceFrameNumber;
-
-  jsonifier;
-};
--- a/dom/webidl/moz.build
+++ b/dom/webidl/moz.build
@@ -352,24 +352,22 @@ WEBIDL_FILES = [
     'OfflineResourceList.webidl',
     'OffscreenCanvas.webidl',
     'OscillatorNode.webidl',
     'PaintRequest.webidl',
     'PaintRequestList.webidl',
     'PannerNode.webidl',
     'ParentNode.webidl',
     'Performance.webidl',
-    'PerformanceCompositeTiming.webidl',
     'PerformanceEntry.webidl',
     'PerformanceMark.webidl',
     'PerformanceMeasure.webidl',
     'PerformanceNavigation.webidl',
     'PerformanceObserver.webidl',
     'PerformanceObserverEntryList.webidl',
-    'PerformanceRenderTiming.webidl',
     'PerformanceResourceTiming.webidl',
     'PerformanceTiming.webidl',
     'PeriodicWave.webidl',
     'Permissions.webidl',
     'PermissionSettings.webidl',
     'PermissionStatus.webidl',
     'PhoneNumberService.webidl',
     'Plugin.webidl',