From 18ba799896b9a0aa8211af00260463c6d57f456d Mon Sep 17 00:00:00 2001 From: Wes Kocher Date: Wed, 19 Aug 2015 16:13:13 -0700 Subject: [PATCH] Backed out 4 changesets (bug 1191178) to see if it will fix the build bustage on a CLOSED TREE Backed out changeset 32adb36cf863 (bug 1191178) Backed out changeset 85cb22235eb5 (bug 1191178) Backed out changeset 744bab15a5ec (bug 1191178) Backed out changeset b7621c6af97e (bug 1191178) --- dom/base/PerformanceCompositeTiming.cpp | 30 ------------ dom/base/PerformanceCompositeTiming.h | 44 ----------------- dom/base/PerformanceRenderTiming.cpp | 32 ------------ dom/base/PerformanceRenderTiming.h | 51 -------------------- dom/base/moz.build | 4 -- dom/base/nsContentUtils.cpp | 11 ----- dom/base/nsContentUtils.h | 6 --- dom/base/nsHostObjectProtocolHandler.cpp | 20 ++++---- dom/base/nsStyleLinkElement.cpp | 10 ---- dom/webidl/PerformanceCompositeTiming.webidl | 19 -------- dom/webidl/PerformanceRenderTiming.webidl | 19 -------- dom/webidl/moz.build | 2 - 12 files changed, 9 insertions(+), 239 deletions(-) delete mode 100644 dom/base/PerformanceCompositeTiming.cpp delete mode 100644 dom/base/PerformanceCompositeTiming.h delete mode 100644 dom/base/PerformanceRenderTiming.cpp delete mode 100644 dom/base/PerformanceRenderTiming.h delete mode 100644 dom/webidl/PerformanceCompositeTiming.webidl delete mode 100644 dom/webidl/PerformanceRenderTiming.webidl diff --git a/dom/base/PerformanceCompositeTiming.cpp b/dom/base/PerformanceCompositeTiming.cpp deleted file mode 100644 index 48362ce2bd60..000000000000 --- 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 aGivenProto) -{ - return PerformanceCompositeTimingBinding::Wrap(aCx, this, aGivenProto); -} diff --git a/dom/base/PerformanceCompositeTiming.h b/dom/base/PerformanceCompositeTiming.h deleted file mode 100644 index deee1598ad46..000000000000 --- 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 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___ */ diff --git a/dom/base/PerformanceRenderTiming.cpp b/dom/base/PerformanceRenderTiming.cpp deleted file mode 100644 index c4f04f1dda93..000000000000 --- 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 aGivenProto) -{ - return PerformanceRenderTimingBinding::Wrap(aCx, this, aGivenProto); -} diff --git a/dom/base/PerformanceRenderTiming.h b/dom/base/PerformanceRenderTiming.h deleted file mode 100644 index 63eeb106d931..000000000000 --- 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 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___ */ diff --git a/dom/base/moz.build b/dom/base/moz.build index fc4bae3054eb..406a640c89ea 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -186,13 +186,11 @@ EXPORTS.mozilla.dom += [ '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', @@ -329,13 +327,11 @@ UNIFIED_SOURCES += [ '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', diff --git a/dom/base/nsContentUtils.cpp b/dom/base/nsContentUtils.cpp index 3f5211803946..7e13fcc9b69c 100644 --- a/dom/base/nsContentUtils.cpp +++ b/dom/base/nsContentUtils.cpp @@ -254,7 +254,6 @@ bool nsContentUtils::sInitialized = false; bool nsContentUtils::sIsFullScreenApiEnabled = false; bool nsContentUtils::sTrustedFullScreenOnly = true; bool nsContentUtils::sIsCutCopyAllowed = true; -bool nsContentUtils::sIsFrameTimingPrefEnabled = false; bool nsContentUtils::sIsPerformanceTimingEnabled = false; bool nsContentUtils::sIsResourceTimingEnabled = false; bool nsContentUtils::sIsUserTimingLoggingEnabled = false; @@ -537,9 +536,6 @@ nsContentUtils::Init() Preferences::AddBoolVarCache(&sIsUserTimingLoggingEnabled, "dom.performance.enable_user_timing_logging", false); - Preferences::AddBoolVarCache(&sIsFrameTimingPrefEnabled, - "dom.enable_frame_timing", true); - Preferences::AddBoolVarCache(&sIsExperimentalAutocompleteEnabled, "dom.forms.autocomplete.experimental", false); @@ -6766,13 +6762,6 @@ nsContentUtils::IsCutCopyAllowed() IsCallerChrome(); } -/* static */ -bool -nsContentUtils::IsFrameTimingEnabled() -{ - return sIsFrameTimingPrefEnabled; -} - /* static */ bool nsContentUtils::HaveEqualPrincipals(nsIDocument* aDoc1, nsIDocument* aDoc2) diff --git a/dom/base/nsContentUtils.h b/dom/base/nsContentUtils.h index 72a18678713d..519c2a5117ea 100644 --- a/dom/base/nsContentUtils.h +++ b/dom/base/nsContentUtils.h @@ -1977,11 +1977,6 @@ public: return sSendPerformanceTimingNotifications; } - /* - * Returns true if the frame timing APIs are enabled. - */ - static bool IsFrameTimingEnabled(); - /* * Returns true if URL setters should percent encode the Hash/Ref segment * and getters should return the percent decoded value of the segment @@ -2574,7 +2569,6 @@ private: static bool sIsPerformanceTimingEnabled; static bool sIsResourceTimingEnabled; static bool sIsUserTimingLoggingEnabled; - static bool sIsFrameTimingPrefEnabled; static bool sIsExperimentalAutocompleteEnabled; static bool sEncodeDecodeURLHash; static bool sGettersDecodeURLHash; diff --git a/dom/base/nsHostObjectProtocolHandler.cpp b/dom/base/nsHostObjectProtocolHandler.cpp index 85316b5e6966..5bf823cbb573 100644 --- a/dom/base/nsHostObjectProtocolHandler.cpp +++ b/dom/base/nsHostObjectProtocolHandler.cpp @@ -5,19 +5,17 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsHostObjectProtocolHandler.h" - -#include "DOMMediaStream.h" -#include "mozilla/dom/File.h" -#include "mozilla/dom/MediaSource.h" -#include "mozilla/LoadInfo.h" -#include "mozilla/Preferences.h" -#include "nsClassHashtable.h" -#include "nsError.h" #include "nsHostObjectURI.h" -#include "nsIMemoryReporter.h" -#include "nsIPrincipal.h" -#include "nsIUUIDGenerator.h" +#include "nsError.h" +#include "nsClassHashtable.h" #include "nsNetUtil.h" +#include "nsIPrincipal.h" +#include "DOMMediaStream.h" +#include "mozilla/dom/MediaSource.h" +#include "nsIMemoryReporter.h" +#include "mozilla/dom/File.h" +#include "mozilla/Preferences.h" +#include "mozilla/LoadInfo.h" using mozilla::dom::BlobImpl; using mozilla::ErrorResult; diff --git a/dom/base/nsStyleLinkElement.cpp b/dom/base/nsStyleLinkElement.cpp index 04734cc4ffeb..c7a175c021d2 100644 --- a/dom/base/nsStyleLinkElement.cpp +++ b/dom/base/nsStyleLinkElement.cpp @@ -31,16 +31,6 @@ #include "nsStyleUtil.h" #include "nsQueryObject.h" -static PRLogModuleInfo* -GetSriLog() -{ - static PRLogModuleInfo *gSriPRLog; - if (!gSriPRLog) { - gSriPRLog = PR_NewLogModule("SRI"); - } - return gSriPRLog; -} - using namespace mozilla; using namespace mozilla::dom; diff --git a/dom/webidl/PerformanceCompositeTiming.webidl b/dom/webidl/PerformanceCompositeTiming.webidl deleted file mode 100644 index c7ccf10e4903..000000000000 --- 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; -}; diff --git a/dom/webidl/PerformanceRenderTiming.webidl b/dom/webidl/PerformanceRenderTiming.webidl deleted file mode 100644 index 4ea4ebdd559b..000000000000 --- 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; -}; diff --git a/dom/webidl/moz.build b/dom/webidl/moz.build index 495557770e1c..ebc780f40713 100644 --- a/dom/webidl/moz.build +++ b/dom/webidl/moz.build @@ -349,14 +349,12 @@ WEBIDL_FILES = [ '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',