Backed out 10 changesets (bug 1518999) for GeckoView failures in PanZoomControllerTest.scroll. CLOSED TREE
Backed out changeset 7b5bdd071d05 (bug 1518999) Backed out changeset 401e488734dd (bug 1518999) Backed out changeset c13e51e17329 (bug 1518999) Backed out changeset 2a2d67ba15b8 (bug 1518999) Backed out changeset 3d4d84003227 (bug 1518999) Backed out changeset 972731762965 (bug 1518999) Backed out changeset f21b13582dad (bug 1518999) Backed out changeset 13a4c749a802 (bug 1518999) Backed out changeset 5a6cea5fd344 (bug 1518999) Backed out changeset c3bb552e76a3 (bug 1518999)
This commit is contained in:
@@ -6,7 +6,6 @@
|
||||
|
||||
#include "PerformanceMainThread.h"
|
||||
#include "PerformanceNavigation.h"
|
||||
#include "PerformancePaintTiming.h"
|
||||
#include "mozilla/StaticPrefs_dom.h"
|
||||
#include "mozilla/StaticPrefs_privacy.h"
|
||||
|
||||
@@ -44,14 +43,14 @@ NS_IMPL_CYCLE_COLLECTION_CLASS(PerformanceMainThread)
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(PerformanceMainThread,
|
||||
Performance)
|
||||
NS_IMPL_CYCLE_COLLECTION_UNLINK(mTiming, mNavigation, mDocEntry, mFCPTiming)
|
||||
NS_IMPL_CYCLE_COLLECTION_UNLINK(mTiming, mNavigation, mDocEntry)
|
||||
tmp->mMozMemory = nullptr;
|
||||
mozilla::DropJSObjects(this);
|
||||
NS_IMPL_CYCLE_COLLECTION_UNLINK_END
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED(PerformanceMainThread,
|
||||
Performance)
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mTiming, mNavigation, mDocEntry, mFCPTiming)
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE(mTiming, mNavigation, mDocEntry)
|
||||
NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END
|
||||
|
||||
NS_IMPL_CYCLE_COLLECTION_TRACE_BEGIN_INHERITED(PerformanceMainThread,
|
||||
@@ -162,14 +161,6 @@ void PerformanceMainThread::AddRawEntry(UniquePtr<PerformanceTimingData> aData,
|
||||
InsertResourceEntry(entry);
|
||||
}
|
||||
|
||||
void PerformanceMainThread::SetFCPTimingEntry(PerformancePaintTiming* aEntry) {
|
||||
MOZ_ASSERT(aEntry);
|
||||
if (!mFCPTiming) {
|
||||
mFCPTiming = aEntry;
|
||||
QueueEntry(aEntry);
|
||||
}
|
||||
}
|
||||
|
||||
// To be removed once bug 1124165 lands
|
||||
bool PerformanceMainThread::IsPerformanceTimingAttribute(
|
||||
const nsAString& aName) {
|
||||
@@ -385,9 +376,6 @@ void PerformanceMainThread::GetEntries(
|
||||
aRetval.AppendElement(mDocEntry);
|
||||
}
|
||||
|
||||
if (mFCPTiming) {
|
||||
aRetval.AppendElement(mFCPTiming);
|
||||
}
|
||||
aRetval.Sort(PerformanceEntryComparator());
|
||||
}
|
||||
|
||||
@@ -408,13 +396,6 @@ void PerformanceMainThread::GetEntriesByType(
|
||||
return;
|
||||
}
|
||||
|
||||
if (aEntryType.EqualsLiteral("paint")) {
|
||||
if (mFCPTiming) {
|
||||
aRetval.AppendElement(mFCPTiming);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
Performance::GetEntriesByType(aEntryType, aRetval);
|
||||
}
|
||||
|
||||
@@ -429,13 +410,6 @@ void PerformanceMainThread::GetEntriesByName(
|
||||
|
||||
Performance::GetEntriesByName(aName, aEntryType, aRetval);
|
||||
|
||||
if (mFCPTiming && mFCPTiming->GetName().Equals(aName) &&
|
||||
(!aEntryType.WasPassed() ||
|
||||
mFCPTiming->GetEntryType().Equals(aEntryType.Value()))) {
|
||||
aRetval.AppendElement(mFCPTiming);
|
||||
return;
|
||||
}
|
||||
|
||||
// The navigation entry is the first one. If it exists and the name matches,
|
||||
// let put it in front.
|
||||
if (mDocEntry && mDocEntry->GetName().Equals(aName)) {
|
||||
|
||||
Reference in New Issue
Block a user