Backed out changeset a73ffb0d0c97 because of build bustage

accessible/src/base/NotificationController.cpp

@@ -15,6 +15,10 @@
 using namespace mozilla;
 using namespace mozilla::a11y;
 
+// Defines the number of selection add/remove events in the queue when they
+// aren't packed into single selection within event.
+const unsigned int kSelChangeCountToPack = 5;
+
 ////////////////////////////////////////////////////////////////////////////////
 // NotificationCollector
 ////////////////////////////////////////////////////////////////////////////////

caps/src/nsScriptSecurityManager.cpp

@@ -70,6 +70,8 @@
 using namespace mozilla;
 using namespace mozilla::dom;
 
+static NS_DEFINE_CID(kZipReaderCID, NS_ZIPREADER_CID);
+
 nsIIOService    *nsScriptSecurityManager::sIOService = nullptr;
 nsIStringBundle *nsScriptSecurityManager::sStrBundle = nullptr;
 JSRuntime       *nsScriptSecurityManager::sRuntime   = 0;

extensions/spellcheck/hunspell/src/mozHunspell.cpp

@@ -78,6 +78,9 @@
 #include "nsIPrefService.h"
 #include "nsIPrefBranch.h"
 
+static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
+static NS_DEFINE_CID(kUnicharUtilCID, NS_UNICHARUTIL_CID);
+
 NS_IMPL_CYCLE_COLLECTING_ADDREF(mozHunspell)
 NS_IMPL_CYCLE_COLLECTING_RELEASE(mozHunspell)
 

extensions/spellcheck/src/mozPersonalDictionary.cpp

@@ -20,6 +20,8 @@
 
 #define MOZ_PERSONAL_DICT_NAME "persdict.dat"
 
