Bug 1175289 - Part 2: Disable "Subdocument container has no frame" warning by default. r=mats
authorEric Rahm <erahm@mozilla.com>
Tue, 16 Jun 2015 16:37:16 -0700
changeset 249212 31303df54182b2e1c1679974d81a63f60f1a8045
parent 249211 f5ef44a112b5a66f986271b4424a025c6c5f4bde
child 249213 cb9fe5f0fd6cabbe9165cfa182396c1e90f37c01
push id61175
push usererahm@mozilla.com
push dateTue, 16 Jun 2015 23:37:35 +0000
treeherdermozilla-inbound@31303df54182 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmats
bugs1175289
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1175289 - Part 2: Disable "Subdocument container has no frame" warning by default. r=mats
layout/base/nsDocumentViewer.cpp
--- a/layout/base/nsDocumentViewer.cpp
+++ b/layout/base/nsDocumentViewer.cpp
@@ -125,17 +125,18 @@ static const char sPrintOptionsContractI
 #include "mozilla/Telemetry.h"
 
 using namespace mozilla;
 using namespace mozilla::dom;
 
 #define BEFOREUNLOAD_DISABLED_PREFNAME "dom.disable_beforeunload"
 
 //-----------------------------------------------------
-// PR LOGGING
+// LOGGING
+#include "LayoutLogging.h"
 #include "mozilla/Logging.h"
 
 #ifdef NS_PRINTING
 static PRLogModuleInfo *
 GetPrintingLog()
 {
   static PRLogModuleInfo *sLog;
   if (!sLog)
@@ -2512,17 +2513,18 @@ nsDocumentViewer::FindContainerView()
             NS_ASSERTION(subdocFrame->GetView(), "Subdoc frames must have views");
             nsView* innerView =
               static_cast<nsSubDocumentFrame*>(subdocFrame)->EnsureInnerView();
             containerView = innerView;
           } else {
             NS_WARNING("Subdocument container has non-subdocument frame");
           }
         } else {
-          NS_WARNING("Subdocument container has no frame");
+          // XXX Silenced by default in bug 117528
+          LAYOUT_WARNING("Subdocument container has no frame");
         }
       }
     }
   }
 
   return containerView;
 }