Bug 1079451: Don't log unnecessary warnings from chrome registration. r=bsmedberg
authorDave Townsend <dtownsend@oxymoronical.com>
Wed, 15 Oct 2014 15:02:42 -0700
changeset 210583 b008a281364db05e62fd8b4974cd71cffa748b11
parent 210582 a615a67cce1e2950c121361ffa9c89f136693a6f
child 210584 402cbbf91165870533e5b6b1bdba08a66ec3249f
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersbsmedberg
bugs1079451
milestone36.0a1
Bug 1079451: Don't log unnecessary warnings from chrome registration. r=bsmedberg
xpcom/components/ManifestParser.cpp
--- a/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp
@@ -761,28 +761,26 @@ ParseManifest(NSLocationType aType, File
           LogMessageWithContext(aFile, line,
                                 "Chrome registry isn't available yet.");
           continue;
         }
       }
 
       (nsChromeRegistry::gChromeRegistry->*(directive->regfunc))(
         chromecx, line, argv, platform, contentAccessible);
-    } else if (directive->mgrfunc && (directive->ischrome || !aChromeOnly)) {
+    } else if (directive->ischrome || !aChromeOnly) {
       if (directive->isContract) {
         CachedDirective* cd = contracts.AppendElement();
         cd->lineno = line;
         cd->argv[0] = argv[0];
         cd->argv[1] = argv[1];
       } else {
         (nsComponentManagerImpl::gComponentManager->*(directive->mgrfunc))(
           mgrcx, line, argv);
       }
-    } else {
-      LogMessageWithContext(aFile, line, "No valid manifest directive.");
     }
   }
 
   for (uint32_t i = 0; i < contracts.Length(); ++i) {
     CachedDirective& d = contracts[i];
     nsComponentManagerImpl::gComponentManager->ManifestContract(mgrcx,
                                                                 d.lineno,
                                                                 d.argv);