+const int kMaxWordLen=256;
+
 /**
  * This is the most braindead implementation of a personal dictionary possible.
  * There is not much complexity needed, though.  It could be made much faster,

extensions/universalchardet/src/xpcom/nsUdetXPCOMWrapper.cpp

@@ -15,6 +15,9 @@
 #include "nsISupports.h"
 #include "nsCOMPtr.h"
 
+static NS_DEFINE_CID(kUniversalDetectorCID, NS_UNIVERSAL_DETECTOR_CID);
+static NS_DEFINE_CID(kUniversalStringDetectorCID, NS_UNIVERSAL_STRING_DETECTOR_CID);
+
 //---------------------------------------------------------------------
 nsXPCOMDetector:: nsXPCOMDetector(uint32_t aLanguageFilter)
  : nsUniversalDetector(aLanguageFilter)

gfx/layers/ipc/Axis.cpp

@@ -20,6 +20,8 @@
 namespace mozilla {
 namespace layers {
 
+static const float EPSILON = 0.0001f;
+
 /**
  * Maximum acceleration that can happen between two frames. Velocity is
  * throttled if it's above this. This may happen if a time delta is very low,

ipc/chromium/src/base/message_loop.cc

@@ -45,6 +45,18 @@ static base::LazyInstance<base::ThreadLocalPointer<MessageLoop> > lazy_tls_ptr(
 
 //------------------------------------------------------------------------------
 
+// Logical events for Histogram profiling. Run with -message-loop-histogrammer
+// to get an accounting of messages and actions taken on each thread.
+static const int kTaskRunEvent = 0x1;
+static const int kTimerEvent = 0x2;
+
+// Provide range of message IDs for use in histogramming and debug display.
+static const int kLeastNonZeroMessageId = 1;
+static const int kMaxMessageId = 1099;
+static const int kNumberOfDistinctMessagesDisplayed = 1100;
+
+//------------------------------------------------------------------------------
+
 #if defined(OS_WIN)
 
 // Upon a SEH exception in this thread, it restores the original unhandled

ipc/chromium/src/base/shared_memory_posix.cc

@@ -17,6 +17,12 @@
 
 namespace base {
 
+namespace {
+// Paranoia. Semaphores and shared memory segments should live in different
+// namespaces, but who knows what's out there.
+const char kSemaphoreSuffix[] = "-sem";
+}
+
 SharedMemory::SharedMemory()
     : mapped_file_(-1),
       inode_(0),

ipc/chromium/src/base/sys_string_conversions_mac.mm

@@ -114,8 +114,10 @@ static CFStringRef STLStringToCFStringWithEncodingsT(
 // when strings don't carry BOMs, as they typically won't.
 static const CFStringEncoding kNarrowStringEncoding = kCFStringEncodingUTF8;
 #ifdef __BIG_ENDIAN__
+static const CFStringEncoding kMediumStringEncoding = kCFStringEncodingUTF16BE;
 static const CFStringEncoding kWideStringEncoding = kCFStringEncodingUTF32BE;
 #elif defined(__LITTLE_ENDIAN__)
+static const CFStringEncoding kMediumStringEncoding = kCFStringEncodingUTF16LE;
 static const CFStringEncoding kWideStringEncoding = kCFStringEncodingUTF32LE;
 #endif  // __LITTLE_ENDIAN__
 

ipc/chromium/src/chrome/common/ipc_logging.cc

@@ -43,9 +43,7 @@ struct RunnableMethodTraits<IPC::Logging> {
 namespace IPC {
 
 const wchar_t kLoggingEventName[] = L"ChromeIPCLog.%d";
-#if defined(OS_WIN)
 const int kLogSendDelayMs = 100;
-#endif
 
 // We use a pointer to the function table to avoid any linker dependencies on
 // all the traits used as IPC message parameters.

js/jsd/jsd_xpc.cpp

@@ -97,6 +97,7 @@ const char implementationString[] = "Mozilla JavaScript Debugger Service";
 
 const char jsdServiceCtrID[] = "@mozilla.org/js/jsd/debugger-service;1";
 const char jsdARObserverCtrID[] = "@mozilla.org/js/jsd/app-start-observer;2";
+const char jsdASObserverCtrID[] = "service,@mozilla.org/js/jsd/app-start-observer;2";
 
 #ifdef DEBUG_verbose
 uint32_t gScriptCount   = 0;

parser/html/nsParserUtils.cpp

@@ -45,6 +45,10 @@ NS_IMPL_ISUPPORTS2(nsParserUtils,
                    nsIScriptableUnescapeHTML,
                    nsIParserUtils)
 
+static NS_DEFINE_CID(kCParserCID, NS_PARSER_CID);
+
+
+
 NS_IMETHODIMP
 nsParserUtils::ConvertToPlainText(const nsAString& aFromStr,
                                   uint32_t aFlags,

parser/htmlparser/src/nsParser.cpp

@@ -54,6 +54,10 @@ using mozilla::dom::EncodingUtils;
 #define NS_PARSER_FLAG_FLUSH_TOKENS           0x00000020
 #define NS_PARSER_FLAG_CAN_TOKENIZE           0x00000040
 
+static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
+static NS_DEFINE_CID(kCParserCID, NS_PARSER_CID);
+static NS_DEFINE_IID(kIParserIID, NS_IPARSER_IID);
+
 //-------------- Begin ParseContinue Event Definition ------------------------
 /*
 The parser can be explicitly interrupted by passing a return value of

parser/htmlparser/src/nsScanner.cpp

@@ -45,6 +45,12 @@ nsReadEndCondition::nsReadEndCondition(const PRUnichar* aTerminateChars) :
   }
 }
 
+#ifdef __INCREMENTAL
+const int   kBufsize=1;
+#else
+const int   kBufsize=64;
+#endif
+
 /**
  *  Use this constructor if you want i/o to be based on 
  *  a single string you hand in during construction.

rdf/base/src/nsCompositeDataSource.cpp

@@ -49,6 +49,8 @@
 PRLogModuleInfo* nsRDFLog = nullptr;
 #endif
 
+static NS_DEFINE_IID(kISupportsIID,           NS_ISUPPORTS_IID);
+
 //----------------------------------------------------------------------
 //
 // CompositeDataSourceImpl

rdf/base/src/nsRDFContentSink.cpp

@@ -73,6 +73,7 @@ using namespace mozilla;
 
 static NS_DEFINE_IID(kIContentSinkIID,         NS_ICONTENT_SINK_IID); // XXX grr...
 static NS_DEFINE_IID(kIExpatSinkIID,           NS_IEXPATSINK_IID);
+static NS_DEFINE_IID(kIRDFServiceIID,          NS_IRDFSERVICE_IID);
 static NS_DEFINE_IID(kISupportsIID,            NS_ISUPPORTS_IID);
 static NS_DEFINE_IID(kIXMLContentSinkIID,      NS_IXMLCONTENT_SINK_IID);
 static NS_DEFINE_IID(kIRDFContentSinkIID,      NS_IRDFCONTENTSINK_IID);

security/manager/ssl/src/SSLServerCertVerification.cpp

@@ -131,6 +131,8 @@ namespace mozilla { namespace psm {
 
 namespace {
 
+NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
+
 NSSCleanupAutoPtrClass(CERTCertificate, CERT_DestroyCertificate)
 NSSCleanupAutoPtrClass_WithParam(PLArenaPool, PORT_FreeArena, FalseParam, false)
 

security/manager/ssl/src/nsCMS.cpp

@@ -27,6 +27,8 @@ extern PRLogModuleInfo* gPIPNSSLog;
 
 using namespace mozilla;
 
+static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
+
 NS_IMPL_ISUPPORTS2(nsCMSMessage, nsICMSMessage, nsICMSMessage2)
 
 nsCMSMessage::nsCMSMessage()

security/manager/ssl/src/nsKeygenHandler.cpp

@@ -69,6 +69,7 @@ const SEC_ASN1Template SECKEY_PQGParamsTemplate[] = {
 };
 
 
+static NS_DEFINE_IID(kIDOMHTMLSelectElementIID, NS_IDOMHTMLSELECTELEMENT_IID);
 static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
 
 static PQGParams *

security/manager/ssl/src/nsNSSIOLayer.cpp

@@ -62,6 +62,8 @@ namespace {
 
 NSSCleanupAutoPtrClass(void, PR_FREEIF)
 
+static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
+
 /* SSM_UserCertChoice: enum for cert choice info */
 typedef enum {ASK, AUTO} SSM_UserCertChoice;
 
