wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1151829 - Unbreak build on non-SPS platforms after bug 1093934. r=rbarker

Browse Source
This commit is contained in:
Jan Beich 2015-04-07 17:26:00 -04:00
parent c646624d09
commit 25225f9727
3 changed files with 7 additions and 9 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;
#ifdef MOZ_ENABLE_PROFILER_SPS
#if defined(MOZ_ENABLE_PROFILER_SPS) && !defined(MOZILLA_XPCOMRT_API)
UniquePtr<ProfilerBacktrace> mBacktrace;
#endif
};
@ -143,7 +143,7 @@ CollectRestyles(nsISupports* aElement,
currentRestyle->mElement = element;
currentRestyle->mRestyleHint = aData->mRestyleHint;
currentRestyle->mChangeHint = aData->mChangeHint;
#ifdef MOZ_ENABLE_PROFILER_SPS
#if defined(MOZ_ENABLE_PROFILER_SPS) && !defined(MOZILLA_XPCOMRT_API)
currentRestyle->mBacktrace = Move(aData->mBacktrace);
#endif
@ -312,7 +312,7 @@ RestyleTracker::DoProcessRestyles()
}
Maybe<GeckoProfilerTracingRAII> profilerRAII;
#ifdef MOZ_ENABLE_PROFILER_SPS
#if defined(MOZ_ENABLE_PROFILER_SPS) && !defined(MOZILLA_XPCOMRT_API)
if (profiler_feature_active("restyle")) {
profilerRAII.emplace("Paint", "Styles", Move(data->mBacktrace));
}
@ -354,7 +354,7 @@ RestyleTracker::DoProcessRestyles()
LOG_RESTYLE_INDENT();
Maybe<GeckoProfilerTracingRAII> profilerRAII;
#ifdef MOZ_ENABLE_PROFILER_SPS
#if defined(MOZ_ENABLE_PROFILER_SPS) && !defined(MOZILLA_XPCOMRT_API)
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"
#ifdef MOZ_ENABLE_PROFILER_SPS
#if defined(MOZ_ENABLE_PROFILER_SPS) && !defined(MOZILLA_XPCOMRT_API)
#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;
#ifdef MOZ_ENABLE_PROFILER_SPS
#if defined(MOZ_ENABLE_PROFILER_SPS) && !defined(MOZILLA_XPCOMRT_API)
UniquePtr<ProfilerBacktrace> mBacktrace;
#endif
};
@ -397,7 +397,7 @@ RestyleTracker::AddPendingRestyleToTable(Element* aElement,
if (!existingData) {
RestyleData* rd = new RestyleData(aRestyleHint, aMinChangeHint);
#ifdef MOZ_ENABLE_PROFILER_SPS
#if defined(MOZ_ENABLE_PROFILER_SPS) && !defined(MOZILLA_XPCOMRT_API)
if (profiler_feature_active("restyle")) {
rd->mBacktrace.reset(profiler_get_backtrace());
}

2
tools/profiler/GeckoProfiler.h
View File

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