Backed out changeset 6ab8ef0895ca (bug 1032880) for bustage
authorWes Kocher <wkocher@mozilla.com>
Wed, 23 Jul 2014 16:55:00 -0700
changeset 195805 4119caa3ac8fdbe65ed90425768041f6e8f18d7f
parent 195804 6ab8ef0895ca40ff5dc313108c51a73dfacd4c07
child 195806 fd72e28c6d38f815739560cbf0beeb18ed88897f
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
bugs1032880
milestone34.0a1
backs out6ab8ef0895ca40ff5dc313108c51a73dfacd4c07
Backed out changeset 6ab8ef0895ca (bug 1032880) for bustage
layout/base/nsDisplayList.cpp
modules/libpref/src/init/all.js
testing/profiles/prefs_general.js
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -60,30 +60,16 @@
 #include <algorithm>
 
 using namespace mozilla;
 using namespace mozilla::layers;
 using namespace mozilla::dom;
 using namespace mozilla::layout;
 typedef FrameMetrics::ViewID ViewID;
 
-static bool
-SpammyLayoutWarningsEnabled()
-{
-  static bool sValue = false;
-  static bool sValueInitialized = false;
-
-  if (!sValueInitialized) {
-    Preferences::GetBool("layout.spammy_warnings.enabled", &sValue);
-    sValueInitialized = true;
-  }
-
-  return sValue;
-}
-
 static inline nsIFrame*
 GetTransformRootFrame(nsIFrame* aFrame)
 {
   return nsLayoutUtils::GetTransformRootFrame(aFrame);
 }
 
 static void AddTransformFunctions(nsCSSValueList* aList,
                                   nsStyleContext* aContext,
@@ -1276,27 +1262,21 @@ void nsDisplayList::PaintForFrame(nsDisp
   }
 
   nsRect viewport(aBuilder->ToReferenceFrame(aForFrame), aForFrame->GetSize());
 
   RecordFrameMetrics(aForFrame, rootScrollFrame,
                      aBuilder->FindReferenceFrameFor(aForFrame),
                      root, viewport,
                      !isRoot, isRoot, containerParameters);
-
-  // NS_WARNING is debug-only, so don't even bother checking the conditions in
-  // a release build.
-#ifdef DEBUG
   if (usingDisplayport &&
-      !(root->GetContentFlags() & Layer::CONTENT_OPAQUE) &&
-      SpammyLayoutWarningsEnabled()) {
+      !(root->GetContentFlags() & Layer::CONTENT_OPAQUE)) {
     // See bug 693938, attachment 567017
     NS_WARNING("Transparent content with displayports can be expensive.");
   }
-#endif
 
   layerManager->SetRoot(root);
   layerBuilder->WillEndTransaction();
 
   if (widgetTransaction ||
       // SVG-as-an-image docs don't paint as part of the retained layer tree,
       // but they still need the invalidation state bits cleared in order for
       // invalidation for CSS/SMIL animation to work properly.
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -2041,19 +2041,16 @@ pref("layout.display-list.dump", false);
 // after we've just finished processing the last notification, which might
 // lead to starvation problems.
 // When false, we use a "slack" timer which fires Nms after the *end*
 // of the last notification. This can give less tight frame rates
 // but provides more time for other operations when the browser is
 // heavily loaded.
 pref("layout.frame_rate.precise", false);
 
-// pref to control whether layout warnings that are hit quite often are enabled 
-pref("layout.spammy_warnings.enabled", true);
-
 // Is support for the Web Animations API enabled?
 #ifdef RELEASE_BUILD
 pref("dom.animations-api.core.enabled", false);
 #else
 pref("dom.animations-api.core.enabled", true);
 #endif
 
 // pref to permit users to make verified SOAP calls by default
--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -134,19 +134,16 @@ user_pref("datareporting.healthreport.ab
 user_pref("layout.css.report_errors", true);
 
 // Enable CSS Grid for testing
 user_pref("layout.css.grid.enabled", true);
 
 // Enable CSS Ruby for testing
 user_pref("layout.css.ruby.enabled", true);
 
-// Disable spammy layout warnings because they pollute test logs
-user_pref("layout.spammy_warnings.enabled", false);
-
 // Enable mozContacts
 user_pref("dom.mozContacts.enabled", true);
 user_pref("dom.navigator-property.disable.mozContacts", false);
 user_pref("dom.global-constructor.disable.mozContact", false);
 
 // Enable mozSettings
 user_pref("dom.mozSettings.enabled", true);