Backed out changeset b7bcbc5c1b92 (bug 1369840)

dom/base/nsDOMWindowUtils.cpp

@@ -3893,10 +3893,6 @@ nsDOMWindowUtils::GetContentAPZTestData(JSContext* aContext,
       if (!clm->GetAPZTestData().ToJS(aOutContentTestData, aContext)) {
         return NS_ERROR_FAILURE;
       }
-    } else if (WebRenderLayerManager* wrlm = lm->AsWebRenderLayerManager()) {
-      if (!wrlm->GetAPZTestData().ToJS(aOutContentTestData, aContext)) {
-        return NS_ERROR_FAILURE;
-      }
     }
   }
 

gfx/layers/wr/WebRenderBridgeParent.cpp

@@ -371,7 +371,7 @@ WebRenderBridgeParent::UpdateAPZ()
   if (RefPtr<APZCTreeManager> apzc = cbp->GetAPZCTreeManager()) {
     apzc->UpdateHitTestingTree(rootLayersId, rootWrbp->GetScrollData(),
         mScrollData.IsFirstPaint(), GetLayersId(),
-        mScrollData.GetPaintSequenceNumber());
+        /* TODO: propagate paint sequence number */ 0);
   }
 }
 

gfx/layers/wr/WebRenderLayerManager.cpp

@@ -32,7 +32,6 @@ WebRenderLayerManager::WebRenderLayerManager(nsIWidget* aWidget)
   , mNeedsComposite(false)
   , mIsFirstPaint(false)
   , mTarget(nullptr)
-  , mPaintSequenceNumber(0)
 {
   MOZ_COUNT_CTOR(WebRenderLayerManager);
 }
@@ -125,13 +124,6 @@ WebRenderLayerManager::BeginTransactionWithTarget(gfxContext* aTarget)
 bool
 WebRenderLayerManager::BeginTransaction()
 {
-  // Increment the paint sequence number even if test logging isn't
-  // enabled in this process; it may be enabled in the parent process,
-  // and the parent process expects unique sequence numbers.
-  ++mPaintSequenceNumber;
-  if (gfxPrefs::APZTestLoggingEnabled()) {
-    mApzTestData.StartNewPaint(mPaintSequenceNumber);
-  }
   return true;
 }
 
@@ -217,7 +209,6 @@ WebRenderLayerManager::EndTransactionInternal(DrawPaintedLayerCallback aCallback
       scrollData.SetIsFirstPaint();
       mIsFirstPaint = false;
     }
-    scrollData.SetPaintSequenceNumber(mPaintSequenceNumber);
     if (mRoot) {
       PopulateScrollData(scrollData, mRoot.get());
     }

gfx/layers/wr/WebRenderLayerManager.h

@@ -8,7 +8,6 @@
 
 #include "Layers.h"
 #include "mozilla/MozPromise.h"
-#include "mozilla/layers/APZTestData.h"
 #include "mozilla/layers/TransactionIdAllocator.h"
 #include "mozilla/webrender/WebRenderTypes.h"
 
@@ -127,16 +126,6 @@ public:
   void SetTransactionIncomplete() { mTransactionIncomplete = true; }
   bool IsMutatedLayer(Layer* aLayer);
 
-  // See equivalent function in ClientLayerManager
-  void LogTestDataForCurrentPaint(FrameMetrics::ViewID aScrollId,
-                                  const std::string& aKey,
-                                  const std::string& aValue) {
-    mApzTestData.LogTestDataForPaint(mPaintSequenceNumber, aScrollId, aKey, aValue);
-  }
-  // See equivalent function in ClientLayerManager
-  const APZTestData& GetAPZTestData() const
-  { return mApzTestData; }
-
 private:
   /**
    * Take a snapshot of the parent context, and copy
@@ -189,11 +178,6 @@ private:
  // being drawn to the default target, and then copy those pixels
  // back to mTarget.
  RefPtr<gfxContext> mTarget;
-
-  // See equivalent field in ClientLayerManager
-  uint32_t mPaintSequenceNumber;
-  // See equivalent field in ClientLayerManager
-  APZTestData mApzTestData;
 };
 
 } // namespace layers

gfx/layers/wr/WebRenderScrollData.cpp

@@ -80,7 +80,6 @@ WebRenderLayerScrollData::GetTransformTyped() const
 
 WebRenderScrollData::WebRenderScrollData()
   : mIsFirstPaint(false)
-  , mPaintSequenceNumber(0)
 {
 }
 
@@ -152,17 +151,5 @@ WebRenderScrollData::IsFirstPaint() const
   return mIsFirstPaint;
 }
 
-void
-WebRenderScrollData::SetPaintSequenceNumber(uint32_t aPaintSequenceNumber)
-{
-  mPaintSequenceNumber = aPaintSequenceNumber;
-}
-
-uint32_t
-WebRenderScrollData::GetPaintSequenceNumber() const
-{
-  return mPaintSequenceNumber;
-}
-
 } // namespace layers
 } // namespace mozilla

gfx/layers/wr/WebRenderScrollData.h

@@ -121,8 +121,6 @@ public:
 
   void SetIsFirstPaint();
   bool IsFirstPaint() const;
-  void SetPaintSequenceNumber(uint32_t aPaintSequenceNumber);
-  uint32_t GetPaintSequenceNumber() const;
 
   friend struct IPC::ParamTraits<WebRenderScrollData>;
 
@@ -148,7 +146,6 @@ private:
   nsTArray<WebRenderLayerScrollData> mLayerScrollData;
 
   bool mIsFirstPaint;
-  uint32_t mPaintSequenceNumber;
 };
 
 } // namespace layers
@@ -222,7 +219,6 @@ struct ParamTraits<mozilla::layers::WebRenderScrollData>
     WriteParam(aMsg, aParam.mScrollMetadatas);
     WriteParam(aMsg, aParam.mLayerScrollData);
     WriteParam(aMsg, aParam.mIsFirstPaint);
-    WriteParam(aMsg, aParam.mPaintSequenceNumber);
   }
 
   static bool
@@ -230,8 +226,7 @@ struct ParamTraits<mozilla::layers::WebRenderScrollData>
   {
     return ReadParam(aMsg, aIter, &aResult->mScrollMetadatas)
         && ReadParam(aMsg, aIter, &aResult->mLayerScrollData)
-        && ReadParam(aMsg, aIter, &aResult->mIsFirstPaint)
-        && ReadParam(aMsg, aIter, &aResult->mPaintSequenceNumber);
+        && ReadParam(aMsg, aIter, &aResult->mIsFirstPaint);
   }
 };
 

layout/base/nsLayoutUtils.cpp

@@ -122,7 +122,6 @@
 #include "RegionBuilder.h"
 #include "SVGSVGElement.h"
 #include "DisplayItemClip.h"
-#include "mozilla/layers/WebRenderLayerManager.h"
 
 #ifdef MOZ_XUL
 #include "nsXULPopupManager.h"
@@ -8509,8 +8508,6 @@ nsLayoutUtils::DoLogTestDataForPaint(LayerManager* aManager,
 {
   if (ClientLayerManager* mgr = aManager->AsClientLayerManager()) {
     mgr->LogTestDataForCurrentPaint(aScrollId, aKey, aValue);
-  } else if (WebRenderLayerManager* wrlm = aManager->AsWebRenderLayerManager()) {
-    wrlm->LogTestDataForCurrentPaint(aScrollId, aKey, aValue);
   }
 }