Backed out changeset c1ea5a8280d7 (bug 1041751) for b2g Gip orange on a CLOSED TREE

gfx/layers/client/ClientLayerManager.cpp

@@ -28,7 +28,6 @@
 #include "nsXULAppAPI.h"                // for XRE_GetProcessType, etc
 #include "TiledLayerBuffer.h"
 #include "mozilla/dom/WindowBinding.h"  // for Overfill Callback
-#include "gfxPrefs.h"
 #ifdef MOZ_WIDGET_ANDROID
 #include "AndroidBridge.h"
 #endif
@@ -166,7 +165,7 @@ ClientLayerManager::BeginTransactionWithTarget(gfxContext* aTarget)
   }
 
   // If this is a new paint, increment the paint sequence number.
-  if (gfxPrefs::APZTestLoggingEnabled() && !mIsRepeatTransaction) {
+  if (!mIsRepeatTransaction) {
     ++mPaintSequenceNumber;
     mApzTestData.StartNewPaint(mPaintSequenceNumber);
   }
@@ -325,14 +324,6 @@ ClientLayerManager::GetCompositorSideAPZTestData(APZTestData* aData) const
   }
 }
 
-void
-ClientLayerManager::StartNewRepaintRequest(SequenceNumber aSequenceNumber)
-{
-  if (gfxPrefs::APZTestLoggingEnabled()) {
-    mApzTestData.StartNewRepaintRequest(aSequenceNumber);
-  }
-}
-
 bool
 ClientLayerManager::RequestOverfill(mozilla::dom::OverfillCallback* aCallback)
 {

gfx/layers/client/ClientLayerManager.h

@@ -203,8 +203,10 @@ public:
   // Log APZ test data for a repaint request. The sequence number must be
   // passed in from outside, and APZTestData::StartNewRepaintRequest() needs
   // to be called from the outside as well when a new repaint request is started.
-  void StartNewRepaintRequest(SequenceNumber aSequenceNumber);
-
+  void StartNewRepaintRequest(SequenceNumber aSequenceNumber)
+  {
+    mApzTestData.StartNewRepaintRequest(aSequenceNumber);
+  }
   // TODO(botond): When we start using this and write a wrapper similar to
   // nsLayoutUtils::LogTestDataForPaint(), make sure that wrapper checks
   // gfxPrefs::APZTestLoggingEnabled().