Commit cc4a6379 authored by Bas Schouten's avatar Bas Schouten Committed by bschouten@mozilla.com
Browse files

Bug 2036782: Add annotation to BHR reports for whether a paint is pending. r=mstange 

Differential Revision: https://phabricator.services.mozilla.com/D298281
parent 4bd867d2

layout/base/nsRefreshDriver.cpp

+30 −0
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ 
#include "mozilla/AnimationEventDispatcher.h"

#include "mozilla/Assertions.h"

#include "mozilla/AutoRestore.h"

#include "mozilla/BackgroundHangMonitor.h"

#include "mozilla/BasePrincipal.h"

#include "mozilla/CycleCollectedJSContext.h"

#include "mozilla/DisplayPortUtils.h"
@@ -1408,6 +1409,31 @@ static nsDocShell* GetDocShell(nsPresContext* aPresContext) { 
  return static_cast<nsDocShell*>(aPresContext->GetDocShell());

}



namespace mozilla {



class PaintPendingHangAnnotator final : public BackgroundHangAnnotator {

 public:

  explicit PaintPendingHangAnnotator(nsRefreshDriver& aDriver)

      : mDriver(aDriver) {

    BackgroundHangMonitor::RegisterAnnotator(*this);

  }



  ~PaintPendingHangAnnotator() {

    BackgroundHangMonitor::UnregisterAnnotator(*this);

  }



  void AnnotateHang(BackgroundHangAnnotations& aAnnotations) override {

    if (mDriver.IsPaintPending()) {

      aAnnotations.AddAnnotation(u"PaintPending"_ns, true);

    }

  }



 private:

  nsRefreshDriver& mDriver;

};



}  // namespace mozilla



nsRefreshDriver::nsRefreshDriver(nsPresContext* aPresContext)

    : mActiveTimer(nullptr),

      mOwnTimer(nullptr),
@@ -1442,6 +1468,10 @@ nsRefreshDriver::nsRefreshDriver(nsPresContext* aPresContext) 
    sRegularRateTimerList = new nsTArray<RefreshDriverTimer*>();

  }

  ++sRefreshDriverCount;



  if (aPresContext->IsRoot()) {

    mHangAnnotator = MakeUnique<PaintPendingHangAnnotator>(*this);

  }

}



nsRefreshDriver::~nsRefreshDriver() {

layout/base/nsRefreshDriver.h

+3 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ struct DocumentFrameCallbacks; 


namespace mozilla {

class AnimationEventDispatcher;

class PaintPendingHangAnnotator;

class PresShell;

class RefreshDriverTimer;

class Runnable;
@@ -537,6 +538,8 @@ class nsRefreshDriver final : public mozilla::layers::TransactionIdAllocator, 


  bool mHasStartedTimerAtLeastOnce : 1;



  mozilla::UniquePtr<mozilla::PaintPendingHangAnnotator> mHangAnnotator;



  mozilla::TimeStamp mMostRecentRefresh;

  mozilla::TimeStamp mTickStart;

  mozilla::VsyncId mTickVsyncId;