Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out 4 changesets (bug 1191178) to see if it will fix the build bustage on a CLOSED TREE

Browse Source 
Backed out changeset 32adb36cf863 (bug 1191178)
Backed out changeset 85cb22235eb5 (bug 1191178)
Backed out changeset 744bab15a5ec (bug 1191178)
Backed out changeset b7621c6af97e (bug 1191178)
This commit is contained in:
Wes Kocher 2015-08-19 16:13:13 -07:00
parent 7548b216ca
commit 18ba799896
12 changed files with 9 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dom/base/PerformanceCompositeTiming.cpp
View File

@ -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);
}

44
dom/base/PerformanceCompositeTiming.h
View File

@ -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___ */

32
dom/base/PerformanceRenderTiming.cpp
View File

@ -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);
}

51
dom/base/PerformanceRenderTiming.h
View File

@ -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___ */

4
dom/base/moz.build
View File

@ -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',

11
dom/base/nsContentUtils.cpp
View File

@ -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)

6
dom/base/nsContentUtils.h
View File

@ -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;

20
dom/base/nsHostObjectProtocolHandler.cpp
View File

@ -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;

10
dom/base/nsStyleLinkElement.cpp
View File

@ -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;

19
dom/webidl/PerformanceCompositeTiming.webidl
View File

@ -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;
};

19
dom/webidl/PerformanceRenderTiming.webidl
View File

@ -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;
};

2
dom/webidl/moz.build
View File

@ -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',