@@ -1715,11 +1717,11 @@ static const SEC_ASN1Template cert_CertificateScopeEntryTemplate[] = {
     { 0 }
 };
 
-#if 0
 static const SEC_ASN1Template cert_CertificateScopeOfUseTemplate[] = {
     { SEC_ASN1_SEQUENCE_OF, 0, cert_CertificateScopeEntryTemplate }
 };
 
+#if 0
 /* 
  * decodes the extension data and create CERTCertificateScopeEntry that can
  * be consumed by the code

startupcache/StartupCache.cpp

@@ -88,6 +88,7 @@ private:
 };
 
 static const char sStartupCacheName[] = "startupCache." SC_WORDSIZE "." SC_ENDIAN;
+static NS_DEFINE_CID(kZipReaderCID, NS_ZIPREADER_CID);
 
 StartupCache*
 StartupCache::GetSingleton()

toolkit/components/places/nsNavHistory.cpp

@@ -102,6 +102,8 @@ using namespace mozilla::places;
 // for repeating stuff.  These are milliseconds between "now" cache refreshes.
 #define RENEW_CACHED_NOW_TIMEOUT ((int32_t)3 * PR_MSEC_PER_SEC)
 
+static const int64_t USECS_PER_DAY = (int64_t)PR_USEC_PER_SEC * 60 * 60 * 24;
+
 // character-set annotation
 #define CHARSET_ANNO NS_LITERAL_CSTRING("URIProperties/characterSet")
 

toolkit/crashreporter/nsExceptionHandler.cpp

@@ -195,18 +195,27 @@ static const int kTimeSinceLastCrashParameterLen =
                                      sizeof(kTimeSinceLastCrashParameter)-1;
 
 static const char kSysMemoryParameter[] = "SystemMemoryUsePercentage=";
+static const int kSysMemoryParameterLen = sizeof(kSysMemoryParameter)-1;
 
 static const char kTotalVirtualMemoryParameter[] = "TotalVirtualMemory=";
+static const int kTotalVirtualMemoryParameterLen =
+  sizeof(kTotalVirtualMemoryParameter)-1;
 
 static const char kAvailableVirtualMemoryParameter[] = "AvailableVirtualMemory=";
+static const int kAvailableVirtualMemoryParameterLen =
+  sizeof(kAvailableVirtualMemoryParameter)-1;
 
 static const char kOOMAllocationSizeParameter[] = "OOMAllocationSize=";
 static const int kOOMAllocationSizeParameterLen =
   sizeof(kOOMAllocationSizeParameter)-1;
 
 static const char kAvailablePageFileParameter[] = "AvailablePageFile=";
+static const int kAvailablePageFileParameterLen =
+  sizeof(kAvailablePageFileParameter)-1;
 
 static const char kAvailablePhysicalMemoryParameter[] = "AvailablePhysicalMemory=";
+static const int kAvailablePhysicalMemoryParameterLen =
+  sizeof(kAvailablePhysicalMemoryParameter)-1;
 
 static const char kIsGarbageCollectingParameter[] = "IsGarbageCollecting=";
 static const int kIsGarbageCollectingParameterLen =

toolkit/xre/nsSigHandlers.cpp

@@ -39,6 +39,10 @@
 static char _progname[1024] = "huh?";
 static unsigned int _gdb_sleep_duration = 300;
 
+// NB: keep me up to date with the same variable in
+// ipc/chromium/chrome/common/ipc_channel_posix.cc
+static const int kClientChannelFd = 3;
+
 #if defined(LINUX) && defined(DEBUG) && \
       (defined(__i386) || defined(__x86_64) || defined(PPC))
 #define CRAWL_STACK_ON_SIGSEGV
@@ -46,10 +50,6 @@ static unsigned int _gdb_sleep_duration = 300;
 
 #if defined(CRAWL_STACK_ON_SIGSEGV)
 
-// NB: keep me up to date with the same variable in
-// ipc/chromium/chrome/common/ipc_channel_posix.cc
-static const int kClientChannelFd = 3;
-
 #include <unistd.h>
 #include "nsISupportsUtils.h"
 #include "nsStackWalk.h"

widget/cocoa/nsNativeThemeCocoa.mm

@@ -277,6 +277,10 @@ static void DrawFocusRing(NSRect rect, float radius)
   
 #endif
 
+// Copied from nsLookAndFeel.h
+// Apple hasn't defined a constant for scollbars with two arrows on each end, so we'll use this one.
+static const int kThemeScrollBarArrowsBoth = 2;
+
 #define HITHEME_ORIENTATION kHIThemeOrientationNormal
 #define MAX_FOCUS_RING_WIDTH 4
 

xpcom/components/nsComponentManager.cpp

@@ -95,15 +95,32 @@ extern mozilla::Module const *const *const kPStaticModules[];
 
 // Common Key Names
 const char classIDKeyName[]="classID";
+const char classesKeyName[]="contractID";
 const char componentsKeyName[]="components";
 const char xpcomComponentsKeyName[]="software/mozilla/XPCOM/components";
 const char xpcomKeyName[]="software/mozilla/XPCOM";
 
 // Common Value Names
+const char classIDValueName[]="ClassID";
+const char classNameValueName[]="ClassName";
+const char componentCountValueName[]="ComponentsCount";
+const char componentTypeValueName[]="ComponentType";
+const char contractIDValueName[]="ContractID";
 const char fileSizeValueName[]="FileSize";
+const char inprocServerValueName[]="InprocServer";
 const char lastModValueName[]="LastModTimeStamp";
 const char nativeComponentType[]="application/x-mozilla-native";
 const char staticComponentType[]="application/x-mozilla-static";
+const char jarComponentType[]="application/x-mozilla-jarjs";
+const char versionValueName[]="VersionString";
+
+const static char XPCOM_ABSCOMPONENT_PREFIX[] = "abs:";
+const static char XPCOM_RELCOMPONENT_PREFIX[] = "rel:";
+const static char XPCOM_GRECOMPONENT_PREFIX[] = "gre:";
+
+static const char gIDFormat[] =
+  "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}";
+
 
 #define NS_EMPTY_IID                                 \
 {                                                    \
@@ -113,6 +130,7 @@ const char staticComponentType[]="application/x-mozilla-static";
     {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00} \
 }
 
+NS_DEFINE_CID(kEmptyCID, NS_EMPTY_IID);
 NS_DEFINE_CID(kCategoryManagerCID, NS_CATEGORYMANAGER_CID);
 
 #define UID_STRING_LENGTH 39

xpcom/ds/TimeStamp_darwin.cpp

@@ -30,6 +30,7 @@ static uint64_t sResolutionSigDigs;
 
 static const uint64_t kNsPerMs   =    1000000;
 static const uint64_t kUsPerSec  =    1000000;
+static const uint64_t kNsPerSec  = 1000000000;
 static const double kNsPerMsd    =    1000000.0;
 static const double kNsPerSecd   = 1000000000.0;
 

xpcom/glue/nsID.cpp

@@ -6,10 +6,11 @@
 #include "prprf.h"
 #include "nsMemory.h"
 
-#ifndef XPCOM_GLUE_AVOID_NSPR
-static const char gIDFormat[] =
+static const char gIDFormat[] = 
   "{%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x}";
-#endif
+
+static const char gIDFormat2[] = 
+  "%08x-%04x-%04x-%02x%02x-%02x%02x%02x%02x%02x%02x";
 
 
 /**

xpcom/glue/nsVoidArray.cpp

@@ -17,6 +17,7 @@
  */
 static const int32_t kMinGrowArrayBy = 8;
 static const int32_t kMaxGrowArrayBy = 1024;
+static const int32_t kAutoClearCompactSizeFactor = 4;
 
 /**
  * This is the threshold (in bytes) of the mImpl struct, past which

xpcom/threads/HangMonitor.cpp

@@ -34,13 +34,11 @@ volatile bool gDebugDisableHangMonitor = false;
 
 const char kHangMonitorPrefName[] = "hangmonitor.timeout";
 
-#ifdef REPORT_CHROME_HANGS
 #ifdef MOZ_TELEMETRY_ON_BY_DEFAULT
 const char kTelemetryPrefName[] = "toolkit.telemetry.enabledPreRelease";
 #else
 const char kTelemetryPrefName[] = "toolkit.telemetry.enabled";
 #endif
-#endif
 
 // Monitor protects gShutdown and gTimeout, but not gTimestamp which rely on
 // being atomically set by the processor; synchronization doesn't really matter

xpfe/components/directory/nsDirectoryViewer.cpp

@@ -54,6 +54,7 @@
 
 using namespace mozilla;
 
+static const int FORMAT_HTML = 2;
 static const int FORMAT_XUL = 3;
 
 //----------------------------------------------------------------------