diff options
Diffstat (limited to 'layout')
| -rw-r--r-- | layout/base/RestyleTracker.cpp | 18 | ||||
| -rw-r--r-- | layout/base/RestyleTracker.h | 12 | ||||
| -rw-r--r-- | layout/base/nsPresShell.cpp | 17 |
3 files changed, 0 insertions, 47 deletions
diff --git a/layout/base/RestyleTracker.cpp b/layout/base/RestyleTracker.cpp index 7d68058d1..a954fda1a 100644 --- a/layout/base/RestyleTracker.cpp +++ b/layout/base/RestyleTracker.cpp @@ -61,9 +61,6 @@ RestyleTracker::Document() const { struct RestyleEnumerateData : RestyleTracker::Hints { RefPtr<dom::Element> mElement; -#if defined(MOZ_ENABLE_PROFILER_SPS) - UniquePtr<ProfilerBacktrace> mBacktrace; -#endif }; inline void @@ -257,12 +254,6 @@ RestyleTracker::DoProcessRestyles() data->mRestyleHint, MarkerTracingType::START))); } -#if defined(MOZ_ENABLE_PROFILER_SPS) - Maybe<GeckoProfilerTracingRAII> profilerRAII; - if (profiler_feature_active("restyle")) { - profilerRAII.emplace("Paint", "Styles", Move(data->mBacktrace)); - } -#endif ProcessOneRestyle(element, data->mRestyleHint, data->mChangeHint, data->mRestyleHintData); AddRestyleRootsIfAwaitingRestyle(data->mDescendants); @@ -337,9 +328,6 @@ RestyleTracker::DoProcessRestyles() // We can move data since we'll be clearing mPendingRestyles after // we finish enumerating it. restyle->mRestyleHintData = Move(data->mRestyleHintData); -#if defined(MOZ_ENABLE_PROFILER_SPS) - restyle->mBacktrace = Move(data->mBacktrace); -#endif #ifdef RESTYLE_LOGGING count++; @@ -365,12 +353,6 @@ RestyleTracker::DoProcessRestyles() index++, count); LOG_RESTYLE_INDENT(); -#if defined(MOZ_ENABLE_PROFILER_SPS) - Maybe<GeckoProfilerTracingRAII> profilerRAII; - if (profiler_feature_active("restyle")) { - profilerRAII.emplace("Paint", "Styles", Move(currentRestyle->mBacktrace)); - } -#endif if (isTimelineRecording) { timelines->AddMarkerForDocShell(docShell, Move( MakeUnique<RestyleTimelineMarker>( diff --git a/layout/base/RestyleTracker.h b/layout/base/RestyleTracker.h index 10a653cdb..5eb393e16 100644 --- a/layout/base/RestyleTracker.h +++ b/layout/base/RestyleTracker.h @@ -22,10 +22,6 @@ #include "GeckoProfiler.h" #include "mozilla/Maybe.h" -#if defined(MOZ_ENABLE_PROFILER_SPS) -#include "ProfilerBacktrace.h" -#endif - namespace mozilla { class RestyleManager; @@ -128,9 +124,6 @@ public: // that we called AddPendingRestyle for and found the element this is // the RestyleData for as its nearest restyle root. nsTArray<RefPtr<Element>> mDescendants; -#if defined(MOZ_ENABLE_PROFILER_SPS) - UniquePtr<ProfilerBacktrace> mBacktrace; -#endif }; /** @@ -265,11 +258,6 @@ RestyleTracker::AddPendingRestyleToTable(Element* aElement, if (!existingData) { RestyleData* rd = new RestyleData(aRestyleHint, aMinChangeHint, aRestyleHintData); -#if defined(MOZ_ENABLE_PROFILER_SPS) - if (profiler_feature_active("restyle")) { - rd->mBacktrace.reset(profiler_get_backtrace()); - } -#endif mPendingRestyles.Put(aElement, rd); return false; } diff --git a/layout/base/nsPresShell.cpp b/layout/base/nsPresShell.cpp index 0b88948c3..3e5320c22 100644 --- a/layout/base/nsPresShell.cpp +++ b/layout/base/nsPresShell.cpp @@ -4064,23 +4064,6 @@ PresShell::FlushPendingNotifications(mozilla::ChangesToFlush aFlush) */ mozFlushType flushType = aFlush.mFlushType; -#ifdef MOZ_ENABLE_PROFILER_SPS - static const char flushTypeNames[][20] = { - "Content", - "ContentAndNotify", - "Style", - "InterruptibleLayout", - "Layout", - "Display" - }; - - // Make sure that we don't miss things added to mozFlushType! - MOZ_ASSERT(static_cast<uint32_t>(flushType) <= ArrayLength(flushTypeNames)); - - PROFILER_LABEL_PRINTF("PresShell", "Flush", - js::ProfileEntry::Category::GRAPHICS, "(Flush_%s)", flushTypeNames[flushType - 1]); -#endif - #ifdef ACCESSIBILITY #ifdef DEBUG nsAccessibilityService* accService = GetAccService(); |