merge mozilla-inbound to mozilla-central a=merge

2017-05-05 15:17:26 +02:00
parent 2c47be5b8f acb99ac1fb
commit 31f9a8236d
327 changed files with 7305 additions and 5063 deletions
--- a/gfx/layers/client/TextureClient.cpp
+++ b/gfx/layers/client/TextureClient.cpp
@@ -1374,7 +1374,8 @@ TextureClient::PrintInfo(std::stringstream& aStream, const char* aPrefix)
  AppendToString(aStream, mFlags, " [flags=", "]");

 #ifdef MOZ_DUMP_PAINTING
-  if (gfxPrefs::LayersDumpTexture() || profiler_feature_active("layersdump")) {
+  if (gfxPrefs::LayersDumpTexture() ||
+      profiler_feature_active(ProfilerFeature::LayersDump)) {
    nsAutoCString pfx(aPrefix);
    pfx += "  ";