Backed out changeset 17d1440b76b1 (bug 1505858) for bustages on WebRenderBridgeParent.cpp

gfx/layers/ipc/CrossProcessCompositorBridgeParent.cpp

@@ -367,26 +367,6 @@ CrossProcessCompositorBridgeParent::ShadowLayersUpdated(
     Unused << state->mParent->SendObserveLayersUpdate(id, aLayerTree->GetChildEpoch(), true);
   }
 
-  auto endTime = TimeStamp::Now();
-#ifdef MOZ_GECKO_PROFILER
-  if (profiler_is_active()) {
-    class ContentBuildPayload : public ProfilerMarkerPayload {
-      public:
-        ContentBuildPayload(const mozilla::TimeStamp& aStartTime, const mozilla::TimeStamp& aEndTime)
-          : ProfilerMarkerPayload(aStartTime, aEndTime)
-        {}
-        virtual void StreamPayload(SpliceableJSONWriter& aWriter, const TimeStamp& aProcessStartTime, UniqueStacks& aUniqueStacks) override {
-          StreamCommonProps("CONTENT_FULL_PAINT_TIME", aWriter, aProcessStartTime, aUniqueStacks);
-        }
-    };
-    profiler_add_marker_for_thread(profiler_current_thread_id(), "CONTENT_FULL_PAINT_TIME", MakeUnique<ContentBuildPayload>(aInfo.transactionStart(),
-                                                                                                                       endTime));
-  }
-#endif
-  Telemetry::Accumulate(Telemetry::CONTENT_FULL_PAINT_TIME,
-                        static_cast<uint32_t>((endTime - aInfo.transactionStart()).ToMilliseconds()));
-
-
   aLayerTree->SetPendingTransactionId(aInfo.id(), aInfo.refreshStart(), aInfo.transactionStart(), aInfo.fwdTime());
 }
 

gfx/layers/wr/WebRenderBridgeParent.cpp

@@ -197,52 +197,6 @@ protected:
   bool mIsActive;
 };
 
-class SceneBuiltNotification: public wr::NotificationHandler {
-public:
-  SceneBuiltNotification(TimeStamp aTxnStartTime)
-  : mTxnStartTime(aTxnStartTime)
-  {}
-
-  virtual void Notify(wr::Checkpoint) override {
-    auto startTime = this->mTxnStartTime;
-    CompositorThreadHolder::Loop()->PostTask(
-      NS_NewRunnableFunction("SceneBuiltNotificationRunnable", [startTime]() {
-        auto endTime = TimeStamp::Now();
-#ifdef MOZ_GECKO_PROFILER
-        if (profiler_is_active()) {
-          class ContentFullPaintPayload : public ProfilerMarkerPayload
-          {
-          public:
-            ContentFullPaintPayload(const mozilla::TimeStamp& aStartTime,
-                                    const mozilla::TimeStamp& aEndTime)
-              : ProfilerMarkerPayload(aStartTime, aEndTime)
-            {
-            }
-            virtual void StreamPayload(SpliceableJSONWriter& aWriter,
-                                       const TimeStamp& aProcessStartTime,
-                                       UniqueStacks& aUniqueStacks) override
-            {
-              StreamCommonProps("CONTENT_FULL_PAINT_TIME",
-                                aWriter,
-                                aProcessStartTime,
-                                aUniqueStacks);
-            }
-          };
-
-          profiler_add_marker_for_thread(profiler_current_thread_id(),
-                                         "CONTENT_FULL_PAINT_TIME",
-                                         MakeUnique<ContentFullPaintPayload>(startTime, endTime));
-        }
-#endif
-        Telemetry::Accumulate(Telemetry::CONTENT_FULL_PAINT_TIME,
-                              static_cast<uint32_t>((endTime - startTime).ToMilliseconds()));
-      }));
-  }
-protected:
-  TimeStamp mTxnStartTime;
-};
-
-
 class WebRenderBridgeParent::ScheduleSharedSurfaceRelease final
   : public wr::NotificationHandler
 {
@@ -982,13 +936,6 @@ WebRenderBridgeParent::RecvSetDisplayList(const gfx::IntSize& aSize,
       );
     }
 
-    txn.Notify(
-      wr::Checkpoint::SceneBuilt,
-      MakeUnique<SceneBuiltNotification>(
-        aTxnStartTime
-      )
-    );
-
     mApi->SendTransaction(txn);
 
     // We will schedule generating a frame after the scene

toolkit/components/telemetry/Histograms.json

@@ -13054,17 +13054,6 @@
     "n_buckets": 50,
     "description": "Time spent in the paint pipeline for content in milliseconds."
   },
-  "CONTENT_FULL_PAINT_TIME": {
-    "record_in_processes": ["main", "content"],
-    "alert_emails": ["gfx-telemetry-alerts@mozilla.com", "jmuizelaar@mozilla.com", "dbolter@mozilla.com"],
-    "bug_numbers": [1505858],
-    "expires_in_version": "never",
-    "releaseChannelCollection": "opt-out",
-    "kind": "exponential",
-    "high": 1000,
-    "n_buckets": 50,
-    "description": "Time spent in the paint pipeline until it's ready for composition in milliseconds."
-  },
   "CONTENT_FRAME_TIME": {
     "record_in_processes": ["main", "gpu"],
     "alert_emails": ["gfx-telemetry-alerts@mozilla.com", "rhunt@mozilla.com"],