Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 84ebfdd3c94c (bug 1151829) for windows build bustage CLOSED TREE

Browse Source
This commit is contained in:
Wes Kocher 2015-04-09 13:40:50 -07:00
parent 306af8a37f
commit 7c4595242e
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
layout/base/RestyleTracker.cpp
View File

@ -83,7 +83,7 @@ CollectLaterSiblings(nsISupports* aElement,
struct RestyleEnumerateData : RestyleTracker::Hints {
nsRefPtr<dom::Element> mElement;
#if defined(MOZ_ENABLE_PROFILER_SPS) && !defined(MOZILLA_XPCOMRT_API)
#ifdef MOZ_ENABLE_PROFILER_SPS
UniquePtr<ProfilerBacktrace> mBacktrace;
#endif
};
@ -143,7 +143,7 @@ CollectRestyles(nsISupports* aElement,
currentRestyle->mElement = element;
currentRestyle->mRestyleHint = aData->mRestyleHint;
currentRestyle->mChangeHint = aData->mChangeHint;
#if defined(MOZ_ENABLE_PROFILER_SPS) && !defined(MOZILLA_XPCOMRT_API)
#ifdef MOZ_ENABLE_PROFILER_SPS
currentRestyle->mBacktrace = Move(aData->mBacktrace);
#endif
@ -312,7 +312,7 @@ RestyleTracker::DoProcessRestyles()
}
Maybe<GeckoProfilerTracingRAII> profilerRAII;
#if defined(MOZ_ENABLE_PROFILER_SPS) && !defined(MOZILLA_XPCOMRT_API)
#ifdef MOZ_ENABLE_PROFILER_SPS
if (profiler_feature_active("restyle")) {
profilerRAII.emplace("Paint", "Styles", Move(data->mBacktrace));
}
@ -354,7 +354,7 @@ RestyleTracker::DoProcessRestyles()
LOG_RESTYLE_INDENT();
Maybe<GeckoProfilerTracingRAII> profilerRAII;
#if defined(MOZ_ENABLE_PROFILER_SPS) && !defined(MOZILLA_XPCOMRT_API)
#ifdef MOZ_ENABLE_PROFILER_SPS
if (profiler_feature_active("restyle")) {
profilerRAII.emplace("Paint", "Styles", Move(currentRestyle->mBacktrace));
}

6
layout/base/RestyleTracker.h
View File

@ -18,7 +18,7 @@
#include "mozilla/RestyleLogging.h"
#include "GeckoProfiler.h"
#if defined(MOZ_ENABLE_PROFILER_SPS) && !defined(MOZILLA_XPCOMRT_API)
#ifdef MOZ_ENABLE_PROFILER_SPS
#include "ProfilerBacktrace.h"
#endif
@ -296,7 +296,7 @@ public:
// that we called AddPendingRestyle for and found the element this is
// the RestyleData for as its nearest restyle root.
nsTArray<nsRefPtr<Element>> mDescendants;
#if defined(MOZ_ENABLE_PROFILER_SPS) && !defined(MOZILLA_XPCOMRT_API)
#ifdef MOZ_ENABLE_PROFILER_SPS
UniquePtr<ProfilerBacktrace> mBacktrace;
#endif
};
@ -397,7 +397,7 @@ RestyleTracker::AddPendingRestyleToTable(Element* aElement,
if (!existingData) {
RestyleData* rd = new RestyleData(aRestyleHint, aMinChangeHint);
#if defined(MOZ_ENABLE_PROFILER_SPS) && !defined(MOZILLA_XPCOMRT_API)
#ifdef MOZ_ENABLE_PROFILER_SPS
if (profiler_feature_active("restyle")) {
rd->mBacktrace.reset(profiler_get_backtrace());
}

2
tools/profiler/GeckoProfiler.h
View File

@ -52,6 +52,8 @@
#include "js/TypeDecls.h"
#include "mozilla/GuardObjects.h"
#include "mozilla/UniquePtr.h"
#include "mozilla/GuardObjects.h"
#include "ProfilerBacktrace.h"
namespace mozilla {
class TimeStamp;