From 7d8e4ddf8dd407578e86b99f3ab33e65fc30ad6c Mon Sep 17 00:00:00 2001 From: Jon Coppeard Date: Wed, 21 Aug 2013 15:25:53 -0400 Subject: [PATCH 01/79] Bug 893184 - Don't attemmpt to get SharedScriptData* from a null code pointer. r=till --- js/src/jsscript.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp index fae864ede0a9..7c24ff58f77b 100644 --- a/js/src/jsscript.cpp +++ b/js/src/jsscript.cpp @@ -2806,7 +2806,7 @@ JSScript::markChildren(JSTracer *trc) if (IS_GC_MARKING_TRACER(trc)) { compartment()->mark(); - if (code || natoms) + if (code) MarkScriptData(trc->runtime, code); } From a9e9e27117563675567da895f4326bb7388d4976 Mon Sep 17 00:00:00 2001 From: Martijn Wargers Date: Wed, 21 Aug 2013 18:11:26 +0200 Subject: [PATCH 02/79] Bug 907648 - test_bug379959.html and test_bug369814.html should use SpecialPowers. r=jmaher --- content/xbl/test/test_bug379959.html | 87 ++++++++++++++++------------ docshell/test/test_bug369814.html | 50 +++++----------- 2 files changed, 65 insertions(+), 72 deletions(-) diff --git a/content/xbl/test/test_bug379959.html b/content/xbl/test/test_bug379959.html index 137b28d318db..32b0e2029736 100644 --- a/content/xbl/test/test_bug379959.html +++ b/content/xbl/test/test_bug379959.html @@ -1,15 +1,15 @@ - Test for Bug 366770 + Test for Bug 379959 - - Mozilla Bug 366770 + + Mozilla Bug 379959

Note: In order to re-run this test correctly you need to shift-reload rather than simply reload. If you just reload we will restore the @@ -23,63 +23,74 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=366770 diff --git a/docshell/test/test_bug369814.html b/docshell/test/test_bug369814.html index a47b9fc72ffa..3e257f9af305 100644 --- a/docshell/test/test_bug369814.html +++ b/docshell/test/test_bug369814.html @@ -26,13 +26,9 @@ SimpleTest.waitForExplicitFinish(); // checking the results. const gLoadEventLoopCount = 100; -var Ci = SpecialPowers.Ci; - var gCurrentTest; var gTargetWindow; var gNumPokes; -var gPrefValue; - var gTestFrame; /** @@ -186,49 +182,36 @@ var gNextTest = 0; function runNextTest() { - var prefs = SpecialPowers.Cc["@mozilla.org/preferences-service;1"] - .getService(SpecialPowers.Ci.nsIPrefBranch); - if (gNextTest < gTests.length) { gCurrentTest = gTests[gNextTest++]; gNumPokes = 0; - prefs.setBoolPref("network.jar.open-unsafe-types", gCurrentTest['pref']); + SpecialPowers.pushPrefEnv({"set": [["network.jar.open-unsafe-types", gCurrentTest['pref']]]}, function() { - // Create a new frame each time, so our restictions on loads in a - // jar:-loaded iframe don't interfere with the test. - if (gTestFrame) { - document.body.removeChild(gTestFrame); - } - gTestFrame = document.createElement("iframe"); - document.body.insertBefore(gTestFrame, $("test")); + // Create a new frame each time, so our restictions on loads in a + // jar:-loaded iframe don't interfere with the test. + if (gTestFrame) { + document.body.removeChild(gTestFrame); + } + gTestFrame = document.createElement("iframe"); + document.body.insertBefore(gTestFrame, $("test")); - gCurrentTest['func'](gCurrentTest); + gCurrentTest['func'](gCurrentTest); + }); } else { - // Put back the pref value we had at test start - prefs.setBoolPref("network.jar.open-unsafe-types", gPrefValue); SimpleTest.finish(); } } function finishTest() { - var prefs = SpecialPowers.Cc["@mozilla.org/preferences-service;1"] - .getService(SpecialPowers.Ci.nsIPrefBranch); - prefs.setBoolPref("network.jar.open-unsafe-types", false); + SpecialPowers.pushPrefEnv({"set": [["network.jar.open-unsafe-types", false]]}, function() { + if (gNumPokes == 0) { + ok(true, gCurrentTest["name"] + ": no unexpected pokes"); + } - if (gNumPokes == 0) { - ok(true, gCurrentTest["name"] + ": no unexpected pokes"); - } - - runNextTest(); -} - -function startTests() -{ - var prefs = SpecialPowers.Cc["@mozilla.org/preferences-service;1"] - .getService(SpecialPowers.Ci.nsIPrefBranch); - gPrefValue = prefs.getBoolPref("network.jar.open-unsafe-types"); + runNextTest(); + }); } addLoadEvent(runNextTest); @@ -237,4 +220,3 @@ addLoadEvent(runNextTest); - From f9b077c0c8f3ddc632be4208ae9ce9001eb0f5b0 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Wed, 21 Aug 2013 15:28:26 -0400 Subject: [PATCH 03/79] Bug 904695 - #include fewer headers in nsContentUtils.h; r=jst --- .../base/public/HTMLSplitOnSpacesTokenizer.h | 14 +++ content/base/public/moz.build | 2 + content/base/public/nsContentTypeParser.h | 30 ++++++ content/base/public/nsContentUtils.h | 97 ++----------------- content/base/src/Element.cpp | 4 +- content/base/src/nsCSPService.cpp | 2 +- content/base/src/nsContentListDeclarations.h | 2 +- content/base/src/nsContentUtils.cpp | 53 +++++++++- content/base/src/nsDocument.cpp | 11 ++- content/base/src/nsMixedContentBlocker.cpp | 2 +- content/base/src/nsScriptLoader.cpp | 1 + content/base/src/nsXMLHttpRequest.cpp | 2 +- content/html/content/src/HTMLInputElement.cpp | 1 + content/html/content/src/HTMLMediaElement.cpp | 3 +- content/html/content/src/nsFormSubmission.cpp | 2 +- content/html/document/src/nsHTMLDocument.cpp | 6 +- .../mathml/content/src/nsMathMLElement.cpp | 11 ++- content/media/mediasource/MediaSource.cpp | 1 + content/media/webaudio/MediaBufferDecoder.cpp | 2 +- content/svg/content/src/SVGContentUtils.cpp | 2 +- .../svg/content/src/SVGFragmentIdentifier.cpp | 1 + content/xbl/src/nsXBLContentSink.cpp | 6 +- content/xbl/src/nsXBLPrototypeBinding.cpp | 2 +- content/xbl/src/nsXBLPrototypeHandler.cpp | 2 +- content/xbl/src/nsXBLService.cpp | 6 +- content/xml/document/src/XMLDocument.cpp | 2 +- content/xul/document/src/XULDocument.cpp | 4 +- content/xul/document/src/nsXULContentSink.cpp | 1 + dom/base/nsDOMWindowUtils.cpp | 2 +- dom/base/nsFocusManager.cpp | 2 +- dom/base/nsGlobalWindow.cpp | 6 +- dom/indexedDB/IDBObjectStore.cpp | 1 + dom/src/json/nsJSON.cpp | 2 +- layout/base/nsCSSFrameConstructor.cpp | 3 +- layout/generic/nsImageMap.cpp | 2 +- layout/mathml/nsMathMLContainerFrame.cpp | 2 +- layout/style/Loader.cpp | 3 +- parser/html/nsHtml5StreamParser.cpp | 2 +- parser/html/nsHtml5TreeOpExecutor.cpp | 4 +- 39 files changed, 167 insertions(+), 134 deletions(-) create mode 100644 content/base/public/HTMLSplitOnSpacesTokenizer.h create mode 100644 content/base/public/nsContentTypeParser.h diff --git a/content/base/public/HTMLSplitOnSpacesTokenizer.h b/content/base/public/HTMLSplitOnSpacesTokenizer.h new file mode 100644 index 000000000000..8eb96b245e13 --- /dev/null +++ b/content/base/public/HTMLSplitOnSpacesTokenizer.h @@ -0,0 +1,14 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef HTMLSplitOnSpacesTokenizer_h +#define HTMLSplitOnSpacesTokenizer_h + +#include "nsCharSeparatedTokenizer.h" + +typedef nsCharSeparatedTokenizerTemplate + HTMLSplitOnSpacesTokenizer; + +#endif diff --git a/content/base/public/moz.build b/content/base/public/moz.build index 7da0a383a5f3..648473f4d887 100644 --- a/content/base/public/moz.build +++ b/content/base/public/moz.build @@ -34,11 +34,13 @@ XPIDL_MODULE = 'content_base' MODULE = 'content' EXPORTS += [ + 'HTMLSplitOnSpacesTokenizer.h', 'mozFlushType.h', 'nsCaseTreatment.h', 'nsContentCID.h', 'nsContentCreatorFunctions.h', 'nsContentPolicyUtils.h', + 'nsContentTypeParser.h', 'nsContentUtils.h', 'nsCopySupport.h', 'nsDOMFile.h', diff --git a/content/base/public/nsContentTypeParser.h b/content/base/public/nsContentTypeParser.h new file mode 100644 index 000000000000..abc1042011c2 --- /dev/null +++ b/content/base/public/nsContentTypeParser.h @@ -0,0 +1,30 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#ifndef nsContentTypeParser_h +#define nsContentTypeParser_h + +#include "nsAString.h" + +class nsIMIMEHeaderParam; + +class nsContentTypeParser { +public: + nsContentTypeParser(const nsAString& aString); + ~nsContentTypeParser(); + + nsresult GetParameter(const char* aParameterName, nsAString& aResult); + nsresult GetType(nsAString& aResult) + { + return GetParameter(nullptr, aResult); + } + +private: + NS_ConvertUTF16toUTF8 mString; + nsIMIMEHeaderParam* mService; +}; + +#endif + diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h index 383c1fdb84ca..1c7084f42fb0 100644 --- a/content/base/public/nsContentUtils.h +++ b/content/base/public/nsContentUtils.h @@ -22,11 +22,8 @@ #include "mozilla/Assertions.h" #include "mozilla/GuardObjects.h" #include "mozilla/TimeStamp.h" -#include "nsAString.h" -#include "nsCharSeparatedTokenizer.h" #include "nsContentListDeclarations.h" #include "nsMathUtils.h" -#include "nsReadableUtils.h" class imgICache; class imgIContainer; @@ -66,7 +63,6 @@ class nsIInterfaceRequestor; class nsIIOService; class nsIJSRuntimeService; class nsILineBreaker; -class nsIMIMEHeaderParam; class nsINameSpaceManager; class nsINodeInfo; class nsIObserver; @@ -106,6 +102,7 @@ template class nsCOMArray; template class nsTArray; template class nsDataHashtable; template class nsRefPtrHashtable; +template class nsReadingIterator; namespace JS { class Value; @@ -143,6 +140,11 @@ class nsIBidiKeyboard; extern const char kLoadAsData[]; +// Stolen from nsReadableUtils, but that's OK, since we can declare the same +// name multiple times. +const nsAFlatString& EmptyString(); +const nsAFlatCString& EmptyCString(); + enum EventNameType { EventNameType_None = 0x0000, EventNameType_HTML = 0x0001, @@ -811,26 +813,6 @@ public: = EmptyString(), uint32_t aLineNumber = 0, uint32_t aColumnNumber = 0); - // This overload allows passing a literal string for aCategory. - template - static nsresult ReportToConsole(uint32_t aErrorFlags, - const char (&aCategory)[N], - nsIDocument* aDocument, - PropertiesFile aFile, - const char *aMessageName, - const PRUnichar **aParams = nullptr, - uint32_t aParamsLength = 0, - nsIURI* aURI = nullptr, - const nsAFlatString& aSourceLine - = EmptyString(), - uint32_t aLineNumber = 0, - uint32_t aColumnNumber = 0) - { - nsDependentCString category(aCategory, N - 1); - return ReportToConsole(aErrorFlags, category, aDocument, aFile, - aMessageName, aParams, aParamsLength, aURI, - aSourceLine, aLineNumber, aColumnNumber); - } /** * Get the localized string named |aKey| in properties file |aFile|. @@ -1241,11 +1223,7 @@ public: * @param aResult the result. Out param. */ static void GetNodeTextContent(nsINode* aNode, bool aDeep, - nsAString& aResult) - { - aResult.Truncate(); - AppendNodeTextContent(aNode, aDeep, aResult); - } + nsAString& aResult); /** * Same as GetNodeTextContents but appends the result rather than sets it. @@ -1264,13 +1242,7 @@ public: /** * Delete strings allocated for nsContentList matches */ - static void DestroyMatchString(void* aData) - { - if (aData) { - nsString* matchString = static_cast(aData); - delete matchString; - } - } + static void DestroyMatchString(void* aData); /** * Unbinds the content from the tree and nulls it out if it's not null. @@ -1340,7 +1312,7 @@ public: bool aAllowData, uint32_t aContentPolicyType, nsISupports* aContext, - const nsACString& aMimeGuess = EmptyCString(), + const nsAFlatCString& aMimeGuess = EmptyCString(), nsISupports* aExtra = nullptr); /** @@ -2052,37 +2024,7 @@ public: */ static JSVersion ParseJavascriptVersion(const nsAString& aVersionStr); - static bool IsJavascriptMIMEType(const nsAString& aMIMEType) - { - // Table ordered from most to least likely JS MIME types. - static const char* jsTypes[] = { - "text/javascript", - "text/ecmascript", - "application/javascript", - "application/ecmascript", - "application/x-javascript", - "application/x-ecmascript", - "text/javascript1.0", - "text/javascript1.1", - "text/javascript1.2", - "text/javascript1.3", - "text/javascript1.4", - "text/javascript1.5", - "text/jscript", - "text/livescript", - "text/x-ecmascript", - "text/x-javascript", - nullptr - }; - - for (uint32_t i = 0; jsTypes[i]; ++i) { - if (aMIMEType.LowerCaseEqualsASCII(jsTypes[i])) { - return true; - } - } - - return false; - } + static bool IsJavascriptMIMEType(const nsAString& aMIMEType); static void SplitMimeType(const nsAString& aValue, nsString& aType, nsString& aParams); @@ -2265,9 +2207,6 @@ private: #endif }; -typedef nsCharSeparatedTokenizerTemplate - HTMLSplitOnSpacesTokenizer; - #define NS_HOLD_JS_OBJECTS(obj, clazz) \ nsContentUtils::HoldJSObjects(NS_CYCLE_COLLECTION_UPCAST(obj, clazz), \ NS_CYCLE_COLLECTION_PARTICIPANT(clazz)) @@ -2369,20 +2308,4 @@ public: } \ } -class nsContentTypeParser { -public: - nsContentTypeParser(const nsAString& aString); - ~nsContentTypeParser(); - - nsresult GetParameter(const char* aParameterName, nsAString& aResult); - nsresult GetType(nsAString& aResult) - { - return GetParameter(nullptr, aResult); - } - -private: - NS_ConvertUTF16toUTF8 mString; - nsIMIMEHeaderParam* mService; -}; - #endif /* nsContentUtils_h___ */ diff --git a/content/base/src/Element.cpp b/content/base/src/Element.cpp index a293f75af3f9..a616835d8685 100644 --- a/content/base/src/Element.cpp +++ b/content/base/src/Element.cpp @@ -1133,7 +1133,7 @@ Element::UnbindFromTree(bool aDeep, bool aNullParent) // The element being removed is an ancestor of the full-screen element, // exit full-screen state. nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "DOM", OwnerDoc(), + NS_LITERAL_CSTRING("DOM"), OwnerDoc(), nsContentUtils::eDOM_PROPERTIES, "RemovedFullScreenElement"); // Fully exit full-screen. @@ -2432,7 +2432,7 @@ Element::MozRequestFullScreen() const char* error = GetFullScreenError(OwnerDoc()); if (error) { nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "DOM", OwnerDoc(), + NS_LITERAL_CSTRING("DOM"), OwnerDoc(), nsContentUtils::eDOM_PROPERTIES, error); nsRefPtr e = diff --git a/content/base/src/nsCSPService.cpp b/content/base/src/nsCSPService.cpp index 42e8b994bdf3..853e564aa649 100644 --- a/content/base/src/nsCSPService.cpp +++ b/content/base/src/nsCSPService.cpp @@ -299,7 +299,7 @@ CSPService::AsyncOnChannelRedirect(nsIChannel *oldChannel, const PRUnichar *formatParams[] = { NS_ConvertUTF8toUTF16(newUriSpec).get() }; if (NS_SUCCEEDED(rv)) { nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "Redirect Error", nullptr, + NS_LITERAL_CSTRING("Redirect Error"), nullptr, nsContentUtils::eDOM_PROPERTIES, "InvalidRedirectChannelWarning", formatParams, 1); diff --git a/content/base/src/nsContentListDeclarations.h b/content/base/src/nsContentListDeclarations.h index 7116ef3486f8..5890bf49e539 100644 --- a/content/base/src/nsContentListDeclarations.h +++ b/content/base/src/nsContentListDeclarations.h @@ -8,7 +8,7 @@ #include #include "nsCOMPtr.h" -#include "nsStringGlue.h" +#include "nsStringFwd.h" class nsContentList; class nsIAtom; diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp index 3e8e6d9f71c7..d81008170e88 100644 --- a/content/base/src/nsContentUtils.cpp +++ b/content/base/src/nsContentUtils.cpp @@ -168,6 +168,8 @@ #include "nsWrapperCacheInlines.h" #include "nsXULPopupManager.h" #include "xpcprivate.h" // nsXPConnect +#include "HTMLSplitOnSpacesTokenizer.h" +#include "nsContentTypeParser.h" #ifdef IBMBIDI #include "nsIBidiKeyboard.h" @@ -4352,7 +4354,7 @@ nsContentUtils::CheckSecurityBeforeLoad(nsIURI* aURIToLoad, bool aAllowData, uint32_t aContentPolicyType, nsISupports* aContext, - const nsACString& aMimeGuess, + const nsAFlatCString& aMimeGuess, nsISupports* aExtra) { NS_PRECONDITION(aLoadingPrincipal, "Must have a loading principal here"); @@ -6492,3 +6494,52 @@ nsContentUtils::DOMWindowDumpEnabled() return true; #endif } + +void +nsContentUtils::GetNodeTextContent(nsINode* aNode, bool aDeep, nsAString& aResult) +{ + aResult.Truncate(); + AppendNodeTextContent(aNode, aDeep, aResult); +} + +void +nsContentUtils::DestroyMatchString(void* aData) +{ + if (aData) { + nsString* matchString = static_cast(aData); + delete matchString; + } +} + +bool +nsContentUtils::IsJavascriptMIMEType(const nsAString& aMIMEType) +{ + // Table ordered from most to least likely JS MIME types. + static const char* jsTypes[] = { + "text/javascript", + "text/ecmascript", + "application/javascript", + "application/ecmascript", + "application/x-javascript", + "application/x-ecmascript", + "text/javascript1.0", + "text/javascript1.1", + "text/javascript1.2", + "text/javascript1.3", + "text/javascript1.4", + "text/javascript1.5", + "text/jscript", + "text/livescript", + "text/x-ecmascript", + "text/x-javascript", + nullptr + }; + + for (uint32_t i = 0; jsTypes[i]; ++i) { + if (aMIMEType.LowerCaseEqualsASCII(jsTypes[i])) { + return true; + } + } + + return false; +} diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index 22844c26fc4f..2971f166fda7 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -210,6 +210,7 @@ #include "mozilla/css/Rule.h" #include "nsIHttpChannelInternal.h" #include "nsISecurityConsoleMessage.h" +#include "nsCharSeparatedTokenizer.h" using namespace mozilla; using namespace mozilla::dom; @@ -2463,7 +2464,7 @@ CSPErrorQueue::Flush(nsIDocument* aDocument) { for (uint32_t i = 0; i < mErrors.Length(); i++) { nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "CSP", aDocument, + NS_LITERAL_CSTRING("CSP"), aDocument, nsContentUtils::eSECURITY_PROPERTIES, mErrors[i]); } @@ -4496,7 +4497,7 @@ void nsDocument::ReportEmptyGetElementByIdArg() { nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "DOM", this, + NS_LITERAL_CSTRING("DOM"), this, nsContentUtils::eDOM_PROPERTIES, "EmptyGetElementByIdParam"); } @@ -6151,7 +6152,7 @@ nsDocument::GetBoxObjectFor(Element* aElement, ErrorResult& aRv) if (!mHasWarnedAboutBoxObjects && !aElement->IsXUL()) { mHasWarnedAboutBoxObjects = true; nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "BoxObjects", this, + NS_LITERAL_CSTRING("BoxObjects"), this, nsContentUtils::eDOM_PROPERTIES, "UseOfGetBoxObjectForWarning"); } @@ -9048,7 +9049,7 @@ nsIDocument::WarnOnceAbout(DeprecatedOperations aOperation, uint32_t flags = asError ? nsIScriptError::errorFlag : nsIScriptError::warningFlag; nsContentUtils::ReportToConsole(flags, - "DOM Core", this, + NS_LITERAL_CSTRING("DOM Core"), this, nsContentUtils::eDOM_PROPERTIES, kWarnings[aOperation]); } @@ -10032,7 +10033,7 @@ LogFullScreenDenied(bool aLogFailure, const char* aMessage, nsIDocument* aDoc) false); e->PostDOMEvent(); nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "DOM", aDoc, + NS_LITERAL_CSTRING("DOM"), aDoc, nsContentUtils::eDOM_PROPERTIES, aMessage); } diff --git a/content/base/src/nsMixedContentBlocker.cpp b/content/base/src/nsMixedContentBlocker.cpp index b853daaa2f29..7dd519b62e32 100644 --- a/content/base/src/nsMixedContentBlocker.cpp +++ b/content/base/src/nsMixedContentBlocker.cpp @@ -158,7 +158,7 @@ LogBlockingMixedContent(MixedContentTypes classification, const PRUnichar* strings[] = { locationSpecUTF16.get() }; nsContentUtils::ReportToConsole(nsIScriptError::errorFlag, - "Mixed Content Blocker", + NS_LITERAL_CSTRING("Mixed Content Blocker"), aRootDoc, nsContentUtils::eSECURITY_PROPERTIES, classification == eMixedDisplay ? "BlockMixedDisplayContent" : "BlockMixedActiveContent", diff --git a/content/base/src/nsScriptLoader.cpp b/content/base/src/nsScriptLoader.cpp index a554e2fe13c3..e23aab5d2df7 100644 --- a/content/base/src/nsScriptLoader.cpp +++ b/content/base/src/nsScriptLoader.cpp @@ -45,6 +45,7 @@ #include "mozilla/dom/Element.h" #include "nsCrossSiteListenerProxy.h" #include "nsSandboxFlags.h" +#include "nsContentTypeParser.h" #include "mozilla/CORSMode.h" #include "mozilla/Attributes.h" diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp index cab8cc236077..60fad524a1ef 100644 --- a/content/base/src/nsXMLHttpRequest.cpp +++ b/content/base/src/nsXMLHttpRequest.cpp @@ -583,7 +583,7 @@ static void LogMessage(const char* aWarning, nsPIDOMWindow* aWindow) doc = aWindow->GetExtantDoc(); } nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "DOM", doc, + NS_LITERAL_CSTRING("DOM"), doc, nsContentUtils::eDOM_PROPERTIES, aWarning); } diff --git a/content/html/content/src/HTMLInputElement.cpp b/content/html/content/src/HTMLInputElement.cpp index d21bed0249bd..5372460e9387 100644 --- a/content/html/content/src/HTMLInputElement.cpp +++ b/content/html/content/src/HTMLInputElement.cpp @@ -98,6 +98,7 @@ #include "nsIColorPicker.h" #include "nsIStringEnumerator.h" +#include "HTMLSplitOnSpacesTokenizer.h" // input type=date #include "js/Date.h" diff --git a/content/html/content/src/HTMLMediaElement.cpp b/content/html/content/src/HTMLMediaElement.cpp index 6762a0a2155b..39bf5d679ec7 100644 --- a/content/html/content/src/HTMLMediaElement.cpp +++ b/content/html/content/src/HTMLMediaElement.cpp @@ -95,6 +95,7 @@ static PRLogModuleInfo* gMediaElementEventsLog; #include "mozilla/Preferences.h" #include "nsIPermissionManager.h" +#include "nsContentTypeParser.h" using namespace mozilla::layers; using mozilla::net::nsMediaFragmentURIParser; @@ -277,7 +278,7 @@ void HTMLMediaElement::ReportLoadError(const char* aMsg, uint32_t aParamCount) { nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "Media", + NS_LITERAL_CSTRING("Media"), OwnerDoc(), nsContentUtils::eDOM_PROPERTIES, aMsg, diff --git a/content/html/content/src/nsFormSubmission.cpp b/content/html/content/src/nsFormSubmission.cpp index 64dabd3e0538..a93c96b89b35 100644 --- a/content/html/content/src/nsFormSubmission.cpp +++ b/content/html/content/src/nsFormSubmission.cpp @@ -51,7 +51,7 @@ SendJSWarning(nsIDocument* aDocument, const PRUnichar** aWarningArgs, uint32_t aWarningArgsLen) { nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "HTML", aDocument, + NS_LITERAL_CSTRING("HTML"), aDocument, nsContentUtils::eFORMS_PROPERTIES, aWarningName, aWarningArgs, aWarningArgsLen); diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp index 16187215fcfc..8100588afea0 100644 --- a/content/html/document/src/nsHTMLDocument.cpp +++ b/content/html/document/src/nsHTMLDocument.cpp @@ -149,7 +149,7 @@ static void ReportUseOfDeprecatedMethod(nsHTMLDocument* aDoc, const char* aWarning) { nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "DOM Events", aDoc, + NS_LITERAL_CSTRING("DOM Events"), aDoc, nsContentUtils::eDOM_PROPERTIES, aWarning); } @@ -1866,7 +1866,7 @@ nsHTMLDocument::WriteCommon(JSContext *cx, if (mExternalScriptsBeingEvaluated) { // Instead of implying a call to document.open(), ignore the call. nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "DOM Events", this, + NS_LITERAL_CSTRING("DOM Events"), this, nsContentUtils::eDOM_PROPERTIES, "DocumentWriteIgnored", nullptr, 0, @@ -1881,7 +1881,7 @@ nsHTMLDocument::WriteCommon(JSContext *cx, if (mExternalScriptsBeingEvaluated) { // Instead of implying a call to document.open(), ignore the call. nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "DOM Events", this, + NS_LITERAL_CSTRING("DOM Events"), this, nsContentUtils::eDOM_PROPERTIES, "DocumentWriteIgnored", nullptr, 0, diff --git a/content/mathml/content/src/nsMathMLElement.cpp b/content/mathml/content/src/nsMathMLElement.cpp index 03de7aba8c44..07eda2dc8399 100644 --- a/content/mathml/content/src/nsMathMLElement.cpp +++ b/content/mathml/content/src/nsMathMLElement.cpp @@ -39,7 +39,8 @@ WarnDeprecated(const PRUnichar* aDeprecatedAttribute, const PRUnichar *argv[] = { aDeprecatedAttribute, aFavoredAttribute }; return nsContentUtils:: - ReportToConsole(nsIScriptError::warningFlag, "MathML", aDocument, + ReportToConsole(nsIScriptError::warningFlag, + NS_LITERAL_CSTRING("MathML"), aDocument, nsContentUtils::eMATHML_PROPERTIES, "DeprecatedSupersededBy", argv, 2); } @@ -49,7 +50,8 @@ ReportLengthParseError(const nsString& aValue, nsIDocument* aDocument) { const PRUnichar *arg = aValue.get(); return nsContentUtils:: - ReportToConsole(nsIScriptError::errorFlag, "MathML", aDocument, + ReportToConsole(nsIScriptError::errorFlag, + NS_LITERAL_CSTRING("MathML"), aDocument, nsContentUtils::eMATHML_PROPERTIES, "LengthParsingError", &arg, 1); } @@ -62,7 +64,8 @@ ReportParseErrorNoTag(const nsString& aValue, const PRUnichar *argv[] = { aValue.get(), aAtom->GetUTF16String() }; return nsContentUtils:: - ReportToConsole(nsIScriptError::errorFlag, "MathML", aDocument, + ReportToConsole(nsIScriptError::errorFlag, + NS_LITERAL_CSTRING("MathML"), aDocument, nsContentUtils::eMATHML_PROPERTIES, "AttributeParsingErrorNoTag", argv, 2); } @@ -419,7 +422,7 @@ nsMathMLElement::ParseNumericValue(const nsString& aString, // no explicit unit, this is a number that will act as a multiplier if (!(aFlags & PARSE_SUPPRESS_WARNINGS)) { nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "MathML", aDocument, + NS_LITERAL_CSTRING("MathML"), aDocument, nsContentUtils::eMATHML_PROPERTIES, "UnitlessValuesAreDeprecated"); } diff --git a/content/media/mediasource/MediaSource.cpp b/content/media/mediasource/MediaSource.cpp index 54ed1215cee8..0b5c77e0b34f 100644 --- a/content/media/mediasource/MediaSource.cpp +++ b/content/media/mediasource/MediaSource.cpp @@ -10,6 +10,7 @@ #include "MediaSourceInputAdapter.h" #include "SourceBuffer.h" #include "SourceBufferList.h" +#include "nsContentTypeParser.h" #ifdef PR_LOGGING PRLogModuleInfo* gMediaSourceLog; diff --git a/content/media/webaudio/MediaBufferDecoder.cpp b/content/media/webaudio/MediaBufferDecoder.cpp index a9133099a1df..b912dc6ce8cf 100644 --- a/content/media/webaudio/MediaBufferDecoder.cpp +++ b/content/media/webaudio/MediaBufferDecoder.cpp @@ -902,7 +902,7 @@ WebAudioDecodeJob::OnFailure(ErrorCode aErrorCode) doc = pWindow->GetExtantDoc(); } nsContentUtils::ReportToConsole(nsIScriptError::errorFlag, - "Media", + NS_LITERAL_CSTRING("Media"), doc, nsContentUtils::eDOM_PROPERTIES, errorMessage); diff --git a/content/svg/content/src/SVGContentUtils.cpp b/content/svg/content/src/SVGContentUtils.cpp index 78aef2a03080..99fa00c52505 100644 --- a/content/svg/content/src/SVGContentUtils.cpp +++ b/content/svg/content/src/SVGContentUtils.cpp @@ -141,7 +141,7 @@ SVGContentUtils::ReportToConsole(nsIDocument* doc, uint32_t aParamsLength) { return nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "SVG", doc, + NS_LITERAL_CSTRING("SVG"), doc, nsContentUtils::eSVG_PROPERTIES, aWarning, aParams, aParamsLength); diff --git a/content/svg/content/src/SVGFragmentIdentifier.cpp b/content/svg/content/src/SVGFragmentIdentifier.cpp index dd7140998b06..c7996cb55fed 100644 --- a/content/svg/content/src/SVGFragmentIdentifier.cpp +++ b/content/svg/content/src/SVGFragmentIdentifier.cpp @@ -9,6 +9,7 @@ #include "mozilla/dom/SVGViewElement.h" #include "nsContentUtils.h" // for nsCharSeparatedTokenizerTemplate #include "nsSVGAnimatedTransformList.h" +#include "nsCharSeparatedTokenizer.h" using namespace mozilla; diff --git a/content/xbl/src/nsXBLContentSink.cpp b/content/xbl/src/nsXBLContentSink.cpp index 6dac5d50f09e..10f0273f08e8 100644 --- a/content/xbl/src/nsXBLContentSink.cpp +++ b/content/xbl/src/nsXBLContentSink.cpp @@ -213,7 +213,7 @@ nsXBLContentSink::ReportUnexpectedElement(nsIAtom* aElementName, const PRUnichar* params[] = { elementName.get() }; return nsContentUtils::ReportToConsole(nsIScriptError::errorFlag, - "XBL Content Sink", + NS_LITERAL_CSTRING("XBL Content Sink"), mDocument, nsContentUtils::eXBL_PROPERTIES, "UnexpectedElement", @@ -556,7 +556,7 @@ nsXBLContentSink::ConstructBinding(uint32_t aLineNumber) } } else { nsContentUtils::ReportToConsole(nsIScriptError::errorFlag, - "XBL Content Sink", nullptr, + NS_LITERAL_CSTRING("XBL Content Sink"), nullptr, nsContentUtils::eXBL_PROPERTIES, "MissingIdAttr", nullptr, 0, mDocumentURI, @@ -645,7 +645,7 @@ nsXBLContentSink::ConstructHandler(const PRUnichar **aAtts, uint32_t aLineNumber // shorthand syntax. mState = eXBL_Error; nsContentUtils::ReportToConsole(nsIScriptError::errorFlag, - "XBL Content Sink", + NS_LITERAL_CSTRING("XBL Content Sink"), mDocument, nsContentUtils::eXBL_PROPERTIES, "CommandNotInChrome", nullptr, 0, diff --git a/content/xbl/src/nsXBLPrototypeBinding.cpp b/content/xbl/src/nsXBLPrototypeBinding.cpp index cc82fbec11ca..dbd534cbe5bd 100644 --- a/content/xbl/src/nsXBLPrototypeBinding.cpp +++ b/content/xbl/src/nsXBLPrototypeBinding.cpp @@ -1621,7 +1621,7 @@ nsXBLPrototypeBinding::ResolveBaseBinding() if (!CheckTagNameWhiteList(nameSpaceID, tagName)) { const PRUnichar* params[] = { display.get() }; nsContentUtils::ReportToConsole(nsIScriptError::errorFlag, - "XBL", nullptr, + NS_LITERAL_CSTRING("XBL"), nullptr, nsContentUtils::eXBL_PROPERTIES, "InvalidExtendsBinding", params, ArrayLength(params), diff --git a/content/xbl/src/nsXBLPrototypeHandler.cpp b/content/xbl/src/nsXBLPrototypeHandler.cpp index 413d1c5a9f65..bcdd39148792 100644 --- a/content/xbl/src/nsXBLPrototypeHandler.cpp +++ b/content/xbl/src/nsXBLPrototypeHandler.cpp @@ -902,7 +902,7 @@ nsXBLPrototypeHandler::ReportKeyConflict(const PRUnichar* aKey, const PRUnichar* const PRUnichar* params[] = { aKey, aModifiers }; nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "XBL Prototype Handler", doc, + NS_LITERAL_CSTRING("XBL Prototype Handler"), doc, nsContentUtils::eXBL_PROPERTIES, aMessageName, params, ArrayLength(params), diff --git a/content/xbl/src/nsXBLService.cpp b/content/xbl/src/nsXBLService.cpp index 8dacecc17972..4f1352635318 100644 --- a/content/xbl/src/nsXBLService.cpp +++ b/content/xbl/src/nsXBLService.cpp @@ -90,7 +90,7 @@ IsAncestorBinding(nsIDocument* aDocument, NS_ConvertUTF8toUTF16 bindingURI(spec); const PRUnichar* params[] = { bindingURI.get() }; nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "XBL", aDocument, + NS_LITERAL_CSTRING("XBL"), aDocument, nsContentUtils::eXBL_PROPERTIES, "TooDeepBindingRecursion", params, ArrayLength(params)); @@ -331,7 +331,7 @@ nsXBLStreamListener::HandleEvent(nsIDOMEvent* aEvent) NS_WARNING("An XBL file is malformed. Did you forget the XBL namespace on the bindings tag?"); } nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "XBL", nullptr, + NS_LITERAL_CSTRING("XBL"), nullptr, nsContentUtils::eXBL_PROPERTIES, "MalformedXBL", nullptr, 0, documentURI); @@ -763,7 +763,7 @@ nsXBLService::GetBinding(nsIContent* aBoundElement, nsIURI* aURI, NS_ConvertUTF8toUTF16 baseSpecUTF16(basespec); const PRUnichar* params[] = { protoSpec.get(), baseSpecUTF16.get() }; nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "XBL", nullptr, + NS_LITERAL_CSTRING("XBL"), nullptr, nsContentUtils::eXBL_PROPERTIES, "CircularExtendsBinding", params, ArrayLength(params), diff --git a/content/xml/document/src/XMLDocument.cpp b/content/xml/document/src/XMLDocument.cpp index ab0f9b9832a3..5736e52c44dd 100644 --- a/content/xml/document/src/XMLDocument.cpp +++ b/content/xml/document/src/XMLDocument.cpp @@ -279,7 +279,7 @@ static void ReportUseOfDeprecatedMethod(nsIDocument *aDoc, const char* aWarning) { nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "DOM3 Load", aDoc, + NS_LITERAL_CSTRING("DOM3 Load"), aDoc, nsContentUtils::eDOM_PROPERTIES, aWarning); } diff --git a/content/xul/document/src/XULDocument.cpp b/content/xul/document/src/XULDocument.cpp index 95c22ed0e8c2..7612b965203f 100644 --- a/content/xul/document/src/XULDocument.cpp +++ b/content/xul/document/src/XULDocument.cpp @@ -3076,7 +3076,7 @@ XULDocument::ResumeWalk() nsContentUtils::ReportToConsole( nsIScriptError::warningFlag, - "XUL Document", nullptr, + NS_LITERAL_CSTRING("XUL Document"), nullptr, nsContentUtils::eXUL_PROPERTIES, "PINotInProlog", params, ArrayLength(params), @@ -3369,7 +3369,7 @@ XULDocument::ReportMissingOverlay(nsIURI* aURI) NS_ConvertUTF8toUTF16 utfSpec(spec); const PRUnichar* params[] = { utfSpec.get() }; nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "XUL Document", this, + NS_LITERAL_CSTRING("XUL Document"), this, nsContentUtils::eXUL_PROPERTIES, "MissingOverlay", params, ArrayLength(params)); diff --git a/content/xul/document/src/nsXULContentSink.cpp b/content/xul/document/src/nsXULContentSink.cpp index 6918b9f26dd4..e6e33f1abeb4 100644 --- a/content/xul/document/src/nsXULContentSink.cpp +++ b/content/xul/document/src/nsXULContentSink.cpp @@ -56,6 +56,7 @@ #include "nsXMLContentSink.h" #include "nsIConsoleService.h" #include "nsIScriptError.h" +#include "nsContentTypeParser.h" #ifdef PR_LOGGING static PRLogModuleInfo* gLog; diff --git a/dom/base/nsDOMWindowUtils.cpp b/dom/base/nsDOMWindowUtils.cpp index b5fe80ff25b8..df630fa0f090 100644 --- a/dom/base/nsDOMWindowUtils.cpp +++ b/dom/base/nsDOMWindowUtils.cpp @@ -2565,7 +2565,7 @@ nsDOMWindowUtils::GetOuterWindowWithId(uint64_t aWindowID, // XXX This method is deprecated. See bug 865664. nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "DOM", + NS_LITERAL_CSTRING("DOM"), nsContentUtils::GetDocumentFromCaller(), nsContentUtils::eDOM_PROPERTIES, "GetWindowWithOuterIdWarning"); diff --git a/dom/base/nsFocusManager.cpp b/dom/base/nsFocusManager.cpp index b73fa2465956..ace94abc1257 100644 --- a/dom/base/nsFocusManager.cpp +++ b/dom/base/nsFocusManager.cpp @@ -1158,7 +1158,7 @@ nsFocusManager::SetFocusInner(nsIContent* aNewContent, int32_t aFlags, (fullscreenAncestor = nsContentUtils::GetFullscreenAncestor(contentToFocus->OwnerDoc())) && nsContentUtils::HasPluginWithUncontrolledEventDispatch(contentToFocus)) { nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "DOM", + NS_LITERAL_CSTRING("DOM"), contentToFocus->OwnerDoc(), nsContentUtils::eDOM_PROPERTIES, "FocusedWindowedPluginWhileFullScreen"); diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index ce927981f85c..09546d946a25 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -1534,7 +1534,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsGlobalWindow) if (!sWarnedAboutWindowInternal) { sWarnedAboutWindowInternal = true; nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "Extensions", mDoc, + NS_LITERAL_CSTRING("Extensions"), mDoc, nsContentUtils::eDOM_PROPERTIES, "nsIDOMWindowInternalWarning"); } @@ -6204,7 +6204,7 @@ ReportUseOfDeprecatedMethod(nsGlobalWindow* aWindow, const char* aWarning) { nsCOMPtr doc = aWindow->GetExtantDoc(); nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "DOM Events", doc, + NS_LITERAL_CSTRING("DOM Events"), doc, nsContentUtils::eDOM_PROPERTIES, aWarning); } @@ -7087,7 +7087,7 @@ nsGlobalWindow::Close() // report localized error msg in JS console nsContentUtils::ReportToConsole( nsIScriptError::warningFlag, - "DOM Window", mDoc, // Better name for the category? + NS_LITERAL_CSTRING("DOM Window"), mDoc, // Better name for the category? nsContentUtils::eDOM_PROPERTIES, "WindowCloseBlockedWarning"); diff --git a/dom/indexedDB/IDBObjectStore.cpp b/dom/indexedDB/IDBObjectStore.cpp index aad2bde6b200..96bb12ee7101 100644 --- a/dom/indexedDB/IDBObjectStore.cpp +++ b/dom/indexedDB/IDBObjectStore.cpp @@ -45,6 +45,7 @@ #include "ipc/IndexedDBParent.h" #include "IndexedDatabaseInlines.h" +#include "nsCharSeparatedTokenizer.h" #define FILE_COPY_BUFFER_SIZE 32768 diff --git a/dom/src/json/nsJSON.cpp b/dom/src/json/nsJSON.cpp index 5a2f85aaeaf7..31fc81e23959 100644 --- a/dom/src/json/nsJSON.cpp +++ b/dom/src/json/nsJSON.cpp @@ -49,7 +49,7 @@ static nsresult WarnDeprecatedMethod(DeprecationWarning warning) { return nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "DOM Core", nullptr, + NS_LITERAL_CSTRING("DOM Core"), nullptr, nsContentUtils::eDOM_PROPERTIES, warning == EncodeWarning ? "nsIJSONEncodeDeprecatedWarning" diff --git a/layout/base/nsCSSFrameConstructor.cpp b/layout/base/nsCSSFrameConstructor.cpp index e57e0dd503b4..3d7acc8b20ab 100644 --- a/layout/base/nsCSSFrameConstructor.cpp +++ b/layout/base/nsCSSFrameConstructor.cpp @@ -9169,7 +9169,8 @@ nsCSSFrameConstructor::ProcessChildren(nsFrameConstructorState& aState, (display->mDisplay == NS_STYLE_DISPLAY_INLINE_BOX) ? "NeededToWrapXULInlineBox" : "NeededToWrapXUL"; nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "FrameConstructor", mDocument, + NS_LITERAL_CSTRING("FrameConstructor"), + mDocument, nsContentUtils::eXUL_PROPERTIES, message, params, ArrayLength(params)); diff --git a/layout/generic/nsImageMap.cpp b/layout/generic/nsImageMap.cpp index 1b20d5e2dbb3..8cc50b8e7096 100644 --- a/layout/generic/nsImageMap.cpp +++ b/layout/generic/nsImageMap.cpp @@ -91,7 +91,7 @@ static void logMessage(nsIContent* aContent, nsIDocument* doc = aContent->OwnerDoc(); nsContentUtils::ReportToConsole( - aFlags, "ImageMap", doc, + aFlags, NS_LITERAL_CSTRING("ImageMap"), doc, nsContentUtils::eLAYOUT_PROPERTIES, aMessageName, nullptr, /* params */ diff --git a/layout/mathml/nsMathMLContainerFrame.cpp b/layout/mathml/nsMathMLContainerFrame.cpp index e92b6d46159e..0a1ae413a9c1 100644 --- a/layout/mathml/nsMathMLContainerFrame.cpp +++ b/layout/mathml/nsMathMLContainerFrame.cpp @@ -1523,7 +1523,7 @@ nsMathMLContainerFrame::ReportErrorToConsole(const char* errorMsgId, uint32_t aParamCount) { return nsContentUtils::ReportToConsole(nsIScriptError::errorFlag, - "MathML", mContent->OwnerDoc(), + NS_LITERAL_CSTRING("MathML"), mContent->OwnerDoc(), nsContentUtils::eMATHML_PROPERTIES, errorMsgId, aParams, aParamCount); } diff --git a/layout/style/Loader.cpp b/layout/style/Loader.cpp index add571174f19..11a3db478c42 100644 --- a/layout/style/Loader.cpp +++ b/layout/style/Loader.cpp @@ -916,7 +916,8 @@ SheetLoadData::OnStreamComplete(nsIUnicharStreamLoader* aLoader, nsCOMPtr referrer = GetReferrerURI(); nsContentUtils::ReportToConsole(errorFlag, - "CSS Loader", mLoader->mDocument, + NS_LITERAL_CSTRING("CSS Loader"), + mLoader->mDocument, nsContentUtils::eCSS_PROPERTIES, errorMessage, strings, ArrayLength(strings), diff --git a/parser/html/nsHtml5StreamParser.cpp b/parser/html/nsHtml5StreamParser.cpp index e71bf879eb6e..b3187694f882 100644 --- a/parser/html/nsHtml5StreamParser.cpp +++ b/parser/html/nsHtml5StreamParser.cpp @@ -1494,7 +1494,7 @@ nsHtml5StreamParser::ContinueAfterScripts(nsHtml5Tokenizer* aTokenizer, mTokenizer->setLineNumber(speculation->GetStartLineNumber()); nsContentUtils::ReportToConsole(nsIScriptError::warningFlag, - "DOM Events", + NS_LITERAL_CSTRING("DOM Events"), mExecutor->GetDocument(), nsContentUtils::eDOM_PROPERTIES, "SpeculationFailed", diff --git a/parser/html/nsHtml5TreeOpExecutor.cpp b/parser/html/nsHtml5TreeOpExecutor.cpp index 4a9a0e3e7e1a..2bcaf0bf591f 100644 --- a/parser/html/nsHtml5TreeOpExecutor.cpp +++ b/parser/html/nsHtml5TreeOpExecutor.cpp @@ -887,7 +887,7 @@ nsHtml5TreeOpExecutor::MaybeComplainAboutCharset(const char* aMsgId, mAlreadyComplainedAboutCharset = true; nsContentUtils::ReportToConsole(aError ? nsIScriptError::errorFlag : nsIScriptError::warningFlag, - "HTML parser", + NS_LITERAL_CSTRING("HTML parser"), mDocument, nsContentUtils::eHTMLPARSER_PROPERTIES, aMsgId, @@ -905,7 +905,7 @@ nsHtml5TreeOpExecutor::ComplainAboutBogusProtocolCharset(nsIDocument* aDoc) "How come we already managed to complain?"); mAlreadyComplainedAboutCharset = true; nsContentUtils::ReportToConsole(nsIScriptError::errorFlag, - "HTML parser", + NS_LITERAL_CSTRING("HTML parser"), aDoc, nsContentUtils::eHTMLPARSER_PROPERTIES, "EncProtocolUnsupported"); From ab58b5ad668734197f1d9e825e56568b5ef7c913 Mon Sep 17 00:00:00 2001 From: Daniel Holbert Date: Wed, 21 Aug 2013 12:31:36 -0700 Subject: [PATCH 04/79] Bug 907539: Use sizeof(PRUnichar) instead of magic number 2, when converting from bytes to wide-string-length in nsCheapString constructor. r=ehsan --- content/base/src/nsAttrValue.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/base/src/nsAttrValue.h b/content/base/src/nsAttrValue.h index 473bd74b82b1..3f84c77a439c 100644 --- a/content/base/src/nsAttrValue.h +++ b/content/base/src/nsAttrValue.h @@ -63,7 +63,7 @@ public: nsCheapString(nsStringBuffer* aBuf) { if (aBuf) - aBuf->ToString(aBuf->StorageSize()/2 - 1, *this); + aBuf->ToString(aBuf->StorageSize()/sizeof(PRUnichar) - 1, *this); } }; From 736bd407f4ce808ecc6cf416883edba3e7278b77 Mon Sep 17 00:00:00 2001 From: Daniel Holbert Date: Wed, 21 Aug 2013 12:31:38 -0700 Subject: [PATCH 05/79] Bug 907547: Update nsCSSValue::BufferFromString documentation to indicate that it's infallible, and remove callers' unneeded null-checks. r=bz --- layout/style/nsCSSValue.cpp | 10 ---------- layout/style/nsCSSValue.h | 4 ++-- layout/style/nsStyleAnimation.cpp | 5 ----- 3 files changed, 2 insertions(+), 17 deletions(-) diff --git a/layout/style/nsCSSValue.cpp b/layout/style/nsCSSValue.cpp index 8f8a7fd0da78..d4dc8af186a3 100644 --- a/layout/style/nsCSSValue.cpp +++ b/layout/style/nsCSSValue.cpp @@ -56,11 +56,6 @@ nsCSSValue::nsCSSValue(const nsString& aValue, nsCSSUnit aUnit) NS_ABORT_IF_FALSE(UnitHasStringValue(), "not a string value"); if (UnitHasStringValue()) { mValue.mString = BufferFromString(aValue).get(); - if (MOZ_UNLIKELY(!mValue.mString)) { - // XXXbz not much we can do here; just make sure that our promise of a - // non-null mValue.mString holds for string units. - mUnit = eCSSUnit_Null; - } } else { mUnit = eCSSUnit_Null; @@ -345,11 +340,6 @@ void nsCSSValue::SetStringValue(const nsString& aValue, NS_ABORT_IF_FALSE(UnitHasStringValue(), "not a string unit"); if (UnitHasStringValue()) { mValue.mString = BufferFromString(aValue).get(); - if (MOZ_UNLIKELY(!mValue.mString)) { - // XXXbz not much we can do here; just make sure that our promise of a - // non-null mValue.mString holds for string units. - mUnit = eCSSUnit_Null; - } } else mUnit = eCSSUnit_Null; } diff --git a/layout/style/nsCSSValue.h b/layout/style/nsCSSValue.h index bcc3846785ee..fecaf0dbd447 100644 --- a/layout/style/nsCSSValue.h +++ b/layout/style/nsCSSValue.h @@ -514,8 +514,8 @@ public: // Checks if this is a function value with the specified function id. bool EqualsFunction(nsCSSKeyword aFunctionId) const; - // Returns an already addrefed buffer. Can return null on allocation - // failure. + // Returns an already addrefed buffer. Guaranteed to return non-null. + // (Will abort on allocation failure.) static already_AddRefed BufferFromString(const nsString& aValue); diff --git a/layout/style/nsStyleAnimation.cpp b/layout/style/nsStyleAnimation.cpp index 71ee46b25fb3..baa602b9bda0 100644 --- a/layout/style/nsStyleAnimation.cpp +++ b/layout/style/nsStyleAnimation.cpp @@ -3402,11 +3402,6 @@ nsStyleAnimation::Value::SetUnparsedStringValue(const nsString& aString) FreeValue(); mUnit = eUnit_UnparsedString; mValue.mString = nsCSSValue::BufferFromString(aString).get(); - if (MOZ_UNLIKELY(!mValue.mString)) { - // not much we can do here; just make sure that our promise of a - // non-null mValue.mString holds for string units. - mUnit = eUnit_Null; - } } void From b6f4813baaf3cf277d58fe63937f7473e104bfb2 Mon Sep 17 00:00:00 2001 From: Till Schneidereit Date: Tue, 20 Aug 2013 11:26:44 +0200 Subject: [PATCH 06/79] Bug 907201 - Enable activating TI and IonMonkey for chrome scripts via about:config. r=jandem --HG-- extra : rebase_source : ee45b0108b4516cff12ecc91014cb566d432a4fa --- dom/base/nsJSEnvironment.cpp | 14 ++++++++++---- dom/workers/RuntimeService.cpp | 9 ++++++--- modules/libpref/src/init/all.js | 4 +++- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp index 9691d128e22c..2543af91d4aa 100644 --- a/dom/base/nsJSEnvironment.cpp +++ b/dom/base/nsJSEnvironment.cpp @@ -685,7 +685,8 @@ static const char js_werror_option_str[] = JS_OPTIONS_DOT_STR "werror"; static const char js_zeal_option_str[] = JS_OPTIONS_DOT_STR "gczeal"; static const char js_zeal_frequency_str[] = JS_OPTIONS_DOT_STR "gczeal.frequency"; #endif -static const char js_typeinfer_str[] = JS_OPTIONS_DOT_STR "typeinference"; +static const char js_typeinfer_content_str[] = JS_OPTIONS_DOT_STR "typeinference.content"; +static const char js_typeinfer_chrome_str[] = JS_OPTIONS_DOT_STR "typeinference.chrome"; static const char js_jit_hardening_str[] = JS_OPTIONS_DOT_STR "jit_hardening"; static const char js_memlog_option_str[] = JS_OPTIONS_DOT_STR "mem.log"; static const char js_memnotify_option_str[] = JS_OPTIONS_DOT_STR "mem.notify"; @@ -694,6 +695,7 @@ static const char js_baselinejit_content_str[] = JS_OPTIONS_DOT_STR "baselinejit static const char js_baselinejit_chrome_str[] = JS_OPTIONS_DOT_STR "baselinejit.chrome"; static const char js_baselinejit_eager_str[] = JS_OPTIONS_DOT_STR "baselinejit.unsafe_eager_compilation"; static const char js_ion_content_str[] = JS_OPTIONS_DOT_STR "ion.content"; +static const char js_ion_chrome_str[] = JS_OPTIONS_DOT_STR "ion.chrome"; static const char js_ion_eager_str[] = JS_OPTIONS_DOT_STR "ion.unsafe_eager_compilation"; static const char js_ion_parallel_compilation_str[] = JS_OPTIONS_DOT_STR "ion.parallel_compilation"; @@ -723,13 +725,17 @@ nsJSContext::JSOptionChangedCallback(const char *pref, void *data) nsCOMPtr contentWindow(do_QueryInterface(global)); nsCOMPtr chromeWindow(do_QueryInterface(global)); - bool useTypeInference = !chromeWindow && contentWindow && Preferences::GetBool(js_typeinfer_str); + bool useTypeInference = Preferences::GetBool((chromeWindow || !contentWindow) ? + js_typeinfer_chrome_str : + js_typeinfer_content_str); bool useHardening = Preferences::GetBool(js_jit_hardening_str); - bool useBaselineJIT = Preferences::GetBool(chromeWindow || !contentWindow ? + bool useBaselineJIT = Preferences::GetBool((chromeWindow || !contentWindow) ? js_baselinejit_chrome_str : js_baselinejit_content_str); bool useBaselineJITEager = Preferences::GetBool(js_baselinejit_eager_str); - bool useIon = Preferences::GetBool(js_ion_content_str); + bool useIon = Preferences::GetBool((chromeWindow || !contentWindow) ? + js_ion_chrome_str : + js_ion_content_str); bool useIonEager = Preferences::GetBool(js_ion_eager_str); bool useAsmJS = Preferences::GetBool(js_asmjs_content_str); bool parallelIonCompilation = Preferences::GetBool(js_ion_parallel_compilation_str); diff --git a/dom/workers/RuntimeService.cpp b/dom/workers/RuntimeService.cpp index a5ca54d1773d..3f6835969fd4 100644 --- a/dom/workers/RuntimeService.cpp +++ b/dom/workers/RuntimeService.cpp @@ -292,9 +292,6 @@ LoadJSContextOptions(const char* aPrefName, void* /* aClosure */) if (GetWorkerPref(NS_LITERAL_CSTRING("werror"))) { commonOptions |= JSOPTION_WERROR; } - if (GetWorkerPref(NS_LITERAL_CSTRING("typeinference"))) { - commonOptions |= JSOPTION_TYPE_INFERENCE; - } if (GetWorkerPref(NS_LITERAL_CSTRING("asmjs"))) { commonOptions |= JSOPTION_ASMJS; } @@ -307,6 +304,9 @@ LoadJSContextOptions(const char* aPrefName, void* /* aClosure */) if (GetWorkerPref(NS_LITERAL_CSTRING("ion.content"))) { contentOptions |= JSOPTION_ION; } + if (GetWorkerPref(NS_LITERAL_CSTRING("typeinference.content"))) { + contentOptions |= JSOPTION_TYPE_INFERENCE; + } // Chrome options. uint32_t chromeOptions = commonOptions; @@ -316,6 +316,9 @@ LoadJSContextOptions(const char* aPrefName, void* /* aClosure */) if (GetWorkerPref(NS_LITERAL_CSTRING("ion.chrome"))) { chromeOptions |= JSOPTION_ION; } + if (GetWorkerPref(NS_LITERAL_CSTRING("typeinference.chrome"))) { + chromeOptions |= JSOPTION_TYPE_INFERENCE; + } #ifdef DEBUG if (GetWorkerPref(NS_LITERAL_CSTRING("strict.debug"))) { chromeOptions |= JSOPTION_EXTRA_WARNINGS; diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js index 98ed61d1ee8f..1d0ca03cf6ac 100644 --- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js @@ -822,10 +822,12 @@ pref("javascript.options.strict.debug", true); pref("javascript.options.baselinejit.content", true); pref("javascript.options.baselinejit.chrome", true); pref("javascript.options.ion.content", true); +pref("javascript.options.ion.chrome", false); pref("javascript.options.asmjs", true); pref("javascript.options.ion.parallel_compilation", true); pref("javascript.options.jit_hardening", true); -pref("javascript.options.typeinference", true); +pref("javascript.options.typeinference.content", true); +pref("javascript.options.typeinference.chrome", false); // This preference limits the memory usage of javascript. // If you want to change these values for your device, // please find Bug 417052 comment 17 and Bug 456721 From 1bc00a6469d85ce7d50f19c24b0ee3418aedff53 Mon Sep 17 00:00:00 2001 From: Eitan Isaacson Date: Wed, 21 Aug 2013 12:39:27 -0700 Subject: [PATCH 07/79] Bug 858529 - Add nsISpeechTask.SendAudioNative. r=smaug --- .../synth/ipc/SpeechSynthesisChild.cpp | 6 +++ .../synth/ipc/SpeechSynthesisChild.h | 6 ++- .../webspeech/synth/nsISpeechService.idl | 5 ++- .../media/webspeech/synth/nsSpeechTask.cpp | 45 ++++++++++++++----- content/media/webspeech/synth/nsSpeechTask.h | 2 + 5 files changed, 50 insertions(+), 14 deletions(-) diff --git a/content/media/webspeech/synth/ipc/SpeechSynthesisChild.cpp b/content/media/webspeech/synth/ipc/SpeechSynthesisChild.cpp index 78cdd06173a9..69c638560618 100644 --- a/content/media/webspeech/synth/ipc/SpeechSynthesisChild.cpp +++ b/content/media/webspeech/synth/ipc/SpeechSynthesisChild.cpp @@ -158,6 +158,12 @@ SpeechTaskChild::SendAudio(const JS::Value& aData, const JS::Value& aLandmarks, MOZ_CRASH("Should never be called from child"); } +NS_IMETHODIMP +SpeechTaskChild::SendAudioNative(int16_t* aData, uint32_t aDataLen) +{ + MOZ_CRASH("Should never be called from child"); +} + void SpeechTaskChild::Pause() { diff --git a/content/media/webspeech/synth/ipc/SpeechSynthesisChild.h b/content/media/webspeech/synth/ipc/SpeechSynthesisChild.h index a4614f82c769..d1a6bd47eb04 100644 --- a/content/media/webspeech/synth/ipc/SpeechSynthesisChild.h +++ b/content/media/webspeech/synth/ipc/SpeechSynthesisChild.h @@ -78,8 +78,10 @@ public: NS_IMETHOD Setup(nsISpeechTaskCallback* aCallback, uint32_t aChannels, uint32_t aRate, uint8_t argc) MOZ_OVERRIDE; - NS_IMETHOD SendAudio (const JS::Value& aData, const JS::Value& aLandmarks, - JSContext* aCx) MOZ_OVERRIDE; + NS_IMETHOD SendAudio(const JS::Value& aData, const JS::Value& aLandmarks, + JSContext* aCx) MOZ_OVERRIDE; + + NS_IMETHOD SendAudioNative(int16_t* aData, uint32_t aDataLen) MOZ_OVERRIDE; virtual void Pause(); diff --git a/content/media/webspeech/synth/nsISpeechService.idl b/content/media/webspeech/synth/nsISpeechService.idl index 7e4e87221edd..980a860bfdc6 100644 --- a/content/media/webspeech/synth/nsISpeechService.idl +++ b/content/media/webspeech/synth/nsISpeechService.idl @@ -36,7 +36,7 @@ interface nsISpeechTaskCallback : nsISupports * A task is associated with a single utterance. It is provided by the browser * to the service in the speak() method. */ -[scriptable, builtinclass, uuid(3a60c397-7a04-4cf7-99ea-7432e7a0a1c1)] +[scriptable, builtinclass, uuid(ad59949c-2437-4b35-8eeb-d760caab75c5)] interface nsISpeechTask : nsISupports { /** @@ -61,6 +61,9 @@ interface nsISpeechTask : nsISupports [implicit_jscontext] void sendAudio(in jsval aData, in jsval aLandmarks); + [noscript] + void sendAudioNative([array, size_is(aDataLen)] in short aData, in unsigned long aDataLen); + /** * Dispatch start event. */ diff --git a/content/media/webspeech/synth/nsSpeechTask.cpp b/content/media/webspeech/synth/nsSpeechTask.cpp index c1faaf350bd0..e6868e21316c 100644 --- a/content/media/webspeech/synth/nsSpeechTask.cpp +++ b/content/media/webspeech/synth/nsSpeechTask.cpp @@ -175,31 +175,54 @@ nsSpeechTask::SendAudio(const JS::Value& aData, const JS::Value& aLandmarks, return NS_ERROR_DOM_TYPE_MISMATCH_ERR; } - uint32_t dataLength = JS_GetTypedArrayLength(tsrc); + SendAudioImpl(JS_GetInt16ArrayData(tsrc), + JS_GetTypedArrayLength(tsrc)); - if (dataLength == 0) { + return NS_OK; +} + +NS_IMETHODIMP +nsSpeechTask::SendAudioNative(int16_t* aData, uint32_t aDataLen) +{ + MOZ_ASSERT(XRE_GetProcessType() == GeckoProcessType_Default); + + NS_ENSURE_TRUE(mStream, NS_ERROR_NOT_AVAILABLE); + NS_ENSURE_FALSE(mStream->IsDestroyed(), NS_ERROR_NOT_AVAILABLE); + NS_ENSURE_TRUE(mChannels, NS_ERROR_FAILURE); + + if (mIndirectAudio) { + NS_WARNING("Can't call SendAudio from an indirect audio speech service."); + return NS_ERROR_FAILURE; + } + + SendAudioImpl(aData, aDataLen); + + return NS_OK; +} + +void +nsSpeechTask::SendAudioImpl(int16_t* aData, uint32_t aDataLen) +{ + if (aDataLen == 0) { // XXX: We should end the track too, an undetermined bug does not allow that. mStream->Finish(); - return NS_OK; + return; } nsRefPtr samples = - SharedBuffer::Create(dataLength * sizeof(int16_t)); + SharedBuffer::Create(aDataLen * sizeof(int16_t)); int16_t* frames = static_cast(samples->Data()); - int16_t* sframes = JS_GetInt16ArrayData(tsrc); - for (uint32_t i = 0; i < dataLength; i++) { - frames[i] = sframes[i]; + for (uint32_t i = 0; i < aDataLen; i++) { + frames[i] = aData[i]; } AudioSegment segment; nsAutoTArray channelData; channelData.AppendElement(frames); - segment.AppendFrames(samples.forget(), channelData, dataLength); + segment.AppendFrames(samples.forget(), channelData, aDataLen); mStream->AppendToTrack(1, &segment); mStream->AdvanceKnownTracksTime(STREAM_TIME_MAX); - - return NS_OK; } NS_IMETHODIMP @@ -360,7 +383,7 @@ nsSpeechTask::DispatchBoundary(const nsAString& aName, nsresult nsSpeechTask::DispatchBoundaryImpl(const nsAString& aName, - float aElapsedTime, uint32_t aCharIndex) + float aElapsedTime, uint32_t aCharIndex) { MOZ_ASSERT(mUtterance); NS_ENSURE_TRUE(mUtterance->mState == SpeechSynthesisUtterance::STATE_SPEAKING, diff --git a/content/media/webspeech/synth/nsSpeechTask.h b/content/media/webspeech/synth/nsSpeechTask.h index bed2ba8b17f3..f4bf2eb71c4a 100644 --- a/content/media/webspeech/synth/nsSpeechTask.h +++ b/content/media/webspeech/synth/nsSpeechTask.h @@ -73,6 +73,8 @@ protected: private: void End(); + void SendAudioImpl(int16_t* aData, uint32_t aDataLen); + nsRefPtr mStream; nsCOMPtr mCallback; From c24d950ecff56d5718c8b7e0e314bb090111e3f9 Mon Sep 17 00:00:00 2001 From: Tom Schuster Date: Wed, 21 Aug 2013 13:24:53 -0400 Subject: [PATCH 08/79] Bug 895957 - Implement a workaround for goDoCommand in e10s. r=neil --- docshell/base/nsDocShell.cpp | 4 +- docshell/base/nsDocShell.h | 2 - docshell/base/nsIDocShell.idl | 10 +++- toolkit/content/browser-child.js | 17 +++++++ toolkit/content/widgets/remote-browser.xml | 6 +++ toolkit/modules/RemoteController.jsm | 58 ++++++++++++++++++++++ toolkit/modules/moz.build | 1 + 7 files changed, 93 insertions(+), 5 deletions(-) create mode 100644 toolkit/modules/RemoteController.jsm diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index cda0c59c3833..eae632896218 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -11983,7 +11983,7 @@ nsDocShell::GetControllerForCommand(const char * inCommand, return root->GetControllerForCommand(inCommand, outController); } -nsresult +NS_IMETHODIMP nsDocShell::IsCommandEnabled(const char * inCommand, bool* outEnabled) { NS_ENSURE_ARG_POINTER(outEnabled); @@ -11999,7 +11999,7 @@ nsDocShell::IsCommandEnabled(const char * inCommand, bool* outEnabled) return rv; } -nsresult +NS_IMETHODIMP nsDocShell::DoCommand(const char * inCommand) { nsresult rv = NS_ERROR_FAILURE; diff --git a/docshell/base/nsDocShell.h b/docshell/base/nsDocShell.h index 454ec925afaa..8ebe45fbfcd6 100644 --- a/docshell/base/nsDocShell.h +++ b/docshell/base/nsDocShell.h @@ -643,8 +643,6 @@ protected: // helpers for executing commands nsresult GetControllerForCommand(const char *inCommand, nsIController** outController); - nsresult IsCommandEnabled(const char * inCommand, bool* outEnabled); - nsresult DoCommand(const char * inCommand); nsresult EnsureCommandHandler(); nsIChannel* GetCurrentDocChannel(); diff --git a/docshell/base/nsIDocShell.idl b/docshell/base/nsIDocShell.idl index 3f4110922819..63d5f2d4180f 100644 --- a/docshell/base/nsIDocShell.idl +++ b/docshell/base/nsIDocShell.idl @@ -42,7 +42,7 @@ interface nsIVariant; interface nsIPrivacyTransitionObserver; interface nsIReflowObserver; -[scriptable, builtinclass, uuid(b5bd6052-ec8c-45bf-b55c-409ad15cecfb)] +[scriptable, builtinclass, uuid(365e7446-6c4b-45ae-ae08-b7b401900093)] interface nsIDocShell : nsIDocShellTreeItem { /** @@ -873,4 +873,12 @@ interface nsIDocShell : nsIDocShellTreeItem * Returns false for mLSHE, true for mOSHE */ boolean getCurrentSHEntry(out nsISHEntry aEntry); + + /** + * Cherry picked parts of nsIController. + * They are here, because we want to call these functions + * from JS. + */ + boolean isCommandEnabled(in string command); + void doCommand(in string command); }; diff --git a/toolkit/content/browser-child.js b/toolkit/content/browser-child.js index 78f189bba829..6a3f4a94ffb8 100644 --- a/toolkit/content/browser-child.js +++ b/toolkit/content/browser-child.js @@ -186,6 +186,23 @@ let SecurityUI = { } }; +let ControllerCommands = { + init: function () { + addMessageListener("ControllerCommands:Do", this); + }, + + receiveMessage: function(message) { + switch(message.name) { + case "ControllerCommands:Do": + if (docShell.isCommandEnabled(message.data)) + docShell.doCommand(message.data); + break; + } + } +} + +ControllerCommands.init() + addEventListener("DOMTitleChanged", function (aEvent) { let document = content.document; switch (aEvent.type) { diff --git a/toolkit/content/widgets/remote-browser.xml b/toolkit/content/widgets/remote-browser.xml index f2f9f0b89a50..8a52b40a250c 100644 --- a/toolkit/content/widgets/remote-browser.xml +++ b/toolkit/content/widgets/remote-browser.xml @@ -101,12 +101,18 @@ this.messageManager.addMessageListener("ImageDocumentLoaded", this); this.messageManager.loadFrameScript("chrome://global/content/browser-child.js", true); this.webProgress._init(); + + let jsm = "resource://gre/modules/RemoteController.jsm"; + let RemoteController = Components.utils.import(jsm, {}).RemoteController; + this._controller = new RemoteController(this); + this.controllers.appendController(this._controller); ]]> diff --git a/toolkit/modules/RemoteController.jsm b/toolkit/modules/RemoteController.jsm new file mode 100644 index 000000000000..aa3183456149 --- /dev/null +++ b/toolkit/modules/RemoteController.jsm @@ -0,0 +1,58 @@ +// -*- Mode: javascript; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this +// file, You can obtain one at http://mozilla.org/MPL/2.0/. + +this.EXPORTED_SYMBOLS = ["RemoteController"]; + +const Ci = Components.interfaces; +const Cc = Components.classes; +const Cu = Components.utils; + +Cu.import("resource://gre/modules/XPCOMUtils.jsm"); + +function RemoteController(browser) +{ + this._browser = browser; +} + +RemoteController.prototype = { + QueryInterface: XPCOMUtils.generateQI([Ci.nsIController]), + + isCommandEnabled: function(aCommand) { + // We can't synchronously ask content if a command is enabled, + // so we always pretend is. + // The right way forward would be to never use nsIController + // to ask if something in content is enabled. Maybe even + // by replacing the nsIController architecture by something else. + // See bug 905768. + return true; + }, + + supportsCommand: function(aCommand) { + // Optimize the lookup a bit. + if (!aCommand.startsWith("cmd_")) + return false; + + // For now only support the commands used in "browser-context.inc" + let commands = [ + "cmd_copyLink", + "cmd_copyImage", + "cmd_undo", + "cmd_cut", + "cmd_copy", + "cmd_paste", + "cmd_delete", + "cmd_selectAll", + "cmd_switchTextDirection" + ]; + + return commands.indexOf(aCommand) >= 0; + }, + + doCommand: function(aCommand) { + this._browser.messageManager.sendAsyncMessage("ControllerCommands:Do", aCommand); + }, + + onEvent: function () {} +}; diff --git a/toolkit/modules/moz.build b/toolkit/modules/moz.build index f60dd1c9ffc0..c28d4dbaa6c5 100644 --- a/toolkit/modules/moz.build +++ b/toolkit/modules/moz.build @@ -21,6 +21,7 @@ EXTRA_JS_MODULES += [ 'PrivateBrowsingUtils.jsm', 'Promise.jsm', 'PropertyListUtils.jsm', + 'RemoteController.jsm', 'RemoteSecurityUI.jsm', 'RemoteWebNavigation.jsm', 'RemoteWebProgress.jsm', From 24980a73b8700d3bb59053f4e01eb15454237a32 Mon Sep 17 00:00:00 2001 From: Tom Schuster Date: Wed, 21 Aug 2013 13:24:53 -0400 Subject: [PATCH 09/79] Bug 902013 - Only enable CPOWs on desktop with browser.tabs.remote. r=dvander --- dom/ipc/TabChild.cpp | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp index 0a06f8971748..ab6275d5f70f 100644 --- a/dom/ipc/TabChild.cpp +++ b/dom/ipc/TabChild.cpp @@ -110,6 +110,8 @@ static const char BROWSER_ZOOM_TO_RECT[] = "browser-zoom-to-rect"; static const char BEFORE_FIRST_PAINT[] = "before-first-paint"; static const char DETECT_SCROLLABLE_SUBFRAME[] = "detect-scrollable-subframe"; +static bool sCpowsEnabled = false; + NS_IMETHODIMP ContentListener::HandleEvent(nsIDOMEvent* aEvent) { @@ -2339,6 +2341,11 @@ TabChild::InitRenderingState() false); } + // This state can't really change during the lifetime of the child. + sCpowsEnabled = Preferences::GetBool("browser.tabs.remote", false); + if (Preferences::GetBool("dom.ipc.cpows.force-disabled", false)) + sCpowsEnabled = false; + return true; } @@ -2469,8 +2476,10 @@ TabChild::DoSendSyncMessage(JSContext* aCx, return false; } InfallibleTArray cpows; - if (!cc->GetCPOWManager()->Wrap(aCx, aCpows, &cpows)) { - return false; + if (sCpowsEnabled) { + if (!cc->GetCPOWManager()->Wrap(aCx, aCpows, &cpows)) { + return false; + } } return SendSyncMessage(nsString(aMessage), data, cpows, aJSONRetVal); } @@ -2487,8 +2496,10 @@ TabChild::DoSendAsyncMessage(JSContext* aCx, return false; } InfallibleTArray cpows; - if (!cc->GetCPOWManager()->Wrap(aCx, aCpows, &cpows)) { - return false; + if (sCpowsEnabled) { + if (!cc->GetCPOWManager()->Wrap(aCx, aCpows, &cpows)) { + return false; + } } return SendAsyncMessage(nsString(aMessage), data, cpows); } From e7b3ee4caf925377828e2dc7f01240cbb4581fd6 Mon Sep 17 00:00:00 2001 From: Stephen Pohl Date: Wed, 21 Aug 2013 15:44:17 -0400 Subject: [PATCH 10/79] Bug 904561: Restrict the growing of overlay scrollbars on hover to OSX 10.8 and above. r=smichaud --- widget/cocoa/nsNativeThemeCocoa.mm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/widget/cocoa/nsNativeThemeCocoa.mm b/widget/cocoa/nsNativeThemeCocoa.mm index 267605cbda45..0347f99185df 100644 --- a/widget/cocoa/nsNativeThemeCocoa.mm +++ b/widget/cocoa/nsNativeThemeCocoa.mm @@ -2329,7 +2329,7 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsRenderingContext* aContext, BOOL isHorizontal = (aWidgetType == NS_THEME_SCROLLBAR_THUMB_HORIZONTAL); BOOL isRolledOver = CheckBooleanAttr(GetParentScrollbarFrame(aFrame), nsGkAtoms::hover); - if (!isRolledOver) { + if (!nsCocoaFeatures::OnMountainLionOrLater() || !isRolledOver) { if (isHorizontal) { macRect.origin.y += 4; macRect.size.height -= 4; @@ -2375,6 +2375,15 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsRenderingContext* aContext, if (nsLookAndFeel::UseOverlayScrollbars() && CheckBooleanAttr(GetParentScrollbarFrame(aFrame), nsGkAtoms::hover)) { BOOL isHorizontal = (aWidgetType == NS_THEME_SCROLLBAR_TRACK_HORIZONTAL); + if (!nsCocoaFeatures::OnMountainLionOrLater()) { + // On OSX 10.7, scrollbars don't grow when hovered. The adjustments + // below were obtained by trial and error. + if (isHorizontal) { + macRect.origin.y += 2.0; + } else { + macRect.origin.x += 3.0; + } + } const BOOL isOnTopOfDarkBackground = IsDarkBackground(aFrame); CUIDraw([NSWindow coreUIRenderer], macRect, cgContext, (CFDictionaryRef)[NSDictionary dictionaryWithObjectsAndKeys: From dd482dce1e1a66539382d276c183c3e75accd190 Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Wed, 21 Aug 2013 15:08:51 -0500 Subject: [PATCH 11/79] Bug 896264 - Disable Math.hypot until spec settles down. r=jorendorff --- js/src/jsmath.cpp | 6 ++++++ js/src/jsmath.h | 6 ++++++ js/src/tests/ecma_6/Math/hypot-approx.js | 3 +++ js/src/tests/ecma_6/Math/hypot-exact.js | 3 +++ 4 files changed, 18 insertions(+) diff --git a/js/src/jsmath.cpp b/js/src/jsmath.cpp index a3347d793319..67e05ccfa7ac 100644 --- a/js/src/jsmath.cpp +++ b/js/src/jsmath.cpp @@ -1101,6 +1101,8 @@ js::math_atanh(JSContext *cx, unsigned argc, Value *vp) return math_function(cx, argc, vp); } +// Math.hypot is disabled pending the resolution of spec issues (bug 896264). +#if 0 #if !HAVE_HYPOT double hypot(double x, double y) { @@ -1166,6 +1168,7 @@ js::math_hypot(JSContext *cx, unsigned argc, Value *vp) args.rval().setNumber(math_hypot_impl(math_hypot_impl(x, y), z)); return true; } +#endif #if !HAVE_TRUNC double trunc(double x) @@ -1274,7 +1277,10 @@ static const JSFunctionSpec math_static_methods[] = { JS_FN("acosh", math_acosh, 1, 0), JS_FN("asinh", math_asinh, 1, 0), JS_FN("atanh", math_atanh, 1, 0), +// Math.hypot is disabled pending the resolution of spec issues (bug 896264). +#if 0 JS_FN("hypot", math_hypot, 2, 0), +#endif JS_FN("trunc", math_trunc, 1, 0), JS_FN("sign", math_sign, 1, 0), JS_FN("cbrt", math_cbrt, 1, 0), diff --git a/js/src/jsmath.h b/js/src/jsmath.h index 3a643d546dce..8e9ccece422c 100644 --- a/js/src/jsmath.h +++ b/js/src/jsmath.h @@ -159,8 +159,11 @@ math_asinh(JSContext *cx, unsigned argc, js::Value *vp); extern bool math_atanh(JSContext *cx, unsigned argc, js::Value *vp); +// Math.hypot is disabled pending the resolution of spec issues (bug 896264). +#if 0 extern bool math_hypot(JSContext *cx, unsigned argc, Value *vp); +#endif extern bool math_trunc(JSContext *cx, unsigned argc, Value *vp); @@ -243,8 +246,11 @@ math_asinh_impl(MathCache *cache, double x); extern double math_atanh_impl(MathCache *cache, double x); +// Math.hypot is disabled pending the resolution of spec issues (bug 896264). +#if 0 extern double math_hypot_impl(double x, double y); +#endif extern double math_trunc_impl(MathCache *cache, double x); diff --git a/js/src/tests/ecma_6/Math/hypot-approx.js b/js/src/tests/ecma_6/Math/hypot-approx.js index 1b68aad52fcd..9960d55d2ea6 100644 --- a/js/src/tests/ecma_6/Math/hypot-approx.js +++ b/js/src/tests/ecma_6/Math/hypot-approx.js @@ -1,3 +1,6 @@ +// |reftest| skip +// Math.hypot is disabled pending the resolution of spec issues (bug 896264). + for (var i = -20; i < 20; i++) assertEq(Math.hypot(+0, i), Math.abs(i)); diff --git a/js/src/tests/ecma_6/Math/hypot-exact.js b/js/src/tests/ecma_6/Math/hypot-exact.js index 6f37b6607e59..059c896ffb1a 100644 --- a/js/src/tests/ecma_6/Math/hypot-exact.js +++ b/js/src/tests/ecma_6/Math/hypot-exact.js @@ -1,3 +1,6 @@ +// |reftest| skip +// Math.hypot is disabled pending the resolution of spec issues (bug 896264). + // Properties of Math.hypot that are guaranteed by the spec. // If any argument is +∞, the result is +∞. From 59208f6acc47244c912107997fc996e05b45ce57 Mon Sep 17 00:00:00 2001 From: Andrew McCreight Date: Mon, 19 Aug 2013 13:49:58 -0700 Subject: [PATCH 12/79] Bug 614238 - Dynamically check that classes QI to their own participant. r=smaug --- js/xpconnect/src/xpcprivate.h | 1 + xpcom/base/nsAgg.h | 1 + xpcom/glue/nsCycleCollectionParticipant.h | 33 ++++++++++++++++++++++- 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/js/xpconnect/src/xpcprivate.h b/js/xpconnect/src/xpcprivate.h index 054f667ee7b5..c96995f89fd2 100644 --- a/js/xpconnect/src/xpcprivate.h +++ b/js/xpconnect/src/xpcprivate.h @@ -2267,6 +2267,7 @@ public: NS_IMETHOD Unroot(void *p) { return NS_OK; } NS_IMPL_GET_XPCOM_CYCLE_COLLECTION_PARTICIPANT(XPCWrappedNative) }; + NS_CHECK_FOR_RIGHT_PARTICIPANT_IMPL(XPCWrappedNative); static NS_CYCLE_COLLECTION_INNERCLASS NS_CYCLE_COLLECTION_INNERNAME; void DeleteCycleCollectable() {} diff --git a/xpcom/base/nsAgg.h b/xpcom/base/nsAgg.h index ca7d6f4fa087..6c5fe76859eb 100644 --- a/xpcom/base/nsAgg.h +++ b/xpcom/base/nsAgg.h @@ -92,6 +92,7 @@ public: \ return &_class::NS_CYCLE_COLLECTION_INNERNAME; \ } \ }; \ +NS_CHECK_FOR_RIGHT_PARTICIPANT_IMPL(_class); \ static NS_CYCLE_COLLECTION_INNERCLASS NS_CYCLE_COLLECTION_INNERNAME; // Put this in your class's constructor: diff --git a/xpcom/glue/nsCycleCollectionParticipant.h b/xpcom/glue/nsCycleCollectionParticipant.h index cf418e4da195..d8a4af719622 100644 --- a/xpcom/glue/nsCycleCollectionParticipant.h +++ b/xpcom/glue/nsCycleCollectionParticipant.h @@ -232,6 +232,12 @@ public: #define NS_CYCLE_COLLECTION_UPCAST(obj, clazz) \ NS_CYCLE_COLLECTION_CLASSNAME(clazz)::Upcast(obj) +#ifdef DEBUG +#define NS_CHECK_FOR_RIGHT_PARTICIPANT(_ptr) _ptr->CheckForRightParticipant() +#else +#define NS_CHECK_FOR_RIGHT_PARTICIPANT(_ptr) +#endif + // The default implementation of this class template is empty, because it // should never be used: see the partial specializations below. template nsISupports *s = static_cast(p); MOZ_ASSERT(NS_CYCLE_COLLECTION_CLASSNAME(T)::CheckForRightISupports(s), "not the nsISupports pointer we expect"); - return NS_CYCLE_COLLECTION_CLASSNAME(T)::Downcast(s); + T *rval = NS_CYCLE_COLLECTION_CLASSNAME(T)::Downcast(s); + NS_CHECK_FOR_RIGHT_PARTICIPANT(rval); + return rval; } }; @@ -432,6 +440,21 @@ T* DowncastCCParticipant(void *p) // Helpers for implementing a concrete nsCycleCollectionParticipant /////////////////////////////////////////////////////////////////////////////// +// If a class defines a participant, then QIing an instance of that class to +// nsXPCOMCycleCollectionParticipant should produce that participant. +#ifdef DEBUG +#define NS_CHECK_FOR_RIGHT_PARTICIPANT_IMPL(_class) \ + virtual void CheckForRightParticipant() \ + { \ + nsXPCOMCycleCollectionParticipant *p; \ + CallQueryInterface(this, &p); \ + MOZ_ASSERT(p == &NS_CYCLE_COLLECTION_INNERNAME, \ + #_class " should QI to its own CC participant"); \ + } +#else +#define NS_CHECK_FOR_RIGHT_PARTICIPANT_IMPL(_class) +#endif + #define NS_DECL_CYCLE_COLLECTION_CLASS_BODY_NO_UNLINK(_class, _base) \ public: \ NS_IMETHOD Traverse(void *p, nsCycleCollectionTraversalCallback &cb); \ @@ -483,6 +506,7 @@ class NS_CYCLE_COLLECTION_INNERCLASS \ NS_DECL_CYCLE_COLLECTION_CLASS_BODY(_class, _base) \ NS_IMPL_GET_XPCOM_CYCLE_COLLECTION_PARTICIPANT(_class) \ }; \ +NS_CHECK_FOR_RIGHT_PARTICIPANT_IMPL(_class) \ static NS_CYCLE_COLLECTION_INNERCLASS NS_CYCLE_COLLECTION_INNERNAME; \ NOT_INHERITED_CANT_OVERRIDE @@ -504,6 +528,7 @@ private: NS_IMETHOD_(bool) CanSkipThisReal(void *p); \ NS_IMPL_GET_XPCOM_CYCLE_COLLECTION_PARTICIPANT(_class) \ }; \ +NS_CHECK_FOR_RIGHT_PARTICIPANT_IMPL(_class) \ static NS_CYCLE_COLLECTION_INNERCLASS NS_CYCLE_COLLECTION_INNERNAME; \ NOT_INHERITED_CANT_OVERRIDE @@ -518,6 +543,7 @@ class NS_CYCLE_COLLECTION_INNERCLASS NS_IMETHOD_(void) Trace(void *p, const TraceCallbacks &cb, void *closure); \ NS_IMPL_GET_XPCOM_CYCLE_COLLECTION_PARTICIPANT(_class) \ }; \ +NS_CHECK_FOR_RIGHT_PARTICIPANT_IMPL(_class) \ static NS_CYCLE_COLLECTION_INNERCLASS NS_CYCLE_COLLECTION_INNERNAME; \ NOT_INHERITED_CANT_OVERRIDE @@ -536,6 +562,7 @@ private: NS_IMETHOD_(bool) CanSkipThisReal(void *p); \ NS_IMPL_GET_XPCOM_CYCLE_COLLECTION_PARTICIPANT(_class) \ }; \ +NS_CHECK_FOR_RIGHT_PARTICIPANT_IMPL(_class) \ static NS_CYCLE_COLLECTION_INNERCLASS NS_CYCLE_COLLECTION_INNERNAME; \ NOT_INHERITED_CANT_OVERRIDE @@ -554,6 +581,7 @@ class NS_CYCLE_COLLECTION_INNERCLASS NS_IMETHOD_(bool) CanSkipThisReal(void *p); \ NS_IMPL_GET_XPCOM_CYCLE_COLLECTION_PARTICIPANT(_class) \ }; \ +NS_CHECK_FOR_RIGHT_PARTICIPANT_IMPL(_class) \ static NS_CYCLE_COLLECTION_INNERCLASS NS_CYCLE_COLLECTION_INNERNAME; #define NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(_class) \ @@ -581,6 +609,7 @@ public: \ NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED_BODY(_class, _base_class) \ NS_IMPL_GET_XPCOM_CYCLE_COLLECTION_PARTICIPANT(_class) \ }; \ +NS_CHECK_FOR_RIGHT_PARTICIPANT_IMPL(_class) \ static NS_CYCLE_COLLECTION_INNERCLASS NS_CYCLE_COLLECTION_INNERNAME; #define NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED_NO_UNLINK(_class, \ @@ -592,6 +621,7 @@ public: \ NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED_BODY_NO_UNLINK(_class, _base_class) \ NS_IMPL_GET_XPCOM_CYCLE_COLLECTION_PARTICIPANT(_class) \ }; \ +NS_CHECK_FOR_RIGHT_PARTICIPANT_IMPL(_class) \ static NS_CYCLE_COLLECTION_INNERCLASS NS_CYCLE_COLLECTION_INNERNAME; #define NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_INHERITED(_class, \ @@ -603,6 +633,7 @@ class NS_CYCLE_COLLECTION_INNERCLASS NS_IMETHOD_(void) Trace(void *p, const TraceCallbacks &cb, void *closure); \ NS_IMPL_GET_XPCOM_CYCLE_COLLECTION_PARTICIPANT(_class) \ }; \ +NS_CHECK_FOR_RIGHT_PARTICIPANT_IMPL(_class) \ static NS_CYCLE_COLLECTION_INNERCLASS NS_CYCLE_COLLECTION_INNERNAME; // Cycle collector participant declarations. From 6d960bf0eb4880937243c8dd7d0c427f3a022e5c Mon Sep 17 00:00:00 2001 From: Andrew McCreight Date: Tue, 20 Aug 2013 15:55:07 -0700 Subject: [PATCH 13/79] Bug 614238, part 2 - remove unused StkCommandEvent CC declaration. r=smaug --- dom/icc/src/StkCommandEvent.h | 1 - 1 file changed, 1 deletion(-) diff --git a/dom/icc/src/StkCommandEvent.h b/dom/icc/src/StkCommandEvent.h index 30ac05d87b5f..feeadeb95c63 100644 --- a/dom/icc/src/StkCommandEvent.h +++ b/dom/icc/src/StkCommandEvent.h @@ -22,7 +22,6 @@ public: NS_DECL_ISUPPORTS_INHERITED NS_FORWARD_TO_NSDOMEVENT NS_DECL_NSIDOMMOZSTKCOMMANDEVENT - NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(StkCommandEvent, nsDOMEvent) static already_AddRefed Create(EventTarget* aOwner, const nsAString& aMessage); From 2d01c5edc2651d818f95c9b9f15193849ba7e5c1 Mon Sep 17 00:00:00 2001 From: Stephen Pohl Date: Wed, 21 Aug 2013 16:33:55 -0400 Subject: [PATCH 14/79] Bug 904561: Followup for RTL support. r=smichaud --- widget/cocoa/nsNativeThemeCocoa.mm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/widget/cocoa/nsNativeThemeCocoa.mm b/widget/cocoa/nsNativeThemeCocoa.mm index 0347f99185df..81e68f1d0bd1 100644 --- a/widget/cocoa/nsNativeThemeCocoa.mm +++ b/widget/cocoa/nsNativeThemeCocoa.mm @@ -2381,7 +2381,12 @@ nsNativeThemeCocoa::DrawWidgetBackground(nsRenderingContext* aContext, if (isHorizontal) { macRect.origin.y += 2.0; } else { - macRect.origin.x += 3.0; + if (aFrame->StyleVisibility()->mDirection != + NS_STYLE_DIRECTION_RTL) { + macRect.origin.x += 3.0; + } else { + macRect.origin.x -= 1.0; + } } } const BOOL isOnTopOfDarkBackground = IsDarkBackground(aFrame); From 81455a2401afa8f7f03577898ce15b8e77327639 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Wed, 21 Aug 2013 16:35:45 -0400 Subject: [PATCH 15/79] Backed out changeset 4d6b320897df (bug 893184) for crashes. --- js/src/jsscript.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp index 7c24ff58f77b..fae864ede0a9 100644 --- a/js/src/jsscript.cpp +++ b/js/src/jsscript.cpp @@ -2806,7 +2806,7 @@ JSScript::markChildren(JSTracer *trc) if (IS_GC_MARKING_TRACER(trc)) { compartment()->mark(); - if (code) + if (code || natoms) MarkScriptData(trc->runtime, code); } From 95ef73617ca12e4a987bd33d80fa065bcd5111fe Mon Sep 17 00:00:00 2001 From: Eric Faust Date: Wed, 21 Aug 2013 13:38:45 -0700 Subject: [PATCH 16/79] Bug 906035 - IonMonkey: Only generate array length GetProperty stubs with valid outputs. (r=nbp) --- js/src/jit-test/tests/ion/bug906035.js | 9 +++++++++ js/src/jit/IonCaches.cpp | 20 +++++++++++++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 js/src/jit-test/tests/ion/bug906035.js diff --git a/js/src/jit-test/tests/ion/bug906035.js b/js/src/jit-test/tests/ion/bug906035.js new file mode 100644 index 000000000000..7c847aed3eff --- /dev/null +++ b/js/src/jit-test/tests/ion/bug906035.js @@ -0,0 +1,9 @@ +// |jit-test| ion-eager +function y() { return "foo,bar"; } +function x() { + var z = y().split(','); + for (var i = 0; i < z.length; i++) {} +} +gczeal(2); +Object.prototype.length = function () {}; +x(); diff --git a/js/src/jit/IonCaches.cpp b/js/src/jit/IonCaches.cpp index 4d986080230f..a40ce0eea6d8 100644 --- a/js/src/jit/IonCaches.cpp +++ b/js/src/jit/IonCaches.cpp @@ -1078,6 +1078,22 @@ GenerateTypedArrayLength(JSContext *cx, MacroAssembler &masm, IonCache::StubAtta attacher.jumpNextStub(masm); } +static bool +IsCacheableArrayLength(JSContext *cx, HandleObject obj, HandlePropertyName name, + TypedOrValueRegister output) +{ + if (!obj->is()) + return false; + + if (output.type() != MIRType_Value && output.type() != MIRType_Int32) { + // The stub assumes that we always output Int32, so make sure our output + // is equipped to handle that. + return false; + } + + return true; +} + template static GetPropertyIC::NativeGetPropCacheability CanAttachNativeGetProp(typename GetPropCache::Context cx, const GetPropCache &cache, @@ -1111,7 +1127,9 @@ CanAttachNativeGetProp(typename GetPropCache::Context cx, const GetPropCache &ca return GetPropertyIC::CanAttachReadSlot; } - if (obj->is() && cx->names().length == name) { + if (cx->names().length == name && + IsCacheableArrayLength(cx, obj, name, cache.output())) + { // The array length property is non-configurable, which means both that // checking the class of the object and the name of the property is enough // and that we don't need to worry about monitoring, since we know the From 23d3390f26dfe98868c6861013447d76b2f001ee Mon Sep 17 00:00:00 2001 From: Gregory Szorc Date: Wed, 21 Aug 2013 09:56:36 -0700 Subject: [PATCH 17/79] Bug 907797 - Catch NotImplementedError when importing psutil; r=ahal --- .../mozsystemmonitor/mozsystemmonitor/resourcemonitor.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py b/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py index a7013c7f329a..c71af93821c0 100644 --- a/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py +++ b/testing/mozbase/mozsystemmonitor/mozsystemmonitor/resourcemonitor.py @@ -6,9 +6,10 @@ import multiprocessing import sys import time +# psutil will raise NotImplementedError if the platform is not supported. try: import psutil -except ImportError: +except (ImportError, NotImplementedError): psutil = None from collections import ( From e5e63a48e9437078085eb67470074164535d7267 Mon Sep 17 00:00:00 2001 From: Olli Pettay Date: Thu, 22 Aug 2013 00:02:12 +0300 Subject: [PATCH 18/79] Bug 906269, don't start a GC cycle so likely while we're in middle of a CC cycle, r=mccr8 --HG-- extra : rebase_source : 90d3ad3d19159613f2cb83f0d28dd37a1a429b75 --- dom/base/nsJSEnvironment.cpp | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp index 2543af91d4aa..73c17f946db8 100644 --- a/dom/base/nsJSEnvironment.cpp +++ b/dom/base/nsJSEnvironment.cpp @@ -174,6 +174,7 @@ static uint32_t sForgetSkippableBeforeCC = 0; static uint32_t sPreviousSuspectedCount = 0; static uint32_t sCleanupsSinceLastGC = UINT32_MAX; static bool sNeedsFullCC = false; +static bool sNeedsGCAfterCC = false; static nsJSContext *sContextList = nullptr; static nsScriptNameSpaceManager *gNameSpaceManager; @@ -2055,7 +2056,8 @@ nsJSContext::CycleCollectNow(nsICycleCollectorListener *aListener, // If we collected a substantial amount of cycles, poke the GC since more objects // might be unreachable now. if (sCCollectedWaitingForGC > 250 || - sLikelyShortLivingObjectsNeedingGC > 2500) { + sLikelyShortLivingObjectsNeedingGC > 2500 || + sNeedsGCAfterCC) { PokeGC(JS::gcreason::CC_WAITING); } @@ -2170,6 +2172,7 @@ nsJSContext::CycleCollectNow(nsICycleCollectorListener *aListener, sRemovedPurples = 0; sForgetSkippableBeforeCC = 0; sNeedsFullCC = false; + sNeedsGCAfterCC = false; } // static @@ -2320,6 +2323,14 @@ nsJSContext::PokeGC(JS::gcreason::Reason aReason, int aDelay) return; } + if (sCCTimer) { + // Make sure CC is called... + sNeedsFullCC = true; + // and GC after it. + sNeedsGCAfterCC = true; + return; + } + CallCreateInstance("@mozilla.org/timer;1", &sGCTimer); if (!sGCTimer) { @@ -2585,6 +2596,7 @@ mozilla::dom::StartupJSEnvironment() sLikelyShortLivingObjectsNeedingGC = 0; sPostGCEventsToConsole = false; sNeedsFullCC = false; + sNeedsGCAfterCC = false; gNameSpaceManager = nullptr; sRuntimeService = nullptr; sRuntime = nullptr; From 9c181eb3fd9c3577091fe2e469efdac9b3c184c3 Mon Sep 17 00:00:00 2001 From: Justin Lebar Date: Wed, 21 Aug 2013 12:04:29 -0700 Subject: [PATCH 19/79] Bug 906909 - Make LinkedList::debugAssertIsSane() compile. r=waldo --HG-- extra : rebase_source : 60027f53b4a8fa91dd7e42863c271c36395d6851 --- mfbt/LinkedList.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mfbt/LinkedList.h b/mfbt/LinkedList.h index c29760b3e73c..070f09e7a81f 100644 --- a/mfbt/LinkedList.h +++ b/mfbt/LinkedList.h @@ -361,7 +361,7 @@ class LinkedList for (slow = sentinel.next, fast1 = sentinel.next->next, fast2 = sentinel.next->next->next; - slow != sentinel && fast1 != sentinel && fast2 != sentinel; + slow != &sentinel && fast1 != &sentinel && fast2 != &sentinel; slow = slow->next, fast1 = fast2->next, fast2 = fast1->next) { MOZ_ASSERT(slow != fast1); @@ -372,7 +372,7 @@ class LinkedList for (slow = sentinel.prev, fast1 = sentinel.prev->prev, fast2 = sentinel.prev->prev->prev; - slow != sentinel && fast1 != sentinel && fast2 != sentinel; + slow != &sentinel && fast1 != &sentinel && fast2 != &sentinel; slow = slow->prev, fast1 = fast2->prev, fast2 = fast1->prev) { MOZ_ASSERT(slow != fast1); @@ -384,14 +384,14 @@ class LinkedList * isSentinel == true. */ for (const LinkedListElement* elem = sentinel.next; - elem != sentinel; + elem != &sentinel; elem = elem->next) { MOZ_ASSERT(!elem->isSentinel); } /* Check that the next/prev pointers match up. */ - const LinkedListElement* prev = sentinel; + const LinkedListElement* prev = &sentinel; const LinkedListElement* cur = sentinel.next; do { MOZ_ASSERT(cur->prev == prev); @@ -399,7 +399,7 @@ class LinkedList prev = cur; cur = cur->next; - } while (cur != sentinel); + } while (cur != &sentinel); #endif /* ifdef DEBUG */ } From 731cefe0442b5c1559622cf5d27fc752f34cff61 Mon Sep 17 00:00:00 2001 From: Justin Lebar Date: Wed, 21 Aug 2013 12:04:29 -0700 Subject: [PATCH 20/79] Bug 907227 - Properly delete LinkedListElement's implicit copy-constructor and operator=. r=waldo --HG-- extra : rebase_source : b5f09c990f38537266c3e42a211a483e1dd291d6 --- mfbt/LinkedList.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mfbt/LinkedList.h b/mfbt/LinkedList.h index 070f09e7a81f..8308fb3dfd93 100644 --- a/mfbt/LinkedList.h +++ b/mfbt/LinkedList.h @@ -252,8 +252,8 @@ class LinkedListElement } private: - LinkedListElement& operator=(const LinkedList& other) MOZ_DELETE; - LinkedListElement(const LinkedList& other) MOZ_DELETE; + LinkedListElement& operator=(const LinkedListElement& other) MOZ_DELETE; + LinkedListElement(const LinkedListElement& other) MOZ_DELETE; }; template From 264acde64bd6626edf75b0a8acd3a5565c650fad Mon Sep 17 00:00:00 2001 From: Terrence Cole Date: Tue, 20 Aug 2013 13:13:21 -0700 Subject: [PATCH 21/79] Bug 907358 - Exactly root internal pointers in Array.join; r=Waldo --HG-- extra : rebase_source : c7f0c4dfd9a1ac7f7877e1cbe0778ac0f071e9d4 --- js/src/jsarray.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp index 02e650a38e11..4123c4cbb017 100644 --- a/js/src/jsarray.cpp +++ b/js/src/jsarray.cpp @@ -1,5 +1,6 @@ /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- - * vim: set ts=8 sts=4 et sw=4 tw=99: + * vim: set sw=4 ts=8 et tw=78: + * * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -932,13 +933,13 @@ array_join_sub(JSContext *cx, CallArgs &args, bool locale) // Various optimized versions of steps 7-10 if (!locale && !seplen && obj->is() && !ObjectMayHaveExtraIndexedProperties(obj)) { - const Value *start = obj->getDenseElements(); - const Value *end = start + obj->getDenseInitializedLength(); - const Value *elem; - for (elem = start; elem < end; elem++) { + uint32_t i; + for (i = 0; i < obj->getDenseInitializedLength(); ++i) { if (!JS_CHECK_OPERATION_LIMIT(cx)) return false; + const Value *elem = &obj->getDenseElement(i); + /* * Object stringifying is slow; delegate it to a separate loop to * keep this one tight. @@ -953,7 +954,7 @@ array_join_sub(JSContext *cx, CallArgs &args, bool locale) } RootedValue v(cx); - for (uint32_t i = uint32_t(PointerRangeSize(start, elem)); i < length; i++) { + for (; i < length; ++i) { if (!JS_CHECK_OPERATION_LIMIT(cx)) return false; From 74e47507872e203d953b4a921059730d791a09b6 Mon Sep 17 00:00:00 2001 From: Terrence Cole Date: Wed, 21 Aug 2013 12:43:22 -0700 Subject: [PATCH 22/79] Bug 907791 - Suppress some AsmJS rooting non-hazards in the static analysis; r=bhackett --HG-- extra : rebase_source : 4c4e371427aeb07cdf3fb478e10810204e1ece8c --- js/src/jit/AsmJS.cpp | 2 ++ js/src/jsgc.cpp | 6 ++++++ js/src/jsgc.h | 1 + 3 files changed, 9 insertions(+) diff --git a/js/src/jit/AsmJS.cpp b/js/src/jit/AsmJS.cpp index 2a17102b3bdd..41ce90d5d6fa 100644 --- a/js/src/jit/AsmJS.cpp +++ b/js/src/jit/AsmJS.cpp @@ -1276,6 +1276,8 @@ class MOZ_STACK_CLASS ModuleCompiler } bool failName(ParseNode *pn, const char *fmt, PropertyName *name) { + // This function is invoked without the caller properly rooting its locals. + gc::AutoSuppressGC suppress(name->runtimeFromMainThread()); JSAutoByteString bytes; if (AtomToPrintableString(cx_, name, &bytes)) failf(pn, fmt, bytes.ptr()); diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp index 26dd00fe2a7b..1cd354ca73e1 100644 --- a/js/src/jsgc.cpp +++ b/js/src/jsgc.cpp @@ -5140,6 +5140,12 @@ AutoMaybeTouchDeadZones::~AutoMaybeTouchDeadZones() runtime->gcManipulatingDeadZones = manipulatingDeadZones; } +AutoSuppressGC::AutoSuppressGC(JSRuntime *rt) + : suppressGC_(rt->mainThread.suppressGC) +{ + suppressGC_++; +} + AutoSuppressGC::AutoSuppressGC(JSContext *cx) : suppressGC_(cx->runtime()->mainThread.suppressGC) { diff --git a/js/src/jsgc.h b/js/src/jsgc.h index 220d7bc92ceb..0c66cd98b18f 100644 --- a/js/src/jsgc.h +++ b/js/src/jsgc.h @@ -1400,6 +1400,7 @@ class AutoSuppressGC int32_t &suppressGC_; public: + AutoSuppressGC(JSRuntime *rt); AutoSuppressGC(JSContext *cx); AutoSuppressGC(JSCompartment *comp); From c8e2b5a9961cb97a60fd7040461d22d6782444ff Mon Sep 17 00:00:00 2001 From: Terrence Cole Date: Wed, 21 Aug 2013 14:20:15 -0700 Subject: [PATCH 23/79] Bug 906241 - Trigger post barriers for writes to tenured call objects; r=bhackett --- js/src/jit-test/tests/gc/bug-906241.js | 8 ++++++++ js/src/jit/VMFunctions.cpp | 12 +++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 js/src/jit-test/tests/gc/bug-906241.js diff --git a/js/src/jit-test/tests/gc/bug-906241.js b/js/src/jit-test/tests/gc/bug-906241.js new file mode 100644 index 000000000000..d035e2a0b16b --- /dev/null +++ b/js/src/jit-test/tests/gc/bug-906241.js @@ -0,0 +1,8 @@ +for (let y in []); +(function f(x) { + Float64Array(ArrayBuffer()); + { + f(x) + function t() {} + } +})(); diff --git a/js/src/jit/VMFunctions.cpp b/js/src/jit/VMFunctions.cpp index 0ff6efd078db..cac311189360 100644 --- a/js/src/jit/VMFunctions.cpp +++ b/js/src/jit/VMFunctions.cpp @@ -458,7 +458,17 @@ JSObject * NewCallObject(JSContext *cx, HandleScript script, HandleShape shape, HandleTypeObject type, HeapSlot *slots) { - return CallObject::create(cx, script, shape, type, slots); + JSObject *obj = CallObject::create(cx, script, shape, type, slots); + +#ifdef JSGC_GENERATIONAL + // The JIT creates call objects in the nursery, so elides barriers for + // the initializing writes. The interpreter, however, may have allocated + // the call object tenured, so barrier as needed before re-entering. + if (!IsInsideNursery(cx->runtime(), obj)) + cx->runtime()->gcStoreBuffer.putWholeCell(obj); +#endif + + return obj; } JSObject * From f4d2016bbdc98dbcd28f7e42e014015afc81ac4c Mon Sep 17 00:00:00 2001 From: Ed Morley Date: Wed, 21 Aug 2013 22:13:36 +0100 Subject: [PATCH 24/79] Bug 907925 - Add reasons to Marionette's wait_for_port() assertions, to make them TBPL compatible; r=jgriffin --HG-- extra : rebase_source : 458c32979708ed5581a992745ff10ba75aee3d7f --- testing/marionette/client/marionette/marionette.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testing/marionette/client/marionette/marionette.py b/testing/marionette/client/marionette/marionette.py index 30e312eaec5e..d363f4d6e999 100644 --- a/testing/marionette/client/marionette/marionette.py +++ b/testing/marionette/client/marionette/marionette.py @@ -456,7 +456,7 @@ class Marionette(object): self.instance = instance_class(host=self.host, port=self.port, bin=self.bin, profile=self.profile, app_args=app_args) self.instance.start() - assert(self.wait_for_port()) + assert(self.wait_for_port()), "Timed out waiting for port!" if emulator: self.emulator = Emulator(homedir=homedir, @@ -469,14 +469,14 @@ class Marionette(object): res=emulator_res) self.emulator.start() self.port = self.emulator.setup_port_forwarding(self.port) - assert(self.emulator.wait_for_port()) + assert(self.emulator.wait_for_port()), "Timed out waiting for port!" if connectToRunningEmulator: self.emulator = Emulator(homedir=homedir, logcat_dir=self.logcat_dir) self.emulator.connect() self.port = self.emulator.setup_port_forwarding(self.port) - assert(self.emulator.wait_for_port()) + assert(self.emulator.wait_for_port()), "Timed out waiting for port!" self.client = MarionetteClient(self.host, self.port) From 201d869637a00e334c4fa4b3d2392f6569d87d03 Mon Sep 17 00:00:00 2001 From: John Schoenick Date: Wed, 7 Aug 2013 13:23:42 -0700 Subject: [PATCH 25/79] Bug 902375 - Actually use the optional parameter added explicitly for this purpose. r=bsmedberg --- content/base/src/nsObjectLoadingContent.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/base/src/nsObjectLoadingContent.cpp b/content/base/src/nsObjectLoadingContent.cpp index e87211a27142..a763f5a6e3e5 100644 --- a/content/base/src/nsObjectLoadingContent.cpp +++ b/content/base/src/nsObjectLoadingContent.cpp @@ -1263,7 +1263,7 @@ nsObjectLoadingContent::CheckJavaCodebase() // the exception of URIs that represent local files if (NS_URIIsLocalFile(mBaseURI) && nsScriptSecurityManager::GetStrictFileOriginPolicy() && - !NS_RelaxStrictFileOriginPolicy(mBaseURI, principalBaseURI)) { + !NS_RelaxStrictFileOriginPolicy(mBaseURI, principalBaseURI, true)) { LOG(("OBJLC [%p]: Java failed RelaxStrictFileOriginPolicy for file URI", this)); return false; From e4df1399c952b7d4753b14963a4dc516a28828c2 Mon Sep 17 00:00:00 2001 From: John Schoenick Date: Wed, 7 Aug 2013 14:35:20 -0700 Subject: [PATCH 26/79] Bug 902375 - Strict file origin policy - handle case where the target is the parent directory of the source. r=bz --- netwerk/base/public/nsNetUtil.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/netwerk/base/public/nsNetUtil.h b/netwerk/base/public/nsNetUtil.h index 1949c5e42441..91afd760d4e1 100644 --- a/netwerk/base/public/nsNetUtil.h +++ b/netwerk/base/public/nsNetUtil.h @@ -1976,19 +1976,26 @@ NS_RelaxStrictFileOriginPolicy(nsIURI *aTargetURI, // inherit its source principal and be scriptable by that source. // bool sourceIsDir; - bool contained = false; + bool allowed = false; nsresult rv = sourceFile->IsDirectory(&sourceIsDir); if (NS_SUCCEEDED(rv) && sourceIsDir) { - rv = sourceFile->Contains(targetFile, true, &contained); + rv = sourceFile->Contains(targetFile, true, &allowed); } else { nsCOMPtr sourceParent; rv = sourceFile->GetParent(getter_AddRefs(sourceParent)); if (NS_SUCCEEDED(rv) && sourceParent) { - rv = sourceParent->Contains(targetFile, true, &contained); + rv = sourceParent->Equals(targetFile, &allowed); + if (NS_FAILED(rv) || !allowed) { + rv = sourceParent->Contains(targetFile, true, &allowed); + } else { + MOZ_ASSERT(aAllowDirectoryTarget, + "sourceFile->Parent == targetFile, but targetFile " + "should've been disallowed if it is a directory"); + } } } - if (NS_SUCCEEDED(rv) && contained) { + if (NS_SUCCEEDED(rv) && allowed) { return true; } From fb5e9ecf336bc7268d603f97c654a9a2e55a4762 Mon Sep 17 00:00:00 2001 From: Magnus Melin Date: Wed, 21 Aug 2013 22:43:01 +0300 Subject: [PATCH 27/79] Bug 907338 - "Ci is undefined" error in printUtils.js - thunderbird's print preview doesn't show any preview. r=Mossop --- toolkit/components/printing/content/printUtils.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/toolkit/components/printing/content/printUtils.js b/toolkit/components/printing/content/printUtils.js index 66948922b5fc..ab9e25927331 100644 --- a/toolkit/components/printing/content/printUtils.js +++ b/toolkit/components/printing/content/printUtils.js @@ -218,9 +218,9 @@ var PrintUtils = { // Set the original window as an active window so any mozPrintCallbacks can // run without delayed setTimeouts. - var docShell = originalWindow.QueryInterface(Ci.nsIInterfaceRequestor) - .getInterface(Ci.nsIWebNavigation) - .QueryInterface(Ci.nsIDocShell); + var docShell = originalWindow.QueryInterface(Components.interfaces.nsIInterfaceRequestor) + .getInterface(Components.interfaces.nsIWebNavigation) + .QueryInterface(Components.interfaces.nsIDocShell); docShell.isActive = true; // show the toolbar after we go into print preview mode so From cbb7aa23bc02ca57ec5de4faaa6ded1e4025d2cf Mon Sep 17 00:00:00 2001 From: Jon Coppeard Date: Wed, 21 Aug 2013 15:25:53 -0400 Subject: [PATCH 28/79] Bug 893184 - Don't attemmpt to get SharedScriptData* from a null code pointer. r=till --- js/src/jsscript.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp index fae864ede0a9..7c24ff58f77b 100644 --- a/js/src/jsscript.cpp +++ b/js/src/jsscript.cpp @@ -2806,7 +2806,7 @@ JSScript::markChildren(JSTracer *trc) if (IS_GC_MARKING_TRACER(trc)) { compartment()->mark(); - if (code || natoms) + if (code) MarkScriptData(trc->runtime, code); } From 138f7551c445f7b06673ada8e982482d8e88f0c3 Mon Sep 17 00:00:00 2001 From: Terrence Cole Date: Wed, 21 Aug 2013 16:47:19 -0700 Subject: [PATCH 29/79] Backout 5c4e5ee49fbe for bustage on a CLOSED TREE. --- js/src/jit-test/tests/gc/bug-906241.js | 8 -------- js/src/jit/VMFunctions.cpp | 12 +----------- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 js/src/jit-test/tests/gc/bug-906241.js diff --git a/js/src/jit-test/tests/gc/bug-906241.js b/js/src/jit-test/tests/gc/bug-906241.js deleted file mode 100644 index d035e2a0b16b..000000000000 --- a/js/src/jit-test/tests/gc/bug-906241.js +++ /dev/null @@ -1,8 +0,0 @@ -for (let y in []); -(function f(x) { - Float64Array(ArrayBuffer()); - { - f(x) - function t() {} - } -})(); diff --git a/js/src/jit/VMFunctions.cpp b/js/src/jit/VMFunctions.cpp index cac311189360..0ff6efd078db 100644 --- a/js/src/jit/VMFunctions.cpp +++ b/js/src/jit/VMFunctions.cpp @@ -458,17 +458,7 @@ JSObject * NewCallObject(JSContext *cx, HandleScript script, HandleShape shape, HandleTypeObject type, HeapSlot *slots) { - JSObject *obj = CallObject::create(cx, script, shape, type, slots); - -#ifdef JSGC_GENERATIONAL - // The JIT creates call objects in the nursery, so elides barriers for - // the initializing writes. The interpreter, however, may have allocated - // the call object tenured, so barrier as needed before re-entering. - if (!IsInsideNursery(cx->runtime(), obj)) - cx->runtime()->gcStoreBuffer.putWholeCell(obj); -#endif - - return obj; + return CallObject::create(cx, script, shape, type, slots); } JSObject * From 04b45ea85d91567985745f6cb4d2a947cee84997 Mon Sep 17 00:00:00 2001 From: Terrence Cole Date: Wed, 21 Aug 2013 16:48:55 -0700 Subject: [PATCH 30/79] Backout 493d5d59b229 for bustage on a CLOSED TREE. --- js/src/jit/AsmJS.cpp | 2 -- js/src/jsgc.cpp | 6 ------ js/src/jsgc.h | 1 - 3 files changed, 9 deletions(-) diff --git a/js/src/jit/AsmJS.cpp b/js/src/jit/AsmJS.cpp index 41ce90d5d6fa..2a17102b3bdd 100644 --- a/js/src/jit/AsmJS.cpp +++ b/js/src/jit/AsmJS.cpp @@ -1276,8 +1276,6 @@ class MOZ_STACK_CLASS ModuleCompiler } bool failName(ParseNode *pn, const char *fmt, PropertyName *name) { - // This function is invoked without the caller properly rooting its locals. - gc::AutoSuppressGC suppress(name->runtimeFromMainThread()); JSAutoByteString bytes; if (AtomToPrintableString(cx_, name, &bytes)) failf(pn, fmt, bytes.ptr()); diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp index 1cd354ca73e1..26dd00fe2a7b 100644 --- a/js/src/jsgc.cpp +++ b/js/src/jsgc.cpp @@ -5140,12 +5140,6 @@ AutoMaybeTouchDeadZones::~AutoMaybeTouchDeadZones() runtime->gcManipulatingDeadZones = manipulatingDeadZones; } -AutoSuppressGC::AutoSuppressGC(JSRuntime *rt) - : suppressGC_(rt->mainThread.suppressGC) -{ - suppressGC_++; -} - AutoSuppressGC::AutoSuppressGC(JSContext *cx) : suppressGC_(cx->runtime()->mainThread.suppressGC) { diff --git a/js/src/jsgc.h b/js/src/jsgc.h index 0c66cd98b18f..220d7bc92ceb 100644 --- a/js/src/jsgc.h +++ b/js/src/jsgc.h @@ -1400,7 +1400,6 @@ class AutoSuppressGC int32_t &suppressGC_; public: - AutoSuppressGC(JSRuntime *rt); AutoSuppressGC(JSContext *cx); AutoSuppressGC(JSCompartment *comp); From 1f6ecdd03b5a72d62f977e1d5174bf406d6b7add Mon Sep 17 00:00:00 2001 From: Terrence Cole Date: Wed, 21 Aug 2013 16:50:26 -0700 Subject: [PATCH 31/79] Backout 0fc0283ac2b1 for bustage on a CLOSED TREE. --- js/src/jsarray.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/js/src/jsarray.cpp b/js/src/jsarray.cpp index 4123c4cbb017..02e650a38e11 100644 --- a/js/src/jsarray.cpp +++ b/js/src/jsarray.cpp @@ -1,6 +1,5 @@ /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- - * vim: set sw=4 ts=8 et tw=78: - * + * vim: set ts=8 sts=4 et sw=4 tw=99: * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ @@ -933,13 +932,13 @@ array_join_sub(JSContext *cx, CallArgs &args, bool locale) // Various optimized versions of steps 7-10 if (!locale && !seplen && obj->is() && !ObjectMayHaveExtraIndexedProperties(obj)) { - uint32_t i; - for (i = 0; i < obj->getDenseInitializedLength(); ++i) { + const Value *start = obj->getDenseElements(); + const Value *end = start + obj->getDenseInitializedLength(); + const Value *elem; + for (elem = start; elem < end; elem++) { if (!JS_CHECK_OPERATION_LIMIT(cx)) return false; - const Value *elem = &obj->getDenseElement(i); - /* * Object stringifying is slow; delegate it to a separate loop to * keep this one tight. @@ -954,7 +953,7 @@ array_join_sub(JSContext *cx, CallArgs &args, bool locale) } RootedValue v(cx); - for (; i < length; ++i) { + for (uint32_t i = uint32_t(PointerRangeSize(start, elem)); i < length; i++) { if (!JS_CHECK_OPERATION_LIMIT(cx)) return false; From 31ee4c5234161650ed669a316f3cf5ef7bbb3bc4 Mon Sep 17 00:00:00 2001 From: Brian Hackett Date: Wed, 21 Aug 2013 18:43:18 -0600 Subject: [PATCH 32/79] Bug 900681 - Properly clean up leaked off thread parses in the JS shell, r=billm. --- js/src/jscntxt.cpp | 5 +++++ js/src/jscntxtinlines.h | 1 + js/src/jsworkers.cpp | 25 ++++++++++++++++++++----- js/src/jsworkers.h | 22 +++++++++++++--------- js/src/vm/Runtime-inl.h | 2 +- js/src/vm/Runtime.h | 3 +++ 6 files changed, 43 insertions(+), 15 deletions(-) diff --git a/js/src/jscntxt.cpp b/js/src/jscntxt.cpp index d8417a135046..be5f944c3ae0 100644 --- a/js/src/jscntxt.cpp +++ b/js/src/jscntxt.cpp @@ -262,6 +262,11 @@ js::DestroyContext(JSContext *cx, DestroyContextMode mode) CancelOffThreadIonCompile(c, NULL); WaitForOffThreadParsingToFinish(rt); +#ifdef JS_WORKER_THREADS + if (rt->workerThreadState) + rt->workerThreadState->cleanup(rt); +#endif + /* Unpin all common names before final GC. */ FinishCommonNames(rt); diff --git a/js/src/jscntxtinlines.h b/js/src/jscntxtinlines.h index 6cdf75841685..eb5030185a0f 100644 --- a/js/src/jscntxtinlines.h +++ b/js/src/jscntxtinlines.h @@ -10,6 +10,7 @@ #include "jscntxt.h" #include "jsiter.h" +#include "jsworkers.h" #include "builtin/Object.h" #include "jit/IonFrames.h" diff --git a/js/src/jsworkers.cpp b/js/src/jsworkers.cpp index fde2174e0c66..3a10377accda 100644 --- a/js/src/jsworkers.cpp +++ b/js/src/jsworkers.cpp @@ -359,18 +359,33 @@ WorkerThreadState::init(JSRuntime *rt) return true; } -WorkerThreadState::~WorkerThreadState() +void +WorkerThreadState::cleanup(JSRuntime *rt) { - /* - * Join created threads first, which needs locks and condition variables - * to be intact. - */ + // Do preparatory work for shutdown before the final GC has destroyed most + // of the GC heap. + + // Join created threads, to ensure there is no in progress work. if (threads) { for (size_t i = 0; i < numThreads; i++) threads[i].destroy(); js_free(threads); + threads = NULL; + numThreads = 0; } + // Clean up any parse tasks which haven't been finished yet. + while (!parseFinishedList.empty()) { + JSScript *script = parseFinishedList[0]->script; + finishParseTaskForScript(rt, script); + } +} + +WorkerThreadState::~WorkerThreadState() +{ + JS_ASSERT(!threads); + JS_ASSERT(parseFinishedList.empty()); + if (workerLock) PR_DestroyLock(workerLock); diff --git a/js/src/jsworkers.h b/js/src/jsworkers.h index e258ad953c82..934670410285 100644 --- a/js/src/jsworkers.h +++ b/js/src/jsworkers.h @@ -30,8 +30,7 @@ namespace ion { class IonBuilder; } -#if defined(JS_THREADSAFE) && defined(JS_ION) -# define JS_WORKER_THREADS +#ifdef JS_WORKER_THREADS /* Per-runtime state for off thread work items. */ class WorkerThreadState @@ -75,6 +74,7 @@ class WorkerThreadState ~WorkerThreadState(); bool init(JSRuntime *rt); + void cleanup(JSRuntime *rt); void lock(); void unlock(); @@ -236,27 +236,31 @@ WaitForOffThreadParsingToFinish(JSRuntime *rt); class AutoLockWorkerThreadState { - WorkerThreadState &state; MOZ_DECL_USE_GUARD_OBJECT_NOTIFIER +#ifdef JS_WORKER_THREADS + WorkerThreadState &state; + public: AutoLockWorkerThreadState(WorkerThreadState &state MOZ_GUARD_OBJECT_NOTIFIER_PARAM) : state(state) { MOZ_GUARD_OBJECT_NOTIFIER_INIT; -#ifdef JS_WORKER_THREADS state.lock(); -#else - (void)state; -#endif } ~AutoLockWorkerThreadState() { -#ifdef JS_WORKER_THREADS state.unlock(); -#endif } +#else + public: + AutoLockWorkerThreadState(WorkerThreadState &state + MOZ_GUARD_OBJECT_NOTIFIER_PARAM) + { + MOZ_GUARD_OBJECT_NOTIFIER_INIT; + } +#endif }; class AutoUnlockWorkerThreadState diff --git a/js/src/vm/Runtime-inl.h b/js/src/vm/Runtime-inl.h index 1736037a16b7..7386c79d9888 100644 --- a/js/src/vm/Runtime-inl.h +++ b/js/src/vm/Runtime-inl.h @@ -74,7 +74,7 @@ ThreadDataIter::ThreadDataIter(JSRuntime *rt) #ifdef JS_WORKER_THREADS // Only allow iteration over a runtime's threads when those threads are // paused, to avoid racing when reading data from the PerThreadData. - JS_ASSERT_IF(rt->workerThreadState, rt->workerThreadState->shouldPause); + JS_ASSERT(rt->exclusiveThreadsPaused); #endif iter = rt->threadList.getFirst(); } diff --git a/js/src/vm/Runtime.h b/js/src/vm/Runtime.h index 8a2bb7bce51b..e0fbd0b1d343 100644 --- a/js/src/vm/Runtime.h +++ b/js/src/vm/Runtime.h @@ -663,6 +663,7 @@ typedef Vector ZoneVector; class AutoLockForExclusiveAccess; class AutoPauseWorkersForGC; +class ThreadDataIter; } // namespace js @@ -772,6 +773,7 @@ struct JSRuntime : public JS::shadow::Runtime, friend class js::AutoLockForExclusiveAccess; friend class js::AutoPauseWorkersForGC; + friend class js::ThreadDataIter; public: void setUsedByExclusiveThread(JS::Zone *zone); @@ -1317,6 +1319,7 @@ struct JSRuntime : public JS::shadow::Runtime, #ifdef JS_THREADSAFE # ifdef JS_ION js::WorkerThreadState *workerThreadState; +# define JS_WORKER_THREADS # endif js::SourceCompressorThread sourceCompressorThread; From 29fd387ec79adfff8515e752800ad9a4e4b4a2ed Mon Sep 17 00:00:00 2001 From: Brian Hackett Date: Wed, 21 Aug 2013 18:47:19 -0600 Subject: [PATCH 33/79] Bug 904315 - Watch for negative integers when loading maybe-hole elements from arrays, r=jandem. --- js/src/jit-test/tests/ion/bug904315.js | 15 +++++++++++++++ js/src/jit/BaselineIC.cpp | 6 ++++++ js/src/jit/BaselineIC.h | 14 ++++++++++++-- js/src/jit/BaselineInspector.cpp | 14 ++++++++++++++ js/src/jit/BaselineInspector.h | 1 + js/src/jit/CodeGenerator.cpp | 15 +++++++++++++++ js/src/jit/IonBuilder.cpp | 5 +++++ js/src/jit/Lowering.cpp | 2 ++ js/src/jit/MIR.h | 6 ++++++ js/src/jit/RangeAnalysis.cpp | 6 ++++++ 10 files changed, 82 insertions(+), 2 deletions(-) create mode 100644 js/src/jit-test/tests/ion/bug904315.js diff --git a/js/src/jit-test/tests/ion/bug904315.js b/js/src/jit-test/tests/ion/bug904315.js new file mode 100644 index 000000000000..64239408f6b2 --- /dev/null +++ b/js/src/jit-test/tests/ion/bug904315.js @@ -0,0 +1,15 @@ + +function g(o, idx, exp) { + for (var i=0; i<3000; i++) { + assertEq(o[idx], exp); + } +} +function f() { + var o = []; + for (var i=1; i<100; i++) { + o[-i] = 1; + } + g(o, 50, undefined); + g(o, -50, 1); +} +f(); diff --git a/js/src/jit/BaselineIC.cpp b/js/src/jit/BaselineIC.cpp index 1437dbda53ad..0af7cd101277 100644 --- a/js/src/jit/BaselineIC.cpp +++ b/js/src/jit/BaselineIC.cpp @@ -3598,6 +3598,12 @@ TryAttachGetElemStub(JSContext *cx, HandleScript script, ICGetElem_Fallback *stu if (!obj->isNative() && !obj->is()) stub->noteNonNativeAccess(); + // GetElem operations which could access negative indexes generally can't + // be optimized without the potential for bailouts, as we can't statically + // determine that an object has no properties on such indexes. + if (rhs.isNumber() && rhs.toNumber() < 0) + stub->noteNegativeIndex(); + return true; } diff --git a/js/src/jit/BaselineIC.h b/js/src/jit/BaselineIC.h index 7417ead70301..2ec65bd40a48 100644 --- a/js/src/jit/BaselineIC.h +++ b/js/src/jit/BaselineIC.h @@ -2787,6 +2787,9 @@ class ICGetElem_Fallback : public ICMonitoredFallbackStub : ICMonitoredFallbackStub(ICStub::GetElem_Fallback, stubCode) { } + static const uint16_t EXTRA_NON_NATIVE = 0x1; + static const uint16_t EXTRA_NEGATIVE_INDEX = 0x2; + public: static const uint32_t MAX_OPTIMIZED_STUBS = 16; @@ -2797,10 +2800,17 @@ class ICGetElem_Fallback : public ICMonitoredFallbackStub } void noteNonNativeAccess() { - extra_ = 1; + extra_ |= EXTRA_NON_NATIVE; } bool hasNonNativeAccess() const { - return extra_; + return extra_ & EXTRA_NON_NATIVE; + } + + void noteNegativeIndex() { + extra_ |= EXTRA_NEGATIVE_INDEX; + } + bool hasNegativeIndex() const { + return extra_ & EXTRA_NEGATIVE_INDEX; } // Compiler for this stub kind. diff --git a/js/src/jit/BaselineInspector.cpp b/js/src/jit/BaselineInspector.cpp index 94ca8ad114fb..a0cd4eca4a74 100644 --- a/js/src/jit/BaselineInspector.cpp +++ b/js/src/jit/BaselineInspector.cpp @@ -303,6 +303,20 @@ BaselineInspector::hasSeenNonNativeGetElement(jsbytecode *pc) return false; } +bool +BaselineInspector::hasSeenNegativeIndexGetElement(jsbytecode *pc) +{ + if (!hasBaselineScript()) + return false; + + const ICEntry &entry = icEntryFromPC(pc); + ICStub *stub = entry.fallbackStub(); + + if (stub->isGetElem_Fallback()) + return stub->toGetElem_Fallback()->hasNegativeIndex(); + return false; +} + bool BaselineInspector::hasSeenAccessedGetter(jsbytecode *pc) { diff --git a/js/src/jit/BaselineInspector.h b/js/src/jit/BaselineInspector.h index c2772ad45035..81a09dff8706 100644 --- a/js/src/jit/BaselineInspector.h +++ b/js/src/jit/BaselineInspector.h @@ -104,6 +104,7 @@ class BaselineInspector MIRType expectedBinaryArithSpecialization(jsbytecode *pc); bool hasSeenNonNativeGetElement(jsbytecode *pc); + bool hasSeenNegativeIndexGetElement(jsbytecode *pc); bool hasSeenAccessedGetter(jsbytecode *pc); bool hasSeenDoubleResult(jsbytecode *pc); }; diff --git a/js/src/jit/CodeGenerator.cpp b/js/src/jit/CodeGenerator.cpp index fcf338f26719..32b83aeaa3a6 100644 --- a/js/src/jit/CodeGenerator.cpp +++ b/js/src/jit/CodeGenerator.cpp @@ -6433,6 +6433,8 @@ CodeGenerator::visitLoadElementHole(LLoadElementHole *lir) Register initLength = ToRegister(lir->initLength()); const ValueOperand out = ToOutValue(lir); + const MLoadElementHole *mir = lir->mir(); + // If the index is out of bounds, load |undefined|. Otherwise, load the // value. Label undefined, done; @@ -6452,6 +6454,19 @@ CodeGenerator::visitLoadElementHole(LLoadElementHole *lir) masm.jump(&done); masm.bind(&undefined); + + if (mir->needsNegativeIntCheck()) { + if (lir->index()->isConstant()) { + if (ToInt32(lir->index()) < 0 && !bailout(lir->snapshot())) + return false; + } else { + Label negative; + masm.branch32(Assembler::LessThan, ToRegister(lir->index()), Imm32(0), &negative); + if (!bailoutFrom(&negative, lir->snapshot())) + return false; + } + } + masm.moveValue(UndefinedValue(), out); masm.bind(&done); return true; diff --git a/js/src/jit/IonBuilder.cpp b/js/src/jit/IonBuilder.cpp index 9eab8d3a54a2..0745e5b6cc6c 100644 --- a/js/src/jit/IonBuilder.cpp +++ b/js/src/jit/IonBuilder.cpp @@ -6465,6 +6465,11 @@ IonBuilder::getElemTryDense(bool *emitted, MDefinition *obj, MDefinition *index) if (ElementAccessHasExtraIndexedProperty(cx, obj) && failedBoundsCheck_) return true; + // Don't generate a fast path if this pc has seen negative indexes accessed, + // which will not appear to be extra indexed properties. + if (inspector->hasSeenNegativeIndexGetElement(pc)) + return true; + // Emit dense getelem variant. if (!jsop_getelem_dense(obj, index)) return false; diff --git a/js/src/jit/Lowering.cpp b/js/src/jit/Lowering.cpp index 378c15dcdb36..4beec7b7e573 100644 --- a/js/src/jit/Lowering.cpp +++ b/js/src/jit/Lowering.cpp @@ -2068,6 +2068,8 @@ LIRGenerator::visitLoadElementHole(MLoadElementHole *ins) LLoadElementHole *lir = new LLoadElementHole(useRegister(ins->elements()), useRegisterOrConstant(ins->index()), useRegister(ins->initLength())); + if (ins->needsNegativeIntCheck() && !assignSnapshot(lir)) + return false; return defineBox(lir, ins); } diff --git a/js/src/jit/MIR.h b/js/src/jit/MIR.h index d27a4dfd63b9..548a3be07bb7 100644 --- a/js/src/jit/MIR.h +++ b/js/src/jit/MIR.h @@ -4821,10 +4821,12 @@ class MLoadElementHole : public MTernaryInstruction, public SingleObjectPolicy { + bool needsNegativeIntCheck_; bool needsHoleCheck_; MLoadElementHole(MDefinition *elements, MDefinition *index, MDefinition *initLength, bool needsHoleCheck) : MTernaryInstruction(elements, index, initLength), + needsNegativeIntCheck_(true), needsHoleCheck_(needsHoleCheck) { setResultType(MIRType_Value); @@ -4854,12 +4856,16 @@ class MLoadElementHole MDefinition *initLength() const { return getOperand(2); } + bool needsNegativeIntCheck() const { + return needsNegativeIntCheck_; + } bool needsHoleCheck() const { return needsHoleCheck_; } AliasSet getAliasSet() const { return AliasSet::Load(AliasSet::Element); } + void collectRangeInfo(); }; class MStoreElementCommon diff --git a/js/src/jit/RangeAnalysis.cpp b/js/src/jit/RangeAnalysis.cpp index c1e031fb5191..d8e710996513 100644 --- a/js/src/jit/RangeAnalysis.cpp +++ b/js/src/jit/RangeAnalysis.cpp @@ -2005,6 +2005,12 @@ MInArray::collectRangeInfo() needsNegativeIntCheck_ = !index()->range() || index()->range()->lower() < 0; } +void +MLoadElementHole::collectRangeInfo() +{ + needsNegativeIntCheck_ = !index()->range() || index()->range()->lower() < 0; +} + void MMod::collectRangeInfo() { From 2d5c9eeeb003a1d134f855c4d72fb9e634572080 Mon Sep 17 00:00:00 2001 From: Patrick McManus Date: Wed, 21 Aug 2013 21:01:19 -0400 Subject: [PATCH 34/79] bug 907960 - backout 905460 r=backout --- netwerk/protocol/http/nsHttpConnectionMgr.cpp | 92 ++++++++++--------- netwerk/protocol/http/nsHttpConnectionMgr.h | 6 +- netwerk/protocol/http/nsHttpHandler.cpp | 20 +++- netwerk/protocol/http/nsHttpHandler.h | 2 +- netwerk/protocol/http/nsHttpPipeline.cpp | 10 +- netwerk/protocol/http/nsHttpPipeline.h | 2 +- netwerk/protocol/http/nsHttpTransaction.cpp | 16 +++- netwerk/protocol/http/nsHttpTransaction.h | 7 +- 8 files changed, 89 insertions(+), 66 deletions(-) diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.cpp b/netwerk/protocol/http/nsHttpConnectionMgr.cpp index 636e35e92e63..c2f2865ac1cf 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.cpp +++ b/netwerk/protocol/http/nsHttpConnectionMgr.cpp @@ -270,39 +270,39 @@ nsHttpConnectionMgr::Observe(nsISupports *subject, //----------------------------------------------------------------------------- nsresult -nsHttpConnectionMgr::AddTransaction(nsHttpTransaction *aTrans, int32_t priority) +nsHttpConnectionMgr::AddTransaction(nsHttpTransaction *trans, int32_t priority) { - LOG(("nsHttpConnectionMgr::AddTransaction [trans=%x %d]\n", aTrans, priority)); + LOG(("nsHttpConnectionMgr::AddTransaction [trans=%x %d]\n", trans, priority)); - nsRefPtr trans(aTrans); + NS_ADDREF(trans); nsresult rv = PostEvent(&nsHttpConnectionMgr::OnMsgNewTransaction, priority, trans); - if (NS_SUCCEEDED(rv)) - trans.forget(); + if (NS_FAILED(rv)) + NS_RELEASE(trans); return rv; } nsresult -nsHttpConnectionMgr::RescheduleTransaction(nsHttpTransaction *aTrans, int32_t priority) +nsHttpConnectionMgr::RescheduleTransaction(nsHttpTransaction *trans, int32_t priority) { - LOG(("nsHttpConnectionMgr::RescheduleTransaction [trans=%x %d]\n", aTrans, priority)); + LOG(("nsHttpConnectionMgr::RescheduleTransaction [trans=%x %d]\n", trans, priority)); - nsRefPtr trans(aTrans); + NS_ADDREF(trans); nsresult rv = PostEvent(&nsHttpConnectionMgr::OnMsgReschedTransaction, priority, trans); - if (NS_SUCCEEDED(rv)) - trans.forget(); + if (NS_FAILED(rv)) + NS_RELEASE(trans); return rv; } nsresult -nsHttpConnectionMgr::CancelTransaction(nsHttpTransaction *aTrans, nsresult reason) +nsHttpConnectionMgr::CancelTransaction(nsHttpTransaction *trans, nsresult reason) { - LOG(("nsHttpConnectionMgr::CancelTransaction [trans=%x reason=%x]\n", aTrans, reason)); + LOG(("nsHttpConnectionMgr::CancelTransaction [trans=%x reason=%x]\n", trans, reason)); - nsRefPtr trans(aTrans); + NS_ADDREF(trans); nsresult rv = PostEvent(&nsHttpConnectionMgr::OnMsgCancelTransaction, static_cast(reason), trans); - if (NS_SUCCEEDED(rv)) - trans.forget(); + if (NS_FAILED(rv)) + NS_RELEASE(trans); return rv; } @@ -359,14 +359,14 @@ nsHttpConnectionMgr::GetSocketThreadTarget(nsIEventTarget **target) } nsresult -nsHttpConnectionMgr::ReclaimConnection(nsHttpConnection *aConn) +nsHttpConnectionMgr::ReclaimConnection(nsHttpConnection *conn) { - LOG(("nsHttpConnectionMgr::ReclaimConnection [conn=%x]\n", aConn)); + LOG(("nsHttpConnectionMgr::ReclaimConnection [conn=%x]\n", conn)); - nsRefPtr conn(aConn); + NS_ADDREF(conn); nsresult rv = PostEvent(&nsHttpConnectionMgr::OnMsgReclaimConnection, 0, conn); - if (NS_SUCCEEDED(rv)) - conn.forget(); + if (NS_FAILED(rv)) + NS_RELEASE(conn); return rv; } @@ -405,14 +405,14 @@ nsHttpConnectionMgr::UpdateParam(nsParamName name, uint16_t value) } nsresult -nsHttpConnectionMgr::ProcessPendingQ(nsHttpConnectionInfo *aCI) +nsHttpConnectionMgr::ProcessPendingQ(nsHttpConnectionInfo *ci) { - LOG(("nsHttpConnectionMgr::ProcessPendingQ [ci=%s]\n", aCI->HashKey().get())); + LOG(("nsHttpConnectionMgr::ProcessPendingQ [ci=%s]\n", ci->HashKey().get())); - nsRefPtr ci(aCI); + NS_ADDREF(ci); nsresult rv = PostEvent(&nsHttpConnectionMgr::OnMsgProcessPendingQ, 0, ci); - if (NS_SUCCEEDED(rv)) - ci.forget(); + if (NS_FAILED(rv)) + NS_RELEASE(ci); return rv; } @@ -2090,12 +2090,12 @@ nsHttpConnectionMgr::OnMsgNewTransaction(int32_t priority, void *param) { LOG(("nsHttpConnectionMgr::OnMsgNewTransaction [trans=%p]\n", param)); - nsRefPtr trans = - dont_AddRef(static_cast(param)); + nsHttpTransaction *trans = (nsHttpTransaction *) param; trans->SetPriority(priority); nsresult rv = ProcessNewTransaction(trans); if (NS_FAILED(rv)) trans->Close(rv); // for whatever its worth + NS_RELEASE(trans); } void @@ -2104,8 +2104,7 @@ nsHttpConnectionMgr::OnMsgReschedTransaction(int32_t priority, void *param) MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread); LOG(("nsHttpConnectionMgr::OnMsgReschedTransaction [trans=%p]\n", param)); - nsRefPtr trans = - dont_AddRef(static_cast(param)); + nsHttpTransaction *trans = (nsHttpTransaction *) param; trans->SetPriority(priority); nsConnectionEntry *ent = LookupConnectionEntry(trans->ConnectionInfo(), @@ -2118,6 +2117,8 @@ nsHttpConnectionMgr::OnMsgReschedTransaction(int32_t priority, void *param) InsertTransactionSorted(ent->mPendingQ, trans); } } + + NS_RELEASE(trans); } void @@ -2127,8 +2128,7 @@ nsHttpConnectionMgr::OnMsgCancelTransaction(int32_t reason, void *param) LOG(("nsHttpConnectionMgr::OnMsgCancelTransaction [trans=%p]\n", param)); nsresult closeCode = static_cast(reason); - nsRefPtr trans = - dont_AddRef(static_cast(param)); + nsHttpTransaction *trans = (nsHttpTransaction *) param; // // if the transaction owns a connection and the transaction is not done, // then ask the connection to close the transaction. otherwise, close the @@ -2151,14 +2151,14 @@ nsHttpConnectionMgr::OnMsgCancelTransaction(int32_t reason, void *param) } trans->Close(closeCode); } + NS_RELEASE(trans); } void nsHttpConnectionMgr::OnMsgProcessPendingQ(int32_t, void *param) { MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread); - nsRefPtr ci = - dont_AddRef(static_cast(param)); + nsHttpConnectionInfo *ci = (nsHttpConnectionInfo *) param; if (!ci) { LOG(("nsHttpConnectionMgr::OnMsgProcessPendingQ [ci=nullptr]\n")); @@ -2177,6 +2177,8 @@ nsHttpConnectionMgr::OnMsgProcessPendingQ(int32_t, void *param) // for the specified connection info. walk the connection table... mCT.Enumerate(ProcessOneTransactionCB, this); } + + NS_RELEASE(ci); } void @@ -2214,8 +2216,7 @@ nsHttpConnectionMgr::OnMsgReclaimConnection(int32_t, void *param) MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread); LOG(("nsHttpConnectionMgr::OnMsgReclaimConnection [conn=%p]\n", param)); - nsRefPtr conn = - dont_AddRef(static_cast(param)); + nsHttpConnection *conn = (nsHttpConnection *) param; // // 1) remove the connection from the active list @@ -2225,16 +2226,16 @@ nsHttpConnectionMgr::OnMsgReclaimConnection(int32_t, void *param) nsConnectionEntry *ent = LookupConnectionEntry(conn->ConnectionInfo(), conn, nullptr); - nsRefPtr ci; + nsHttpConnectionInfo *ci = nullptr; if (!ent) { // this should never happen LOG(("nsHttpConnectionMgr::OnMsgReclaimConnection ent == null\n")); MOZ_ASSERT(false, "no connection entry"); - ci = conn->ConnectionInfo(); + NS_ADDREF(ci = conn->ConnectionInfo()); } else { - ci = ent->mConnInfo; + NS_ADDREF(ci = ent->mConnInfo); // If the connection is in the active list, remove that entry // and the reference held by the mActiveConns list. @@ -2254,9 +2255,8 @@ nsHttpConnectionMgr::OnMsgReclaimConnection(int32_t, void *param) if (ent->mActiveConns.RemoveElement(conn)) { if (conn == ent->mYellowConnection) ent->OnYellowComplete(); - - // drop a reference that was held by list - conn.get()->Release(); + nsHttpConnection *temp = conn; + NS_RELEASE(temp); DecrementActiveConnCount(conn); ConditionallyStopTimeoutTick(); } @@ -2277,8 +2277,7 @@ nsHttpConnectionMgr::OnMsgReclaimConnection(int32_t, void *param) break; } - // manually add a ref to the connection when it is in the list - conn.get()->AddRef(); + NS_ADDREF(conn); ent->mIdleConns.InsertElementAt(idx, conn); mNumIdleConns++; conn->BeginIdleMonitoring(); @@ -2296,7 +2295,8 @@ nsHttpConnectionMgr::OnMsgReclaimConnection(int32_t, void *param) } } - OnMsgProcessPendingQ(0, ci.forget().get()); // releases |ci| + OnMsgProcessPendingQ(0, ci); // releases |ci| + NS_RELEASE(conn); } void @@ -2359,6 +2359,8 @@ nsHttpConnectionMgr::nsConnectionEntry::~nsConnectionEntry() { if (mSpdyPreferred) gHttpHandler->ConnMgr()->RemoveSpdyPreferredEnt(mCoalescingKey); + + NS_RELEASE(mConnInfo); } void @@ -2469,6 +2471,7 @@ nsHttpConnectionMgr::nsConnectionHandle::~nsConnectionHandle() { if (mConn) { gHttpHandler->ReclaimConnection(mConn); + NS_RELEASE(mConn); } } @@ -3094,6 +3097,7 @@ nsConnectionEntry::nsConnectionEntry(nsHttpConnectionInfo *ci) , mPreferIPv4(false) , mPreferIPv6(false) { + NS_ADDREF(mConnInfo); if (gHttpHandler->GetPipelineAggressive()) { mGreenDepth = kPipelineUnlimited; mPipelineState = PS_GREEN; diff --git a/netwerk/protocol/http/nsHttpConnectionMgr.h b/netwerk/protocol/http/nsHttpConnectionMgr.h index da16d8b0e35a..9e539286d414 100644 --- a/netwerk/protocol/http/nsHttpConnectionMgr.h +++ b/netwerk/protocol/http/nsHttpConnectionMgr.h @@ -273,7 +273,7 @@ private: nsConnectionEntry(nsHttpConnectionInfo *ci); ~nsConnectionEntry(); - nsRefPtr mConnInfo; + nsHttpConnectionInfo *mConnInfo; nsTArray mPendingQ; // pending transaction queue nsTArray mActiveConns; // active connections nsTArray mIdleConns; // idle persistent connections @@ -393,10 +393,10 @@ private: NS_DECL_THREADSAFE_ISUPPORTS NS_DECL_NSAHTTPCONNECTION(mConn) - nsConnectionHandle(nsHttpConnection *conn) : mConn(conn) { } + nsConnectionHandle(nsHttpConnection *conn) { NS_ADDREF(mConn = conn); } virtual ~nsConnectionHandle(); - nsRefPtr mConn; + nsHttpConnection *mConn; }; // nsHalfOpenSocket is used to hold the state of an opening TCP socket diff --git a/netwerk/protocol/http/nsHttpHandler.cpp b/netwerk/protocol/http/nsHttpHandler.cpp index d143239afd0e..2ff39548fffc 100644 --- a/netwerk/protocol/http/nsHttpHandler.cpp +++ b/netwerk/protocol/http/nsHttpHandler.cpp @@ -121,14 +121,19 @@ NewURI(const nsACString &aSpec, int32_t aDefaultPort, nsIURI **aURI) { - nsRefPtr url = new nsStandardURL(); + nsStandardURL *url = new nsStandardURL(); + if (!url) + return NS_ERROR_OUT_OF_MEMORY; + NS_ADDREF(url); nsresult rv = url->Init(nsIStandardURL::URLTYPE_AUTHORITY, aDefaultPort, aSpec, aCharset, aBaseURI); if (NS_FAILED(rv)) { + NS_RELEASE(url); return rv; } - url.forget(aURI); + + *aURI = url; // no QI needed return NS_OK; } @@ -139,7 +144,8 @@ NewURI(const nsACString &aSpec, nsHttpHandler *gHttpHandler = nullptr; nsHttpHandler::nsHttpHandler() - : mHttpVersion(NS_HTTP_VERSION_1_1) + : mConnMgr(nullptr) + , mHttpVersion(NS_HTTP_VERSION_1_1) , mProxyHttpVersion(NS_HTTP_VERSION_1_1) , mCapabilities(NS_HTTP_ALLOW_KEEPALIVE) , mReferrerLevel(0xff) // by default we always send a referrer @@ -218,7 +224,7 @@ nsHttpHandler::~nsHttpHandler() // make sure the connection manager is shutdown if (mConnMgr) { mConnMgr->Shutdown(); - mConnMgr = nullptr; + NS_RELEASE(mConnMgr); } // Note: don't call NeckoChild::DestroyNeckoChild() here, as it's too late @@ -374,8 +380,12 @@ nsHttpHandler::InitConnectionMgr() { nsresult rv; - if (!mConnMgr) + if (!mConnMgr) { mConnMgr = new nsHttpConnectionMgr(); + if (!mConnMgr) + return NS_ERROR_OUT_OF_MEMORY; + NS_ADDREF(mConnMgr); + } rv = mConnMgr->Init(mMaxConnections, mMaxPersistentConnectionsPerServer, diff --git a/netwerk/protocol/http/nsHttpHandler.h b/netwerk/protocol/http/nsHttpHandler.h index e78ab1153c6a..dc419dbbe4fa 100644 --- a/netwerk/protocol/http/nsHttpHandler.h +++ b/netwerk/protocol/http/nsHttpHandler.h @@ -315,7 +315,7 @@ private: nsHttpAuthCache mPrivateAuthCache; // the connection manager - nsRefPtr mConnMgr; + nsHttpConnectionMgr *mConnMgr; // // prefs diff --git a/netwerk/protocol/http/nsHttpPipeline.cpp b/netwerk/protocol/http/nsHttpPipeline.cpp index dde16a709783..e7c04a46002b 100644 --- a/netwerk/protocol/http/nsHttpPipeline.cpp +++ b/netwerk/protocol/http/nsHttpPipeline.cpp @@ -63,7 +63,8 @@ private: //----------------------------------------------------------------------------- nsHttpPipeline::nsHttpPipeline() - : mStatus(NS_OK) + : mConnection(nullptr) + , mStatus(NS_OK) , mRequestIsPartial(false) , mResponseIsPartial(false) , mClosed(false) @@ -83,6 +84,8 @@ nsHttpPipeline::~nsHttpPipeline() // make sure we aren't still holding onto any transactions! Close(NS_ERROR_ABORT); + NS_IF_RELEASE(mConnection); + if (mPushBackBuf) free(mPushBackBuf); } @@ -407,13 +410,14 @@ nsHttpPipeline::SetConnection(nsAHttpConnection *conn) MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread); MOZ_ASSERT(!mConnection, "already have a connection"); - mConnection = conn; + + NS_IF_ADDREF(mConnection = conn); } nsAHttpConnection * nsHttpPipeline::Connection() { - LOG(("nsHttpPipeline::Connection [this=%p conn=%x]\n", this, mConnection.get())); + LOG(("nsHttpPipeline::Connection [this=%p conn=%x]\n", this, mConnection)); MOZ_ASSERT(PR_GetCurrentThread() == gSocketThread); return mConnection; diff --git a/netwerk/protocol/http/nsHttpPipeline.h b/netwerk/protocol/http/nsHttpPipeline.h index 4c41a5c3a0a1..8570e83ca9d9 100644 --- a/netwerk/protocol/http/nsHttpPipeline.h +++ b/netwerk/protocol/http/nsHttpPipeline.h @@ -52,7 +52,7 @@ private: // overload of nsAHttpTransaction::QueryPipeline() nsHttpPipeline *QueryPipeline(); - nsRefPtr mConnection; + nsAHttpConnection *mConnection; nsTArray mRequestQ; // array of transactions nsTArray mResponseQ; // array of transactions nsresult mStatus; diff --git a/netwerk/protocol/http/nsHttpTransaction.cpp b/netwerk/protocol/http/nsHttpTransaction.cpp index b1a160387843..2f0519e9be29 100644 --- a/netwerk/protocol/http/nsHttpTransaction.cpp +++ b/netwerk/protocol/http/nsHttpTransaction.cpp @@ -82,6 +82,8 @@ LogHeaders(const char *lineStart) nsHttpTransaction::nsHttpTransaction() : mCallbacksLock("transaction mCallbacks lock") , mRequestSize(0) + , mConnection(nullptr) + , mConnInfo(nullptr) , mRequestHead(nullptr) , mResponseHead(nullptr) , mContentLength(-1) @@ -135,6 +137,9 @@ nsHttpTransaction::~nsHttpTransaction() // Force the callbacks to be released right now mCallbacks = nullptr; + NS_IF_RELEASE(mConnection); + NS_IF_RELEASE(mConnInfo); + delete mResponseHead; delete mForTakeResponseHead; delete mChunkedDecoder; @@ -227,7 +232,7 @@ nsHttpTransaction::Init(uint32_t caps, !activityDistributorActive); if (NS_FAILED(rv)) return rv; - mConnInfo = cinfo; + NS_ADDREF(mConnInfo = cinfo); mCallbacks = callbacks; mConsumerTarget = target; mCaps = caps; @@ -403,7 +408,8 @@ nsHttpTransaction::TakeSubTransactions( void nsHttpTransaction::SetConnection(nsAHttpConnection *conn) { - mConnection = conn; + NS_IF_RELEASE(mConnection); + NS_IF_ADDREF(mConnection = conn); if (conn) { MOZ_EVENT_TRACER_EXEC(static_cast(this), @@ -818,8 +824,8 @@ nsHttpTransaction::Close(nsresult reason) mTimings.responseEnd.IsNull() && !mTimings.responseStart.IsNull()) mTimings.responseEnd = TimeStamp::Now(); - if (relConn) - mConnection = nullptr; + if (relConn && mConnection) + NS_RELEASE(mConnection); mStatus = reason; mTransactionDone = true; // forcibly flag the transaction as complete @@ -952,7 +958,7 @@ nsHttpTransaction::Restart() // clear old connection state... mSecurityInfo = 0; - mConnection = nullptr; + NS_IF_RELEASE(mConnection); // disable pipelining for the next attempt in case pipelining caused the // reset. this is being overly cautious since we don't know if pipelining diff --git a/netwerk/protocol/http/nsHttpTransaction.h b/netwerk/protocol/http/nsHttpTransaction.h index 3b5913d561f5..f0b61a2f44f2 100644 --- a/netwerk/protocol/http/nsHttpTransaction.h +++ b/netwerk/protocol/http/nsHttpTransaction.h @@ -180,11 +180,10 @@ private: nsCOMPtr mRequestStream; uint64_t mRequestSize; - nsRefPtr mConnInfo; - nsRefPtr mConnection; - + nsAHttpConnection *mConnection; // hard ref + nsHttpConnectionInfo *mConnInfo; // hard ref nsHttpRequestHead *mRequestHead; // weak ref - nsHttpResponseHead *mResponseHead; // owning ref + nsHttpResponseHead *mResponseHead; // hard ref nsAHttpSegmentReader *mReader; nsAHttpSegmentWriter *mWriter; From 166bf211b327631c9863819c10dac758ac03b78f Mon Sep 17 00:00:00 2001 From: Guillaume Abadie Date: Wed, 21 Aug 2013 21:11:03 -0400 Subject: [PATCH 35/79] bug 903480 - [WebGL 2.0] implement TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN - r=jgilbert --- content/canvas/src/WebGLContext.cpp | 6 ++- content/canvas/src/WebGLContext.h | 6 ++- .../canvas/src/WebGLContextAsyncQueries.cpp | 53 ++++++++++++++----- dom/base/nsWrapperCache.h | 46 ++++++++++++++++ dom/webidl/WebGL2RenderingContext.webidl | 3 ++ 5 files changed, 96 insertions(+), 18 deletions(-) diff --git a/content/canvas/src/WebGLContext.cpp b/content/canvas/src/WebGLContext.cpp index 9e810a6d2a02..c2dead52a94a 100644 --- a/content/canvas/src/WebGLContext.cpp +++ b/content/canvas/src/WebGLContext.cpp @@ -1596,17 +1596,19 @@ WebGLContext::GetSupportedExtensions(JSContext *cx, Nullable< nsTArray NS_IMPL_CYCLE_COLLECTING_ADDREF(WebGLContext) NS_IMPL_CYCLE_COLLECTING_RELEASE(WebGLContext) -NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_10(WebGLContext, +NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_12(WebGLContext, mCanvasElement, mExtensions, mBound2DTextures, mBoundCubeMapTextures, mBoundArrayBuffer, + mBoundTransformFeedbackBuffer, mCurrentProgram, mBoundFramebuffer, mBoundRenderbuffer, mBoundVertexArray, - mActiveOcclusionQuery) + mActiveOcclusionQuery, + mActiveTransformFeedbackQuery) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(WebGLContext) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY diff --git a/content/canvas/src/WebGLContext.h b/content/canvas/src/WebGLContext.h index d25376bf6183..656cdd28b854 100644 --- a/content/canvas/src/WebGLContext.h +++ b/content/canvas/src/WebGLContext.h @@ -737,7 +737,10 @@ public: JS::Value GetQueryObject(JSContext* cx, WebGLQuery *query, WebGLenum pname); private: - bool ValidateTargetParameter(WebGLenum target, const char* infos); + WebGLRefPtr mActiveOcclusionQuery; + WebGLRefPtr mActiveTransformFeedbackQuery; + + bool ValidateQueryTargetParameter(WebGLenum target, const char* infos); WebGLRefPtr& GetActiveQueryByTarget(WebGLenum target); // ----------------------------------------------------------------------------- @@ -1137,7 +1140,6 @@ protected: WebGLRefPtr mBoundFramebuffer; WebGLRefPtr mBoundRenderbuffer; WebGLRefPtr mBoundVertexArray; - WebGLRefPtr mActiveOcclusionQuery; LinkedList mTextures; LinkedList mBuffers; diff --git a/content/canvas/src/WebGLContextAsyncQueries.cpp b/content/canvas/src/WebGLContextAsyncQueries.cpp index 44e2bff019c0..64726919c892 100644 --- a/content/canvas/src/WebGLContextAsyncQueries.cpp +++ b/content/canvas/src/WebGLContextAsyncQueries.cpp @@ -9,7 +9,7 @@ using namespace mozilla; /* - * We fake ANY_SAMPLES_PASSED and ANY_SAMPLES_PASSED_CONSERVATIVE with + * We fake ANY_SAMPLES_PASSED and ANY_SAMPLES_PASSED_CONSERVATIVE with * SAMPLES_PASSED on desktop. * * OpenGL ES 3.0 spec 4.1.6 @@ -27,6 +27,8 @@ GetQueryTargetEnumString(WebGLenum target) return "ANY_SAMPLES_PASSED"; case LOCAL_GL_ANY_SAMPLES_PASSED_CONSERVATIVE: return "ANY_SAMPLES_PASSED_CONSERVATIVE"; + case LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN: + return "TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN"; default: break; } @@ -111,7 +113,7 @@ WebGLContext::BeginQuery(WebGLenum target, WebGLQuery *query) if (!IsContextStable()) return; - if (!ValidateTargetParameter(target, "beginQuery")) { + if (!ValidateQueryTargetParameter(target, "beginQuery")) { return; } @@ -165,7 +167,11 @@ WebGLContext::BeginQuery(WebGLenum target, WebGLQuery *query) MakeContextCurrent(); - gl->fBeginQuery(SimulateOcclusionQueryTarget(gl, target), query->mGLName); + if (target == LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN) { + gl->fBeginQuery(LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN, query->mGLName); + } else { + gl->fBeginQuery(SimulateOcclusionQueryTarget(gl, target), query->mGLName); + } GetActiveQueryByTarget(target) = query; } @@ -176,7 +182,7 @@ WebGLContext::EndQuery(WebGLenum target) if (!IsContextStable()) return; - if (!ValidateTargetParameter(target, "endQuery")) { + if (!ValidateQueryTargetParameter(target, "endQuery")) { return; } @@ -202,7 +208,11 @@ WebGLContext::EndQuery(WebGLenum target) MakeContextCurrent(); - gl->fEndQuery(SimulateOcclusionQueryTarget(gl, target)); + if (target == LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN) { + gl->fEndQuery(LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN); + } else { + gl->fEndQuery(SimulateOcclusionQueryTarget(gl, target)); + } GetActiveQueryByTarget(target) = nullptr; } @@ -227,7 +237,7 @@ WebGLContext::GetQuery(WebGLenum target, WebGLenum pname) if (!IsContextStable()) return nullptr; - if (!ValidateTargetParameter(target, "getQuery")) { + if (!ValidateQueryTargetParameter(target, "getQuery")) { return nullptr; } @@ -299,6 +309,10 @@ WebGLContext::GetQueryObject(JSContext* cx, WebGLQuery *query, WebGLenum pname) MakeContextCurrent(); gl->fGetQueryObjectuiv(query->mGLName, LOCAL_GL_QUERY_RESULT, &returned); + if (query->mType == LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN) { + return JS::NumberValue(uint32_t(returned)); + } + /* * test (returned != 0) is important because ARB_occlusion_query on desktop drivers * return the number of samples drawed when the OpenGL ES extension @@ -316,23 +330,34 @@ WebGLContext::GetQueryObject(JSContext* cx, WebGLQuery *query, WebGLenum pname) } bool -WebGLContext::ValidateTargetParameter(WebGLenum target, const char* infos) +WebGLContext::ValidateQueryTargetParameter(WebGLenum target, const char* infos) { - if (target != LOCAL_GL_ANY_SAMPLES_PASSED && - target != LOCAL_GL_ANY_SAMPLES_PASSED_CONSERVATIVE) - { - ErrorInvalidEnum("%s: target must be ANY_SAMPLES_PASSED{_CONSERVATIVE}", infos); - return false; + switch (target) { + case LOCAL_GL_ANY_SAMPLES_PASSED: + case LOCAL_GL_ANY_SAMPLES_PASSED_CONSERVATIVE: + case LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN: + return true; } - return true; + ErrorInvalidEnum("%s: unknown query target", infos); + return false; } WebGLRefPtr& WebGLContext::GetActiveQueryByTarget(WebGLenum target) { - MOZ_ASSERT(ValidateTargetParameter(target, "private WebGLContext::GetActiveQueryByTarget")); + MOZ_ASSERT(ValidateQueryTargetParameter(target, "private WebGLContext::GetActiveQueryByTarget")); + switch (target) { + case LOCAL_GL_ANY_SAMPLES_PASSED: + case LOCAL_GL_ANY_SAMPLES_PASSED_CONSERVATIVE: + return mActiveOcclusionQuery; + case LOCAL_GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN: + return mActiveTransformFeedbackQuery; + } + + MOZ_ASSERT(false, "WebGLContext::GetActiveQueryByTarget is not compatible with " + "WebGLContext::ValidateQueryTargetParameter"); return mActiveOcclusionQuery; } diff --git a/dom/base/nsWrapperCache.h b/dom/base/nsWrapperCache.h index 41052db84dfb..21963d71d88b 100644 --- a/dom/base/nsWrapperCache.h +++ b/dom/base/nsWrapperCache.h @@ -656,4 +656,50 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsWrapperCache, NS_WRAPPERCACHE_IID) NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END \ NS_IMPL_CYCLE_COLLECTION_TRACE_WRAPPERCACHE(_class) +#define NS_IMPL_CYCLE_COLLECTION_WRAPPERCACHE_12(_class, \ + _field1, \ + _field2, \ + _field3, \ + _field4, \ + _field5, \ + _field6, \ + _field7, \ + _field8, \ + _field9, \ + _field10, \ + _field11, \ + _field12) \ + NS_IMPL_CYCLE_COLLECTION_CLASS(_class) \ + NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN(_class) \ + NS_IMPL_CYCLE_COLLECTION_UNLINK(_field1) \ + NS_IMPL_CYCLE_COLLECTION_UNLINK(_field2) \ + NS_IMPL_CYCLE_COLLECTION_UNLINK(_field3) \ + NS_IMPL_CYCLE_COLLECTION_UNLINK(_field4) \ + NS_IMPL_CYCLE_COLLECTION_UNLINK(_field5) \ + NS_IMPL_CYCLE_COLLECTION_UNLINK(_field6) \ + NS_IMPL_CYCLE_COLLECTION_UNLINK(_field7) \ + NS_IMPL_CYCLE_COLLECTION_UNLINK(_field8) \ + NS_IMPL_CYCLE_COLLECTION_UNLINK(_field9) \ + NS_IMPL_CYCLE_COLLECTION_UNLINK(_field10) \ + NS_IMPL_CYCLE_COLLECTION_UNLINK(_field11) \ + NS_IMPL_CYCLE_COLLECTION_UNLINK(_field12) \ + NS_IMPL_CYCLE_COLLECTION_UNLINK_PRESERVED_WRAPPER \ + NS_IMPL_CYCLE_COLLECTION_UNLINK_END \ + NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN(_class) \ + NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field1) \ + NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field2) \ + NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field3) \ + NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field4) \ + NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field5) \ + NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field6) \ + NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field7) \ + NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field8) \ + NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field9) \ + NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field10) \ + NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field11) \ + NS_IMPL_CYCLE_COLLECTION_TRAVERSE(_field12) \ + NS_IMPL_CYCLE_COLLECTION_TRAVERSE_SCRIPT_OBJECTS \ + NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END \ + NS_IMPL_CYCLE_COLLECTION_TRACE_WRAPPERCACHE(_class) + #endif /* nsWrapperCache_h___ */ diff --git a/dom/webidl/WebGL2RenderingContext.webidl b/dom/webidl/WebGL2RenderingContext.webidl index 612211e2e031..5851ac49a7f1 100644 --- a/dom/webidl/WebGL2RenderingContext.webidl +++ b/dom/webidl/WebGL2RenderingContext.webidl @@ -77,6 +77,9 @@ interface WebGL2RenderingContext : WebGLRenderingContext { const GLenum TRANSFORM_FEEDBACK_BUFFER_SIZE = 0x8C85; const GLenum MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS = 0x8C8B; + /* transform feedback queries */ + const GLenum TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN = 0x8C88; + /* buffer objects */ void bindBufferBase(GLenum target, GLuint index, WebGLBuffer? buffer); void bindBufferRange(GLenum target, GLuint index, WebGLBuffer? buffer, From 8ac5aa13d64d5a7fb9b0360d2db458b1f99f89f2 Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Wed, 21 Aug 2013 21:52:18 -0400 Subject: [PATCH 36/79] Backed out 2 changesets (bug 893184) for Nexus 4 startup crashes. Backed out changeset e1b2f6bd92c4 (bug 893184) Backed out changeset 560f18fc3ae3 (bug 893184) --- js/src/jsscript.cpp | 19 ++++--------------- js/src/jsscript.h | 15 +++++---------- 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/js/src/jsscript.cpp b/js/src/jsscript.cpp index 7c24ff58f77b..97801aedf378 100644 --- a/js/src/jsscript.cpp +++ b/js/src/jsscript.cpp @@ -637,7 +637,7 @@ js::XDRScript(XDRState *xdr, HandleObject enclosingScope, HandleScript enc code = ssd->data; if (natoms != 0) { script->natoms = natoms; - script->atoms = ssd->atoms(); + script->atoms = ssd->atoms(length, nsrcnotes); } } @@ -1518,26 +1518,15 @@ js::SharedScriptData::new_(ExclusiveContext *cx, uint32_t codeLength, uint32_t baseLength = codeLength + srcnotesLength; uint32_t padding = sizeof(JSAtom *) - baseLength % sizeof(JSAtom *); uint32_t length = baseLength + padding + sizeof(JSAtom *) * natoms; - JS_ASSERT(length % sizeof(JSAtom *) == 0); SharedScriptData *entry = (SharedScriptData *)cx->malloc_(length + offsetof(SharedScriptData, data)); if (!entry) return NULL; - entry->length = length; - entry->natoms = natoms; entry->marked = false; + entry->length = length; memset(entry->data + baseLength, 0, padding); - - /* - * Call constructors to initialize the storage that will be accessed as a - * HeapPtrAtom array via atoms(). - */ - HeapPtrAtom *atoms = entry->atoms(); - for (unsigned i = 0; i < natoms; ++i) - new (&atoms[i]) HeapPtrAtom(); - return entry; } @@ -1585,7 +1574,7 @@ SaveSharedScriptData(ExclusiveContext *cx, Handle script, SharedScri #endif script->code = ssd->data; - script->atoms = ssd->atoms(); + script->atoms = ssd->atoms(script->length, nsrcnotes); return true; } @@ -1929,7 +1918,7 @@ JSScript::fullyInitFromEmitter(ExclusiveContext *cx, HandleScript script, Byteco PodCopy(code + prologLength, bce->code().begin(), mainLength); if (!FinishTakingSrcNotes(cx, bce, (jssrcnote *)(code + script->length))) return false; - InitAtomMap(bce->atomIndices.getMap(), ssd->atoms()); + InitAtomMap(bce->atomIndices.getMap(), ssd->atoms(script->length, nsrcnotes)); if (!SaveSharedScriptData(cx, script, ssd, nsrcnotes)) return false; diff --git a/js/src/jsscript.h b/js/src/jsscript.h index ee20caf4239b..a845c52d50c9 100644 --- a/js/src/jsscript.h +++ b/js/src/jsscript.h @@ -1427,27 +1427,22 @@ CallDestroyScriptHook(FreeOp *fop, JSScript *script); struct SharedScriptData { - uint32_t length; - uint32_t natoms; bool marked; + uint32_t length; jsbytecode data[1]; static SharedScriptData *new_(ExclusiveContext *cx, uint32_t codeLength, uint32_t srcnotesLength, uint32_t natoms); - HeapPtrAtom *atoms() { - if (!natoms) - return NULL; - return reinterpret_cast(data + length - sizeof(JSAtom *) * natoms); + HeapPtrAtom *atoms(uint32_t codeLength, uint32_t srcnotesLength) { + uint32_t length = codeLength + srcnotesLength; + return reinterpret_cast(data + length + sizeof(JSAtom *) - + length % sizeof(JSAtom *)); } static SharedScriptData *fromBytecode(const jsbytecode *bytecode) { return (SharedScriptData *)(bytecode - offsetof(SharedScriptData, data)); } - - private: - SharedScriptData() MOZ_DELETE; - SharedScriptData(const SharedScriptData&) MOZ_DELETE; }; struct ScriptBytecodeHasher From 196b59a54847eed4ee3e40fb9d9e30af2e049e3a Mon Sep 17 00:00:00 2001 From: Masayuki Nakano Date: Thu, 22 Aug 2013 11:31:26 +0900 Subject: [PATCH 37/79] Bug 906281 part.1 Make nsEventStateManager::mClickHoldContextMenu static variable r=smaug --- content/events/src/nsEventStateManager.cpp | 21 ++++++++++----------- content/events/src/nsEventStateManager.h | 1 - 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp index 17d7d053b383..a6e6c91534d5 100644 --- a/content/events/src/nsEventStateManager.cpp +++ b/content/events/src/nsEventStateManager.cpp @@ -115,6 +115,7 @@ static bool sLeftClickOnly = true; static bool sKeyCausesActivation = true; static uint32_t sESMInstanceCount = 0; static int32_t sChromeAccessModifier = 0, sContentAccessModifier = 0; +static bool sClickHoldContextMenu = false; int32_t nsEventStateManager::sUserInputEventDepth = 0; bool nsEventStateManager::sNormalLMouseEventInProcess = false; nsEventStateManager* nsEventStateManager::sActiveESM = nullptr; @@ -681,8 +682,7 @@ nsEventStateManager::nsEventStateManager() mLClickCount(0), mMClickCount(0), mRClickCount(0), - m_haveShutdown(false), - mClickHoldContextMenu(false) + m_haveShutdown(false) { if (sESMInstanceCount == 0) { gUserInteractionTimerCallback = new nsUITimerCallback(); @@ -742,12 +742,11 @@ nsEventStateManager::Init() GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeChrome); sContentAccessModifier = GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeContent); + sClickHoldContextMenu = + Preferences::GetBool("ui.click_hold_context_menus", false); } Preferences::AddWeakObservers(this, kObservedPrefs); - mClickHoldContextMenu = - Preferences::GetBool("ui.click_hold_context_menus", false); - return NS_OK; } @@ -756,7 +755,7 @@ nsEventStateManager::~nsEventStateManager() if (sActiveESM == this) { sActiveESM = nullptr; } - if (mClickHoldContextMenu) + if (sClickHoldContextMenu) KillClickHoldTimer(); if (mDocument == sMouseOverDocument) @@ -837,7 +836,7 @@ nsEventStateManager::Observe(nsISupports *aSubject, sContentAccessModifier = GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeContent); } else if (data.EqualsLiteral("ui.click_hold_context_menus")) { - mClickHoldContextMenu = + sClickHoldContextMenu = Preferences::GetBool("ui.click_hold_context_menus", false); } else if (data.EqualsLiteral("dom.popup_allowed_events")) { nsDOMEvent::PopupAllowedEventsChanged(); @@ -965,7 +964,7 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext, case NS_MOUSE_BUTTON_UP: switch (static_cast(aEvent)->button) { case nsMouseEvent::eLeftButton: - if (mClickHoldContextMenu) { + if (sClickHoldContextMenu) { KillClickHoldTimer(); } #ifndef XP_OS2 @@ -1018,7 +1017,7 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext, FlushPendingEvents(aPresContext); break; case NS_DRAGDROP_GESTURE: - if (mClickHoldContextMenu) { + if (sClickHoldContextMenu) { // an external drag gesture event came in, not generated internally // by Gecko. Make sure we get rid of the click-hold timer. KillClickHoldTimer(); @@ -1900,7 +1899,7 @@ nsEventStateManager::BeginTrackingDragGesture(nsPresContext* aPresContext, mGestureModifiers = inDownEvent->modifiers; mGestureDownButtons = inDownEvent->buttons; - if (mClickHoldContextMenu) { + if (sClickHoldContextMenu) { // fire off a timer to track click-hold CreateClickHoldTimer(aPresContext, inDownFrame, inDownEvent); } @@ -1990,7 +1989,7 @@ nsEventStateManager::GenerateDragGesture(nsPresContext* aPresContext, LayoutDeviceIntPoint::FromUntyped(aEvent->widget->WidgetToScreenOffset()); if (DeprecatedAbs(pt.x - mGestureDownPoint.x) > pixelThresholdX || DeprecatedAbs(pt.y - mGestureDownPoint.y) > pixelThresholdY) { - if (mClickHoldContextMenu) { + if (sClickHoldContextMenu) { // stop the click-hold before we fire off the drag gesture, in case // it takes a long time KillClickHoldTimer(); diff --git a/content/events/src/nsEventStateManager.h b/content/events/src/nsEventStateManager.h index b0eae5f1ef39..1ef5f7951214 100644 --- a/content/events/src/nsEventStateManager.h +++ b/content/events/src/nsEventStateManager.h @@ -784,7 +784,6 @@ public: static void ClearGlobalActiveContent(nsEventStateManager* aClearer); // Functions used for click hold context menus - bool mClickHoldContextMenu; nsCOMPtr mClickHoldTimer; void CreateClickHoldTimer ( nsPresContext* aPresContext, nsIFrame* inDownFrame, nsGUIEvent* inMouseDownEvent ) ; From 94c7b8a98ee707d82aba1c7689f3b725bc32a613 Mon Sep 17 00:00:00 2001 From: Masayuki Nakano Date: Thu, 22 Aug 2013 11:31:26 +0900 Subject: [PATCH 38/79] Bug 906281 part.2 Get rid of "nglayout.events.dispatchLeftClickOnly" due to not used r=smaug --- content/events/src/nsEventStateManager.cpp | 9 --------- modules/libpref/src/init/all.js | 3 --- 2 files changed, 12 deletions(-) diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp index a6e6c91534d5..62cbe3d2424d 100644 --- a/content/events/src/nsEventStateManager.cpp +++ b/content/events/src/nsEventStateManager.cpp @@ -111,7 +111,6 @@ using namespace mozilla::dom; static const LayoutDeviceIntPoint kInvalidRefPoint = LayoutDeviceIntPoint(-1,-1); -static bool sLeftClickOnly = true; static bool sKeyCausesActivation = true; static uint32_t sESMInstanceCount = 0; static int32_t sChromeAccessModifier = 0, sContentAccessModifier = 0; @@ -712,7 +711,6 @@ nsEventStateManager::UpdateUserActivityTimer(void) static const char* kObservedPrefs[] = { "accessibility.accesskeycausesactivation", - "nglayout.events.dispatchLeftClickOnly", "ui.key.generalAccessKey", "ui.key.chromeAccess", "ui.key.contentAccess", @@ -735,9 +733,6 @@ nsEventStateManager::Init() sKeyCausesActivation = Preferences::GetBool("accessibility.accesskeycausesactivation", sKeyCausesActivation); - sLeftClickOnly = - Preferences::GetBool("nglayout.events.dispatchLeftClickOnly", - sLeftClickOnly); sChromeAccessModifier = GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeChrome); sContentAccessModifier = @@ -820,10 +815,6 @@ nsEventStateManager::Observe(nsISupports *aSubject, sKeyCausesActivation = Preferences::GetBool("accessibility.accesskeycausesactivation", sKeyCausesActivation); - } else if (data.EqualsLiteral("nglayout.events.dispatchLeftClickOnly")) { - sLeftClickOnly = - Preferences::GetBool("nglayout.events.dispatchLeftClickOnly", - sLeftClickOnly); } else if (data.EqualsLiteral("ui.key.generalAccessKey")) { sChromeAccessModifier = GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeChrome); diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js index 1d0ca03cf6ac..b7430818a22a 100644 --- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js @@ -475,9 +475,6 @@ pref("view_source.editor.args", ""); // When true this will word-wrap plain text documents. pref("plain_text.wrap_long_lines", false); -// dispatch left clicks only to content in browser (still allows clicks to chrome/xul) -pref("nglayout.events.dispatchLeftClickOnly", true); - // whether or not to draw images while dragging pref("nglayout.enable_drag_images", true); From 71a65ed4babf46c70746e29b0c291ee1643f57fc Mon Sep 17 00:00:00 2001 From: Masayuki Nakano Date: Thu, 22 Aug 2013 11:31:26 +0900 Subject: [PATCH 39/79] Bug 906281 part.3 Create nsEventStateManager::Prefs for capsuling the preferences management r=smaug --- content/events/src/nsEventStateManager.cpp | 158 ++++++++++++--------- content/events/src/nsEventStateManager.h | 28 ++++ 2 files changed, 121 insertions(+), 65 deletions(-) diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp index 62cbe3d2424d..089c826def0c 100644 --- a/content/events/src/nsEventStateManager.cpp +++ b/content/events/src/nsEventStateManager.cpp @@ -111,10 +111,7 @@ using namespace mozilla::dom; static const LayoutDeviceIntPoint kInvalidRefPoint = LayoutDeviceIntPoint(-1,-1); -static bool sKeyCausesActivation = true; static uint32_t sESMInstanceCount = 0; -static int32_t sChromeAccessModifier = 0, sContentAccessModifier = 0; -static bool sClickHoldContextMenu = false; int32_t nsEventStateManager::sUserInputEventDepth = 0; bool nsEventStateManager::sNormalLMouseEventInProcess = false; nsEventStateManager* nsEventStateManager::sActiveESM = nullptr; @@ -709,16 +706,6 @@ nsEventStateManager::UpdateUserActivityTimer(void) return NS_OK; } -static const char* kObservedPrefs[] = { - "accessibility.accesskeycausesactivation", - "ui.key.generalAccessKey", - "ui.key.chromeAccess", - "ui.key.contentAccess", - "ui.click_hold_context_menus", - "dom.popup_allowed_events", - nullptr -}; - nsresult nsEventStateManager::Init() { @@ -730,17 +717,8 @@ nsEventStateManager::Init() observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, true); if (sESMInstanceCount == 1) { - sKeyCausesActivation = - Preferences::GetBool("accessibility.accesskeycausesactivation", - sKeyCausesActivation); - sChromeAccessModifier = - GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeChrome); - sContentAccessModifier = - GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeContent); - sClickHoldContextMenu = - Preferences::GetBool("ui.click_hold_context_menus", false); + Prefs::Init(); } - Preferences::AddWeakObservers(this, kObservedPrefs); return NS_OK; } @@ -750,7 +728,7 @@ nsEventStateManager::~nsEventStateManager() if (sActiveESM == this) { sActiveESM = nullptr; } - if (sClickHoldContextMenu) + if (Prefs::ClickHoldContextMenu()) KillClickHoldTimer(); if (mDocument == sMouseOverDocument) @@ -767,6 +745,7 @@ nsEventStateManager::~nsEventStateManager() gUserInteractionTimer->Cancel(); NS_RELEASE(gUserInteractionTimer); } + Prefs::Shutdown(); WheelPrefs::Shutdown(); DeltaAccumulator::Shutdown(); } @@ -794,7 +773,6 @@ nsEventStateManager::~nsEventStateManager() nsresult nsEventStateManager::Shutdown() { - Preferences::RemoveObservers(this, kObservedPrefs); m_haveShutdown = true; return NS_OK; } @@ -804,34 +782,8 @@ nsEventStateManager::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *someData) { - if (!nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) + if (!nsCRT::strcmp(aTopic, NS_XPCOM_SHUTDOWN_OBSERVER_ID)) { Shutdown(); - else if (!nsCRT::strcmp(aTopic, NS_PREFBRANCH_PREFCHANGE_TOPIC_ID)) { - if (!someData) - return NS_OK; - - nsDependentString data(someData); - if (data.EqualsLiteral("accessibility.accesskeycausesactivation")) { - sKeyCausesActivation = - Preferences::GetBool("accessibility.accesskeycausesactivation", - sKeyCausesActivation); - } else if (data.EqualsLiteral("ui.key.generalAccessKey")) { - sChromeAccessModifier = - GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeChrome); - sContentAccessModifier = - GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeContent); - } else if (data.EqualsLiteral("ui.key.chromeAccess")) { - sChromeAccessModifier = - GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeChrome); - } else if (data.EqualsLiteral("ui.key.contentAccess")) { - sContentAccessModifier = - GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeContent); - } else if (data.EqualsLiteral("ui.click_hold_context_menus")) { - sClickHoldContextMenu = - Preferences::GetBool("ui.click_hold_context_menus", false); - } else if (data.EqualsLiteral("dom.popup_allowed_events")) { - nsDOMEvent::PopupAllowedEventsChanged(); - } } return NS_OK; @@ -955,7 +907,7 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext, case NS_MOUSE_BUTTON_UP: switch (static_cast(aEvent)->button) { case nsMouseEvent::eLeftButton: - if (sClickHoldContextMenu) { + if (Prefs::ClickHoldContextMenu()) { KillClickHoldTimer(); } #ifndef XP_OS2 @@ -1008,7 +960,7 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext, FlushPendingEvents(aPresContext); break; case NS_DRAGDROP_GESTURE: - if (sClickHoldContextMenu) { + if (Prefs::ClickHoldContextMenu()) { // an external drag gesture event came in, not generated internally // by Gecko. Make sure we get rid of the click-hold timer. KillClickHoldTimer(); @@ -1038,8 +990,8 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext, modifierMask |= NS_MODIFIER_OS; // Prevent keyboard scrolling while an accesskey modifier is in use. - if (modifierMask && (modifierMask == sChromeAccessModifier || - modifierMask == sContentAccessModifier)) + if (modifierMask && (modifierMask == Prefs::ChromeAccessModifier() || + modifierMask == Prefs::ContentAccessModifier())) HandleAccessKey(aPresContext, keyEvent, aStatus, nullptr, eAccessKeyProcessingNormal, modifierMask); } @@ -1210,8 +1162,9 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext, return NS_OK; } -static int32_t -GetAccessModifierMask(nsISupports* aDocShell) +// static +int32_t +nsEventStateManager::GetAccessModifierFor(nsISupports* aDocShell) { nsCOMPtr treeItem(do_QueryInterface(aDocShell)); if (!treeItem) @@ -1222,10 +1175,10 @@ GetAccessModifierMask(nsISupports* aDocShell) switch (itemType) { case nsIDocShellTreeItem::typeChrome: - return sChromeAccessModifier; + return Prefs::ChromeAccessModifier(); case nsIDocShellTreeItem::typeContent: - return sContentAccessModifier; + return Prefs::ContentAccessModifier(); default: return -1; // invalid modifier @@ -1304,7 +1257,7 @@ nsEventStateManager::ExecuteAccessKey(nsTArray& aAccessCharCodes, content = mAccessKeys[(start + count) % length]; frame = content->GetPrimaryFrame(); if (IsAccessKeyTarget(content, frame, accessKey)) { - bool shouldActivate = sKeyCausesActivation; + bool shouldActivate = Prefs::KeyCausesActivation(); while (shouldActivate && ++count <= length) { nsIContent *oc = mAccessKeys[(start + count) % length]; nsIFrame *of = oc->GetPrimaryFrame(); @@ -1335,7 +1288,7 @@ nsEventStateManager::GetAccessKeyLabelPrefix(nsAString& aPrefix) nsContentUtils::GetModifierSeparatorText(separator); nsCOMPtr container = mPresContext->GetContainer(); - int32_t modifier = GetAccessModifierMask(container); + int32_t modifier = GetAccessModifierFor(container); if (modifier & NS_MODIFIER_CONTROL) { nsContentUtils::GetControlText(modifierText); @@ -1372,7 +1325,7 @@ nsEventStateManager::HandleAccessKey(nsPresContext* aPresContext, // Alt or other accesskey modifier is down, we may need to do an accesskey if (mAccessKeys.Count() > 0 && - aModifierMask == GetAccessModifierMask(pcContainer)) { + aModifierMask == GetAccessModifierFor(pcContainer)) { // Someone registered an accesskey. Find and activate it. nsAutoTArray accessCharCodes; nsContentUtils::GetAccessKeyCandidates(aEvent, accessCharCodes); @@ -1890,7 +1843,7 @@ nsEventStateManager::BeginTrackingDragGesture(nsPresContext* aPresContext, mGestureModifiers = inDownEvent->modifiers; mGestureDownButtons = inDownEvent->buttons; - if (sClickHoldContextMenu) { + if (Prefs::ClickHoldContextMenu()) { // fire off a timer to track click-hold CreateClickHoldTimer(aPresContext, inDownFrame, inDownEvent); } @@ -1980,7 +1933,7 @@ nsEventStateManager::GenerateDragGesture(nsPresContext* aPresContext, LayoutDeviceIntPoint::FromUntyped(aEvent->widget->WidgetToScreenOffset()); if (DeprecatedAbs(pt.x - mGestureDownPoint.x) > pixelThresholdX || DeprecatedAbs(pt.y - mGestureDownPoint.y) > pixelThresholdY) { - if (sClickHoldContextMenu) { + if (Prefs::ClickHoldContextMenu()) { // stop the click-hold before we fire off the drag gesture, in case // it takes a long time KillClickHoldTimer(); @@ -5575,3 +5528,78 @@ nsEventStateManager::WheelPrefs::IsOverOnePageScrollAllowedY( return Abs(mMultiplierY[index]) >= MIN_MULTIPLIER_VALUE_ALLOWING_OVER_ONE_PAGE_SCROLL; } + +/******************************************************************/ +/* nsEventStateManager::Prefs */ +/******************************************************************/ + +bool nsEventStateManager::Prefs::sKeyCausesActivation = true; +bool nsEventStateManager::Prefs::sClickHoldContextMenu = false; +int32_t nsEventStateManager::Prefs::sChromeAccessModifier = 0; +int32_t nsEventStateManager::Prefs::sContentAccessModifier = 0; + +// static +void +nsEventStateManager::Prefs::Init() +{ + DebugOnly rv = + Preferences::AddBoolVarCache(&sKeyCausesActivation, + "accessibility.accesskeycausesactivation", + sKeyCausesActivation); + MOZ_ASSERT(NS_SUCCEEDED(rv), + "Failed to observe \"accessibility.accesskeycausesactivation\""); + rv = Preferences::AddBoolVarCache(&sClickHoldContextMenu, + "ui.click_hold_context_menus", + sClickHoldContextMenu); + MOZ_ASSERT(NS_SUCCEEDED(rv), + "Failed to observe \"ui.click_hold_context_menus\""); + sChromeAccessModifier = + GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeChrome); + sContentAccessModifier = + GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeContent); + + rv = Preferences::RegisterCallback(OnChange, "ui.key.generalAccessKey"); + MOZ_ASSERT(NS_SUCCEEDED(rv), + "Failed to observe \"ui.key.generalAccessKey\""); + rv = Preferences::RegisterCallback(OnChange, "ui.key.chromeAccess"); + MOZ_ASSERT(NS_SUCCEEDED(rv), + "Failed to observe \"ui.key.chromeAccess\""); + rv = Preferences::RegisterCallback(OnChange, "ui.key.contentAccess"); + MOZ_ASSERT(NS_SUCCEEDED(rv), + "Failed to observe \"ui.key.contentAccess\""); + rv = Preferences::RegisterCallback(OnChange, "dom.popup_allowed_events"); + MOZ_ASSERT(NS_SUCCEEDED(rv), + "Failed to observe \"dom.popup_allowed_events\""); +} + +// static +int +nsEventStateManager::Prefs::OnChange(const char* aPrefName, void*) +{ + nsDependentCString prefName(aPrefName); + if (prefName.EqualsLiteral("ui.key.generalAccessKey")) { + sChromeAccessModifier = + GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeChrome); + sContentAccessModifier = + GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeContent); + } else if (prefName.EqualsLiteral("ui.key.chromeAccess")) { + sChromeAccessModifier = + GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeChrome); + } else if (prefName.EqualsLiteral("ui.key.contentAccess")) { + sContentAccessModifier = + GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeContent); + } else if (prefName.EqualsLiteral("dom.popup_allowed_events")) { + nsDOMEvent::PopupAllowedEventsChanged(); + } + return 0; +} + +// static +void +nsEventStateManager::Prefs::Shutdown() +{ + Preferences::UnregisterCallback(OnChange, "ui.key.generalAccessKey"); + Preferences::UnregisterCallback(OnChange, "ui.key.chromeAccess"); + Preferences::UnregisterCallback(OnChange, "ui.key.contentAccess"); + Preferences::UnregisterCallback(OnChange, "dom.popup_allowed_events"); +} diff --git a/content/events/src/nsEventStateManager.h b/content/events/src/nsEventStateManager.h index 1ef5f7951214..dd65a5c7fe38 100644 --- a/content/events/src/nsEventStateManager.h +++ b/content/events/src/nsEventStateManager.h @@ -217,6 +217,34 @@ public: protected: friend class MouseEnterLeaveDispatcher; + /** + * Prefs class capsules preference management. + */ + class Prefs + { + public: + static bool KeyCausesActivation() { return sKeyCausesActivation; } + static bool ClickHoldContextMenu() { return sClickHoldContextMenu; } + static int32_t ChromeAccessModifier() { return sChromeAccessModifier; } + static int32_t ContentAccessModifier() { return sContentAccessModifier; } + + static void Init(); + static int OnChange(const char* aPrefName, void*); + static void Shutdown(); + + private: + static bool sKeyCausesActivation; + static bool sClickHoldContextMenu; + static int32_t sChromeAccessModifier; + static int32_t sContentAccessModifier; + }; + + /** + * Get appropriate access modifier for the aDocShell. Returns -1 if + * access key isn't available. + */ + static int32_t GetAccessModifierFor(nsISupports* aDocShell); + void UpdateCursor(nsPresContext* aPresContext, nsEvent* aEvent, nsIFrame* aTargetFrame, nsEventStatus* aStatus); /** * Turn a GUI mouse event into a mouse event targeted at the specified From a24a19c1e42b073b260783f4de47ebe831d834ec Mon Sep 17 00:00:00 2001 From: Masayuki Nakano Date: Thu, 22 Aug 2013 11:31:26 +0900 Subject: [PATCH 40/79] Bug 906281 part.4 Use Preferences::AddIntVarCache() for accesskey prefs in nsEventStateManager::Prefs r=smaug --- content/events/src/nsEventStateManager.cpp | 129 +++++++++++---------- content/events/src/nsEventStateManager.h | 15 ++- 2 files changed, 77 insertions(+), 67 deletions(-) diff --git a/content/events/src/nsEventStateManager.cpp b/content/events/src/nsEventStateManager.cpp index 089c826def0c..c6954ffb13f1 100644 --- a/content/events/src/nsEventStateManager.cpp +++ b/content/events/src/nsEventStateManager.cpp @@ -265,30 +265,6 @@ GetDocumentFromWindow(nsIDOMWindow *aWindow) return win ? win->GetExtantDoc() : nullptr; } -static int32_t -GetAccessModifierMaskFromPref(int32_t aItemType) -{ - int32_t accessKey = Preferences::GetInt("ui.key.generalAccessKey", -1); - switch (accessKey) { - case -1: break; // use the individual prefs - case nsIDOMKeyEvent::DOM_VK_SHIFT: return NS_MODIFIER_SHIFT; - case nsIDOMKeyEvent::DOM_VK_CONTROL: return NS_MODIFIER_CONTROL; - case nsIDOMKeyEvent::DOM_VK_ALT: return NS_MODIFIER_ALT; - case nsIDOMKeyEvent::DOM_VK_META: return NS_MODIFIER_META; - case nsIDOMKeyEvent::DOM_VK_WIN: return NS_MODIFIER_OS; - default: return 0; - } - - switch (aItemType) { - case nsIDocShellTreeItem::typeChrome: - return Preferences::GetInt("ui.key.chromeAccess", 0); - case nsIDocShellTreeItem::typeContent: - return Preferences::GetInt("ui.key.contentAccess", 0); - default: - return 0; - } -} - struct DeltaValues { DeltaValues() : deltaX(0.0), deltaY(0.0) {} @@ -990,10 +966,12 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext, modifierMask |= NS_MODIFIER_OS; // Prevent keyboard scrolling while an accesskey modifier is in use. - if (modifierMask && (modifierMask == Prefs::ChromeAccessModifier() || - modifierMask == Prefs::ContentAccessModifier())) + if (modifierMask && + (modifierMask == Prefs::ChromeAccessModifierMask() || + modifierMask == Prefs::ContentAccessModifierMask())) { HandleAccessKey(aPresContext, keyEvent, aStatus, nullptr, eAccessKeyProcessingNormal, modifierMask); + } } // then fall through... case NS_KEY_DOWN: @@ -1164,7 +1142,7 @@ nsEventStateManager::PreHandleEvent(nsPresContext* aPresContext, // static int32_t -nsEventStateManager::GetAccessModifierFor(nsISupports* aDocShell) +nsEventStateManager::GetAccessModifierMaskFor(nsISupports* aDocShell) { nsCOMPtr treeItem(do_QueryInterface(aDocShell)); if (!treeItem) @@ -1175,10 +1153,10 @@ nsEventStateManager::GetAccessModifierFor(nsISupports* aDocShell) switch (itemType) { case nsIDocShellTreeItem::typeChrome: - return Prefs::ChromeAccessModifier(); + return Prefs::ChromeAccessModifierMask(); case nsIDocShellTreeItem::typeContent: - return Prefs::ContentAccessModifier(); + return Prefs::ContentAccessModifierMask(); default: return -1; // invalid modifier @@ -1288,25 +1266,25 @@ nsEventStateManager::GetAccessKeyLabelPrefix(nsAString& aPrefix) nsContentUtils::GetModifierSeparatorText(separator); nsCOMPtr container = mPresContext->GetContainer(); - int32_t modifier = GetAccessModifierFor(container); + int32_t modifierMask = GetAccessModifierMaskFor(container); - if (modifier & NS_MODIFIER_CONTROL) { + if (modifierMask & NS_MODIFIER_CONTROL) { nsContentUtils::GetControlText(modifierText); aPrefix.Append(modifierText + separator); } - if (modifier & NS_MODIFIER_META) { + if (modifierMask & NS_MODIFIER_META) { nsContentUtils::GetMetaText(modifierText); aPrefix.Append(modifierText + separator); } - if (modifier & NS_MODIFIER_OS) { + if (modifierMask & NS_MODIFIER_OS) { nsContentUtils::GetOSText(modifierText); aPrefix.Append(modifierText + separator); } - if (modifier & NS_MODIFIER_ALT) { + if (modifierMask & NS_MODIFIER_ALT) { nsContentUtils::GetAltText(modifierText); aPrefix.Append(modifierText + separator); } - if (modifier & NS_MODIFIER_SHIFT) { + if (modifierMask & NS_MODIFIER_SHIFT) { nsContentUtils::GetShiftText(modifierText); aPrefix.Append(modifierText + separator); } @@ -1325,7 +1303,7 @@ nsEventStateManager::HandleAccessKey(nsPresContext* aPresContext, // Alt or other accesskey modifier is down, we may need to do an accesskey if (mAccessKeys.Count() > 0 && - aModifierMask == GetAccessModifierFor(pcContainer)) { + aModifierMask == GetAccessModifierMaskFor(pcContainer)) { // Someone registered an accesskey. Find and activate it. nsAutoTArray accessCharCodes; nsContentUtils::GetAccessKeyCandidates(aEvent, accessCharCodes); @@ -5535,8 +5513,9 @@ nsEventStateManager::WheelPrefs::IsOverOnePageScrollAllowedY( bool nsEventStateManager::Prefs::sKeyCausesActivation = true; bool nsEventStateManager::Prefs::sClickHoldContextMenu = false; -int32_t nsEventStateManager::Prefs::sChromeAccessModifier = 0; -int32_t nsEventStateManager::Prefs::sContentAccessModifier = 0; +int32_t nsEventStateManager::Prefs::sGenericAccessModifierKey = -1; +int32_t nsEventStateManager::Prefs::sChromeAccessModifierMask = 0; +int32_t nsEventStateManager::Prefs::sContentAccessModifierMask = 0; // static void @@ -5553,20 +5532,22 @@ nsEventStateManager::Prefs::Init() sClickHoldContextMenu); MOZ_ASSERT(NS_SUCCEEDED(rv), "Failed to observe \"ui.click_hold_context_menus\""); - sChromeAccessModifier = - GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeChrome); - sContentAccessModifier = - GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeContent); - - rv = Preferences::RegisterCallback(OnChange, "ui.key.generalAccessKey"); + rv = Preferences::AddIntVarCache(&sGenericAccessModifierKey, + "ui.key.generalAccessKey", + sGenericAccessModifierKey); MOZ_ASSERT(NS_SUCCEEDED(rv), "Failed to observe \"ui.key.generalAccessKey\""); - rv = Preferences::RegisterCallback(OnChange, "ui.key.chromeAccess"); + rv = Preferences::AddIntVarCache(&sChromeAccessModifierMask, + "ui.key.chromeAccess", + sChromeAccessModifierMask); MOZ_ASSERT(NS_SUCCEEDED(rv), "Failed to observe \"ui.key.chromeAccess\""); - rv = Preferences::RegisterCallback(OnChange, "ui.key.contentAccess"); + rv = Preferences::AddIntVarCache(&sContentAccessModifierMask, + "ui.key.contentAccess", + sContentAccessModifierMask); MOZ_ASSERT(NS_SUCCEEDED(rv), "Failed to observe \"ui.key.contentAccess\""); + rv = Preferences::RegisterCallback(OnChange, "dom.popup_allowed_events"); MOZ_ASSERT(NS_SUCCEEDED(rv), "Failed to observe \"dom.popup_allowed_events\""); @@ -5577,18 +5558,7 @@ int nsEventStateManager::Prefs::OnChange(const char* aPrefName, void*) { nsDependentCString prefName(aPrefName); - if (prefName.EqualsLiteral("ui.key.generalAccessKey")) { - sChromeAccessModifier = - GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeChrome); - sContentAccessModifier = - GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeContent); - } else if (prefName.EqualsLiteral("ui.key.chromeAccess")) { - sChromeAccessModifier = - GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeChrome); - } else if (prefName.EqualsLiteral("ui.key.contentAccess")) { - sContentAccessModifier = - GetAccessModifierMaskFromPref(nsIDocShellTreeItem::typeContent); - } else if (prefName.EqualsLiteral("dom.popup_allowed_events")) { + if (prefName.EqualsLiteral("dom.popup_allowed_events")) { nsDOMEvent::PopupAllowedEventsChanged(); } return 0; @@ -5598,8 +5568,45 @@ nsEventStateManager::Prefs::OnChange(const char* aPrefName, void*) void nsEventStateManager::Prefs::Shutdown() { - Preferences::UnregisterCallback(OnChange, "ui.key.generalAccessKey"); - Preferences::UnregisterCallback(OnChange, "ui.key.chromeAccess"); - Preferences::UnregisterCallback(OnChange, "ui.key.contentAccess"); Preferences::UnregisterCallback(OnChange, "dom.popup_allowed_events"); } + +// static +int32_t +nsEventStateManager::Prefs::ChromeAccessModifierMask() +{ + return GetAccessModifierMask(nsIDocShellTreeItem::typeChrome); +} + +// static +int32_t +nsEventStateManager::Prefs::ContentAccessModifierMask() +{ + return GetAccessModifierMask(nsIDocShellTreeItem::typeContent); +} + +// static +int32_t +nsEventStateManager::Prefs::GetAccessModifierMask(int32_t aItemType) +{ + switch (sGenericAccessModifierKey) { + case -1: break; // use the individual prefs + case nsIDOMKeyEvent::DOM_VK_SHIFT: return NS_MODIFIER_SHIFT; + case nsIDOMKeyEvent::DOM_VK_CONTROL: return NS_MODIFIER_CONTROL; + case nsIDOMKeyEvent::DOM_VK_ALT: return NS_MODIFIER_ALT; + case nsIDOMKeyEvent::DOM_VK_META: return NS_MODIFIER_META; + case nsIDOMKeyEvent::DOM_VK_WIN: return NS_MODIFIER_OS; + default: return 0; + } + + switch (aItemType) { + case nsIDocShellTreeItem::typeChrome: + return sChromeAccessModifierMask; + case nsIDocShellTreeItem::typeContent: + return sContentAccessModifierMask; + default: + return 0; + } +} + + diff --git a/content/events/src/nsEventStateManager.h b/content/events/src/nsEventStateManager.h index dd65a5c7fe38..7e19f25d5804 100644 --- a/content/events/src/nsEventStateManager.h +++ b/content/events/src/nsEventStateManager.h @@ -225,8 +225,8 @@ protected: public: static bool KeyCausesActivation() { return sKeyCausesActivation; } static bool ClickHoldContextMenu() { return sClickHoldContextMenu; } - static int32_t ChromeAccessModifier() { return sChromeAccessModifier; } - static int32_t ContentAccessModifier() { return sContentAccessModifier; } + static int32_t ChromeAccessModifierMask(); + static int32_t ContentAccessModifierMask(); static void Init(); static int OnChange(const char* aPrefName, void*); @@ -235,15 +235,18 @@ protected: private: static bool sKeyCausesActivation; static bool sClickHoldContextMenu; - static int32_t sChromeAccessModifier; - static int32_t sContentAccessModifier; + static int32_t sGenericAccessModifierKey; + static int32_t sChromeAccessModifierMask; + static int32_t sContentAccessModifierMask; + + static int32_t GetAccessModifierMask(int32_t aItemType); }; /** - * Get appropriate access modifier for the aDocShell. Returns -1 if + * Get appropriate access modifier mask for the aDocShell. Returns -1 if * access key isn't available. */ - static int32_t GetAccessModifierFor(nsISupports* aDocShell); + static int32_t GetAccessModifierMaskFor(nsISupports* aDocShell); void UpdateCursor(nsPresContext* aPresContext, nsEvent* aEvent, nsIFrame* aTargetFrame, nsEventStatus* aStatus); /** From af8841fe56e3a50d748200072984f7da0a00fc8e Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:29:30 +0200 Subject: [PATCH 41/79] Bug 905747 - Reduce includes in nsXMLHttpRequest.h; r=khuey --- content/base/src/nsXMLHttpRequest.cpp | 35 ++++++++++----------------- content/base/src/nsXMLHttpRequest.h | 28 +++++++-------------- dom/base/nsDOMClassInfo.cpp | 1 + 3 files changed, 23 insertions(+), 41 deletions(-) diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp index cab8cc236077..91aa6a5579f3 100644 --- a/content/base/src/nsXMLHttpRequest.cpp +++ b/content/base/src/nsXMLHttpRequest.cpp @@ -4,16 +4,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "nsXMLHttpRequest.h" + +#include "mozilla/dom/XMLHttpRequestUploadBinding.h" #include "mozilla/MemoryReporting.h" #include "mozilla/Util.h" - -#include "nsXMLHttpRequest.h" -#include "nsISimpleEnumerator.h" -#include "nsIXPConnect.h" +#include "nsDOMBlobBuilder.h" #include "nsICharsetConverterManager.h" +#include "nsIDOMProgressEvent.h" +#include "nsIJARChannel.h" #include "nsLayoutCID.h" -#include "nsXPIDLString.h" #include "nsReadableUtils.h" + #include "nsIURI.h" #include "nsILoadGroup.h" #include "nsNetUtil.h" @@ -23,31 +25,18 @@ #include "nsIUploadChannel2.h" #include "nsIDOMSerializer.h" #include "nsXPCOM.h" -#include "nsISupportsPrimitives.h" #include "nsGUIEvent.h" -#include "prprf.h" #include "nsIDOMEventListener.h" #include "nsIScriptSecurityManager.h" -#include "nsWeakPtr.h" -#include "nsIScriptGlobalObject.h" -#include "nsDOMClassInfoID.h" -#include "nsIDOMElement.h" #include "nsIDOMWindow.h" -#include "nsIMIMEService.h" -#include "nsCExternalHandlerService.h" #include "nsIVariant.h" #include "nsVariant.h" #include "nsIScriptError.h" -#include "xpcpublic.h" -#include "nsStringStream.h" #include "nsIStreamConverterService.h" #include "nsICachingChannel.h" #include "nsContentUtils.h" #include "nsCxPusher.h" #include "nsEventDispatcher.h" -#include "nsDOMJSUtils.h" -#include "nsCOMArray.h" -#include "nsIScriptableUConv.h" #include "nsCycleCollectionParticipant.h" #include "nsIContentPolicy.h" #include "nsContentPolicyUtils.h" @@ -55,11 +44,9 @@ #include "nsLayoutStatics.h" #include "nsCrossSiteListenerProxy.h" #include "nsIHTMLDocument.h" -#include "nsIScriptObjectPrincipal.h" #include "nsIStorageStream.h" #include "nsIPromptFactory.h" #include "nsIWindowWatcher.h" -#include "nsCharSeparatedTokenizer.h" #include "nsIConsoleService.h" #include "nsIChannelPolicy.h" #include "nsChannelPolicy.h" @@ -73,8 +60,6 @@ #include "GeckoProfiler.h" #include "mozilla/dom/EncodingUtils.h" #include "mozilla/dom/XMLHttpRequestBinding.h" -#include "nsIDOMFormData.h" -#include "DictionaryHelpers.h" #include "mozilla/Attributes.h" #include "nsIPermissionManager.h" #include "nsMimeTypes.h" @@ -284,6 +269,12 @@ NS_INTERFACE_MAP_END_INHERITING(nsXHREventTarget) NS_IMPL_ADDREF_INHERITED(nsXMLHttpRequestUpload, nsXHREventTarget) NS_IMPL_RELEASE_INHERITED(nsXMLHttpRequestUpload, nsXHREventTarget) +/* virtual */ JSObject* +nsXMLHttpRequestUpload::WrapObject(JSContext* aCx, JS::Handle aScope) +{ + return XMLHttpRequestUploadBinding::Wrap(aCx, aScope, this); +} + ///////////////////////////////////////////// // // diff --git a/content/base/src/nsXMLHttpRequest.h b/content/base/src/nsXMLHttpRequest.h index 781979ad1f1a..62227d522273 100644 --- a/content/base/src/nsXMLHttpRequest.h +++ b/content/base/src/nsXMLHttpRequest.h @@ -13,36 +13,26 @@ #include "nsString.h" #include "nsIURI.h" #include "nsIHttpChannel.h" -#include "nsIJARChannel.h" #include "nsIDocument.h" #include "nsIStreamListener.h" #include "nsWeakReference.h" -#include "jsapi.h" -#include "nsIScriptContext.h" #include "nsIChannelEventSink.h" #include "nsIAsyncVerifyRedirectCallback.h" #include "nsIInterfaceRequestor.h" #include "nsIHttpHeaderVisitor.h" #include "nsIProgressEventSink.h" -#include "nsCOMArray.h" #include "nsJSUtils.h" #include "nsTArray.h" #include "nsITimer.h" -#include "nsIDOMProgressEvent.h" #include "nsDOMEventTargetHelper.h" -#include "nsDOMFile.h" -#include "nsDOMBlobBuilder.h" #include "nsIPrincipal.h" #include "nsIScriptObjectPrincipal.h" #include "nsISizeOfEventTarget.h" #include "mozilla/Assertions.h" #include "mozilla/MemoryReporting.h" -#include "mozilla/dom/BindingUtils.h" #include "mozilla/dom/TypedArray.h" #include "mozilla/dom/XMLHttpRequestBinding.h" -#include "mozilla/dom/XMLHttpRequestUploadBinding.h" -#include "mozilla/dom/EventHandlerBinding.h" #ifdef Status /* Xlib headers insist on this for some reason... Nuke it because @@ -50,10 +40,13 @@ #undef Status #endif -class nsILoadGroup; class AsyncVerifyRedirectCallbackForwarder; -class nsIUnicodeDecoder; +class BlobSet; +class nsDOMFile; class nsFormData; +class nsIJARChannel; +class nsILoadGroup; +class nsIUnicodeDecoder; class nsXHREventTarget : public nsDOMEventTargetHelper, public nsIXMLHttpRequestEventTarget @@ -82,25 +75,22 @@ public: virtual void DisconnectFromOwner(); }; -class nsXMLHttpRequestUpload : public nsXHREventTarget, - public nsIXMLHttpRequestUpload +class nsXMLHttpRequestUpload MOZ_FINAL : public nsXHREventTarget, + public nsIXMLHttpRequestUpload { public: nsXMLHttpRequestUpload(nsDOMEventTargetHelper* aOwner) { BindToOwner(aOwner); SetIsDOMBinding(); - } + } NS_DECL_ISUPPORTS_INHERITED NS_FORWARD_NSIXMLHTTPREQUESTEVENTTARGET(nsXHREventTarget::) NS_REALLY_FORWARD_NSIDOMEVENTTARGET(nsXHREventTarget) NS_DECL_NSIXMLHTTPREQUESTUPLOAD virtual JSObject* WrapObject(JSContext *cx, - JS::Handle scope) MOZ_OVERRIDE - { - return mozilla::dom::XMLHttpRequestUploadBinding::Wrap(cx, scope, this); - } + JS::Handle scope) MOZ_OVERRIDE; nsISupports* GetParentObject() { return GetOwner(); diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index 392df1c053c9..a826ea8cff4d 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -148,6 +148,7 @@ #include "mozilla/dom/workers/Workers.h" #include "nsIDOMFile.h" +#include "nsDOMBlobBuilder.h" // nsDOMMultipartFile #include "nsIEventListenerService.h" #include "nsIMessageManager.h" From 5869ffd59e70a64b2dfd6d7b61771ae79fef91ff Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:29:57 +0200 Subject: [PATCH 42/79] Bug 905751 - Don't include binding headers in ns{I,DOM}CSSDeclaration.h; r=roc --- editor/libeditor/html/nsHTMLAnonymousUtils.cpp | 1 + layout/style/nsComputedDOMStyle.cpp | 1 + layout/style/nsDOMCSSDeclaration.cpp | 8 ++++++++ layout/style/nsDOMCSSDeclaration.h | 12 +++++------- layout/style/nsICSSDeclaration.h | 5 +++-- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/editor/libeditor/html/nsHTMLAnonymousUtils.cpp b/editor/libeditor/html/nsHTMLAnonymousUtils.cpp index a50bc1346a28..23a7ad7613f9 100644 --- a/editor/libeditor/html/nsHTMLAnonymousUtils.cpp +++ b/editor/libeditor/html/nsHTMLAnonymousUtils.cpp @@ -43,6 +43,7 @@ #include "nsStringFwd.h" #include "nsUnicharUtils.h" #include "nscore.h" +#include "nsContentUtils.h" // for nsAutoScriptBlocker class nsIDOMEventListener; class nsISelection; diff --git a/layout/style/nsComputedDOMStyle.cpp b/layout/style/nsComputedDOMStyle.cpp index 737159aff7bc..6613f64b3159 100644 --- a/layout/style/nsComputedDOMStyle.cpp +++ b/layout/style/nsComputedDOMStyle.cpp @@ -41,6 +41,7 @@ #include "nsDOMCSSDeclaration.h" #include "nsStyleTransformMatrix.h" #include "mozilla/dom/Element.h" +#include "prtime.h" #include "nsWrapperCacheInlines.h" #include diff --git a/layout/style/nsDOMCSSDeclaration.cpp b/layout/style/nsDOMCSSDeclaration.cpp index ef313742abc6..e82a53bd417e 100644 --- a/layout/style/nsDOMCSSDeclaration.cpp +++ b/layout/style/nsDOMCSSDeclaration.cpp @@ -6,10 +6,12 @@ /* base class for DOM objects for element.style and cssStyleRule.style */ #include "nsDOMCSSDeclaration.h" + #include "nsCSSParser.h" #include "nsCSSStyleSheet.h" #include "mozilla/css/Rule.h" #include "mozilla/css/Declaration.h" +#include "mozilla/dom/CSS2PropertiesBinding.h" #include "nsCSSProps.h" #include "nsCOMPtr.h" #include "mozAutoDocUpdate.h" @@ -20,6 +22,12 @@ nsDOMCSSDeclaration::~nsDOMCSSDeclaration() { } +/* virtual */ JSObject* +nsDOMCSSDeclaration::WrapObject(JSContext* aCx, JS::Handle aScope) +{ + return dom::CSS2PropertiesBinding::Wrap(aCx, aScope, this); +} + NS_INTERFACE_TABLE_HEAD(nsDOMCSSDeclaration) NS_INTERFACE_TABLE2(nsDOMCSSDeclaration, nsICSSDeclaration, diff --git a/layout/style/nsDOMCSSDeclaration.h b/layout/style/nsDOMCSSDeclaration.h index 639408804391..862c88d944d4 100644 --- a/layout/style/nsDOMCSSDeclaration.h +++ b/layout/style/nsDOMCSSDeclaration.h @@ -8,13 +8,14 @@ #ifndef nsDOMCSSDeclaration_h___ #define nsDOMCSSDeclaration_h___ -#include "mozilla/Attributes.h" #include "nsICSSDeclaration.h" + +#include "mozilla/Attributes.h" #include "nsCOMPtr.h" -#include "mozilla/dom/CSS2PropertiesBinding.h" class nsIPrincipal; class nsIDocument; +class nsIURI; namespace mozilla { namespace css { @@ -92,11 +93,8 @@ public: virtual void IndexedGetter(uint32_t aIndex, bool& aFound, nsAString& aPropName) MOZ_OVERRIDE; - virtual JSObject* WrapObject(JSContext *cx, - JS::Handle scope) MOZ_OVERRIDE - { - return mozilla::dom::CSS2PropertiesBinding::Wrap(cx, scope, this); - } + virtual JSObject* WrapObject(JSContext* aCx, + JS::Handle aScope) MOZ_OVERRIDE; protected: // This method can return null regardless of the value of aAllocate; diff --git a/layout/style/nsICSSDeclaration.h b/layout/style/nsICSSDeclaration.h index 48cccec8fc12..67e80c5ef970 100644 --- a/layout/style/nsICSSDeclaration.h +++ b/layout/style/nsICSSDeclaration.h @@ -24,11 +24,12 @@ #include "nsCSSProperty.h" #include "CSSValue.h" #include "nsWrapperCache.h" -#include "mozilla/dom/BindingUtils.h" #include "nsString.h" #include "nsIDOMCSSRule.h" #include "nsIDOMCSSValue.h" #include "mozilla/ErrorResult.h" +#include "nsAutoPtr.h" +#include "nsCOMPtr.h" // dbeabbfa-6cb3-4f5c-aec2-dd558d9d681f #define NS_ICSSDECLARATION_IID \ @@ -75,7 +76,7 @@ public: nsRefPtr val = GetPropertyCSSValue(aProp, error); if (error.Failed()) { return error.ErrorCode(); - } + } nsCOMPtr xpVal = do_QueryInterface(val); xpVal.forget(aVal); From 34addaf4e6e7d42346a9836383ec92506e70cc7f Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:30:28 +0200 Subject: [PATCH 43/79] Bug 903796 - Remove remaining traces of GeoPositionError; r=jst --- dom/base/nsDOMClassInfo.cpp | 8 -------- dom/base/nsDOMClassInfoClasses.h | 1 - dom/src/geolocation/nsGeolocation.cpp | 1 - dom/tests/mochitest/general/test_interfaces.html | 1 - js/xpconnect/tests/mochitest/test_bug790732.html | 1 - 5 files changed, 12 deletions(-) diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index a826ea8cff4d..c4c451f80ac8 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -80,7 +80,6 @@ #include "nsIDOMDOMException.h" #include "nsIDOMDOMStringList.h" #include "nsIDOMUserDataHandler.h" -#include "nsIDOMGeoPositionError.h" #include "nsIDOMLoadStatus.h" #include "nsIDOMXPathNamespace.h" #include "nsIDOMXULButtonElement.h" @@ -574,8 +573,6 @@ static nsDOMClassInfoData sClassInfoData[] = { NS_DEFINE_CLASSINFO_DATA(UserDataHandler, nsDOMGenericSH, DOM_DEFAULT_SCRIPTABLE_FLAGS) - NS_DEFINE_CLASSINFO_DATA(GeoPositionError, nsDOMGenericSH, - DOM_DEFAULT_SCRIPTABLE_FLAGS) NS_DEFINE_CLASSINFO_DATA(LoadStatus, nsDOMGenericSH, DOM_DEFAULT_SCRIPTABLE_FLAGS) NS_DEFINE_CLASSINFO_DATA(XPathNamespace, nsDOMGenericSH, @@ -1474,10 +1471,6 @@ nsDOMClassInfo::Init() DOM_CLASSINFO_MAP_ENTRY(nsIDOMUserDataHandler) DOM_CLASSINFO_MAP_END - DOM_CLASSINFO_MAP_BEGIN(GeoPositionError, nsIDOMGeoPositionError) - DOM_CLASSINFO_MAP_ENTRY(nsIDOMGeoPositionError) - DOM_CLASSINFO_MAP_END - DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(LoadStatus, nsIDOMLoadStatus) DOM_CLASSINFO_MAP_ENTRY(nsIDOMLoadStatus) DOM_CLASSINFO_MAP_END @@ -3559,7 +3552,6 @@ const InterfaceShimEntry kInterfaceShimMap[] = { "nsIDOMMutationEvent", "MutationEvent" }, { "nsIDOMSimpleGestureEvent", "SimpleGestureEvent" }, { "nsIDOMUIEvent", "UIEvent" }, - { "nsIDOMGeoPositionError", "GeoPositionError" }, { "nsIDOMHTMLMediaElement", "HTMLMediaElement" }, { "nsIDOMMediaError", "MediaError" }, { "nsIDOMLoadStatus", "LoadStatus" }, diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h index effc66496dd6..1d6cd8d7d406 100644 --- a/dom/base/nsDOMClassInfoClasses.h +++ b/dom/base/nsDOMClassInfoClasses.h @@ -150,7 +150,6 @@ DOMCI_CLASS(LockedFile) DOMCI_CLASS(CSSFontFeatureValuesRule) DOMCI_CLASS(UserDataHandler) -DOMCI_CLASS(GeoPositionError) DOMCI_CLASS(LoadStatus) DOMCI_CLASS(XPathNamespace) DOMCI_CLASS(XULControlElement) diff --git a/dom/src/geolocation/nsGeolocation.cpp b/dom/src/geolocation/nsGeolocation.cpp index a4a2570b3c25..c7e85f0e5435 100644 --- a/dom/src/geolocation/nsGeolocation.cpp +++ b/dom/src/geolocation/nsGeolocation.cpp @@ -201,7 +201,6 @@ private: //////////////////////////////////////////////////// // PositionError //////////////////////////////////////////////////// -DOMCI_DATA(GeoPositionError, PositionError) NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(PositionError) NS_WRAPPERCACHE_INTERFACE_MAP_ENTRY diff --git a/dom/tests/mochitest/general/test_interfaces.html b/dom/tests/mochitest/general/test_interfaces.html index d12dae39017f..69fc3400f2e4 100644 --- a/dom/tests/mochitest/general/test_interfaces.html +++ b/dom/tests/mochitest/general/test_interfaces.html @@ -119,7 +119,6 @@ var interfaceNamesInGlobalScope = "GamepadAxisMoveEvent", "GamepadButtonEvent", "GamepadEvent", - "GeoPositionError", "HashChangeEvent", "History", "HTMLAnchorElement", diff --git a/js/xpconnect/tests/mochitest/test_bug790732.html b/js/xpconnect/tests/mochitest/test_bug790732.html index a830165baf30..c918f525a80f 100644 --- a/js/xpconnect/tests/mochitest/test_bug790732.html +++ b/js/xpconnect/tests/mochitest/test_bug790732.html @@ -36,7 +36,6 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=790732 is(Ci.nsIDOMMutationEvent, MutationEvent); is(Ci.nsIDOMSimpleGestureEvent, SimpleGestureEvent); is(Ci.nsIDOMUIEvent, UIEvent); - is(Ci.nsIDOMGeoPositionError, GeoPositionError); is(Ci.nsIDOMHTMLMediaElement, HTMLMediaElement); is(Ci.nsIDOMMediaError, MediaError); is(Ci.nsIDOMLoadStatus, LoadStatus); From 40829a23d03e4d163dbfde92206eebe8d8ae117f Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:30:38 +0200 Subject: [PATCH 44/79] Bug 903778 - Move dom::Date into its own files; r=khuey --- content/html/content/src/HTMLInputElement.cpp | 5 +- content/html/content/src/HTMLInputElement.h | 2 + dom/bindings/BindingDeclarations.h | 28 --------- dom/bindings/BindingUtils.cpp | 38 ------------ dom/bindings/Codegen.py | 6 ++ dom/bindings/Date.cpp | 59 +++++++++++++++++++ dom/bindings/Date.h | 54 +++++++++++++++++ dom/bindings/Makefile.in | 1 + dom/bindings/moz.build | 1 + dom/bindings/test/TestBindingHeader.h | 7 ++- dom/time/TimeManager.cpp | 1 + 11 files changed, 131 insertions(+), 71 deletions(-) create mode 100644 dom/bindings/Date.cpp create mode 100644 dom/bindings/Date.h diff --git a/content/html/content/src/HTMLInputElement.cpp b/content/html/content/src/HTMLInputElement.cpp index d21bed0249bd..bcd271a01153 100644 --- a/content/html/content/src/HTMLInputElement.cpp +++ b/content/html/content/src/HTMLInputElement.cpp @@ -3,9 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "mozilla/DebugOnly.h" - #include "mozilla/dom/HTMLInputElement.h" + +#include "mozilla/DebugOnly.h" +#include "mozilla/dom/Date.h" #include "mozilla/dom/HTMLInputElementBinding.h" #include "nsAsyncDOMEvent.h" #include "nsAttrValueInlines.h" diff --git a/content/html/content/src/HTMLInputElement.h b/content/html/content/src/HTMLInputElement.h index aaa8ade7286d..83f8c0c28cdf 100644 --- a/content/html/content/src/HTMLInputElement.h +++ b/content/html/content/src/HTMLInputElement.h @@ -31,6 +31,8 @@ class nsIRadioVisitor; namespace mozilla { namespace dom { +class Date; + class UploadLastDir MOZ_FINAL : public nsIObserver, public nsSupportsWeakReference { public: NS_DECL_ISUPPORTS diff --git a/dom/bindings/BindingDeclarations.h b/dom/bindings/BindingDeclarations.h index d799db3fecf0..3b5fe6a6ccce 100644 --- a/dom/bindings/BindingDeclarations.h +++ b/dom/bindings/BindingDeclarations.h @@ -626,34 +626,6 @@ struct ParentObject { nsWrapperCache* const mWrapperCache; }; -// Representation for dates -class Date { -public: - // Not inlining much here to avoid the extra includes we'd need - Date(); - Date(double aMilliseconds) : - mMsecSinceEpoch(aMilliseconds) - {} - - bool IsUndefined() const; - double TimeStamp() const - { - return mMsecSinceEpoch; - } - void SetTimeStamp(double aMilliseconds) - { - mMsecSinceEpoch = aMilliseconds; - } - // Can return false if CheckedUnwrap fails. This will NOT throw; - // callers should do it as needed. - bool SetTimeStamp(JSContext* cx, JSObject* obj); - - bool ToDateObject(JSContext* cx, JS::MutableHandle rval) const; - -private: - double mMsecSinceEpoch; -}; - } // namespace dom } // namespace mozilla diff --git a/dom/bindings/BindingUtils.cpp b/dom/bindings/BindingUtils.cpp index 50a2f4a1247d..058762b09d2e 100644 --- a/dom/bindings/BindingUtils.cpp +++ b/dom/bindings/BindingUtils.cpp @@ -1853,44 +1853,6 @@ ReportLenientThisUnwrappingFailure(JSContext* cx, JS::Handle obj) return true; } -// Date implementation methods -Date::Date() : - mMsecSinceEpoch(UnspecifiedNaN()) -{ -} - -bool -Date::IsUndefined() const -{ - return IsNaN(mMsecSinceEpoch); -} - -bool -Date::SetTimeStamp(JSContext* cx, JSObject* objArg) -{ - JS::Rooted obj(cx, objArg); - MOZ_ASSERT(JS_ObjectIsDate(cx, obj)); - - obj = js::CheckedUnwrap(obj); - // This really sucks: even if JS_ObjectIsDate, CheckedUnwrap can _still_ fail - if (!obj) { - return false; - } - mMsecSinceEpoch = js_DateGetMsecSinceEpoch(obj); - return true; -} - -bool -Date::ToDateObject(JSContext* cx, JS::MutableHandle rval) const -{ - JSObject* obj = JS_NewDateObjectMsec(cx, mMsecSinceEpoch); - if (!obj) { - return false; - } - rval.set(JS::ObjectValue(*obj)); - return true; -} - bool GetWindowForJSImplementedObject(JSContext* cx, JS::Handle obj, nsPIDOMWindow** window) diff --git a/dom/bindings/Codegen.py b/dom/bindings/Codegen.py index 17f227c1bdaf..a7588278530d 100644 --- a/dom/bindings/Codegen.py +++ b/dom/bindings/Codegen.py @@ -604,6 +604,12 @@ class CGHeaders(CGWrapper): if unrolled.isUnion(): # UnionConversions.h includes UnionTypes.h bindingHeaders.add("mozilla/dom/UnionConversions.h") + elif unrolled.isDate(): + if dictionary or jsImplementedDescriptors: + headerSet = declareIncludes + else: + headerSet = bindingHeaders + headerSet.add("mozilla/dom/Date.h") elif unrolled.isInterface(): if unrolled.isSpiderMonkeyInterface(): bindingHeaders.add("jsfriendapi.h") diff --git a/dom/bindings/Date.cpp b/dom/bindings/Date.cpp new file mode 100644 index 000000000000..6707d38596f6 --- /dev/null +++ b/dom/bindings/Date.cpp @@ -0,0 +1,59 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=8 sts=2 et sw=2 tw=80: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +#include "mozilla/dom/Date.h" + +#include "jsapi.h" // for JS_ObjectIsDate, JS_NewDateObjectMsec +#include "jsfriendapi.h" // for js_DateGetMsecSinceEpoch +#include "js/RootingAPI.h" // for Rooted, MutableHandle +#include "js/Value.h" // for Value +#include "jswrapper.h" // for CheckedUnwrap +#include "mozilla/FloatingPoint.h" // for IsNaN, UnspecifiedNaN + +namespace mozilla { +namespace dom { + +Date::Date() + : mMsecSinceEpoch(UnspecifiedNaN()) +{ +} + +bool +Date::IsUndefined() const +{ + return IsNaN(mMsecSinceEpoch); +} + +bool +Date::SetTimeStamp(JSContext* aCx, JSObject* aObject) +{ + JS::Rooted obj(aCx, aObject); + MOZ_ASSERT(JS_ObjectIsDate(aCx, obj)); + + obj = js::CheckedUnwrap(obj); + // This really sucks: even if JS_ObjectIsDate, CheckedUnwrap can _still_ fail. + if (!obj) { + return false; + } + + mMsecSinceEpoch = js_DateGetMsecSinceEpoch(obj); + return true; +} + +bool +Date::ToDateObject(JSContext* aCx, JS::MutableHandle aRval) const +{ + JSObject* obj = JS_NewDateObjectMsec(aCx, mMsecSinceEpoch); + if (!obj) { + return false; + } + + aRval.setObject(*obj); + return true; +} + +} // namespace dom +} // namespace mozilla diff --git a/dom/bindings/Date.h b/dom/bindings/Date.h new file mode 100644 index 000000000000..26448e077b1c --- /dev/null +++ b/dom/bindings/Date.h @@ -0,0 +1,54 @@ +/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* vim: set ts=8 sts=2 et sw=2 tw=80: */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +/* Representation for dates. */ + +#ifndef mozilla_dom_Date_h +#define mozilla_dom_Date_h + +class JSObject; +struct JSContext; + +namespace JS { +class Value; +template class MutableHandle; +} // namespace JS + +namespace mozilla { +namespace dom { + +class Date +{ +public: + // Not inlining much here to avoid the includes we'd need. + Date(); + Date(double aMilliseconds) + : mMsecSinceEpoch(aMilliseconds) + {} + + bool IsUndefined() const; + double TimeStamp() const + { + return mMsecSinceEpoch; + } + void SetTimeStamp(double aMilliseconds) + { + mMsecSinceEpoch = aMilliseconds; + } + // Can return false if CheckedUnwrap fails. This will NOT throw; + // callers should do it as needed. + bool SetTimeStamp(JSContext* aCx, JSObject* aObject); + + bool ToDateObject(JSContext* aCx, JS::MutableHandle aRval) const; + +private: + double mMsecSinceEpoch; +}; + +} // namespace dom +} // namespace mozilla + +#endif // mozilla_dom_Date_h diff --git a/dom/bindings/Makefile.in b/dom/bindings/Makefile.in index 9ec45ff0c584..3465285eeee3 100644 --- a/dom/bindings/Makefile.in +++ b/dom/bindings/Makefile.in @@ -69,6 +69,7 @@ CPPSRCS = \ CallbackInterface.cpp \ CallbackObject.cpp \ DOMJSProxyHandler.cpp \ + Date.cpp \ $(NULL) endif diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build index ad100e8990df..0ef597cfc057 100644 --- a/dom/bindings/moz.build +++ b/dom/bindings/moz.build @@ -18,6 +18,7 @@ EXPORTS.mozilla.dom += [ 'CallbackObject.h', 'DOMJSClass.h', 'DOMJSProxyHandler.h', + 'Date.h', 'Errors.msg', 'NonRefcountedDOMObject.h', 'Nullable.h', diff --git a/dom/bindings/test/TestBindingHeader.h b/dom/bindings/test/TestBindingHeader.h index d0bdb50406ce..1dbea3bd7124 100644 --- a/dom/bindings/test/TestBindingHeader.h +++ b/dom/bindings/test/TestBindingHeader.h @@ -7,12 +7,13 @@ #ifndef TestBindingHeader_h #define TestBindingHeader_h -#include "nsWrapperCache.h" -#include "mozilla/ErrorResult.h" #include "mozilla/dom/BindingUtils.h" +#include "mozilla/dom/Date.h" #include "mozilla/dom/TypedArray.h" -#include "nsCOMPtr.h" #include "mozilla/dom/UnionTypes.h" +#include "mozilla/ErrorResult.h" +#include "nsCOMPtr.h" +#include "nsWrapperCache.h" // Forward declare this before we include TestCodeGenBinding.h, because that header relies on including // this one for it, for ParentDict. Hopefully it won't begin to rely on it in more fundamental ways. diff --git a/dom/time/TimeManager.cpp b/dom/time/TimeManager.cpp index 2e2542e1667c..d0890516e2f7 100644 --- a/dom/time/TimeManager.cpp +++ b/dom/time/TimeManager.cpp @@ -4,6 +4,7 @@ #include "TimeManager.h" +#include "mozilla/dom/Date.h" #include "mozilla/dom/MozTimeManagerBinding.h" #include "nsITimeService.h" #include "nsServiceManagerUtils.h" From 504d76004bdd46cdb593da915605e066900438af Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:30:44 +0200 Subject: [PATCH 45/79] Bug 904178 - Part e: Make it possible to include nsIDocument.h on its own; r=ehsan --- content/base/public/nsIDocument.h | 1 + content/base/src/nsDocument.cpp | 3 ++- content/base/src/nsDocument.h | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/content/base/public/nsIDocument.h b/content/base/public/nsIDocument.h index 7802b9a4e7ea..241bcc0e73be 100644 --- a/content/base/public/nsIDocument.h +++ b/content/base/public/nsIDocument.h @@ -50,6 +50,7 @@ class nsIDOMDocument; class nsIDOMDocumentFragment; class nsIDOMDocumentType; class nsIDOMElement; +class nsIDOMNodeFilter; class nsIDOMNodeList; class nsIDOMXPathExpression; class nsIDOMXPathNSResolver; diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index 22844c26fc4f..4a3e939eb8ed 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -8,6 +8,8 @@ * Base class for all our document implementations. */ +#include "nsDocument.h" + #include "mozilla/DebugOnly.h" #include "mozilla/MemoryReporting.h" #include "mozilla/Util.h" @@ -25,7 +27,6 @@ #include "mozilla/Telemetry.h" #include "nsIInterfaceRequestor.h" #include "nsIInterfaceRequestorUtils.h" -#include "nsDocument.h" #include "nsUnicharUtils.h" #include "nsContentList.h" #include "nsIObserver.h" diff --git a/content/base/src/nsDocument.h b/content/base/src/nsDocument.h index 13384cd37ee9..fdcf1ef3963b 100644 --- a/content/base/src/nsDocument.h +++ b/content/base/src/nsDocument.h @@ -10,10 +10,11 @@ #ifndef nsDocument_h___ #define nsDocument_h___ +#include "nsIDocument.h" + #include "nsCOMPtr.h" #include "nsAutoPtr.h" #include "nsCRT.h" -#include "nsIDocument.h" #include "nsWeakReference.h" #include "nsWeakPtr.h" #include "nsVoidArray.h" From c6ed78509a25eecdf605c83b4a79a78d86a82501 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:30:55 +0200 Subject: [PATCH 46/79] Bug 904178 - Part f: Remove some includes from nsPIDOMWindow.h; r=mounir --- content/base/src/DOMImplementation.cpp | 1 + content/base/src/nsDOMParser.cpp | 2 + content/base/src/nsDOMSerializer.cpp | 1 + content/base/src/nsDocument.cpp | 1 + content/base/src/nsXMLHttpRequest.cpp | 1 + content/events/src/nsDOMDataTransfer.cpp | 1 + content/html/content/src/UndoManager.cpp | 1 + .../content/src/nsGenericHTMLFrameElement.cpp | 2 + content/xbl/src/nsXBLDocumentInfo.cpp | 1 + docshell/shistory/src/nsSHEntryShared.cpp | 2 + dom/base/nsGlobalWindow.cpp | 3 +- dom/base/nsGlobalWindow.h | 3 +- dom/base/nsGlobalWindowCommands.cpp | 1 + dom/base/nsPIDOMWindow.h | 43 +++++++++---------- dom/plugins/base/nsNPAPIPluginInstance.cpp | 1 + dom/plugins/base/nsPluginHost.cpp | 1 + gfx/thebes/gfxSVGGlyphs.cpp | 1 + layout/inspector/src/inFlasher.cpp | 1 + layout/inspector/src/inLayoutUtils.cpp | 1 + widget/xpwidgets/nsClipboardHelper.cpp | 3 +- 20 files changed, 46 insertions(+), 25 deletions(-) diff --git a/content/base/src/DOMImplementation.cpp b/content/base/src/DOMImplementation.cpp index b633f45bd098..35977e7fc555 100644 --- a/content/base/src/DOMImplementation.cpp +++ b/content/base/src/DOMImplementation.cpp @@ -8,6 +8,7 @@ #include "nsContentCreatorFunctions.h" #include "nsContentUtils.h" #include "nsDOMClassInfoID.h" +#include "nsIDOMDocument.h" #include "DocumentType.h" #include "nsTextNode.h" diff --git a/content/base/src/nsDOMParser.cpp b/content/base/src/nsDOMParser.cpp index 0ab06d9c03be..5e9377773a34 100644 --- a/content/base/src/nsDOMParser.cpp +++ b/content/base/src/nsDOMParser.cpp @@ -4,6 +4,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsDOMParser.h" + +#include "nsIDOMDocument.h" #include "nsNetUtil.h" #include "nsStringStream.h" #include "nsIScriptSecurityManager.h" diff --git a/content/base/src/nsDOMSerializer.cpp b/content/base/src/nsDOMSerializer.cpp index d963d1b23d16..ce8825215dec 100644 --- a/content/base/src/nsDOMSerializer.cpp +++ b/content/base/src/nsDOMSerializer.cpp @@ -7,6 +7,7 @@ #include "nsIDocument.h" #include "nsIDocumentEncoder.h" +#include "nsIDOMDocument.h" #include "nsComponentManagerUtils.h" #include "nsContentCID.h" #include "nsContentUtils.h" diff --git a/content/base/src/nsDocument.cpp b/content/base/src/nsDocument.cpp index 4a3e939eb8ed..fe0fb2230fe5 100644 --- a/content/base/src/nsDocument.cpp +++ b/content/base/src/nsDocument.cpp @@ -209,6 +209,7 @@ #include "nsIEditor.h" #include "nsIDOMCSSStyleRule.h" #include "mozilla/css/Rule.h" +#include "nsIDOMLocation.h" #include "nsIHttpChannelInternal.h" #include "nsISecurityConsoleMessage.h" diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp index 91aa6a5579f3..40a522a4ba8b 100644 --- a/content/base/src/nsXMLHttpRequest.cpp +++ b/content/base/src/nsXMLHttpRequest.cpp @@ -11,6 +11,7 @@ #include "mozilla/Util.h" #include "nsDOMBlobBuilder.h" #include "nsICharsetConverterManager.h" +#include "nsIDOMDocument.h" #include "nsIDOMProgressEvent.h" #include "nsIJARChannel.h" #include "nsLayoutCID.h" diff --git a/content/events/src/nsDOMDataTransfer.cpp b/content/events/src/nsDOMDataTransfer.cpp index be14d3051449..0a554a82e3fd 100644 --- a/content/events/src/nsDOMDataTransfer.cpp +++ b/content/events/src/nsDOMDataTransfer.cpp @@ -9,6 +9,7 @@ #include "prlog.h" #include "nsString.h" +#include "nsIDOMDocument.h" #include "nsIServiceManager.h" #include "nsIInterfaceRequestorUtils.h" #include "nsIVariant.h" diff --git a/content/html/content/src/UndoManager.cpp b/content/html/content/src/UndoManager.cpp index 399a4a477cd0..28e51a96b2e9 100644 --- a/content/html/content/src/UndoManager.cpp +++ b/content/html/content/src/UndoManager.cpp @@ -9,6 +9,7 @@ #include "nsDOMClassInfoID.h" #include "nsDOMEvent.h" #include "nsIClassInfo.h" +#include "nsIDOMDocument.h" #include "nsIXPCScriptable.h" #include "nsIVariant.h" #include "nsVariant.h" diff --git a/content/html/content/src/nsGenericHTMLFrameElement.cpp b/content/html/content/src/nsGenericHTMLFrameElement.cpp index 36ec90f56c0b..10f5eb9ce26d 100644 --- a/content/html/content/src/nsGenericHTMLFrameElement.cpp +++ b/content/html/content/src/nsGenericHTMLFrameElement.cpp @@ -6,6 +6,8 @@ * You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsGenericHTMLFrameElement.h" + +#include "nsIDOMDocument.h" #include "nsIInterfaceRequestorUtils.h" #include "nsContentUtils.h" #include "mozilla/Preferences.h" diff --git a/content/xbl/src/nsXBLDocumentInfo.cpp b/content/xbl/src/nsXBLDocumentInfo.cpp index 74c6127340ce..9d242cca1262 100644 --- a/content/xbl/src/nsXBLDocumentInfo.cpp +++ b/content/xbl/src/nsXBLDocumentInfo.cpp @@ -13,6 +13,7 @@ #include "nsIScriptObjectPrincipal.h" #include "nsIScriptGlobalObject.h" #include "nsIScriptContext.h" +#include "nsIDOMDocument.h" #include "nsIDOMScriptObjectFactory.h" #include "jsapi.h" #include "jsfriendapi.h" diff --git a/docshell/shistory/src/nsSHEntryShared.cpp b/docshell/shistory/src/nsSHEntryShared.cpp index 3b3328a4cec2..8c81854fabab 100644 --- a/docshell/shistory/src/nsSHEntryShared.cpp +++ b/docshell/shistory/src/nsSHEntryShared.cpp @@ -3,6 +3,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "nsSHEntryShared.h" + +#include "nsIDOMDocument.h" #include "nsISHistory.h" #include "nsISHistoryInternal.h" #include "nsIDocument.h" diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index ce927981f85c..7806af18bb51 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -4,13 +4,14 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "nsGlobalWindow.h" + #include #include "mozilla/MemoryReporting.h" #include "mozilla/Util.h" // Local Includes -#include "nsGlobalWindow.h" #include "Navigator.h" #include "nsScreen.h" #include "nsHistory.h" diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h index 946a238cadb8..c880d07859ca 100644 --- a/dom/base/nsGlobalWindow.h +++ b/dom/base/nsGlobalWindow.h @@ -7,6 +7,8 @@ #ifndef nsGlobalWindow_h___ #define nsGlobalWindow_h___ +#include "nsPIDOMWindow.h" + #include "nsTHashtable.h" #include "nsHashKeys.h" #include "nsRefPtrHashtable.h" @@ -28,7 +30,6 @@ #include "nsIDOMChromeWindow.h" #include "nsIScriptGlobalObject.h" #include "nsITimer.h" -#include "nsPIDOMWindow.h" #include "nsIDOMModalContentWindow.h" #include "nsEventListenerManager.h" #include "nsIPrincipal.h" diff --git a/dom/base/nsGlobalWindowCommands.cpp b/dom/base/nsGlobalWindowCommands.cpp index 8d02ba8c9e9e..123131d83d83 100644 --- a/dom/base/nsGlobalWindowCommands.cpp +++ b/dom/base/nsGlobalWindowCommands.cpp @@ -6,6 +6,7 @@ #include "nsGlobalWindowCommands.h" #include "nsIComponentManager.h" +#include "nsIDOMElement.h" #include "nsIInterfaceRequestor.h" #include "nsIInterfaceRequestorUtils.h" #include "nsCRT.h" diff --git a/dom/base/nsPIDOMWindow.h b/dom/base/nsPIDOMWindow.h index 78c0079492be..095327e843e3 100644 --- a/dom/base/nsPIDOMWindow.h +++ b/dom/base/nsPIDOMWindow.h @@ -10,24 +10,39 @@ #include "nsIDOMWindow.h" -#include "nsIDOMLocation.h" -#include "nsIDOMXULCommandDispatcher.h" -#include "nsIDOMElement.h" -#include "nsIDOMDocument.h" #include "nsCOMPtr.h" #include "nsAutoPtr.h" #include "nsTArray.h" -#include "nsIURI.h" #include "mozilla/dom/EventTarget.h" -#include "js/RootingAPI.h" #define DOM_WINDOW_DESTROYED_TOPIC "dom-window-destroyed" #define DOM_WINDOW_FROZEN_TOPIC "dom-window-frozen" #define DOM_WINDOW_THAWED_TOPIC "dom-window-thawed" +class JSObject; +class nsIArray; +class nsIContent; +class nsIDocShell; +class nsIDocument; class nsIIdleObserver; class nsIPrincipal; +class nsIScriptTimeoutHandler; +class nsIURI; class nsPerformance; +class nsPIWindowRoot; +class nsXBLPrototypeHandler; +struct nsTimeout; + +namespace JS { +template class Handle; +} + +namespace mozilla { +namespace dom { +class AudioContext; +class Element; +} +} // Popup control state enum. The values in this enum must go from most // permissive to least permissive so that it's safe to push state in @@ -41,22 +56,6 @@ enum PopupControlState { openOverridden // disallow window open }; -class nsIDocShell; -class nsIContent; -class nsIDocument; -class nsIScriptTimeoutHandler; -struct nsTimeout; -class nsXBLPrototypeHandler; -class nsIArray; -class nsPIWindowRoot; - -namespace mozilla { -namespace dom { -class AudioContext; -class Element; -} -} - #define NS_PIDOMWINDOW_IID \ { 0x4f4eadf9, 0xe795, 0x48e5, \ { 0x89, 0x4b, 0x04, 0x40, 0xb2, 0x5d, 0xa6, 0xfa } } diff --git a/dom/plugins/base/nsNPAPIPluginInstance.cpp b/dom/plugins/base/nsNPAPIPluginInstance.cpp index 9484d8d4441e..23be2417f1f4 100644 --- a/dom/plugins/base/nsNPAPIPluginInstance.cpp +++ b/dom/plugins/base/nsNPAPIPluginInstance.cpp @@ -23,6 +23,7 @@ #include "nsContentUtils.h" #include "nsPluginInstanceOwner.h" +#include "nsIDOMElement.h" #include "nsIDocument.h" #include "nsIDocShell.h" #include "nsIScriptGlobalObject.h" diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp index 60253df485ac..eaaa855c8f42 100644 --- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp @@ -61,6 +61,7 @@ // for the dialog #include "nsIWindowWatcher.h" +#include "nsIDOMElement.h" #include "nsIDOMWindow.h" #include "nsNetCID.h" diff --git a/gfx/thebes/gfxSVGGlyphs.cpp b/gfx/thebes/gfxSVGGlyphs.cpp index ed9533354c48..2b22e5b9730b 100644 --- a/gfx/thebes/gfxSVGGlyphs.cpp +++ b/gfx/thebes/gfxSVGGlyphs.cpp @@ -8,6 +8,7 @@ #include "nsError.h" #include "nsAutoPtr.h" #include "nsIParser.h" +#include "nsIDOMDocument.h" #include "nsIDOMNodeList.h" #include "nsString.h" #include "nsIDocument.h" diff --git a/layout/inspector/src/inFlasher.cpp b/layout/inspector/src/inFlasher.cpp index 51b52dfbc186..ad2e8b813c36 100644 --- a/layout/inspector/src/inFlasher.cpp +++ b/layout/inspector/src/inFlasher.cpp @@ -5,6 +5,7 @@ #include "inFlasher.h" #include "inLayoutUtils.h" +#include "nsIDOMElement.h" #include "nsIServiceManager.h" #include "nsIPresShell.h" #include "nsIFrame.h" diff --git a/layout/inspector/src/inLayoutUtils.cpp b/layout/inspector/src/inLayoutUtils.cpp index d8b3ba1193cc..5101207dd2ed 100644 --- a/layout/inspector/src/inLayoutUtils.cpp +++ b/layout/inspector/src/inLayoutUtils.cpp @@ -6,6 +6,7 @@ #include "inLayoutUtils.h" #include "nsIDocument.h" +#include "nsIDOMDocument.h" #include "nsIContent.h" #include "nsIContentViewer.h" #include "nsPIDOMWindow.h" diff --git a/widget/xpwidgets/nsClipboardHelper.cpp b/widget/xpwidgets/nsClipboardHelper.cpp index b245cf66c885..6739a261a5c5 100644 --- a/widget/xpwidgets/nsClipboardHelper.cpp +++ b/widget/xpwidgets/nsClipboardHelper.cpp @@ -14,9 +14,10 @@ // helpers #include "nsIClipboard.h" +#include "nsIDocument.h" +#include "nsIDOMDocument.h" #include "nsITransferable.h" #include "nsReadableUtils.h" -#include "nsIDocument.h" NS_IMPL_ISUPPORTS1(nsClipboardHelper, nsIClipboardHelper) From 18cd92e9b410c9fca87939087b6acb294895cf6d Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:31:21 +0200 Subject: [PATCH 47/79] Bug 903844 - Add/update include-what-you-use annotations for various files; r=ehsan+khuey --- content/base/public/nsDeprecatedOperationList.h | 1 + content/base/src/nsGkAtomList.h | 1 - content/events/public/nsVKList.h | 1 + content/html/content/src/HTMLBodyElement.cpp | 2 +- content/html/content/src/HTMLBodyElement.h | 2 +- content/html/content/src/HTMLFrameSetElement.cpp | 2 +- content/html/content/src/HTMLFrameSetElement.h | 2 +- content/html/content/src/nsGenericHTMLElement.cpp | 4 ++-- content/html/content/src/nsGenericHTMLElement.h | 2 +- dom/base/nsDOMClassInfoClasses.h | 1 + tools/profiler/GeckoProfilerImpl.h | 1 + xpcom/base/ErrorList.h | 1 + xpcom/base/Makefile.in | 3 ++- xpcom/base/nsISupportsBase.h | 1 + xpcom/build/ServiceList.h | 1 - xpcom/glue/nsISupportsImpl.h | 1 + xpcom/string/public/nsAString.h | 1 + xpcom/string/public/nsReadableUtils.h | 1 + xpcom/string/public/nsString.h | 1 + xpcom/string/public/nsTDependentSubstring.h | 3 +-- xpcom/string/public/nsTString.h | 3 +-- xpcom/string/public/nsTSubstring.h | 3 +-- xpcom/string/public/nsTSubstringTuple.h | 3 +-- xpcom/string/public/string-template-def-char.h | 3 +-- xpcom/string/public/string-template-def-unichar.h | 3 +-- xpcom/string/public/string-template-undef.h | 1 + 26 files changed, 26 insertions(+), 22 deletions(-) diff --git a/content/base/public/nsDeprecatedOperationList.h b/content/base/public/nsDeprecatedOperationList.h index ff72fddd5388..27c42a034726 100644 --- a/content/base/public/nsDeprecatedOperationList.h +++ b/content/base/public/nsDeprecatedOperationList.h @@ -1,6 +1,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +// IWYU pragma: private, include "nsIDocument.h" /* * This file contains the list of deprecated DOM operations. It is diff --git a/content/base/src/nsGkAtomList.h b/content/base/src/nsGkAtomList.h index 14dd5bb5cddb..4f8f55e7ff78 100644 --- a/content/base/src/nsGkAtomList.h +++ b/content/base/src/nsGkAtomList.h @@ -2,7 +2,6 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - // IWYU pragma: private, include "nsGkAtoms.h" /* diff --git a/content/events/public/nsVKList.h b/content/events/public/nsVKList.h index 063de995f988..79dd880fd9b9 100644 --- a/content/events/public/nsVKList.h +++ b/content/events/public/nsVKList.h @@ -3,6 +3,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ +// IWYU pragma: private, include "nsGUIEvent.h" /** * This header file defines all DOM keys which are defined in nsIDOMKeyEvent. diff --git a/content/html/content/src/HTMLBodyElement.cpp b/content/html/content/src/HTMLBodyElement.cpp index 7e4ee3796607..07591628dfdc 100644 --- a/content/html/content/src/HTMLBodyElement.cpp +++ b/content/html/content/src/HTMLBodyElement.cpp @@ -541,7 +541,7 @@ HTMLBodyElement::IsEventAttributeName(nsIAtom *aName) WINDOW_EVENT_HELPER(name_, EventHandlerNonNull) #define BEFOREUNLOAD_EVENT(name_, id_, type_, struct_) \ WINDOW_EVENT_HELPER(name_, BeforeUnloadEventHandlerNonNull) -#include "nsEventNameList.h" +#include "nsEventNameList.h" // IWYU pragma: keep #undef BEFOREUNLOAD_EVENT #undef WINDOW_EVENT #undef WINDOW_EVENT_HELPER diff --git a/content/html/content/src/HTMLBodyElement.h b/content/html/content/src/HTMLBodyElement.h index 5db7abfd091d..6bd61d026e6f 100644 --- a/content/html/content/src/HTMLBodyElement.h +++ b/content/html/content/src/HTMLBodyElement.h @@ -65,7 +65,7 @@ public: WINDOW_EVENT_HELPER(name_, EventHandlerNonNull) #define BEFOREUNLOAD_EVENT(name_, id_, type_, struct_) \ WINDOW_EVENT_HELPER(name_, BeforeUnloadEventHandlerNonNull) -#include "nsEventNameList.h" +#include "nsEventNameList.h" // IWYU pragma: keep #undef BEFOREUNLOAD_EVENT #undef WINDOW_EVENT #undef WINDOW_EVENT_HELPER diff --git a/content/html/content/src/HTMLFrameSetElement.cpp b/content/html/content/src/HTMLFrameSetElement.cpp index ca05b634250d..2f0bdf5c2ff1 100644 --- a/content/html/content/src/HTMLFrameSetElement.cpp +++ b/content/html/content/src/HTMLFrameSetElement.cpp @@ -400,7 +400,7 @@ HTMLFrameSetElement::IsEventAttributeName(nsIAtom *aName) WINDOW_EVENT_HELPER(name_, EventHandlerNonNull) #define BEFOREUNLOAD_EVENT(name_, id_, type_, struct_) \ WINDOW_EVENT_HELPER(name_, BeforeUnloadEventHandlerNonNull) -#include "nsEventNameList.h" +#include "nsEventNameList.h" // IWYU pragma: keep #undef BEFOREUNLOAD_EVENT #undef WINDOW_EVENT #undef WINDOW_EVENT_HELPER diff --git a/content/html/content/src/HTMLFrameSetElement.h b/content/html/content/src/HTMLFrameSetElement.h index c1fe9c77d326..541dea6ba631 100644 --- a/content/html/content/src/HTMLFrameSetElement.h +++ b/content/html/content/src/HTMLFrameSetElement.h @@ -95,7 +95,7 @@ public: WINDOW_EVENT_HELPER(name_, EventHandlerNonNull) #define BEFOREUNLOAD_EVENT(name_, id_, type_, struct_) \ WINDOW_EVENT_HELPER(name_, BeforeUnloadEventHandlerNonNull) -#include "nsEventNameList.h" +#include "nsEventNameList.h" // IWYU pragma: keep #undef BEFOREUNLOAD_EVENT #undef WINDOW_EVENT #undef WINDOW_EVENT_HELPER diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp index b96f979a531b..eb9c6dd30e47 100644 --- a/content/html/content/src/nsGenericHTMLElement.cpp +++ b/content/html/content/src/nsGenericHTMLElement.cpp @@ -820,7 +820,7 @@ nsGenericHTMLElement::GetEventListenerManagerForAttr(nsIAtom* aAttrName, #define FORWARDED_EVENT(name_, id_, type_, struct_) \ || nsGkAtoms::on##name_ == aAttrName #define WINDOW_EVENT FORWARDED_EVENT -#include "nsEventNameList.h" +#include "nsEventNameList.h" // IWYU pragma: keep #undef WINDOW_EVENT #undef FORWARDED_EVENT #undef EVENT @@ -928,7 +928,7 @@ nsGenericHTMLElement::SetOn##name_(EventHandlerNonNull* handler, \ \ return nsINode::SetOn##name_(handler, error); \ } -#include "nsEventNameList.h" +#include "nsEventNameList.h" // IWYU pragma: keep #undef ERROR_EVENT #undef FORWARDED_EVENT #undef EVENT diff --git a/content/html/content/src/nsGenericHTMLElement.h b/content/html/content/src/nsGenericHTMLElement.h index da80bb593d54..56da1a3ad55a 100644 --- a/content/html/content/src/nsGenericHTMLElement.h +++ b/content/html/content/src/nsGenericHTMLElement.h @@ -247,7 +247,7 @@ public: already_AddRefed GetOn##name_(); \ void SetOn##name_(mozilla::dom::EventHandlerNonNull* handler, \ mozilla::ErrorResult& error); -#include "nsEventNameList.h" +#include "nsEventNameList.h" // IWYU pragma: keep #undef ERROR_EVENT #undef FORWARDED_EVENT #undef EVENT diff --git a/dom/base/nsDOMClassInfoClasses.h b/dom/base/nsDOMClassInfoClasses.h index 1d6cd8d7d406..128cc96b0516 100644 --- a/dom/base/nsDOMClassInfoClasses.h +++ b/dom/base/nsDOMClassInfoClasses.h @@ -2,6 +2,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +// IWYU pragma: private, include "nsDOMClassInfoID.h" DOMCI_CLASS(Window) DOMCI_CLASS(Location) diff --git a/tools/profiler/GeckoProfilerImpl.h b/tools/profiler/GeckoProfilerImpl.h index 02e53ba8b493..d147c2cc0587 100644 --- a/tools/profiler/GeckoProfilerImpl.h +++ b/tools/profiler/GeckoProfilerImpl.h @@ -2,6 +2,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +// IWYU pragma: private, include "GeckoProfiler.h" #ifndef TOOLS_SPS_SAMPLER_H_ #define TOOLS_SPS_SAMPLER_H_ diff --git a/xpcom/base/ErrorList.h b/xpcom/base/ErrorList.h index 904686dbb478..daf959d4af55 100644 --- a/xpcom/base/ErrorList.h +++ b/xpcom/base/ErrorList.h @@ -1,3 +1,4 @@ +// IWYU pragma: private, include "nsError.h" /* Helper file for nsError.h, via preprocessor magic */ /* Standard "it worked" return value */ ERROR(NS_OK, 0), diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in index 4f1f39b7bd33..de07083a71c8 100644 --- a/xpcom/base/Makefile.in +++ b/xpcom/base/Makefile.in @@ -43,7 +43,8 @@ LOCAL_INCLUDES += \ # suppresses printing the pattern space, and the p at the end prints it anyway, # so we don't print lines that don't match the pattern to start with. ErrorListCxxDefines.h: ErrorList.h Makefile - sed -n 's/.*ERROR(\([A-Z_0-9]*\).*/#define \1 nsresult::\1/p' < $< > $@ + echo '// IWYU pragma: private, include "nsError.h"' > $@ + sed -n 's/.*ERROR(\([A-Z_0-9]*\).*/#define \1 nsresult::\1/p' < $< >> $@ ErrorListCDefines.h: ErrorList.h Makefile sed 's/.*ERROR(\([A-Z_0-9]*\),\( *\)\(.*\))[^)]*/#define \1 \2((nsresult)(\3))/' < $< > $@ diff --git a/xpcom/base/nsISupportsBase.h b/xpcom/base/nsISupportsBase.h index e3b7419757e1..d2f66f4a68fa 100644 --- a/xpcom/base/nsISupportsBase.h +++ b/xpcom/base/nsISupportsBase.h @@ -1,6 +1,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +// IWYU pragma: private, include "nsISupports.h" #ifndef nsISupportsBase_h__ #define nsISupportsBase_h__ diff --git a/xpcom/build/ServiceList.h b/xpcom/build/ServiceList.h index 2630948e1d8e..78a9c5aa311d 100644 --- a/xpcom/build/ServiceList.h +++ b/xpcom/build/ServiceList.h @@ -1,7 +1,6 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - // IWYU pragma: private, include "mozilla/Services.h" #ifdef ACCESSIBILITY diff --git a/xpcom/glue/nsISupportsImpl.h b/xpcom/glue/nsISupportsImpl.h index d5f08ff56673..ffd9a057081e 100644 --- a/xpcom/glue/nsISupportsImpl.h +++ b/xpcom/glue/nsISupportsImpl.h @@ -2,6 +2,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +// IWYU pragma: private, include "nsISupports.h" #ifndef nsISupportsImpl_h__ diff --git a/xpcom/string/public/nsAString.h b/xpcom/string/public/nsAString.h index 688ab1fa9805..506d7bb1c23c 100644 --- a/xpcom/string/public/nsAString.h +++ b/xpcom/string/public/nsAString.h @@ -3,6 +3,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +// IWYU pragma: private, include "nsStringGlue.h" #ifndef nsAString_h___ #define nsAString_h___ diff --git a/xpcom/string/public/nsReadableUtils.h b/xpcom/string/public/nsReadableUtils.h index 72e439ad18be..a222d8cc28dc 100644 --- a/xpcom/string/public/nsReadableUtils.h +++ b/xpcom/string/public/nsReadableUtils.h @@ -2,6 +2,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +// IWYU pragma: private, include "nsStringGlue.h" #ifndef nsReadableUtils_h___ #define nsReadableUtils_h___ diff --git a/xpcom/string/public/nsString.h b/xpcom/string/public/nsString.h index 39d83cd5dce2..3f55072cb15e 100644 --- a/xpcom/string/public/nsString.h +++ b/xpcom/string/public/nsString.h @@ -3,6 +3,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +// IWYU pragma: private, include "nsStringGlue.h" #ifndef nsString_h___ #define nsString_h___ diff --git a/xpcom/string/public/nsTDependentSubstring.h b/xpcom/string/public/nsTDependentSubstring.h index 88538e610d2c..61c84c2f2d73 100644 --- a/xpcom/string/public/nsTDependentSubstring.h +++ b/xpcom/string/public/nsTDependentSubstring.h @@ -3,8 +3,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -// IWYU pragma: private, include "nsDependentSubstring.h" +// IWYU pragma: private, include "nsStringGlue.h" /** * nsTDependentSubstring_CharT diff --git a/xpcom/string/public/nsTString.h b/xpcom/string/public/nsTString.h index 0af5a5bd48d3..be633bd56e27 100644 --- a/xpcom/string/public/nsTString.h +++ b/xpcom/string/public/nsTString.h @@ -3,8 +3,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -// IWYU pragma: private, include "nsString.h" +// IWYU pragma: private, include "nsStringGlue.h" /** * This is the canonical null-terminated string class. All subclasses diff --git a/xpcom/string/public/nsTSubstring.h b/xpcom/string/public/nsTSubstring.h index f73ce8b20b53..fa7099fd6f35 100644 --- a/xpcom/string/public/nsTSubstring.h +++ b/xpcom/string/public/nsTSubstring.h @@ -3,8 +3,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -// IWYU pragma: private, include "nsAString.h" +// IWYU pragma: private, include "nsStringGlue.h" #include "mozilla/MemoryReporting.h" diff --git a/xpcom/string/public/nsTSubstringTuple.h b/xpcom/string/public/nsTSubstringTuple.h index f96a45e713bd..103d292528ad 100644 --- a/xpcom/string/public/nsTSubstringTuple.h +++ b/xpcom/string/public/nsTSubstringTuple.h @@ -3,8 +3,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -// IWYU pragma: private, include "nsSubstringTuple.h" +// IWYU pragma: private, include "nsStringGlue.h" /** * nsTSubstringTuple_CharT diff --git a/xpcom/string/public/string-template-def-char.h b/xpcom/string/public/string-template-def-char.h index e61c96da9ccd..2ca792281856 100644 --- a/xpcom/string/public/string-template-def-char.h +++ b/xpcom/string/public/string-template-def-char.h @@ -3,8 +3,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -// IWYU pragma: private, include "nsString.h" +// IWYU pragma: private, include "nsStringGlue.h" #define CharT char #define CharT_is_char 1 diff --git a/xpcom/string/public/string-template-def-unichar.h b/xpcom/string/public/string-template-def-unichar.h index 4141e10df523..70a8f40e3a95 100644 --- a/xpcom/string/public/string-template-def-unichar.h +++ b/xpcom/string/public/string-template-def-unichar.h @@ -3,8 +3,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -// IWYU pragma: private, include "nsString.h" +// IWYU pragma: private, include "nsStringGlue.h" #define CharT PRUnichar #define CharT_is_PRUnichar 1 diff --git a/xpcom/string/public/string-template-undef.h b/xpcom/string/public/string-template-undef.h index 22bb7236b651..ba558c2a6196 100644 --- a/xpcom/string/public/string-template-undef.h +++ b/xpcom/string/public/string-template-undef.h @@ -3,6 +3,7 @@ /* This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +// IWYU pragma: private, include "nsStringGlue.h" #undef CharT #undef CharT_is_PRUnichar From 609e778c1f07fb8ae44f1b7b5a932211d087d70c Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:33:59 +0200 Subject: [PATCH 48/79] Bug 905739 - Remove nsIDOMStorageIndexedDB; r=khuey --- dom/base/nsDOMClassInfo.cpp | 14 ++++------- dom/base/nsGlobalWindow.cpp | 5 ---- dom/base/nsGlobalWindow.h | 5 ---- dom/interfaces/base/nsIDOMWindow.idl | 11 +++++++-- dom/interfaces/storage/moz.build | 1 - .../storage/nsIDOMStorageIndexedDB.idl | 24 ------------------- 6 files changed, 14 insertions(+), 46 deletions(-) delete mode 100644 dom/interfaces/storage/nsIDOMStorageIndexedDB.idl diff --git a/dom/base/nsDOMClassInfo.cpp b/dom/base/nsDOMClassInfo.cpp index c4c451f80ac8..f7a8e62c4857 100644 --- a/dom/base/nsDOMClassInfo.cpp +++ b/dom/base/nsDOMClassInfo.cpp @@ -1058,26 +1058,22 @@ nsDOMClassInfo::RegisterExternalClasses() } #ifdef MOZ_B2G -#define DOM_CLASSINFO_WINDOW_MAP_ENTRIES(_support_indexed_db) \ +#define DOM_CLASSINFO_WINDOW_MAP_ENTRIES \ DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow) \ DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowB2G) \ DOM_CLASSINFO_MAP_ENTRY(nsIDOMJSWindow) \ DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget) \ DOM_CLASSINFO_MAP_ENTRY(nsIInlineEventHandlers) \ DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowPerformance) \ - DOM_CLASSINFO_MAP_CONDITIONAL_ENTRY(nsIDOMStorageIndexedDB, \ - _support_indexed_db) \ DOM_CLASSINFO_MAP_CONDITIONAL_ENTRY(nsITouchEventReceiver, \ nsDOMTouchEvent::PrefEnabled()) #else // !MOZ_B2G -#define DOM_CLASSINFO_WINDOW_MAP_ENTRIES(_support_indexed_db) \ +#define DOM_CLASSINFO_WINDOW_MAP_ENTRIES \ DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindow) \ DOM_CLASSINFO_MAP_ENTRY(nsIDOMJSWindow) \ DOM_CLASSINFO_MAP_ENTRY(nsIDOMEventTarget) \ DOM_CLASSINFO_MAP_ENTRY(nsIInlineEventHandlers) \ DOM_CLASSINFO_MAP_ENTRY(nsIDOMWindowPerformance) \ - DOM_CLASSINFO_MAP_CONDITIONAL_ENTRY(nsIDOMStorageIndexedDB, \ - _support_indexed_db) \ DOM_CLASSINFO_MAP_CONDITIONAL_ENTRY(nsITouchEventReceiver, \ nsDOMTouchEvent::PrefEnabled()) #endif // MOZ_B2G @@ -1112,7 +1108,7 @@ nsDOMClassInfo::Init() AutoSafeJSContext cx; DOM_CLASSINFO_MAP_BEGIN(Window, nsIDOMWindow) - DOM_CLASSINFO_WINDOW_MAP_ENTRIES(true) + DOM_CLASSINFO_WINDOW_MAP_ENTRIES #ifdef MOZ_WEBSPEECH DOM_CLASSINFO_MAP_ENTRY(nsISpeechSynthesisGetter) #endif @@ -1223,7 +1219,7 @@ nsDOMClassInfo::Init() #endif DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(ChromeWindow, nsIDOMWindow) - DOM_CLASSINFO_WINDOW_MAP_ENTRIES(true) + DOM_CLASSINFO_WINDOW_MAP_ENTRIES DOM_CLASSINFO_MAP_ENTRY(nsIDOMChromeWindow) #ifdef MOZ_WEBSPEECH DOM_CLASSINFO_MAP_ENTRY(nsISpeechSynthesisGetter) @@ -1307,7 +1303,7 @@ nsDOMClassInfo::Init() DOM_CLASSINFO_MAP_END DOM_CLASSINFO_MAP_BEGIN_NO_CLASS_IF(ModalContentWindow, nsIDOMWindow) - DOM_CLASSINFO_WINDOW_MAP_ENTRIES(true) + DOM_CLASSINFO_WINDOW_MAP_ENTRIES DOM_CLASSINFO_MAP_ENTRY(nsIDOMModalContentWindow) #ifdef MOZ_WEBSPEECH DOM_CLASSINFO_MAP_ENTRY(nsISpeechSynthesisGetter) diff --git a/dom/base/nsGlobalWindow.cpp b/dom/base/nsGlobalWindow.cpp index 7806af18bb51..495221856b0c 100644 --- a/dom/base/nsGlobalWindow.cpp +++ b/dom/base/nsGlobalWindow.cpp @@ -1546,7 +1546,6 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsGlobalWindow) NS_INTERFACE_MAP_ENTRY(nsIDOMEventTarget) NS_INTERFACE_MAP_ENTRY(mozilla::dom::EventTarget) NS_INTERFACE_MAP_ENTRY(nsPIDOMWindow) - NS_INTERFACE_MAP_ENTRY(nsIDOMStorageIndexedDB) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY(nsIInterfaceRequestor) NS_INTERFACE_MAP_ENTRY(nsIDOMWindowPerformance) @@ -8963,10 +8962,6 @@ nsGlobalWindow::GetLocalStorage(nsIDOMStorage ** aLocalStorage) return NS_OK; } -//***************************************************************************** -// nsGlobalWindow::nsIDOMStorageIndexedDB -//***************************************************************************** - NS_IMETHODIMP nsGlobalWindow::GetIndexedDB(nsISupports** _retval) { diff --git a/dom/base/nsGlobalWindow.h b/dom/base/nsGlobalWindow.h index c880d07859ca..279fa6135730 100644 --- a/dom/base/nsGlobalWindow.h +++ b/dom/base/nsGlobalWindow.h @@ -38,7 +38,6 @@ #include "mozFlushType.h" #include "prclist.h" #include "nsIDOMStorageEvent.h" -#include "nsIDOMStorageIndexedDB.h" #include "nsFrameMessageManager.h" #include "mozilla/LinkedList.h" #include "mozilla/TimeStamp.h" @@ -287,7 +286,6 @@ class nsGlobalWindow : public mozilla::dom::EventTarget, public nsPIDOMWindow, public nsIScriptGlobalObject, public nsIDOMJSWindow, - public nsIDOMStorageIndexedDB, public nsSupportsWeakReference, public nsIInterfaceRequestor, public PRCListStr, @@ -442,9 +440,6 @@ public: virtual NS_HIDDEN_(void) SetHasGamepadEventListener(bool aHasGamepad = true); - // nsIDOMStorageIndexedDB - NS_DECL_NSIDOMSTORAGEINDEXEDDB - // nsIInterfaceRequestor NS_DECL_NSIINTERFACEREQUESTOR diff --git a/dom/interfaces/base/nsIDOMWindow.idl b/dom/interfaces/base/nsIDOMWindow.idl index 5baaf18b2b75..ca16a8ab972a 100644 --- a/dom/interfaces/base/nsIDOMWindow.idl +++ b/dom/interfaces/base/nsIDOMWindow.idl @@ -25,7 +25,7 @@ interface nsIVariant; * @see */ -[scriptable, uuid(e4610a67-ce3c-4dff-a5cf-b0e858452bf5)] +[scriptable, uuid(b0ebb526-ed69-43c6-8242-b381a1fe79da)] interface nsIDOMWindow : nsISupports { // the current browsing context @@ -249,6 +249,13 @@ interface nsIDOMWindow : nsISupports readonly attribute nsIDOMStorage localStorage; + // IndexedDB + // https://dvcs.w3.org/hg/IndexedDB/raw-file/tip/Overview.html#requests + // IDBEnvironment + readonly attribute nsISupports indexedDB; + readonly attribute nsISupports mozIndexedDB; + + // DOM Range /** * Method for accessing this window's selection object. @@ -515,5 +522,5 @@ interface nsIDOMWindowPerformance : nsISupports * Empty interface for compatibility with older versions. * @deprecated Use nsIDOMWindow instead */ -[scriptable, uuid(ad5768c7-8668-4cd4-bcac-3d0a400d50be)] +[scriptable, uuid(2ec49e81-b2ba-4633-991a-f48f1e1d8800)] interface nsIDOMWindowInternal : nsIDOMWindow {}; diff --git a/dom/interfaces/storage/moz.build b/dom/interfaces/storage/moz.build index 7ccf5260ea47..cc7fffec7225 100644 --- a/dom/interfaces/storage/moz.build +++ b/dom/interfaces/storage/moz.build @@ -7,7 +7,6 @@ XPIDL_SOURCES += [ 'nsIDOMStorage.idl', 'nsIDOMStorageEvent.idl', - 'nsIDOMStorageIndexedDB.idl', 'nsIDOMStorageManager.idl', 'nsIDOMToString.idl', ] diff --git a/dom/interfaces/storage/nsIDOMStorageIndexedDB.idl b/dom/interfaces/storage/nsIDOMStorageIndexedDB.idl deleted file mode 100644 index e68d2fe3e5e6..000000000000 --- a/dom/interfaces/storage/nsIDOMStorageIndexedDB.idl +++ /dev/null @@ -1,24 +0,0 @@ -/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ - -#include "domstubs.idl" - -/** - * Interface for a client side storage. See - * http://www.whatwg.org/specs/web-apps/current-work/#scs-client-side and - * http://www.w3.org/TR/IndexedDB/ for more information. - * - * Allows access to contextual storage areas. - */ - -[scriptable, uuid(f4deeef5-32d3-4048-bb56-883330fd8f35)] -interface nsIDOMStorageIndexedDB : nsISupports -{ - /** - * Indexed Databases for the current browsing context. - */ - readonly attribute nsISupports indexedDB; - readonly attribute nsISupports mozIndexedDB; -}; From a69d93e14a3a5bed1cfbd6a50f5dc382406e590a Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:34:25 +0200 Subject: [PATCH 49/79] Bug 907364 - Remove the unused nsContentUtils::sDOMScriptObjectFactory; r=bholley --- content/base/public/nsContentUtils.h | 2 -- content/base/src/nsContentUtils.cpp | 2 -- 2 files changed, 4 deletions(-) diff --git a/content/base/public/nsContentUtils.h b/content/base/public/nsContentUtils.h index 383c1fdb84ca..9b14b311960c 100644 --- a/content/base/public/nsContentUtils.h +++ b/content/base/public/nsContentUtils.h @@ -2182,8 +2182,6 @@ private: static void* AllocClassMatchingInfo(nsINode* aRootNode, const nsString* aClasses); - static nsIDOMScriptObjectFactory *sDOMScriptObjectFactory; - static nsIXPConnect *sXPConnect; static nsIScriptSecurityManager *sSecurityManager; diff --git a/content/base/src/nsContentUtils.cpp b/content/base/src/nsContentUtils.cpp index 3e8e6d9f71c7..aded060e9f5b 100644 --- a/content/base/src/nsContentUtils.cpp +++ b/content/base/src/nsContentUtils.cpp @@ -187,7 +187,6 @@ using namespace mozilla; const char kLoadAsData[] = "loadAsData"; -nsIDOMScriptObjectFactory *nsContentUtils::sDOMScriptObjectFactory = nullptr; nsIXPConnect *nsContentUtils::sXPConnect; nsIScriptSecurityManager *nsContentUtils::sSecurityManager; nsIParserService *nsContentUtils::sParserService = nullptr; @@ -1451,7 +1450,6 @@ nsContentUtils::Shutdown() NS_IF_RELEASE(sStringBundleService); NS_IF_RELEASE(sConsoleService); - NS_IF_RELEASE(sDOMScriptObjectFactory); sXPConnect = nullptr; NS_IF_RELEASE(sSecurityManager); NS_IF_RELEASE(sNameSpaceManager); From f021b0168882e1caf561b7c4e3272c754a3551cd Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:34:39 +0200 Subject: [PATCH 50/79] Bug 899705 - Give SetDoubleAttr an ErrorResult argument; r=dzbarsky --- content/html/content/src/HTMLMeterElement.h | 12 ++++++------ content/html/content/src/HTMLProgressElement.h | 4 ++-- content/html/content/src/nsGenericHTMLElement.cpp | 9 --------- content/html/content/src/nsGenericHTMLElement.h | 8 +++++++- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/content/html/content/src/HTMLMeterElement.h b/content/html/content/src/HTMLMeterElement.h index 38ccdf41fa0c..55294ca347b6 100644 --- a/content/html/content/src/HTMLMeterElement.h +++ b/content/html/content/src/HTMLMeterElement.h @@ -36,42 +36,42 @@ public: double Value() const; void SetValue(double aValue, ErrorResult& aRv) { - aRv = SetDoubleAttr(nsGkAtoms::value, aValue); + SetDoubleAttr(nsGkAtoms::value, aValue, aRv); } /* @return the minimum value */ double Min() const; void SetMin(double aValue, ErrorResult& aRv) { - aRv = SetDoubleAttr(nsGkAtoms::min, aValue); + SetDoubleAttr(nsGkAtoms::min, aValue, aRv); } /* @return the maximum value */ double Max() const; void SetMax(double aValue, ErrorResult& aRv) { - aRv = SetDoubleAttr(nsGkAtoms::max, aValue); + SetDoubleAttr(nsGkAtoms::max, aValue, aRv); } /* @return the low value */ double Low() const; void SetLow(double aValue, ErrorResult& aRv) { - aRv = SetDoubleAttr(nsGkAtoms::low, aValue); + SetDoubleAttr(nsGkAtoms::low, aValue, aRv); } /* @return the high value */ double High() const; void SetHigh(double aValue, ErrorResult& aRv) { - aRv = SetDoubleAttr(nsGkAtoms::high, aValue); + SetDoubleAttr(nsGkAtoms::high, aValue, aRv); } /* @return the optimum value */ double Optimum() const; void SetOptimum(double aValue, ErrorResult& aRv) { - aRv = SetDoubleAttr(nsGkAtoms::optimum, aValue); + SetDoubleAttr(nsGkAtoms::optimum, aValue, aRv); } protected: diff --git a/content/html/content/src/HTMLProgressElement.h b/content/html/content/src/HTMLProgressElement.h index a6fd91412f43..9360f95620ff 100644 --- a/content/html/content/src/HTMLProgressElement.h +++ b/content/html/content/src/HTMLProgressElement.h @@ -33,12 +33,12 @@ public: double Value() const; void SetValue(double aValue, ErrorResult& aRv) { - aRv = SetDoubleAttr(nsGkAtoms::value, aValue); + SetDoubleAttr(nsGkAtoms::value, aValue, aRv); } double Max() const; void SetMax(double aValue, ErrorResult& aRv) { - aRv = SetDoubleAttr(nsGkAtoms::max, aValue); + SetDoubleAttr(nsGkAtoms::max, aValue, aRv); } double Position() const; diff --git a/content/html/content/src/nsGenericHTMLElement.cpp b/content/html/content/src/nsGenericHTMLElement.cpp index eb9c6dd30e47..12b47e86ea71 100644 --- a/content/html/content/src/nsGenericHTMLElement.cpp +++ b/content/html/content/src/nsGenericHTMLElement.cpp @@ -1758,15 +1758,6 @@ nsGenericHTMLElement::GetUnsignedIntAttr(nsIAtom* aAttr, return attrVal->GetIntegerValue(); } -nsresult -nsGenericHTMLElement::SetDoubleAttr(nsIAtom* aAttr, double aValue) -{ - nsAutoString value; - value.AppendFloat(aValue); - - return SetAttr(kNameSpaceID_None, aAttr, value, true); -} - void nsGenericHTMLElement::GetURIAttr(nsIAtom* aAttr, nsIAtom* aBaseAttr, nsAString& aResult) const diff --git a/content/html/content/src/nsGenericHTMLElement.h b/content/html/content/src/nsGenericHTMLElement.h index 56da1a3ad55a..bad8b5024dcc 100644 --- a/content/html/content/src/nsGenericHTMLElement.h +++ b/content/html/content/src/nsGenericHTMLElement.h @@ -1104,7 +1104,13 @@ protected: * @param aAttr name of attribute. * @param aValue Double value of attribute. */ - NS_HIDDEN_(nsresult) SetDoubleAttr(nsIAtom* aAttr, double aValue); + void SetDoubleAttr(nsIAtom* aAttr, double aValue, mozilla::ErrorResult& aRv) + { + nsAutoString value; + value.AppendFloat(aValue); + + SetHTMLAttr(aAttr, value, aRv); + } /** * This method works like GetURIAttr, except that it supports multiple From 930728b3e2105228f7a5934e0111a96e0929b5d2 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:34:44 +0200 Subject: [PATCH 51/79] Bug 905230 - Use LinkedList for nsXBLJSClass; r=mrbkap --- content/xbl/src/nsXBLBinding.cpp | 28 +++++++++++----------------- content/xbl/src/nsXBLService.cpp | 12 ++++++------ content/xbl/src/nsXBLService.h | 9 ++++++--- 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/content/xbl/src/nsXBLBinding.cpp b/content/xbl/src/nsXBLBinding.cpp index fdc1c459221a..b72e4d64b19f 100644 --- a/content/xbl/src/nsXBLBinding.cpp +++ b/content/xbl/src/nsXBLBinding.cpp @@ -94,9 +94,11 @@ uint64_t nsXBLJSClass::sIdCount = 0; nsXBLJSClass::nsXBLJSClass(const nsAFlatCString& aClassName, const nsCString& aKey) + : LinkedListElement() + , mRefCnt(0) + , mKey(aKey) { - memset(this, 0, sizeof(nsXBLJSClass)); - next = prev = static_cast(this); + memset(static_cast(this), 0, sizeof(JSClass)); name = ToNewCString(aClassName); flags = JSCLASS_HAS_PRIVATE | JSCLASS_PRIVATE_IS_NSISUPPORTS | @@ -110,13 +112,12 @@ nsXBLJSClass::nsXBLJSClass(const nsAFlatCString& aClassName, resolve = JS_ResolveStub; convert = ::JS_ConvertStub; finalize = XBLFinalize; - mKey = aKey; } nsrefcnt nsXBLJSClass::Destroy() { - NS_ASSERTION(next == prev && prev == static_cast(this), + NS_ASSERTION(!isInList(), "referenced nsXBLJSClass is on LRU list already!?"); if (nsXBLService::gClassTable) { @@ -130,8 +131,7 @@ nsXBLJSClass::Destroy() delete this; } else { // Put this most-recently-used class on end of the LRU-sorted freelist. - JSCList* mru = static_cast(this); - JS_APPEND_LINK(mru, &nsXBLService::gClassLRUList); + nsXBLService::gClassLRUList->insertBack(this); nsXBLService::gClassLRUListLength++; } @@ -957,27 +957,21 @@ nsXBLBinding::DoInitJSClass(JSContext *cx, JS::Handle global, c = static_cast(nsXBLService::gClassTable->Get(&key)); } if (c) { - // If c is on the LRU list (i.e., not linked to itself), remove it now! - JSCList* link = static_cast(c); - if (c->next != link) { - JS_REMOVE_AND_INIT_LINK(link); + // If c is on the LRU list, remove it now! + if (c->isInList()) { + c->remove(); nsXBLService::gClassLRUListLength--; } } else { - if (JS_CLIST_IS_EMPTY(&nsXBLService::gClassLRUList)) { + if (nsXBLService::gClassLRUList->isEmpty()) { // We need to create a struct for this class. c = new nsXBLJSClass(className, xblKey); - - if (!c) - return NS_ERROR_OUT_OF_MEMORY; } else { // Pull the least recently used class struct off the list. - JSCList* lru = (nsXBLService::gClassLRUList).next; - JS_REMOVE_AND_INIT_LINK(lru); + c = nsXBLService::gClassLRUList->popFirst(); nsXBLService::gClassLRUListLength--; // Remove any mapping from the old name to the class struct. - c = static_cast(lru); nsCStringKey oldKey(c->Key()); (nsXBLService::gClassTable)->Remove(&oldKey); diff --git a/content/xbl/src/nsXBLService.cpp b/content/xbl/src/nsXBLService.cpp index 8dacecc17972..62ad0f1a1653 100644 --- a/content/xbl/src/nsXBLService.cpp +++ b/content/xbl/src/nsXBLService.cpp @@ -369,7 +369,7 @@ bool nsXBLService::gAllowDataURIs = false; nsHashtable* nsXBLService::gClassTable = nullptr; -JSCList nsXBLService::gClassLRUList = JS_INIT_STATIC_CLIST(&nsXBLService::gClassLRUList); +LinkedList* nsXBLService::gClassLRUList = nullptr; uint32_t nsXBLService::gClassLRUListLength = 0; uint32_t nsXBLService::gClassLRUListQuota = 64; @@ -393,6 +393,7 @@ nsXBLService::Init() nsXBLService::nsXBLService(void) { gClassTable = new nsHashtable(); + gClassLRUList = new LinkedList(); Preferences::AddBoolVarCache(&gAllowDataURIs, "layout.debug.enable_data_xbl"); } @@ -406,6 +407,8 @@ nsXBLService::~nsXBLService(void) // created for bindings will be deleted when those objects are finalized // (and not put on gClassLRUList, because length >= quota). gClassLRUListLength = gClassLRUListQuota = 0; + delete gClassLRUList; + gClassLRUList = nullptr; // At this point, the only hash table entries should be for referenced // XBL class structs held by unfinalized JS binding objects. @@ -642,11 +645,8 @@ nsXBLService::Observe(nsISupports* aSubject, const char* aTopic, const PRUnichar nsresult nsXBLService::FlushMemory() { - while (!JS_CLIST_IS_EMPTY(&gClassLRUList)) { - JSCList* lru = gClassLRUList.next; - nsXBLJSClass* c = static_cast(lru); - - JS_REMOVE_AND_INIT_LINK(lru); + while (!gClassLRUList->isEmpty()) { + nsXBLJSClass* c = gClassLRUList->popFirst(); delete c; gClassLRUListLength--; } diff --git a/content/xbl/src/nsXBLService.h b/content/xbl/src/nsXBLService.h index 573fd0a58e47..fdfe9a45cf06 100644 --- a/content/xbl/src/nsXBLService.h +++ b/content/xbl/src/nsXBLService.h @@ -8,15 +8,16 @@ #ifndef nsXBLService_h_ #define nsXBLService_h_ +#include "mozilla/LinkedList.h" #include "nsString.h" #include "nsIObserver.h" #include "nsWeakReference.h" #include "jsapi.h" // nsXBLJSClass derives from JSClass -#include "jsclist.h" // nsXBLJSClass derives from JSCList #include "nsTArray.h" class nsXBLBinding; class nsXBLDocumentInfo; +class nsXBLJSClass; class nsIContent; class nsIDocument; class nsString; @@ -124,7 +125,8 @@ public: static nsHashtable* gClassTable; // A table of nsXBLJSClass objects. - static JSCList gClassLRUList; // LRU list of cached classes. + static mozilla::LinkedList* gClassLRUList; + // LRU list of cached classes. static uint32_t gClassLRUListLength; // Number of classes on LRU list. static uint32_t gClassLRUListQuota; // Quota on class LRU list. static bool gAllowDataURIs; // Whether we should allow data @@ -132,7 +134,8 @@ public: // testing. }; -class nsXBLJSClass : public JSCList, public JSClass +class nsXBLJSClass : public mozilla::LinkedListElement + , public JSClass { private: nsrefcnt mRefCnt; From e88cf99a1526e3d5cf5089bb39ad04b8b1cd1816 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:34:48 +0200 Subject: [PATCH 52/79] Bug 907605 - Remove BindingUtils.h include from PrimitiveConversions.h; r=bz --- dom/bindings/BindingUtils.h | 2 -- dom/bindings/ErrorResult.h | 5 +++++ dom/bindings/PrimitiveConversions.h | 6 ++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/dom/bindings/BindingUtils.h b/dom/bindings/BindingUtils.h index a1a45ca286c0..3f7a9278dabc 100644 --- a/dom/bindings/BindingUtils.h +++ b/dom/bindings/BindingUtils.h @@ -62,8 +62,6 @@ UnwrapArg(JSContext* cx, jsval v, Interface** ppArg, return rv; } -bool -ThrowErrorMessage(JSContext* aCx, const ErrNum aErrorNumber, ...); bool ThrowInvalidThis(JSContext* aCx, const JS::CallArgs& aArgs, const ErrNum aErrorNumber, diff --git a/dom/bindings/ErrorResult.h b/dom/bindings/ErrorResult.h index 5050157f9f4d..d32a7a719a0f 100644 --- a/dom/bindings/ErrorResult.h +++ b/dom/bindings/ErrorResult.h @@ -18,6 +18,8 @@ #include "nsStringGlue.h" #include "mozilla/Assertions.h" +struct JSContext; + namespace mozilla { namespace dom { @@ -30,6 +32,9 @@ enum ErrNum { Err_Limit }; +bool +ThrowErrorMessage(JSContext* aCx, const ErrNum aErrorNumber, ...); + } // namespace dom class ErrorResult { diff --git a/dom/bindings/PrimitiveConversions.h b/dom/bindings/PrimitiveConversions.h index 1108913dc58e..4785a0568955 100644 --- a/dom/bindings/PrimitiveConversions.h +++ b/dom/bindings/PrimitiveConversions.h @@ -13,10 +13,12 @@ #include #include +#include + +#include "jsapi.h" #include "mozilla/Assertions.h" -#include "mozilla/dom/BindingUtils.h" +#include "mozilla/ErrorResult.h" #include "mozilla/FloatingPoint.h" -#include "xpcpublic.h" namespace mozilla { namespace dom { From c33067d172748d923ff483333e7e143a3fc7ace3 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:34:54 +0200 Subject: [PATCH 53/79] Bug 907606 - Remove BindingUtils.h include from WebGLContext.h; r=mounir --- content/canvas/src/WebGLContext.h | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/content/canvas/src/WebGLContext.h b/content/canvas/src/WebGLContext.h index d25376bf6183..27d06ebfca93 100644 --- a/content/canvas/src/WebGLContext.h +++ b/content/canvas/src/WebGLContext.h @@ -13,18 +13,11 @@ #include #include "nsTArray.h" -#include "nsDataHashtable.h" -#include "nsHashKeys.h" #include "nsCycleCollectionNoteChild.h" -#include "nsIDocShell.h" - #include "nsIDOMWebGLRenderingContext.h" #include "nsICanvasRenderingContextInternal.h" #include "mozilla/dom/HTMLCanvasElement.h" -#include "nsIDOMHTMLElement.h" -#include "nsIMemoryReporter.h" -#include "nsIJSNativeInitializer.h" #include "nsWrapperCache.h" #include "nsIObserver.h" @@ -39,9 +32,9 @@ #endif #include "mozilla/dom/TypedArray.h" -#include "mozilla/dom/Nullable.h" #include "mozilla/ErrorResult.h" -#include "mozilla/dom/BindingUtils.h" + +class nsIDocShell; /* * Minimum value constants defined in 6.2 State Tables of OpenGL ES - 2.0.25 @@ -82,6 +75,7 @@ class WebGLVertexArray; namespace dom { struct WebGLContextAttributes; struct WebGLContextAttributesInitializer; +template class Nullable; } using WebGLTexelConversions::WebGLTexelFormat; From 69316b294af19994181551117660298429827844 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:34:58 +0200 Subject: [PATCH 54/79] No bug - Fix indentation in xpcshell's mach handler; r=ted --- testing/xpcshell/mach_commands.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/xpcshell/mach_commands.py b/testing/xpcshell/mach_commands.py index 1f38190ff133..c59cff37747d 100644 --- a/testing/xpcshell/mach_commands.py +++ b/testing/xpcshell/mach_commands.py @@ -69,8 +69,8 @@ class XPCShellRunner(MozbuildObject): xpcshell_dirs = [] for base, dirs, files in os.walk(test_obj_dir): - if os.path.exists(mozpack.path.join(base, 'xpcshell.ini')): - xpcshell_dirs.append(base) + if os.path.exists(mozpack.path.join(base, 'xpcshell.ini')): + xpcshell_dirs.append(base) if not xpcshell_dirs: raise InvalidTestPathError('An xpcshell.ini could not be found ' From 9cfd854dab711d6b494ea6a44fadd323de5e845e Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:35:03 +0200 Subject: [PATCH 55/79] Bug 906342 - Move the remaining SIMPLE_PROGRAMS to moz.build and disallow setting SIMPLE_PROGRAMS in Makefiles; r=gps --- config/rules.mk | 1 + intl/uconv/tests/Makefile.in | 18 ------------------ intl/uconv/tests/moz.build | 17 +++++++++++++++++ js/src/config/rules.mk | 1 + mozglue/tests/Makefile.in | 1 - mozglue/tests/moz.build | 3 +++ toolkit/mozapps/update/test/Makefile.in | 9 --------- toolkit/mozapps/update/test/moz.build | 14 ++++++++++++-- 8 files changed, 34 insertions(+), 30 deletions(-) diff --git a/config/rules.mk b/config/rules.mk index 83ee08c94300..ce6a361e9bb4 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -27,6 +27,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \ MODULE \ NO_DIST_INSTALL \ PARALLEL_DIRS \ + SIMPLE_PROGRAMS \ TEST_DIRS \ TIERS \ TOOL_DIRS \ diff --git a/intl/uconv/tests/Makefile.in b/intl/uconv/tests/Makefile.in index 5492fb833abb..7e216b794096 100644 --- a/intl/uconv/tests/Makefile.in +++ b/intl/uconv/tests/Makefile.in @@ -11,24 +11,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk -# Tests disabled because they dont work in libxul builds. -#MOZILLA_INTERNAL_API = 1 -# -# -#CPPSRCS = \ -# TestUConv.cpp \ -# nsconv.cpp \ -# plattest.cpp \ -# $(NULL) -# -#ifeq ($(OS_ARCH),WINNT) -#CPPSRCS += convperf.cpp -#endif -# -#SIMPLE_PROGRAMS = $(CPPSRCS:.cpp=$(BIN_SUFFIX)) - -relativesrcdir = @relativesrcdir@ - MOCHITEST_FILES = \ test_bug335816.html \ test_bug843434.html \ diff --git a/intl/uconv/tests/moz.build b/intl/uconv/tests/moz.build index 6476e91ca056..2db8a4aeb15d 100644 --- a/intl/uconv/tests/moz.build +++ b/intl/uconv/tests/moz.build @@ -7,3 +7,20 @@ MODULE = 'test_intl_uconv' XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] + +# Tests disabled because they dont work in libxul builds. +#MOZILLA_INTERNAL_API = True +# +#CPP_SOURCES += [ +# 'TestUConv.cpp', +# 'nsconv.cpp', +# 'plattest.cpp', +#] +# +#if CONFIG['OS_ARCH'] == 'WINNT': +# CPP_SOURCES += [ +# 'convperf.cpp', +# ] +# +#SIMPLE_PROGRAMS += [source.replace('.cpp', CONFIG['BIN_SUFFIX']), CPP_SOURCES] + diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk index 83ee08c94300..ce6a361e9bb4 100644 --- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -27,6 +27,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \ MODULE \ NO_DIST_INSTALL \ PARALLEL_DIRS \ + SIMPLE_PROGRAMS \ TEST_DIRS \ TIERS \ TOOL_DIRS \ diff --git a/mozglue/tests/Makefile.in b/mozglue/tests/Makefile.in index 5fa079c33290..9eeee4fa2de5 100644 --- a/mozglue/tests/Makefile.in +++ b/mozglue/tests/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk ifdef MOZ_LINKER -SIMPLE_PROGRAMS := TestZip$(BIN_SUFFIX) STL_FLAGS = LOCAL_INCLUDES += -I$(srcdir)/../linker diff --git a/mozglue/tests/moz.build b/mozglue/tests/moz.build index 5f0fcc5544d5..2ae9d4e6a2e9 100644 --- a/mozglue/tests/moz.build +++ b/mozglue/tests/moz.build @@ -11,3 +11,6 @@ if CONFIG['MOZ_LINKER']: 'TestZip.cpp', 'ShowSSEConfig.cpp', ] + SIMPLE_PROGRAMS += [ + 'TestZip' + CONFIG['BIN_SUFFIX'], + ] diff --git a/toolkit/mozapps/update/test/Makefile.in b/toolkit/mozapps/update/test/Makefile.in index b01aac72a218..45d486139352 100644 --- a/toolkit/mozapps/update/test/Makefile.in +++ b/toolkit/mozapps/update/test/Makefile.in @@ -26,15 +26,6 @@ DEFINES += -DMOZ_MAINTENANCE_SERVICE=$(MOZ_MAINTENANCE_SERVICE) endif ifneq (android,$(MOZ_WIDGET_TOOLKIT)) -# TODO: Remove when SIMPLE_PROGRAMS is in moz.build -cppsrcs = \ - TestAUSReadStrings.cpp \ - TestAUSHelper.cpp \ - $(NULL) - -# TODO: Base off of CPP_SOURCES in moz.build -SIMPLE_PROGRAMS = $(cppsrcs:.cpp=$(BIN_SUFFIX)) - INI_TEST_FILES = \ TestAUSReadStrings1.ini \ TestAUSReadStrings2.ini \ diff --git a/toolkit/mozapps/update/test/moz.build b/toolkit/mozapps/update/test/moz.build index 991aa438a3b3..601ce5ac6e67 100644 --- a/toolkit/mozapps/update/test/moz.build +++ b/toolkit/mozapps/update/test/moz.build @@ -6,9 +6,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': DIRS += ['chrome'] + + sources = [ + 'TestAUSHelper', + 'TestAUSReadStrings', + ] + CPP_SOURCES += [ - 'TestAUSReadStrings.cpp', - 'TestAUSHelper.cpp', + '%s.cpp' % s for s in sources + ] + + bin_suffix = CONFIG['BIN_SUFFIX'] + SIMPLE_PROGRAMS += [ + '%s%s' % (s, bin_suffix) for s in sources ] XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] From 52505f4f1de16caa588c740d43f1e92a821626b9 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:55:53 +0200 Subject: [PATCH 56/79] Bug 906343 - Remove the last reference to XPCSHELL_TESTS in a Makefile; r=gps --- dom/indexedDB/ipc/Makefile.in | 8 -------- 1 file changed, 8 deletions(-) diff --git a/dom/indexedDB/ipc/Makefile.in b/dom/indexedDB/ipc/Makefile.in index b03544ee5820..1bacc1f590ad 100644 --- a/dom/indexedDB/ipc/Makefile.in +++ b/dom/indexedDB/ipc/Makefile.in @@ -21,14 +21,6 @@ LOCAL_INCLUDES += \ MOCHITEST_FILES = test_ipc.html -# bug: 866734 - move XPCSHEL_TESTS to moz.build - -# Need to enable these tests sometime soon. -#DISABLED_XPCSHELL_TESTS = unit - -# We're copying tests from another directory so this check is wrong for us. -#NO_XPCSHELL_MANIFEST_CHECK = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk From 68aab516ebf96954b85b76d12dd4b87e06146404 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:55:58 +0200 Subject: [PATCH 57/79] Bug 882859 - Part a: Introduce FAIL_ON_WARNINGS into moz.build; r=gps --- python/mozbuild/mozbuild/backend/recursivemake.py | 4 +++- python/mozbuild/mozbuild/frontend/emitter.py | 1 + python/mozbuild/mozbuild/frontend/sandbox_symbols.py | 4 ++++ .../mozbuild/test/backend/data/variable_passthru/moz.build | 2 ++ python/mozbuild/mozbuild/test/backend/test_recursivemake.py | 3 +++ .../mozbuild/test/frontend/data/variable-passthru/moz.build | 2 ++ python/mozbuild/mozbuild/test/frontend/test_emitter.py | 1 + 7 files changed, 16 insertions(+), 1 deletion(-) diff --git a/python/mozbuild/mozbuild/backend/recursivemake.py b/python/mozbuild/mozbuild/backend/recursivemake.py index b0347d8058d1..5c8dcdef7042 100644 --- a/python/mozbuild/mozbuild/backend/recursivemake.py +++ b/python/mozbuild/mozbuild/backend/recursivemake.py @@ -200,7 +200,9 @@ class RecursiveMakeBackend(CommonBackend): if isinstance(v, list): for item in v: backend_file.write('%s += %s\n' % (k, item)) - + elif isinstance(v, bool): + if v: + backend_file.write('%s := 1\n' % k) else: backend_file.write('%s := %s\n' % (k, v)) elif isinstance(obj, Exports): diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py index d85d879b326d..940dfc2ab2a4 100644 --- a/python/mozbuild/mozbuild/frontend/emitter.py +++ b/python/mozbuild/mozbuild/frontend/emitter.py @@ -122,6 +122,7 @@ class TreeMetadataEmitter(LoggingMixin): EXTRA_JS_MODULES='EXTRA_JS_MODULES', EXTRA_PP_COMPONENTS='EXTRA_PP_COMPONENTS', EXTRA_PP_JS_MODULES='EXTRA_PP_JS_MODULES', + FAIL_ON_WARNINGS='FAIL_ON_WARNINGS', GTEST_CMMSRCS='GTEST_CMM_SOURCES', GTEST_CPPSRCS='GTEST_CPP_SOURCES', GTEST_CSRCS='GTEST_C_SOURCES', diff --git a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py index 891bd86aebfd..204cb7bb0f68 100644 --- a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py +++ b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py @@ -134,6 +134,10 @@ VARIABLES = { exist. These generally have .cpp extensions. """), + 'FAIL_ON_WARNINGS': (bool, bool, False, + """Whether to treat warnings as errors. + """), + 'GTEST_C_SOURCES': (StrictOrderingOnAppendList, list, [], """C code source files for GTest unit tests. diff --git a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build b/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build index d349e488cc7f..2ad897de7874 100644 --- a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build +++ b/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build @@ -39,3 +39,5 @@ CSRCS += ['bar.c', 'foo.c'] CMMSRCS = ['bar.mm', 'foo.mm'] SSRCS = ['bar.S', 'foo.S'] + +FAIL_ON_WARNINGS = True diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py index 86a8d5ba54b7..9cd892b1d096 100644 --- a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py +++ b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py @@ -175,6 +175,9 @@ class TestRecursiveMakeBackend(BackendTester): 'EXTRA_PP_JS_MODULES += bar.pp.jsm', 'EXTRA_PP_JS_MODULES += foo.pp.jsm', ], + 'FAIL_ON_WARNINGS': [ + 'FAIL_ON_WARNINGS := 1', + ], 'GTEST_CMMSRCS': [ 'GTEST_CMMSRCS += test1.mm', 'GTEST_CMMSRCS += test2.mm', diff --git a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build b/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build index 1bc40a2aae23..8c34b775f439 100644 --- a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build +++ b/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build @@ -40,4 +40,6 @@ CMMSRCS = ['fans.mm', 'tans.mm'] SSRCS = ['fans.S', 'tans.S'] +FAIL_ON_WARNINGS = True + NO_DIST_INSTALL = True diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py index f284b3e8c102..37a72381a39c 100644 --- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py +++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py @@ -136,6 +136,7 @@ class TestEmitterBasic(unittest.TestCase): EXTRA_PP_COMPONENTS=['fans.pp.js', 'tans.pp.js'], EXTRA_JS_MODULES=['bar.jsm', 'foo.jsm'], EXTRA_PP_JS_MODULES=['bar.pp.jsm', 'foo.pp.jsm'], + FAIL_ON_WARNINGS=True, GTEST_CSRCS=['test1.c', 'test2.c'], GTEST_CMMSRCS=['test1.mm', 'test2.mm'], GTEST_CPPSRCS=['test1.cpp', 'test2.cpp'], From 4807f1c86c4c84845f36fbd8555ce5d9ca84c3d0 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:55:59 +0200 Subject: [PATCH 58/79] Bug 882859 - Part b: Move FAIL_ON_WARNINGS into moz.build; r=joey+gps --- b2g/components/test/Makefile.in | 16 ---------------- b2g/components/test/moz.build | 3 +++ content/base/src/Makefile.in | 2 -- content/base/src/moz.build | 3 +++ content/canvas/compiledtest/Makefile.in | 2 -- content/canvas/compiledtest/moz.build | 2 ++ content/canvas/src/Makefile.in | 2 -- content/canvas/src/moz.build | 3 +++ content/events/src/Makefile.in | 2 -- content/events/src/moz.build | 3 +++ content/html/content/src/Makefile.in | 2 -- content/html/content/src/moz.build | 2 ++ content/html/document/src/Makefile.in | 2 -- content/html/document/src/moz.build | 2 ++ content/mathml/content/src/Makefile.in | 2 -- content/mathml/content/src/moz.build | 2 ++ content/media/Makefile.in | 2 -- content/media/directshow/Makefile.in | 2 -- content/media/directshow/moz.build | 3 +++ content/media/encoder/Makefile.in | 3 --- content/media/encoder/moz.build | 2 ++ content/media/gstreamer/Makefile.in | 2 -- content/media/gstreamer/moz.build | 2 ++ content/media/mediasource/Makefile.in | 2 -- content/media/mediasource/moz.build | 2 ++ content/media/moz.build | 3 +++ content/media/ogg/Makefile.in | 3 --- content/media/ogg/moz.build | 2 ++ content/media/raw/Makefile.in | 2 -- content/media/raw/moz.build | 2 ++ content/media/wave/Makefile.in | 2 -- content/media/wave/moz.build | 2 ++ content/media/webaudio/Makefile.in | 2 -- content/media/webaudio/compiledtest/Makefile.in | 2 -- content/media/webaudio/compiledtest/moz.build | 2 ++ content/media/webaudio/moz.build | 2 ++ content/media/webm/Makefile.in | 2 -- content/media/webm/moz.build | 2 ++ content/media/webspeech/synth/Makefile.in | 3 --- content/media/webspeech/synth/moz.build | 3 +++ content/media/wmf/Makefile.in | 2 -- content/media/wmf/moz.build | 2 ++ content/smil/Makefile.in | 2 -- content/smil/moz.build | 2 ++ content/svg/content/src/Makefile.in | 2 -- content/svg/content/src/moz.build | 2 ++ content/svg/document/src/Makefile.in | 2 -- content/svg/document/src/moz.build | 2 ++ content/xbl/src/Makefile.in | 2 -- content/xbl/src/moz.build | 2 ++ content/xml/content/src/Makefile.in | 2 -- content/xml/content/src/moz.build | 2 ++ content/xml/document/src/Makefile.in | 2 -- content/xml/document/src/moz.build | 2 ++ content/xslt/src/base/Makefile.in | 2 -- content/xslt/src/base/moz.build | 2 ++ content/xslt/src/xml/Makefile.in | 2 -- content/xslt/src/xml/moz.build | 2 ++ content/xslt/src/xpath/Makefile.in | 2 -- content/xslt/src/xpath/moz.build | 2 ++ content/xslt/src/xslt/Makefile.in | 1 - content/xslt/src/xslt/moz.build | 2 ++ content/xul/content/src/Makefile.in | 4 ---- content/xul/content/src/moz.build | 3 +++ content/xul/document/src/Makefile.in | 2 -- content/xul/document/src/moz.build | 2 ++ docshell/base/Makefile.in | 1 - docshell/base/moz.build | 2 ++ docshell/shistory/src/Makefile.in | 2 -- docshell/shistory/src/moz.build | 2 ++ dom/activities/src/Makefile.in | 2 -- dom/activities/src/moz.build | 3 +++ dom/activities/tests/Makefile.in | 15 --------------- dom/activities/tests/moz.build | 3 +++ dom/alarm/Makefile.in | 2 -- dom/alarm/moz.build | 3 +++ dom/audiochannel/Makefile.in | 2 -- dom/audiochannel/moz.build | 2 ++ dom/audiochannel/tests/Makefile.in | 16 ---------------- dom/audiochannel/tests/moz.build | 2 ++ dom/base/Makefile.in | 3 --- dom/base/moz.build | 3 +++ dom/battery/Makefile.in | 2 -- dom/battery/moz.build | 2 ++ dom/bindings/Makefile.in | 1 - dom/bindings/moz.build | 3 +++ dom/bluetooth/Makefile.in | 2 -- dom/bluetooth/moz.build | 3 +++ dom/browser-element/Makefile.in | 2 -- dom/browser-element/moz.build | 3 +++ dom/camera/Makefile.in | 2 -- dom/camera/moz.build | 3 +++ dom/cellbroadcast/src/Makefile.in | 2 -- dom/cellbroadcast/src/moz.build | 2 ++ dom/devicestorage/Makefile.in | 2 -- dom/devicestorage/moz.build | 3 +++ dom/encoding/Makefile.in | 2 -- dom/encoding/moz.build | 2 ++ dom/file/Makefile.in | 2 -- dom/file/moz.build | 2 ++ dom/gamepad/Makefile.in | 2 -- dom/gamepad/moz.build | 3 +++ dom/icc/src/Makefile.in | 2 -- dom/icc/src/moz.build | 2 ++ dom/indexedDB/Makefile.in | 2 -- dom/indexedDB/ipc/Makefile.in | 2 -- dom/indexedDB/ipc/moz.build | 3 +++ dom/indexedDB/moz.build | 2 ++ dom/ipc/Makefile.in | 2 -- dom/ipc/moz.build | 3 +++ dom/media/Makefile.in | 2 -- dom/media/moz.build | 3 +++ dom/mobilemessage/src/Makefile.in | 2 -- dom/mobilemessage/src/moz.build | 3 +++ dom/network/src/Makefile.in | 3 --- dom/network/src/moz.build | 3 +++ dom/plugins/base/Makefile.in | 5 ----- dom/plugins/base/android/Makefile.in | 2 -- dom/plugins/base/android/moz.build | 2 ++ dom/plugins/base/moz.build | 6 ++++++ dom/plugins/ipc/Makefile.in | 2 -- dom/plugins/ipc/moz.build | 3 +++ dom/plugins/test/testplugin/Makefile.in | 3 --- dom/plugins/test/testplugin/moz.build | 1 + dom/power/Makefile.in | 2 -- dom/power/moz.build | 2 ++ dom/promise/Makefile.in | 2 -- dom/promise/moz.build | 3 +++ dom/quota/Makefile.in | 2 -- dom/quota/moz.build | 2 ++ dom/src/events/Makefile.in | 2 -- dom/src/events/moz.build | 2 ++ dom/src/geolocation/Makefile.in | 2 -- dom/src/geolocation/moz.build | 2 ++ dom/src/json/Makefile.in | 2 -- dom/src/json/moz.build | 2 ++ dom/src/jsurl/Makefile.in | 2 -- dom/src/jsurl/moz.build | 2 ++ dom/src/notification/Makefile.in | 2 -- dom/src/notification/moz.build | 2 ++ dom/src/offline/Makefile.in | 2 -- dom/src/offline/moz.build | 2 ++ dom/src/storage/Makefile.in | 2 -- dom/src/storage/moz.build | 3 +++ dom/system/Makefile.in | 2 -- dom/system/android/Makefile.in | 2 -- dom/system/android/moz.build | 2 ++ dom/system/gonk/Makefile.in | 2 -- dom/system/gonk/moz.build | 2 ++ dom/system/mac/Makefile.in | 2 -- dom/system/mac/moz.build | 3 +++ dom/system/moz.build | 2 ++ dom/system/unix/Makefile.in | 2 -- dom/system/unix/moz.build | 3 +++ dom/system/windows/Makefile.in | 1 - dom/system/windows/moz.build | 2 ++ dom/telephony/Makefile.in | 2 -- dom/telephony/moz.build | 2 ++ dom/time/Makefile.in | 2 -- dom/time/moz.build | 2 ++ dom/voicemail/Makefile.in | 2 -- dom/voicemail/moz.build | 2 ++ dom/workers/Makefile.in | 2 -- dom/workers/moz.build | 2 ++ editor/Makefile.in | 15 --------------- editor/composer/src/Makefile.in | 3 --- editor/composer/src/moz.build | 2 ++ editor/libeditor/base/Makefile.in | 2 -- editor/libeditor/base/moz.build | 2 ++ editor/libeditor/html/Makefile.in | 2 -- editor/libeditor/html/moz.build | 2 ++ editor/libeditor/text/Makefile.in | 2 -- editor/libeditor/text/moz.build | 2 ++ editor/moz.build | 3 +++ editor/txmgr/src/Makefile.in | 2 -- editor/txmgr/src/moz.build | 2 ++ editor/txmgr/tests/Makefile.in | 15 --------------- editor/txmgr/tests/moz.build | 2 ++ editor/txtsvc/src/Makefile.in | 2 -- editor/txtsvc/src/moz.build | 2 ++ embedding/browser/build/Makefile.in | 3 --- embedding/browser/build/moz.build | 2 ++ embedding/browser/webBrowser/Makefile.in | 3 --- embedding/browser/webBrowser/moz.build | 2 ++ embedding/components/appstartup/src/Makefile.in | 2 -- embedding/components/appstartup/src/moz.build | 2 ++ embedding/components/build/Makefile.in | 2 -- embedding/components/build/moz.build | 2 ++ .../components/commandhandler/src/Makefile.in | 2 -- .../components/commandhandler/src/moz.build | 2 ++ embedding/components/find/src/Makefile.in | 2 -- embedding/components/find/src/moz.build | 2 ++ .../components/printingui/src/mac/Makefile.in | 4 ---- .../components/printingui/src/mac/moz.build | 3 +++ .../printingui/src/unixshared/Makefile.in | 2 -- .../printingui/src/unixshared/moz.build | 2 ++ .../components/printingui/src/win/Makefile.in | 2 -- .../components/printingui/src/win/moz.build | 2 ++ .../components/webbrowserpersist/src/Makefile.in | 2 -- .../components/webbrowserpersist/src/moz.build | 2 ++ .../components/windowwatcher/src/Makefile.in | 5 +++-- embedding/components/windowwatcher/src/moz.build | 2 ++ extensions/gio/Makefile.in | 2 -- extensions/gio/moz.build | 2 ++ gfx/gl/Makefile.in | 3 --- gfx/gl/moz.build | 2 ++ gfx/src/Makefile.in | 2 -- gfx/src/moz.build | 2 ++ gfx/thebes/Makefile.in | 4 ---- gfx/thebes/moz.build | 2 ++ hal/Makefile.in | 2 -- hal/moz.build | 3 +++ image/build/Makefile.in | 2 -- image/build/moz.build | 2 ++ image/decoders/Makefile.in | 2 -- image/decoders/icon/Makefile.in | 2 -- image/decoders/icon/android/Makefile.in | 2 -- image/decoders/icon/android/moz.build | 2 ++ image/decoders/icon/gtk/Makefile.in | 2 -- image/decoders/icon/gtk/moz.build | 2 ++ image/decoders/icon/mac/Makefile.in | 4 ---- image/decoders/icon/mac/moz.build | 3 +++ image/decoders/icon/moz.build | 2 ++ image/decoders/icon/win/Makefile.in | 2 -- image/decoders/icon/win/moz.build | 2 ++ image/decoders/moz.build | 2 ++ image/encoders/bmp/Makefile.in | 2 -- image/encoders/bmp/moz.build | 2 ++ image/encoders/ico/Makefile.in | 1 - image/encoders/ico/moz.build | 2 ++ image/encoders/jpeg/Makefile.in | 2 -- image/encoders/jpeg/moz.build | 2 ++ image/encoders/png/Makefile.in | 2 -- image/encoders/png/moz.build | 2 ++ image/src/Makefile.in | 1 - image/src/moz.build | 2 ++ ipc/testshell/Makefile.in | 2 -- ipc/testshell/moz.build | 3 +++ ipc/unixsocket/Makefile.in | 2 -- ipc/unixsocket/moz.build | 2 ++ js/ipc/Makefile.in | 2 -- js/ipc/moz.build | 3 +++ js/xpconnect/loader/Makefile.in | 1 - js/xpconnect/loader/moz.build | 3 +++ js/xpconnect/src/Makefile.in | 2 -- js/xpconnect/src/moz.build | 2 ++ js/xpconnect/wrappers/Makefile.in | 3 --- js/xpconnect/wrappers/moz.build | 2 ++ layout/base/Makefile.in | 2 -- layout/base/moz.build | 2 ++ layout/build/Makefile.in | 3 --- layout/build/moz.build | 2 ++ layout/forms/Makefile.in | 2 -- layout/forms/moz.build | 2 ++ layout/generic/Makefile.in | 3 --- layout/generic/moz.build | 2 ++ layout/inspector/src/Makefile.in | 2 -- layout/inspector/src/moz.build | 2 ++ layout/ipc/Makefile.in | 2 -- layout/ipc/moz.build | 3 +++ layout/mathml/Makefile.in | 3 --- layout/mathml/moz.build | 2 ++ layout/printing/Makefile.in | 2 -- layout/printing/moz.build | 2 ++ layout/style/Makefile.in | 2 -- layout/style/moz.build | 2 ++ layout/svg/Makefile.in | 3 --- layout/svg/moz.build | 2 ++ layout/tables/Makefile.in | 2 -- layout/tables/moz.build | 2 ++ layout/tools/layout-debug/src/Makefile.in | 3 --- layout/tools/layout-debug/src/moz.build | 2 ++ layout/xul/base/src/Makefile.in | 2 -- layout/xul/base/src/moz.build | 3 +++ layout/xul/grid/Makefile.in | 2 -- layout/xul/grid/moz.build | 2 ++ layout/xul/tree/Makefile.in | 2 -- layout/xul/tree/moz.build | 2 ++ media/mtransport/build/Makefile.in | 4 ---- media/mtransport/build/moz.build | 1 + media/mtransport/test/Makefile.in | 2 -- media/mtransport/test/moz.build | 3 +++ modules/libjar/Makefile.in | 2 -- modules/libjar/moz.build | 2 ++ mozglue/android/Makefile.in | 2 -- mozglue/android/moz.build | 2 ++ netwerk/base/public/Makefile.in | 2 -- netwerk/base/public/moz.build | 2 ++ netwerk/base/src/Makefile.in | 2 -- netwerk/base/src/moz.build | 3 +++ netwerk/build/Makefile.in | 2 -- netwerk/build/moz.build | 2 ++ netwerk/cache/Makefile.in | 2 -- netwerk/cache/moz.build | 2 ++ netwerk/cookie/Makefile.in | 2 -- netwerk/cookie/moz.build | 3 +++ netwerk/dns/Makefile.in | 1 - netwerk/dns/moz.build | 2 ++ netwerk/ipc/Makefile.in | 2 -- netwerk/ipc/moz.build | 3 +++ netwerk/mime/Makefile.in | 2 -- netwerk/mime/moz.build | 2 ++ netwerk/protocol/about/Makefile.in | 2 -- netwerk/protocol/about/moz.build | 2 ++ netwerk/protocol/data/Makefile.in | 2 -- netwerk/protocol/data/moz.build | 2 ++ netwerk/protocol/device/Makefile.in | 2 -- netwerk/protocol/device/moz.build | 2 ++ netwerk/protocol/file/Makefile.in | 2 -- netwerk/protocol/file/moz.build | 2 ++ netwerk/protocol/ftp/Makefile.in | 2 -- netwerk/protocol/ftp/moz.build | 3 +++ netwerk/protocol/http/Makefile.in | 2 -- netwerk/protocol/http/moz.build | 3 +++ netwerk/protocol/res/Makefile.in | 2 -- netwerk/protocol/res/moz.build | 2 ++ netwerk/protocol/viewsource/Makefile.in | 2 -- netwerk/protocol/viewsource/moz.build | 2 ++ netwerk/protocol/websocket/Makefile.in | 2 -- netwerk/protocol/websocket/moz.build | 3 +++ netwerk/protocol/wyciwyg/Makefile.in | 2 -- netwerk/protocol/wyciwyg/moz.build | 3 +++ netwerk/sctp/datachannel/Makefile.in | 2 -- netwerk/sctp/datachannel/moz.build | 2 ++ netwerk/socket/Makefile.in | 2 -- netwerk/socket/moz.build | 2 ++ netwerk/streamconv/converters/Makefile.in | 2 -- netwerk/streamconv/converters/moz.build | 2 ++ netwerk/streamconv/public/Makefile.in | 16 ---------------- netwerk/streamconv/public/moz.build | 2 ++ netwerk/streamconv/src/Makefile.in | 7 ------- netwerk/streamconv/src/moz.build | 13 ++++++++----- netwerk/streamconv/test/Makefile.in | 2 -- netwerk/streamconv/test/moz.build | 3 +++ netwerk/system/android/Makefile.in | 2 -- netwerk/system/android/moz.build | 2 ++ netwerk/system/mac/Makefile.in | 2 -- netwerk/system/mac/moz.build | 3 +++ netwerk/system/maemo/Makefile.in | 2 -- netwerk/system/maemo/moz.build | 2 ++ netwerk/system/qt/Makefile.in | 2 -- netwerk/system/qt/moz.build | 2 ++ netwerk/system/win32/Makefile.in | 2 -- netwerk/system/win32/moz.build | 2 ++ netwerk/test/mochitests/Makefile.in | 2 -- netwerk/test/mochitests/moz.build | 3 +++ netwerk/wifi/Makefile.in | 5 ----- netwerk/wifi/moz.build | 4 ++++ security/manager/boot/src/Makefile.in | 2 -- security/manager/boot/src/moz.build | 2 ++ security/manager/pki/src/Makefile.in | 2 -- security/manager/pki/src/moz.build | 2 ++ services/crypto/component/Makefile.in | 2 -- services/crypto/component/moz.build | 2 ++ toolkit/components/autocomplete/Makefile.in | 2 -- toolkit/components/autocomplete/moz.build | 2 ++ toolkit/components/downloads/Makefile.in | 2 -- toolkit/components/downloads/moz.build | 3 +++ toolkit/components/perf/Makefile.in | 2 -- toolkit/components/perf/moz.build | 3 +++ toolkit/components/places/tests/cpp/Makefile.in | 14 -------------- toolkit/components/places/tests/cpp/moz.build | 2 ++ toolkit/components/telemetry/Makefile.in | 2 -- toolkit/components/telemetry/moz.build | 3 +++ toolkit/components/url-classifier/Makefile.in | 2 -- toolkit/components/url-classifier/moz.build | 3 +++ toolkit/identity/Makefile.in | 2 -- toolkit/identity/moz.build | 3 +++ toolkit/system/gnome/Makefile.in | 2 -- toolkit/system/gnome/moz.build | 2 ++ tools/profiler/Makefile.in | 3 --- tools/profiler/moz.build | 3 +++ uriloader/base/Makefile.in | 2 -- uriloader/base/moz.build | 2 ++ uriloader/exthandler/Makefile.in | 3 --- uriloader/exthandler/moz.build | 3 +++ uriloader/prefetch/Makefile.in | 2 -- uriloader/prefetch/moz.build | 3 +++ view/src/Makefile.in | 2 -- view/src/moz.build | 2 ++ webapprt/gtk2/Makefile.in | 2 -- webapprt/gtk2/moz.build | 3 +++ widget/android/Makefile.in | 2 -- widget/android/moz.build | 2 ++ widget/gonk/nativewindow/Makefile.in | 1 - widget/gonk/nativewindow/moz.build | 2 ++ widget/gtk2/Makefile.in | 2 -- widget/gtk2/moz.build | 3 +++ widget/tests/Makefile.in | 2 -- widget/tests/moz.build | 2 ++ 390 files changed, 461 insertions(+), 518 deletions(-) delete mode 100644 b2g/components/test/Makefile.in delete mode 100644 dom/activities/tests/Makefile.in delete mode 100644 dom/audiochannel/tests/Makefile.in delete mode 100644 editor/Makefile.in delete mode 100644 editor/txmgr/tests/Makefile.in delete mode 100644 netwerk/streamconv/public/Makefile.in delete mode 100644 toolkit/components/places/tests/cpp/Makefile.in diff --git a/b2g/components/test/Makefile.in b/b2g/components/test/Makefile.in deleted file mode 100644 index 29a9eedf6ac2..000000000000 --- a/b2g/components/test/Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ -# vim: noexpandtab ts=8 sw=8 -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ -FAIL_ON_WARNINGS := 1 - -include $(DEPTH)/config/autoconf.mk - -include $(topsrcdir)/config/rules.mk diff --git a/b2g/components/test/moz.build b/b2g/components/test/moz.build index 556309ce4095..99d23a409214 100644 --- a/b2g/components/test/moz.build +++ b/b2g/components/test/moz.build @@ -7,3 +7,6 @@ MODULE = 'B2GComponents' XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] + +FAIL_ON_WARNINGS = True + diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in index 8cdec868b976..417b48dbc572 100644 --- a/content/base/src/Makefile.in +++ b/content/base/src/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconbase_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - ifdef MOZ_WEBRTC LOCAL_INCLUDES += \ -I$(topsrcdir)/netwerk/sctp/datachannel \ diff --git a/content/base/src/moz.build b/content/base/src/moz.build index afaa6dd83547..a149aec820dd 100644 --- a/content/base/src/moz.build +++ b/content/base/src/moz.build @@ -169,3 +169,6 @@ EXTRA_PP_COMPONENTS += [ EXTRA_JS_MODULES += [ 'CSPUtils.jsm', ] + +FAIL_ON_WARNINGS = True + diff --git a/content/canvas/compiledtest/Makefile.in b/content/canvas/compiledtest/Makefile.in index 2baa1df28669..b1858fe42fbb 100644 --- a/content/canvas/compiledtest/Makefile.in +++ b/content/canvas/compiledtest/Makefile.in @@ -7,8 +7,6 @@ topsrcdir := @top_srcdir@ srcdir := @srcdir@ VPATH := @srcdir@ -FAIL_ON_WARNINGS = 1 - include $(DEPTH)/config/autoconf.mk LOCAL_INCLUDES := \ diff --git a/content/canvas/compiledtest/moz.build b/content/canvas/compiledtest/moz.build index 0f7f94762522..0f03ae80f45e 100644 --- a/content/canvas/compiledtest/moz.build +++ b/content/canvas/compiledtest/moz.build @@ -8,3 +8,5 @@ CPP_UNIT_TESTS += [ 'TestWebGLElementArrayCache.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in index 10aafe5dd7ac..e3f47d8ffcc5 100644 --- a/content/canvas/src/Makefile.in +++ b/content/canvas/src/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconcvs_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - ifdef MOZ_WEBGL LOCAL_INCLUDES += \ -I$(topsrcdir)/js/xpconnect/wrappers \ diff --git a/content/canvas/src/moz.build b/content/canvas/src/moz.build index a7971dfff82e..3b1c14276306 100644 --- a/content/canvas/src/moz.build +++ b/content/canvas/src/moz.build @@ -73,3 +73,6 @@ else: CPP_SOURCES += [ 'WebGLContextNotSupported.cpp', ] + +FAIL_ON_WARNINGS = True + diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in index b24dc90fb0ce..8dc9ad447ef3 100644 --- a/content/events/src/Makefile.in +++ b/content/events/src/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconevents_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/events/src/moz.build b/content/events/src/moz.build index 143b8f6b5404..06ac1db0c42c 100644 --- a/content/events/src/moz.build +++ b/content/events/src/moz.build @@ -66,3 +66,6 @@ CPP_SOURCES += [ if CONFIG['MOZ_WEBSPEECH']: CPP_SOURCES += ['SpeechRecognitionError.cpp'] + +FAIL_ON_WARNINGS = True + diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in index 6fd3699ddbd6..d426ab323615 100644 --- a/content/html/content/src/Makefile.in +++ b/content/html/content/src/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconhtmlcon_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/html/content/src/moz.build b/content/html/content/src/moz.build index 6e873616e7fd..8212d436a451 100644 --- a/content/html/content/src/moz.build +++ b/content/html/content/src/moz.build @@ -154,3 +154,5 @@ CPP_SOURCES += [ 'nsTextEditorState.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/content/html/document/src/Makefile.in b/content/html/document/src/Makefile.in index ef5a57c9e8bd..8657240f049b 100644 --- a/content/html/document/src/Makefile.in +++ b/content/html/document/src/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += \ diff --git a/content/html/document/src/moz.build b/content/html/document/src/moz.build index d277ee6c263e..80520f44d483 100644 --- a/content/html/document/src/moz.build +++ b/content/html/document/src/moz.build @@ -25,3 +25,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'gkconhtmldoc_s' +FAIL_ON_WARNINGS = True + diff --git a/content/mathml/content/src/Makefile.in b/content/mathml/content/src/Makefile.in index 25afcb683483..63de0e78b7af 100644 --- a/content/mathml/content/src/Makefile.in +++ b/content/mathml/content/src/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkcontentmathml_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/mathml/content/src/moz.build b/content/mathml/content/src/moz.build index cfd45e762bf9..6dd667b1e395 100644 --- a/content/mathml/content/src/moz.build +++ b/content/mathml/content/src/moz.build @@ -11,3 +11,5 @@ CPP_SOURCES += [ 'nsMathMLElementFactory.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/content/media/Makefile.in b/content/media/Makefile.in index c7f833d497c2..4b43651df2bf 100644 --- a/content/media/Makefile.in +++ b/content/media/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconmedia_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/media/directshow/Makefile.in b/content/media/directshow/Makefile.in index 540538e614ec..ae7aac70d127 100644 --- a/content/media/directshow/Makefile.in +++ b/content/media/directshow/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FAIL_ON_WARNINGS := 1 - LIBRARY_NAME = gkcondirectshow_s LIBXUL_LIBRARY = 1 diff --git a/content/media/directshow/moz.build b/content/media/directshow/moz.build index d8cd61651c98..6a405dd6b8fd 100644 --- a/content/media/directshow/moz.build +++ b/content/media/directshow/moz.build @@ -33,3 +33,6 @@ if not CONFIG['MOZ_WEBRTC_IN_LIBXUL']: TOPSRCDIR + '/media/webrtc/trunk/webrtc/modules/video_capture/windows/BasePin.cpp', TOPSRCDIR + '/media/webrtc/trunk/webrtc/modules/video_capture/windows/MediaType.cpp', ] + +FAIL_ON_WARNINGS = True + diff --git a/content/media/encoder/Makefile.in b/content/media/encoder/Makefile.in index c4e33711a8ee..865181c4ce43 100644 --- a/content/media/encoder/Makefile.in +++ b/content/media/encoder/Makefile.in @@ -10,7 +10,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - - include $(topsrcdir)/config/rules.mk diff --git a/content/media/encoder/moz.build b/content/media/encoder/moz.build index ba1eb736acfd..cf0ea9304b33 100644 --- a/content/media/encoder/moz.build +++ b/content/media/encoder/moz.build @@ -23,3 +23,5 @@ if CONFIG['MOZ_OPUS']: LIBRARY_NAME = 'gkconencoder_s' +FAIL_ON_WARNINGS = True + diff --git a/content/media/gstreamer/Makefile.in b/content/media/gstreamer/Makefile.in index 86cc606de10d..0aee85c59652 100644 --- a/content/media/gstreamer/Makefile.in +++ b/content/media/gstreamer/Makefile.in @@ -6,8 +6,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 diff --git a/content/media/gstreamer/moz.build b/content/media/gstreamer/moz.build index 26e27d864720..09cccea4f761 100644 --- a/content/media/gstreamer/moz.build +++ b/content/media/gstreamer/moz.build @@ -23,3 +23,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'gkcongstreamer_s' +FAIL_ON_WARNINGS = True + diff --git a/content/media/mediasource/Makefile.in b/content/media/mediasource/Makefile.in index 9c5676c573c7..75a112639e58 100644 --- a/content/media/mediasource/Makefile.in +++ b/content/media/mediasource/Makefile.in @@ -6,8 +6,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconmediasource_s diff --git a/content/media/mediasource/moz.build b/content/media/mediasource/moz.build index 6b1aec7232c8..a90461521bd4 100644 --- a/content/media/mediasource/moz.build +++ b/content/media/mediasource/moz.build @@ -26,3 +26,5 @@ CPP_SOURCES += [ 'SourceBufferList.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/content/media/moz.build b/content/media/moz.build index 237e43ae1a25..2ebeb4c43626 100644 --- a/content/media/moz.build +++ b/content/media/moz.build @@ -130,6 +130,9 @@ CPP_SOURCES += [ 'WebVTTLoadListener.cpp', ] +FAIL_ON_WARNINGS = True + + if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']: CPP_SOURCES += [ 'AudioNodeEngineNEON.cpp', diff --git a/content/media/ogg/Makefile.in b/content/media/ogg/Makefile.in index 86df1d7589af..5ce55c06d6e3 100644 --- a/content/media/ogg/Makefile.in +++ b/content/media/ogg/Makefile.in @@ -10,7 +10,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - - include $(topsrcdir)/config/rules.mk diff --git a/content/media/ogg/moz.build b/content/media/ogg/moz.build index 7b2a721745d2..7cbf70482053 100644 --- a/content/media/ogg/moz.build +++ b/content/media/ogg/moz.build @@ -22,3 +22,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'gkconogg_s' +FAIL_ON_WARNINGS = True + diff --git a/content/media/raw/Makefile.in b/content/media/raw/Makefile.in index 57d9b3875560..0990e6e37651 100644 --- a/content/media/raw/Makefile.in +++ b/content/media/raw/Makefile.in @@ -11,8 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/media/raw/moz.build b/content/media/raw/moz.build index 54cbeac3f683..a8dabceaf135 100644 --- a/content/media/raw/moz.build +++ b/content/media/raw/moz.build @@ -19,3 +19,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'gkconraw_s' +FAIL_ON_WARNINGS = True + diff --git a/content/media/wave/Makefile.in b/content/media/wave/Makefile.in index 519c470e12b0..bdacd989c366 100644 --- a/content/media/wave/Makefile.in +++ b/content/media/wave/Makefile.in @@ -6,8 +6,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 diff --git a/content/media/wave/moz.build b/content/media/wave/moz.build index b44832b335ec..ca2ede1e260e 100644 --- a/content/media/wave/moz.build +++ b/content/media/wave/moz.build @@ -18,3 +18,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'gkconwave_s' +FAIL_ON_WARNINGS = True + diff --git a/content/media/webaudio/Makefile.in b/content/media/webaudio/Makefile.in index dca187ece60f..2e675ecfe7e4 100644 --- a/content/media/webaudio/Makefile.in +++ b/content/media/webaudio/Makefile.in @@ -11,7 +11,5 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME := gkconwebaudio_s LIBXUL_LIBRARY := 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/media/webaudio/compiledtest/Makefile.in b/content/media/webaudio/compiledtest/Makefile.in index ca8cc642cb8f..4dd0d37710fd 100644 --- a/content/media/webaudio/compiledtest/Makefile.in +++ b/content/media/webaudio/compiledtest/Makefile.in @@ -10,8 +10,6 @@ relativesrcdir := @relativesrcdir@ include $(DEPTH)/config/autoconf.mk -FAIL_ON_WARNINGS = 1 - LOCAL_INCLUDES := -I$(srcdir)/.. include $(topsrcdir)/config/rules.mk diff --git a/content/media/webaudio/compiledtest/moz.build b/content/media/webaudio/compiledtest/moz.build index 8d38be629e9a..1b079ac5ce9e 100644 --- a/content/media/webaudio/compiledtest/moz.build +++ b/content/media/webaudio/compiledtest/moz.build @@ -8,3 +8,5 @@ CPP_UNIT_TESTS += [ 'TestAudioEventTimeline.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/content/media/webaudio/moz.build b/content/media/webaudio/moz.build index 92a331a730ad..bf44474ec850 100644 --- a/content/media/webaudio/moz.build +++ b/content/media/webaudio/moz.build @@ -84,3 +84,5 @@ CPP_SOURCES += [ 'WebAudioUtils.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/content/media/webm/Makefile.in b/content/media/webm/Makefile.in index 22d53ba6ae04..d8e73b908a3f 100644 --- a/content/media/webm/Makefile.in +++ b/content/media/webm/Makefile.in @@ -6,8 +6,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 diff --git a/content/media/webm/moz.build b/content/media/webm/moz.build index dea61fe0d729..a9b1f22165e4 100644 --- a/content/media/webm/moz.build +++ b/content/media/webm/moz.build @@ -19,3 +19,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'gkconwebm_s' +FAIL_ON_WARNINGS = True + diff --git a/content/media/webspeech/synth/Makefile.in b/content/media/webspeech/synth/Makefile.in index 2932ae3d1453..505406ba8a19 100644 --- a/content/media/webspeech/synth/Makefile.in +++ b/content/media/webspeech/synth/Makefile.in @@ -6,9 +6,6 @@ DEPTH := @DEPTH@ topsrcdir := @top_srcdir@ srcdir := @srcdir@ VPATH := @srcdir@ -FAIL_ON_WARNINGS := 1 - - include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/dom/dom-config.mk diff --git a/content/media/webspeech/synth/moz.build b/content/media/webspeech/synth/moz.build index ae135a7ccf06..46609f0f8c49 100644 --- a/content/media/webspeech/synth/moz.build +++ b/content/media/webspeech/synth/moz.build @@ -42,3 +42,6 @@ IPDL_SOURCES += [ 'ipc/PSpeechSynthesis.ipdl', 'ipc/PSpeechSynthesisRequest.ipdl', ] + +FAIL_ON_WARNINGS = True + diff --git a/content/media/wmf/Makefile.in b/content/media/wmf/Makefile.in index 8f6dd8fb8579..48665405f082 100644 --- a/content/media/wmf/Makefile.in +++ b/content/media/wmf/Makefile.in @@ -6,8 +6,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 diff --git a/content/media/wmf/moz.build b/content/media/wmf/moz.build index 6f73110ca77e..1b13aea2fb9e 100644 --- a/content/media/wmf/moz.build +++ b/content/media/wmf/moz.build @@ -23,3 +23,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'gkconwmf_s' +FAIL_ON_WARNINGS = True + diff --git a/content/smil/Makefile.in b/content/smil/Makefile.in index 8be207b28d94..4137896ddf9b 100644 --- a/content/smil/Makefile.in +++ b/content/smil/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconsmil_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - LOCAL_INCLUDES += \ -I$(srcdir)/../base/src \ -I$(srcdir)/../../layout/style \ diff --git a/content/smil/moz.build b/content/smil/moz.build index ed9f2281a767..ca099a10c041 100644 --- a/content/smil/moz.build +++ b/content/smil/moz.build @@ -61,3 +61,5 @@ CPP_SOURCES += [ 'nsSMILValue.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/content/svg/content/src/Makefile.in b/content/svg/content/src/Makefile.in index fbb807af7189..25e0d81cce8d 100644 --- a/content/svg/content/src/Makefile.in +++ b/content/svg/content/src/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkcontentsvg_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/svg/content/src/moz.build b/content/svg/content/src/moz.build index 32956b746e3f..fa0eba9037c8 100644 --- a/content/svg/content/src/moz.build +++ b/content/svg/content/src/moz.build @@ -244,3 +244,5 @@ CPP_SOURCES += [ 'nsSVGViewBox.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/content/svg/document/src/Makefile.in b/content/svg/document/src/Makefile.in index 9bf4e63da799..c1379e2f2382 100644 --- a/content/svg/document/src/Makefile.in +++ b/content/svg/document/src/Makefile.in @@ -11,8 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/svg/document/src/moz.build b/content/svg/document/src/moz.build index b1baa01f22fd..1acbbbe49d3d 100644 --- a/content/svg/document/src/moz.build +++ b/content/svg/document/src/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'gkconsvgdoc_s' +FAIL_ON_WARNINGS = True + diff --git a/content/xbl/src/Makefile.in b/content/xbl/src/Makefile.in index 0df5822ca7c5..94105b980e65 100644 --- a/content/xbl/src/Makefile.in +++ b/content/xbl/src/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconxbl_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/content/xbl/src/moz.build b/content/xbl/src/moz.build index e613e3192535..10fa50a5f721 100644 --- a/content/xbl/src/moz.build +++ b/content/xbl/src/moz.build @@ -36,3 +36,5 @@ CPP_SOURCES += [ 'XBLChildrenElement.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/content/xml/content/src/Makefile.in b/content/xml/content/src/Makefile.in index 2ccb39e0761c..2a325fe32219 100644 --- a/content/xml/content/src/Makefile.in +++ b/content/xml/content/src/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/xml/content/src/moz.build b/content/xml/content/src/moz.build index 1d3ce63b4bab..a36a89a124ee 100644 --- a/content/xml/content/src/moz.build +++ b/content/xml/content/src/moz.build @@ -22,3 +22,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'gkconxmlcon_s' +FAIL_ON_WARNINGS = True + diff --git a/content/xml/document/src/Makefile.in b/content/xml/document/src/Makefile.in index 481b9c2dbb08..b439a0c106f9 100644 --- a/content/xml/document/src/Makefile.in +++ b/content/xml/document/src/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/content/xml/document/src/moz.build b/content/xml/document/src/moz.build index 2a00a1385a84..a117870b1576 100644 --- a/content/xml/document/src/moz.build +++ b/content/xml/document/src/moz.build @@ -19,3 +19,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'gkconxmldoc_s' +FAIL_ON_WARNINGS = True + diff --git a/content/xslt/src/base/Makefile.in b/content/xslt/src/base/Makefile.in index 70ca9d5dd330..b998d654e42a 100644 --- a/content/xslt/src/base/Makefile.in +++ b/content/xslt/src/base/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/xslt/src/base/moz.build b/content/xslt/src/base/moz.build index cc783af3dd13..272c27cc365f 100644 --- a/content/xslt/src/base/moz.build +++ b/content/xslt/src/base/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'txbase_s' +FAIL_ON_WARNINGS = True + diff --git a/content/xslt/src/xml/Makefile.in b/content/xslt/src/xml/Makefile.in index 590169fc38c2..5ea8eda299ac 100644 --- a/content/xslt/src/xml/Makefile.in +++ b/content/xslt/src/xml/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/xslt/src/xml/moz.build b/content/xslt/src/xml/moz.build index 9a0fd8be184a..e6202e1ade7d 100644 --- a/content/xslt/src/xml/moz.build +++ b/content/xslt/src/xml/moz.build @@ -13,3 +13,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'txxml_s' +FAIL_ON_WARNINGS = True + diff --git a/content/xslt/src/xpath/Makefile.in b/content/xslt/src/xpath/Makefile.in index 1608dc477d19..868af65fdf74 100644 --- a/content/xslt/src/xpath/Makefile.in +++ b/content/xslt/src/xpath/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/xslt/src/xpath/moz.build b/content/xslt/src/xpath/moz.build index 20679a9abcb6..cf2fa2902411 100644 --- a/content/xslt/src/xpath/moz.build +++ b/content/xslt/src/xpath/moz.build @@ -49,3 +49,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'txxpath_s' +FAIL_ON_WARNINGS = True + diff --git a/content/xslt/src/xslt/Makefile.in b/content/xslt/src/xslt/Makefile.in index 72cfb09afa69..3b4cca3b3349 100644 --- a/content/xslt/src/xslt/Makefile.in +++ b/content/xslt/src/xslt/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 # For nsDependentJSString LOCAL_INCLUDES += \ diff --git a/content/xslt/src/xslt/moz.build b/content/xslt/src/xslt/moz.build index f864406552f3..d0860baf19ee 100644 --- a/content/xslt/src/xslt/moz.build +++ b/content/xslt/src/xslt/moz.build @@ -46,3 +46,5 @@ EXTRA_COMPONENTS += [ LIBRARY_NAME = 'txxslt_s' +FAIL_ON_WARNINGS = True + diff --git a/content/xul/content/src/Makefile.in b/content/xul/content/src/Makefile.in index 1b90983ca45b..398004ebb15a 100644 --- a/content/xul/content/src/Makefile.in +++ b/content/xul/content/src/Makefile.in @@ -7,8 +7,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS = 1 - include $(DEPTH)/config/autoconf.mk ifdef MOZ_XUL @@ -16,8 +14,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 endif -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/content/xul/content/src/moz.build b/content/xul/content/src/moz.build index 068e5a0f0620..1b70a59c45d8 100644 --- a/content/xul/content/src/moz.build +++ b/content/xul/content/src/moz.build @@ -13,3 +13,6 @@ if CONFIG['MOZ_XUL']: 'nsXULContextMenuBuilder.cpp', ] LIBRARY_NAME = 'gkconxulcon_s' + +FAIL_ON_WARNINGS = True + diff --git a/content/xul/document/src/Makefile.in b/content/xul/document/src/Makefile.in index 2cb31b067482..b8cdfe75429a 100644 --- a/content/xul/document/src/Makefile.in +++ b/content/xul/document/src/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = -I$(srcdir)/../../../base/src \ diff --git a/content/xul/document/src/moz.build b/content/xul/document/src/moz.build index 1c666c03ce2c..6eb1d60fa5a9 100644 --- a/content/xul/document/src/moz.build +++ b/content/xul/document/src/moz.build @@ -21,3 +21,5 @@ if CONFIG['MOZ_XUL']: LIBRARY_NAME = 'gkconxuldoc_s' +FAIL_ON_WARNINGS = True + diff --git a/docshell/base/Makefile.in b/docshell/base/Makefile.in index e3bc7131a1bf..0ffe878c3b69 100644 --- a/docshell/base/Makefile.in +++ b/docshell/base/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FAIL_ON_WARNINGS := 1 LIBRARY_NAME = basedocshell_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 diff --git a/docshell/base/moz.build b/docshell/base/moz.build index 1895adea1fd4..cbf67d31d754 100644 --- a/docshell/base/moz.build +++ b/docshell/base/moz.build @@ -62,3 +62,5 @@ CPP_SOURCES += [ 'nsWebNavigationInfo.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/docshell/shistory/src/Makefile.in b/docshell/shistory/src/Makefile.in index 7fecb85a394d..f4de7098fd89 100644 --- a/docshell/shistory/src/Makefile.in +++ b/docshell/shistory/src/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += -I$(srcdir)/../../base diff --git a/docshell/shistory/src/moz.build b/docshell/shistory/src/moz.build index f792acf65d77..c211c4dc9879 100644 --- a/docshell/shistory/src/moz.build +++ b/docshell/shistory/src/moz.build @@ -19,3 +19,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'shistory_s' +FAIL_ON_WARNINGS = True + diff --git a/dom/activities/src/Makefile.in b/dom/activities/src/Makefile.in index 385b8720be18..7391ab0d9255 100644 --- a/dom/activities/src/Makefile.in +++ b/dom/activities/src/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_activities_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/activities/src/moz.build b/dom/activities/src/moz.build index b107bcb5d84d..48e48f1af108 100644 --- a/dom/activities/src/moz.build +++ b/dom/activities/src/moz.build @@ -27,3 +27,6 @@ EXTRA_JS_MODULES += [ 'ActivitiesService.jsm', 'ActivitiesServiceFilter.jsm', ] + +FAIL_ON_WARNINGS = True + diff --git a/dom/activities/tests/Makefile.in b/dom/activities/tests/Makefile.in deleted file mode 100644 index e8a194c897c4..000000000000 --- a/dom/activities/tests/Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -FAIL_ON_WARNINGS := 1 - -include $(DEPTH)/config/autoconf.mk - -include $(topsrcdir)/config/rules.mk diff --git a/dom/activities/tests/moz.build b/dom/activities/tests/moz.build index 191c90f0b92d..b984ece4aa0e 100644 --- a/dom/activities/tests/moz.build +++ b/dom/activities/tests/moz.build @@ -5,3 +5,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. XPCSHELL_TESTS_MANIFESTS += ['unit/xpcshell.ini'] + +FAIL_ON_WARNINGS = True + diff --git a/dom/alarm/Makefile.in b/dom/alarm/Makefile.in index f7926ebbc289..c78da2609c6e 100644 --- a/dom/alarm/Makefile.in +++ b/dom/alarm/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domalarm_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/alarm/moz.build b/dom/alarm/moz.build index d851490f445f..86b6b24109f9 100644 --- a/dom/alarm/moz.build +++ b/dom/alarm/moz.build @@ -32,3 +32,6 @@ EXTRA_JS_MODULES += [ 'AlarmDB.jsm', 'AlarmService.jsm', ] + +FAIL_ON_WARNINGS = True + diff --git a/dom/audiochannel/Makefile.in b/dom/audiochannel/Makefile.in index 2fd96f5d3b5f..bcd8c65fa73c 100644 --- a/dom/audiochannel/Makefile.in +++ b/dom/audiochannel/Makefile.in @@ -22,8 +22,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domaudiochannel_s LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/audiochannel/moz.build b/dom/audiochannel/moz.build index 5b116f5a3201..c99354af8555 100644 --- a/dom/audiochannel/moz.build +++ b/dom/audiochannel/moz.build @@ -27,3 +27,5 @@ CPP_SOURCES += [ 'AudioChannelServiceChild.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/dom/audiochannel/tests/Makefile.in b/dom/audiochannel/tests/Makefile.in deleted file mode 100644 index 0659b8375711..000000000000 --- a/dom/audiochannel/tests/Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - -FAIL_ON_WARNINGS = 1 - -include $(topsrcdir)/config/rules.mk - diff --git a/dom/audiochannel/tests/moz.build b/dom/audiochannel/tests/moz.build index 35da34275eab..e1148d182ff1 100644 --- a/dom/audiochannel/tests/moz.build +++ b/dom/audiochannel/tests/moz.build @@ -10,3 +10,5 @@ CPP_UNIT_TESTS += [ 'TestAudioChannelService.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/dom/base/Makefile.in b/dom/base/Makefile.in index dcdf8c792704..026f60063426 100644 --- a/dom/base/Makefile.in +++ b/dom/base/Makefile.in @@ -12,9 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = jsdombase_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - - include $(topsrcdir)/dom/dom-config.mk ifdef MOZ_JSDEBUGGER diff --git a/dom/base/moz.build b/dom/base/moz.build index 469970f40c27..277cc88bed26 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -108,3 +108,6 @@ EXTRA_JS_MODULES += [ 'IndexedDBHelper.jsm', 'ObjectWrapper.jsm', ] + +FAIL_ON_WARNINGS = True + diff --git a/dom/battery/Makefile.in b/dom/battery/Makefile.in index 67a18432487a..0dbb06b967f9 100644 --- a/dom/battery/Makefile.in +++ b/dom/battery/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_battery_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/battery/moz.build b/dom/battery/moz.build index 732603cdd71f..bd246cf7830b 100644 --- a/dom/battery/moz.build +++ b/dom/battery/moz.build @@ -15,3 +15,5 @@ CPP_SOURCES += [ 'BatteryManager.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/dom/bindings/Makefile.in b/dom/bindings/Makefile.in index 3465285eeee3..c387c3d536bd 100644 --- a/dom/bindings/Makefile.in +++ b/dom/bindings/Makefile.in @@ -13,7 +13,6 @@ LIBRARY_NAME = dombindings_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 # Need this to find all our DOM source files. include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build index 0ef597cfc057..7b7a1cae625d 100644 --- a/dom/bindings/moz.build +++ b/dom/bindings/moz.build @@ -25,3 +25,6 @@ EXPORTS.mozilla.dom += [ 'PrimitiveConversions.h', 'TypedArray.h', ] + +FAIL_ON_WARNINGS = True + diff --git a/dom/bluetooth/Makefile.in b/dom/bluetooth/Makefile.in index b199e4133dfc..6e62298b7cf9 100644 --- a/dom/bluetooth/Makefile.in +++ b/dom/bluetooth/Makefile.in @@ -16,8 +16,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/bluetooth/moz.build b/dom/bluetooth/moz.build index 6527f4bfdb75..0da9c0af22db 100644 --- a/dom/bluetooth/moz.build +++ b/dom/bluetooth/moz.build @@ -73,3 +73,6 @@ IPDL_SOURCES += [ 'ipc/PBluetooth.ipdl', 'ipc/PBluetoothRequest.ipdl', ] + +FAIL_ON_WARNINGS = True + diff --git a/dom/browser-element/Makefile.in b/dom/browser-element/Makefile.in index 948cfaf2a4b1..36f48419a552 100644 --- a/dom/browser-element/Makefile.in +++ b/dom/browser-element/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_browserelement_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/browser-element/moz.build b/dom/browser-element/moz.build index f37264ea6c1d..b1107a27406f 100644 --- a/dom/browser-element/moz.build +++ b/dom/browser-element/moz.build @@ -39,3 +39,6 @@ EXTRA_JS_MODULES += [ 'BrowserElementParent.jsm', 'BrowserElementPromptService.jsm', ] + +FAIL_ON_WARNINGS = True + diff --git a/dom/camera/Makefile.in b/dom/camera/Makefile.in index 85644a299838..9fcbc7d33961 100644 --- a/dom/camera/Makefile.in +++ b/dom/camera/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domcamera_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/camera/moz.build b/dom/camera/moz.build index 92d1b845203d..a2b490d0b9cc 100644 --- a/dom/camera/moz.build +++ b/dom/camera/moz.build @@ -44,3 +44,6 @@ else: 'FallbackCameraManager.cpp', 'FallbackCameraControl.cpp', ] + +FAIL_ON_WARNINGS = True + diff --git a/dom/cellbroadcast/src/Makefile.in b/dom/cellbroadcast/src/Makefile.in index 658a2a1fef5a..8876a245c95e 100644 --- a/dom/cellbroadcast/src/Makefile.in +++ b/dom/cellbroadcast/src/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_cellbroadcast_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/cellbroadcast/src/moz.build b/dom/cellbroadcast/src/moz.build index e1b5599978f9..66bc823993e0 100644 --- a/dom/cellbroadcast/src/moz.build +++ b/dom/cellbroadcast/src/moz.build @@ -14,3 +14,5 @@ CPP_SOURCES += [ 'CellBroadcast.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/dom/devicestorage/Makefile.in b/dom/devicestorage/Makefile.in index 64840219d03f..36db62339a75 100644 --- a/dom/devicestorage/Makefile.in +++ b/dom/devicestorage/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domdevicestorage_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/devicestorage/moz.build b/dom/devicestorage/moz.build index d2929b4f256e..0aa16bd91809 100644 --- a/dom/devicestorage/moz.build +++ b/dom/devicestorage/moz.build @@ -29,3 +29,6 @@ CPP_SOURCES += [ IPDL_SOURCES += [ 'PDeviceStorageRequest.ipdl', ] + +FAIL_ON_WARNINGS = True + diff --git a/dom/encoding/Makefile.in b/dom/encoding/Makefile.in index 742e607c5595..3de7da972b12 100644 --- a/dom/encoding/Makefile.in +++ b/dom/encoding/Makefile.in @@ -6,8 +6,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domencoding_s diff --git a/dom/encoding/moz.build b/dom/encoding/moz.build index 81fb2eb00d0b..611fa44de817 100644 --- a/dom/encoding/moz.build +++ b/dom/encoding/moz.build @@ -22,3 +22,5 @@ CPP_SOURCES += [ 'TextEncoder.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/dom/file/Makefile.in b/dom/file/Makefile.in index 2e7f112a29b7..094bd56b1285 100644 --- a/dom/file/Makefile.in +++ b/dom/file/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domfile_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/file/moz.build b/dom/file/moz.build index 1f96114fee26..330534a1c40c 100644 --- a/dom/file/moz.build +++ b/dom/file/moz.build @@ -55,3 +55,5 @@ CPP_SOURCES += [ 'MetadataHelper.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/dom/gamepad/Makefile.in b/dom/gamepad/Makefile.in index f29e3bee6590..3bcc4cc09058 100644 --- a/dom/gamepad/Makefile.in +++ b/dom/gamepad/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domgamepad_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/base \ $(NULL) diff --git a/dom/gamepad/moz.build b/dom/gamepad/moz.build index d9fdac941c95..41e2a4e51af3 100644 --- a/dom/gamepad/moz.build +++ b/dom/gamepad/moz.build @@ -13,3 +13,6 @@ CPP_SOURCES = [ 'Gamepad.cpp', 'GamepadService.cpp', ] + +FAIL_ON_WARNINGS = True + diff --git a/dom/icc/src/Makefile.in b/dom/icc/src/Makefile.in index 53bb76a9f170..b87e52d9ac32 100644 --- a/dom/icc/src/Makefile.in +++ b/dom/icc/src/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_icc_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/icc/src/moz.build b/dom/icc/src/moz.build index e5e527fd48c4..151f6fdd0283 100644 --- a/dom/icc/src/moz.build +++ b/dom/icc/src/moz.build @@ -13,3 +13,5 @@ CPP_SOURCES += [ 'StkCommandEvent.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/dom/indexedDB/Makefile.in b/dom/indexedDB/Makefile.in index fcbe4ad23f7d..0eb1a52894d0 100644 --- a/dom/indexedDB/Makefile.in +++ b/dom/indexedDB/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_indexeddb_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - LOCAL_INCLUDES = \ -I$(topsrcdir)/caps/include \ -I$(topsrcdir)/content/base/src \ diff --git a/dom/indexedDB/ipc/Makefile.in b/dom/indexedDB/ipc/Makefile.in index 1bacc1f590ad..2703e9afc121 100644 --- a/dom/indexedDB/ipc/Makefile.in +++ b/dom/indexedDB/ipc/Makefile.in @@ -7,8 +7,6 @@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ relativesrcdir = @relativesrcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_indexeddb_ipc_s diff --git a/dom/indexedDB/ipc/moz.build b/dom/indexedDB/ipc/moz.build index f271ec09f044..635910d91ad0 100644 --- a/dom/indexedDB/ipc/moz.build +++ b/dom/indexedDB/ipc/moz.build @@ -29,3 +29,6 @@ IPDL_SOURCES += [ 'PIndexedDBRequest.ipdl', 'PIndexedDBTransaction.ipdl', ] + +FAIL_ON_WARNINGS = True + diff --git a/dom/indexedDB/moz.build b/dom/indexedDB/moz.build index 679b08068d64..4f026c942325 100644 --- a/dom/indexedDB/moz.build +++ b/dom/indexedDB/moz.build @@ -63,3 +63,5 @@ CPP_SOURCES += [ 'TransactionThreadPool.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/dom/ipc/Makefile.in b/dom/ipc/Makefile.in index 32942fb54fa7..55535347622a 100644 --- a/dom/ipc/Makefile.in +++ b/dom/ipc/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domipc_s LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build index 5bfbd1722fd0..b55c9588dba4 100644 --- a/dom/ipc/moz.build +++ b/dom/ipc/moz.build @@ -70,3 +70,6 @@ IPDL_SOURCES += [ 'PMemoryReportRequest.ipdl', 'PTabContext.ipdlh', ] + +FAIL_ON_WARNINGS = True + diff --git a/dom/media/Makefile.in b/dom/media/Makefile.in index a9142703acf0..a35ae6a06b30 100644 --- a/dom/media/Makefile.in +++ b/dom/media/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_media_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/media/moz.build b/dom/media/moz.build index a71a2e08e886..19c1ed8d6fa0 100644 --- a/dom/media/moz.build +++ b/dom/media/moz.build @@ -31,3 +31,6 @@ EXTRA_COMPONENTS += [ 'PeerConnection.js', 'PeerConnection.manifest', ] + +FAIL_ON_WARNINGS = True + diff --git a/dom/mobilemessage/src/Makefile.in b/dom/mobilemessage/src/Makefile.in index 07be2a661115..81fcd515b1c8 100644 --- a/dom/mobilemessage/src/Makefile.in +++ b/dom/mobilemessage/src/Makefile.in @@ -23,8 +23,6 @@ endif LIBRARY_NAME = dom_mobilemessage_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/mobilemessage/src/moz.build b/dom/mobilemessage/src/moz.build index 0d37deba1a6b..eaa7afc78b58 100644 --- a/dom/mobilemessage/src/moz.build +++ b/dom/mobilemessage/src/moz.build @@ -78,3 +78,6 @@ IPDL_SOURCES += [ 'ipc/PSmsRequest.ipdl', 'ipc/SmsTypes.ipdlh', ] + +FAIL_ON_WARNINGS = True + diff --git a/dom/network/src/Makefile.in b/dom/network/src/Makefile.in index d7232a698f74..43edada4d91d 100644 --- a/dom/network/src/Makefile.in +++ b/dom/network/src/Makefile.in @@ -11,9 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_network_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - - ifdef MOZ_B2G_RIL endif diff --git a/dom/network/src/moz.build b/dom/network/src/moz.build index 840c6cac2575..9cd72ee27909 100644 --- a/dom/network/src/moz.build +++ b/dom/network/src/moz.build @@ -47,3 +47,6 @@ IPDL_SOURCES += [ 'PTCPServerSocket.ipdl', 'PTCPSocket.ipdl', ] + +FAIL_ON_WARNINGS = True + diff --git a/dom/plugins/base/Makefile.in b/dom/plugins/base/Makefile.in index 32478221476c..297d4dc3eab4 100644 --- a/dom/plugins/base/Makefile.in +++ b/dom/plugins/base/Makefile.in @@ -17,11 +17,6 @@ LIBXUL_LIBRARY = 1 ifeq ($(MOZ_WIDGET_TOOLKIT),android) LOCAL_INCLUDES += -I$(topsrcdir)/dom/plugins/base/android -else -# android_npapi.h extends the NPNVariable and NPPVariable enums -# using #defines, which results in Wswitch warnings in gcc-4.6. -# Therefore, enable FAIL_ON_WARNINGS only on non-Android platforms. -FAIL_ON_WARNINGS := 1 endif ifeq ($(OS_ARCH),WINNT) diff --git a/dom/plugins/base/android/Makefile.in b/dom/plugins/base/android/Makefile.in index 4af352a492ff..06619495f910 100644 --- a/dom/plugins/base/android/Makefile.in +++ b/dom/plugins/base/android/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkpluginandroid_s LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - LOCAL_INCLUDES += \ -I$(topsrcdir)/widget/android \ -I$(topsrcdir)/widget/xpwidgets \ diff --git a/dom/plugins/base/android/moz.build b/dom/plugins/base/android/moz.build index 9dc96cdb1a92..e5f0cb78e473 100644 --- a/dom/plugins/base/android/moz.build +++ b/dom/plugins/base/android/moz.build @@ -25,3 +25,5 @@ CPP_SOURCES += [ 'ANPWindow.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/dom/plugins/base/moz.build b/dom/plugins/base/moz.build index 7b11cde4a992..bbc2be278aa5 100644 --- a/dom/plugins/base/moz.build +++ b/dom/plugins/base/moz.build @@ -88,3 +88,9 @@ else: CPP_SOURCES += [ 'nsPluginNativeWindow.cpp', ] + +if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': + # android_npapi.h extends the NPNVariable and NPPVariable enums + # using #defines, which results in Wswitch warnings in gcc-4.6. + # Therefore, enable FAIL_ON_WARNINGS only on non-Android platforms. + FAIL_ON_WARNINGS = True diff --git a/dom/plugins/ipc/Makefile.in b/dom/plugins/ipc/Makefile.in index c5beb7733188..27a0000a88a9 100644 --- a/dom/plugins/ipc/Makefile.in +++ b/dom/plugins/ipc/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FAIL_ON_WARNINGS := 1 - LIBRARY_NAME = domplugins_s LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 diff --git a/dom/plugins/ipc/moz.build b/dom/plugins/ipc/moz.build index d3e14784248a..9242aeb3802b 100644 --- a/dom/plugins/ipc/moz.build +++ b/dom/plugins/ipc/moz.build @@ -102,3 +102,6 @@ IPDL_SOURCES += [ 'PPluginSurface.ipdl', 'PStreamNotify.ipdl', ] + +FAIL_ON_WARNINGS = True + diff --git a/dom/plugins/test/testplugin/Makefile.in b/dom/plugins/test/testplugin/Makefile.in index 85fa7c27e6c9..19a08ec39865 100644 --- a/dom/plugins/test/testplugin/Makefile.in +++ b/dom/plugins/test/testplugin/Makefile.in @@ -11,9 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MODULE_NAME = TestPlugin -ifndef _MSC_VER -FAIL_ON_WARNINGS = 1 -endif # !_MSC_VER RELATIVE_PATH=. COCOA_NAME=Test diff --git a/dom/plugins/test/testplugin/moz.build b/dom/plugins/test/testplugin/moz.build index 2d1944ebc551..4d1c1b0d8c88 100644 --- a/dom/plugins/test/testplugin/moz.build +++ b/dom/plugins/test/testplugin/moz.build @@ -11,3 +11,4 @@ NO_DIST_INSTALL = True LIBRARY_NAME = 'nptest' +FAIL_ON_WARNINGS = not CONFIG['_MSC_VER'] diff --git a/dom/power/Makefile.in b/dom/power/Makefile.in index ea4da2c1e7bc..67c50e2f4af4 100644 --- a/dom/power/Makefile.in +++ b/dom/power/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_power_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/power/moz.build b/dom/power/moz.build index a4d35f36dce7..8ea0bba66ef8 100644 --- a/dom/power/moz.build +++ b/dom/power/moz.build @@ -27,3 +27,5 @@ CPP_SOURCES += [ 'WakeLock.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/dom/promise/Makefile.in b/dom/promise/Makefile.in index 18cb01cb2fbe..53a4599f3e1d 100644 --- a/dom/promise/Makefile.in +++ b/dom/promise/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dompromise_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/workers \ -I$(topsrcdir)/dom/base \ diff --git a/dom/promise/moz.build b/dom/promise/moz.build index e3074a1360d8..160121e1c36b 100644 --- a/dom/promise/moz.build +++ b/dom/promise/moz.build @@ -20,3 +20,6 @@ CPP_SOURCES += [ 'PromiseResolver.cpp', 'PromiseCallback.cpp', ] + +FAIL_ON_WARNINGS = True + diff --git a/dom/quota/Makefile.in b/dom/quota/Makefile.in index 5d07fab274ca..d5ae9c16ef41 100644 --- a/dom/quota/Makefile.in +++ b/dom/quota/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domquota_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/quota/moz.build b/dom/quota/moz.build index 5576884cd007..0b68fce2450d 100644 --- a/dom/quota/moz.build +++ b/dom/quota/moz.build @@ -39,3 +39,5 @@ CPP_SOURCES += [ 'QuotaObject.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/dom/src/events/Makefile.in b/dom/src/events/Makefile.in index de36ee863ec2..bf189dfd4651 100644 --- a/dom/src/events/Makefile.in +++ b/dom/src/events/Makefile.in @@ -7,8 +7,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 diff --git a/dom/src/events/moz.build b/dom/src/events/moz.build index 7d4540410a03..e046d2168cd4 100644 --- a/dom/src/events/moz.build +++ b/dom/src/events/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'jsdomevents_s' +FAIL_ON_WARNINGS = True + diff --git a/dom/src/geolocation/Makefile.in b/dom/src/geolocation/Makefile.in index af1ca2a3a50d..63520c4ab473 100644 --- a/dom/src/geolocation/Makefile.in +++ b/dom/src/geolocation/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = jsdomgeolocation_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/ipc \ diff --git a/dom/src/geolocation/moz.build b/dom/src/geolocation/moz.build index c70f2a089a9b..17867530af1b 100644 --- a/dom/src/geolocation/moz.build +++ b/dom/src/geolocation/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ 'nsGeolocation.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/dom/src/json/Makefile.in b/dom/src/json/Makefile.in index b8d2e9ab8dfe..bc72b0033747 100644 --- a/dom/src/json/Makefile.in +++ b/dom/src/json/Makefile.in @@ -7,8 +7,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 diff --git a/dom/src/json/moz.build b/dom/src/json/moz.build index 43e24ae4f100..cf5c434400a0 100644 --- a/dom/src/json/moz.build +++ b/dom/src/json/moz.build @@ -18,3 +18,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'json_s' +FAIL_ON_WARNINGS = True + diff --git a/dom/src/jsurl/Makefile.in b/dom/src/jsurl/Makefile.in index 28770ed69b38..f5998d025a74 100644 --- a/dom/src/jsurl/Makefile.in +++ b/dom/src/jsurl/Makefile.in @@ -7,8 +7,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 diff --git a/dom/src/jsurl/moz.build b/dom/src/jsurl/moz.build index a2830d7dc9b3..14e764ec93d2 100644 --- a/dom/src/jsurl/moz.build +++ b/dom/src/jsurl/moz.build @@ -18,3 +18,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'jsurl_s' +FAIL_ON_WARNINGS = True + diff --git a/dom/src/notification/Makefile.in b/dom/src/notification/Makefile.in index 435a4a67327b..003c474164eb 100644 --- a/dom/src/notification/Makefile.in +++ b/dom/src/notification/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = jsdomnotification_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/ipc \ diff --git a/dom/src/notification/moz.build b/dom/src/notification/moz.build index 1819dcc0f1ec..e15e448bf80c 100644 --- a/dom/src/notification/moz.build +++ b/dom/src/notification/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ 'Notification.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/dom/src/offline/Makefile.in b/dom/src/offline/Makefile.in index 1dea96802362..1db97b570c3c 100644 --- a/dom/src/offline/Makefile.in +++ b/dom/src/offline/Makefile.in @@ -11,8 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/content/base/src \ diff --git a/dom/src/offline/moz.build b/dom/src/offline/moz.build index 0f8667fcbd11..0bdb1402e251 100644 --- a/dom/src/offline/moz.build +++ b/dom/src/offline/moz.build @@ -15,3 +15,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'jsdomoffline_s' +FAIL_ON_WARNINGS = True + diff --git a/dom/src/storage/Makefile.in b/dom/src/storage/Makefile.in index 2aa49de4a8fe..fc524ee41003 100644 --- a/dom/src/storage/Makefile.in +++ b/dom/src/storage/Makefile.in @@ -7,8 +7,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = jsdomstorage_s diff --git a/dom/src/storage/moz.build b/dom/src/storage/moz.build index 8eaf17b1bc8f..942d85c55175 100644 --- a/dom/src/storage/moz.build +++ b/dom/src/storage/moz.build @@ -22,3 +22,6 @@ CPP_SOURCES += [ IPDL_SOURCES += [ 'PStorage.ipdl', ] + +FAIL_ON_WARNINGS = True + diff --git a/dom/system/Makefile.in b/dom/system/Makefile.in index 092cfa2ecd83..738667ac394e 100644 --- a/dom/system/Makefile.in +++ b/dom/system/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domsystem_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - DEFINES += -DDLL_PREFIX=\"$(DLL_PREFIX)\" -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" # We fire the nsDOMDeviceAcceleration diff --git a/dom/system/android/Makefile.in b/dom/system/android/Makefile.in index 70991e44d9b3..9c273aeed620 100644 --- a/dom/system/android/Makefile.in +++ b/dom/system/android/Makefile.in @@ -13,8 +13,6 @@ LIBRARY_NAME = domsystemandroid_s LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - LOCAL_INCLUDES += -I$(topsrcdir)/dom/src/geolocation \ -I$(topsrcdir)/content/events/src $(NULL) diff --git a/dom/system/android/moz.build b/dom/system/android/moz.build index b81506295407..94f68e676807 100644 --- a/dom/system/android/moz.build +++ b/dom/system/android/moz.build @@ -11,3 +11,5 @@ CPP_SOURCES += [ 'nsHapticFeedback.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/dom/system/gonk/Makefile.in b/dom/system/gonk/Makefile.in index 1693886bf6cf..322944de51f0 100644 --- a/dom/system/gonk/Makefile.in +++ b/dom/system/gonk/Makefile.in @@ -23,8 +23,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domsystemgonk_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/system/gonk/moz.build b/dom/system/gonk/moz.build index 8b2558aa6f5b..777bde46117b 100644 --- a/dom/system/gonk/moz.build +++ b/dom/system/gonk/moz.build @@ -80,3 +80,5 @@ EXTRA_JS_MODULES += [ 'systemlibs.js', ] +FAIL_ON_WARNINGS = True + diff --git a/dom/system/mac/Makefile.in b/dom/system/mac/Makefile.in index 1a6256572216..77be27439065 100644 --- a/dom/system/mac/Makefile.in +++ b/dom/system/mac/Makefile.in @@ -13,8 +13,6 @@ LIBRARY_NAME = domsystemmac_s LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - LOCAL_INCLUDES += -I$(topsrcdir)/dom/src/geolocation \ $(NULL) diff --git a/dom/system/mac/moz.build b/dom/system/mac/moz.build index 33ceee8b74a7..417ce5b25c5f 100644 --- a/dom/system/mac/moz.build +++ b/dom/system/mac/moz.build @@ -7,3 +7,6 @@ MODULE = 'dom' CMMSRCS += ['CoreLocationLocationProvider.mm'] + +FAIL_ON_WARNINGS = True + diff --git a/dom/system/moz.build b/dom/system/moz.build index 8762019ef46b..5948c80c3030 100644 --- a/dom/system/moz.build +++ b/dom/system/moz.build @@ -49,3 +49,5 @@ if CONFIG['OS_TARGET'] != 'Android' or CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': 'NetworkGeolocationProvider.manifest', ] +FAIL_ON_WARNINGS = True + diff --git a/dom/system/unix/Makefile.in b/dom/system/unix/Makefile.in index 704e52339e2d..a15832e31d07 100644 --- a/dom/system/unix/Makefile.in +++ b/dom/system/unix/Makefile.in @@ -13,8 +13,6 @@ LIBRARY_NAME = domsystemunix_s LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - ifdef MOZ_MAEMO_LIBLOCATION LOCAL_INCLUDES += $(MOZ_PLATFORM_MAEMO_CFLAGS) \ -I$(topsrcdir)/dom/src/geolocation \ diff --git a/dom/system/unix/moz.build b/dom/system/unix/moz.build index 297dd5a46f23..cf8e10bda1b5 100644 --- a/dom/system/unix/moz.build +++ b/dom/system/unix/moz.build @@ -21,3 +21,6 @@ if CONFIG['MOZ_ENABLE_QTMOBILITY']: 'moc_QTMLocationProvider.cpp', 'QTMLocationProvider.cpp', ] + +FAIL_ON_WARNINGS = True + diff --git a/dom/system/windows/Makefile.in b/dom/system/windows/Makefile.in index e0e706bc0486..71dea5cbbffc 100644 --- a/dom/system/windows/Makefile.in +++ b/dom/system/windows/Makefile.in @@ -13,7 +13,6 @@ LIBRARY_NAME = domsystemwindows_s LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 # We fire the nsDOMDeviceAcceleration LOCAL_INCLUDES += -I$(topsrcdir)/content/events/src diff --git a/dom/system/windows/moz.build b/dom/system/windows/moz.build index 7da139c862b9..03a01af6ef2f 100644 --- a/dom/system/windows/moz.build +++ b/dom/system/windows/moz.build @@ -10,3 +10,5 @@ CPP_SOURCES += [ 'nsHapticFeedback.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/dom/telephony/Makefile.in b/dom/telephony/Makefile.in index 7b47c9360ae2..6753f22bfa2d 100644 --- a/dom/telephony/Makefile.in +++ b/dom/telephony/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domtelephony_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/telephony/moz.build b/dom/telephony/moz.build index 35d757c71b01..2be5c7040eee 100644 --- a/dom/telephony/moz.build +++ b/dom/telephony/moz.build @@ -20,3 +20,5 @@ CPP_SOURCES += [ 'TelephonyCallGroup.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/dom/time/Makefile.in b/dom/time/Makefile.in index d5f5d6f34f3e..5d0c34c2c41a 100644 --- a/dom/time/Makefile.in +++ b/dom/time/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_time_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/time/moz.build b/dom/time/moz.build index 74cde53b8bac..584338017020 100644 --- a/dom/time/moz.build +++ b/dom/time/moz.build @@ -26,3 +26,5 @@ CPP_SOURCES += [ 'TimeService.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/dom/voicemail/Makefile.in b/dom/voicemail/Makefile.in index 5da1f55de226..cc0051de8368 100644 --- a/dom/voicemail/Makefile.in +++ b/dom/voicemail/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domvoicemail_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/voicemail/moz.build b/dom/voicemail/moz.build index 5d7511145f14..7fbb017f7fa2 100644 --- a/dom/voicemail/moz.build +++ b/dom/voicemail/moz.build @@ -23,3 +23,5 @@ CPP_SOURCES += [ 'Voicemail.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/dom/workers/Makefile.in b/dom/workers/Makefile.in index 9e901ac69a99..70dc38ad76cc 100644 --- a/dom/workers/Makefile.in +++ b/dom/workers/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - LOCAL_INCLUDES = \ -I$(topsrcdir)/content/base/src \ -I$(topsrcdir)/content/events/src \ diff --git a/dom/workers/moz.build b/dom/workers/moz.build index c5834d722a9c..e6f4ab5e858d 100644 --- a/dom/workers/moz.build +++ b/dom/workers/moz.build @@ -57,3 +57,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'domworkers_s' +FAIL_ON_WARNINGS = True + diff --git a/editor/Makefile.in b/editor/Makefile.in deleted file mode 100644 index 5f45bab6fa04..000000000000 --- a/editor/Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH := @DEPTH@ -topsrcdir := @top_srcdir@ -srcdir := @srcdir@ -VPATH := @srcdir@ -FAIL_ON_WARNINGS := 1 - -include $(DEPTH)/config/autoconf.mk - -include $(topsrcdir)/config/rules.mk - diff --git a/editor/composer/src/Makefile.in b/editor/composer/src/Makefile.in index 77751366944e..f41d5d9878b2 100644 --- a/editor/composer/src/Makefile.in +++ b/editor/composer/src/Makefile.in @@ -12,9 +12,6 @@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/editor/composer/src/moz.build b/editor/composer/src/moz.build index 8dc94a15a346..2443ef42d71b 100644 --- a/editor/composer/src/moz.build +++ b/editor/composer/src/moz.build @@ -19,3 +19,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'composer' +FAIL_ON_WARNINGS = True + diff --git a/editor/libeditor/base/Makefile.in b/editor/libeditor/base/Makefile.in index 743a9d36e431..282f769c07f0 100644 --- a/editor/libeditor/base/Makefile.in +++ b/editor/libeditor/base/Makefile.in @@ -11,8 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - # Internal header files, needed by other editor sublibs: INTERNAL_HDR_DIR = ../internal diff --git a/editor/libeditor/base/moz.build b/editor/libeditor/base/moz.build index 44780caac078..afc0f344ec34 100644 --- a/editor/libeditor/base/moz.build +++ b/editor/libeditor/base/moz.build @@ -35,3 +35,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'editorbase_s' +FAIL_ON_WARNINGS = True + diff --git a/editor/libeditor/html/Makefile.in b/editor/libeditor/html/Makefile.in index 8e1523d3f447..0037b3268f95 100644 --- a/editor/libeditor/html/Makefile.in +++ b/editor/libeditor/html/Makefile.in @@ -7,8 +7,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS = 1 - include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 diff --git a/editor/libeditor/html/moz.build b/editor/libeditor/html/moz.build index 696625d6879e..5aa17c00e765 100644 --- a/editor/libeditor/html/moz.build +++ b/editor/libeditor/html/moz.build @@ -30,3 +30,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'htmleditor_s' +FAIL_ON_WARNINGS = True + diff --git a/editor/libeditor/text/Makefile.in b/editor/libeditor/text/Makefile.in index abf29f57fbc2..66d795ff40b6 100644 --- a/editor/libeditor/text/Makefile.in +++ b/editor/libeditor/text/Makefile.in @@ -7,8 +7,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS = 1 - include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 diff --git a/editor/libeditor/text/moz.build b/editor/libeditor/text/moz.build index 2ea07128d6b0..4b486a5a7cb4 100644 --- a/editor/libeditor/text/moz.build +++ b/editor/libeditor/text/moz.build @@ -19,3 +19,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'texteditor_s' +FAIL_ON_WARNINGS = True + diff --git a/editor/moz.build b/editor/moz.build index 9aea7eb43b0e..36317d538185 100644 --- a/editor/moz.build +++ b/editor/moz.build @@ -18,3 +18,6 @@ MODULE = 'editor' EXTRA_JS_MODULES += [ 'AsyncSpellCheckTestHelper.jsm', ] + +FAIL_ON_WARNINGS = True + diff --git a/editor/txmgr/src/Makefile.in b/editor/txmgr/src/Makefile.in index 5562ce282532..a321f55e4361 100644 --- a/editor/txmgr/src/Makefile.in +++ b/editor/txmgr/src/Makefile.in @@ -7,8 +7,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS = 1 - include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 diff --git a/editor/txmgr/src/moz.build b/editor/txmgr/src/moz.build index 747e44493009..e4c2c638346a 100644 --- a/editor/txmgr/src/moz.build +++ b/editor/txmgr/src/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'txmgr' +FAIL_ON_WARNINGS = True + diff --git a/editor/txmgr/tests/Makefile.in b/editor/txmgr/tests/Makefile.in deleted file mode 100644 index dcdbd0d6102c..000000000000 --- a/editor/txmgr/tests/Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -FAIL_ON_WARNINGS = 1 - -include $(DEPTH)/config/autoconf.mk - - -include $(topsrcdir)/config/rules.mk diff --git a/editor/txmgr/tests/moz.build b/editor/txmgr/tests/moz.build index 727b18a4f491..a764ecda81d1 100644 --- a/editor/txmgr/tests/moz.build +++ b/editor/txmgr/tests/moz.build @@ -8,3 +8,5 @@ CPP_UNIT_TESTS += [ 'TestTXMgr.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/editor/txtsvc/src/Makefile.in b/editor/txtsvc/src/Makefile.in index 58dd5e52834c..fd85f0e763b2 100644 --- a/editor/txtsvc/src/Makefile.in +++ b/editor/txtsvc/src/Makefile.in @@ -7,8 +7,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS = 1 - include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 diff --git a/editor/txtsvc/src/moz.build b/editor/txtsvc/src/moz.build index 4a6d2c402ec6..5ba96bbdcb1d 100644 --- a/editor/txtsvc/src/moz.build +++ b/editor/txtsvc/src/moz.build @@ -13,3 +13,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'txtsvc_s' +FAIL_ON_WARNINGS = True + diff --git a/embedding/browser/build/Makefile.in b/embedding/browser/build/Makefile.in index 8afb7cdec072..49971524f003 100644 --- a/embedding/browser/build/Makefile.in +++ b/embedding/browser/build/Makefile.in @@ -12,9 +12,6 @@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - - SHARED_LIBRARY_LIBS= \ ../webBrowser/$(LIB_PREFIX)nsWebBrowser_s.$(LIB_SUFFIX) \ $(NULL) diff --git a/embedding/browser/build/moz.build b/embedding/browser/build/moz.build index f5417fbf6709..4cc6164e8222 100644 --- a/embedding/browser/build/moz.build +++ b/embedding/browser/build/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'webbrwsr' +FAIL_ON_WARNINGS = True + diff --git a/embedding/browser/webBrowser/Makefile.in b/embedding/browser/webBrowser/Makefile.in index c102390464be..5c94410916a1 100644 --- a/embedding/browser/webBrowser/Makefile.in +++ b/embedding/browser/webBrowser/Makefile.in @@ -11,9 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - - LOCAL_INCLUDES = \ -I$(srcdir)/../../../content/base/src \ -I$(srcdir)/../../../content/svg/content/src \ diff --git a/embedding/browser/webBrowser/moz.build b/embedding/browser/webBrowser/moz.build index 3dd0283c25e5..5563abcaad9c 100644 --- a/embedding/browser/webBrowser/moz.build +++ b/embedding/browser/webBrowser/moz.build @@ -48,3 +48,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'nsWebBrowser_s' +FAIL_ON_WARNINGS = True + diff --git a/embedding/components/appstartup/src/Makefile.in b/embedding/components/appstartup/src/Makefile.in index a688d9264c3a..123dfb545230 100644 --- a/embedding/components/appstartup/src/Makefile.in +++ b/embedding/components/appstartup/src/Makefile.in @@ -11,7 +11,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/appstartup/src/moz.build b/embedding/components/appstartup/src/moz.build index a157a9122b4f..388155d7faa1 100644 --- a/embedding/components/appstartup/src/moz.build +++ b/embedding/components/appstartup/src/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'appstartupnotifier_s' +FAIL_ON_WARNINGS = True + diff --git a/embedding/components/build/Makefile.in b/embedding/components/build/Makefile.in index bac0b55b618a..248260521d92 100644 --- a/embedding/components/build/Makefile.in +++ b/embedding/components/build/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - SHARED_LIBRARY_LIBS = \ ../windowwatcher/src/$(LIB_PREFIX)windowwatcher_s.$(LIB_SUFFIX) \ ../appstartup/src/$(LIB_PREFIX)appstartupnotifier_s.$(LIB_SUFFIX) \ diff --git a/embedding/components/build/moz.build b/embedding/components/build/moz.build index ff5ff6190e74..b84f5515f5f0 100644 --- a/embedding/components/build/moz.build +++ b/embedding/components/build/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'embedcomponents' +FAIL_ON_WARNINGS = True + diff --git a/embedding/components/commandhandler/src/Makefile.in b/embedding/components/commandhandler/src/Makefile.in index a688d9264c3a..123dfb545230 100644 --- a/embedding/components/commandhandler/src/Makefile.in +++ b/embedding/components/commandhandler/src/Makefile.in @@ -11,7 +11,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/commandhandler/src/moz.build b/embedding/components/commandhandler/src/moz.build index 1d9108426716..6c1f1d52eadb 100644 --- a/embedding/components/commandhandler/src/moz.build +++ b/embedding/components/commandhandler/src/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'commandhandler_s' +FAIL_ON_WARNINGS = True + diff --git a/embedding/components/find/src/Makefile.in b/embedding/components/find/src/Makefile.in index a688d9264c3a..123dfb545230 100644 --- a/embedding/components/find/src/Makefile.in +++ b/embedding/components/find/src/Makefile.in @@ -11,7 +11,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/find/src/moz.build b/embedding/components/find/src/moz.build index 1680d5077653..2b77111d5e97 100644 --- a/embedding/components/find/src/moz.build +++ b/embedding/components/find/src/moz.build @@ -13,3 +13,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'find_s' +FAIL_ON_WARNINGS = True + diff --git a/embedding/components/printingui/src/mac/Makefile.in b/embedding/components/printingui/src/mac/Makefile.in index d28673d00abe..d4ecaf565a05 100644 --- a/embedding/components/printingui/src/mac/Makefile.in +++ b/embedding/components/printingui/src/mac/Makefile.in @@ -12,10 +12,6 @@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = .. LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - - - LOCAL_INCLUDES = \ $(NULL) diff --git a/embedding/components/printingui/src/mac/moz.build b/embedding/components/printingui/src/mac/moz.build index d5e5dcf0ac6e..bd971567efa5 100644 --- a/embedding/components/printingui/src/mac/moz.build +++ b/embedding/components/printingui/src/mac/moz.build @@ -16,3 +16,6 @@ LIBRARY_NAME = 'printingui_s' CMMSRCS += [ 'nsPrintingPromptServiceX.mm', ] + +FAIL_ON_WARNINGS = True + diff --git a/embedding/components/printingui/src/unixshared/Makefile.in b/embedding/components/printingui/src/unixshared/Makefile.in index 766378c7d0ab..1fb1c3289500 100644 --- a/embedding/components/printingui/src/unixshared/Makefile.in +++ b/embedding/components/printingui/src/unixshared/Makefile.in @@ -12,7 +12,5 @@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = .. LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/printingui/src/unixshared/moz.build b/embedding/components/printingui/src/unixshared/moz.build index e1747e7c85f8..04982c860cde 100644 --- a/embedding/components/printingui/src/unixshared/moz.build +++ b/embedding/components/printingui/src/unixshared/moz.build @@ -14,3 +14,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'printingui_s' +FAIL_ON_WARNINGS = True + diff --git a/embedding/components/printingui/src/win/Makefile.in b/embedding/components/printingui/src/win/Makefile.in index 766378c7d0ab..1fb1c3289500 100644 --- a/embedding/components/printingui/src/win/Makefile.in +++ b/embedding/components/printingui/src/win/Makefile.in @@ -12,7 +12,5 @@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = .. LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/printingui/src/win/moz.build b/embedding/components/printingui/src/win/moz.build index cabf41dd7473..9e108f31a6bf 100644 --- a/embedding/components/printingui/src/win/moz.build +++ b/embedding/components/printingui/src/win/moz.build @@ -15,3 +15,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'printingui_s' +FAIL_ON_WARNINGS = True + diff --git a/embedding/components/webbrowserpersist/src/Makefile.in b/embedding/components/webbrowserpersist/src/Makefile.in index e82ebf0086b4..6297c32482be 100644 --- a/embedding/components/webbrowserpersist/src/Makefile.in +++ b/embedding/components/webbrowserpersist/src/Makefile.in @@ -11,8 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/embedding/components/webbrowserpersist/src/moz.build b/embedding/components/webbrowserpersist/src/moz.build index 5066372752ed..c6ebf92f0630 100644 --- a/embedding/components/webbrowserpersist/src/moz.build +++ b/embedding/components/webbrowserpersist/src/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'webbrowserpersist_s' +FAIL_ON_WARNINGS = True + diff --git a/embedding/components/windowwatcher/src/Makefile.in b/embedding/components/windowwatcher/src/Makefile.in index 34e87f5c6e03..ea052094e060 100644 --- a/embedding/components/windowwatcher/src/Makefile.in +++ b/embedding/components/windowwatcher/src/Makefile.in @@ -11,9 +11,10 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 # For nsJSUtils -LOCAL_INCLUDES += -I$(topsrcdir)/dom/base \ +LOCAL_INCLUDES += \ + -I$(topsrcdir)/dom/base \ + $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/windowwatcher/src/moz.build b/embedding/components/windowwatcher/src/moz.build index 452c41e3f2f4..f50cf3870484 100644 --- a/embedding/components/windowwatcher/src/moz.build +++ b/embedding/components/windowwatcher/src/moz.build @@ -18,3 +18,5 @@ if CONFIG['MOZ_XUL']: LIBRARY_NAME = 'windowwatcher_s' +FAIL_ON_WARNINGS = True + diff --git a/extensions/gio/Makefile.in b/extensions/gio/Makefile.in index 1fa4e04dd478..8a6f73e6c6d0 100644 --- a/extensions/gio/Makefile.in +++ b/extensions/gio/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - LOCAL_INCLUDES = $(MOZ_GIO_CFLAGS) include $(topsrcdir)/config/rules.mk diff --git a/extensions/gio/moz.build b/extensions/gio/moz.build index fc6042030e2e..78c2ad97e9bb 100644 --- a/extensions/gio/moz.build +++ b/extensions/gio/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'nkgio' +FAIL_ON_WARNINGS = True + diff --git a/gfx/gl/Makefile.in b/gfx/gl/Makefile.in index 54a2cd37d1f9..c3ad1f792bcb 100644 --- a/gfx/gl/Makefile.in +++ b/gfx/gl/Makefile.in @@ -13,9 +13,6 @@ LIBRARY_NAME = gl MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - - ifeq ($(MOZ_WIDGET_TOOLKIT),windows) ifdef MOZ_WEBGL DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL) diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build index 541f60aaed87..e98a6cb6b6f3 100644 --- a/gfx/gl/moz.build +++ b/gfx/gl/moz.build @@ -116,3 +116,5 @@ CPP_SOURCES += [ 'SurfaceStream.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in index b6881a508c3d..bb0d1984ceaa 100644 --- a/gfx/src/Makefile.in +++ b/gfx/src/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS) diff --git a/gfx/src/moz.build b/gfx/src/moz.build index 3f15bbe78d6e..8237e4305bec 100644 --- a/gfx/src/moz.build +++ b/gfx/src/moz.build @@ -57,3 +57,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'gkgfx' +FAIL_ON_WARNINGS = True + diff --git a/gfx/thebes/Makefile.in b/gfx/thebes/Makefile.in index cb05c10a1056..7b9bb8eb6ff1 100644 --- a/gfx/thebes/Makefile.in +++ b/gfx/thebes/Makefile.in @@ -14,10 +14,6 @@ MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -ifndef _MSC_VER -FAIL_ON_WARNINGS = 1 -endif # !_MSC_VER - # gfxSVGGlyphs needs nsDOMParser.h LOCAL_INCLUDES += \ -I$(topsrcdir)/content/base/public \ diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build index b855ac9c6d39..85ac6d683fa0 100644 --- a/gfx/thebes/moz.build +++ b/gfx/thebes/moz.build @@ -268,3 +268,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': CMMSRCS += [ 'gfxMacPlatformFontList.mm', ] + +FAIL_ON_WARNINGS = not CONFIG['_MSC_VER'] diff --git a/hal/Makefile.in b/hal/Makefile.in index f6395f649af7..b47a0c721184 100644 --- a/hal/Makefile.in +++ b/hal/Makefile.in @@ -24,8 +24,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = hal_s LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - MOCHITEST_BROWSER_FILES += \ tests/browser_alarms.js \ $(NULL) diff --git a/hal/moz.build b/hal/moz.build index f8aaf8145341..d8d384072aa3 100644 --- a/hal/moz.build +++ b/hal/moz.build @@ -149,3 +149,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': IPDL_SOURCES = [ 'sandbox/PHal.ipdl', ] + +FAIL_ON_WARNINGS = True + diff --git a/image/build/Makefile.in b/image/build/Makefile.in index 14ed56a6f44a..290ba3cff958 100644 --- a/image/build/Makefile.in +++ b/image/build/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - LOCAL_INCLUDES = \ -I. \ -I$(srcdir)/../src \ diff --git a/image/build/moz.build b/image/build/moz.build index a2faeffe95a9..4f58423f17bf 100644 --- a/image/build/moz.build +++ b/image/build/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'imglib2' +FAIL_ON_WARNINGS = True + diff --git a/image/decoders/Makefile.in b/image/decoders/Makefile.in index 8fc0569e1f71..e8ace735d4d4 100644 --- a/image/decoders/Makefile.in +++ b/image/decoders/Makefile.in @@ -11,8 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - CSRCS = iccjpeg.c \ $(NULL) diff --git a/image/decoders/icon/Makefile.in b/image/decoders/icon/Makefile.in index c8419ae022d5..c2fc4ca6e104 100644 --- a/image/decoders/icon/Makefile.in +++ b/image/decoders/icon/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - ifdef MOZ_WIDGET_GTK PLATFORM = gtk endif diff --git a/image/decoders/icon/android/Makefile.in b/image/decoders/icon/android/Makefile.in index edafdefcdb74..230394f1a8cf 100644 --- a/image/decoders/icon/android/Makefile.in +++ b/image/decoders/icon/android/Makefile.in @@ -11,7 +11,5 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = imgiconandroid_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/image/decoders/icon/android/moz.build b/image/decoders/icon/android/moz.build index dd14f43309fe..217f2a028d0a 100644 --- a/image/decoders/icon/android/moz.build +++ b/image/decoders/icon/android/moz.build @@ -10,3 +10,5 @@ CPP_SOURCES += [ 'nsIconChannel.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/image/decoders/icon/gtk/Makefile.in b/image/decoders/icon/gtk/Makefile.in index 4f7f51b91a36..503610e62a75 100644 --- a/image/decoders/icon/gtk/Makefile.in +++ b/image/decoders/icon/gtk/Makefile.in @@ -11,8 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - ifdef MOZ_ENABLE_GNOMEUI LOCAL_INCLUDES += $(MOZ_GNOMEUI_CFLAGS) else diff --git a/image/decoders/icon/gtk/moz.build b/image/decoders/icon/gtk/moz.build index 0cb7aa9235f6..7c817290a0aa 100644 --- a/image/decoders/icon/gtk/moz.build +++ b/image/decoders/icon/gtk/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'imgicongtk_s' +FAIL_ON_WARNINGS = True + diff --git a/image/decoders/icon/mac/Makefile.in b/image/decoders/icon/mac/Makefile.in index 9eaddda84d76..5656cfbb757d 100644 --- a/image/decoders/icon/mac/Makefile.in +++ b/image/decoders/icon/mac/Makefile.in @@ -10,8 +10,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - - - include $(topsrcdir)/config/rules.mk diff --git a/image/decoders/icon/mac/moz.build b/image/decoders/icon/mac/moz.build index 5ad34c100ef1..6669f4354636 100644 --- a/image/decoders/icon/mac/moz.build +++ b/image/decoders/icon/mac/moz.build @@ -11,3 +11,6 @@ LIBRARY_NAME = 'imgiconmac_s' CMMSRCS += [ 'nsIconChannelCocoa.mm', ] + +FAIL_ON_WARNINGS = True + diff --git a/image/decoders/icon/moz.build b/image/decoders/icon/moz.build index 68f3a40cfea2..649473897aa5 100644 --- a/image/decoders/icon/moz.build +++ b/image/decoders/icon/moz.build @@ -18,3 +18,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'imgicon' +FAIL_ON_WARNINGS = True + diff --git a/image/decoders/icon/win/Makefile.in b/image/decoders/icon/win/Makefile.in index 8dc0a33fdd0f..a819b1fdcba0 100644 --- a/image/decoders/icon/win/Makefile.in +++ b/image/decoders/icon/win/Makefile.in @@ -11,7 +11,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk diff --git a/image/decoders/icon/win/moz.build b/image/decoders/icon/win/moz.build index c89cec90ac85..886b42b05ad8 100644 --- a/image/decoders/icon/win/moz.build +++ b/image/decoders/icon/win/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'imgiconwin_s' +FAIL_ON_WARNINGS = True + diff --git a/image/decoders/moz.build b/image/decoders/moz.build index 3b3874db7346..4c520e6bea1d 100644 --- a/image/decoders/moz.build +++ b/image/decoders/moz.build @@ -36,3 +36,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'imgdecoders_s' +FAIL_ON_WARNINGS = True + diff --git a/image/encoders/bmp/Makefile.in b/image/encoders/bmp/Makefile.in index 0416c5b51943..df81ef0f7c04 100644 --- a/image/encoders/bmp/Makefile.in +++ b/image/encoders/bmp/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - LOCAL_INCLUDES += -I$(topsrcdir)/image/src/ include $(topsrcdir)/config/rules.mk diff --git a/image/encoders/bmp/moz.build b/image/encoders/bmp/moz.build index f9929ab5a415..c77ab50419ed 100644 --- a/image/encoders/bmp/moz.build +++ b/image/encoders/bmp/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'imgbmpe_s' +FAIL_ON_WARNINGS = True + diff --git a/image/encoders/ico/Makefile.in b/image/encoders/ico/Makefile.in index 88c17df739f7..65ecef1f80ab 100644 --- a/image/encoders/ico/Makefile.in +++ b/image/encoders/ico/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 # Decoders need RasterImage.h LOCAL_INCLUDES += -I$(topsrcdir)/image/src/ diff --git a/image/encoders/ico/moz.build b/image/encoders/ico/moz.build index fc01dd0de75e..1008014be4df 100644 --- a/image/encoders/ico/moz.build +++ b/image/encoders/ico/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'imgicoe_s' +FAIL_ON_WARNINGS = True + diff --git a/image/encoders/jpeg/Makefile.in b/image/encoders/jpeg/Makefile.in index 93592f5c0223..7051ddb33b26 100644 --- a/image/encoders/jpeg/Makefile.in +++ b/image/encoders/jpeg/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk diff --git a/image/encoders/jpeg/moz.build b/image/encoders/jpeg/moz.build index 8a3561752e50..a102612f17a2 100644 --- a/image/encoders/jpeg/moz.build +++ b/image/encoders/jpeg/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'imgjpege_s' +FAIL_ON_WARNINGS = True + diff --git a/image/encoders/png/Makefile.in b/image/encoders/png/Makefile.in index 2797257edcf7..acfb35f16400 100644 --- a/image/encoders/png/Makefile.in +++ b/image/encoders/png/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - DEFINES += -DMOZ_PNG_WRITE \ -DMOZ_PNG_READ \ $(NULL) diff --git a/image/encoders/png/moz.build b/image/encoders/png/moz.build index e9db3c622e62..115220fdf82d 100644 --- a/image/encoders/png/moz.build +++ b/image/encoders/png/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'imgpnge_s' +FAIL_ON_WARNINGS = True + diff --git a/image/src/Makefile.in b/image/src/Makefile.in index aa9ff826a953..e51378a2b7d3 100644 --- a/image/src/Makefile.in +++ b/image/src/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = imglib2_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 # We need to instantiate the decoders LOCAL_INCLUDES += -I$(topsrcdir)/image/decoders diff --git a/image/src/moz.build b/image/src/moz.build index fca3c903dcbc..2257cbb7faf6 100644 --- a/image/src/moz.build +++ b/image/src/moz.build @@ -38,3 +38,5 @@ CPP_SOURCES += [ 'imgTools.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/ipc/testshell/Makefile.in b/ipc/testshell/Makefile.in index f4d679d2ef20..5667964f9306 100644 --- a/ipc/testshell/Makefile.in +++ b/ipc/testshell/Makefile.in @@ -7,8 +7,6 @@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ relativesrcdir = @relativesrcdir@ -FAIL_ON_WARNINGS = 1 - include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = ipcshell_s diff --git a/ipc/testshell/moz.build b/ipc/testshell/moz.build index fd5ea3317364..f07e6e07363a 100644 --- a/ipc/testshell/moz.build +++ b/ipc/testshell/moz.build @@ -26,3 +26,6 @@ IPDL_SOURCES = [ 'PTestShell.ipdl', 'PTestShellCommand.ipdl', ] + +FAIL_ON_WARNINGS = True + diff --git a/ipc/unixsocket/Makefile.in b/ipc/unixsocket/Makefile.in index 906de43b3d2a..0ee8f0a63cfb 100644 --- a/ipc/unixsocket/Makefile.in +++ b/ipc/unixsocket/Makefile.in @@ -12,7 +12,5 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = mozipcunixsocket_s LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/ipc/unixsocket/moz.build b/ipc/unixsocket/moz.build index 97ee8f94324c..62c2246cc98a 100644 --- a/ipc/unixsocket/moz.build +++ b/ipc/unixsocket/moz.build @@ -14,3 +14,5 @@ CPP_SOURCES += [ 'UnixSocket.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/js/ipc/Makefile.in b/js/ipc/Makefile.in index 2d5dbca5da91..7f69c5df38a0 100644 --- a/js/ipc/Makefile.in +++ b/js/ipc/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = jsipc_s LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/js/ipc \ diff --git a/js/ipc/moz.build b/js/ipc/moz.build index 0e43d1cfdaa0..4072cce1614a 100644 --- a/js/ipc/moz.build +++ b/js/ipc/moz.build @@ -16,3 +16,6 @@ IPDL_SOURCES += [ 'JavaScriptTypes.ipdlh', 'PJavaScript.ipdl', ] + +FAIL_ON_WARNINGS = True + diff --git a/js/xpconnect/loader/Makefile.in b/js/xpconnect/loader/Makefile.in index d0fabaabdb7e..7bca49ca9525 100644 --- a/js/xpconnect/loader/Makefile.in +++ b/js/xpconnect/loader/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FAIL_ON_WARNINGS := 1 MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 LOCAL_INCLUDES += \ diff --git a/js/xpconnect/loader/moz.build b/js/xpconnect/loader/moz.build index b3f1105d9291..6354453261d0 100644 --- a/js/xpconnect/loader/moz.build +++ b/js/xpconnect/loader/moz.build @@ -18,3 +18,6 @@ EXTRA_JS_MODULES += [ 'ISO8601DateUtils.jsm', 'XPCOMUtils.jsm', ] + +FAIL_ON_WARNINGS = True + diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in index efe097acc232..53726b2821b4 100644 --- a/js/xpconnect/src/Makefile.in +++ b/js/xpconnect/src/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = xpconnect_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../wrappers \ -I$(srcdir)/../loader \ diff --git a/js/xpconnect/src/moz.build b/js/xpconnect/src/moz.build index 333faf7130fc..6152158bd7a0 100644 --- a/js/xpconnect/src/moz.build +++ b/js/xpconnect/src/moz.build @@ -53,3 +53,5 @@ CPP_SOURCES += [ 'nsXPConnect.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/js/xpconnect/wrappers/Makefile.in b/js/xpconnect/wrappers/Makefile.in index d14718b6e3a5..c4d4f89e7c78 100644 --- a/js/xpconnect/wrappers/Makefile.in +++ b/js/xpconnect/wrappers/Makefile.in @@ -11,9 +11,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -ifndef _MSC_VER # warning C4661 for FilteringWrapper -FAIL_ON_WARNINGS := 1 -endif # !_MSC_VER LOCAL_INCLUDES = \ -I$(srcdir)/../src \ diff --git a/js/xpconnect/wrappers/moz.build b/js/xpconnect/wrappers/moz.build index b41581a8543c..461a0aa827b7 100644 --- a/js/xpconnect/wrappers/moz.build +++ b/js/xpconnect/wrappers/moz.build @@ -21,3 +21,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'xpcwrappers_s' +# warning C4661 for FilteringWrapper +FAIL_ON_WARNINGS = not CONFIG['_MSC_VER'] diff --git a/layout/base/Makefile.in b/layout/base/Makefile.in index 17adf29f9e32..9e61e0b25d50 100644 --- a/layout/base/Makefile.in +++ b/layout/base/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkbase_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/layout/base/moz.build b/layout/base/moz.build index da602b182705..2e96f1a02ee3 100644 --- a/layout/base/moz.build +++ b/layout/base/moz.build @@ -99,3 +99,5 @@ CPP_SOURCES += [ 'nsStyleSheetService.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in index 9bf88b09cdca..f405e43d8b47 100644 --- a/layout/build/Makefile.in +++ b/layout/build/Makefile.in @@ -19,9 +19,6 @@ LIBRARY_NAME = gklayout MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - - SHARED_LIBRARY_LIBS = \ ../base/$(LIB_PREFIX)gkbase_s.$(LIB_SUFFIX) \ ../forms/$(LIB_PREFIX)gkforms_s.$(LIB_SUFFIX) \ diff --git a/layout/build/moz.build b/layout/build/moz.build index fdb12f185b65..0e0b60575cf7 100644 --- a/layout/build/moz.build +++ b/layout/build/moz.build @@ -18,3 +18,5 @@ CPP_SOURCES += [ 'nsLayoutStatics.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/layout/forms/Makefile.in b/layout/forms/Makefile.in index 8d93c587bcec..7b1250b52830 100644 --- a/layout/forms/Makefile.in +++ b/layout/forms/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/layout/forms/moz.build b/layout/forms/moz.build index e090553c6e0f..17baae71b8c4 100644 --- a/layout/forms/moz.build +++ b/layout/forms/moz.build @@ -38,3 +38,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'gkforms_s' +FAIL_ON_WARNINGS = True + diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in index 270fa777b184..751c645430aa 100644 --- a/layout/generic/Makefile.in +++ b/layout/generic/Makefile.in @@ -12,9 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkgeneric_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -ifndef _MSC_VER -FAIL_ON_WARNINGS = 1 -endif # !_MSC_VER RESOURCES_HTML = \ $(srcdir)/folder.png \ diff --git a/layout/generic/moz.build b/layout/generic/moz.build index aec4f4ce55e6..d19c88c7d31b 100644 --- a/layout/generic/moz.build +++ b/layout/generic/moz.build @@ -93,3 +93,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': CMMSRCS += [ 'nsPluginUtilsOSX.mm', ] + +FAIL_ON_WARNINGS = not CONFIG['_MSC_VER'] diff --git a/layout/inspector/src/Makefile.in b/layout/inspector/src/Makefile.in index 96ac0820501e..83b0c9b077d8 100644 --- a/layout/inspector/src/Makefile.in +++ b/layout/inspector/src/Makefile.in @@ -11,8 +11,6 @@ VPATH=@srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - LOCAL_INCLUDES += \ -I$(srcdir)/../../style \ -I$(topsrcdir)/content/base/src \ diff --git a/layout/inspector/src/moz.build b/layout/inspector/src/moz.build index a70d4d98a17f..abfb7dfc3a3a 100644 --- a/layout/inspector/src/moz.build +++ b/layout/inspector/src/moz.build @@ -29,3 +29,5 @@ if CONFIG['MOZ_XUL']: LIBRARY_NAME = 'inspector_s' +FAIL_ON_WARNINGS = True + diff --git a/layout/ipc/Makefile.in b/layout/ipc/Makefile.in index ebefc89a0eb1..4aef1413816b 100644 --- a/layout/ipc/Makefile.in +++ b/layout/ipc/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkipc_s LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/layout/ipc/moz.build b/layout/ipc/moz.build index 3f4e5f6646bf..17ef8c16c3a1 100644 --- a/layout/ipc/moz.build +++ b/layout/ipc/moz.build @@ -20,3 +20,6 @@ CPP_SOURCES += [ IPDL_SOURCES = [ 'PRenderFrame.ipdl', ] + +FAIL_ON_WARNINGS = True + diff --git a/layout/mathml/Makefile.in b/layout/mathml/Makefile.in index 12bec4cb3582..f5422381cd33 100644 --- a/layout/mathml/Makefile.in +++ b/layout/mathml/Makefile.in @@ -13,9 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkmathml_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - - LOCAL_INCLUDES = \ -I$(srcdir)/../style \ -I$(srcdir)/../base \ diff --git a/layout/mathml/moz.build b/layout/mathml/moz.build index 586bcf60f27c..56e56e957862 100644 --- a/layout/mathml/moz.build +++ b/layout/mathml/moz.build @@ -31,3 +31,5 @@ CPP_SOURCES += [ 'nsMathMLsemanticsFrame.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/layout/printing/Makefile.in b/layout/printing/Makefile.in index 77bb2ea84761..01d78ecf157b 100644 --- a/layout/printing/Makefile.in +++ b/layout/printing/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += \ diff --git a/layout/printing/moz.build b/layout/printing/moz.build index 152a3587c0b7..18273864fabf 100644 --- a/layout/printing/moz.build +++ b/layout/printing/moz.build @@ -24,3 +24,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'gkprinting_s' +FAIL_ON_WARNINGS = True + diff --git a/layout/style/Makefile.in b/layout/style/Makefile.in index 983e9cca3cf8..beba3c48de95 100644 --- a/layout/style/Makefile.in +++ b/layout/style/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkstyle_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - ifdef GNU_CC OS_CFLAGS := $(OS_CFLAGS) -Wshadow OS_CXXFLAGS := $(OS_CXXFLAGS) -Wshadow diff --git a/layout/style/moz.build b/layout/style/moz.build index e00e8491789a..ac7f4d9cd738 100644 --- a/layout/style/moz.build +++ b/layout/style/moz.build @@ -123,3 +123,5 @@ CPP_SOURCES += [ 'nsTransitionManager.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/layout/svg/Makefile.in b/layout/svg/Makefile.in index ed32b433f1ab..ba77befc1869 100644 --- a/layout/svg/Makefile.in +++ b/layout/svg/Makefile.in @@ -12,9 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gksvgbase_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/layout/svg/moz.build b/layout/svg/moz.build index 49880173c2da..16c80c0db46f 100644 --- a/layout/svg/moz.build +++ b/layout/svg/moz.build @@ -53,3 +53,5 @@ CPP_SOURCES += [ 'nsSVGUtils.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/layout/tables/Makefile.in b/layout/tables/Makefile.in index dca53289dc6b..dcbcc95d9689 100644 --- a/layout/tables/Makefile.in +++ b/layout/tables/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk DEFINES += -DDEBUG_TABLE_STRATEGY_off diff --git a/layout/tables/moz.build b/layout/tables/moz.build index 025bb76dbd56..32ad123f1b97 100644 --- a/layout/tables/moz.build +++ b/layout/tables/moz.build @@ -29,3 +29,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'gktable_s' +FAIL_ON_WARNINGS = True + diff --git a/layout/tools/layout-debug/src/Makefile.in b/layout/tools/layout-debug/src/Makefile.in index ef44ae04c8f3..559ca83e3008 100644 --- a/layout/tools/layout-debug/src/Makefile.in +++ b/layout/tools/layout-debug/src/Makefile.in @@ -12,9 +12,6 @@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - - include $(topsrcdir)/config/rules.mk libs:: diff --git a/layout/tools/layout-debug/src/moz.build b/layout/tools/layout-debug/src/moz.build index fd03b5818943..a97ceb9d9c86 100644 --- a/layout/tools/layout-debug/src/moz.build +++ b/layout/tools/layout-debug/src/moz.build @@ -24,3 +24,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'gkdebug' +FAIL_ON_WARNINGS = True + diff --git a/layout/xul/base/src/Makefile.in b/layout/xul/base/src/Makefile.in index 15327dd5e5b3..b30ab753c65e 100644 --- a/layout/xul/base/src/Makefile.in +++ b/layout/xul/base/src/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkxulbase_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/layout/xul/base/src/moz.build b/layout/xul/base/src/moz.build index 6f27f45c6ac9..d3784f00f7ea 100644 --- a/layout/xul/base/src/moz.build +++ b/layout/xul/base/src/moz.build @@ -53,3 +53,6 @@ if CONFIG['MOZ_XUL']: 'nsXULLabelFrame.cpp', 'nsXULPopupManager.cpp', ] + +FAIL_ON_WARNINGS = True + diff --git a/layout/xul/grid/Makefile.in b/layout/xul/grid/Makefile.in index 3dfb63e5ccfd..14b3c846afa9 100644 --- a/layout/xul/grid/Makefile.in +++ b/layout/xul/grid/Makefile.in @@ -11,8 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - LOCAL_INCLUDES = \ -I$(srcdir) \ -I$(srcdir)/../base/src \ diff --git a/layout/xul/grid/moz.build b/layout/xul/grid/moz.build index d2cfd5d2e253..f8be16873db6 100644 --- a/layout/xul/grid/moz.build +++ b/layout/xul/grid/moz.build @@ -32,3 +32,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'gkxulgrid_s' +FAIL_ON_WARNINGS = True + diff --git a/layout/xul/tree/Makefile.in b/layout/xul/tree/Makefile.in index e0f6b11a0349..90fdeda400da 100644 --- a/layout/xul/tree/Makefile.in +++ b/layout/xul/tree/Makefile.in @@ -11,8 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - LOCAL_INCLUDES = \ -I$(srcdir) \ -I$(topsrcdir)/content/events/src \ diff --git a/layout/xul/tree/moz.build b/layout/xul/tree/moz.build index 8add51baf879..79175b60ca17 100644 --- a/layout/xul/tree/moz.build +++ b/layout/xul/tree/moz.build @@ -35,3 +35,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'gkxultree_s' +FAIL_ON_WARNINGS = True + diff --git a/media/mtransport/build/Makefile.in b/media/mtransport/build/Makefile.in index 40a950a1c47c..35ab5736922e 100644 --- a/media/mtransport/build/Makefile.in +++ b/media/mtransport/build/Makefile.in @@ -17,10 +17,6 @@ endif LIBXUL_LIBRARY=1 -ifndef _MSC_VER -FAIL_ON_WARNINGS = 1 -endif # !_MSC_VER - include $(srcdir)/../objs.mk diff --git a/media/mtransport/build/moz.build b/media/mtransport/build/moz.build index dc9e3e19ddb6..c439df6fa4a3 100644 --- a/media/mtransport/build/moz.build +++ b/media/mtransport/build/moz.build @@ -30,3 +30,4 @@ CPP_SOURCES += [ LIBRARY_NAME = 'mtransport' +FAIL_ON_WARNINGS = not CONFIG['_MSC_VER'] diff --git a/media/mtransport/test/Makefile.in b/media/mtransport/test/Makefile.in index ef01fd89779c..47c35e3e1885 100644 --- a/media/mtransport/test/Makefile.in +++ b/media/mtransport/test/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FAIL_ON_WARNINGS = 1 - DEFINES += \ -DHAVE_STRDUP -DNR_SOCKET_IS_VOID_PTR -DSCTP_DEBUG -DINET diff --git a/media/mtransport/test/moz.build b/media/mtransport/test/moz.build index 4fd84d59ac96..e1520fcf6c64 100644 --- a/media/mtransport/test/moz.build +++ b/media/mtransport/test/moz.build @@ -21,3 +21,6 @@ if CONFIG['OS_TARGET'] != 'WINNT' and CONFIG['MOZ_WIDGET_TOOLKIT'] != 'gonk': CPP_UNIT_TESTS += [ 'sctp_unittest.cpp', ] + +FAIL_ON_WARNINGS = True + diff --git a/modules/libjar/Makefile.in b/modules/libjar/Makefile.in index a66a38ea7269..b07372507c2d 100644 --- a/modules/libjar/Makefile.in +++ b/modules/libjar/Makefile.in @@ -14,7 +14,5 @@ LIBRARY_NAME = jar$(VERSION_NUMBER) MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/modules/libjar/moz.build b/modules/libjar/moz.build index 7b132d7e1032..1fdbc429832a 100644 --- a/modules/libjar/moz.build +++ b/modules/libjar/moz.build @@ -34,3 +34,5 @@ CPP_SOURCES += [ 'nsZipArchive.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/mozglue/android/Makefile.in b/mozglue/android/Makefile.in index a67c4d45041c..d3ac49fcb9e7 100644 --- a/mozglue/android/Makefile.in +++ b/mozglue/android/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk FORCE_STATIC_LIB = 1 STL_FLAGS= -FAIL_ON_WARNINGS := 1 - DEFINES += \ -DANDROID_PACKAGE_NAME='"$(ANDROID_PACKAGE_NAME)"' \ $(NULL) diff --git a/mozglue/android/moz.build b/mozglue/android/moz.build index 48722a8e86dd..37f165fe1b8f 100644 --- a/mozglue/android/moz.build +++ b/mozglue/android/moz.build @@ -19,3 +19,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'android' +FAIL_ON_WARNINGS = True + diff --git a/netwerk/base/public/Makefile.in b/netwerk/base/public/Makefile.in index 45531d6beca7..11a39f90e87f 100644 --- a/netwerk/base/public/Makefile.in +++ b/netwerk/base/public/Makefile.in @@ -7,8 +7,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk diff --git a/netwerk/base/public/moz.build b/netwerk/base/public/moz.build index f39509709c43..4abb5b910ffa 100644 --- a/netwerk/base/public/moz.build +++ b/netwerk/base/public/moz.build @@ -134,3 +134,5 @@ EXPORTS += [ 'nsURIHashKey.h', ] +FAIL_ON_WARNINGS = True + diff --git a/netwerk/base/src/Makefile.in b/netwerk/base/src/Makefile.in index 00208d1262fa..6b734e1ab33e 100644 --- a/netwerk/base/src/Makefile.in +++ b/netwerk/base/src/Makefile.in @@ -14,8 +14,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = neckobase_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - LOCAL_INCLUDES += -I$(topsrcdir)/dom/base ifdef MOZ_PLATFORM_MAEMO diff --git a/netwerk/base/src/moz.build b/netwerk/base/src/moz.build index 2af05e252808..bfc82ab119db 100644 --- a/netwerk/base/src/moz.build +++ b/netwerk/base/src/moz.build @@ -110,3 +110,6 @@ if CONFIG['MOZ_PLATFORM_MAEMO']: EXTRA_JS_MODULES += [ 'NetUtil.jsm', ] + +FAIL_ON_WARNINGS = True + diff --git a/netwerk/build/Makefile.in b/netwerk/build/Makefile.in index 179d43d75178..40a348dde958 100644 --- a/netwerk/build/Makefile.in +++ b/netwerk/build/Makefile.in @@ -14,8 +14,6 @@ LIBRARY_NAME = necko MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - SHARED_LIBRARY_LIBS = \ ../base/src/$(LIB_PREFIX)neckobase_s.$(LIB_SUFFIX) \ ../dns/$(LIB_PREFIX)neckodns_s.$(LIB_SUFFIX) \ diff --git a/netwerk/build/moz.build b/netwerk/build/moz.build index 987d4da8656a..268b5e93311f 100644 --- a/netwerk/build/moz.build +++ b/netwerk/build/moz.build @@ -14,3 +14,5 @@ CPP_SOURCES += [ 'nsNetModule.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/netwerk/cache/Makefile.in b/netwerk/cache/Makefile.in index 504f608b6835..a7f65e02c82c 100644 --- a/netwerk/cache/Makefile.in +++ b/netwerk/cache/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../base/src \ $(NULL) diff --git a/netwerk/cache/moz.build b/netwerk/cache/moz.build index ba048016d035..3bbaff6f0dfd 100644 --- a/netwerk/cache/moz.build +++ b/netwerk/cache/moz.build @@ -44,3 +44,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'nkcache_s' +FAIL_ON_WARNINGS = True + diff --git a/netwerk/cookie/Makefile.in b/netwerk/cookie/Makefile.in index ad6839942688..2090ea61bef6 100644 --- a/netwerk/cookie/Makefile.in +++ b/netwerk/cookie/Makefile.in @@ -12,8 +12,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk # export required interfaces, even if --disable-cookies has been given -FAIL_ON_WARNINGS := 1 - ifdef NECKO_COOKIES LIBRARY_NAME = neckocookie_s MSVC_ENABLE_PGO := 1 diff --git a/netwerk/cookie/moz.build b/netwerk/cookie/moz.build index 4189aa76bb59..d07a9f4f29f5 100644 --- a/netwerk/cookie/moz.build +++ b/netwerk/cookie/moz.build @@ -39,3 +39,6 @@ if CONFIG['NECKO_COOKIES'] and CONFIG['OS_ARCH'] != 'Darwin': IPDL_SOURCES = [ 'PCookieService.ipdl', ] + +FAIL_ON_WARNINGS = True + diff --git a/netwerk/dns/Makefile.in b/netwerk/dns/Makefile.in index 03a9c5c1673c..2e9e3a4c928f 100644 --- a/netwerk/dns/Makefile.in +++ b/netwerk/dns/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 # need to include etld_data.inc LOCAL_INCLUDES = \ diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build index 093f6f746fad..db682fab037b 100644 --- a/netwerk/dns/moz.build +++ b/netwerk/dns/moz.build @@ -37,3 +37,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'neckodns_s' +FAIL_ON_WARNINGS = True + diff --git a/netwerk/ipc/Makefile.in b/netwerk/ipc/Makefile.in index 2c2c15ce106c..8388a674fece 100644 --- a/netwerk/ipc/Makefile.in +++ b/netwerk/ipc/Makefile.in @@ -6,8 +6,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = neckoipc_s diff --git a/netwerk/ipc/moz.build b/netwerk/ipc/moz.build index c4094c91febf..b3fbb6f8bb0e 100644 --- a/netwerk/ipc/moz.build +++ b/netwerk/ipc/moz.build @@ -36,3 +36,6 @@ IPDL_SOURCES = [ 'PNecko.ipdl', 'PRemoteOpenFile.ipdl', ] + +FAIL_ON_WARNINGS = True + diff --git a/netwerk/mime/Makefile.in b/netwerk/mime/Makefile.in index 8f31acf4d80b..3bcbb57a2459 100644 --- a/netwerk/mime/Makefile.in +++ b/netwerk/mime/Makefile.in @@ -7,8 +7,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 diff --git a/netwerk/mime/moz.build b/netwerk/mime/moz.build index 2f241e7f2473..e3f3179d662e 100644 --- a/netwerk/mime/moz.build +++ b/netwerk/mime/moz.build @@ -22,3 +22,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'nkmime_s' +FAIL_ON_WARNINGS = True + diff --git a/netwerk/protocol/about/Makefile.in b/netwerk/protocol/about/Makefile.in index c5011f2cce9d..f825d7cb5e5f 100644 --- a/netwerk/protocol/about/Makefile.in +++ b/netwerk/protocol/about/Makefile.in @@ -7,8 +7,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkabout_s diff --git a/netwerk/protocol/about/moz.build b/netwerk/protocol/about/moz.build index 3892cb706ebb..65333a585848 100644 --- a/netwerk/protocol/about/moz.build +++ b/netwerk/protocol/about/moz.build @@ -24,3 +24,5 @@ CPP_SOURCES += [ 'nsAboutProtocolHandler.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/netwerk/protocol/data/Makefile.in b/netwerk/protocol/data/Makefile.in index 82157dddcb8a..659bd99d247c 100644 --- a/netwerk/protocol/data/Makefile.in +++ b/netwerk/protocol/data/Makefile.in @@ -7,8 +7,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS = 1 - include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 diff --git a/netwerk/protocol/data/moz.build b/netwerk/protocol/data/moz.build index 3d4344b541d7..f4bcf8e60f49 100644 --- a/netwerk/protocol/data/moz.build +++ b/netwerk/protocol/data/moz.build @@ -13,3 +13,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'nkdata_s' +FAIL_ON_WARNINGS = True + diff --git a/netwerk/protocol/device/Makefile.in b/netwerk/protocol/device/Makefile.in index 3437d16c5be3..30558cc495e2 100644 --- a/netwerk/protocol/device/Makefile.in +++ b/netwerk/protocol/device/Makefile.in @@ -6,8 +6,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS = 1 - include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkdevice_s diff --git a/netwerk/protocol/device/moz.build b/netwerk/protocol/device/moz.build index 147c8eb2af40..e2c5b2898cbe 100644 --- a/netwerk/protocol/device/moz.build +++ b/netwerk/protocol/device/moz.build @@ -20,3 +20,5 @@ CPP_SOURCES += [ 'nsDeviceProtocolHandler.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/netwerk/protocol/file/Makefile.in b/netwerk/protocol/file/Makefile.in index 1ff638f3323a..4a3e4456da41 100644 --- a/netwerk/protocol/file/Makefile.in +++ b/netwerk/protocol/file/Makefile.in @@ -7,8 +7,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS = 1 - include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 diff --git a/netwerk/protocol/file/moz.build b/netwerk/protocol/file/moz.build index e3eb168ec78a..b5fa3c9666b7 100644 --- a/netwerk/protocol/file/moz.build +++ b/netwerk/protocol/file/moz.build @@ -20,3 +20,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'nkfile_s' +FAIL_ON_WARNINGS = True + diff --git a/netwerk/protocol/ftp/Makefile.in b/netwerk/protocol/ftp/Makefile.in index bd92e69a511c..96b5df04712d 100644 --- a/netwerk/protocol/ftp/Makefile.in +++ b/netwerk/protocol/ftp/Makefile.in @@ -7,8 +7,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS = 1 - include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkftp_s diff --git a/netwerk/protocol/ftp/moz.build b/netwerk/protocol/ftp/moz.build index 232e8b209810..2b080f82c3eb 100644 --- a/netwerk/protocol/ftp/moz.build +++ b/netwerk/protocol/ftp/moz.build @@ -33,3 +33,6 @@ CPP_SOURCES += [ IPDL_SOURCES += [ 'PFTPChannel.ipdl', ] + +FAIL_ON_WARNINGS = True + diff --git a/netwerk/protocol/http/Makefile.in b/netwerk/protocol/http/Makefile.in index 640b1f0e7d65..90d296925a40 100644 --- a/netwerk/protocol/http/Makefile.in +++ b/netwerk/protocol/http/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkhttp_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/xpcom/ds \ diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build index 6add00fed3c5..5e81cea1e353 100644 --- a/netwerk/protocol/http/moz.build +++ b/netwerk/protocol/http/moz.build @@ -79,3 +79,6 @@ IPDL_SOURCES += [ EXTRA_JS_MODULES += [ 'UserAgentOverrides.jsm', ] + +FAIL_ON_WARNINGS = True + diff --git a/netwerk/protocol/res/Makefile.in b/netwerk/protocol/res/Makefile.in index af6eb70aa459..dbc937e0ef08 100644 --- a/netwerk/protocol/res/Makefile.in +++ b/netwerk/protocol/res/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkres_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - LOCAL_INCLUDES = \ -I$(topsrcdir)/netwerk/base/src \ $(NULL) diff --git a/netwerk/protocol/res/moz.build b/netwerk/protocol/res/moz.build index 9cd1568e6f46..46ddeeade9c1 100644 --- a/netwerk/protocol/res/moz.build +++ b/netwerk/protocol/res/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ 'nsResProtocolHandler.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/netwerk/protocol/viewsource/Makefile.in b/netwerk/protocol/viewsource/Makefile.in index 7057c5829231..d34433c5562e 100644 --- a/netwerk/protocol/viewsource/Makefile.in +++ b/netwerk/protocol/viewsource/Makefile.in @@ -7,8 +7,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS = 1 - include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 diff --git a/netwerk/protocol/viewsource/moz.build b/netwerk/protocol/viewsource/moz.build index 22a818b54f2b..f93e6d111278 100644 --- a/netwerk/protocol/viewsource/moz.build +++ b/netwerk/protocol/viewsource/moz.build @@ -19,3 +19,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'nkviewsource_s' +FAIL_ON_WARNINGS = True + diff --git a/netwerk/protocol/websocket/Makefile.in b/netwerk/protocol/websocket/Makefile.in index cdf1e7c66dd7..96e6e1cdbf40 100644 --- a/netwerk/protocol/websocket/Makefile.in +++ b/netwerk/protocol/websocket/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkwebsocket_s MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/content/base/src \ diff --git a/netwerk/protocol/websocket/moz.build b/netwerk/protocol/websocket/moz.build index e1dde568db62..c4cb901cd196 100644 --- a/netwerk/protocol/websocket/moz.build +++ b/netwerk/protocol/websocket/moz.build @@ -30,3 +30,6 @@ CPP_SOURCES += [ IPDL_SOURCES += [ 'PWebSocket.ipdl', ] + +FAIL_ON_WARNINGS = True + diff --git a/netwerk/protocol/wyciwyg/Makefile.in b/netwerk/protocol/wyciwyg/Makefile.in index ff14c12394d9..e7f3b0be4a5a 100644 --- a/netwerk/protocol/wyciwyg/Makefile.in +++ b/netwerk/protocol/wyciwyg/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkwyciwyg_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ $(NULL) diff --git a/netwerk/protocol/wyciwyg/moz.build b/netwerk/protocol/wyciwyg/moz.build index 21c2489d5f6a..dbb94052d3b6 100644 --- a/netwerk/protocol/wyciwyg/moz.build +++ b/netwerk/protocol/wyciwyg/moz.build @@ -28,3 +28,6 @@ CPP_SOURCES += [ IPDL_SOURCES += [ 'PWyciwygChannel.ipdl', ] + +FAIL_ON_WARNINGS = True + diff --git a/netwerk/sctp/datachannel/Makefile.in b/netwerk/sctp/datachannel/Makefile.in index c37b57f2da3b..9d79fb1e094c 100644 --- a/netwerk/sctp/datachannel/Makefile.in +++ b/netwerk/sctp/datachannel/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkdatachan_s LIBXUL_LIBRARY = 1 NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO -FAIL_ON_WARNINGS = 1 - LOCAL_INCLUDES = \ -I$(topsrcdir)/xpcom/ds \ -I$(srcdir)/../src \ diff --git a/netwerk/sctp/datachannel/moz.build b/netwerk/sctp/datachannel/moz.build index bf6e9be7cd99..f16756498b27 100644 --- a/netwerk/sctp/datachannel/moz.build +++ b/netwerk/sctp/datachannel/moz.build @@ -17,3 +17,5 @@ CPP_SOURCES += [ 'DataChannel.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/netwerk/socket/Makefile.in b/netwerk/socket/Makefile.in index 361ed47544b4..22f2bacadc95 100644 --- a/netwerk/socket/Makefile.in +++ b/netwerk/socket/Makefile.in @@ -7,8 +7,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 diff --git a/netwerk/socket/moz.build b/netwerk/socket/moz.build index c25d3b58bffb..b0b5f0de06b2 100644 --- a/netwerk/socket/moz.build +++ b/netwerk/socket/moz.build @@ -25,3 +25,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'neckosocket_s' +FAIL_ON_WARNINGS = True + diff --git a/netwerk/streamconv/converters/Makefile.in b/netwerk/streamconv/converters/Makefile.in index 486169e9d43f..791852c497b3 100644 --- a/netwerk/streamconv/converters/Makefile.in +++ b/netwerk/streamconv/converters/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - LOCAL_INCLUDES = \ -I$(topsrcdir)/netwerk/base/src \ $(NULL) diff --git a/netwerk/streamconv/converters/moz.build b/netwerk/streamconv/converters/moz.build index 2786427d0724..0d0d90c51c7f 100644 --- a/netwerk/streamconv/converters/moz.build +++ b/netwerk/streamconv/converters/moz.build @@ -30,3 +30,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'cocoa': LIBRARY_NAME = 'nkcnvts_s' +FAIL_ON_WARNINGS = True + diff --git a/netwerk/streamconv/public/Makefile.in b/netwerk/streamconv/public/Makefile.in deleted file mode 100644 index 711d3c091158..000000000000 --- a/netwerk/streamconv/public/Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - -include $(DEPTH)/config/autoconf.mk - - -include $(topsrcdir)/config/rules.mk - diff --git a/netwerk/streamconv/public/moz.build b/netwerk/streamconv/public/moz.build index 3efb0619f9e3..47ced4968020 100644 --- a/netwerk/streamconv/public/moz.build +++ b/netwerk/streamconv/public/moz.build @@ -22,3 +22,5 @@ XPIDL_MODULE = 'necko_strconv' MODULE = 'necko' +FAIL_ON_WARNINGS = True + diff --git a/netwerk/streamconv/src/Makefile.in b/netwerk/streamconv/src/Makefile.in index fd8908725746..c0cab172f783 100644 --- a/netwerk/streamconv/src/Makefile.in +++ b/netwerk/streamconv/src/Makefile.in @@ -13,12 +13,5 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -ifneq (cocoa,$(MOZ_WIDGET_TOOLKIT)) -ifeq (x86_64,$(OS_TEST)) -# nsAppleFileDecoder.cpp has warnings I don't understand. -FAIL_ON_WARNINGS := 1 -endif -endif - include $(topsrcdir)/config/rules.mk diff --git a/netwerk/streamconv/src/moz.build b/netwerk/streamconv/src/moz.build index ee6d24d0768a..360dd22be4b6 100644 --- a/netwerk/streamconv/src/moz.build +++ b/netwerk/streamconv/src/moz.build @@ -6,15 +6,18 @@ MODULE = 'necko' +FAIL_ON_WARNINGS = True + CPP_SOURCES += [ 'nsStreamConverterService.cpp', ] -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': - if CONFIG['OS_TEST'] != 'x86_64': - CPP_SOURCES += [ - 'nsAppleFileDecoder.cpp', - ] +if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' and CONFIG['OS_TEST'] != 'x86_64': + # nsAppleFileDecoder.cpp has warnings I don't understand. + FAIL_ON_WARNINGS = False + CPP_SOURCES += [ + 'nsAppleFileDecoder.cpp', + ] LIBRARY_NAME = 'nkconv_s' diff --git a/netwerk/streamconv/test/Makefile.in b/netwerk/streamconv/test/Makefile.in index 43d0e647e843..360a151c6060 100644 --- a/netwerk/streamconv/test/Makefile.in +++ b/netwerk/streamconv/test/Makefile.in @@ -7,8 +7,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk LIBS = \ diff --git a/netwerk/streamconv/test/moz.build b/netwerk/streamconv/test/moz.build index 1dc3688dcb55..4526dc0e8889 100644 --- a/netwerk/streamconv/test/moz.build +++ b/netwerk/streamconv/test/moz.build @@ -12,3 +12,6 @@ CPP_SOURCES += [ 'Converters.cpp', 'TestStreamConv.cpp', ] + +FAIL_ON_WARNINGS = True + diff --git a/netwerk/system/android/Makefile.in b/netwerk/system/android/Makefile.in index 38abf5c61d9a..ae8891478d74 100644 --- a/netwerk/system/android/Makefile.in +++ b/netwerk/system/android/Makefile.in @@ -6,8 +6,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 diff --git a/netwerk/system/android/moz.build b/netwerk/system/android/moz.build index 9f95b11de1f8..22d5f3096b7b 100644 --- a/netwerk/system/android/moz.build +++ b/netwerk/system/android/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'neckosystem_s' +FAIL_ON_WARNINGS = True + diff --git a/netwerk/system/mac/Makefile.in b/netwerk/system/mac/Makefile.in index 211db0b53f47..c060b2970fce 100644 --- a/netwerk/system/mac/Makefile.in +++ b/netwerk/system/mac/Makefile.in @@ -7,8 +7,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 diff --git a/netwerk/system/mac/moz.build b/netwerk/system/mac/moz.build index 10805e746684..01dcb59559da 100644 --- a/netwerk/system/mac/moz.build +++ b/netwerk/system/mac/moz.build @@ -11,3 +11,6 @@ LIBRARY_NAME = 'neckosystem_s' CMMSRCS += [ 'nsNetworkLinkService.mm', ] + +FAIL_ON_WARNINGS = True + diff --git a/netwerk/system/maemo/Makefile.in b/netwerk/system/maemo/Makefile.in index 18758f447159..6f23cb56efb0 100644 --- a/netwerk/system/maemo/Makefile.in +++ b/netwerk/system/maemo/Makefile.in @@ -6,8 +6,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 diff --git a/netwerk/system/maemo/moz.build b/netwerk/system/maemo/moz.build index ccabe2b608ea..6382d413d0be 100644 --- a/netwerk/system/maemo/moz.build +++ b/netwerk/system/maemo/moz.build @@ -13,3 +13,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'neckosystem_s' +FAIL_ON_WARNINGS = True + diff --git a/netwerk/system/qt/Makefile.in b/netwerk/system/qt/Makefile.in index 9e69c12f489e..169519f68198 100644 --- a/netwerk/system/qt/Makefile.in +++ b/netwerk/system/qt/Makefile.in @@ -7,8 +7,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 diff --git a/netwerk/system/qt/moz.build b/netwerk/system/qt/moz.build index 10f228e9236a..b5ef31128447 100644 --- a/netwerk/system/qt/moz.build +++ b/netwerk/system/qt/moz.build @@ -14,3 +14,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'neckosystem_s' +FAIL_ON_WARNINGS = True + diff --git a/netwerk/system/win32/Makefile.in b/netwerk/system/win32/Makefile.in index 211db0b53f47..c060b2970fce 100644 --- a/netwerk/system/win32/Makefile.in +++ b/netwerk/system/win32/Makefile.in @@ -7,8 +7,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 diff --git a/netwerk/system/win32/moz.build b/netwerk/system/win32/moz.build index 98fee928e26c..3065cbdf0475 100644 --- a/netwerk/system/win32/moz.build +++ b/netwerk/system/win32/moz.build @@ -13,3 +13,5 @@ if CONFIG['OS_ARCH'] == 'WINNT': LIBRARY_NAME = 'neckosystem_s' +FAIL_ON_WARNINGS = True + diff --git a/netwerk/test/mochitests/Makefile.in b/netwerk/test/mochitests/Makefile.in index e1dd425ddb42..30311a97b7be 100644 --- a/netwerk/test/mochitests/Makefile.in +++ b/netwerk/test/mochitests/Makefile.in @@ -9,8 +9,6 @@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ relativesrcdir = @relativesrcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk MOCHITEST_FILES = \ diff --git a/netwerk/test/mochitests/moz.build b/netwerk/test/mochitests/moz.build index a6f020189e93..d731280b64f5 100644 --- a/netwerk/test/mochitests/moz.build +++ b/netwerk/test/mochitests/moz.build @@ -5,3 +5,6 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. MODULE = 'test_necko' + +FAIL_ON_WARNINGS = True + diff --git a/netwerk/wifi/Makefile.in b/netwerk/wifi/Makefile.in index 4cbf912d87b7..e9a9ebb5231d 100644 --- a/netwerk/wifi/Makefile.in +++ b/netwerk/wifi/Makefile.in @@ -11,11 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -ifneq ($(OS_ARCH),Darwin) -# osx_corewlan.mm has warnings I don't understand. -FAIL_ON_WARNINGS := 1 -endif - ifeq ($(OS_ARCH),SunOS) OS_INCLUDES += $(GLIB_CFLAGS) endif diff --git a/netwerk/wifi/moz.build b/netwerk/wifi/moz.build index 07b01de75779..29abb6b02cb9 100644 --- a/netwerk/wifi/moz.build +++ b/netwerk/wifi/moz.build @@ -4,6 +4,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +FAIL_ON_WARNINGS = True + XPIDL_SOURCES += [ 'nsIWifiAccessPoint.idl', 'nsIWifiListener.idl', @@ -28,6 +30,8 @@ else: ] if CONFIG['OS_ARCH'] == 'Darwin': + # osx_corewlan.mm has warnings I don't understand. + FAIL_ON_WARNINGS = False CPP_SOURCES += [ 'nsWifiScannerMac.cpp', ] diff --git a/security/manager/boot/src/Makefile.in b/security/manager/boot/src/Makefile.in index bcf81ce74710..49c99d7142d6 100644 --- a/security/manager/boot/src/Makefile.in +++ b/security/manager/boot/src/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - DEFINES += -D__STDC_CONSTANT_MACROS include $(topsrcdir)/config/rules.mk diff --git a/security/manager/boot/src/moz.build b/security/manager/boot/src/moz.build index 865030329d20..563c8d697d38 100644 --- a/security/manager/boot/src/moz.build +++ b/security/manager/boot/src/moz.build @@ -17,3 +17,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'pipboot' +FAIL_ON_WARNINGS = True + diff --git a/security/manager/pki/src/Makefile.in b/security/manager/pki/src/Makefile.in index 4210dda8e231..d4db55799063 100644 --- a/security/manager/pki/src/Makefile.in +++ b/security/manager/pki/src/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - INCLUDES += \ -I$(DIST)/public/nss \ $(NULL) diff --git a/security/manager/pki/src/moz.build b/security/manager/pki/src/moz.build index 69d182046877..d7da5f75ee75 100644 --- a/security/manager/pki/src/moz.build +++ b/security/manager/pki/src/moz.build @@ -17,3 +17,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'pippki' +FAIL_ON_WARNINGS = True + diff --git a/services/crypto/component/Makefile.in b/services/crypto/component/Makefile.in index 432fe7e5f2c3..466dfbf2ea49 100644 --- a/services/crypto/component/Makefile.in +++ b/services/crypto/component/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FAIL_ON_WARNINGS := 1 - EXPORT_LIBRARY := 1 LIBXUL_LIBRARY := 1 MOZILLA_INTERNAL_API := 1 diff --git a/services/crypto/component/moz.build b/services/crypto/component/moz.build index 7c322ecd6cd3..2801204c5b2c 100644 --- a/services/crypto/component/moz.build +++ b/services/crypto/component/moz.build @@ -20,3 +20,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'services-crypto' +FAIL_ON_WARNINGS = True + diff --git a/toolkit/components/autocomplete/Makefile.in b/toolkit/components/autocomplete/Makefile.in index 78a8104e3754..e06e5e622744 100644 --- a/toolkit/components/autocomplete/Makefile.in +++ b/toolkit/components/autocomplete/Makefile.in @@ -11,6 +11,4 @@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/autocomplete/moz.build b/toolkit/components/autocomplete/moz.build index 6b28849d106a..457808f5893e 100644 --- a/toolkit/components/autocomplete/moz.build +++ b/toolkit/components/autocomplete/moz.build @@ -24,3 +24,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'tkautocomplete' +FAIL_ON_WARNINGS = True + diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in index 2ac02f985486..afe129da352c 100644 --- a/toolkit/components/downloads/Makefile.in +++ b/toolkit/components/downloads/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = download_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build index da4f7ddb96e6..94119ab94c82 100644 --- a/toolkit/components/downloads/moz.build +++ b/toolkit/components/downloads/moz.build @@ -35,3 +35,6 @@ if not CONFIG['MOZ_SUITE']: 'nsDownloadManagerUI.js', 'nsDownloadManagerUI.manifest', ] + +FAIL_ON_WARNINGS = True + diff --git a/toolkit/components/perf/Makefile.in b/toolkit/components/perf/Makefile.in index 8d07f3ae852c..d06b73bf7645 100644 --- a/toolkit/components/perf/Makefile.in +++ b/toolkit/components/perf/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - LOCAL_INCLUDES := \ -I$(topsrcdir)/js/xpconnect/loader \ $(NULL) diff --git a/toolkit/components/perf/moz.build b/toolkit/components/perf/moz.build index f619a7dc60a0..66c590cf3012 100644 --- a/toolkit/components/perf/moz.build +++ b/toolkit/components/perf/moz.build @@ -15,3 +15,6 @@ LIBRARY_NAME = 'jsperf' EXTRA_JS_MODULES += [ 'PerfMeasurement.jsm', ] + +FAIL_ON_WARNINGS = True + diff --git a/toolkit/components/places/tests/cpp/Makefile.in b/toolkit/components/places/tests/cpp/Makefile.in deleted file mode 100644 index 4b4ffa22ee5f..000000000000 --- a/toolkit/components/places/tests/cpp/Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ -FAIL_ON_WARNINGS = 1 - -include $(DEPTH)/config/autoconf.mk - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/places/tests/cpp/moz.build b/toolkit/components/places/tests/cpp/moz.build index 2d7b3630ef76..7b697409ecc0 100644 --- a/toolkit/components/places/tests/cpp/moz.build +++ b/toolkit/components/places/tests/cpp/moz.build @@ -10,3 +10,5 @@ CPP_UNIT_TESTS += [ 'test_IHistory.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/toolkit/components/telemetry/Makefile.in b/toolkit/components/telemetry/Makefile.in index 7a33bb56cf6f..8c12c41af98a 100644 --- a/toolkit/components/telemetry/Makefile.in +++ b/toolkit/components/telemetry/Makefile.in @@ -14,8 +14,6 @@ include $(topsrcdir)/config/makefiles/rcs.mk LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - LIBRARY_NAME = telemetry MSVC_ENABLE_PGO := 1 diff --git a/toolkit/components/telemetry/moz.build b/toolkit/components/telemetry/moz.build index c79dc5008302..a33372fab885 100644 --- a/toolkit/components/telemetry/moz.build +++ b/toolkit/components/telemetry/moz.build @@ -36,3 +36,6 @@ EXTRA_JS_MODULES += [ 'TelemetryStopwatch.jsm', 'ThirdPartyCookieProbe.jsm', ] + +FAIL_ON_WARNINGS = True + diff --git a/toolkit/components/url-classifier/Makefile.in b/toolkit/components/url-classifier/Makefile.in index f8a78915b07b..82db7d8136f6 100644 --- a/toolkit/components/url-classifier/Makefile.in +++ b/toolkit/components/url-classifier/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../build \ $(SQLITE_CFLAGS) \ diff --git a/toolkit/components/url-classifier/moz.build b/toolkit/components/url-classifier/moz.build index 22828490c2f7..85c9f7f10a32 100644 --- a/toolkit/components/url-classifier/moz.build +++ b/toolkit/components/url-classifier/moz.build @@ -47,3 +47,6 @@ LIBRARY_NAME = 'urlclassifier_s' EXTRA_JS_MODULES += [ 'SafeBrowsing.jsm', ] + +FAIL_ON_WARNINGS = True + diff --git a/toolkit/identity/Makefile.in b/toolkit/identity/Makefile.in index ff9d29f6923e..0e9648008493 100644 --- a/toolkit/identity/Makefile.in +++ b/toolkit/identity/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -FAIL_ON_WARNINGS := 1 - LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 diff --git a/toolkit/identity/moz.build b/toolkit/identity/moz.build index 24d05c714563..40d61c327e41 100644 --- a/toolkit/identity/moz.build +++ b/toolkit/identity/moz.build @@ -31,3 +31,6 @@ EXTRA_JS_MODULES += [ 'Sandbox.jsm', 'jwcrypto.jsm', ] + +FAIL_ON_WARNINGS = True + diff --git a/toolkit/system/gnome/Makefile.in b/toolkit/system/gnome/Makefile.in index 64efc3e84086..70ab32ecfafc 100644 --- a/toolkit/system/gnome/Makefile.in +++ b/toolkit/system/gnome/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk FORCE_SHARED_LIB = 1 IS_COMPONENT = 1 -FAIL_ON_WARNINGS = 1 - EXTRA_DSO_LDOPTS += \ $(XPCOM_GLUE_LDOPTS) \ $(XPCOM_FROZEN_LDOPTS) \ diff --git a/toolkit/system/gnome/moz.build b/toolkit/system/gnome/moz.build index b535a9804222..76b7be19b92b 100644 --- a/toolkit/system/gnome/moz.build +++ b/toolkit/system/gnome/moz.build @@ -28,3 +28,5 @@ if CONFIG['MOZ_ENABLE_GIO']: LIBRARY_NAME = 'mozgnome' +FAIL_ON_WARNINGS = True + diff --git a/tools/profiler/Makefile.in b/tools/profiler/Makefile.in index e89bfbe79a14..181f84624206 100644 --- a/tools/profiler/Makefile.in +++ b/tools/profiler/Makefile.in @@ -25,9 +25,6 @@ endif EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 -ifndef _MSC_VER -FAIL_ON_WARNINGS = 1 -endif # !_MSC_VER # Uncomment for better debugging in opt builds #MOZ_OPTIMIZE_FLAGS += -O0 -g diff --git a/tools/profiler/moz.build b/tools/profiler/moz.build index aefb0c793767..02e2fa0eb9f4 100644 --- a/tools/profiler/moz.build +++ b/tools/profiler/moz.build @@ -5,6 +5,9 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. if CONFIG['MOZ_ENABLE_PROFILER_SPS']: + FAIL_ON_WARNINGS = not CONFIG['_MSC_VER'] + + MODULE = 'profiler' LIBRARY_NAME = 'profiler' XPIDL_SOURCES += [ diff --git a/uriloader/base/Makefile.in b/uriloader/base/Makefile.in index dc9ad52d4741..5742e8f437b5 100644 --- a/uriloader/base/Makefile.in +++ b/uriloader/base/Makefile.in @@ -12,7 +12,5 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - include $(topsrcdir)/config/rules.mk diff --git a/uriloader/base/moz.build b/uriloader/base/moz.build index 3aad3281d2b9..cc0f3e133c68 100644 --- a/uriloader/base/moz.build +++ b/uriloader/base/moz.build @@ -30,3 +30,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'uriloaderbase_s' +FAIL_ON_WARNINGS = True + diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in index 94a4dbe0b251..a0d397421f4f 100644 --- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in @@ -35,9 +35,6 @@ VPATH := $(srcdir) $(srcdir)/$(OSDIR) LIBRARY_NAME = exthandler_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - - ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CMMSRCS = nsOSHelperAppService.mm \ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build index 8c2277859b47..0b6afeff7f70 100644 --- a/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build @@ -122,3 +122,6 @@ EXTRA_COMPONENTS += [ IPDL_SOURCES += [ 'PExternalHelperApp.ipdl', ] + +FAIL_ON_WARNINGS = True + diff --git a/uriloader/prefetch/Makefile.in b/uriloader/prefetch/Makefile.in index a64befb2dae8..4d8b2e0afc59 100644 --- a/uriloader/prefetch/Makefile.in +++ b/uriloader/prefetch/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = prefetch_s LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - LOCAL_INCLUDES = \ -I$(topsrcdir)/content/base/src \ -I$(topsrcdir)/content/events/src \ diff --git a/uriloader/prefetch/moz.build b/uriloader/prefetch/moz.build index b4c0d936f3d6..74b30123aebc 100644 --- a/uriloader/prefetch/moz.build +++ b/uriloader/prefetch/moz.build @@ -32,3 +32,6 @@ CPP_SOURCES += [ IPDL_SOURCES += [ 'POfflineCacheUpdate.ipdl', ] + +FAIL_ON_WARNINGS = True + diff --git a/view/src/Makefile.in b/view/src/Makefile.in index d8c8fbdb5334..e08b0e598b3c 100644 --- a/view/src/Makefile.in +++ b/view/src/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/view/src/moz.build b/view/src/moz.build index c362d3c40d5b..9d67e943bfd5 100644 --- a/view/src/moz.build +++ b/view/src/moz.build @@ -13,3 +13,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'gkview_s' +FAIL_ON_WARNINGS = True + diff --git a/webapprt/gtk2/Makefile.in b/webapprt/gtk2/Makefile.in index 969557ed3b23..b74ed3e54a66 100644 --- a/webapprt/gtk2/Makefile.in +++ b/webapprt/gtk2/Makefile.in @@ -6,8 +6,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 - include $(DEPTH)/config/autoconf.mk LOCAL_INCLUDES += \ diff --git a/webapprt/gtk2/moz.build b/webapprt/gtk2/moz.build index 890b5961a694..1b989dd82d04 100644 --- a/webapprt/gtk2/moz.build +++ b/webapprt/gtk2/moz.build @@ -9,3 +9,6 @@ PROGRAM = 'webapprt-stub' CPP_SOURCES += [ 'webapprt.cpp', ] + +FAIL_ON_WARNINGS = True + diff --git a/widget/android/Makefile.in b/widget/android/Makefile.in index 0e9513ab4ea6..d2f76c6bb2a4 100644 --- a/widget/android/Makefile.in +++ b/widget/android/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = widget_android EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 - ifdef MOZ_WEBSMS_BACKEND DEFINES += -DMOZ_WEBSMS_BACKEND endif diff --git a/widget/android/moz.build b/widget/android/moz.build index 51640c2b618d..7d62bcd8f4d4 100644 --- a/widget/android/moz.build +++ b/widget/android/moz.build @@ -38,3 +38,5 @@ CPP_SOURCES += [ 'nsWindow.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/widget/gonk/nativewindow/Makefile.in b/widget/gonk/nativewindow/Makefile.in index 098906cb6523..f9355a696596 100644 --- a/widget/gonk/nativewindow/Makefile.in +++ b/widget/gonk/nativewindow/Makefile.in @@ -20,7 +20,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nativewindow LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS := 1 STL_FLAGS= include $(topsrcdir)/config/rules.mk diff --git a/widget/gonk/nativewindow/moz.build b/widget/gonk/nativewindow/moz.build index 25617adb25a0..da8d1d239ef8 100644 --- a/widget/gonk/nativewindow/moz.build +++ b/widget/gonk/nativewindow/moz.build @@ -32,3 +32,5 @@ if CONFIG['MOZ_B2G_CAMERA'] or CONFIG['MOZ_OMX_DECODER']: 'GonkNativeWindowClientICS.cpp', ] +FAIL_ON_WARNINGS = True + diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in index 8f97cf03c1f7..415d617b0bd1 100644 --- a/widget/gtk2/Makefile.in +++ b/widget/gtk2/Makefile.in @@ -18,8 +18,6 @@ endif EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 -FAIL_ON_WARNINGS = 1 - NATIVE_THEME_SUPPORT = 1 diff --git a/widget/gtk2/moz.build b/widget/gtk2/moz.build index 00fbb5c894b8..8e76427ead20 100644 --- a/widget/gtk2/moz.build +++ b/widget/gtk2/moz.build @@ -53,3 +53,6 @@ if CONFIG['MOZ_X11']: 'nsClipboard.cpp', 'nsDragService.cpp', ] + +FAIL_ON_WARNINGS = True + diff --git a/widget/tests/Makefile.in b/widget/tests/Makefile.in index 2c47fcc61b1f..d90c64376d4b 100644 --- a/widget/tests/Makefile.in +++ b/widget/tests/Makefile.in @@ -8,8 +8,6 @@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ relativesrcdir = @relativesrcdir@ -FAIL_ON_WARNINGS = 1 - include $(DEPTH)/config/autoconf.mk ifeq ($(MOZ_WIDGET_TOOLKIT),windows) diff --git a/widget/tests/moz.build b/widget/tests/moz.build index 6bd1dfbc649f..42fcf4e45323 100644 --- a/widget/tests/moz.build +++ b/widget/tests/moz.build @@ -12,3 +12,5 @@ CPP_UNIT_TESTS += [ 'TestAppShellSteadyState.cpp', ] +FAIL_ON_WARNINGS = True + From 6ca05cdcf195df2a0957a795b2d67d1e2c836ae6 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:55:59 +0200 Subject: [PATCH 59/79] Bug 882859 - Part c: Move FAIL_ON_WARNINGS into moz.build in dom/plugins/ipc/hangui; r=mshal --- dom/plugins/ipc/hangui/Makefile.in | 10 +++------- dom/plugins/ipc/hangui/moz.build | 2 ++ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/dom/plugins/ipc/hangui/Makefile.in b/dom/plugins/ipc/hangui/Makefile.in index 1a831bd96e62..f0b485c3b5ac 100644 --- a/dom/plugins/ipc/hangui/Makefile.in +++ b/dom/plugins/ipc/hangui/Makefile.in @@ -6,7 +6,6 @@ DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -FAIL_ON_WARNINGS := 1 include $(DEPTH)/config/autoconf.mk @@ -14,8 +13,6 @@ OS_LIBS = $(call EXPAND_LIBNAME,comctl32) RCINCLUDE = HangUIDlg.rc -include $(topsrcdir)/config/config.mk - DEFINES += \ -DNS_NO_XPCOM \ $(NULL) @@ -26,10 +23,9 @@ STL_FLAGS = \ MOZ_GLUE_LDFLAGS = -ifdef GNU_CC -WIN32_EXE_LDFLAGS = -municode -endif - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk +ifdef GNU_CC +WIN32_EXE_LDFLAGS = -municode +endif diff --git a/dom/plugins/ipc/hangui/moz.build b/dom/plugins/ipc/hangui/moz.build index 33b6a6eb6422..bb2a67aec31c 100644 --- a/dom/plugins/ipc/hangui/moz.build +++ b/dom/plugins/ipc/hangui/moz.build @@ -4,6 +4,8 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +FAIL_ON_WARNINGS = True + PROGRAM = 'plugin-hang-ui' CPP_SOURCES += [ From 6a7bc47591102f7d612465cd767668501eddb99b Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:55:59 +0200 Subject: [PATCH 60/79] Bug 906351 - Use @DEPTH@ even more; r=ted --- browser/metro/Makefile.in | 2 +- browser/metro/base/Makefile.in | 2 +- browser/metro/locales/Makefile.in | 2 +- browser/metro/locales/import/Makefile.in | 2 +- browser/metro/profile/Makefile.in | 2 +- browser/metro/shell/Makefile.in | 2 +- .../metro/shell/commandexecutehandler/Makefile.in | 2 +- browser/metro/shell/linktool/Makefile.in | 2 +- browser/metro/shell/testing/Makefile.in | 2 +- dom/fm/Makefile.in | 2 +- dom/icc/interfaces/Makefile.in | 2 +- dom/interfaces/gamepad/Makefile.in | 12 ------------ dom/media/bridge/Makefile.in | 2 +- dom/quota/Makefile.in | 2 +- dom/tests/mochitest/gamepad/Makefile.in | 2 +- dom/time/Makefile.in | 2 +- netwerk/sctp/src/Makefile.in | 2 +- .../components/passwordmgr/test/auth2/Makefile.in | 2 +- widget/windows/winrt/Makefile.in | 2 +- 19 files changed, 18 insertions(+), 30 deletions(-) delete mode 100644 dom/interfaces/gamepad/Makefile.in diff --git a/browser/metro/Makefile.in b/browser/metro/Makefile.in index e0c60e11909f..d58229c79c5a 100644 --- a/browser/metro/Makefile.in +++ b/browser/metro/Makefile.in @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = ../.. +DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/browser/metro/base/Makefile.in b/browser/metro/base/Makefile.in index 6cf5adc48bd5..c0a3a4404786 100644 --- a/browser/metro/base/Makefile.in +++ b/browser/metro/base/Makefile.in @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = ../../.. +DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/browser/metro/locales/Makefile.in b/browser/metro/locales/Makefile.in index 07e7103c9c5a..43155d62a76b 100644 --- a/browser/metro/locales/Makefile.in +++ b/browser/metro/locales/Makefile.in @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = ../../.. +DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/browser/metro/locales/import/Makefile.in b/browser/metro/locales/import/Makefile.in index 76fc1bbbb156..6c9bcab5534e 100644 --- a/browser/metro/locales/import/Makefile.in +++ b/browser/metro/locales/import/Makefile.in @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = ../../../.. +DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/browser/metro/profile/Makefile.in b/browser/metro/profile/Makefile.in index 834a723802f5..258abe97531b 100644 --- a/browser/metro/profile/Makefile.in +++ b/browser/metro/profile/Makefile.in @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = ../../.. +DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/browser/metro/shell/Makefile.in b/browser/metro/shell/Makefile.in index f8c6bbd6f3cd..0846eaa7a5e3 100644 --- a/browser/metro/shell/Makefile.in +++ b/browser/metro/shell/Makefile.in @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = ../../.. +DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/browser/metro/shell/commandexecutehandler/Makefile.in b/browser/metro/shell/commandexecutehandler/Makefile.in index 80b73787b23a..09610317854f 100644 --- a/browser/metro/shell/commandexecutehandler/Makefile.in +++ b/browser/metro/shell/commandexecutehandler/Makefile.in @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = ../../../.. +DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/browser/metro/shell/linktool/Makefile.in b/browser/metro/shell/linktool/Makefile.in index 896515cace71..9bfa298c6611 100644 --- a/browser/metro/shell/linktool/Makefile.in +++ b/browser/metro/shell/linktool/Makefile.in @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = ../../../.. +DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/browser/metro/shell/testing/Makefile.in b/browser/metro/shell/testing/Makefile.in index c201df0fafd3..c3e5cfba423a 100644 --- a/browser/metro/shell/testing/Makefile.in +++ b/browser/metro/shell/testing/Makefile.in @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = ../../../.. +DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/dom/fm/Makefile.in b/dom/fm/Makefile.in index 437f36a85315..7a418262061b 100644 --- a/dom/fm/Makefile.in +++ b/dom/fm/Makefile.in @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = ../.. +DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/dom/icc/interfaces/Makefile.in b/dom/icc/interfaces/Makefile.in index 09c8567a746b..db4cf4d78023 100644 --- a/dom/icc/interfaces/Makefile.in +++ b/dom/icc/interfaces/Makefile.in @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = ../../.. +DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/dom/interfaces/gamepad/Makefile.in b/dom/interfaces/gamepad/Makefile.in deleted file mode 100644 index 49810fe6afe2..000000000000 --- a/dom/interfaces/gamepad/Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = ../../.. -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -include $(topsrcdir)/config/rules.mk diff --git a/dom/media/bridge/Makefile.in b/dom/media/bridge/Makefile.in index d45b4de3b56c..522f88e75ca7 100644 --- a/dom/media/bridge/Makefile.in +++ b/dom/media/bridge/Makefile.in @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = ../../.. +DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/dom/quota/Makefile.in b/dom/quota/Makefile.in index d5ae9c16ef41..df9d6d9f1032 100644 --- a/dom/quota/Makefile.in +++ b/dom/quota/Makefile.in @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = ../.. +DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/dom/tests/mochitest/gamepad/Makefile.in b/dom/tests/mochitest/gamepad/Makefile.in index a641c417756c..3d63b0e083cd 100644 --- a/dom/tests/mochitest/gamepad/Makefile.in +++ b/dom/tests/mochitest/gamepad/Makefile.in @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = ../../../.. +DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/dom/time/Makefile.in b/dom/time/Makefile.in index 5d0c34c2c41a..3e2b7d63fa0f 100644 --- a/dom/time/Makefile.in +++ b/dom/time/Makefile.in @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = ../.. +DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/netwerk/sctp/src/Makefile.in b/netwerk/sctp/src/Makefile.in index 2fdfefb5a938..37ceb1e3b65c 100644 --- a/netwerk/sctp/src/Makefile.in +++ b/netwerk/sctp/src/Makefile.in @@ -3,7 +3,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = ../../.. +DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = \ diff --git a/toolkit/components/passwordmgr/test/auth2/Makefile.in b/toolkit/components/passwordmgr/test/auth2/Makefile.in index 4323059319cf..d7588520b84b 100644 --- a/toolkit/components/passwordmgr/test/auth2/Makefile.in +++ b/toolkit/components/passwordmgr/test/auth2/Makefile.in @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = ../../../../.. +DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ diff --git a/widget/windows/winrt/Makefile.in b/widget/windows/winrt/Makefile.in index 971e04a3aa60..adfdbc3899d1 100644 --- a/widget/windows/winrt/Makefile.in +++ b/widget/windows/winrt/Makefile.in @@ -2,7 +2,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this file, # You can obtain one at http://mozilla.org/MPL/2.0/. -DEPTH = ../../.. +DEPTH = @DEPTH@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ From af2c13c793d0b03dcc0aa97d3b3703a9cf9c7455 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:55:59 +0200 Subject: [PATCH 61/79] Bug 906412 - Cleanup some random parts of the build system; r=mshal --- Makefile.in | 5 +-- b2g/installer/Makefile.in | 8 ---- browser/extensions/Makefile.in | 2 - browser/installer/Makefile.in | 7 ---- config/rules.mk | 1 - content/base/src/Makefile.in | 2 - dom/src/jsurl/Makefile.in | 5 +-- editor/composer/src/Makefile.in | 3 -- editor/libeditor/base/Makefile.in | 9 ++-- embedding/base/Makefile.in | 18 -------- .../components/printingui/src/mac/Makefile.in | 2 - gfx/angle/src/libEGL/Makefile.in | 4 -- gfx/angle/src/libGLESv2/Makefile.in | 4 -- gfx/cairo/cairo/src/Makefile.in | 4 -- gfx/cairo/cairo/src/moz.build | 5 --- gfx/gl/Makefile.in | 41 ------------------- gfx/gl/moz.build | 6 +-- js/src/Makefile.in | 7 +--- js/src/config/rules.mk | 1 - media/libpng/Makefile.in | 15 ++----- mobile/android/app/Makefile.in | 2 - mobile/android/installer/Makefile.in | 8 ---- toolkit/components/feeds/Makefile.in | 2 - .../components/maintenanceservice/Makefile.in | 1 - toolkit/mozapps/installer/packager.mk | 4 +- toolkit/xre/Makefile.in | 14 +------ toolkit/xre/moz.build | 6 +++ widget/android/Makefile.in | 12 ------ widget/qt/Makefile.in | 5 --- xpcom/tests/Makefile.in | 5 --- 30 files changed, 22 insertions(+), 186 deletions(-) delete mode 100644 embedding/base/Makefile.in diff --git a/Makefile.in b/Makefile.in index 21632cfa4a51..7bfb6f3cb448 100644 --- a/Makefile.in +++ b/Makefile.in @@ -33,7 +33,7 @@ include $(topsrcdir)/config/config.mk GARBAGE_DIRS += dist _javagen _profile _tests staticlib DIST_GARBAGE = config.cache config.log config.status* config-defs.h \ config/autoconf.mk \ - unallmakefiles mozilla-config.h \ + mozilla-config.h \ netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \ $(topsrcdir)/.mozconfig.mk $(topsrcdir)/.mozconfig.out @@ -107,8 +107,7 @@ include $(topsrcdir)/config/makefiles/tiers.mk $(foreach tier,$(TIERS),$(eval $(call CREATE_TIER_RULE,$(tier)))) distclean:: - cat unallmakefiles | $(XARGS) rm -f - $(RM) unallmakefiles $(DIST_GARBAGE) + $(RM) $(DIST_GARBAGE) ifeq ($(OS_ARCH),WINNT) # we want to copy PDB files on Windows diff --git a/b2g/installer/Makefile.in b/b2g/installer/Makefile.in index 9c00d1f2324a..ff49d58d6708 100644 --- a/b2g/installer/Makefile.in +++ b/b2g/installer/Makefile.in @@ -17,14 +17,6 @@ MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in -MOZ_NONLOCALIZED_PKG_LIST = \ - xpcom \ - browser \ - b2g \ - $(NULL) - -MOZ_LOCALIZED_PKG_LIST = $(AB_CD) multilocale - DEFINES += \ -DAB_CD=$(AB_CD) \ -DMOZ_APP_NAME=$(MOZ_APP_NAME) \ diff --git a/browser/extensions/Makefile.in b/browser/extensions/Makefile.in index ff96dc1b60df..5dae4397a6d2 100644 --- a/browser/extensions/Makefile.in +++ b/browser/extensions/Makefile.in @@ -7,8 +7,6 @@ topsrcdir = @top_srcdir@ srcdir = @srcdir@ VPATH = @srcdir@ -CHROMEDIR = $(call core_abspath,$(FINAL_TARGET))/chrome - include $(DEPTH)/config/autoconf.mk ifdef MOZ_METRO diff --git a/browser/installer/Makefile.in b/browser/installer/Makefile.in index 4e3ab6fad4ba..2f9c4554d519 100644 --- a/browser/installer/Makefile.in +++ b/browser/installer/Makefile.in @@ -21,13 +21,6 @@ ifndef SYSTEM_LIBXUL MOZ_PKG_FATAL_WARNINGS = 1 endif -MOZ_NONLOCALIZED_PKG_LIST = \ - xpcom \ - browser \ - $(NULL) - -MOZ_LOCALIZED_PKG_LIST = $(AB_CD) - DEFINES += -DAB_CD=$(AB_CD) -DMOZ_APP_NAME=$(MOZ_APP_NAME) -DPREF_DIR=$(PREF_DIR) ifdef LIBXUL_SDK diff --git a/config/rules.mk b/config/rules.mk index ce6a361e9bb4..a05a7a714601 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -399,7 +399,6 @@ ALL_TRASH_DIRS = \ ifdef QTDIR GARBAGE += $(MOCSRCS) -GARBAGE += $(RCCSRCS) endif ifdef SIMPLE_PROGRAMS diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in index 417b48dbc572..9242219de584 100644 --- a/content/base/src/Makefile.in +++ b/content/base/src/Makefile.in @@ -19,8 +19,6 @@ LOCAL_INCLUDES += \ $(NULL) endif -GQI_SRCS = contentbase.gqi - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/src/jsurl/Makefile.in b/dom/src/jsurl/Makefile.in index f5998d025a74..35dab2853736 100644 --- a/dom/src/jsurl/Makefile.in +++ b/dom/src/jsurl/Makefile.in @@ -15,10 +15,7 @@ LOCAL_INCLUDES += \ -I$(srcdir) \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/netwerk/base/src \ - -ifdef BUILD_DEBUG_GC -DEFINES += -DDEBUG_GC -endif + $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/editor/composer/src/Makefile.in b/editor/composer/src/Makefile.in index f41d5d9878b2..abc5f9c9abe4 100644 --- a/editor/composer/src/Makefile.in +++ b/editor/composer/src/Makefile.in @@ -14,9 +14,6 @@ EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk -INCLUDES += \ - $(NULL) - _FILES = \ $(srcdir)/res/EditorOverride.css \ $(srcdir)/res/grabber.gif \ diff --git a/editor/libeditor/base/Makefile.in b/editor/libeditor/base/Makefile.in index 282f769c07f0..fb878d02469b 100644 --- a/editor/libeditor/base/Makefile.in +++ b/editor/libeditor/base/Makefile.in @@ -12,12 +12,7 @@ include $(DEPTH)/config/autoconf.mk LIBXUL_LIBRARY = 1 -# Internal header files, needed by other editor sublibs: -INTERNAL_HDR_DIR = ../internal - -include $(topsrcdir)/config/rules.mk - -INCLUDES += \ +LOCAL_INCLUDES += \ -I$(topsrcdir)/editor/libeditor/text \ -I$(topsrcdir)/editor/txmgr/src \ -I$(topsrcdir)/content/base/src \ @@ -25,3 +20,5 @@ INCLUDES += \ -I$(topsrcdir)/layout/style \ -I$(topsrcdir)/extensions/spellcheck/src \ $(NULL) + +include $(topsrcdir)/config/rules.mk diff --git a/embedding/base/Makefile.in b/embedding/base/Makefile.in deleted file mode 100644 index b29a36f34a67..000000000000 --- a/embedding/base/Makefile.in +++ /dev/null @@ -1,18 +0,0 @@ -# vim:set ts=8 sw=8 sts=8 noet: -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -DISABLED_SDK_HEADERS = \ - nsEmbedCID.h \ - $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/printingui/src/mac/Makefile.in b/embedding/components/printingui/src/mac/Makefile.in index d4ecaf565a05..d04671e0e073 100644 --- a/embedding/components/printingui/src/mac/Makefile.in +++ b/embedding/components/printingui/src/mac/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = .. LIBXUL_LIBRARY = 1 -LOCAL_INCLUDES = \ - $(NULL) include $(topsrcdir)/config/rules.mk diff --git a/gfx/angle/src/libEGL/Makefile.in b/gfx/angle/src/libEGL/Makefile.in index af93672fdc4b..00d9dcb40560 100644 --- a/gfx/angle/src/libEGL/Makefile.in +++ b/gfx/angle/src/libEGL/Makefile.in @@ -15,10 +15,6 @@ FORCE_SHARED_LIB = 1 # ANGLE uses the STL, so we can't use our derpy STL wrappers. STL_FLAGS = -# ANGLE uses exceptions internally, so we need to have exception handling -# support -ENABLE_CXX_EXCEPTIONS = 1 - ifndef GNU_CC # Enable unwind semantics for exception handlers in response to warning C4530. OS_CPPFLAGS += -EHsc diff --git a/gfx/angle/src/libGLESv2/Makefile.in b/gfx/angle/src/libGLESv2/Makefile.in index a7c63f279215..249a3cea4799 100644 --- a/gfx/angle/src/libGLESv2/Makefile.in +++ b/gfx/angle/src/libGLESv2/Makefile.in @@ -16,10 +16,6 @@ FORCE_SHARED_LIB = 1 # ANGLE uses the STL, so we can't use our derpy STL wrappers. STL_FLAGS = -# ANGLE uses exceptions internally, so we need to have exception handling -# support -ENABLE_CXX_EXCEPTIONS = 1 - ifndef GNU_CC # Enable unwind semantics for exception handlers in response to warning C4530. OS_CPPFLAGS += -EHsc diff --git a/gfx/cairo/cairo/src/Makefile.in b/gfx/cairo/cairo/src/Makefile.in index 6b1337866369..2950ba2306eb 100644 --- a/gfx/cairo/cairo/src/Makefile.in +++ b/gfx/cairo/cairo/src/Makefile.in @@ -154,10 +154,6 @@ CSRCS += $(PSPDF_BASE_CSRCS) $(PDF_CSRCS) OS_INCLUDES += $(MOZ_QT_CFLAGS) endif -ifdef BUILD_CAIRO_SVG -CSRCS += cairo-svg-surface.c -endif - ifdef MOZ_X11 CSRCS += cairo-xlib-surface.c \ cairo-xlib-screen.c \ diff --git a/gfx/cairo/cairo/src/moz.build b/gfx/cairo/cairo/src/moz.build index dd0f1943e5bd..c7528a50bcdc 100644 --- a/gfx/cairo/cairo/src/moz.build +++ b/gfx/cairo/cairo/src/moz.build @@ -67,11 +67,6 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt': 'cairo-qt-surface.cpp', ] -if CONFIG['BUILD_CAIRO_SVG']: - EXPORTS.cairo += [ - 'cairo-svg.h' - ] - if CONFIG['MOZ_X11']: EXPORTS.cairo += [ 'cairo-xlib-xrender.h', diff --git a/gfx/gl/Makefile.in b/gfx/gl/Makefile.in index c3ad1f792bcb..21c2f6469317 100644 --- a/gfx/gl/Makefile.in +++ b/gfx/gl/Makefile.in @@ -19,51 +19,10 @@ DEFINES += -DMOZ_D3DCOMPILER_DLL=$(MOZ_D3DCOMPILER_DLL) endif endif -# NOTE: Please keep GL_PROVIDER in sync with moz.build until all variables -# are moved over. -GL_PROVIDER = Null - -ifeq ($(MOZ_WIDGET_TOOLKIT),windows) -GL_PROVIDER = WGL -endif - -ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) -GL_PROVIDER = CGL -endif - -ifdef MOZ_WIDGET_GTK -ifdef MOZ_PLATFORM_MAEMO -GL_PROVIDER = EGL -else -ifdef MOZ_EGL_XRENDER_COMPOSITE -GL_PROVIDER = EGL -else -GL_PROVIDER = GLX -endif -endif -endif - -ifeq ($(MOZ_WIDGET_TOOLKIT),qt) -ifdef MOZ_PLATFORM_MAEMO -GL_PROVIDER = EGL -else -GL_PROVIDER = GLX -endif -endif - -ifeq ($(MOZ_WIDGET_TOOLKIT),android) -GL_PROVIDER = EGL -endif - ifeq ($(MOZ_WIDGET_TOOLKIT),gonk) -GL_PROVIDER = EGL LOCAL_INCLUDES = -I$(topsrcdir)/widget/gonk endif -ifdef MOZ_GL_PROVIDER -GL_PROVIDER = $(MOZ_GL_PROVIDER) -endif - ifdef MOZ_ANDROID_OMTC DEFINES += -DMOZ_ANDROID_OMTC endif diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build index e98a6cb6b6f3..0a97149ab678 100644 --- a/gfx/gl/moz.build +++ b/gfx/gl/moz.build @@ -6,8 +6,6 @@ MODULE = 'gl' -# NOTE: Please keep gl_provider in sync with Makefile.in until all variables -# are moved over. gl_provider = 'Null' if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': @@ -15,7 +13,7 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': gl_provider = 'CGL' elif CONFIG['MOZ_WIDGET_GTK']: - if CONFIG['fdef MOZ_PLATFORM_MAEMO']: + if CONFIG['MOZ_PLATFORM_MAEMO']: gl_provider = 'EGL' else: if CONFIG['MOZ_EGL_XRENDER_COMPOSITE']: @@ -23,7 +21,7 @@ elif CONFIG['MOZ_WIDGET_GTK']: else: gl_provider = 'GLX' elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt': - if CONFIG['fdef MOZ_PLATFORM_MAEMO']: + if CONFIG['MOZ_PLATFORM_MAEMO']: gl_provider = 'EGL' else: gl_provider = 'GLX' diff --git a/js/src/Makefile.in b/js/src/Makefile.in index 5a736a6109a5..9cd7e390fc24 100644 --- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -158,10 +158,6 @@ endif EXTRA_DSO_LDOPTS += $(NSPR_LIBS) -ifndef BUILD_OPT -MOCHAFILE = 1 -endif - # Define keyword generator before rules.mk, see bug 323979 comment 50 HOST_CPPSRCS += jskwgen.cpp @@ -343,10 +339,9 @@ endif DIST_GARBAGE = config.cache config.log config.status* \ config/autoconf.mk \ - unallmakefiles $(JS_CONFIG_NAME) js-config.h js-confdefs.h + $(JS_CONFIG_NAME) js-config.h js-confdefs.h distclean:: - cat unallmakefiles | $(XARGS) rm -f $(RM) $(DIST_GARBAGE) DEFINES += -DEXPORT_JS_API diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk index ce6a361e9bb4..a05a7a714601 100644 --- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -399,7 +399,6 @@ ALL_TRASH_DIRS = \ ifdef QTDIR GARBAGE += $(MOCSRCS) -GARBAGE += $(RCCSRCS) endif ifdef SIMPLE_PROGRAMS diff --git a/media/libpng/Makefile.in b/media/libpng/Makefile.in index 4434411508b1..2ec10ee96823 100644 --- a/media/libpng/Makefile.in +++ b/media/libpng/Makefile.in @@ -16,18 +16,11 @@ ifeq ($(OS_ARCH),WINNT) VISIBILITY_FLAGS= endif - -DEFINES += -DMOZ_PNG_READ \ - -DMOZ_PNG_WRITE - -LOCAL_INCLUDES = -I$(srcdir) +DEFINES += \ + -DMOZ_PNG_READ \ + -DMOZ_PNG_WRITE \ + $(NULL) FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk - -ifeq ($(OS_ARCH),WINNT) -ifdef BUILD_DEBUG_GC -DEFINES += -DDEBUG_GC -endif -endif diff --git a/mobile/android/app/Makefile.in b/mobile/android/app/Makefile.in index 27931839f370..fea286accedd 100644 --- a/mobile/android/app/Makefile.in +++ b/mobile/android/app/Makefile.in @@ -37,8 +37,6 @@ NSDISTMODE = copy include $(topsrcdir)/config/rules.mk -APP_ICON = mobile - DEFINES += \ -DAPP_NAME=$(MOZ_APP_NAME) \ -DAPP_VERSION=$(MOZ_APP_VERSION) \ diff --git a/mobile/android/installer/Makefile.in b/mobile/android/installer/Makefile.in index 39e2c0137676..53d02bd9acc7 100644 --- a/mobile/android/installer/Makefile.in +++ b/mobile/android/installer/Makefile.in @@ -22,14 +22,6 @@ MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in -MOZ_NONLOCALIZED_PKG_LIST = \ - xpcom \ - browser \ - mobile \ - $(NULL) - -MOZ_LOCALIZED_PKG_LIST = $(AB_CD) multilocale - DEFINES += \ -DAB_CD=$(AB_CD) \ -DMOZ_APP_NAME=$(MOZ_APP_NAME) \ diff --git a/toolkit/components/feeds/Makefile.in b/toolkit/components/feeds/Makefile.in index 84fd69aa96c7..e57faa8c180c 100644 --- a/toolkit/components/feeds/Makefile.in +++ b/toolkit/components/feeds/Makefile.in @@ -19,8 +19,6 @@ include $(topsrcdir)/config/rules.mk ABS_SRCDIR := $(call core_abspath,$(srcdir)) ifeq ($(OS_ARCH),WINNT) -ABS_DEPTH := $(call core_abspath,$(DEPTH)) - check:: cd $(srcdir)/test; $(LIBXUL_DIST)/bin/xpcshell$(BIN_SUFFIX) shell.js diff --git a/toolkit/components/maintenanceservice/Makefile.in b/toolkit/components/maintenanceservice/Makefile.in index 0cdcb1e09cbb..45085c3ef7f6 100644 --- a/toolkit/components/maintenanceservice/Makefile.in +++ b/toolkit/components/maintenanceservice/Makefile.in @@ -25,7 +25,6 @@ LIBS += \ $(NULL) USE_STATIC_LIBS = 1 -HAVE_PROGRESSUI = 1 RCINCLUDE = maintenanceservice.rc OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32 shell32) diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index 101292d9eca1..c5073757b84f 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -555,9 +555,7 @@ GARBAGE += $(DIST)/$(PACKAGE) $(PACKAGE) # The following target stages files into two directories: one directory for # core files, and one for optional extensions based on the information in -# the MOZ_PKG_MANIFEST file and the following vars: -# MOZ_NONLOCALIZED_PKG_LIST -# MOZ_LOCALIZED_PKG_LIST +# the MOZ_PKG_MANIFEST file. PKG_ARG = , "$(pkg)" diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in index 894ac9d1f875..ec693cac011d 100644 --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -27,7 +27,8 @@ endif DEFINES += \ -DMOZ_APP_NAME='"$(MOZ_APP_NAME)"' \ - -DMOZ_APP_VERSION='"$(MOZ_APP_VERSION)"' + -DMOZ_APP_VERSION='"$(MOZ_APP_VERSION)"' \ + $(NULL) ifdef MOZ_UPDATER ifneq (android,$(MOZ_WIDGET_TOOLKIT)) @@ -37,17 +38,6 @@ endif ifeq ($(MOZ_WIDGET_TOOLKIT),windows) DEFINES += -DWIN32_LEAN_AND_MEAN -DUNICODE -D_UNICODE -else -ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) -CMMSRCS = nsNativeAppSupportCocoa.mm -endif -endif - -ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) -CMMSRCS += MacLaunchHelper.mm -CMMSRCS += MacApplicationDelegate.mm -CMMSRCS += MacAutoreleasePool.mm -ENABLE_CXX_EXCEPTIONS = 1 endif ifeq ($(MOZ_WIDGET_TOOLKIT),android) diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build index 01df06809dcf..f16b6cfcc08d 100644 --- a/toolkit/xre/moz.build +++ b/toolkit/xre/moz.build @@ -31,6 +31,12 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': CPP_SOURCES += [ 'nsCommandLineServiceMac.cpp', ] + CMMSRCS += [ + 'MacApplicationDelegate.mm', + 'MacAutoreleasePool.mm', + 'MacLaunchHelper.mm', + 'nsNativeAppSupportCocoa.mm', + ] elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt': EXPORTS += ['nsQAppInstance.h'] CPP_SOURCES += [ diff --git a/widget/android/Makefile.in b/widget/android/Makefile.in index d2f76c6bb2a4..a0aa81a50db0 100644 --- a/widget/android/Makefile.in +++ b/widget/android/Makefile.in @@ -12,18 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = widget_android EXPORT_LIBRARY = 1 LIBXUL_LIBRARY = 1 -ifdef MOZ_WEBSMS_BACKEND -DEFINES += -DMOZ_WEBSMS_BACKEND -endif - -NOT_THERE_YET_CPPSRCS = \ - nsQtKeyUtils.cpp \ - nsBidiKeyboard.cpp \ - nsDragService.cpp \ - nsNativeThemeQt.cpp \ - mozqwidget.cpp \ - nsSound.cpp \ - $(NULL) SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a diff --git a/widget/qt/Makefile.in b/widget/qt/Makefile.in index 23c6fa06d9c2..499ba901b0ce 100644 --- a/widget/qt/Makefile.in +++ b/widget/qt/Makefile.in @@ -16,11 +16,6 @@ LIBXUL_LIBRARY = 1 SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a -# If not primary toolkit, install in secondary path -ifneq (qt,$(MOZ_WIDGET_TOOLKIT)) -INACTIVE_COMPONENT = 1 -endif - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/xpcom/tests/Makefile.in b/xpcom/tests/Makefile.in index 3194a057891f..d1e23c724b5c 100644 --- a/xpcom/tests/Makefile.in +++ b/xpcom/tests/Makefile.in @@ -49,13 +49,8 @@ endif abs_srcdir = $(call core_abspath,$(srcdir)) -DIST_PATH = $(DIST)/bin/ -RM_DIST = rm -f regOrderDir="$(call getnativepath,$(abs_srcdir)/regorder)"; -DOCOPY= check:: XPCOM_DEBUG_BREAK=stack-and-abort $(RUN_TEST_PROGRAM) \ $(DIST)/bin/TestRegistrationOrder$(BIN_SUFFIX) $(regOrderDir) - -GARBAGE += TestScriptable.h From 0747462b80fa3f873eaaaf25feb9d5da6453ad68 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:55:59 +0200 Subject: [PATCH 62/79] Bug 883284 - Part a: Support LIBXUL_LIBRARY in moz.build; r=mshal --- python/mozbuild/mozbuild/frontend/emitter.py | 1 + python/mozbuild/mozbuild/frontend/sandbox_symbols.py | 6 ++++++ .../mozbuild/test/backend/data/variable_passthru/moz.build | 1 + python/mozbuild/mozbuild/test/backend/test_recursivemake.py | 3 +++ .../mozbuild/test/frontend/data/variable-passthru/moz.build | 1 + python/mozbuild/mozbuild/test/frontend/test_emitter.py | 1 + 6 files changed, 13 insertions(+) diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py index 940dfc2ab2a4..3acb662b4de1 100644 --- a/python/mozbuild/mozbuild/frontend/emitter.py +++ b/python/mozbuild/mozbuild/frontend/emitter.py @@ -132,6 +132,7 @@ class TreeMetadataEmitter(LoggingMixin): JS_MODULES_PATH='JS_MODULES_PATH', LIBRARY_NAME='LIBRARY_NAME', LIBS='LIBS', + LIBXUL_LIBRARY='LIBXUL_LIBRARY', MODULE='MODULE', SDK_LIBRARY='SDK_LIBRARY', SHARED_LIBRARY_LIBS='SHARED_LIBRARY_LIBS', diff --git a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py index 204cb7bb0f68..e288b6068196 100644 --- a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py +++ b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py @@ -209,6 +209,12 @@ VARIABLES = { A list of libraries and flags to include when linking. """), + 'LIBXUL_LIBRARY': (bool, bool, False, + """Whether the library in this directory is linked into libxul. + + Implies MOZILLA_INTERNAL_API. + """), + 'SDK_LIBRARY': (StrictOrderingOnAppendList, list, [], """Elements of the distributed SDK. diff --git a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build b/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build index 2ad897de7874..f208953a9e44 100644 --- a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build +++ b/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build @@ -41,3 +41,4 @@ CMMSRCS = ['bar.mm', 'foo.mm'] SSRCS = ['bar.S', 'foo.S'] FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py index 9cd892b1d096..23c3839d8e14 100644 --- a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py +++ b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py @@ -204,6 +204,9 @@ class TestRecursiveMakeBackend(BackendTester): 'LIBRARY_NAME': [ 'LIBRARY_NAME := lib_name', ], + 'LIBXUL_LIBRARY': [ + 'LIBXUL_LIBRARY := 1', + ], 'SDK_LIBRARY': [ 'SDK_LIBRARY += bar.sdk', 'SDK_LIBRARY += foo.sdk', diff --git a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build b/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build index 8c34b775f439..57db2a16aa13 100644 --- a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build +++ b/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build @@ -41,5 +41,6 @@ CMMSRCS = ['fans.mm', 'tans.mm'] SSRCS = ['fans.S', 'tans.S'] FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True NO_DIST_INSTALL = True diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py index 37a72381a39c..5737d4518fe5 100644 --- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py +++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py @@ -145,6 +145,7 @@ class TestEmitterBasic(unittest.TestCase): HOST_LIBRARY_NAME='host_fans', LIBRARY_NAME='lib_name', LIBS=['fans.lib', 'tans.lib'], + LIBXUL_LIBRARY=True, NO_DIST_INSTALL='1', MODULE='module_name', SDK_LIBRARY=['fans.sdk', 'tans.sdk'], From 6d473220dc1c2aa044d839f8ca90263fec1f2771 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:55:59 +0200 Subject: [PATCH 63/79] Bug 883284 - Part b: Move LIBXUL_LIBRARY into moz.build (a-c); r=joey --- accessible/src/atk/Makefile.in | 2 -- accessible/src/atk/moz.build | 2 ++ accessible/src/base/Makefile.in | 2 -- accessible/src/base/moz.build | 2 ++ accessible/src/generic/Makefile.in | 2 -- accessible/src/generic/moz.build | 2 ++ accessible/src/html/Makefile.in | 2 -- accessible/src/html/moz.build | 2 ++ accessible/src/mac/Makefile.in | 3 --- accessible/src/mac/moz.build | 3 +++ accessible/src/other/Makefile.in | 2 -- accessible/src/other/moz.build | 2 ++ accessible/src/windows/ia2/Makefile.in | 1 - accessible/src/windows/ia2/moz.build | 2 ++ accessible/src/windows/msaa/Makefile.in | 2 -- accessible/src/windows/msaa/moz.build | 3 +++ accessible/src/windows/sdn/Makefile.in | 2 +- accessible/src/windows/sdn/moz.build | 2 ++ accessible/src/windows/uia/Makefile.in | 2 +- accessible/src/windows/uia/moz.build | 2 ++ accessible/src/xpcom/Makefile.in | 2 -- accessible/src/xpcom/moz.build | 2 ++ accessible/src/xul/Makefile.in | 2 -- accessible/src/xul/moz.build | 2 ++ caps/src/Makefile.in | 3 --- caps/src/moz.build | 2 ++ chrome/src/Makefile.in | 2 -- chrome/src/moz.build | 2 ++ content/base/src/Makefile.in | 1 - content/base/src/moz.build | 2 ++ content/canvas/src/Makefile.in | 1 - content/canvas/src/moz.build | 2 ++ content/events/src/Makefile.in | 1 - content/events/src/moz.build | 2 ++ content/html/content/src/Makefile.in | 1 - content/html/content/src/moz.build | 2 ++ content/html/document/src/Makefile.in | 1 - content/html/document/src/moz.build | 2 ++ content/mathml/content/src/Makefile.in | 1 - content/mathml/content/src/moz.build | 2 ++ content/media/Makefile.in | 1 - content/media/dash/Makefile.in | 2 -- content/media/dash/moz.build | 2 ++ content/media/directshow/Makefile.in | 2 -- content/media/directshow/moz.build | 2 ++ content/media/encoder/Makefile.in | 13 ------------- content/media/encoder/moz.build | 2 ++ content/media/gstreamer/Makefile.in | 2 -- content/media/gstreamer/moz.build | 2 ++ content/media/mediasource/Makefile.in | 2 -- content/media/mediasource/moz.build | 2 ++ content/media/moz.build | 4 +++- content/media/ogg/Makefile.in | 13 ------------- content/media/ogg/moz.build | 2 ++ content/media/omx/Makefile.in | 2 -- content/media/omx/moz.build | 2 ++ content/media/plugins/Makefile.in | 2 -- content/media/plugins/moz.build | 2 ++ content/media/raw/Makefile.in | 1 - content/media/raw/moz.build | 2 ++ content/media/wave/Makefile.in | 14 -------------- content/media/wave/moz.build | 2 ++ content/media/webaudio/Makefile.in | 1 - content/media/webaudio/blink/Makefile.in | 2 -- content/media/webaudio/blink/moz.build | 2 ++ content/media/webaudio/moz.build | 2 ++ content/media/webm/Makefile.in | 3 --- content/media/webm/moz.build | 2 ++ content/media/webrtc/Makefile.in | 2 -- content/media/webrtc/moz.build | 2 ++ content/media/webspeech/recognition/Makefile.in | 2 -- content/media/webspeech/recognition/moz.build | 2 ++ content/media/webspeech/synth/Makefile.in | 2 -- content/media/webspeech/synth/moz.build | 2 ++ content/media/wmf/Makefile.in | 2 -- content/media/wmf/moz.build | 2 ++ content/smil/Makefile.in | 1 - content/smil/moz.build | 2 ++ content/svg/content/src/Makefile.in | 1 - content/svg/content/src/moz.build | 2 ++ content/svg/document/src/Makefile.in | 1 - content/svg/document/src/moz.build | 2 ++ content/xbl/src/Makefile.in | 1 - content/xbl/src/moz.build | 2 ++ content/xml/content/src/Makefile.in | 1 - content/xml/content/src/moz.build | 2 ++ content/xml/document/src/Makefile.in | 1 - content/xml/document/src/moz.build | 2 ++ content/xslt/src/base/Makefile.in | 1 - content/xslt/src/base/moz.build | 2 ++ content/xslt/src/xml/Makefile.in | 1 - content/xslt/src/xml/moz.build | 2 ++ content/xslt/src/xpath/Makefile.in | 1 - content/xslt/src/xpath/moz.build | 2 ++ content/xslt/src/xslt/Makefile.in | 2 -- content/xslt/src/xslt/moz.build | 2 ++ content/xul/document/src/Makefile.in | 1 - content/xul/document/src/moz.build | 2 ++ content/xul/templates/src/Makefile.in | 2 -- content/xul/templates/src/moz.build | 2 ++ 100 files changed, 105 insertions(+), 116 deletions(-) delete mode 100644 content/media/encoder/Makefile.in delete mode 100644 content/media/ogg/Makefile.in delete mode 100644 content/media/wave/Makefile.in diff --git a/accessible/src/atk/Makefile.in b/accessible/src/atk/Makefile.in index 70be75d8af48..ba1599610340 100644 --- a/accessible/src/atk/Makefile.in +++ b/accessible/src/atk/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = .. -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk ifdef MOZ_ENABLE_GTK diff --git a/accessible/src/atk/moz.build b/accessible/src/atk/moz.build index 90baa27fc5c7..106d43b869d8 100644 --- a/accessible/src/atk/moz.build +++ b/accessible/src/atk/moz.build @@ -35,3 +35,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'accessibility_toolkit_s' +LIBXUL_LIBRARY = True + diff --git a/accessible/src/base/Makefile.in b/accessible/src/base/Makefile.in index 67191a4b573d..90f243945253 100644 --- a/accessible/src/base/Makefile.in +++ b/accessible/src/base/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += \ diff --git a/accessible/src/base/moz.build b/accessible/src/base/moz.build index 26519c08b146..3448d52b7b48 100644 --- a/accessible/src/base/moz.build +++ b/accessible/src/base/moz.build @@ -63,3 +63,5 @@ if a11y_log: LIBRARY_NAME = 'accessibility_base_s' +LIBXUL_LIBRARY = True + diff --git a/accessible/src/generic/Makefile.in b/accessible/src/generic/Makefile.in index 68825db73f75..e62fab2c6e0d 100644 --- a/accessible/src/generic/Makefile.in +++ b/accessible/src/generic/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/accessible/src/generic/moz.build b/accessible/src/generic/moz.build index 3af56bafd7b4..a602225b40f0 100644 --- a/accessible/src/generic/moz.build +++ b/accessible/src/generic/moz.build @@ -29,3 +29,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'accessibility_generic_s' +LIBXUL_LIBRARY = True + diff --git a/accessible/src/html/Makefile.in b/accessible/src/html/Makefile.in index c73ec9317cf1..6b8c0b882286 100644 --- a/accessible/src/html/Makefile.in +++ b/accessible/src/html/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/accessible/src/html/moz.build b/accessible/src/html/moz.build index 972a0c463890..52a3b7430876 100644 --- a/accessible/src/html/moz.build +++ b/accessible/src/html/moz.build @@ -19,3 +19,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'accessibility_html_s' +LIBXUL_LIBRARY = True + diff --git a/accessible/src/mac/Makefile.in b/accessible/src/mac/Makefile.in index 90a6b6ae2d5c..2b98846b0236 100644 --- a/accessible/src/mac/Makefile.in +++ b/accessible/src/mac/Makefile.in @@ -10,9 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = .. -LIBXUL_LIBRARY = 1 - - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += \ diff --git a/accessible/src/mac/moz.build b/accessible/src/mac/moz.build index dab37e183b1a..ae2c455087f1 100644 --- a/accessible/src/mac/moz.build +++ b/accessible/src/mac/moz.build @@ -29,3 +29,6 @@ CMMSRCS += [ 'mozHTMLAccessible.mm', 'mozTextAccessible.mm', ] + +LIBXUL_LIBRARY = True + diff --git a/accessible/src/other/Makefile.in b/accessible/src/other/Makefile.in index 1c65f82a96a6..5e146623d448 100644 --- a/accessible/src/other/Makefile.in +++ b/accessible/src/other/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = .. -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += \ diff --git a/accessible/src/other/moz.build b/accessible/src/other/moz.build index 8f2f2bba7e8f..a2f29f28ebd2 100644 --- a/accessible/src/other/moz.build +++ b/accessible/src/other/moz.build @@ -18,3 +18,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'accessibility_toolkit_s' +LIBXUL_LIBRARY = True + diff --git a/accessible/src/windows/ia2/Makefile.in b/accessible/src/windows/ia2/Makefile.in index 5827bd89c687..0b57d0c5b6cb 100644 --- a/accessible/src/windows/ia2/Makefile.in +++ b/accessible/src/windows/ia2/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = accessibility_toolkit_ia2_s EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 # The midl generated code include Windows headers which defines min and max # macros which conflicts with std::min/max. Suppress the macros: diff --git a/accessible/src/windows/ia2/moz.build b/accessible/src/windows/ia2/moz.build index 54f52890d53d..883f99786644 100644 --- a/accessible/src/windows/ia2/moz.build +++ b/accessible/src/windows/ia2/moz.build @@ -30,3 +30,5 @@ CPP_SOURCES += [ 'ia2AccessibleValue.cpp', ] +LIBXUL_LIBRARY = True + diff --git a/accessible/src/windows/msaa/Makefile.in b/accessible/src/windows/msaa/Makefile.in index b595e30c82ef..e019041a9a76 100644 --- a/accessible/src/windows/msaa/Makefile.in +++ b/accessible/src/windows/msaa/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = accessibility_toolkit_msaa_s EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/accessible/src/windows/msaa/moz.build b/accessible/src/windows/msaa/moz.build index febc7f713ddc..52b83aa601ba 100644 --- a/accessible/src/windows/msaa/moz.build +++ b/accessible/src/windows/msaa/moz.build @@ -41,3 +41,6 @@ if CONFIG['MOZ_XUL']: 'XULMenuAccessibleWrap.cpp', 'XULTreeGridAccessibleWrap.cpp', ] + +LIBXUL_LIBRARY = True + diff --git a/accessible/src/windows/sdn/Makefile.in b/accessible/src/windows/sdn/Makefile.in index cbc3681e8f37..ba998fda4942 100644 --- a/accessible/src/windows/sdn/Makefile.in +++ b/accessible/src/windows/sdn/Makefile.in @@ -11,7 +11,7 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = accessibility_toolkit_sdn_s EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 + # The midl generated code include Windows headers which defines min and max # macros which conflicts with std::min/max. Suppress the macros: OS_CXXFLAGS += -DNOMINMAX diff --git a/accessible/src/windows/sdn/moz.build b/accessible/src/windows/sdn/moz.build index 3736a2980ac0..b5768afe05a8 100644 --- a/accessible/src/windows/sdn/moz.build +++ b/accessible/src/windows/sdn/moz.build @@ -11,3 +11,5 @@ CPP_SOURCES += [ 'sdnTextAccessible.cpp', ] +LIBXUL_LIBRARY = True + diff --git a/accessible/src/windows/uia/Makefile.in b/accessible/src/windows/uia/Makefile.in index 6fa292fc9298..d39f7f9a6cd3 100644 --- a/accessible/src/windows/uia/Makefile.in +++ b/accessible/src/windows/uia/Makefile.in @@ -11,7 +11,7 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = accessibility_toolkit_uia_s EXPORT_LIBRARY = .. -LIBXUL_LIBRARY = 1 + # The midl generated code include Windows headers which defines min and max # macros which conflicts with std::min/max. Suppress the macros: OS_CXXFLAGS += -DNOMINMAX diff --git a/accessible/src/windows/uia/moz.build b/accessible/src/windows/uia/moz.build index f6c2ee69dc5c..eb3bb01e2989 100644 --- a/accessible/src/windows/uia/moz.build +++ b/accessible/src/windows/uia/moz.build @@ -10,3 +10,5 @@ CPP_SOURCES += [ 'uiaRawElmProvider.cpp', ] +LIBXUL_LIBRARY = True + diff --git a/accessible/src/xpcom/Makefile.in b/accessible/src/xpcom/Makefile.in index f484a05ff8ef..a87748938cc6 100644 --- a/accessible/src/xpcom/Makefile.in +++ b/accessible/src/xpcom/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - EXTRA_MDDEPEND_FILES = xpcAccEvents.pp include $(topsrcdir)/config/rules.mk diff --git a/accessible/src/xpcom/moz.build b/accessible/src/xpcom/moz.build index cd6a44e8fd80..9bbe85607176 100644 --- a/accessible/src/xpcom/moz.build +++ b/accessible/src/xpcom/moz.build @@ -19,3 +19,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'accessibility_xpcom_s' +LIBXUL_LIBRARY = True + diff --git a/accessible/src/xul/Makefile.in b/accessible/src/xul/Makefile.in index c2dd89d8ffbf..a57c3f469823 100644 --- a/accessible/src/xul/Makefile.in +++ b/accessible/src/xul/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/accessible/src/xul/moz.build b/accessible/src/xul/moz.build index 5625280f2fc6..599e3c36bbf6 100644 --- a/accessible/src/xul/moz.build +++ b/accessible/src/xul/moz.build @@ -23,3 +23,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'accessibility_xul_s' +LIBXUL_LIBRARY = True + diff --git a/caps/src/Makefile.in b/caps/src/Makefile.in index b5804cf4278e..fa3083fad3e1 100644 --- a/caps/src/Makefile.in +++ b/caps/src/Makefile.in @@ -11,9 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - - include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/../include \ diff --git a/caps/src/moz.build b/caps/src/moz.build index 59683de668df..01c2ca2ae2da 100644 --- a/caps/src/moz.build +++ b/caps/src/moz.build @@ -18,3 +18,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'caps_s' +LIBXUL_LIBRARY = True + diff --git a/chrome/src/Makefile.in b/chrome/src/Makefile.in index 31b73227007c..007975f62740 100644 --- a/chrome/src/Makefile.in +++ b/chrome/src/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = chrome_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/chrome/src/moz.build b/chrome/src/moz.build index 5fb69ed750c8..f128712e8943 100644 --- a/chrome/src/moz.build +++ b/chrome/src/moz.build @@ -17,3 +17,5 @@ CPP_SOURCES += [ 'nsChromeRegistryContent.cpp', ] +LIBXUL_LIBRARY = True + diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in index 9242219de584..9759825fcaa5 100644 --- a/content/base/src/Makefile.in +++ b/content/base/src/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconbase_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 ifdef MOZ_WEBRTC LOCAL_INCLUDES += \ -I$(topsrcdir)/netwerk/sctp/datachannel \ diff --git a/content/base/src/moz.build b/content/base/src/moz.build index a149aec820dd..be1a4b13a1e3 100644 --- a/content/base/src/moz.build +++ b/content/base/src/moz.build @@ -172,3 +172,5 @@ EXTRA_JS_MODULES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in index e3f47d8ffcc5..cadc7033d7cd 100644 --- a/content/canvas/src/Makefile.in +++ b/content/canvas/src/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconcvs_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 ifdef MOZ_WEBGL LOCAL_INCLUDES += \ -I$(topsrcdir)/js/xpconnect/wrappers \ diff --git a/content/canvas/src/moz.build b/content/canvas/src/moz.build index 3b1c14276306..f9e6c83a5abb 100644 --- a/content/canvas/src/moz.build +++ b/content/canvas/src/moz.build @@ -76,3 +76,5 @@ else: FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in index 8dc9ad447ef3..b56a5ac13788 100644 --- a/content/events/src/Makefile.in +++ b/content/events/src/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconevents_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/events/src/moz.build b/content/events/src/moz.build index 06ac1db0c42c..6e5b6e6fc797 100644 --- a/content/events/src/moz.build +++ b/content/events/src/moz.build @@ -69,3 +69,5 @@ if CONFIG['MOZ_WEBSPEECH']: FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in index d426ab323615..9cfaa0f26a7f 100644 --- a/content/html/content/src/Makefile.in +++ b/content/html/content/src/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconhtmlcon_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/html/content/src/moz.build b/content/html/content/src/moz.build index 8212d436a451..8933e1d970eb 100644 --- a/content/html/content/src/moz.build +++ b/content/html/content/src/moz.build @@ -156,3 +156,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/html/document/src/Makefile.in b/content/html/document/src/Makefile.in index 8657240f049b..c52e0426a153 100644 --- a/content/html/document/src/Makefile.in +++ b/content/html/document/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += \ diff --git a/content/html/document/src/moz.build b/content/html/document/src/moz.build index 80520f44d483..e8b0b9bf451e 100644 --- a/content/html/document/src/moz.build +++ b/content/html/document/src/moz.build @@ -27,3 +27,5 @@ LIBRARY_NAME = 'gkconhtmldoc_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/mathml/content/src/Makefile.in b/content/mathml/content/src/Makefile.in index 63de0e78b7af..5a711f04ccf9 100644 --- a/content/mathml/content/src/Makefile.in +++ b/content/mathml/content/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkcontentmathml_s -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/mathml/content/src/moz.build b/content/mathml/content/src/moz.build index 6dd667b1e395..738d55c31c85 100644 --- a/content/mathml/content/src/moz.build +++ b/content/mathml/content/src/moz.build @@ -13,3 +13,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/media/Makefile.in b/content/media/Makefile.in index 4b43651df2bf..2f6b8bb2cd73 100644 --- a/content/media/Makefile.in +++ b/content/media/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconmedia_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/media/dash/Makefile.in b/content/media/dash/Makefile.in index 40bccbe10b2e..40c9391db93b 100644 --- a/content/media/dash/Makefile.in +++ b/content/media/dash/Makefile.in @@ -15,8 +15,6 @@ VPATH := @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY := 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES := \ diff --git a/content/media/dash/moz.build b/content/media/dash/moz.build index 921b926977c0..560bd7362bcc 100644 --- a/content/media/dash/moz.build +++ b/content/media/dash/moz.build @@ -21,3 +21,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'gkcondash_s' +LIBXUL_LIBRARY = True + diff --git a/content/media/directshow/Makefile.in b/content/media/directshow/Makefile.in index ae7aac70d127..41d6d9ae847d 100644 --- a/content/media/directshow/Makefile.in +++ b/content/media/directshow/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkcondirectshow_s -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES += -I$(topsrcdir)/media/webrtc/trunk/webrtc/modules/video_capture/windows/ ifeq ($(OS_ARCH),WINNT) diff --git a/content/media/directshow/moz.build b/content/media/directshow/moz.build index 6a405dd6b8fd..8787ee845b09 100644 --- a/content/media/directshow/moz.build +++ b/content/media/directshow/moz.build @@ -36,3 +36,5 @@ if not CONFIG['MOZ_WEBRTC_IN_LIBXUL']: FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/media/encoder/Makefile.in b/content/media/encoder/Makefile.in deleted file mode 100644 index 865181c4ce43..000000000000 --- a/content/media/encoder/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 -include $(topsrcdir)/config/rules.mk diff --git a/content/media/encoder/moz.build b/content/media/encoder/moz.build index cf0ea9304b33..001ca84f2c1d 100644 --- a/content/media/encoder/moz.build +++ b/content/media/encoder/moz.build @@ -25,3 +25,5 @@ LIBRARY_NAME = 'gkconencoder_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/media/gstreamer/Makefile.in b/content/media/gstreamer/Makefile.in index 0aee85c59652..73436052c9cd 100644 --- a/content/media/gstreamer/Makefile.in +++ b/content/media/gstreamer/Makefile.in @@ -8,8 +8,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk CFLAGS += $(GSTREAMER_CFLAGS) diff --git a/content/media/gstreamer/moz.build b/content/media/gstreamer/moz.build index 09cccea4f761..9e48ad07956e 100644 --- a/content/media/gstreamer/moz.build +++ b/content/media/gstreamer/moz.build @@ -25,3 +25,5 @@ LIBRARY_NAME = 'gkcongstreamer_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/media/mediasource/Makefile.in b/content/media/mediasource/Makefile.in index 75a112639e58..e533fc0a4d0e 100644 --- a/content/media/mediasource/Makefile.in +++ b/content/media/mediasource/Makefile.in @@ -9,6 +9,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconmediasource_s -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk diff --git a/content/media/mediasource/moz.build b/content/media/mediasource/moz.build index a90461521bd4..2e4e68fe31b8 100644 --- a/content/media/mediasource/moz.build +++ b/content/media/mediasource/moz.build @@ -28,3 +28,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/media/moz.build b/content/media/moz.build index 2ebeb4c43626..9fcea014d787 100644 --- a/content/media/moz.build +++ b/content/media/moz.build @@ -132,8 +132,10 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True - if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']: CPP_SOURCES += [ 'AudioNodeEngineNEON.cpp', ] + +LIBXUL_LIBRARY = True + diff --git a/content/media/ogg/Makefile.in b/content/media/ogg/Makefile.in deleted file mode 100644 index 5ce55c06d6e3..000000000000 --- a/content/media/ogg/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 -include $(topsrcdir)/config/rules.mk diff --git a/content/media/ogg/moz.build b/content/media/ogg/moz.build index 7cbf70482053..b83d8287af6f 100644 --- a/content/media/ogg/moz.build +++ b/content/media/ogg/moz.build @@ -24,3 +24,5 @@ LIBRARY_NAME = 'gkconogg_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/media/omx/Makefile.in b/content/media/omx/Makefile.in index 791e89f17f63..f82b0b53091d 100644 --- a/content/media/omx/Makefile.in +++ b/content/media/omx/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconomx_s -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/media/omx/moz.build b/content/media/omx/moz.build index e36b67f1cae5..39da61420601 100644 --- a/content/media/omx/moz.build +++ b/content/media/omx/moz.build @@ -19,3 +19,5 @@ CPP_SOURCES += [ 'OMXCodecProxy.cpp', ] +LIBXUL_LIBRARY = True + diff --git a/content/media/plugins/Makefile.in b/content/media/plugins/Makefile.in index 105ec7f29a5d..28f33d995a16 100644 --- a/content/media/plugins/Makefile.in +++ b/content/media/plugins/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/media/plugins/moz.build b/content/media/plugins/moz.build index c7d49fb39207..c2845273bc8e 100644 --- a/content/media/plugins/moz.build +++ b/content/media/plugins/moz.build @@ -21,3 +21,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'gkconmediaplugins_s' +LIBXUL_LIBRARY = True + diff --git a/content/media/raw/Makefile.in b/content/media/raw/Makefile.in index 0990e6e37651..480a76049b5d 100644 --- a/content/media/raw/Makefile.in +++ b/content/media/raw/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/media/raw/moz.build b/content/media/raw/moz.build index a8dabceaf135..7c8e2b0d5286 100644 --- a/content/media/raw/moz.build +++ b/content/media/raw/moz.build @@ -21,3 +21,5 @@ LIBRARY_NAME = 'gkconraw_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/media/wave/Makefile.in b/content/media/wave/Makefile.in deleted file mode 100644 index bdacd989c366..000000000000 --- a/content/media/wave/Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 - - -include $(topsrcdir)/config/rules.mk diff --git a/content/media/wave/moz.build b/content/media/wave/moz.build index ca2ede1e260e..3f4e6254a59c 100644 --- a/content/media/wave/moz.build +++ b/content/media/wave/moz.build @@ -20,3 +20,5 @@ LIBRARY_NAME = 'gkconwave_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/media/webaudio/Makefile.in b/content/media/webaudio/Makefile.in index 2e675ecfe7e4..087db3ab8b81 100644 --- a/content/media/webaudio/Makefile.in +++ b/content/media/webaudio/Makefile.in @@ -10,6 +10,5 @@ VPATH := @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME := gkconwebaudio_s -LIBXUL_LIBRARY := 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/media/webaudio/blink/Makefile.in b/content/media/webaudio/blink/Makefile.in index a4b980ba86c0..39dabd4fcc9c 100644 --- a/content/media/webaudio/blink/Makefile.in +++ b/content/media/webaudio/blink/Makefile.in @@ -10,8 +10,6 @@ VPATH := @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME := gkconwebaudio_blink_s -LIBXUL_LIBRARY := 1 - LOCAL_INCLUDES += -I$(topsrcdir)/content/media/webaudio include $(topsrcdir)/config/rules.mk diff --git a/content/media/webaudio/blink/moz.build b/content/media/webaudio/blink/moz.build index 95074f0f7ae0..3041b726753a 100644 --- a/content/media/webaudio/blink/moz.build +++ b/content/media/webaudio/blink/moz.build @@ -25,3 +25,5 @@ CPP_SOURCES += [ 'ZeroPole.cpp', ] +LIBXUL_LIBRARY = True + diff --git a/content/media/webaudio/moz.build b/content/media/webaudio/moz.build index bf44474ec850..5c8d4d505558 100644 --- a/content/media/webaudio/moz.build +++ b/content/media/webaudio/moz.build @@ -86,3 +86,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/media/webm/Makefile.in b/content/media/webm/Makefile.in index d8e73b908a3f..47ea451c6b0f 100644 --- a/content/media/webm/Makefile.in +++ b/content/media/webm/Makefile.in @@ -8,9 +8,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/content/media/webm/moz.build b/content/media/webm/moz.build index a9b1f22165e4..1923a76883b3 100644 --- a/content/media/webm/moz.build +++ b/content/media/webm/moz.build @@ -21,3 +21,5 @@ LIBRARY_NAME = 'gkconwebm_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/media/webrtc/Makefile.in b/content/media/webrtc/Makefile.in index 440c14557271..b97113262296 100644 --- a/content/media/webrtc/Makefile.in +++ b/content/media/webrtc/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconwebrtc_s -LIBXUL_LIBRARY = 1 - ifeq ($(OS_ARCH),WINNT) OS_CXXFLAGS += -DNOMINMAX endif diff --git a/content/media/webrtc/moz.build b/content/media/webrtc/moz.build index ab8eae1e0cf5..c7020ac1c2b5 100644 --- a/content/media/webrtc/moz.build +++ b/content/media/webrtc/moz.build @@ -23,3 +23,5 @@ CPP_SOURCES += [ 'MediaEngineDefault.cpp', ] +LIBXUL_LIBRARY = True + diff --git a/content/media/webspeech/recognition/Makefile.in b/content/media/webspeech/recognition/Makefile.in index 3b04c8faceff..af4b62f4ff22 100644 --- a/content/media/webspeech/recognition/Makefile.in +++ b/content/media/webspeech/recognition/Makefile.in @@ -15,8 +15,6 @@ VPATH += \ $(NULL) LIBRARY_NAME := gkconwebspeechrecognition_s -LIBXUL_LIBRARY := 1 - LOCAL_INCLUDES += $(VPATH:%=-I%) include $(topsrcdir)/config/rules.mk diff --git a/content/media/webspeech/recognition/moz.build b/content/media/webspeech/recognition/moz.build index 4952784aa597..047c7da23896 100644 --- a/content/media/webspeech/recognition/moz.build +++ b/content/media/webspeech/recognition/moz.build @@ -40,3 +40,5 @@ CPP_SOURCES += [ 'energy_endpointer_params.cc', ] +LIBXUL_LIBRARY = True + diff --git a/content/media/webspeech/synth/Makefile.in b/content/media/webspeech/synth/Makefile.in index 505406ba8a19..25eecb68aaa1 100644 --- a/content/media/webspeech/synth/Makefile.in +++ b/content/media/webspeech/synth/Makefile.in @@ -15,8 +15,6 @@ VPATH += \ LIBRARY_NAME := gkconwebspeechsynth_s EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES += $(VPATH:%=-I%) include $(topsrcdir)/config/rules.mk diff --git a/content/media/webspeech/synth/moz.build b/content/media/webspeech/synth/moz.build index 46609f0f8c49..c8459bea1783 100644 --- a/content/media/webspeech/synth/moz.build +++ b/content/media/webspeech/synth/moz.build @@ -45,3 +45,5 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/media/wmf/Makefile.in b/content/media/wmf/Makefile.in index 48665405f082..1185c8b7f817 100644 --- a/content/media/wmf/Makefile.in +++ b/content/media/wmf/Makefile.in @@ -8,8 +8,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - ifeq ($(OS_ARCH),WINNT) OS_CXXFLAGS += -DNOMINMAX endif diff --git a/content/media/wmf/moz.build b/content/media/wmf/moz.build index 1b13aea2fb9e..bdc6cb8ea857 100644 --- a/content/media/wmf/moz.build +++ b/content/media/wmf/moz.build @@ -25,3 +25,5 @@ LIBRARY_NAME = 'gkconwmf_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/smil/Makefile.in b/content/smil/Makefile.in index 4137896ddf9b..f1a5232f7d83 100644 --- a/content/smil/Makefile.in +++ b/content/smil/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconsmil_s -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES += \ -I$(srcdir)/../base/src \ -I$(srcdir)/../../layout/style \ diff --git a/content/smil/moz.build b/content/smil/moz.build index ca099a10c041..846a95370d8c 100644 --- a/content/smil/moz.build +++ b/content/smil/moz.build @@ -63,3 +63,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/svg/content/src/Makefile.in b/content/svg/content/src/Makefile.in index 25e0d81cce8d..72baafae11b3 100644 --- a/content/svg/content/src/Makefile.in +++ b/content/svg/content/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkcontentsvg_s -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/svg/content/src/moz.build b/content/svg/content/src/moz.build index fa0eba9037c8..dc553bfc0cf7 100644 --- a/content/svg/content/src/moz.build +++ b/content/svg/content/src/moz.build @@ -246,3 +246,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/svg/document/src/Makefile.in b/content/svg/document/src/Makefile.in index c1379e2f2382..ea1a3ada93a7 100644 --- a/content/svg/document/src/Makefile.in +++ b/content/svg/document/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/svg/document/src/moz.build b/content/svg/document/src/moz.build index 1acbbbe49d3d..d0723654f0f3 100644 --- a/content/svg/document/src/moz.build +++ b/content/svg/document/src/moz.build @@ -18,3 +18,5 @@ LIBRARY_NAME = 'gkconsvgdoc_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/xbl/src/Makefile.in b/content/xbl/src/Makefile.in index 94105b980e65..91cfbc713705 100644 --- a/content/xbl/src/Makefile.in +++ b/content/xbl/src/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconxbl_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/content/xbl/src/moz.build b/content/xbl/src/moz.build index 10fa50a5f721..507d049c06b8 100644 --- a/content/xbl/src/moz.build +++ b/content/xbl/src/moz.build @@ -38,3 +38,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/xml/content/src/Makefile.in b/content/xml/content/src/Makefile.in index 2a325fe32219..f19f9c89f166 100644 --- a/content/xml/content/src/Makefile.in +++ b/content/xml/content/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/xml/content/src/moz.build b/content/xml/content/src/moz.build index a36a89a124ee..89f1347d7d21 100644 --- a/content/xml/content/src/moz.build +++ b/content/xml/content/src/moz.build @@ -24,3 +24,5 @@ LIBRARY_NAME = 'gkconxmlcon_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/xml/document/src/Makefile.in b/content/xml/document/src/Makefile.in index b439a0c106f9..bf4a622b898a 100644 --- a/content/xml/document/src/Makefile.in +++ b/content/xml/document/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/content/xml/document/src/moz.build b/content/xml/document/src/moz.build index a117870b1576..65e515273b2a 100644 --- a/content/xml/document/src/moz.build +++ b/content/xml/document/src/moz.build @@ -21,3 +21,5 @@ LIBRARY_NAME = 'gkconxmldoc_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/xslt/src/base/Makefile.in b/content/xslt/src/base/Makefile.in index b998d654e42a..e6de70ac28ee 100644 --- a/content/xslt/src/base/Makefile.in +++ b/content/xslt/src/base/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/xslt/src/base/moz.build b/content/xslt/src/base/moz.build index 272c27cc365f..073bd662fe49 100644 --- a/content/xslt/src/base/moz.build +++ b/content/xslt/src/base/moz.build @@ -18,3 +18,5 @@ LIBRARY_NAME = 'txbase_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/xslt/src/xml/Makefile.in b/content/xslt/src/xml/Makefile.in index 5ea8eda299ac..1eaa5430e0af 100644 --- a/content/xslt/src/xml/Makefile.in +++ b/content/xslt/src/xml/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/xslt/src/xml/moz.build b/content/xslt/src/xml/moz.build index e6202e1ade7d..471e2db7c0f0 100644 --- a/content/xslt/src/xml/moz.build +++ b/content/xslt/src/xml/moz.build @@ -15,3 +15,5 @@ LIBRARY_NAME = 'txxml_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/xslt/src/xpath/Makefile.in b/content/xslt/src/xpath/Makefile.in index 868af65fdf74..0155c2562882 100644 --- a/content/xslt/src/xpath/Makefile.in +++ b/content/xslt/src/xpath/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/xslt/src/xpath/moz.build b/content/xslt/src/xpath/moz.build index cf2fa2902411..4e878fb2b4f8 100644 --- a/content/xslt/src/xpath/moz.build +++ b/content/xslt/src/xpath/moz.build @@ -51,3 +51,5 @@ LIBRARY_NAME = 'txxpath_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/xslt/src/xslt/Makefile.in b/content/xslt/src/xslt/Makefile.in index 3b4cca3b3349..a61c3bd47f2d 100644 --- a/content/xslt/src/xslt/Makefile.in +++ b/content/xslt/src/xslt/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - # For nsDependentJSString LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/base \ diff --git a/content/xslt/src/xslt/moz.build b/content/xslt/src/xslt/moz.build index d0860baf19ee..c86961f42636 100644 --- a/content/xslt/src/xslt/moz.build +++ b/content/xslt/src/xslt/moz.build @@ -48,3 +48,5 @@ LIBRARY_NAME = 'txxslt_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/xul/document/src/Makefile.in b/content/xul/document/src/Makefile.in index b8cdfe75429a..a5c2a58fdd37 100644 --- a/content/xul/document/src/Makefile.in +++ b/content/xul/document/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = -I$(srcdir)/../../../base/src \ diff --git a/content/xul/document/src/moz.build b/content/xul/document/src/moz.build index 6eb1d60fa5a9..7759b397835a 100644 --- a/content/xul/document/src/moz.build +++ b/content/xul/document/src/moz.build @@ -23,3 +23,5 @@ LIBRARY_NAME = 'gkconxuldoc_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/content/xul/templates/src/Makefile.in b/content/xul/templates/src/Makefile.in index d0d9d829d788..5d299fb0325d 100644 --- a/content/xul/templates/src/Makefile.in +++ b/content/xul/templates/src/Makefile.in @@ -11,8 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = -I$(srcdir)/../../../base/src \ diff --git a/content/xul/templates/src/moz.build b/content/xul/templates/src/moz.build index 149d5dcef032..84e5fd2fcdbb 100644 --- a/content/xul/templates/src/moz.build +++ b/content/xul/templates/src/moz.build @@ -37,3 +37,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'gkconxultmpl_s' +LIBXUL_LIBRARY = True + From 4fb1aa6786ac0f3b4848bfefafaba659407cb07d Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:56:00 +0200 Subject: [PATCH 64/79] Bug 883284 - Part c: Move LIBXUL_LIBRARY into moz.build (d-e); r=mshal --- docshell/base/Makefile.in | 2 -- docshell/base/moz.build | 2 ++ docshell/build/Makefile.in | 3 --- docshell/build/moz.build | 2 ++ docshell/shistory/src/Makefile.in | 1 - docshell/shistory/src/moz.build | 2 ++ dom/activities/src/Makefile.in | 1 - dom/activities/src/moz.build | 2 ++ dom/alarm/Makefile.in | 1 - dom/alarm/moz.build | 2 ++ dom/audiochannel/Makefile.in | 1 - dom/audiochannel/moz.build | 2 ++ dom/base/Makefile.in | 1 - dom/base/moz.build | 2 ++ dom/battery/Makefile.in | 1 - dom/battery/moz.build | 2 ++ dom/bindings/Makefile.in | 1 - dom/bindings/moz.build | 2 ++ dom/bindings/test/Makefile.in | 1 - dom/bindings/test/moz.build | 4 ++++ dom/browser-element/Makefile.in | 1 - dom/browser-element/moz.build | 2 ++ dom/camera/Makefile.in | 1 - dom/camera/moz.build | 2 ++ dom/cellbroadcast/src/Makefile.in | 1 - dom/cellbroadcast/src/moz.build | 2 ++ dom/devicestorage/Makefile.in | 1 - dom/devicestorage/moz.build | 2 ++ dom/encoding/Makefile.in | 2 -- dom/encoding/moz.build | 2 ++ dom/file/Makefile.in | 1 - dom/file/moz.build | 2 ++ dom/fm/Makefile.in | 2 -- dom/fm/moz.build | 2 ++ dom/gamepad/Makefile.in | 1 - dom/gamepad/moz.build | 2 ++ dom/icc/src/Makefile.in | 1 - dom/icc/src/moz.build | 2 ++ dom/indexedDB/Makefile.in | 1 - dom/indexedDB/ipc/Makefile.in | 2 -- dom/indexedDB/ipc/moz.build | 2 ++ dom/indexedDB/moz.build | 2 ++ dom/interfaces/devicestorage/Makefile.in | 2 -- dom/interfaces/devicestorage/moz.build | 2 ++ dom/ipc/Makefile.in | 1 - dom/ipc/moz.build | 2 ++ dom/media/Makefile.in | 1 - dom/media/bridge/Makefile.in | 2 -- dom/media/bridge/moz.build | 2 ++ dom/media/moz.build | 2 ++ dom/mobilemessage/src/Makefile.in | 1 - dom/mobilemessage/src/moz.build | 2 ++ dom/network/src/Makefile.in | 1 - dom/network/src/moz.build | 2 ++ dom/plugins/base/Makefile.in | 2 -- dom/plugins/base/android/Makefile.in | 1 - dom/plugins/base/android/moz.build | 2 ++ dom/plugins/base/moz.build | 3 +++ dom/plugins/ipc/Makefile.in | 1 - dom/plugins/ipc/moz.build | 2 ++ dom/power/Makefile.in | 1 - dom/power/moz.build | 2 ++ dom/promise/Makefile.in | 1 - dom/promise/moz.build | 2 ++ dom/quota/Makefile.in | 1 - dom/quota/moz.build | 2 ++ dom/src/events/Makefile.in | 2 -- dom/src/events/moz.build | 2 ++ dom/src/geolocation/Makefile.in | 2 -- dom/src/geolocation/moz.build | 2 ++ dom/src/json/Makefile.in | 2 -- dom/src/json/moz.build | 2 ++ dom/src/jsurl/Makefile.in | 2 -- dom/src/jsurl/moz.build | 2 ++ dom/src/notification/Makefile.in | 2 -- dom/src/notification/moz.build | 2 ++ dom/src/offline/Makefile.in | 1 - dom/src/offline/moz.build | 2 ++ dom/src/storage/Makefile.in | 2 -- dom/src/storage/moz.build | 2 ++ dom/system/Makefile.in | 1 - dom/system/android/Makefile.in | 1 - dom/system/android/moz.build | 2 ++ dom/system/gonk/Makefile.in | 1 - dom/system/gonk/moz.build | 2 ++ dom/system/mac/Makefile.in | 1 - dom/system/mac/moz.build | 2 ++ dom/system/moz.build | 2 ++ dom/system/unix/Makefile.in | 1 - dom/system/unix/moz.build | 2 ++ dom/system/windows/Makefile.in | 1 - dom/system/windows/moz.build | 2 ++ dom/telephony/Makefile.in | 1 - dom/telephony/moz.build | 2 ++ dom/time/Makefile.in | 1 - dom/time/moz.build | 2 ++ dom/voicemail/Makefile.in | 1 - dom/voicemail/moz.build | 2 ++ dom/wifi/Makefile.in | 2 -- dom/wifi/moz.build | 2 ++ dom/workers/Makefile.in | 1 - dom/workers/moz.build | 2 ++ editor/composer/src/Makefile.in | 1 - editor/composer/src/moz.build | 2 ++ editor/libeditor/base/Makefile.in | 2 -- editor/libeditor/base/moz.build | 2 ++ editor/libeditor/html/Makefile.in | 2 -- editor/libeditor/html/moz.build | 2 ++ editor/libeditor/text/Makefile.in | 2 -- editor/libeditor/text/moz.build | 2 ++ editor/txmgr/src/Makefile.in | 3 --- editor/txmgr/src/moz.build | 2 ++ editor/txtsvc/src/Makefile.in | 16 ---------------- editor/txtsvc/src/moz.build | 2 ++ embedding/browser/build/Makefile.in | 1 - embedding/browser/build/moz.build | 2 ++ embedding/browser/webBrowser/Makefile.in | 1 - embedding/browser/webBrowser/moz.build | 2 ++ embedding/components/appstartup/src/Makefile.in | 15 --------------- embedding/components/appstartup/src/moz.build | 2 ++ embedding/components/build/Makefile.in | 1 - embedding/components/build/moz.build | 2 ++ .../components/commandhandler/src/Makefile.in | 15 --------------- .../components/commandhandler/src/moz.build | 2 ++ embedding/components/find/src/Makefile.in | 15 --------------- embedding/components/find/src/moz.build | 2 ++ .../components/printingui/src/mac/Makefile.in | 2 -- .../components/printingui/src/mac/moz.build | 2 ++ .../components/printingui/src/os2/Makefile.in | 2 -- .../components/printingui/src/os2/moz.build | 2 ++ .../printingui/src/unixshared/Makefile.in | 1 - .../printingui/src/unixshared/moz.build | 2 ++ .../components/printingui/src/win/Makefile.in | 1 - .../components/printingui/src/win/moz.build | 2 ++ .../components/webbrowserpersist/src/Makefile.in | 1 - .../components/webbrowserpersist/src/moz.build | 2 ++ .../components/windowwatcher/src/Makefile.in | 2 -- embedding/components/windowwatcher/src/moz.build | 2 ++ extensions/auth/Makefile.in | 3 --- extensions/auth/moz.build | 2 ++ extensions/cookie/Makefile.in | 2 -- extensions/cookie/moz.build | 2 ++ extensions/gio/Makefile.in | 1 - extensions/gio/moz.build | 2 ++ extensions/permissions/Makefile.in | 3 --- extensions/permissions/moz.build | 2 ++ extensions/pref/autoconfig/src/Makefile.in | 2 -- extensions/pref/autoconfig/src/moz.build | 2 ++ extensions/spellcheck/hunspell/src/Makefile.in | 3 --- extensions/spellcheck/hunspell/src/moz.build | 2 ++ extensions/spellcheck/src/Makefile.in | 3 --- extensions/spellcheck/src/moz.build | 2 ++ extensions/universalchardet/src/base/Makefile.in | 15 --------------- extensions/universalchardet/src/base/moz.build | 2 ++ .../universalchardet/src/xpcom/Makefile.in | 2 -- extensions/universalchardet/src/xpcom/moz.build | 2 ++ 156 files changed, 159 insertions(+), 184 deletions(-) delete mode 100644 editor/txtsvc/src/Makefile.in delete mode 100644 embedding/components/appstartup/src/Makefile.in delete mode 100644 embedding/components/commandhandler/src/Makefile.in delete mode 100644 embedding/components/find/src/Makefile.in delete mode 100644 extensions/universalchardet/src/base/Makefile.in diff --git a/docshell/base/Makefile.in b/docshell/base/Makefile.in index 0ffe878c3b69..92d8f7a8c32e 100644 --- a/docshell/base/Makefile.in +++ b/docshell/base/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = basedocshell_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - ifdef MOZ_TOOLKIT_SEARCH DEFINES += -DMOZ_TOOLKIT_SEARCH endif diff --git a/docshell/base/moz.build b/docshell/base/moz.build index cbf67d31d754..0c140fc4625d 100644 --- a/docshell/base/moz.build +++ b/docshell/base/moz.build @@ -64,3 +64,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/docshell/build/Makefile.in b/docshell/build/Makefile.in index 81fee6fb80fa..c782b215d3ee 100644 --- a/docshell/build/Makefile.in +++ b/docshell/build/Makefile.in @@ -12,9 +12,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - - SHARED_LIBRARY_LIBS= \ ../base/$(LIB_PREFIX)basedocshell_s.$(LIB_SUFFIX) \ $(DEPTH)/uriloader/base/$(LIB_PREFIX)uriloaderbase_s.$(LIB_SUFFIX) \ diff --git a/docshell/build/moz.build b/docshell/build/moz.build index f81d40505221..3d9c5030fca7 100644 --- a/docshell/build/moz.build +++ b/docshell/build/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'docshell' +LIBXUL_LIBRARY = True + diff --git a/docshell/shistory/src/Makefile.in b/docshell/shistory/src/Makefile.in index f4de7098fd89..eb3a81c47c5d 100644 --- a/docshell/shistory/src/Makefile.in +++ b/docshell/shistory/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += -I$(srcdir)/../../base diff --git a/docshell/shistory/src/moz.build b/docshell/shistory/src/moz.build index c211c4dc9879..d06c58199f5f 100644 --- a/docshell/shistory/src/moz.build +++ b/docshell/shistory/src/moz.build @@ -21,3 +21,5 @@ LIBRARY_NAME = 'shistory_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/activities/src/Makefile.in b/dom/activities/src/Makefile.in index 7391ab0d9255..7d7022d974c8 100644 --- a/dom/activities/src/Makefile.in +++ b/dom/activities/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_activities_s -LIBXUL_LIBRARY = 1 include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/activities/src/moz.build b/dom/activities/src/moz.build index 48e48f1af108..8aa085a3b466 100644 --- a/dom/activities/src/moz.build +++ b/dom/activities/src/moz.build @@ -30,3 +30,5 @@ EXTRA_JS_MODULES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/alarm/Makefile.in b/dom/alarm/Makefile.in index c78da2609c6e..96239d2b506b 100644 --- a/dom/alarm/Makefile.in +++ b/dom/alarm/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domalarm_s -LIBXUL_LIBRARY = 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/alarm/moz.build b/dom/alarm/moz.build index 86b6b24109f9..b40c4a5bd6aa 100644 --- a/dom/alarm/moz.build +++ b/dom/alarm/moz.build @@ -35,3 +35,5 @@ EXTRA_JS_MODULES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/audiochannel/Makefile.in b/dom/audiochannel/Makefile.in index bcd8c65fa73c..adcd696c4b5d 100644 --- a/dom/audiochannel/Makefile.in +++ b/dom/audiochannel/Makefile.in @@ -20,7 +20,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domaudiochannel_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/audiochannel/moz.build b/dom/audiochannel/moz.build index c99354af8555..4b3d9d5a8a7d 100644 --- a/dom/audiochannel/moz.build +++ b/dom/audiochannel/moz.build @@ -29,3 +29,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/base/Makefile.in b/dom/base/Makefile.in index 026f60063426..5ed7e43abe87 100644 --- a/dom/base/Makefile.in +++ b/dom/base/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = jsdombase_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/dom/dom-config.mk ifdef MOZ_JSDEBUGGER diff --git a/dom/base/moz.build b/dom/base/moz.build index 277cc88bed26..42420083d553 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -111,3 +111,5 @@ EXTRA_JS_MODULES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/battery/Makefile.in b/dom/battery/Makefile.in index 0dbb06b967f9..8cdd16a182e8 100644 --- a/dom/battery/Makefile.in +++ b/dom/battery/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_battery_s -LIBXUL_LIBRARY = 1 include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/battery/moz.build b/dom/battery/moz.build index bd246cf7830b..5e56663cd0aa 100644 --- a/dom/battery/moz.build +++ b/dom/battery/moz.build @@ -17,3 +17,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/bindings/Makefile.in b/dom/bindings/Makefile.in index c387c3d536bd..c03fc494f6f6 100644 --- a/dom/bindings/Makefile.in +++ b/dom/bindings/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dombindings_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 # Need this to find all our DOM source files. diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build index 7b7a1cae625d..f8db3cd6b47c 100644 --- a/dom/bindings/moz.build +++ b/dom/bindings/moz.build @@ -28,3 +28,5 @@ EXPORTS.mozilla.dom += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/bindings/test/Makefile.in b/dom/bindings/test/Makefile.in index fbfe03004cf0..0d03c7d04502 100644 --- a/dom/bindings/test/Makefile.in +++ b/dom/bindings/test/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ relativesrcdir = @relativesrcdir@ LIBRARY_NAME = dombindings_test_s -LIBXUL_LIBRARY = 1 # Do NOT export this library. We don't actually want our test code # being added to libxul or anything. diff --git a/dom/bindings/test/moz.build b/dom/bindings/test/moz.build index 042cc8816086..c62097ecf122 100644 --- a/dom/bindings/test/moz.build +++ b/dom/bindings/test/moz.build @@ -10,3 +10,7 @@ CPP_SOURCES += [ '$(subst .webidl,Binding.cpp,$(test_webidl_files))', ] +LIBXUL_LIBRARY = True +# Do NOT export this library. We don't actually want our test code +# being added to libxul or anything. + diff --git a/dom/browser-element/Makefile.in b/dom/browser-element/Makefile.in index 36f48419a552..8e1c254045fe 100644 --- a/dom/browser-element/Makefile.in +++ b/dom/browser-element/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_browserelement_s -LIBXUL_LIBRARY = 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/browser-element/moz.build b/dom/browser-element/moz.build index b1107a27406f..a541a125a6c5 100644 --- a/dom/browser-element/moz.build +++ b/dom/browser-element/moz.build @@ -42,3 +42,5 @@ EXTRA_JS_MODULES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/camera/Makefile.in b/dom/camera/Makefile.in index 9fcbc7d33961..996df86f6dc5 100644 --- a/dom/camera/Makefile.in +++ b/dom/camera/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domcamera_s -LIBXUL_LIBRARY = 1 include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/camera/moz.build b/dom/camera/moz.build index a2b490d0b9cc..440b6ff00ab6 100644 --- a/dom/camera/moz.build +++ b/dom/camera/moz.build @@ -47,3 +47,5 @@ else: FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/cellbroadcast/src/Makefile.in b/dom/cellbroadcast/src/Makefile.in index 8876a245c95e..fdd548d4dcb0 100644 --- a/dom/cellbroadcast/src/Makefile.in +++ b/dom/cellbroadcast/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_cellbroadcast_s -LIBXUL_LIBRARY = 1 include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/cellbroadcast/src/moz.build b/dom/cellbroadcast/src/moz.build index 66bc823993e0..e706fe5ca7e2 100644 --- a/dom/cellbroadcast/src/moz.build +++ b/dom/cellbroadcast/src/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/devicestorage/Makefile.in b/dom/devicestorage/Makefile.in index 36db62339a75..edbc285088fb 100644 --- a/dom/devicestorage/Makefile.in +++ b/dom/devicestorage/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domdevicestorage_s -LIBXUL_LIBRARY = 1 include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/devicestorage/moz.build b/dom/devicestorage/moz.build index 0aa16bd91809..54e5749e9f05 100644 --- a/dom/devicestorage/moz.build +++ b/dom/devicestorage/moz.build @@ -32,3 +32,5 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/encoding/Makefile.in b/dom/encoding/Makefile.in index 3de7da972b12..6560ae457430 100644 --- a/dom/encoding/Makefile.in +++ b/dom/encoding/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domencoding_s -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES = \ -I$(topsrcdir)/intl/locale/src \ $(NULL) diff --git a/dom/encoding/moz.build b/dom/encoding/moz.build index 611fa44de817..a814d26e50ee 100644 --- a/dom/encoding/moz.build +++ b/dom/encoding/moz.build @@ -24,3 +24,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/file/Makefile.in b/dom/file/Makefile.in index 094bd56b1285..9320a05ec7d6 100644 --- a/dom/file/Makefile.in +++ b/dom/file/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domfile_s -LIBXUL_LIBRARY = 1 include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/file/moz.build b/dom/file/moz.build index 330534a1c40c..90fe8f2d8855 100644 --- a/dom/file/moz.build +++ b/dom/file/moz.build @@ -57,3 +57,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/fm/Makefile.in b/dom/fm/Makefile.in index 7a418262061b..f49a4f67288a 100644 --- a/dom/fm/Makefile.in +++ b/dom/fm/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domfm_s -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/fm/moz.build b/dom/fm/moz.build index 10de07f9890e..1fe739b8c856 100644 --- a/dom/fm/moz.build +++ b/dom/fm/moz.build @@ -27,3 +27,5 @@ EXTRA_COMPONENTS += [ 'DOMFMRadioChild.js', ] +LIBXUL_LIBRARY = True + diff --git a/dom/gamepad/Makefile.in b/dom/gamepad/Makefile.in index 3bcc4cc09058..13e16b9ac73b 100644 --- a/dom/gamepad/Makefile.in +++ b/dom/gamepad/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domgamepad_s -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/base \ $(NULL) diff --git a/dom/gamepad/moz.build b/dom/gamepad/moz.build index 41e2a4e51af3..19f225b7cb45 100644 --- a/dom/gamepad/moz.build +++ b/dom/gamepad/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES = [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/icc/src/Makefile.in b/dom/icc/src/Makefile.in index b87e52d9ac32..ced411e76d98 100644 --- a/dom/icc/src/Makefile.in +++ b/dom/icc/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = $(srcdir) include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_icc_s -LIBXUL_LIBRARY = 1 include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/icc/src/moz.build b/dom/icc/src/moz.build index 151f6fdd0283..16746ddc8000 100644 --- a/dom/icc/src/moz.build +++ b/dom/icc/src/moz.build @@ -15,3 +15,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/indexedDB/Makefile.in b/dom/indexedDB/Makefile.in index 0eb1a52894d0..cfcf03ea625a 100644 --- a/dom/indexedDB/Makefile.in +++ b/dom/indexedDB/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_indexeddb_s -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = \ -I$(topsrcdir)/caps/include \ -I$(topsrcdir)/content/base/src \ diff --git a/dom/indexedDB/ipc/Makefile.in b/dom/indexedDB/ipc/Makefile.in index 2703e9afc121..05a026851432 100644 --- a/dom/indexedDB/ipc/Makefile.in +++ b/dom/indexedDB/ipc/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_indexeddb_ipc_s -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/indexedDB \ -I$(topsrcdir)/content/events/src \ diff --git a/dom/indexedDB/ipc/moz.build b/dom/indexedDB/ipc/moz.build index 635910d91ad0..8b465094d76f 100644 --- a/dom/indexedDB/ipc/moz.build +++ b/dom/indexedDB/ipc/moz.build @@ -32,3 +32,5 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/indexedDB/moz.build b/dom/indexedDB/moz.build index 4f026c942325..82e968464f0c 100644 --- a/dom/indexedDB/moz.build +++ b/dom/indexedDB/moz.build @@ -65,3 +65,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/interfaces/devicestorage/Makefile.in b/dom/interfaces/devicestorage/Makefile.in index 94cd8d2b636b..c0c7305abb30 100644 --- a/dom/interfaces/devicestorage/Makefile.in +++ b/dom/interfaces/devicestorage/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domdevicestorage_s -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/interfaces/devicestorage/moz.build b/dom/interfaces/devicestorage/moz.build index e5e1fdf120ff..fd882d036fce 100644 --- a/dom/interfaces/devicestorage/moz.build +++ b/dom/interfaces/devicestorage/moz.build @@ -13,3 +13,5 @@ XPIDL_MODULE = 'dom_devicestorage' MODULE = 'dom' +LIBXUL_LIBRARY = True + diff --git a/dom/ipc/Makefile.in b/dom/ipc/Makefile.in index 55535347622a..9f9528197d5f 100644 --- a/dom/ipc/Makefile.in +++ b/dom/ipc/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domipc_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/dom/ipc/moz.build b/dom/ipc/moz.build index b55c9588dba4..d39c49c27f0c 100644 --- a/dom/ipc/moz.build +++ b/dom/ipc/moz.build @@ -73,3 +73,5 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/media/Makefile.in b/dom/media/Makefile.in index a35ae6a06b30..fd340892975d 100644 --- a/dom/media/Makefile.in +++ b/dom/media/Makefile.in @@ -11,7 +11,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_media_s -LIBXUL_LIBRARY = 1 include $(topsrcdir)/dom/dom-config.mk diff --git a/dom/media/bridge/Makefile.in b/dom/media/bridge/Makefile.in index 522f88e75ca7..7a3160977712 100644 --- a/dom/media/bridge/Makefile.in +++ b/dom/media/bridge/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES += \ -I$(topsrcdir)/media/mtransport \ -I$(topsrcdir)/media/webrtc/signaling/include \ diff --git a/dom/media/bridge/moz.build b/dom/media/bridge/moz.build index 7777d8debd4b..1f04c1af70f5 100644 --- a/dom/media/bridge/moz.build +++ b/dom/media/bridge/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'peerconnection' +LIBXUL_LIBRARY = True + diff --git a/dom/media/moz.build b/dom/media/moz.build index 19c1ed8d6fa0..14cfc77d1d4e 100644 --- a/dom/media/moz.build +++ b/dom/media/moz.build @@ -34,3 +34,5 @@ EXTRA_COMPONENTS += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/mobilemessage/src/Makefile.in b/dom/mobilemessage/src/Makefile.in index 81fcd515b1c8..1018535453e1 100644 --- a/dom/mobilemessage/src/Makefile.in +++ b/dom/mobilemessage/src/Makefile.in @@ -22,7 +22,6 @@ endif LIBRARY_NAME = dom_mobilemessage_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/mobilemessage/src/moz.build b/dom/mobilemessage/src/moz.build index eaa7afc78b58..bf9293895598 100644 --- a/dom/mobilemessage/src/moz.build +++ b/dom/mobilemessage/src/moz.build @@ -81,3 +81,5 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/network/src/Makefile.in b/dom/network/src/Makefile.in index 43edada4d91d..597150cb3b18 100644 --- a/dom/network/src/Makefile.in +++ b/dom/network/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = $(srcdir) include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_network_s -LIBXUL_LIBRARY = 1 ifdef MOZ_B2G_RIL endif diff --git a/dom/network/src/moz.build b/dom/network/src/moz.build index 9cd72ee27909..25b67ec7cfa3 100644 --- a/dom/network/src/moz.build +++ b/dom/network/src/moz.build @@ -50,3 +50,5 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/plugins/base/Makefile.in b/dom/plugins/base/Makefile.in index 297d4dc3eab4..681faa449cb2 100644 --- a/dom/plugins/base/Makefile.in +++ b/dom/plugins/base/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkplugin MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - ifeq ($(MOZ_WIDGET_TOOLKIT),android) LOCAL_INCLUDES += -I$(topsrcdir)/dom/plugins/base/android endif diff --git a/dom/plugins/base/android/Makefile.in b/dom/plugins/base/android/Makefile.in index 06619495f910..93bea224b246 100644 --- a/dom/plugins/base/android/Makefile.in +++ b/dom/plugins/base/android/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkpluginandroid_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 LOCAL_INCLUDES += \ -I$(topsrcdir)/widget/android \ diff --git a/dom/plugins/base/android/moz.build b/dom/plugins/base/android/moz.build index e5f0cb78e473..27306f7560a0 100644 --- a/dom/plugins/base/android/moz.build +++ b/dom/plugins/base/android/moz.build @@ -27,3 +27,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/plugins/base/moz.build b/dom/plugins/base/moz.build index bbc2be278aa5..e8348b1fe935 100644 --- a/dom/plugins/base/moz.build +++ b/dom/plugins/base/moz.build @@ -94,3 +94,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': # using #defines, which results in Wswitch warnings in gcc-4.6. # Therefore, enable FAIL_ON_WARNINGS only on non-Android platforms. FAIL_ON_WARNINGS = True + +LIBXUL_LIBRARY = True + diff --git a/dom/plugins/ipc/Makefile.in b/dom/plugins/ipc/Makefile.in index 27a0000a88a9..7b0151a96ae1 100644 --- a/dom/plugins/ipc/Makefile.in +++ b/dom/plugins/ipc/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domplugins_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 ifeq (WINNT,$(OS_ARCH)) diff --git a/dom/plugins/ipc/moz.build b/dom/plugins/ipc/moz.build index 9242aeb3802b..191d6effa743 100644 --- a/dom/plugins/ipc/moz.build +++ b/dom/plugins/ipc/moz.build @@ -105,3 +105,5 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/power/Makefile.in b/dom/power/Makefile.in index 67c50e2f4af4..79d08580b10b 100644 --- a/dom/power/Makefile.in +++ b/dom/power/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_power_s -LIBXUL_LIBRARY = 1 include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/power/moz.build b/dom/power/moz.build index 8ea0bba66ef8..1162924a9d54 100644 --- a/dom/power/moz.build +++ b/dom/power/moz.build @@ -29,3 +29,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/promise/Makefile.in b/dom/promise/Makefile.in index 53a4599f3e1d..d920a5c8f2dc 100644 --- a/dom/promise/Makefile.in +++ b/dom/promise/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dompromise_s -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/workers \ -I$(topsrcdir)/dom/base \ diff --git a/dom/promise/moz.build b/dom/promise/moz.build index 160121e1c36b..59c29727ce88 100644 --- a/dom/promise/moz.build +++ b/dom/promise/moz.build @@ -23,3 +23,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/quota/Makefile.in b/dom/quota/Makefile.in index df9d6d9f1032..3d610b9563cc 100644 --- a/dom/quota/Makefile.in +++ b/dom/quota/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domquota_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/quota/moz.build b/dom/quota/moz.build index 0b68fce2450d..715f8b13ff30 100644 --- a/dom/quota/moz.build +++ b/dom/quota/moz.build @@ -41,3 +41,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/src/events/Makefile.in b/dom/src/events/Makefile.in index bf189dfd4651..12513cd838d4 100644 --- a/dom/src/events/Makefile.in +++ b/dom/src/events/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += -I$(topsrcdir)/dom/base diff --git a/dom/src/events/moz.build b/dom/src/events/moz.build index e046d2168cd4..b9874c2f34ec 100644 --- a/dom/src/events/moz.build +++ b/dom/src/events/moz.build @@ -14,3 +14,5 @@ LIBRARY_NAME = 'jsdomevents_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/src/geolocation/Makefile.in b/dom/src/geolocation/Makefile.in index 63520c4ab473..8414486bdaae 100644 --- a/dom/src/geolocation/Makefile.in +++ b/dom/src/geolocation/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = jsdomgeolocation_s -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/ipc \ diff --git a/dom/src/geolocation/moz.build b/dom/src/geolocation/moz.build index 17867530af1b..a8000c599cd8 100644 --- a/dom/src/geolocation/moz.build +++ b/dom/src/geolocation/moz.build @@ -18,3 +18,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/src/json/Makefile.in b/dom/src/json/Makefile.in index bc72b0033747..c69686fbe74e 100644 --- a/dom/src/json/Makefile.in +++ b/dom/src/json/Makefile.in @@ -9,8 +9,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../base \ -I$(topsrcdir)/content/events/src diff --git a/dom/src/json/moz.build b/dom/src/json/moz.build index cf5c434400a0..bd6446fc6062 100644 --- a/dom/src/json/moz.build +++ b/dom/src/json/moz.build @@ -20,3 +20,5 @@ LIBRARY_NAME = 'json_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/src/jsurl/Makefile.in b/dom/src/jsurl/Makefile.in index 35dab2853736..3451a229a38d 100644 --- a/dom/src/jsurl/Makefile.in +++ b/dom/src/jsurl/Makefile.in @@ -9,8 +9,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES += \ -I$(srcdir) \ -I$(topsrcdir)/dom/base \ diff --git a/dom/src/jsurl/moz.build b/dom/src/jsurl/moz.build index 14e764ec93d2..d405530d6bfa 100644 --- a/dom/src/jsurl/moz.build +++ b/dom/src/jsurl/moz.build @@ -20,3 +20,5 @@ LIBRARY_NAME = 'jsurl_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/src/notification/Makefile.in b/dom/src/notification/Makefile.in index 003c474164eb..a9a07c7d2921 100644 --- a/dom/src/notification/Makefile.in +++ b/dom/src/notification/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = jsdomnotification_s -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/dom/ipc \ diff --git a/dom/src/notification/moz.build b/dom/src/notification/moz.build index e15e448bf80c..4499653b931e 100644 --- a/dom/src/notification/moz.build +++ b/dom/src/notification/moz.build @@ -18,3 +18,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/src/offline/Makefile.in b/dom/src/offline/Makefile.in index 1db97b570c3c..75a44f151e42 100644 --- a/dom/src/offline/Makefile.in +++ b/dom/src/offline/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/content/base/src \ diff --git a/dom/src/offline/moz.build b/dom/src/offline/moz.build index 0bdb1402e251..7dac4c99525c 100644 --- a/dom/src/offline/moz.build +++ b/dom/src/offline/moz.build @@ -17,3 +17,5 @@ LIBRARY_NAME = 'jsdomoffline_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/src/storage/Makefile.in b/dom/src/storage/Makefile.in index fc524ee41003..021c558c897e 100644 --- a/dom/src/storage/Makefile.in +++ b/dom/src/storage/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = jsdomstorage_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/content/events/src diff --git a/dom/src/storage/moz.build b/dom/src/storage/moz.build index 942d85c55175..52a337c343cb 100644 --- a/dom/src/storage/moz.build +++ b/dom/src/storage/moz.build @@ -25,3 +25,5 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/system/Makefile.in b/dom/system/Makefile.in index 738667ac394e..ef32be70d7cc 100644 --- a/dom/system/Makefile.in +++ b/dom/system/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domsystem_s -LIBXUL_LIBRARY = 1 DEFINES += -DDLL_PREFIX=\"$(DLL_PREFIX)\" -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" # We fire the nsDOMDeviceAcceleration diff --git a/dom/system/android/Makefile.in b/dom/system/android/Makefile.in index 9c273aeed620..07c1d60363a1 100644 --- a/dom/system/android/Makefile.in +++ b/dom/system/android/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domsystemandroid_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 LOCAL_INCLUDES += -I$(topsrcdir)/dom/src/geolocation \ -I$(topsrcdir)/content/events/src diff --git a/dom/system/android/moz.build b/dom/system/android/moz.build index 94f68e676807..d493f3eef6af 100644 --- a/dom/system/android/moz.build +++ b/dom/system/android/moz.build @@ -13,3 +13,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/system/gonk/Makefile.in b/dom/system/gonk/Makefile.in index 322944de51f0..ebbbbf96ebf7 100644 --- a/dom/system/gonk/Makefile.in +++ b/dom/system/gonk/Makefile.in @@ -22,7 +22,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domsystemgonk_s -LIBXUL_LIBRARY = 1 include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/system/gonk/moz.build b/dom/system/gonk/moz.build index 777bde46117b..f6b3d3102dac 100644 --- a/dom/system/gonk/moz.build +++ b/dom/system/gonk/moz.build @@ -82,3 +82,5 @@ EXTRA_JS_MODULES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/system/mac/Makefile.in b/dom/system/mac/Makefile.in index 77be27439065..0b207e86ada4 100644 --- a/dom/system/mac/Makefile.in +++ b/dom/system/mac/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domsystemmac_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 LOCAL_INCLUDES += -I$(topsrcdir)/dom/src/geolocation \ $(NULL) diff --git a/dom/system/mac/moz.build b/dom/system/mac/moz.build index 417ce5b25c5f..53bf3cc29717 100644 --- a/dom/system/mac/moz.build +++ b/dom/system/mac/moz.build @@ -10,3 +10,5 @@ CMMSRCS += ['CoreLocationLocationProvider.mm'] FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/system/moz.build b/dom/system/moz.build index 5948c80c3030..53d359be2980 100644 --- a/dom/system/moz.build +++ b/dom/system/moz.build @@ -51,3 +51,5 @@ if CONFIG['OS_TARGET'] != 'Android' or CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk': FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/system/unix/Makefile.in b/dom/system/unix/Makefile.in index a15832e31d07..f36484c51441 100644 --- a/dom/system/unix/Makefile.in +++ b/dom/system/unix/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domsystemunix_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 ifdef MOZ_MAEMO_LIBLOCATION LOCAL_INCLUDES += $(MOZ_PLATFORM_MAEMO_CFLAGS) \ diff --git a/dom/system/unix/moz.build b/dom/system/unix/moz.build index cf8e10bda1b5..46525978247a 100644 --- a/dom/system/unix/moz.build +++ b/dom/system/unix/moz.build @@ -24,3 +24,5 @@ if CONFIG['MOZ_ENABLE_QTMOBILITY']: FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/system/windows/Makefile.in b/dom/system/windows/Makefile.in index 71dea5cbbffc..f42d6907e0e5 100644 --- a/dom/system/windows/Makefile.in +++ b/dom/system/windows/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domsystemwindows_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 # We fire the nsDOMDeviceAcceleration diff --git a/dom/system/windows/moz.build b/dom/system/windows/moz.build index 03a01af6ef2f..09bac1aa885f 100644 --- a/dom/system/windows/moz.build +++ b/dom/system/windows/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/telephony/Makefile.in b/dom/telephony/Makefile.in index 6753f22bfa2d..60f2ca436279 100644 --- a/dom/telephony/Makefile.in +++ b/dom/telephony/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domtelephony_s -LIBXUL_LIBRARY = 1 include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/telephony/moz.build b/dom/telephony/moz.build index 2be5c7040eee..0489b424bbac 100644 --- a/dom/telephony/moz.build +++ b/dom/telephony/moz.build @@ -22,3 +22,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/time/Makefile.in b/dom/time/Makefile.in index 3e2b7d63fa0f..4a4d6bb67417 100644 --- a/dom/time/Makefile.in +++ b/dom/time/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dom_time_s -LIBXUL_LIBRARY = 1 include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/time/moz.build b/dom/time/moz.build index 584338017020..001c8e1b1fe1 100644 --- a/dom/time/moz.build +++ b/dom/time/moz.build @@ -28,3 +28,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/voicemail/Makefile.in b/dom/voicemail/Makefile.in index cc0051de8368..001a90245539 100644 --- a/dom/voicemail/Makefile.in +++ b/dom/voicemail/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domvoicemail_s -LIBXUL_LIBRARY = 1 include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/voicemail/moz.build b/dom/voicemail/moz.build index 7fbb017f7fa2..c6fb68bc8ae9 100644 --- a/dom/voicemail/moz.build +++ b/dom/voicemail/moz.build @@ -25,3 +25,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/dom/wifi/Makefile.in b/dom/wifi/Makefile.in index 2f6515af6c6a..e8b4ad01492e 100644 --- a/dom/wifi/Makefile.in +++ b/dom/wifi/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domwifi_s -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/dom/dom-config.mk include $(topsrcdir)/config/rules.mk diff --git a/dom/wifi/moz.build b/dom/wifi/moz.build index 9a112308424d..f58793a08a7d 100644 --- a/dom/wifi/moz.build +++ b/dom/wifi/moz.build @@ -26,3 +26,5 @@ EXTRA_JS_MODULES += [ 'wifi_worker.js', ] +LIBXUL_LIBRARY = True + diff --git a/dom/workers/Makefile.in b/dom/workers/Makefile.in index 70dc38ad76cc..aaa967994152 100644 --- a/dom/workers/Makefile.in +++ b/dom/workers/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = \ -I$(topsrcdir)/content/base/src \ -I$(topsrcdir)/content/events/src \ diff --git a/dom/workers/moz.build b/dom/workers/moz.build index e6f4ab5e858d..1ee715dc9384 100644 --- a/dom/workers/moz.build +++ b/dom/workers/moz.build @@ -59,3 +59,5 @@ LIBRARY_NAME = 'domworkers_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/editor/composer/src/Makefile.in b/editor/composer/src/Makefile.in index abc5f9c9abe4..592154674c59 100644 --- a/editor/composer/src/Makefile.in +++ b/editor/composer/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk _FILES = \ diff --git a/editor/composer/src/moz.build b/editor/composer/src/moz.build index 2443ef42d71b..24d3748fe64b 100644 --- a/editor/composer/src/moz.build +++ b/editor/composer/src/moz.build @@ -21,3 +21,5 @@ LIBRARY_NAME = 'composer' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/editor/libeditor/base/Makefile.in b/editor/libeditor/base/Makefile.in index fb878d02469b..c140237a7b42 100644 --- a/editor/libeditor/base/Makefile.in +++ b/editor/libeditor/base/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES += \ -I$(topsrcdir)/editor/libeditor/text \ -I$(topsrcdir)/editor/txmgr/src \ diff --git a/editor/libeditor/base/moz.build b/editor/libeditor/base/moz.build index afc0f344ec34..6afad0b2cf34 100644 --- a/editor/libeditor/base/moz.build +++ b/editor/libeditor/base/moz.build @@ -37,3 +37,5 @@ LIBRARY_NAME = 'editorbase_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/editor/libeditor/html/Makefile.in b/editor/libeditor/html/Makefile.in index 0037b3268f95..cfa7e057d407 100644 --- a/editor/libeditor/html/Makefile.in +++ b/editor/libeditor/html/Makefile.in @@ -9,8 +9,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += -I$(topsrcdir)/editor/libeditor/base \ diff --git a/editor/libeditor/html/moz.build b/editor/libeditor/html/moz.build index 5aa17c00e765..b175d014769a 100644 --- a/editor/libeditor/html/moz.build +++ b/editor/libeditor/html/moz.build @@ -32,3 +32,5 @@ LIBRARY_NAME = 'htmleditor_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/editor/libeditor/text/Makefile.in b/editor/libeditor/text/Makefile.in index 66d795ff40b6..6de6eac10bf0 100644 --- a/editor/libeditor/text/Makefile.in +++ b/editor/libeditor/text/Makefile.in @@ -9,8 +9,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/editor/libeditor/text/moz.build b/editor/libeditor/text/moz.build index 4b486a5a7cb4..0d221320b717 100644 --- a/editor/libeditor/text/moz.build +++ b/editor/libeditor/text/moz.build @@ -21,3 +21,5 @@ LIBRARY_NAME = 'texteditor_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/editor/txmgr/src/Makefile.in b/editor/txmgr/src/Makefile.in index a321f55e4361..230e328fd409 100644 --- a/editor/txmgr/src/Makefile.in +++ b/editor/txmgr/src/Makefile.in @@ -10,8 +10,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - - include $(topsrcdir)/config/rules.mk diff --git a/editor/txmgr/src/moz.build b/editor/txmgr/src/moz.build index e4c2c638346a..83b59f2bf7a2 100644 --- a/editor/txmgr/src/moz.build +++ b/editor/txmgr/src/moz.build @@ -18,3 +18,5 @@ LIBRARY_NAME = 'txmgr' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/editor/txtsvc/src/Makefile.in b/editor/txtsvc/src/Makefile.in deleted file mode 100644 index fd85f0e763b2..000000000000 --- a/editor/txtsvc/src/Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 - - -include $(topsrcdir)/config/rules.mk - diff --git a/editor/txtsvc/src/moz.build b/editor/txtsvc/src/moz.build index 5ba96bbdcb1d..5498e0ce6178 100644 --- a/editor/txtsvc/src/moz.build +++ b/editor/txtsvc/src/moz.build @@ -15,3 +15,5 @@ LIBRARY_NAME = 'txtsvc_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/embedding/browser/build/Makefile.in b/embedding/browser/build/Makefile.in index 49971524f003..553c1109a444 100644 --- a/embedding/browser/build/Makefile.in +++ b/embedding/browser/build/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 SHARED_LIBRARY_LIBS= \ ../webBrowser/$(LIB_PREFIX)nsWebBrowser_s.$(LIB_SUFFIX) \ $(NULL) diff --git a/embedding/browser/build/moz.build b/embedding/browser/build/moz.build index 4cc6164e8222..1af4c98fcd1b 100644 --- a/embedding/browser/build/moz.build +++ b/embedding/browser/build/moz.build @@ -14,3 +14,5 @@ LIBRARY_NAME = 'webbrwsr' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/embedding/browser/webBrowser/Makefile.in b/embedding/browser/webBrowser/Makefile.in index 5c94410916a1..6eb70043309c 100644 --- a/embedding/browser/webBrowser/Makefile.in +++ b/embedding/browser/webBrowser/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = \ -I$(srcdir)/../../../content/base/src \ -I$(srcdir)/../../../content/svg/content/src \ diff --git a/embedding/browser/webBrowser/moz.build b/embedding/browser/webBrowser/moz.build index 5563abcaad9c..0e2ecf482da5 100644 --- a/embedding/browser/webBrowser/moz.build +++ b/embedding/browser/webBrowser/moz.build @@ -50,3 +50,5 @@ LIBRARY_NAME = 'nsWebBrowser_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/embedding/components/appstartup/src/Makefile.in b/embedding/components/appstartup/src/Makefile.in deleted file mode 100644 index 123dfb545230..000000000000 --- a/embedding/components/appstartup/src/Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 -include $(topsrcdir)/config/rules.mk - diff --git a/embedding/components/appstartup/src/moz.build b/embedding/components/appstartup/src/moz.build index 388155d7faa1..b0106e58edf7 100644 --- a/embedding/components/appstartup/src/moz.build +++ b/embedding/components/appstartup/src/moz.build @@ -18,3 +18,5 @@ LIBRARY_NAME = 'appstartupnotifier_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/embedding/components/build/Makefile.in b/embedding/components/build/Makefile.in index 248260521d92..d2e007471862 100644 --- a/embedding/components/build/Makefile.in +++ b/embedding/components/build/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 SHARED_LIBRARY_LIBS = \ ../windowwatcher/src/$(LIB_PREFIX)windowwatcher_s.$(LIB_SUFFIX) \ ../appstartup/src/$(LIB_PREFIX)appstartupnotifier_s.$(LIB_SUFFIX) \ diff --git a/embedding/components/build/moz.build b/embedding/components/build/moz.build index b84f5515f5f0..3f1637fdf42e 100644 --- a/embedding/components/build/moz.build +++ b/embedding/components/build/moz.build @@ -14,3 +14,5 @@ LIBRARY_NAME = 'embedcomponents' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/embedding/components/commandhandler/src/Makefile.in b/embedding/components/commandhandler/src/Makefile.in deleted file mode 100644 index 123dfb545230..000000000000 --- a/embedding/components/commandhandler/src/Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 -include $(topsrcdir)/config/rules.mk - diff --git a/embedding/components/commandhandler/src/moz.build b/embedding/components/commandhandler/src/moz.build index 6c1f1d52eadb..d1efd265beca 100644 --- a/embedding/components/commandhandler/src/moz.build +++ b/embedding/components/commandhandler/src/moz.build @@ -18,3 +18,5 @@ LIBRARY_NAME = 'commandhandler_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/embedding/components/find/src/Makefile.in b/embedding/components/find/src/Makefile.in deleted file mode 100644 index 123dfb545230..000000000000 --- a/embedding/components/find/src/Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 -include $(topsrcdir)/config/rules.mk - diff --git a/embedding/components/find/src/moz.build b/embedding/components/find/src/moz.build index 2b77111d5e97..6fdc232c0db1 100644 --- a/embedding/components/find/src/moz.build +++ b/embedding/components/find/src/moz.build @@ -15,3 +15,5 @@ LIBRARY_NAME = 'find_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/embedding/components/printingui/src/mac/Makefile.in b/embedding/components/printingui/src/mac/Makefile.in index d04671e0e073..94df80c131fb 100644 --- a/embedding/components/printingui/src/mac/Makefile.in +++ b/embedding/components/printingui/src/mac/Makefile.in @@ -11,7 +11,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = .. -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/printingui/src/mac/moz.build b/embedding/components/printingui/src/mac/moz.build index bd971567efa5..4432f8109985 100644 --- a/embedding/components/printingui/src/mac/moz.build +++ b/embedding/components/printingui/src/mac/moz.build @@ -19,3 +19,5 @@ CMMSRCS += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/embedding/components/printingui/src/os2/Makefile.in b/embedding/components/printingui/src/os2/Makefile.in index d04671e0e073..94df80c131fb 100644 --- a/embedding/components/printingui/src/os2/Makefile.in +++ b/embedding/components/printingui/src/os2/Makefile.in @@ -11,7 +11,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = .. -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/printingui/src/os2/moz.build b/embedding/components/printingui/src/os2/moz.build index e1747e7c85f8..07a76fe9e5e8 100644 --- a/embedding/components/printingui/src/os2/moz.build +++ b/embedding/components/printingui/src/os2/moz.build @@ -14,3 +14,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'printingui_s' +LIBXUL_LIBRARY = True + diff --git a/embedding/components/printingui/src/unixshared/Makefile.in b/embedding/components/printingui/src/unixshared/Makefile.in index 1fb1c3289500..94df80c131fb 100644 --- a/embedding/components/printingui/src/unixshared/Makefile.in +++ b/embedding/components/printingui/src/unixshared/Makefile.in @@ -11,6 +11,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = .. -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/printingui/src/unixshared/moz.build b/embedding/components/printingui/src/unixshared/moz.build index 04982c860cde..057579dfe771 100644 --- a/embedding/components/printingui/src/unixshared/moz.build +++ b/embedding/components/printingui/src/unixshared/moz.build @@ -16,3 +16,5 @@ LIBRARY_NAME = 'printingui_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/embedding/components/printingui/src/win/Makefile.in b/embedding/components/printingui/src/win/Makefile.in index 1fb1c3289500..94df80c131fb 100644 --- a/embedding/components/printingui/src/win/Makefile.in +++ b/embedding/components/printingui/src/win/Makefile.in @@ -11,6 +11,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = .. -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/embedding/components/printingui/src/win/moz.build b/embedding/components/printingui/src/win/moz.build index 9e108f31a6bf..d1e353a8251d 100644 --- a/embedding/components/printingui/src/win/moz.build +++ b/embedding/components/printingui/src/win/moz.build @@ -17,3 +17,5 @@ LIBRARY_NAME = 'printingui_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/embedding/components/webbrowserpersist/src/Makefile.in b/embedding/components/webbrowserpersist/src/Makefile.in index 6297c32482be..3beef4b0faea 100644 --- a/embedding/components/webbrowserpersist/src/Makefile.in +++ b/embedding/components/webbrowserpersist/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/embedding/components/webbrowserpersist/src/moz.build b/embedding/components/webbrowserpersist/src/moz.build index c6ebf92f0630..d6292112c5ad 100644 --- a/embedding/components/webbrowserpersist/src/moz.build +++ b/embedding/components/webbrowserpersist/src/moz.build @@ -14,3 +14,5 @@ LIBRARY_NAME = 'webbrowserpersist_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/embedding/components/windowwatcher/src/Makefile.in b/embedding/components/windowwatcher/src/Makefile.in index ea052094e060..c199269872e1 100644 --- a/embedding/components/windowwatcher/src/Makefile.in +++ b/embedding/components/windowwatcher/src/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - # For nsJSUtils LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/base \ diff --git a/embedding/components/windowwatcher/src/moz.build b/embedding/components/windowwatcher/src/moz.build index f50cf3870484..5eb2178997ac 100644 --- a/embedding/components/windowwatcher/src/moz.build +++ b/embedding/components/windowwatcher/src/moz.build @@ -20,3 +20,5 @@ LIBRARY_NAME = 'windowwatcher_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/extensions/auth/Makefile.in b/extensions/auth/Makefile.in index 3af6c3a539ca..d6e846e05ef7 100644 --- a/extensions/auth/Makefile.in +++ b/extensions/auth/Makefile.in @@ -11,9 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - - ifeq ($(OS_ARCH),WINNT) LOCAL_INCLUDES += -DUSE_SSPI endif diff --git a/extensions/auth/moz.build b/extensions/auth/moz.build index 665b2412f55a..9241af16d731 100644 --- a/extensions/auth/moz.build +++ b/extensions/auth/moz.build @@ -24,3 +24,5 @@ else: LIBRARY_NAME = 'auth' +LIBXUL_LIBRARY = True + diff --git a/extensions/cookie/Makefile.in b/extensions/cookie/Makefile.in index 3bc7c8db7aa8..1511be3376e0 100644 --- a/extensions/cookie/Makefile.in +++ b/extensions/cookie/Makefile.in @@ -13,7 +13,5 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = cookie MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/extensions/cookie/moz.build b/extensions/cookie/moz.build index fe4f120a29c2..6e7ada6b1bc4 100644 --- a/extensions/cookie/moz.build +++ b/extensions/cookie/moz.build @@ -22,3 +22,5 @@ CPP_SOURCES += [ 'nsPopupWindowManager.cpp', ] +LIBXUL_LIBRARY = True + diff --git a/extensions/gio/Makefile.in b/extensions/gio/Makefile.in index 8a6f73e6c6d0..f5a630c97d1f 100644 --- a/extensions/gio/Makefile.in +++ b/extensions/gio/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = $(MOZ_GIO_CFLAGS) include $(topsrcdir)/config/rules.mk diff --git a/extensions/gio/moz.build b/extensions/gio/moz.build index 78c2ad97e9bb..b54db3a28e7d 100644 --- a/extensions/gio/moz.build +++ b/extensions/gio/moz.build @@ -14,3 +14,5 @@ LIBRARY_NAME = 'nkgio' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/extensions/permissions/Makefile.in b/extensions/permissions/Makefile.in index 17e1f9677de2..3d29be25d141 100644 --- a/extensions/permissions/Makefile.in +++ b/extensions/permissions/Makefile.in @@ -10,7 +10,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - - include $(topsrcdir)/config/rules.mk diff --git a/extensions/permissions/moz.build b/extensions/permissions/moz.build index ff00f9080db1..f3de4dc334bd 100644 --- a/extensions/permissions/moz.build +++ b/extensions/permissions/moz.build @@ -13,3 +13,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'permissions' +LIBXUL_LIBRARY = True + diff --git a/extensions/pref/autoconfig/src/Makefile.in b/extensions/pref/autoconfig/src/Makefile.in index 93c3575e7866..fc7b8eff3b65 100644 --- a/extensions/pref/autoconfig/src/Makefile.in +++ b/extensions/pref/autoconfig/src/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = autoconfig EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - AUTOCFG_JS_EXPORTS = \ $(srcdir)/prefcalls.js \ $(NULL) diff --git a/extensions/pref/autoconfig/src/moz.build b/extensions/pref/autoconfig/src/moz.build index c6711d2c7e57..12d64e9aa300 100644 --- a/extensions/pref/autoconfig/src/moz.build +++ b/extensions/pref/autoconfig/src/moz.build @@ -13,3 +13,5 @@ CPP_SOURCES += [ 'nsReadConfig.cpp', ] +LIBXUL_LIBRARY = True + diff --git a/extensions/spellcheck/hunspell/src/Makefile.in b/extensions/spellcheck/hunspell/src/Makefile.in index 12625a2edb70..026922dd24d8 100644 --- a/extensions/spellcheck/hunspell/src/Makefile.in +++ b/extensions/spellcheck/hunspell/src/Makefile.in @@ -9,9 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - - ifndef MOZ_NATIVE_HUNSPELL # This variable is referenced in configure.in. Make sure to change that file # too if you need to change this variable. diff --git a/extensions/spellcheck/hunspell/src/moz.build b/extensions/spellcheck/hunspell/src/moz.build index 6a3c8836044b..ced362418909 100644 --- a/extensions/spellcheck/hunspell/src/moz.build +++ b/extensions/spellcheck/hunspell/src/moz.build @@ -28,3 +28,5 @@ if not CONFIG['MOZ_NATIVE_HUNSPELL']: LIBRARY_NAME = 'hunspell_s' +LIBXUL_LIBRARY = True + diff --git a/extensions/spellcheck/src/Makefile.in b/extensions/spellcheck/src/Makefile.in index 5f073439f042..83096b06e6b0 100644 --- a/extensions/spellcheck/src/Makefile.in +++ b/extensions/spellcheck/src/Makefile.in @@ -10,9 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - - SHARED_LIBRARY_LIBS += ../hunspell/src/$(LIB_PREFIX)hunspell_s.$(LIB_SUFFIX) include $(topsrcdir)/config/rules.mk diff --git a/extensions/spellcheck/src/moz.build b/extensions/spellcheck/src/moz.build index b74c6571e4a9..f53c7c20c79b 100644 --- a/extensions/spellcheck/src/moz.build +++ b/extensions/spellcheck/src/moz.build @@ -19,3 +19,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'spellchecker' +LIBXUL_LIBRARY = True + diff --git a/extensions/universalchardet/src/base/Makefile.in b/extensions/universalchardet/src/base/Makefile.in deleted file mode 100644 index 104378a1773a..000000000000 --- a/extensions/universalchardet/src/base/Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 - -include $(topsrcdir)/config/rules.mk diff --git a/extensions/universalchardet/src/base/moz.build b/extensions/universalchardet/src/base/moz.build index 79a3a88915f7..025fb948e0bd 100644 --- a/extensions/universalchardet/src/base/moz.build +++ b/extensions/universalchardet/src/base/moz.build @@ -36,3 +36,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'universalchardet_s' +LIBXUL_LIBRARY = True + diff --git a/extensions/universalchardet/src/xpcom/Makefile.in b/extensions/universalchardet/src/xpcom/Makefile.in index d6a8ca0043e0..50cdbe77134b 100644 --- a/extensions/universalchardet/src/xpcom/Makefile.in +++ b/extensions/universalchardet/src/xpcom/Makefile.in @@ -11,8 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES = -I$(srcdir)/../base SHARED_LIBRARY_LIBS = \ diff --git a/extensions/universalchardet/src/xpcom/moz.build b/extensions/universalchardet/src/xpcom/moz.build index 2402e9c0cef4..3697b41c9065 100644 --- a/extensions/universalchardet/src/xpcom/moz.build +++ b/extensions/universalchardet/src/xpcom/moz.build @@ -13,3 +13,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'universalchardet' +LIBXUL_LIBRARY = True + From 1c4d224f0e550fee2ef56d0fca234ab589a47cdc Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:56:00 +0200 Subject: [PATCH 65/79] Bug 883284 - Part d: Move LIBXUL_LIBRARY into moz.build (f-j); r=bsmedberg --- gfx/2d/Makefile.in | 1 - gfx/2d/moz.build | 4 +++- gfx/angle/Makefile.in | 1 - gfx/angle/moz.build | 2 ++ gfx/cairo/cairo/src/Makefile.in | 2 -- gfx/cairo/cairo/src/moz.build | 2 ++ gfx/cairo/libpixman/src/Makefile.in | 2 -- gfx/cairo/libpixman/src/moz.build | 3 +++ gfx/gl/Makefile.in | 1 - gfx/gl/moz.build | 2 ++ gfx/ipc/Makefile.in | 1 - gfx/ipc/moz.build | 2 ++ gfx/layers/Makefile.in | 2 -- gfx/layers/moz.build | 3 +++ gfx/qcms/Makefile.in | 2 -- gfx/qcms/moz.build | 2 ++ gfx/skia/Makefile.in | 1 - gfx/skia/moz.build | 2 ++ gfx/src/Makefile.in | 1 - gfx/src/moz.build | 2 ++ gfx/tests/gtest/Makefile.in | 1 - gfx/tests/gtest/moz.build | 3 +++ gfx/thebes/Makefile.in | 1 - gfx/thebes/moz.build | 4 +++- gfx/ycbcr/Makefile.in | 1 - gfx/ycbcr/moz.build | 2 ++ hal/Makefile.in | 1 - hal/moz.build | 2 ++ image/build/Makefile.in | 1 - image/build/moz.build | 2 ++ image/decoders/Makefile.in | 1 - image/decoders/icon/Makefile.in | 1 - image/decoders/icon/android/Makefile.in | 1 - image/decoders/icon/android/moz.build | 2 ++ image/decoders/icon/gtk/Makefile.in | 1 - image/decoders/icon/gtk/moz.build | 2 ++ image/decoders/icon/mac/Makefile.in | 13 ------------- image/decoders/icon/mac/moz.build | 2 ++ image/decoders/icon/moz.build | 2 ++ image/decoders/icon/os2/Makefile.in | 16 ---------------- image/decoders/icon/os2/moz.build | 2 ++ image/decoders/icon/qt/Makefile.in | 3 --- image/decoders/icon/qt/moz.build | 2 ++ image/decoders/icon/win/Makefile.in | 15 --------------- image/decoders/icon/win/moz.build | 2 ++ image/decoders/moz.build | 2 ++ image/encoders/bmp/Makefile.in | 1 - image/encoders/bmp/moz.build | 2 ++ image/encoders/ico/Makefile.in | 2 -- image/encoders/ico/moz.build | 2 ++ image/encoders/jpeg/Makefile.in | 15 --------------- image/encoders/jpeg/moz.build | 2 ++ image/encoders/png/Makefile.in | 1 - image/encoders/png/moz.build | 2 ++ image/src/Makefile.in | 1 - image/src/moz.build | 2 ++ intl/build/Makefile.in | 1 - intl/build/moz.build | 2 ++ intl/chardet/src/Makefile.in | 3 --- intl/chardet/src/moz.build | 2 ++ intl/hyphenation/src/Makefile.in | 2 -- intl/hyphenation/src/moz.build | 2 ++ intl/locale/src/Makefile.in | 2 -- intl/locale/src/mac/Makefile.in | 3 --- intl/locale/src/mac/moz.build | 2 ++ intl/locale/src/moz.build | 3 +++ intl/locale/src/os2/Makefile.in | 3 --- intl/locale/src/os2/moz.build | 2 ++ intl/locale/src/unix/Makefile.in | 2 -- intl/locale/src/unix/moz.build | 2 ++ intl/locale/src/windows/Makefile.in | 3 --- intl/locale/src/windows/moz.build | 2 ++ intl/lwbrk/src/Makefile.in | 3 --- intl/lwbrk/src/moz.build | 2 ++ intl/strres/src/Makefile.in | 3 --- intl/strres/src/moz.build | 2 ++ intl/uconv/src/Makefile.in | 2 -- intl/uconv/src/moz.build | 2 ++ intl/uconv/ucvcn/Makefile.in | 3 --- intl/uconv/ucvcn/moz.build | 2 ++ intl/uconv/ucvibm/Makefile.in | 2 -- intl/uconv/ucvibm/moz.build | 2 ++ intl/uconv/ucvja/Makefile.in | 3 --- intl/uconv/ucvja/moz.build | 2 ++ intl/uconv/ucvko/Makefile.in | 3 --- intl/uconv/ucvko/moz.build | 2 ++ intl/uconv/ucvlatin/Makefile.in | 3 --- intl/uconv/ucvlatin/moz.build | 2 ++ intl/uconv/ucvtw/Makefile.in | 3 --- intl/uconv/ucvtw/moz.build | 2 ++ intl/uconv/ucvtw2/Makefile.in | 3 --- intl/uconv/ucvtw2/moz.build | 2 ++ intl/uconv/util/Makefile.in | 2 -- intl/uconv/util/moz.build | 2 ++ intl/unicharutil/src/Makefile.in | 15 --------------- intl/unicharutil/src/moz.build | 2 ++ ipc/chromium/Makefile.in | 1 - ipc/chromium/moz.build | 3 +++ ipc/dbus/Makefile.in | 1 - ipc/dbus/moz.build | 2 ++ ipc/glue/Makefile.in | 1 - ipc/glue/moz.build | 3 +++ ipc/ipdl/Makefile.in | 1 - ipc/ipdl/moz.build | 3 +++ ipc/ipdl/test/cxx/Makefile.in | 1 - ipc/ipdl/test/cxx/moz.build | 3 +++ ipc/netd/Makefile.in | 1 - ipc/netd/moz.build | 2 ++ ipc/nfc/Makefile.in | 1 - ipc/nfc/moz.build | 3 +++ ipc/ril/Makefile.in | 1 - ipc/ril/moz.build | 2 ++ ipc/testshell/Makefile.in | 1 - ipc/testshell/moz.build | 2 ++ ipc/unixsocket/Makefile.in | 1 - ipc/unixsocket/moz.build | 2 ++ js/ductwork/debugger/Makefile.in | 1 - js/ductwork/debugger/moz.build | 3 +++ js/ipc/Makefile.in | 1 - js/ipc/moz.build | 2 ++ js/jsd/Makefile.in | 2 -- js/jsd/moz.build | 2 ++ js/xpconnect/loader/Makefile.in | 1 - js/xpconnect/loader/moz.build | 2 ++ js/xpconnect/src/Makefile.in | 1 - js/xpconnect/src/moz.build | 2 ++ js/xpconnect/wrappers/Makefile.in | 2 -- js/xpconnect/wrappers/moz.build | 3 +++ 128 files changed, 141 insertions(+), 174 deletions(-) delete mode 100644 image/decoders/icon/mac/Makefile.in delete mode 100644 image/decoders/icon/os2/Makefile.in delete mode 100644 image/decoders/icon/win/Makefile.in delete mode 100644 image/encoders/jpeg/Makefile.in delete mode 100644 intl/unicharutil/src/Makefile.in diff --git a/gfx/2d/Makefile.in b/gfx/2d/Makefile.in index 9f9b39c63af8..7c372ad6eaa7 100644 --- a/gfx/2d/Makefile.in +++ b/gfx/2d/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gfx2d MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 DEFINES += -DMOZ_GFX -DUSE_CAIRO -DGFX2D_INTERNAL diff --git a/gfx/2d/moz.build b/gfx/2d/moz.build index 4f5e45e84624..ad129782d11d 100644 --- a/gfx/2d/moz.build +++ b/gfx/2d/moz.build @@ -97,8 +97,10 @@ CPP_SOURCES += [ 'SourceSurfaceRawData.cpp', ] - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': CMMSRCS += [ 'QuartzSupport.mm', ] + +LIBXUL_LIBRARY = True + diff --git a/gfx/angle/Makefile.in b/gfx/angle/Makefile.in index 103d8955de42..444a053ba99a 100644 --- a/gfx/angle/Makefile.in +++ b/gfx/angle/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = endif diff --git a/gfx/angle/moz.build b/gfx/angle/moz.build index 61aa04386a3a..2ca5198fd098 100644 --- a/gfx/angle/moz.build +++ b/gfx/angle/moz.build @@ -110,3 +110,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'angle' +LIBXUL_LIBRARY = True + diff --git a/gfx/cairo/cairo/src/Makefile.in b/gfx/cairo/cairo/src/Makefile.in index 2950ba2306eb..4955ccadb73b 100644 --- a/gfx/cairo/cairo/src/Makefile.in +++ b/gfx/cairo/cairo/src/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - ifdef GNU_CC ifeq ($(OS_TARGET),Android) MODULE_OPTIMIZE_FLAGS = -O2 diff --git a/gfx/cairo/cairo/src/moz.build b/gfx/cairo/cairo/src/moz.build index c7528a50bcdc..a9e7cf6eaa7d 100644 --- a/gfx/cairo/cairo/src/moz.build +++ b/gfx/cairo/cairo/src/moz.build @@ -80,3 +80,5 @@ if CONFIG['MOZ_ENABLE_CAIRO_FT']: LIBRARY_NAME = 'mozcairo' +LIBXUL_LIBRARY = True + diff --git a/gfx/cairo/libpixman/src/Makefile.in b/gfx/cairo/libpixman/src/Makefile.in index 7cad93a6d193..8878266d5715 100644 --- a/gfx/cairo/libpixman/src/Makefile.in +++ b/gfx/cairo/libpixman/src/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = mozlibpixman MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - ifeq ($(OS_TARGET),Android) MODULE_OPTIMIZE_FLAGS = -O2 endif diff --git a/gfx/cairo/libpixman/src/moz.build b/gfx/cairo/libpixman/src/moz.build index 98a5db5c6c9c..a770caf77d11 100644 --- a/gfx/cairo/libpixman/src/moz.build +++ b/gfx/cairo/libpixman/src/moz.build @@ -26,3 +26,6 @@ if CONFIG['OS_ARCH'] != 'Darwin' and CONFIG['GNU_CC']: 'pixman-arm-simd-asm-scaled.S', 'pixman-arm-simd-asm.S', ] + +LIBXUL_LIBRARY = True + diff --git a/gfx/gl/Makefile.in b/gfx/gl/Makefile.in index 21c2f6469317..db8a207ab7e1 100644 --- a/gfx/gl/Makefile.in +++ b/gfx/gl/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gl MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 ifeq ($(MOZ_WIDGET_TOOLKIT),windows) ifdef MOZ_WEBGL diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build index 0a97149ab678..8d06edcdef1b 100644 --- a/gfx/gl/moz.build +++ b/gfx/gl/moz.build @@ -116,3 +116,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/gfx/ipc/Makefile.in b/gfx/ipc/Makefile.in index 9264a35c4ffb..0fba90e60d3b 100644 --- a/gfx/ipc/Makefile.in +++ b/gfx/ipc/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gfxipc_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/gfx/ipc/moz.build b/gfx/ipc/moz.build index 999b459bc1de..05bbd3f66946 100644 --- a/gfx/ipc/moz.build +++ b/gfx/ipc/moz.build @@ -28,3 +28,5 @@ CPP_SOURCES += [ 'SharedDIB.cpp', ] +LIBXUL_LIBRARY = True + diff --git a/gfx/layers/Makefile.in b/gfx/layers/Makefile.in index 513a932751e0..7373d46d505c 100644 --- a/gfx/layers/Makefile.in +++ b/gfx/layers/Makefile.in @@ -22,8 +22,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = layers MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - ifdef MOZ_DEBUG DEFINES += -DD3D_DEBUG_INFO endif diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build index fb6d832f5d90..2e300f5c864e 100644 --- a/gfx/layers/moz.build +++ b/gfx/layers/moz.build @@ -267,3 +267,6 @@ IPDL_SOURCES = [ 'ipc/PLayer.ipdl', 'ipc/PLayerTransaction.ipdl', ] + +LIBXUL_LIBRARY = True + diff --git a/gfx/qcms/Makefile.in b/gfx/qcms/Makefile.in index 1bf4698994a0..e58b764e0032 100644 --- a/gfx/qcms/Makefile.in +++ b/gfx/qcms/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - CSRCS = \ chain.c \ iccread.c \ diff --git a/gfx/qcms/moz.build b/gfx/qcms/moz.build index 85efae9d548f..4930eb051f4a 100644 --- a/gfx/qcms/moz.build +++ b/gfx/qcms/moz.build @@ -13,3 +13,5 @@ EXPORTS += [ LIBRARY_NAME = 'mozqcms' +LIBXUL_LIBRARY = True + diff --git a/gfx/skia/Makefile.in b/gfx/skia/Makefile.in index a577f42ba62f..92a22527b2d0 100644 --- a/gfx/skia/Makefile.in +++ b/gfx/skia/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 DEFINES += -DSK_A32_SHIFT=24 -DSK_R32_SHIFT=16 -DSK_G32_SHIFT=8 -DSK_B32_SHIFT=0 diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build index 99bc7b0a5e0e..dca4227bbfce 100644 --- a/gfx/skia/moz.build +++ b/gfx/skia/moz.build @@ -549,3 +549,5 @@ if not CONFIG['INTEL_ARCHITECTURE'] and CONFIG['CPU_ARCH'] == 'arm' and CONFIG[' LIBRARY_NAME = 'skia' +LIBXUL_LIBRARY = True + diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in index bb0d1984ceaa..bfc02f47482f 100644 --- a/gfx/src/Makefile.in +++ b/gfx/src/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS) diff --git a/gfx/src/moz.build b/gfx/src/moz.build index 8237e4305bec..a470fd72d5d7 100644 --- a/gfx/src/moz.build +++ b/gfx/src/moz.build @@ -59,3 +59,5 @@ LIBRARY_NAME = 'gkgfx' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/gfx/tests/gtest/Makefile.in b/gfx/tests/gtest/Makefile.in index 8b5a61201cf1..34bf9654a9b2 100644 --- a/gfx/tests/gtest/Makefile.in +++ b/gfx/tests/gtest/Makefile.in @@ -14,7 +14,6 @@ include $(DEPTH)/config/autoconf.mk CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) $(TK_CFLAGS) # Create a GTest library -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 LOCAL_INCLUDES = \ diff --git a/gfx/tests/gtest/moz.build b/gfx/tests/gtest/moz.build index 1922acb2b964..95d1af04f27e 100644 --- a/gfx/tests/gtest/moz.build +++ b/gfx/tests/gtest/moz.build @@ -32,3 +32,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'windows': 'TestPoint.cpp', 'TestScaling.cpp', ] + +LIBXUL_LIBRARY = True + diff --git a/gfx/thebes/Makefile.in b/gfx/thebes/Makefile.in index 7b9bb8eb6ff1..846e32ab1a38 100644 --- a/gfx/thebes/Makefile.in +++ b/gfx/thebes/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = thebes MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 # gfxSVGGlyphs needs nsDOMParser.h diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build index 85ac6d683fa0..cadc25d1530e 100644 --- a/gfx/thebes/moz.build +++ b/gfx/thebes/moz.build @@ -263,10 +263,12 @@ CPP_SOURCES += [ 'nsSurfaceTexture.cpp', ] - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': CMMSRCS += [ 'gfxMacPlatformFontList.mm', ] FAIL_ON_WARNINGS = not CONFIG['_MSC_VER'] + +LIBXUL_LIBRARY = True + diff --git a/gfx/ycbcr/Makefile.in b/gfx/ycbcr/Makefile.in index c800ccf8b2d9..dde0947edd09 100644 --- a/gfx/ycbcr/Makefile.in +++ b/gfx/ycbcr/Makefile.in @@ -5,7 +5,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/gfx/ycbcr/moz.build b/gfx/ycbcr/moz.build index a71ce6c06477..6507f55deb10 100644 --- a/gfx/ycbcr/moz.build +++ b/gfx/ycbcr/moz.build @@ -71,3 +71,5 @@ if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['HAVE_ARM_NEON']: LIBRARY_NAME = 'ycbcr' +LIBXUL_LIBRARY = True + diff --git a/hal/Makefile.in b/hal/Makefile.in index b47a0c721184..2ab608b37820 100644 --- a/hal/Makefile.in +++ b/hal/Makefile.in @@ -22,7 +22,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = hal_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 MOCHITEST_BROWSER_FILES += \ tests/browser_alarms.js \ diff --git a/hal/moz.build b/hal/moz.build index d8d384072aa3..386a01663b1c 100644 --- a/hal/moz.build +++ b/hal/moz.build @@ -152,3 +152,5 @@ IPDL_SOURCES = [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/image/build/Makefile.in b/image/build/Makefile.in index 290ba3cff958..7f4cb4668982 100644 --- a/image/build/Makefile.in +++ b/image/build/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = \ -I. \ -I$(srcdir)/../src \ diff --git a/image/build/moz.build b/image/build/moz.build index 4f58423f17bf..81cf0b4afa87 100644 --- a/image/build/moz.build +++ b/image/build/moz.build @@ -14,3 +14,5 @@ LIBRARY_NAME = 'imglib2' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/image/decoders/Makefile.in b/image/decoders/Makefile.in index e8ace735d4d4..f00741ef3106 100644 --- a/image/decoders/Makefile.in +++ b/image/decoders/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 CSRCS = iccjpeg.c \ $(NULL) diff --git a/image/decoders/icon/Makefile.in b/image/decoders/icon/Makefile.in index c2fc4ca6e104..819ac56dd687 100644 --- a/image/decoders/icon/Makefile.in +++ b/image/decoders/icon/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 ifdef MOZ_WIDGET_GTK PLATFORM = gtk diff --git a/image/decoders/icon/android/Makefile.in b/image/decoders/icon/android/Makefile.in index 230394f1a8cf..eeaa3db2cb3b 100644 --- a/image/decoders/icon/android/Makefile.in +++ b/image/decoders/icon/android/Makefile.in @@ -10,6 +10,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = imgiconandroid_s -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/image/decoders/icon/android/moz.build b/image/decoders/icon/android/moz.build index 217f2a028d0a..18587733662f 100644 --- a/image/decoders/icon/android/moz.build +++ b/image/decoders/icon/android/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/image/decoders/icon/gtk/Makefile.in b/image/decoders/icon/gtk/Makefile.in index 503610e62a75..fa149a883cc2 100644 --- a/image/decoders/icon/gtk/Makefile.in +++ b/image/decoders/icon/gtk/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 ifdef MOZ_ENABLE_GNOMEUI LOCAL_INCLUDES += $(MOZ_GNOMEUI_CFLAGS) else diff --git a/image/decoders/icon/gtk/moz.build b/image/decoders/icon/gtk/moz.build index 7c817290a0aa..02c7e8512bae 100644 --- a/image/decoders/icon/gtk/moz.build +++ b/image/decoders/icon/gtk/moz.build @@ -14,3 +14,5 @@ LIBRARY_NAME = 'imgicongtk_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/image/decoders/icon/mac/Makefile.in b/image/decoders/icon/mac/Makefile.in deleted file mode 100644 index 5656cfbb757d..000000000000 --- a/image/decoders/icon/mac/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 -include $(topsrcdir)/config/rules.mk diff --git a/image/decoders/icon/mac/moz.build b/image/decoders/icon/mac/moz.build index 6669f4354636..d82eb56b2c3f 100644 --- a/image/decoders/icon/mac/moz.build +++ b/image/decoders/icon/mac/moz.build @@ -14,3 +14,5 @@ CMMSRCS += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/image/decoders/icon/moz.build b/image/decoders/icon/moz.build index 649473897aa5..3bfabb9220bd 100644 --- a/image/decoders/icon/moz.build +++ b/image/decoders/icon/moz.build @@ -20,3 +20,5 @@ LIBRARY_NAME = 'imgicon' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/image/decoders/icon/os2/Makefile.in b/image/decoders/icon/os2/Makefile.in deleted file mode 100644 index 091686b75ba4..000000000000 --- a/image/decoders/icon/os2/Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 - -include $(topsrcdir)/config/rules.mk - diff --git a/image/decoders/icon/os2/moz.build b/image/decoders/icon/os2/moz.build index 4e03b68de69d..3402306ec035 100644 --- a/image/decoders/icon/os2/moz.build +++ b/image/decoders/icon/os2/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'imgiconos2_s' +LIBXUL_LIBRARY = True + diff --git a/image/decoders/icon/qt/Makefile.in b/image/decoders/icon/qt/Makefile.in index 23e852f5d334..f6f6be105e51 100644 --- a/image/decoders/icon/qt/Makefile.in +++ b/image/decoders/icon/qt/Makefile.in @@ -9,9 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - - LOCAL_INCLUDES += $(MOZ_QT_CFLAGS) include $(topsrcdir)/config/rules.mk diff --git a/image/decoders/icon/qt/moz.build b/image/decoders/icon/qt/moz.build index 5b01072fdc40..7b8bead4634e 100644 --- a/image/decoders/icon/qt/moz.build +++ b/image/decoders/icon/qt/moz.build @@ -22,3 +22,5 @@ EXTRA_PP_COMPONENTS += [ LIBRARY_NAME = 'imgiconqt_s' +LIBXUL_LIBRARY = True + diff --git a/image/decoders/icon/win/Makefile.in b/image/decoders/icon/win/Makefile.in deleted file mode 100644 index a819b1fdcba0..000000000000 --- a/image/decoders/icon/win/Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 -include $(topsrcdir)/config/rules.mk - diff --git a/image/decoders/icon/win/moz.build b/image/decoders/icon/win/moz.build index 886b42b05ad8..91d8f19181ba 100644 --- a/image/decoders/icon/win/moz.build +++ b/image/decoders/icon/win/moz.build @@ -14,3 +14,5 @@ LIBRARY_NAME = 'imgiconwin_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/image/decoders/moz.build b/image/decoders/moz.build index 4c520e6bea1d..c9e80a84800e 100644 --- a/image/decoders/moz.build +++ b/image/decoders/moz.build @@ -38,3 +38,5 @@ LIBRARY_NAME = 'imgdecoders_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/image/encoders/bmp/Makefile.in b/image/encoders/bmp/Makefile.in index df81ef0f7c04..52ec2fb1cb10 100644 --- a/image/encoders/bmp/Makefile.in +++ b/image/encoders/bmp/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES += -I$(topsrcdir)/image/src/ include $(topsrcdir)/config/rules.mk diff --git a/image/encoders/bmp/moz.build b/image/encoders/bmp/moz.build index c77ab50419ed..35ae8ac4cf5f 100644 --- a/image/encoders/bmp/moz.build +++ b/image/encoders/bmp/moz.build @@ -14,3 +14,5 @@ LIBRARY_NAME = 'imgbmpe_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/image/encoders/ico/Makefile.in b/image/encoders/ico/Makefile.in index 65ecef1f80ab..613a91c2a8c0 100644 --- a/image/encoders/ico/Makefile.in +++ b/image/encoders/ico/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - # Decoders need RasterImage.h LOCAL_INCLUDES += -I$(topsrcdir)/image/src/ LOCAL_INCLUDES += -I$(topsrcdir)/image/encoders/bmp/ diff --git a/image/encoders/ico/moz.build b/image/encoders/ico/moz.build index 1008014be4df..80dba5e89e7f 100644 --- a/image/encoders/ico/moz.build +++ b/image/encoders/ico/moz.build @@ -14,3 +14,5 @@ LIBRARY_NAME = 'imgicoe_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/image/encoders/jpeg/Makefile.in b/image/encoders/jpeg/Makefile.in deleted file mode 100644 index 7051ddb33b26..000000000000 --- a/image/encoders/jpeg/Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 -include $(topsrcdir)/config/rules.mk - - diff --git a/image/encoders/jpeg/moz.build b/image/encoders/jpeg/moz.build index a102612f17a2..42b450b52460 100644 --- a/image/encoders/jpeg/moz.build +++ b/image/encoders/jpeg/moz.build @@ -14,3 +14,5 @@ LIBRARY_NAME = 'imgjpege_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/image/encoders/png/Makefile.in b/image/encoders/png/Makefile.in index acfb35f16400..2bb1a80ada2c 100644 --- a/image/encoders/png/Makefile.in +++ b/image/encoders/png/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 DEFINES += -DMOZ_PNG_WRITE \ -DMOZ_PNG_READ \ $(NULL) diff --git a/image/encoders/png/moz.build b/image/encoders/png/moz.build index 115220fdf82d..51c35b04931f 100644 --- a/image/encoders/png/moz.build +++ b/image/encoders/png/moz.build @@ -14,3 +14,5 @@ LIBRARY_NAME = 'imgpnge_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/image/src/Makefile.in b/image/src/Makefile.in index e51378a2b7d3..0d9a8e0667e9 100644 --- a/image/src/Makefile.in +++ b/image/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = imglib2_s -LIBXUL_LIBRARY = 1 # We need to instantiate the decoders LOCAL_INCLUDES += -I$(topsrcdir)/image/decoders diff --git a/image/src/moz.build b/image/src/moz.build index 2257cbb7faf6..845b1e5ec427 100644 --- a/image/src/moz.build +++ b/image/src/moz.build @@ -40,3 +40,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/intl/build/Makefile.in b/intl/build/Makefile.in index 48df13342e5c..e3bd610b8793 100644 --- a/intl/build/Makefile.in +++ b/intl/build/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 # see also intl/locale/src/Makefile.in ifneq (,$(filter os2 windows, $(MOZ_WIDGET_TOOLKIT))) diff --git a/intl/build/moz.build b/intl/build/moz.build index 05825b83aa60..da71409898ca 100644 --- a/intl/build/moz.build +++ b/intl/build/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'i18n' +LIBXUL_LIBRARY = True + diff --git a/intl/chardet/src/Makefile.in b/intl/chardet/src/Makefile.in index 71764eeaba9c..7cd163587f08 100644 --- a/intl/chardet/src/Makefile.in +++ b/intl/chardet/src/Makefile.in @@ -11,7 +11,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - - include $(topsrcdir)/config/rules.mk diff --git a/intl/chardet/src/moz.build b/intl/chardet/src/moz.build index cfdea4b5dfe2..278f111d16d2 100644 --- a/intl/chardet/src/moz.build +++ b/intl/chardet/src/moz.build @@ -13,3 +13,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'chardet' +LIBXUL_LIBRARY = True + diff --git a/intl/hyphenation/src/Makefile.in b/intl/hyphenation/src/Makefile.in index fac4d0a024c8..d7ebae8c79f7 100644 --- a/intl/hyphenation/src/Makefile.in +++ b/intl/hyphenation/src/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - CSRCS = hyphen.c \ $(NULL) diff --git a/intl/hyphenation/src/moz.build b/intl/hyphenation/src/moz.build index d24ed9f9b42a..317573ae57d1 100644 --- a/intl/hyphenation/src/moz.build +++ b/intl/hyphenation/src/moz.build @@ -14,3 +14,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'hyphenation_s' +LIBXUL_LIBRARY = True + diff --git a/intl/locale/src/Makefile.in b/intl/locale/src/Makefile.in index 34d548b5e122..9a53d30c0b61 100644 --- a/intl/locale/src/Makefile.in +++ b/intl/locale/src/Makefile.in @@ -11,8 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - ifeq ($(MOZ_WIDGET_TOOLKIT), qt) OS_INCLUDES += $(MOZ_QT_CFLAGS) endif diff --git a/intl/locale/src/mac/Makefile.in b/intl/locale/src/mac/Makefile.in index 40133bb53267..170eb4439f77 100644 --- a/intl/locale/src/mac/Makefile.in +++ b/intl/locale/src/mac/Makefile.in @@ -9,9 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - - include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/.. diff --git a/intl/locale/src/mac/moz.build b/intl/locale/src/mac/moz.build index b0cad6445f84..bcbd63eaa35b 100644 --- a/intl/locale/src/mac/moz.build +++ b/intl/locale/src/mac/moz.build @@ -14,3 +14,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'platlocale_s' +LIBXUL_LIBRARY = True + diff --git a/intl/locale/src/moz.build b/intl/locale/src/moz.build index f029a1ee34f0..d7950e1d9b4e 100644 --- a/intl/locale/src/moz.build +++ b/intl/locale/src/moz.build @@ -34,3 +34,6 @@ LIBRARY_NAME = 'nslocale_s' EXTRA_JS_MODULES += [ 'PluralForm.jsm', ] + +LIBXUL_LIBRARY = True + diff --git a/intl/locale/src/os2/Makefile.in b/intl/locale/src/os2/Makefile.in index 40e7f3a1cfcb..4c7b1925769d 100644 --- a/intl/locale/src/os2/Makefile.in +++ b/intl/locale/src/os2/Makefile.in @@ -11,9 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - - include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/.. diff --git a/intl/locale/src/os2/moz.build b/intl/locale/src/os2/moz.build index a59ed2a29028..15776f3b379d 100644 --- a/intl/locale/src/os2/moz.build +++ b/intl/locale/src/os2/moz.build @@ -15,3 +15,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'platlocale_s' +LIBXUL_LIBRARY = True + diff --git a/intl/locale/src/unix/Makefile.in b/intl/locale/src/unix/Makefile.in index 02eec2debe50..cd8fc6a9f664 100644 --- a/intl/locale/src/unix/Makefile.in +++ b/intl/locale/src/unix/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/.. diff --git a/intl/locale/src/unix/moz.build b/intl/locale/src/unix/moz.build index 8d055e756eaa..dc01163f0649 100644 --- a/intl/locale/src/unix/moz.build +++ b/intl/locale/src/unix/moz.build @@ -23,3 +23,5 @@ else: LIBRARY_NAME = 'platlocale_s' +LIBXUL_LIBRARY = True + diff --git a/intl/locale/src/windows/Makefile.in b/intl/locale/src/windows/Makefile.in index 491834017aef..596b7dfd724e 100644 --- a/intl/locale/src/windows/Makefile.in +++ b/intl/locale/src/windows/Makefile.in @@ -10,9 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - - include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/.. diff --git a/intl/locale/src/windows/moz.build b/intl/locale/src/windows/moz.build index 5c879ec11e04..f5def36f3f15 100644 --- a/intl/locale/src/windows/moz.build +++ b/intl/locale/src/windows/moz.build @@ -15,3 +15,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'platlocale_s' +LIBXUL_LIBRARY = True + diff --git a/intl/lwbrk/src/Makefile.in b/intl/lwbrk/src/Makefile.in index bc3186681768..6324825dd8e8 100644 --- a/intl/lwbrk/src/Makefile.in +++ b/intl/lwbrk/src/Makefile.in @@ -11,9 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - - ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) else ifeq ($(MOZ_WIDGET_TOOLKIT),gtk3) diff --git a/intl/lwbrk/src/moz.build b/intl/lwbrk/src/moz.build index 145c1737cdc3..6504e0800f1d 100644 --- a/intl/lwbrk/src/moz.build +++ b/intl/lwbrk/src/moz.build @@ -31,3 +31,5 @@ else: LIBRARY_NAME = 'lwbrk_s' +LIBXUL_LIBRARY = True + diff --git a/intl/strres/src/Makefile.in b/intl/strres/src/Makefile.in index 0b356512efac..b1618d012444 100644 --- a/intl/strres/src/Makefile.in +++ b/intl/strres/src/Makefile.in @@ -11,7 +11,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - - include $(topsrcdir)/config/rules.mk diff --git a/intl/strres/src/moz.build b/intl/strres/src/moz.build index 2b333023eb1d..13ec4f78be9c 100644 --- a/intl/strres/src/moz.build +++ b/intl/strres/src/moz.build @@ -13,3 +13,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'strres_s' +LIBXUL_LIBRARY = True + diff --git a/intl/uconv/src/Makefile.in b/intl/uconv/src/Makefile.in index a3b16b829785..269ce89973cf 100644 --- a/intl/uconv/src/Makefile.in +++ b/intl/uconv/src/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES = -I$(srcdir)/../util \ -I$(srcdir)/../ucvlatin \ -I$(srcdir)/../ucvibm \ diff --git a/intl/uconv/src/moz.build b/intl/uconv/src/moz.build index e120d23ab6d1..770871592125 100644 --- a/intl/uconv/src/moz.build +++ b/intl/uconv/src/moz.build @@ -31,3 +31,5 @@ if CONFIG['INTEL_ARCHITECTURE']: LIBRARY_NAME = 'uconv' +LIBXUL_LIBRARY = True + diff --git a/intl/uconv/ucvcn/Makefile.in b/intl/uconv/ucvcn/Makefile.in index cc8665fc944d..9ccce15a2d87 100644 --- a/intl/uconv/ucvcn/Makefile.in +++ b/intl/uconv/ucvcn/Makefile.in @@ -10,9 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - - LOCAL_INCLUDES = -I$(srcdir)/../util include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/ucvcn/moz.build b/intl/uconv/ucvcn/moz.build index 69be3c402a66..560e1cdf06ee 100644 --- a/intl/uconv/ucvcn/moz.build +++ b/intl/uconv/ucvcn/moz.build @@ -23,3 +23,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'ucvcn_s' +LIBXUL_LIBRARY = True + diff --git a/intl/uconv/ucvibm/Makefile.in b/intl/uconv/ucvibm/Makefile.in index f20937b5c24a..9ccce15a2d87 100644 --- a/intl/uconv/ucvibm/Makefile.in +++ b/intl/uconv/ucvibm/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES = -I$(srcdir)/../util include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/ucvibm/moz.build b/intl/uconv/ucvibm/moz.build index f9603e1785b9..8fa07f1de897 100644 --- a/intl/uconv/ucvibm/moz.build +++ b/intl/uconv/ucvibm/moz.build @@ -37,3 +37,5 @@ if CONFIG['OS_ARCH'] == 'OS2': LIBRARY_NAME = 'ucvibm_s' +LIBXUL_LIBRARY = True + diff --git a/intl/uconv/ucvja/Makefile.in b/intl/uconv/ucvja/Makefile.in index dc902b449215..f42ee4ba1892 100644 --- a/intl/uconv/ucvja/Makefile.in +++ b/intl/uconv/ucvja/Makefile.in @@ -10,9 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - - LOCAL_INCLUDES = -I$(srcdir)/../util include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/ucvja/moz.build b/intl/uconv/ucvja/moz.build index 8526345b1166..01856877541f 100644 --- a/intl/uconv/ucvja/moz.build +++ b/intl/uconv/ucvja/moz.build @@ -21,3 +21,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'ucvja_s' +LIBXUL_LIBRARY = True + diff --git a/intl/uconv/ucvko/Makefile.in b/intl/uconv/ucvko/Makefile.in index 23bf9407313b..77417d245458 100644 --- a/intl/uconv/ucvko/Makefile.in +++ b/intl/uconv/ucvko/Makefile.in @@ -10,9 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - - LOCAL_INCLUDES = -I$(srcdir)/../util include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/ucvko/moz.build b/intl/uconv/ucvko/moz.build index 25a33b2b0b04..8a5f613eea48 100644 --- a/intl/uconv/ucvko/moz.build +++ b/intl/uconv/ucvko/moz.build @@ -20,3 +20,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'ucvko_s' +LIBXUL_LIBRARY = True + diff --git a/intl/uconv/ucvlatin/Makefile.in b/intl/uconv/ucvlatin/Makefile.in index 81344835860b..ae3abe6bb548 100644 --- a/intl/uconv/ucvlatin/Makefile.in +++ b/intl/uconv/ucvlatin/Makefile.in @@ -10,9 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - - LOCAL_INCLUDES = -I$(srcdir)/../util -I$(srcdir)/../src include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/ucvlatin/moz.build b/intl/uconv/ucvlatin/moz.build index 37c28fd3351d..20ae6bfceb45 100644 --- a/intl/uconv/ucvlatin/moz.build +++ b/intl/uconv/ucvlatin/moz.build @@ -129,3 +129,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'ucvlatin_s' +LIBXUL_LIBRARY = True + diff --git a/intl/uconv/ucvtw/Makefile.in b/intl/uconv/ucvtw/Makefile.in index cc8665fc944d..9ccce15a2d87 100644 --- a/intl/uconv/ucvtw/Makefile.in +++ b/intl/uconv/ucvtw/Makefile.in @@ -10,9 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - - LOCAL_INCLUDES = -I$(srcdir)/../util include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/ucvtw/moz.build b/intl/uconv/ucvtw/moz.build index a7a0ba105bc8..17862e5bd6c0 100644 --- a/intl/uconv/ucvtw/moz.build +++ b/intl/uconv/ucvtw/moz.build @@ -20,3 +20,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'ucvtw_s' +LIBXUL_LIBRARY = True + diff --git a/intl/uconv/ucvtw2/Makefile.in b/intl/uconv/ucvtw2/Makefile.in index dc902b449215..f42ee4ba1892 100644 --- a/intl/uconv/ucvtw2/Makefile.in +++ b/intl/uconv/ucvtw2/Makefile.in @@ -10,9 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - - LOCAL_INCLUDES = -I$(srcdir)/../util include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/ucvtw2/moz.build b/intl/uconv/ucvtw2/moz.build index 0fa7b2e6349b..9498037214ef 100644 --- a/intl/uconv/ucvtw2/moz.build +++ b/intl/uconv/ucvtw2/moz.build @@ -17,3 +17,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'ucvtw2_s' +LIBXUL_LIBRARY = True + diff --git a/intl/uconv/util/Makefile.in b/intl/uconv/util/Makefile.in index 14ad5ad0211f..afbc2963e795 100644 --- a/intl/uconv/util/Makefile.in +++ b/intl/uconv/util/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - CSRCS = \ ugen.c \ uscan.c \ diff --git a/intl/uconv/util/moz.build b/intl/uconv/util/moz.build index a565273ce2f1..bb509ee78430 100644 --- a/intl/uconv/util/moz.build +++ b/intl/uconv/util/moz.build @@ -15,3 +15,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'ucvutil_s' +LIBXUL_LIBRARY = True + diff --git a/intl/unicharutil/src/Makefile.in b/intl/unicharutil/src/Makefile.in deleted file mode 100644 index 104378a1773a..000000000000 --- a/intl/unicharutil/src/Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 - -include $(topsrcdir)/config/rules.mk diff --git a/intl/unicharutil/src/moz.build b/intl/unicharutil/src/moz.build index 0861eec2c0ae..644c06034507 100644 --- a/intl/unicharutil/src/moz.build +++ b/intl/unicharutil/src/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'ucharucomp_s' +LIBXUL_LIBRARY = True + diff --git a/ipc/chromium/Makefile.in b/ipc/chromium/Makefile.in index d86dd2020d54..5edef29c5991 100644 --- a/ipc/chromium/Makefile.in +++ b/ipc/chromium/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk OS_CXXFLAGS := $(filter-out -fshort-wchar,$(OS_CXXFLAGS)) LIBRARY_NAME = chromium_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 ACDEFINES = diff --git a/ipc/chromium/moz.build b/ipc/chromium/moz.build index 4e8b65cd2a9f..d59edde1f364 100644 --- a/ipc/chromium/moz.build +++ b/ipc/chromium/moz.build @@ -231,3 +231,6 @@ if ost.find('86') == -1 and ost.find('arm') == -1 and ost.find('mips') == -1: CPP_SOURCES += [ 'atomicops_internals_mutex.cc', ] + +LIBXUL_LIBRARY = True + diff --git a/ipc/dbus/Makefile.in b/ipc/dbus/Makefile.in index 3d9a161833ba..13d0039fa763 100644 --- a/ipc/dbus/Makefile.in +++ b/ipc/dbus/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = mozdbus_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 ifdef MOZ_ENABLE_DBUS diff --git a/ipc/dbus/moz.build b/ipc/dbus/moz.build index 1a5a52099f9e..a639e9e92471 100644 --- a/ipc/dbus/moz.build +++ b/ipc/dbus/moz.build @@ -18,3 +18,5 @@ CPP_SOURCES += [ 'RawDBusConnection.cpp', ] +LIBXUL_LIBRARY = True + diff --git a/ipc/glue/Makefile.in b/ipc/glue/Makefile.in index 9e2c24449cc1..822f7011ba37 100644 --- a/ipc/glue/Makefile.in +++ b/ipc/glue/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/crashreporter LIBRARY_NAME = mozipc_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 DEFINES += -DMOZ_CHILD_PROCESS_NAME=\"$(MOZ_CHILD_PROCESS_NAME)\" diff --git a/ipc/glue/moz.build b/ipc/glue/moz.build index a3aa9136fc02..4af604fe64c4 100644 --- a/ipc/glue/moz.build +++ b/ipc/glue/moz.build @@ -100,3 +100,6 @@ IPDL_SOURCES = [ 'InputStreamParams.ipdlh', 'URIParams.ipdlh', ] + +LIBXUL_LIBRARY = True + diff --git a/ipc/ipdl/Makefile.in b/ipc/ipdl/Makefile.in index edb36356e6ae..9413d47e8c82 100644 --- a/ipc/ipdl/Makefile.in +++ b/ipc/ipdl/Makefile.in @@ -13,7 +13,6 @@ GARBAGE_DIRS += _ipdlheaders GARBAGE += ipdl_lextab.py ipdl_yacctab.py $(wildcard *.pyc $(srcdir)/ipdl/*.pyc $(srcdir)/ipdl/cxx/*.pyc) LIBRARY_NAME = mozipdlgen_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 # This file is generated by the moz.build backend. diff --git a/ipc/ipdl/moz.build b/ipc/ipdl/moz.build index 780e2817891e..bb733d72d347 100644 --- a/ipc/ipdl/moz.build +++ b/ipc/ipdl/moz.build @@ -8,3 +8,6 @@ if CONFIG['MOZ_IPDL_TESTS']: DIRS += ['test'] MODULE = 'ipdlgen' + +LIBXUL_LIBRARY = True + diff --git a/ipc/ipdl/test/cxx/Makefile.in b/ipc/ipdl/test/cxx/Makefile.in index d0f6444f17f6..0a71f9eccee6 100644 --- a/ipc/ipdl/test/cxx/Makefile.in +++ b/ipc/ipdl/test/cxx/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = $(MODULE)_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 IPDLTESTS = \ diff --git a/ipc/ipdl/test/cxx/moz.build b/ipc/ipdl/test/cxx/moz.build index 7d49f43ad1e0..5d467c0f97b5 100644 --- a/ipc/ipdl/test/cxx/moz.build +++ b/ipc/ipdl/test/cxx/moz.build @@ -79,3 +79,6 @@ IPDL_SOURCES += [ 'PTestSysVShmem.ipdl', 'PTestUrgency.ipdl', ] + +LIBXUL_LIBRARY = True + diff --git a/ipc/netd/Makefile.in b/ipc/netd/Makefile.in index 781fa85bed5b..aa1ae80b2739 100644 --- a/ipc/netd/Makefile.in +++ b/ipc/netd/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = moznetd_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/ipc/netd/moz.build b/ipc/netd/moz.build index 972a06834acc..08fff59f4d23 100644 --- a/ipc/netd/moz.build +++ b/ipc/netd/moz.build @@ -14,3 +14,5 @@ CPP_SOURCES += [ 'Netd.cpp', ] +LIBXUL_LIBRARY = True + diff --git a/ipc/nfc/Makefile.in b/ipc/nfc/Makefile.in index a084c43a64a9..210520d4407e 100644 --- a/ipc/nfc/Makefile.in +++ b/ipc/nfc/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = moznfc_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/ipc/nfc/moz.build b/ipc/nfc/moz.build index 1273f1052513..d21f12b3be51 100644 --- a/ipc/nfc/moz.build +++ b/ipc/nfc/moz.build @@ -11,3 +11,6 @@ if CONFIG['MOZ_B2G_NFC']: CPP_SOURCES += [ 'Nfc.cpp', ] + +LIBXUL_LIBRARY = True + diff --git a/ipc/ril/Makefile.in b/ipc/ril/Makefile.in index f1afb46b7d7f..dba0bc5bc904 100644 --- a/ipc/ril/Makefile.in +++ b/ipc/ril/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = mozril_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/ipc/ril/moz.build b/ipc/ril/moz.build index 0ee44577fd1d..fb2f4ad277be 100644 --- a/ipc/ril/moz.build +++ b/ipc/ril/moz.build @@ -14,3 +14,5 @@ CPP_SOURCES += [ 'Ril.cpp', ] +LIBXUL_LIBRARY = True + diff --git a/ipc/testshell/Makefile.in b/ipc/testshell/Makefile.in index 5667964f9306..e3c12f30debb 100644 --- a/ipc/testshell/Makefile.in +++ b/ipc/testshell/Makefile.in @@ -10,7 +10,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = ipcshell_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 # For xpcshell error messages and nsDependentJSString diff --git a/ipc/testshell/moz.build b/ipc/testshell/moz.build index f07e6e07363a..d108d6b24cb6 100644 --- a/ipc/testshell/moz.build +++ b/ipc/testshell/moz.build @@ -29,3 +29,5 @@ IPDL_SOURCES = [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/ipc/unixsocket/Makefile.in b/ipc/unixsocket/Makefile.in index 0ee8f0a63cfb..2e53f851be6f 100644 --- a/ipc/unixsocket/Makefile.in +++ b/ipc/unixsocket/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = mozipcunixsocket_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/ipc/unixsocket/moz.build b/ipc/unixsocket/moz.build index 62c2246cc98a..104fec8b8c2a 100644 --- a/ipc/unixsocket/moz.build +++ b/ipc/unixsocket/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/js/ductwork/debugger/Makefile.in b/js/ductwork/debugger/Makefile.in index 5dce0b0aa815..4d78f806adfd 100644 --- a/js/ductwork/debugger/Makefile.in +++ b/js/ductwork/debugger/Makefile.in @@ -10,7 +10,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 EXTRA_DSO_LDOPTS += \ diff --git a/js/ductwork/debugger/moz.build b/js/ductwork/debugger/moz.build index 48852d1a1c81..dc6f375d2a46 100644 --- a/js/ductwork/debugger/moz.build +++ b/js/ductwork/debugger/moz.build @@ -21,3 +21,6 @@ LIBRARY_NAME = 'jsdebugger' EXTRA_JS_MODULES += [ 'jsdebugger.jsm', ] + +LIBXUL_LIBRARY = True + diff --git a/js/ipc/Makefile.in b/js/ipc/Makefile.in index 7f69c5df38a0..0ed8dc605aee 100644 --- a/js/ipc/Makefile.in +++ b/js/ipc/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = jsipc_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 LOCAL_INCLUDES += \ -I$(topsrcdir)/dom/base \ diff --git a/js/ipc/moz.build b/js/ipc/moz.build index 4072cce1614a..21a25f1020de 100644 --- a/js/ipc/moz.build +++ b/js/ipc/moz.build @@ -19,3 +19,5 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/js/jsd/Makefile.in b/js/jsd/Makefile.in index 745772e2205f..adc6cfeab29b 100644 --- a/js/jsd/Makefile.in +++ b/js/jsd/Makefile.in @@ -14,8 +14,6 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - EXPORT_LIBRARY = 1 # REQUIRES = java js diff --git a/js/jsd/moz.build b/js/jsd/moz.build index 1cb5e025314c..043f15dde2bb 100644 --- a/js/jsd/moz.build +++ b/js/jsd/moz.build @@ -33,3 +33,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'jsd' +LIBXUL_LIBRARY = True + diff --git a/js/xpconnect/loader/Makefile.in b/js/xpconnect/loader/Makefile.in index 7bca49ca9525..eeee7ae801b9 100644 --- a/js/xpconnect/loader/Makefile.in +++ b/js/xpconnect/loader/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES += \ -I$(srcdir)/../src \ -I$(srcdir)/../wrappers \ diff --git a/js/xpconnect/loader/moz.build b/js/xpconnect/loader/moz.build index 6354453261d0..53efc6679460 100644 --- a/js/xpconnect/loader/moz.build +++ b/js/xpconnect/loader/moz.build @@ -21,3 +21,5 @@ EXTRA_JS_MODULES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in index 53726b2821b4..85ab6af6ec8c 100644 --- a/js/xpconnect/src/Makefile.in +++ b/js/xpconnect/src/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = xpconnect_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = \ -I$(srcdir)/../wrappers \ -I$(srcdir)/../loader \ diff --git a/js/xpconnect/src/moz.build b/js/xpconnect/src/moz.build index 6152158bd7a0..8620553f3535 100644 --- a/js/xpconnect/src/moz.build +++ b/js/xpconnect/src/moz.build @@ -55,3 +55,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/js/xpconnect/wrappers/Makefile.in b/js/xpconnect/wrappers/Makefile.in index c4d4f89e7c78..97f34e77c688 100644 --- a/js/xpconnect/wrappers/Makefile.in +++ b/js/xpconnect/wrappers/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../src \ -I$(srcdir)/../../../dom/base \ diff --git a/js/xpconnect/wrappers/moz.build b/js/xpconnect/wrappers/moz.build index 461a0aa827b7..df6e6a36eede 100644 --- a/js/xpconnect/wrappers/moz.build +++ b/js/xpconnect/wrappers/moz.build @@ -23,3 +23,6 @@ LIBRARY_NAME = 'xpcwrappers_s' # warning C4661 for FilteringWrapper FAIL_ON_WARNINGS = not CONFIG['_MSC_VER'] + +LIBXUL_LIBRARY = True + From 49f603cd4d6223dc343919253aa79357f01b1bef Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:56:00 +0200 Subject: [PATCH 66/79] Bug 883284 - Part e: Move LIBXUL_LIBRARY into moz.build (k-o); r=ted --- layout/base/Makefile.in | 1 - layout/base/moz.build | 2 ++ layout/build/Makefile.in | 1 - layout/build/moz.build | 2 ++ layout/forms/Makefile.in | 1 - layout/forms/moz.build | 2 ++ layout/generic/Makefile.in | 2 -- layout/generic/moz.build | 3 +++ layout/inspector/src/Makefile.in | 1 - layout/inspector/src/moz.build | 2 ++ layout/ipc/Makefile.in | 1 - layout/ipc/moz.build | 2 ++ layout/mathml/Makefile.in | 1 - layout/mathml/moz.build | 2 ++ layout/printing/Makefile.in | 1 - layout/printing/moz.build | 2 ++ layout/style/Makefile.in | 1 - layout/style/moz.build | 2 ++ layout/svg/Makefile.in | 1 - layout/svg/moz.build | 2 ++ layout/tables/Makefile.in | 1 - layout/tables/moz.build | 2 ++ layout/tools/layout-debug/src/Makefile.in | 1 - layout/tools/layout-debug/src/moz.build | 2 ++ layout/xul/base/src/Makefile.in | 1 - layout/xul/base/src/moz.build | 2 ++ layout/xul/grid/Makefile.in | 1 - layout/xul/grid/moz.build | 2 ++ layout/xul/tree/Makefile.in | 1 - layout/xul/tree/moz.build | 2 ++ media/mtransport/build/Makefile.in | 2 -- media/mtransport/build/moz.build | 3 +++ mobile/android/components/build/Makefile.in | 2 -- mobile/android/components/build/moz.build | 2 ++ modules/libjar/Makefile.in | 1 - modules/libjar/moz.build | 2 ++ modules/libjar/zipwriter/src/Makefile.in | 2 -- modules/libjar/zipwriter/src/moz.build | 2 ++ modules/libpref/src/Makefile.in | 2 -- modules/libpref/src/moz.build | 2 ++ netwerk/base/src/Makefile.in | 1 - netwerk/base/src/moz.build | 2 ++ netwerk/build/Makefile.in | 1 - netwerk/build/moz.build | 2 ++ netwerk/cache/Makefile.in | 1 - netwerk/cache/moz.build | 2 ++ netwerk/dash/mpd/Makefile.in | 2 -- netwerk/dash/mpd/moz.build | 2 ++ netwerk/dns/Makefile.in | 1 - netwerk/dns/moz.build | 2 ++ netwerk/ipc/Makefile.in | 1 - netwerk/ipc/moz.build | 2 ++ netwerk/mime/Makefile.in | 3 --- netwerk/mime/moz.build | 2 ++ netwerk/protocol/about/Makefile.in | 2 -- netwerk/protocol/about/moz.build | 2 ++ netwerk/protocol/data/Makefile.in | 2 -- netwerk/protocol/data/moz.build | 2 ++ netwerk/protocol/device/Makefile.in | 2 -- netwerk/protocol/device/moz.build | 2 ++ netwerk/protocol/file/Makefile.in | 2 -- netwerk/protocol/file/moz.build | 2 ++ netwerk/protocol/ftp/Makefile.in | 2 -- netwerk/protocol/ftp/moz.build | 2 ++ netwerk/protocol/http/Makefile.in | 1 - netwerk/protocol/http/moz.build | 2 ++ netwerk/protocol/res/Makefile.in | 1 - netwerk/protocol/res/moz.build | 2 ++ netwerk/protocol/viewsource/Makefile.in | 2 -- netwerk/protocol/viewsource/moz.build | 2 ++ netwerk/protocol/websocket/Makefile.in | 1 - netwerk/protocol/websocket/moz.build | 2 ++ netwerk/protocol/wyciwyg/Makefile.in | 1 - netwerk/protocol/wyciwyg/moz.build | 2 ++ netwerk/sctp/datachannel/Makefile.in | 1 - netwerk/sctp/datachannel/moz.build | 2 ++ netwerk/sctp/src/Makefile.in | 1 - netwerk/sctp/src/moz.build | 3 +++ netwerk/socket/Makefile.in | 16 ---------------- netwerk/socket/moz.build | 2 ++ netwerk/srtp/src/Makefile.in | 2 -- netwerk/srtp/src/moz.build | 3 +++ netwerk/streamconv/converters/Makefile.in | 1 - netwerk/streamconv/converters/moz.build | 2 ++ netwerk/streamconv/src/Makefile.in | 2 -- netwerk/streamconv/src/moz.build | 2 ++ netwerk/system/android/Makefile.in | 2 -- netwerk/system/android/moz.build | 2 ++ netwerk/system/mac/Makefile.in | 15 --------------- netwerk/system/mac/moz.build | 2 ++ netwerk/system/maemo/Makefile.in | 2 -- netwerk/system/maemo/moz.build | 2 ++ netwerk/system/qt/Makefile.in | 2 -- netwerk/system/qt/moz.build | 2 ++ netwerk/system/win32/Makefile.in | 15 --------------- netwerk/system/win32/moz.build | 2 ++ netwerk/wifi/Makefile.in | 2 -- netwerk/wifi/moz.build | 3 +++ 98 files changed, 103 insertions(+), 112 deletions(-) delete mode 100644 netwerk/socket/Makefile.in delete mode 100644 netwerk/system/mac/Makefile.in delete mode 100644 netwerk/system/win32/Makefile.in diff --git a/layout/base/Makefile.in b/layout/base/Makefile.in index 9e61e0b25d50..de62474e8cab 100644 --- a/layout/base/Makefile.in +++ b/layout/base/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkbase_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/layout/base/moz.build b/layout/base/moz.build index 2e96f1a02ee3..d1e5fa5cb2c7 100644 --- a/layout/base/moz.build +++ b/layout/base/moz.build @@ -101,3 +101,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in index f405e43d8b47..242eab17e281 100644 --- a/layout/build/Makefile.in +++ b/layout/build/Makefile.in @@ -18,7 +18,6 @@ endif LIBRARY_NAME = gklayout MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 SHARED_LIBRARY_LIBS = \ ../base/$(LIB_PREFIX)gkbase_s.$(LIB_SUFFIX) \ ../forms/$(LIB_PREFIX)gkforms_s.$(LIB_SUFFIX) \ diff --git a/layout/build/moz.build b/layout/build/moz.build index 0e0b60575cf7..3adbf744d90a 100644 --- a/layout/build/moz.build +++ b/layout/build/moz.build @@ -20,3 +20,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/layout/forms/Makefile.in b/layout/forms/Makefile.in index 7b1250b52830..b984dcf28bc3 100644 --- a/layout/forms/Makefile.in +++ b/layout/forms/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/layout/forms/moz.build b/layout/forms/moz.build index 17baae71b8c4..4cfe64fb8186 100644 --- a/layout/forms/moz.build +++ b/layout/forms/moz.build @@ -40,3 +40,5 @@ LIBRARY_NAME = 'gkforms_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in index 751c645430aa..8f62f80f65fe 100644 --- a/layout/generic/Makefile.in +++ b/layout/generic/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkgeneric_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - RESOURCES_HTML = \ $(srcdir)/folder.png \ $(NULL) diff --git a/layout/generic/moz.build b/layout/generic/moz.build index d19c88c7d31b..1465ebf0db60 100644 --- a/layout/generic/moz.build +++ b/layout/generic/moz.build @@ -95,3 +95,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': ] FAIL_ON_WARNINGS = not CONFIG['_MSC_VER'] + +LIBXUL_LIBRARY = True + diff --git a/layout/inspector/src/Makefile.in b/layout/inspector/src/Makefile.in index 83b0c9b077d8..49c8934ec123 100644 --- a/layout/inspector/src/Makefile.in +++ b/layout/inspector/src/Makefile.in @@ -10,7 +10,6 @@ VPATH=@srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES += \ -I$(srcdir)/../../style \ -I$(topsrcdir)/content/base/src \ diff --git a/layout/inspector/src/moz.build b/layout/inspector/src/moz.build index abfb7dfc3a3a..245927a2096c 100644 --- a/layout/inspector/src/moz.build +++ b/layout/inspector/src/moz.build @@ -31,3 +31,5 @@ LIBRARY_NAME = 'inspector_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/layout/ipc/Makefile.in b/layout/ipc/Makefile.in index 4aef1413816b..7fa9dddbd0a4 100644 --- a/layout/ipc/Makefile.in +++ b/layout/ipc/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkipc_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/layout/ipc/moz.build b/layout/ipc/moz.build index 17ef8c16c3a1..d17e9d3c912e 100644 --- a/layout/ipc/moz.build +++ b/layout/ipc/moz.build @@ -23,3 +23,5 @@ IPDL_SOURCES = [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/layout/mathml/Makefile.in b/layout/mathml/Makefile.in index f5422381cd33..b9a5b730d67d 100644 --- a/layout/mathml/Makefile.in +++ b/layout/mathml/Makefile.in @@ -12,7 +12,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkmathml_s -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = \ -I$(srcdir)/../style \ -I$(srcdir)/../base \ diff --git a/layout/mathml/moz.build b/layout/mathml/moz.build index 56e56e957862..aa73a270d3f0 100644 --- a/layout/mathml/moz.build +++ b/layout/mathml/moz.build @@ -33,3 +33,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/layout/printing/Makefile.in b/layout/printing/Makefile.in index 01d78ecf157b..d425fd8974cc 100644 --- a/layout/printing/Makefile.in +++ b/layout/printing/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += \ diff --git a/layout/printing/moz.build b/layout/printing/moz.build index 18273864fabf..7c40fb69b7e5 100644 --- a/layout/printing/moz.build +++ b/layout/printing/moz.build @@ -26,3 +26,5 @@ LIBRARY_NAME = 'gkprinting_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/layout/style/Makefile.in b/layout/style/Makefile.in index beba3c48de95..aea2b153e2a9 100644 --- a/layout/style/Makefile.in +++ b/layout/style/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkstyle_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 ifdef GNU_CC OS_CFLAGS := $(OS_CFLAGS) -Wshadow OS_CXXFLAGS := $(OS_CXXFLAGS) -Wshadow diff --git a/layout/style/moz.build b/layout/style/moz.build index ac7f4d9cd738..031ab5bc1f24 100644 --- a/layout/style/moz.build +++ b/layout/style/moz.build @@ -125,3 +125,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/layout/svg/Makefile.in b/layout/svg/Makefile.in index ba77befc1869..76438c6b526c 100644 --- a/layout/svg/Makefile.in +++ b/layout/svg/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gksvgbase_s -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/layout/svg/moz.build b/layout/svg/moz.build index 16c80c0db46f..e4838633e207 100644 --- a/layout/svg/moz.build +++ b/layout/svg/moz.build @@ -55,3 +55,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/layout/tables/Makefile.in b/layout/tables/Makefile.in index dcbcc95d9689..0fae96679a9d 100644 --- a/layout/tables/Makefile.in +++ b/layout/tables/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk DEFINES += -DDEBUG_TABLE_STRATEGY_off diff --git a/layout/tables/moz.build b/layout/tables/moz.build index 32ad123f1b97..74f25260eed6 100644 --- a/layout/tables/moz.build +++ b/layout/tables/moz.build @@ -31,3 +31,5 @@ LIBRARY_NAME = 'gktable_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/layout/tools/layout-debug/src/Makefile.in b/layout/tools/layout-debug/src/Makefile.in index 559ca83e3008..88811c529c03 100644 --- a/layout/tools/layout-debug/src/Makefile.in +++ b/layout/tools/layout-debug/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk libs:: diff --git a/layout/tools/layout-debug/src/moz.build b/layout/tools/layout-debug/src/moz.build index a97ceb9d9c86..2041fcd318c7 100644 --- a/layout/tools/layout-debug/src/moz.build +++ b/layout/tools/layout-debug/src/moz.build @@ -26,3 +26,5 @@ LIBRARY_NAME = 'gkdebug' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/layout/xul/base/src/Makefile.in b/layout/xul/base/src/Makefile.in index b30ab753c65e..92f9aff37574 100644 --- a/layout/xul/base/src/Makefile.in +++ b/layout/xul/base/src/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkxulbase_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/layout/xul/base/src/moz.build b/layout/xul/base/src/moz.build index d3784f00f7ea..aa5eca39ec67 100644 --- a/layout/xul/base/src/moz.build +++ b/layout/xul/base/src/moz.build @@ -56,3 +56,5 @@ if CONFIG['MOZ_XUL']: FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/layout/xul/grid/Makefile.in b/layout/xul/grid/Makefile.in index 14b3c846afa9..f1797eee63d3 100644 --- a/layout/xul/grid/Makefile.in +++ b/layout/xul/grid/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = \ -I$(srcdir) \ -I$(srcdir)/../base/src \ diff --git a/layout/xul/grid/moz.build b/layout/xul/grid/moz.build index f8be16873db6..360d00410aef 100644 --- a/layout/xul/grid/moz.build +++ b/layout/xul/grid/moz.build @@ -34,3 +34,5 @@ LIBRARY_NAME = 'gkxulgrid_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/layout/xul/tree/Makefile.in b/layout/xul/tree/Makefile.in index 90fdeda400da..21dc290365e6 100644 --- a/layout/xul/tree/Makefile.in +++ b/layout/xul/tree/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = \ -I$(srcdir) \ -I$(topsrcdir)/content/events/src \ diff --git a/layout/xul/tree/moz.build b/layout/xul/tree/moz.build index 79175b60ca17..83cb2a2ea397 100644 --- a/layout/xul/tree/moz.build +++ b/layout/xul/tree/moz.build @@ -37,3 +37,5 @@ LIBRARY_NAME = 'gkxultree_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/media/mtransport/build/Makefile.in b/media/mtransport/build/Makefile.in index 35ab5736922e..7a0d94b977d3 100644 --- a/media/mtransport/build/Makefile.in +++ b/media/mtransport/build/Makefile.in @@ -15,8 +15,6 @@ ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = endif -LIBXUL_LIBRARY=1 - include $(srcdir)/../objs.mk diff --git a/media/mtransport/build/moz.build b/media/mtransport/build/moz.build index c439df6fa4a3..0ae3665ce1eb 100644 --- a/media/mtransport/build/moz.build +++ b/media/mtransport/build/moz.build @@ -31,3 +31,6 @@ CPP_SOURCES += [ LIBRARY_NAME = 'mtransport' FAIL_ON_WARNINGS = not CONFIG['_MSC_VER'] + +LIBXUL_LIBRARY = True + diff --git a/mobile/android/components/build/Makefile.in b/mobile/android/components/build/Makefile.in index 24ef424c22a9..e2c6ba886e87 100644 --- a/mobile/android/components/build/Makefile.in +++ b/mobile/android/components/build/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - EXPORT_LIBRARY = 1 ifdef MOZ_ANDROID_HISTORY diff --git a/mobile/android/components/build/moz.build b/mobile/android/components/build/moz.build index c2a47c4baf05..790cce9948dc 100644 --- a/mobile/android/components/build/moz.build +++ b/mobile/android/components/build/moz.build @@ -26,3 +26,5 @@ if CONFIG['MOZ_ANDROID_HISTORY']: LIBRARY_NAME = 'browsercomps' +LIBXUL_LIBRARY = True + diff --git a/modules/libjar/Makefile.in b/modules/libjar/Makefile.in index b07372507c2d..83b3b15b44df 100644 --- a/modules/libjar/Makefile.in +++ b/modules/libjar/Makefile.in @@ -13,6 +13,5 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = jar$(VERSION_NUMBER) MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/modules/libjar/moz.build b/modules/libjar/moz.build index 1fdbc429832a..c738fa8e453e 100644 --- a/modules/libjar/moz.build +++ b/modules/libjar/moz.build @@ -36,3 +36,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/modules/libjar/zipwriter/src/Makefile.in b/modules/libjar/zipwriter/src/Makefile.in index 5e533331f6c8..14633eaa92aa 100644 --- a/modules/libjar/zipwriter/src/Makefile.in +++ b/modules/libjar/zipwriter/src/Makefile.in @@ -11,6 +11,4 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk diff --git a/modules/libjar/zipwriter/src/moz.build b/modules/libjar/zipwriter/src/moz.build index a7ab06ddaf08..b89a6a4f5b88 100644 --- a/modules/libjar/zipwriter/src/moz.build +++ b/modules/libjar/zipwriter/src/moz.build @@ -17,3 +17,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'zipwriter' +LIBXUL_LIBRARY = True + diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in index 76c4e51c47a6..8c78cf30a4d1 100644 --- a/modules/libpref/src/Makefile.in +++ b/modules/libpref/src/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = pref MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - DEFINES += -DOS_ARCH=$(OS_ARCH) \ -DMOZ_WIDGET_TOOLKIT=$(MOZ_WIDGET_TOOLKIT) \ $(NULL) diff --git a/modules/libpref/src/moz.build b/modules/libpref/src/moz.build index 80e1a31251b0..138f26ee5c5e 100644 --- a/modules/libpref/src/moz.build +++ b/modules/libpref/src/moz.build @@ -14,3 +14,5 @@ CPP_SOURCES += [ 'prefread.cpp', ] +LIBXUL_LIBRARY = True + diff --git a/netwerk/base/src/Makefile.in b/netwerk/base/src/Makefile.in index 6b734e1ab33e..e6b6f485253c 100644 --- a/netwerk/base/src/Makefile.in +++ b/netwerk/base/src/Makefile.in @@ -13,7 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = neckobase_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES += -I$(topsrcdir)/dom/base ifdef MOZ_PLATFORM_MAEMO diff --git a/netwerk/base/src/moz.build b/netwerk/base/src/moz.build index bfc82ab119db..97a0b2435415 100644 --- a/netwerk/base/src/moz.build +++ b/netwerk/base/src/moz.build @@ -113,3 +113,5 @@ EXTRA_JS_MODULES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/build/Makefile.in b/netwerk/build/Makefile.in index 40a348dde958..a793cf4ef873 100644 --- a/netwerk/build/Makefile.in +++ b/netwerk/build/Makefile.in @@ -13,7 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = necko MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 SHARED_LIBRARY_LIBS = \ ../base/src/$(LIB_PREFIX)neckobase_s.$(LIB_SUFFIX) \ ../dns/$(LIB_PREFIX)neckodns_s.$(LIB_SUFFIX) \ diff --git a/netwerk/build/moz.build b/netwerk/build/moz.build index 268b5e93311f..70901e87fa90 100644 --- a/netwerk/build/moz.build +++ b/netwerk/build/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/cache/Makefile.in b/netwerk/cache/Makefile.in index a7f65e02c82c..11b4276d90ff 100644 --- a/netwerk/cache/Makefile.in +++ b/netwerk/cache/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = \ -I$(srcdir)/../base/src \ $(NULL) diff --git a/netwerk/cache/moz.build b/netwerk/cache/moz.build index 3bbaff6f0dfd..119a106c8175 100644 --- a/netwerk/cache/moz.build +++ b/netwerk/cache/moz.build @@ -46,3 +46,5 @@ LIBRARY_NAME = 'nkcache_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/dash/mpd/Makefile.in b/netwerk/dash/mpd/Makefile.in index 43999506e546..e50488494c1e 100644 --- a/netwerk/dash/mpd/Makefile.in +++ b/netwerk/dash/mpd/Makefile.in @@ -15,8 +15,6 @@ VPATH := @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY := 1 - LOCAL_INCLUDES := \ -I$(topsrcdir)/content/base/src \ -I$(topsrcdir)/content/html/content/public \ diff --git a/netwerk/dash/mpd/moz.build b/netwerk/dash/mpd/moz.build index 34168870d3ea..966f34438bb7 100644 --- a/netwerk/dash/mpd/moz.build +++ b/netwerk/dash/mpd/moz.build @@ -20,3 +20,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'nkdashmpd_s' +LIBXUL_LIBRARY = True + diff --git a/netwerk/dns/Makefile.in b/netwerk/dns/Makefile.in index 2e9e3a4c928f..e750b5704241 100644 --- a/netwerk/dns/Makefile.in +++ b/netwerk/dns/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 # need to include etld_data.inc LOCAL_INCLUDES = \ diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build index db682fab037b..6e429eb0c661 100644 --- a/netwerk/dns/moz.build +++ b/netwerk/dns/moz.build @@ -39,3 +39,5 @@ LIBRARY_NAME = 'neckodns_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/ipc/Makefile.in b/netwerk/ipc/Makefile.in index 8388a674fece..d8efeaef1531 100644 --- a/netwerk/ipc/Makefile.in +++ b/netwerk/ipc/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = neckoipc_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 LOCAL_INCLUDES += \ -I$(srcdir)/../protocol/http \ diff --git a/netwerk/ipc/moz.build b/netwerk/ipc/moz.build index b3fbb6f8bb0e..993773b5ff09 100644 --- a/netwerk/ipc/moz.build +++ b/netwerk/ipc/moz.build @@ -39,3 +39,5 @@ IPDL_SOURCES = [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/mime/Makefile.in b/netwerk/mime/Makefile.in index 3bcbb57a2459..80b5b90d2298 100644 --- a/netwerk/mime/Makefile.in +++ b/netwerk/mime/Makefile.in @@ -10,8 +10,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - - include $(topsrcdir)/config/rules.mk diff --git a/netwerk/mime/moz.build b/netwerk/mime/moz.build index e3f3179d662e..d84d8a084a8a 100644 --- a/netwerk/mime/moz.build +++ b/netwerk/mime/moz.build @@ -24,3 +24,5 @@ LIBRARY_NAME = 'nkmime_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/protocol/about/Makefile.in b/netwerk/protocol/about/Makefile.in index f825d7cb5e5f..7c98604c5654 100644 --- a/netwerk/protocol/about/Makefile.in +++ b/netwerk/protocol/about/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkabout_s -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ $(NULL) diff --git a/netwerk/protocol/about/moz.build b/netwerk/protocol/about/moz.build index 65333a585848..971da5dd1d7a 100644 --- a/netwerk/protocol/about/moz.build +++ b/netwerk/protocol/about/moz.build @@ -26,3 +26,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/protocol/data/Makefile.in b/netwerk/protocol/data/Makefile.in index 659bd99d247c..fc155171b296 100644 --- a/netwerk/protocol/data/Makefile.in +++ b/netwerk/protocol/data/Makefile.in @@ -9,8 +9,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ $(NULL) diff --git a/netwerk/protocol/data/moz.build b/netwerk/protocol/data/moz.build index f4bcf8e60f49..43c1389cda8a 100644 --- a/netwerk/protocol/data/moz.build +++ b/netwerk/protocol/data/moz.build @@ -15,3 +15,5 @@ LIBRARY_NAME = 'nkdata_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/protocol/device/Makefile.in b/netwerk/protocol/device/Makefile.in index 30558cc495e2..9f009f6499f1 100644 --- a/netwerk/protocol/device/Makefile.in +++ b/netwerk/protocol/device/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkdevice_s -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES = -I$(srcdir)/../../base/src/ \ $(NULL) diff --git a/netwerk/protocol/device/moz.build b/netwerk/protocol/device/moz.build index e2c5b2898cbe..97be44c600e7 100644 --- a/netwerk/protocol/device/moz.build +++ b/netwerk/protocol/device/moz.build @@ -22,3 +22,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/protocol/file/Makefile.in b/netwerk/protocol/file/Makefile.in index 4a3e4456da41..fc795ec599bd 100644 --- a/netwerk/protocol/file/Makefile.in +++ b/netwerk/protocol/file/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/xpcom/ds \ diff --git a/netwerk/protocol/file/moz.build b/netwerk/protocol/file/moz.build index b5fa3c9666b7..575a5a18d06c 100644 --- a/netwerk/protocol/file/moz.build +++ b/netwerk/protocol/file/moz.build @@ -22,3 +22,5 @@ LIBRARY_NAME = 'nkfile_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/protocol/ftp/Makefile.in b/netwerk/protocol/ftp/Makefile.in index 96b5df04712d..92c2c81f7540 100644 --- a/netwerk/protocol/ftp/Makefile.in +++ b/netwerk/protocol/ftp/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkftp_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/xpcom/ds \ diff --git a/netwerk/protocol/ftp/moz.build b/netwerk/protocol/ftp/moz.build index 2b080f82c3eb..a595e22076aa 100644 --- a/netwerk/protocol/ftp/moz.build +++ b/netwerk/protocol/ftp/moz.build @@ -36,3 +36,5 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/protocol/http/Makefile.in b/netwerk/protocol/http/Makefile.in index 90d296925a40..b5a21e0ec730 100644 --- a/netwerk/protocol/http/Makefile.in +++ b/netwerk/protocol/http/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkhttp_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/xpcom/ds \ diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build index 5e81cea1e353..166224f6d116 100644 --- a/netwerk/protocol/http/moz.build +++ b/netwerk/protocol/http/moz.build @@ -82,3 +82,5 @@ EXTRA_JS_MODULES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/protocol/res/Makefile.in b/netwerk/protocol/res/Makefile.in index dbc937e0ef08..5f6088d2a543 100644 --- a/netwerk/protocol/res/Makefile.in +++ b/netwerk/protocol/res/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkres_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = \ -I$(topsrcdir)/netwerk/base/src \ $(NULL) diff --git a/netwerk/protocol/res/moz.build b/netwerk/protocol/res/moz.build index 46ddeeade9c1..f7b096fac096 100644 --- a/netwerk/protocol/res/moz.build +++ b/netwerk/protocol/res/moz.build @@ -18,3 +18,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/protocol/viewsource/Makefile.in b/netwerk/protocol/viewsource/Makefile.in index d34433c5562e..8705772dda6e 100644 --- a/netwerk/protocol/viewsource/Makefile.in +++ b/netwerk/protocol/viewsource/Makefile.in @@ -9,8 +9,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ $(NULL) diff --git a/netwerk/protocol/viewsource/moz.build b/netwerk/protocol/viewsource/moz.build index f93e6d111278..39df27d86e17 100644 --- a/netwerk/protocol/viewsource/moz.build +++ b/netwerk/protocol/viewsource/moz.build @@ -21,3 +21,5 @@ LIBRARY_NAME = 'nkviewsource_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/protocol/websocket/Makefile.in b/netwerk/protocol/websocket/Makefile.in index 96e6e1cdbf40..5a36c7f359e9 100644 --- a/netwerk/protocol/websocket/Makefile.in +++ b/netwerk/protocol/websocket/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkwebsocket_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/content/base/src \ diff --git a/netwerk/protocol/websocket/moz.build b/netwerk/protocol/websocket/moz.build index c4cb901cd196..86dfec9103f4 100644 --- a/netwerk/protocol/websocket/moz.build +++ b/netwerk/protocol/websocket/moz.build @@ -33,3 +33,5 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/protocol/wyciwyg/Makefile.in b/netwerk/protocol/wyciwyg/Makefile.in index e7f3b0be4a5a..0f5137cb4e06 100644 --- a/netwerk/protocol/wyciwyg/Makefile.in +++ b/netwerk/protocol/wyciwyg/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkwyciwyg_s -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ $(NULL) diff --git a/netwerk/protocol/wyciwyg/moz.build b/netwerk/protocol/wyciwyg/moz.build index dbb94052d3b6..203402d4e730 100644 --- a/netwerk/protocol/wyciwyg/moz.build +++ b/netwerk/protocol/wyciwyg/moz.build @@ -31,3 +31,5 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/sctp/datachannel/Makefile.in b/netwerk/sctp/datachannel/Makefile.in index 9d79fb1e094c..f36860f0e9d8 100644 --- a/netwerk/sctp/datachannel/Makefile.in +++ b/netwerk/sctp/datachannel/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkdatachan_s -LIBXUL_LIBRARY = 1 NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO LOCAL_INCLUDES = \ -I$(topsrcdir)/xpcom/ds \ diff --git a/netwerk/sctp/datachannel/moz.build b/netwerk/sctp/datachannel/moz.build index f16756498b27..71c5267cd3be 100644 --- a/netwerk/sctp/datachannel/moz.build +++ b/netwerk/sctp/datachannel/moz.build @@ -19,3 +19,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/sctp/src/Makefile.in b/netwerk/sctp/src/Makefile.in index 37ceb1e3b65c..0655bd630c4e 100644 --- a/netwerk/sctp/src/Makefile.in +++ b/netwerk/sctp/src/Makefile.in @@ -15,7 +15,6 @@ VPATH = \ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nksctp_s -LIBXUL_LIBRARY = 1 NO_PROFILE_GUIDED_OPTIMIZE = 1 # Don't PGO LOCAL_INCLUDES = \ diff --git a/netwerk/sctp/src/moz.build b/netwerk/sctp/src/moz.build index 1ac90db9802a..233204a81434 100644 --- a/netwerk/sctp/src/moz.build +++ b/netwerk/sctp/src/moz.build @@ -44,3 +44,6 @@ if CONFIG['OS_TARGET'] == 'Android': CPP_SOURCES += [ 'ifaddrs_android.cpp', ] + +LIBXUL_LIBRARY = True + diff --git a/netwerk/socket/Makefile.in b/netwerk/socket/Makefile.in deleted file mode 100644 index 22f2bacadc95..000000000000 --- a/netwerk/socket/Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 - - -include $(topsrcdir)/config/rules.mk - diff --git a/netwerk/socket/moz.build b/netwerk/socket/moz.build index b0b5f0de06b2..203be9529f7d 100644 --- a/netwerk/socket/moz.build +++ b/netwerk/socket/moz.build @@ -27,3 +27,5 @@ LIBRARY_NAME = 'neckosocket_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/srtp/src/Makefile.in b/netwerk/srtp/src/Makefile.in index 184719061ee0..9e89bb3f0666 100644 --- a/netwerk/srtp/src/Makefile.in +++ b/netwerk/srtp/src/Makefile.in @@ -21,8 +21,6 @@ VPATH = \ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nksrtp_s -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES = \ -I$(srcdir)/include \ -I$(srcdir)/crypto/include \ diff --git a/netwerk/srtp/src/moz.build b/netwerk/srtp/src/moz.build index e3062f9c6703..090389225c70 100644 --- a/netwerk/srtp/src/moz.build +++ b/netwerk/srtp/src/moz.build @@ -34,3 +34,6 @@ CSRCS += [ 'stat.c', 'ut_sim.c', ] + +LIBXUL_LIBRARY = True + diff --git a/netwerk/streamconv/converters/Makefile.in b/netwerk/streamconv/converters/Makefile.in index 791852c497b3..10f51e262a3d 100644 --- a/netwerk/streamconv/converters/Makefile.in +++ b/netwerk/streamconv/converters/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = \ -I$(topsrcdir)/netwerk/base/src \ $(NULL) diff --git a/netwerk/streamconv/converters/moz.build b/netwerk/streamconv/converters/moz.build index 0d0d90c51c7f..60511e35645c 100644 --- a/netwerk/streamconv/converters/moz.build +++ b/netwerk/streamconv/converters/moz.build @@ -32,3 +32,5 @@ LIBRARY_NAME = 'nkcnvts_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/streamconv/src/Makefile.in b/netwerk/streamconv/src/Makefile.in index c0cab172f783..4f19a9cc820a 100644 --- a/netwerk/streamconv/src/Makefile.in +++ b/netwerk/streamconv/src/Makefile.in @@ -11,7 +11,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk diff --git a/netwerk/streamconv/src/moz.build b/netwerk/streamconv/src/moz.build index 360dd22be4b6..ced1bd13a17a 100644 --- a/netwerk/streamconv/src/moz.build +++ b/netwerk/streamconv/src/moz.build @@ -21,3 +21,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa' and CONFIG['OS_TEST'] != 'x86_64': LIBRARY_NAME = 'nkconv_s' +LIBXUL_LIBRARY = True + diff --git a/netwerk/system/android/Makefile.in b/netwerk/system/android/Makefile.in index ae8891478d74..a3ea1c27f704 100644 --- a/netwerk/system/android/Makefile.in +++ b/netwerk/system/android/Makefile.in @@ -8,8 +8,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += -I$(srcdir)/../../base/src diff --git a/netwerk/system/android/moz.build b/netwerk/system/android/moz.build index 22d5f3096b7b..e41a13941e0c 100644 --- a/netwerk/system/android/moz.build +++ b/netwerk/system/android/moz.build @@ -14,3 +14,5 @@ LIBRARY_NAME = 'neckosystem_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/system/mac/Makefile.in b/netwerk/system/mac/Makefile.in deleted file mode 100644 index c060b2970fce..000000000000 --- a/netwerk/system/mac/Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 - -include $(topsrcdir)/config/rules.mk - diff --git a/netwerk/system/mac/moz.build b/netwerk/system/mac/moz.build index 01dcb59559da..026155ccf158 100644 --- a/netwerk/system/mac/moz.build +++ b/netwerk/system/mac/moz.build @@ -14,3 +14,5 @@ CMMSRCS += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/system/maemo/Makefile.in b/netwerk/system/maemo/Makefile.in index 6f23cb56efb0..a17f20326a68 100644 --- a/netwerk/system/maemo/Makefile.in +++ b/netwerk/system/maemo/Makefile.in @@ -8,8 +8,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk OS_INCLUDES += $(GLIB_CFLAGS) $(LIBCONIC_CFLAGS) diff --git a/netwerk/system/maemo/moz.build b/netwerk/system/maemo/moz.build index 6382d413d0be..d76428a0b904 100644 --- a/netwerk/system/maemo/moz.build +++ b/netwerk/system/maemo/moz.build @@ -15,3 +15,5 @@ LIBRARY_NAME = 'neckosystem_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/system/qt/Makefile.in b/netwerk/system/qt/Makefile.in index 169519f68198..114cebb23869 100644 --- a/netwerk/system/qt/Makefile.in +++ b/netwerk/system/qt/Makefile.in @@ -9,8 +9,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk OS_INCLUDES += $(MOZ_QT_CFLAGS) diff --git a/netwerk/system/qt/moz.build b/netwerk/system/qt/moz.build index b5ef31128447..b909f7c47de9 100644 --- a/netwerk/system/qt/moz.build +++ b/netwerk/system/qt/moz.build @@ -16,3 +16,5 @@ LIBRARY_NAME = 'neckosystem_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/system/win32/Makefile.in b/netwerk/system/win32/Makefile.in deleted file mode 100644 index c060b2970fce..000000000000 --- a/netwerk/system/win32/Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 - -include $(topsrcdir)/config/rules.mk - diff --git a/netwerk/system/win32/moz.build b/netwerk/system/win32/moz.build index 3065cbdf0475..8544bee96066 100644 --- a/netwerk/system/win32/moz.build +++ b/netwerk/system/win32/moz.build @@ -15,3 +15,5 @@ LIBRARY_NAME = 'neckosystem_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/netwerk/wifi/Makefile.in b/netwerk/wifi/Makefile.in index e9a9ebb5231d..b875c6d06956 100644 --- a/netwerk/wifi/Makefile.in +++ b/netwerk/wifi/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - ifeq ($(OS_ARCH),SunOS) OS_INCLUDES += $(GLIB_CFLAGS) endif diff --git a/netwerk/wifi/moz.build b/netwerk/wifi/moz.build index 29abb6b02cb9..fd8d43452344 100644 --- a/netwerk/wifi/moz.build +++ b/netwerk/wifi/moz.build @@ -53,3 +53,6 @@ if CONFIG['NECKO_WIFI_DBUS']: ] LIBRARY_NAME = 'neckowifi_s' + +LIBXUL_LIBRARY = True + From 3a103a7e9f5a360bcaea2f7db15d2838b5a52343 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:56:01 +0200 Subject: [PATCH 67/79] Bug 883284 - Part f: Move LIBXUL_LIBRARY into moz.build (p-z); r=glandium --- other-licenses/skia-npapi/Makefile.in | 1 - other-licenses/skia-npapi/moz.build | 2 ++ other-licenses/snappy/Makefile.in | 1 - other-licenses/snappy/moz.build | 2 ++ parser/html/Makefile.in | 2 -- parser/html/moz.build | 2 ++ parser/htmlparser/src/Makefile.in | 3 --- parser/htmlparser/src/moz.build | 2 ++ parser/xml/src/Makefile.in | 2 -- parser/xml/src/moz.build | 2 ++ rdf/base/src/Makefile.in | 16 ---------------- rdf/base/src/moz.build | 2 ++ rdf/build/Makefile.in | 4 ---- rdf/build/moz.build | 2 ++ rdf/datasource/src/Makefile.in | 2 -- rdf/datasource/src/moz.build | 2 ++ security/manager/boot/src/Makefile.in | 1 - security/manager/boot/src/moz.build | 2 ++ security/manager/pki/src/Makefile.in | 1 - security/manager/pki/src/moz.build | 2 ++ security/manager/ssl/src/Makefile.in | 1 - security/manager/ssl/src/moz.build | 2 ++ security/sandbox/Makefile.in | 4 +--- security/sandbox/moz.build | 2 ++ services/crypto/component/Makefile.in | 1 - services/crypto/component/moz.build | 2 ++ startupcache/Makefile.in | 2 -- startupcache/moz.build | 2 ++ storage/build/Makefile.in | 3 --- storage/build/moz.build | 2 ++ storage/src/Makefile.in | 2 -- storage/src/moz.build | 2 ++ testing/gtest/Makefile.in | 2 -- testing/gtest/moz.build | 2 ++ toolkit/components/alerts/Makefile.in | 1 - toolkit/components/alerts/moz.build | 2 ++ toolkit/components/autocomplete/Makefile.in | 1 - toolkit/components/autocomplete/moz.build | 2 ++ toolkit/components/build/Makefile.in | 2 -- toolkit/components/build/moz.build | 2 ++ toolkit/components/commandlines/Makefile.in | 2 -- toolkit/components/commandlines/moz.build | 2 ++ toolkit/components/ctypes/Makefile.in | 1 - toolkit/components/ctypes/moz.build | 3 +++ toolkit/components/diskspacewatcher/Makefile.in | 2 -- toolkit/components/diskspacewatcher/moz.build | 3 +++ toolkit/components/downloads/Makefile.in | 1 - toolkit/components/downloads/moz.build | 2 ++ toolkit/components/feeds/Makefile.in | 3 --- toolkit/components/feeds/moz.build | 2 ++ toolkit/components/find/Makefile.in | 15 --------------- toolkit/components/find/moz.build | 2 ++ toolkit/components/intl/Makefile.in | 15 --------------- toolkit/components/intl/moz.build | 2 ++ toolkit/components/mediasniffer/Makefile.in | 1 - toolkit/components/mediasniffer/moz.build | 3 +++ toolkit/components/perf/Makefile.in | 1 - toolkit/components/perf/moz.build | 2 ++ toolkit/components/reflect/Makefile.in | 1 - toolkit/components/reflect/moz.build | 3 +++ toolkit/components/remote/Makefile.in | 2 -- toolkit/components/remote/moz.build | 2 ++ toolkit/components/satchel/Makefile.in | 1 - toolkit/components/satchel/moz.build | 2 ++ toolkit/components/startup/Makefile.in | 15 --------------- toolkit/components/startup/moz.build | 2 ++ toolkit/components/statusfilter/Makefile.in | 16 ---------------- toolkit/components/statusfilter/moz.build | 2 ++ toolkit/components/telemetry/Makefile.in | 1 - toolkit/components/telemetry/moz.build | 2 ++ toolkit/components/typeaheadfind/Makefile.in | 14 -------------- toolkit/components/typeaheadfind/moz.build | 2 ++ toolkit/components/url-classifier/Makefile.in | 1 - toolkit/components/url-classifier/moz.build | 2 ++ toolkit/crashreporter/Makefile.in | 1 - toolkit/crashreporter/moz.build | 2 ++ toolkit/devtools/server/Makefile.in | 1 - toolkit/devtools/server/moz.build | 2 ++ toolkit/identity/Makefile.in | 1 - toolkit/identity/moz.build | 2 ++ toolkit/mozapps/update/common/Makefile.in | 1 - toolkit/mozapps/update/common/moz.build | 2 ++ toolkit/profile/Makefile.in | 2 -- toolkit/profile/moz.build | 2 ++ toolkit/system/androidproxy/Makefile.in | 3 --- toolkit/system/androidproxy/moz.build | 2 ++ toolkit/system/osxproxy/Makefile.in | 3 --- toolkit/system/osxproxy/moz.build | 2 ++ toolkit/system/unixproxy/Makefile.in | 2 -- toolkit/system/unixproxy/moz.build | 2 ++ toolkit/system/windowsproxy/Makefile.in | 3 --- toolkit/system/windowsproxy/moz.build | 2 ++ toolkit/xre/Makefile.in | 2 -- toolkit/xre/moz.build | 3 +++ tools/trace-malloc/lib/Makefile.in | 2 -- tools/trace-malloc/lib/moz.build | 2 ++ uriloader/base/Makefile.in | 1 - uriloader/base/moz.build | 2 ++ uriloader/exthandler/Makefile.in | 1 - uriloader/exthandler/moz.build | 2 ++ uriloader/prefetch/Makefile.in | 1 - uriloader/prefetch/moz.build | 2 ++ view/src/Makefile.in | 1 - view/src/moz.build | 2 ++ widget/android/Makefile.in | 2 -- widget/android/moz.build | 2 ++ widget/cocoa/Makefile.in | 4 ---- widget/cocoa/moz.build | 2 ++ widget/gonk/Makefile.in | 2 -- widget/gonk/moz.build | 3 +++ widget/gonk/nativewindow/Makefile.in | 1 - widget/gonk/nativewindow/moz.build | 2 ++ widget/gtk2/Makefile.in | 1 - widget/gtk2/moz.build | 2 ++ widget/gtkxtbin/Makefile.in | 2 -- widget/gtkxtbin/moz.build | 2 ++ widget/os2/Makefile.in | 3 --- widget/os2/moz.build | 2 ++ widget/qt/Makefile.in | 2 -- widget/qt/moz.build | 3 +++ widget/shared/Makefile.in | 2 -- widget/shared/moz.build | 2 ++ widget/shared/x11/Makefile.in | 3 --- widget/shared/x11/moz.build | 2 ++ widget/windows/Makefile.in | 2 -- widget/windows/moz.build | 3 +++ widget/windows/winrt/Makefile.in | 2 -- widget/windows/winrt/moz.build | 2 ++ widget/xpwidgets/Makefile.in | 2 -- widget/xpwidgets/moz.build | 3 +++ xpcom/base/Makefile.in | 2 -- xpcom/base/moz.build | 3 +++ xpcom/build/Makefile.in | 1 - xpcom/build/moz.build | 3 +++ xpcom/components/Makefile.in | 1 - xpcom/components/moz.build | 2 ++ xpcom/ds/Makefile.in | 1 - xpcom/ds/moz.build | 2 ++ xpcom/glue/tests/gtest/Makefile.in | 2 -- xpcom/glue/tests/gtest/moz.build | 2 ++ xpcom/io/Makefile.in | 2 -- xpcom/io/moz.build | 4 +++- xpcom/threads/Makefile.in | 2 -- xpcom/threads/moz.build | 2 ++ xpcom/typelib/xpt/src/Makefile.in | 1 - xpcom/typelib/xpt/src/moz.build | 2 ++ xpfe/appshell/src/Makefile.in | 2 -- xpfe/appshell/src/moz.build | 2 ++ xpfe/components/build/Makefile.in | 3 --- xpfe/components/build/moz.build | 2 ++ xpfe/components/directory/Makefile.in | 16 ---------------- xpfe/components/directory/moz.build | 2 ++ xpfe/components/windowds/Makefile.in | 1 - xpfe/components/windowds/moz.build | 2 ++ 154 files changed, 167 insertions(+), 231 deletions(-) delete mode 100644 rdf/base/src/Makefile.in delete mode 100644 toolkit/components/find/Makefile.in delete mode 100644 toolkit/components/intl/Makefile.in delete mode 100644 toolkit/components/startup/Makefile.in delete mode 100644 toolkit/components/statusfilter/Makefile.in delete mode 100644 toolkit/components/typeaheadfind/Makefile.in delete mode 100644 xpfe/components/directory/Makefile.in diff --git a/other-licenses/skia-npapi/Makefile.in b/other-licenses/skia-npapi/Makefile.in index c73f1724855f..185336e2bb46 100644 --- a/other-licenses/skia-npapi/Makefile.in +++ b/other-licenses/skia-npapi/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 DEFINES += \ diff --git a/other-licenses/skia-npapi/moz.build b/other-licenses/skia-npapi/moz.build index 099a3936177d..d62283720173 100644 --- a/other-licenses/skia-npapi/moz.build +++ b/other-licenses/skia-npapi/moz.build @@ -20,3 +20,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'skia_npapi' +LIBXUL_LIBRARY = True + diff --git a/other-licenses/snappy/Makefile.in b/other-licenses/snappy/Makefile.in index a57131a9ca06..d3e3fe90b989 100644 --- a/other-licenses/snappy/Makefile.in +++ b/other-licenses/snappy/Makefile.in @@ -13,7 +13,6 @@ VPATH = \ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/other-licenses/snappy/moz.build b/other-licenses/snappy/moz.build index d75e8612505c..2ec7d4835a84 100644 --- a/other-licenses/snappy/moz.build +++ b/other-licenses/snappy/moz.build @@ -19,3 +19,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'snappy_s' +LIBXUL_LIBRARY = True + diff --git a/parser/html/Makefile.in b/parser/html/Makefile.in index d44d6e0e620b..5244de8fc7fc 100644 --- a/parser/html/Makefile.in +++ b/parser/html/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/parser/html/moz.build b/parser/html/moz.build index 6760a3b277d6..a731cf5e236b 100644 --- a/parser/html/moz.build +++ b/parser/html/moz.build @@ -85,3 +85,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'html5p_s' +LIBXUL_LIBRARY = True + diff --git a/parser/htmlparser/src/Makefile.in b/parser/htmlparser/src/Makefile.in index f270c9f0f80d..e1a11a885a72 100644 --- a/parser/htmlparser/src/Makefile.in +++ b/parser/htmlparser/src/Makefile.in @@ -10,9 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - - SHARED_LIBRARY_LIBS = \ $(DEPTH)/parser/xml/src/$(LIB_PREFIX)saxp.$(LIB_SUFFIX) \ $(NULL) diff --git a/parser/htmlparser/src/moz.build b/parser/htmlparser/src/moz.build index 177d2e13e22f..ba2b514ae3f7 100644 --- a/parser/htmlparser/src/moz.build +++ b/parser/htmlparser/src/moz.build @@ -25,3 +25,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'htmlpars' +LIBXUL_LIBRARY = True + diff --git a/parser/xml/src/Makefile.in b/parser/xml/src/Makefile.in index 0c4bae861640..7f846873003b 100644 --- a/parser/xml/src/Makefile.in +++ b/parser/xml/src/Makefile.in @@ -12,6 +12,4 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 MOZILLA_INTERNAL_API = 1 -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk diff --git a/parser/xml/src/moz.build b/parser/xml/src/moz.build index 3ed160b777ce..105c78544d33 100644 --- a/parser/xml/src/moz.build +++ b/parser/xml/src/moz.build @@ -20,3 +20,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'saxp' +LIBXUL_LIBRARY = True + diff --git a/rdf/base/src/Makefile.in b/rdf/base/src/Makefile.in deleted file mode 100644 index 99d07d15669e..000000000000 --- a/rdf/base/src/Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 - -include $(topsrcdir)/config/rules.mk - diff --git a/rdf/base/src/moz.build b/rdf/base/src/moz.build index 70844226d7bf..634da851a25f 100644 --- a/rdf/base/src/moz.build +++ b/rdf/base/src/moz.build @@ -25,3 +25,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'rdfbase_s' +LIBXUL_LIBRARY = True + diff --git a/rdf/build/Makefile.in b/rdf/build/Makefile.in index 7586e6aec50b..ed3993579cd9 100644 --- a/rdf/build/Makefile.in +++ b/rdf/build/Makefile.in @@ -11,10 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - -# XXX Note dependencies on implementation headers for factory functions - SHARED_LIBRARY_LIBS = \ ../base/src/$(LIB_PREFIX)rdfbase_s.$(LIB_SUFFIX) \ ../datasource/src/$(LIB_PREFIX)rdfdatasource_s.$(LIB_SUFFIX) \ diff --git a/rdf/build/moz.build b/rdf/build/moz.build index 6894fb38c2d9..301fbb043ca3 100644 --- a/rdf/build/moz.build +++ b/rdf/build/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'rdf' +LIBXUL_LIBRARY = True + diff --git a/rdf/datasource/src/Makefile.in b/rdf/datasource/src/Makefile.in index ed191e44d09c..1e473e7cc477 100644 --- a/rdf/datasource/src/Makefile.in +++ b/rdf/datasource/src/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk # XXX This is a dependency on rdfutil.h: it'll go away once that becomes diff --git a/rdf/datasource/src/moz.build b/rdf/datasource/src/moz.build index c9d03ae25a79..2bb0bb8e8d28 100644 --- a/rdf/datasource/src/moz.build +++ b/rdf/datasource/src/moz.build @@ -13,3 +13,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'rdfdatasource_s' +LIBXUL_LIBRARY = True + diff --git a/security/manager/boot/src/Makefile.in b/security/manager/boot/src/Makefile.in index 49c99d7142d6..c5f34657d7e6 100644 --- a/security/manager/boot/src/Makefile.in +++ b/security/manager/boot/src/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 DEFINES += -D__STDC_CONSTANT_MACROS include $(topsrcdir)/config/rules.mk diff --git a/security/manager/boot/src/moz.build b/security/manager/boot/src/moz.build index 563c8d697d38..50a7335058da 100644 --- a/security/manager/boot/src/moz.build +++ b/security/manager/boot/src/moz.build @@ -19,3 +19,5 @@ LIBRARY_NAME = 'pipboot' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/security/manager/pki/src/Makefile.in b/security/manager/pki/src/Makefile.in index d4db55799063..91591b89cdfb 100644 --- a/security/manager/pki/src/Makefile.in +++ b/security/manager/pki/src/Makefile.in @@ -12,7 +12,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 INCLUDES += \ -I$(DIST)/public/nss \ $(NULL) diff --git a/security/manager/pki/src/moz.build b/security/manager/pki/src/moz.build index d7da5f75ee75..8980e9663abf 100644 --- a/security/manager/pki/src/moz.build +++ b/security/manager/pki/src/moz.build @@ -19,3 +19,5 @@ LIBRARY_NAME = 'pippki' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in index 2b578ee4f135..ae8822ae7160 100644 --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in @@ -12,7 +12,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 CSRCS += md4.c DEFINES += \ diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build index 1e7954184c01..033c708b043b 100644 --- a/security/manager/ssl/src/moz.build +++ b/security/manager/ssl/src/moz.build @@ -85,3 +85,5 @@ if CONFIG['MOZ_XUL']: LIBRARY_NAME = 'pipnss' +LIBXUL_LIBRARY = True + diff --git a/security/sandbox/Makefile.in b/security/sandbox/Makefile.in index 88485fc46132..3ef1f8a62a2e 100644 --- a/security/sandbox/Makefile.in +++ b/security/sandbox/Makefile.in @@ -10,11 +10,9 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = sandbox_s -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 FAIL_ON_WARNINGS = 1 -include $(topsrcdir)/config/config.mk -include $(topsrcdir)/ipc/chromium/chromium-config.mk include $(topsrcdir)/config/rules.mk +include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/security/sandbox/moz.build b/security/sandbox/moz.build index bbcc6b70ed52..9a5c3dcc020f 100644 --- a/security/sandbox/moz.build +++ b/security/sandbox/moz.build @@ -14,3 +14,5 @@ CPP_SOURCES += [ 'Sandbox.cpp', ] +LIBXUL_LIBRARY = True + diff --git a/services/crypto/component/Makefile.in b/services/crypto/component/Makefile.in index 466dfbf2ea49..9ba68107e605 100644 --- a/services/crypto/component/Makefile.in +++ b/services/crypto/component/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY := 1 -LIBXUL_LIBRARY := 1 MOZILLA_INTERNAL_API := 1 include $(topsrcdir)/config/rules.mk diff --git a/services/crypto/component/moz.build b/services/crypto/component/moz.build index 2801204c5b2c..76a0113fdb5a 100644 --- a/services/crypto/component/moz.build +++ b/services/crypto/component/moz.build @@ -22,3 +22,5 @@ LIBRARY_NAME = 'services-crypto' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/startupcache/Makefile.in b/startupcache/Makefile.in index 9c4543777329..b0ca4419928c 100644 --- a/startupcache/Makefile.in +++ b/startupcache/Makefile.in @@ -11,6 +11,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk diff --git a/startupcache/moz.build b/startupcache/moz.build index b30b8896da43..bd13f4a1f07b 100644 --- a/startupcache/moz.build +++ b/startupcache/moz.build @@ -26,3 +26,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'startupcache' +LIBXUL_LIBRARY = True + diff --git a/storage/build/Makefile.in b/storage/build/Makefile.in index 9865dd2e14e2..fb8e601bc233 100644 --- a/storage/build/Makefile.in +++ b/storage/build/Makefile.in @@ -11,9 +11,6 @@ VPATH=@srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - - LOCAL_INCLUDES = \ $(SQLITE_CFLAGS) \ -I$(srcdir)/../src diff --git a/storage/build/moz.build b/storage/build/moz.build index 0c79e6f98e34..28cf593541f4 100644 --- a/storage/build/moz.build +++ b/storage/build/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'storagecomps' +LIBXUL_LIBRARY = True + diff --git a/storage/src/Makefile.in b/storage/src/Makefile.in index 13da31de0f28..75763f61e67a 100644 --- a/storage/src/Makefile.in +++ b/storage/src/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - # Don't use the jemalloc allocator on Android, because we can't guarantee # that Gecko will configure sqlite before it is first used (bug 730495). # diff --git a/storage/src/moz.build b/storage/src/moz.build index 10d7106b88ca..bca051b98ed1 100644 --- a/storage/src/moz.build +++ b/storage/src/moz.build @@ -39,3 +39,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'storage_s' +LIBXUL_LIBRARY = True + diff --git a/testing/gtest/Makefile.in b/testing/gtest/Makefile.in index 25fb7cbd2e78..50af72f9c189 100644 --- a/testing/gtest/Makefile.in +++ b/testing/gtest/Makefile.in @@ -18,8 +18,6 @@ VPATH = \ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES += \ -I$(srcdir)/gtest \ -I$(srcdir)/gtest/include \ diff --git a/testing/gtest/moz.build b/testing/gtest/moz.build index 0ea567b175d6..ba6726234dfb 100644 --- a/testing/gtest/moz.build +++ b/testing/gtest/moz.build @@ -65,3 +65,5 @@ GTEST_CPP_SOURCES += [ 'SanityTest.cpp', ] +LIBXUL_LIBRARY = True + diff --git a/toolkit/components/alerts/Makefile.in b/toolkit/components/alerts/Makefile.in index a4e3ff492fb9..181509b078d8 100644 --- a/toolkit/components/alerts/Makefile.in +++ b/toolkit/components/alerts/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = alerts_s -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/components/build/ include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/alerts/moz.build b/toolkit/components/alerts/moz.build index 99b84efa0741..4decbae989f9 100644 --- a/toolkit/components/alerts/moz.build +++ b/toolkit/components/alerts/moz.build @@ -17,3 +17,5 @@ CPP_SOURCES += [ 'nsXULAlerts.cpp', ] +LIBXUL_LIBRARY = True + diff --git a/toolkit/components/autocomplete/Makefile.in b/toolkit/components/autocomplete/Makefile.in index e06e5e622744..554ea27e53e6 100644 --- a/toolkit/components/autocomplete/Makefile.in +++ b/toolkit/components/autocomplete/Makefile.in @@ -10,5 +10,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/autocomplete/moz.build b/toolkit/components/autocomplete/moz.build index 457808f5893e..be3ce44b0ab5 100644 --- a/toolkit/components/autocomplete/moz.build +++ b/toolkit/components/autocomplete/moz.build @@ -26,3 +26,5 @@ LIBRARY_NAME = 'tkautocomplete' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/toolkit/components/build/Makefile.in b/toolkit/components/build/Makefile.in index d21c560de511..86e6c3303a7e 100644 --- a/toolkit/components/build/Makefile.in +++ b/toolkit/components/build/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = toolkitcomps EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../alerts \ -I$(srcdir)/../downloads \ diff --git a/toolkit/components/build/moz.build b/toolkit/components/build/moz.build index 5e15b2e60600..788691537f3c 100644 --- a/toolkit/components/build/moz.build +++ b/toolkit/components/build/moz.build @@ -14,3 +14,5 @@ CPP_SOURCES += [ 'nsToolkitCompsModule.cpp', ] +LIBXUL_LIBRARY = True + diff --git a/toolkit/components/commandlines/Makefile.in b/toolkit/components/commandlines/Makefile.in index 3fde84ec88c0..86f1a688612b 100644 --- a/toolkit/components/commandlines/Makefile.in +++ b/toolkit/components/commandlines/Makefile.in @@ -10,6 +10,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/commandlines/moz.build b/toolkit/components/commandlines/moz.build index 5136b0c04858..c437654e4f1c 100644 --- a/toolkit/components/commandlines/moz.build +++ b/toolkit/components/commandlines/moz.build @@ -23,3 +23,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'commandlines' +LIBXUL_LIBRARY = True + diff --git a/toolkit/components/ctypes/Makefile.in b/toolkit/components/ctypes/Makefile.in index 1951e36ee489..4da5d6d31ccb 100644 --- a/toolkit/components/ctypes/Makefile.in +++ b/toolkit/components/ctypes/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 LOCAL_INCLUDES := \ diff --git a/toolkit/components/ctypes/moz.build b/toolkit/components/ctypes/moz.build index b4fb8858a38e..89f87c771921 100644 --- a/toolkit/components/ctypes/moz.build +++ b/toolkit/components/ctypes/moz.build @@ -17,3 +17,6 @@ LIBRARY_NAME = 'jsctypes' EXTRA_JS_MODULES += [ 'ctypes.jsm', ] + +LIBXUL_LIBRARY = True + diff --git a/toolkit/components/diskspacewatcher/Makefile.in b/toolkit/components/diskspacewatcher/Makefile.in index 1570769ab46d..3fbfc9bc8a69 100644 --- a/toolkit/components/diskspacewatcher/Makefile.in +++ b/toolkit/components/diskspacewatcher/Makefile.in @@ -11,7 +11,5 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = diskspacewatcher EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/toolkit/components/diskspacewatcher/moz.build b/toolkit/components/diskspacewatcher/moz.build index 54f71d03d342..cf544546b512 100644 --- a/toolkit/components/diskspacewatcher/moz.build +++ b/toolkit/components/diskspacewatcher/moz.build @@ -18,3 +18,6 @@ MODULE = 'toolkitcomps' CPP_SOURCES = [ 'DiskSpaceWatcher.cpp', ] + +LIBXUL_LIBRARY = True + diff --git a/toolkit/components/downloads/Makefile.in b/toolkit/components/downloads/Makefile.in index afe129da352c..0d86b9cdd2d3 100644 --- a/toolkit/components/downloads/Makefile.in +++ b/toolkit/components/downloads/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = download_s -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk CXXFLAGS += $(TK_CFLAGS) -DGOOGLE_PROTOBUF_NO_RTTI diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build index 94119ab94c82..923a62e893ed 100644 --- a/toolkit/components/downloads/moz.build +++ b/toolkit/components/downloads/moz.build @@ -38,3 +38,5 @@ if not CONFIG['MOZ_SUITE']: FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/toolkit/components/feeds/Makefile.in b/toolkit/components/feeds/Makefile.in index e57faa8c180c..5e901809cddd 100644 --- a/toolkit/components/feeds/Makefile.in +++ b/toolkit/components/feeds/Makefile.in @@ -11,9 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MOZILLA_INTERNAL_API = 1 -LIBXUL_LIBRARY = 1 - - include $(topsrcdir)/config/rules.mk ABS_SRCDIR := $(call core_abspath,$(srcdir)) diff --git a/toolkit/components/feeds/moz.build b/toolkit/components/feeds/moz.build index 217ae550f807..da58c4e5c8e9 100644 --- a/toolkit/components/feeds/moz.build +++ b/toolkit/components/feeds/moz.build @@ -28,3 +28,5 @@ EXTRA_COMPONENTS += [ LIBRARY_NAME = 'feed_s' +LIBXUL_LIBRARY = True + diff --git a/toolkit/components/find/Makefile.in b/toolkit/components/find/Makefile.in deleted file mode 100644 index 35fbe699bd1a..000000000000 --- a/toolkit/components/find/Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/find/moz.build b/toolkit/components/find/moz.build index 3fbea87ecb77..309f200d7562 100644 --- a/toolkit/components/find/moz.build +++ b/toolkit/components/find/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'mozfind_s' +LIBXUL_LIBRARY = True + diff --git a/toolkit/components/intl/Makefile.in b/toolkit/components/intl/Makefile.in deleted file mode 100644 index dbc3e1df5120..000000000000 --- a/toolkit/components/intl/Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/intl/moz.build b/toolkit/components/intl/moz.build index 8bc9469bffdc..05f674cca0b0 100644 --- a/toolkit/components/intl/moz.build +++ b/toolkit/components/intl/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'intl_s' +LIBXUL_LIBRARY = True + diff --git a/toolkit/components/mediasniffer/Makefile.in b/toolkit/components/mediasniffer/Makefile.in index c6ac05050c6f..439bf2b73495 100644 --- a/toolkit/components/mediasniffer/Makefile.in +++ b/toolkit/components/mediasniffer/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = mediasniffer -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/mediasniffer/moz.build b/toolkit/components/mediasniffer/moz.build index 170af6670d53..c5230af2f64d 100644 --- a/toolkit/components/mediasniffer/moz.build +++ b/toolkit/components/mediasniffer/moz.build @@ -20,3 +20,6 @@ CPP_SOURCES += [ CSRCS += [ 'mp3sniff.c', ] + +LIBXUL_LIBRARY = True + diff --git a/toolkit/components/perf/Makefile.in b/toolkit/components/perf/Makefile.in index d06b73bf7645..038daa920234 100644 --- a/toolkit/components/perf/Makefile.in +++ b/toolkit/components/perf/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 LOCAL_INCLUDES := \ -I$(topsrcdir)/js/xpconnect/loader \ diff --git a/toolkit/components/perf/moz.build b/toolkit/components/perf/moz.build index 66c590cf3012..53c22822f504 100644 --- a/toolkit/components/perf/moz.build +++ b/toolkit/components/perf/moz.build @@ -18,3 +18,5 @@ EXTRA_JS_MODULES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/toolkit/components/reflect/Makefile.in b/toolkit/components/reflect/Makefile.in index f5f895d5c9a5..20a0aa89f9c8 100644 --- a/toolkit/components/reflect/Makefile.in +++ b/toolkit/components/reflect/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 EXTRA_DSO_LDOPTS += \ diff --git a/toolkit/components/reflect/moz.build b/toolkit/components/reflect/moz.build index 6565cf9dac13..06b933483fc8 100644 --- a/toolkit/components/reflect/moz.build +++ b/toolkit/components/reflect/moz.build @@ -15,3 +15,6 @@ LIBRARY_NAME = 'jsreflect' EXTRA_JS_MODULES += [ 'reflect.jsm', ] + +LIBXUL_LIBRARY = True + diff --git a/toolkit/components/remote/Makefile.in b/toolkit/components/remote/Makefile.in index dc5e01ebaec2..8382e419743a 100644 --- a/toolkit/components/remote/Makefile.in +++ b/toolkit/components/remote/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk CXXFLAGS += $(TK_CFLAGS) diff --git a/toolkit/components/remote/moz.build b/toolkit/components/remote/moz.build index 30f0ed985d40..fd0b8a303c07 100644 --- a/toolkit/components/remote/moz.build +++ b/toolkit/components/remote/moz.build @@ -27,3 +27,5 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'qt': LIBRARY_NAME = 'remoteservice' +LIBXUL_LIBRARY = True + diff --git a/toolkit/components/satchel/Makefile.in b/toolkit/components/satchel/Makefile.in index 760ce190d1d7..fff31c9f1d68 100644 --- a/toolkit/components/satchel/Makefile.in +++ b/toolkit/components/satchel/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 LOCAL_INCLUDES = \ diff --git a/toolkit/components/satchel/moz.build b/toolkit/components/satchel/moz.build index 3e00e792506c..513c9ecf450b 100644 --- a/toolkit/components/satchel/moz.build +++ b/toolkit/components/satchel/moz.build @@ -40,3 +40,5 @@ EXTRA_PP_JS_MODULES += [ 'FormHistory.jsm', ] +LIBXUL_LIBRARY = True + diff --git a/toolkit/components/startup/Makefile.in b/toolkit/components/startup/Makefile.in deleted file mode 100644 index d5ba5cb2e828..000000000000 --- a/toolkit/components/startup/Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -relativesrcdir = @relativesrcdir@ - -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/startup/moz.build b/toolkit/components/startup/moz.build index 9862c3327dc8..6a35932df6af 100644 --- a/toolkit/components/startup/moz.build +++ b/toolkit/components/startup/moz.build @@ -40,3 +40,5 @@ else: LIBRARY_NAME = 'appstartup_s' +LIBXUL_LIBRARY = True + diff --git a/toolkit/components/statusfilter/Makefile.in b/toolkit/components/statusfilter/Makefile.in deleted file mode 100644 index 18047041218f..000000000000 --- a/toolkit/components/statusfilter/Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 - - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/statusfilter/moz.build b/toolkit/components/statusfilter/moz.build index c636bc15e305..6f1925542487 100644 --- a/toolkit/components/statusfilter/moz.build +++ b/toolkit/components/statusfilter/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'mozbrwsr_s' +LIBXUL_LIBRARY = True + diff --git a/toolkit/components/telemetry/Makefile.in b/toolkit/components/telemetry/Makefile.in index 8c12c41af98a..a208b6508c36 100644 --- a/toolkit/components/telemetry/Makefile.in +++ b/toolkit/components/telemetry/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk USE_RCS_MK := 1 include $(topsrcdir)/config/makefiles/rcs.mk -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 LIBRARY_NAME = telemetry MSVC_ENABLE_PGO := 1 diff --git a/toolkit/components/telemetry/moz.build b/toolkit/components/telemetry/moz.build index a33372fab885..ca7b3b118d4b 100644 --- a/toolkit/components/telemetry/moz.build +++ b/toolkit/components/telemetry/moz.build @@ -39,3 +39,5 @@ EXTRA_JS_MODULES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/toolkit/components/typeaheadfind/Makefile.in b/toolkit/components/typeaheadfind/Makefile.in deleted file mode 100644 index 7948ee6dcd43..000000000000 --- a/toolkit/components/typeaheadfind/Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/typeaheadfind/moz.build b/toolkit/components/typeaheadfind/moz.build index 85cce02d8bf9..0ad7e810b4d3 100644 --- a/toolkit/components/typeaheadfind/moz.build +++ b/toolkit/components/typeaheadfind/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'fastfind_s' +LIBXUL_LIBRARY = True + diff --git a/toolkit/components/url-classifier/Makefile.in b/toolkit/components/url-classifier/Makefile.in index 82db7d8136f6..f47ac69579c0 100644 --- a/toolkit/components/url-classifier/Makefile.in +++ b/toolkit/components/url-classifier/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = \ -I$(srcdir)/../build \ $(SQLITE_CFLAGS) \ diff --git a/toolkit/components/url-classifier/moz.build b/toolkit/components/url-classifier/moz.build index 85c9f7f10a32..63061a47be25 100644 --- a/toolkit/components/url-classifier/moz.build +++ b/toolkit/components/url-classifier/moz.build @@ -50,3 +50,5 @@ EXTRA_JS_MODULES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/toolkit/crashreporter/Makefile.in b/toolkit/crashreporter/Makefile.in index 3003149fdf7d..bf40f1967779 100644 --- a/toolkit/crashreporter/Makefile.in +++ b/toolkit/crashreporter/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 LIBRARY_NAME = exception_handler_s MSVC_ENABLE_PGO := 1 diff --git a/toolkit/crashreporter/moz.build b/toolkit/crashreporter/moz.build index d42078a0134c..bd487aac6da0 100644 --- a/toolkit/crashreporter/moz.build +++ b/toolkit/crashreporter/moz.build @@ -77,3 +77,5 @@ EXTRA_JS_MODULES += [ 'KeyValueParser.jsm', ] +LIBXUL_LIBRARY = True + diff --git a/toolkit/devtools/server/Makefile.in b/toolkit/devtools/server/Makefile.in index 8fb5d07d2477..9402dbeb04eb 100644 --- a/toolkit/devtools/server/Makefile.in +++ b/toolkit/devtools/server/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 EXTRA_DSO_LDOPTS += \ diff --git a/toolkit/devtools/server/moz.build b/toolkit/devtools/server/moz.build index 3df17560c0b5..2dc564f92038 100644 --- a/toolkit/devtools/server/moz.build +++ b/toolkit/devtools/server/moz.build @@ -18,3 +18,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'jsinspector' +LIBXUL_LIBRARY = True + diff --git a/toolkit/identity/Makefile.in b/toolkit/identity/Makefile.in index 0e9648008493..fa79dcc3230f 100644 --- a/toolkit/identity/Makefile.in +++ b/toolkit/identity/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/toolkit/identity/moz.build b/toolkit/identity/moz.build index 40d61c327e41..e23934b982cf 100644 --- a/toolkit/identity/moz.build +++ b/toolkit/identity/moz.build @@ -34,3 +34,5 @@ EXTRA_JS_MODULES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/toolkit/mozapps/update/common/Makefile.in b/toolkit/mozapps/update/common/Makefile.in index 4295e12fd974..723847251077 100644 --- a/toolkit/mozapps/update/common/Makefile.in +++ b/toolkit/mozapps/update/common/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 ifeq ($(OS_ARCH),WINNT) USE_STATIC_LIBS = 1 endif diff --git a/toolkit/mozapps/update/common/moz.build b/toolkit/mozapps/update/common/moz.build index 4ef0ac5f2bd1..62a78a443f0e 100644 --- a/toolkit/mozapps/update/common/moz.build +++ b/toolkit/mozapps/update/common/moz.build @@ -32,3 +32,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'updatecommon' +LIBXUL_LIBRARY = True + diff --git a/toolkit/profile/Makefile.in b/toolkit/profile/Makefile.in index 181c931ac482..5cc9d5164722 100644 --- a/toolkit/profile/Makefile.in +++ b/toolkit/profile/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES = \ -I$(srcdir)/../xre \ -I$(topsrcdir)/profile/dirserviceprovider/src \ diff --git a/toolkit/profile/moz.build b/toolkit/profile/moz.build index 1a25b98f58b6..9e486f85616d 100644 --- a/toolkit/profile/moz.build +++ b/toolkit/profile/moz.build @@ -23,3 +23,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'profile_s' +LIBXUL_LIBRARY = True + diff --git a/toolkit/system/androidproxy/Makefile.in b/toolkit/system/androidproxy/Makefile.in index f630e3c4b2a6..ee5f5f18fb70 100644 --- a/toolkit/system/androidproxy/Makefile.in +++ b/toolkit/system/androidproxy/Makefile.in @@ -10,7 +10,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/system/androidproxy/moz.build b/toolkit/system/androidproxy/moz.build index 5aba33a496c4..7d9162112c7e 100644 --- a/toolkit/system/androidproxy/moz.build +++ b/toolkit/system/androidproxy/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'androidproxy' +LIBXUL_LIBRARY = True + diff --git a/toolkit/system/osxproxy/Makefile.in b/toolkit/system/osxproxy/Makefile.in index f630e3c4b2a6..ee5f5f18fb70 100644 --- a/toolkit/system/osxproxy/Makefile.in +++ b/toolkit/system/osxproxy/Makefile.in @@ -10,7 +10,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/system/osxproxy/moz.build b/toolkit/system/osxproxy/moz.build index 5c4f52fcbd2b..0e41354413f3 100644 --- a/toolkit/system/osxproxy/moz.build +++ b/toolkit/system/osxproxy/moz.build @@ -12,3 +12,5 @@ CMMSRCS += [ LIBRARY_NAME = 'osxproxy' +LIBXUL_LIBRARY = True + diff --git a/toolkit/system/unixproxy/Makefile.in b/toolkit/system/unixproxy/Makefile.in index c65a56bbac52..9a4052750b47 100644 --- a/toolkit/system/unixproxy/Makefile.in +++ b/toolkit/system/unixproxy/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - ifdef MOZ_ENABLE_LIBPROXY CXXFLAGS += $(MOZ_LIBPROXY_CFLAGS) endif # MOZ_ENABLE_LIBPROXY diff --git a/toolkit/system/unixproxy/moz.build b/toolkit/system/unixproxy/moz.build index 7fcd1fced89d..d9c89f37ccad 100644 --- a/toolkit/system/unixproxy/moz.build +++ b/toolkit/system/unixproxy/moz.build @@ -17,3 +17,5 @@ else: LIBRARY_NAME = 'unixproxy' +LIBXUL_LIBRARY = True + diff --git a/toolkit/system/windowsproxy/Makefile.in b/toolkit/system/windowsproxy/Makefile.in index f630e3c4b2a6..ee5f5f18fb70 100644 --- a/toolkit/system/windowsproxy/Makefile.in +++ b/toolkit/system/windowsproxy/Makefile.in @@ -10,7 +10,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - - include $(topsrcdir)/config/rules.mk diff --git a/toolkit/system/windowsproxy/moz.build b/toolkit/system/windowsproxy/moz.build index 3440bfc07f4e..4de00049cc92 100644 --- a/toolkit/system/windowsproxy/moz.build +++ b/toolkit/system/windowsproxy/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'windowsproxy' +LIBXUL_LIBRARY = True + diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in index ec693cac011d..7cdafe8616c0 100644 --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -19,8 +19,6 @@ milestone_txt = $(topsrcdir)/config/milestone.txt LIBRARY_NAME = xulapp_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - ifeq ($(MOZ_GL_DEFAULT_PROVIDER),GLX) DEFINES += -DUSE_GLX_TEST endif diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build index f16b6cfcc08d..e8f5cf0ddd50 100644 --- a/toolkit/xre/moz.build +++ b/toolkit/xre/moz.build @@ -93,3 +93,6 @@ if CONFIG['MOZ_UPDATER']: CPP_SOURCES += [ 'nsUpdateDriver.cpp', ] + +LIBXUL_LIBRARY = True + diff --git a/tools/trace-malloc/lib/Makefile.in b/tools/trace-malloc/lib/Makefile.in index b46b484855da..e53aa0b639ff 100644 --- a/tools/trace-malloc/lib/Makefile.in +++ b/tools/trace-malloc/lib/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 DEFFILE = $(win_srcdir)/tm.def -LIBXUL_LIBRARY = 1 - STL_FLAGS = CSRCS = \ diff --git a/tools/trace-malloc/lib/moz.build b/tools/trace-malloc/lib/moz.build index c4e57073c757..270ef3bd5ec8 100644 --- a/tools/trace-malloc/lib/moz.build +++ b/tools/trace-malloc/lib/moz.build @@ -22,3 +22,5 @@ if CONFIG['OS_ARCH'] == 'WINNT': LIBRARY_NAME = 'tracemalloc' +LIBXUL_LIBRARY = True + diff --git a/uriloader/base/Makefile.in b/uriloader/base/Makefile.in index 5742e8f437b5..7238228cb4ae 100644 --- a/uriloader/base/Makefile.in +++ b/uriloader/base/Makefile.in @@ -11,6 +11,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/uriloader/base/moz.build b/uriloader/base/moz.build index cc0f3e133c68..51993b6e2308 100644 --- a/uriloader/base/moz.build +++ b/uriloader/base/moz.build @@ -32,3 +32,5 @@ LIBRARY_NAME = 'uriloaderbase_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in index a0d397421f4f..98507f13c578 100644 --- a/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in @@ -34,7 +34,6 @@ endif VPATH := $(srcdir) $(srcdir)/$(OSDIR) LIBRARY_NAME = exthandler_s -LIBXUL_LIBRARY = 1 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CMMSRCS = nsOSHelperAppService.mm \ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build index 0b6afeff7f70..8f8c4c4156d8 100644 --- a/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build @@ -125,3 +125,5 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/uriloader/prefetch/Makefile.in b/uriloader/prefetch/Makefile.in index 4d8b2e0afc59..2afb56e1f80b 100644 --- a/uriloader/prefetch/Makefile.in +++ b/uriloader/prefetch/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = prefetch_s -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = \ -I$(topsrcdir)/content/base/src \ -I$(topsrcdir)/content/events/src \ diff --git a/uriloader/prefetch/moz.build b/uriloader/prefetch/moz.build index 74b30123aebc..8fca016cdac4 100644 --- a/uriloader/prefetch/moz.build +++ b/uriloader/prefetch/moz.build @@ -35,3 +35,5 @@ IPDL_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/view/src/Makefile.in b/view/src/Makefile.in index e08b0e598b3c..674b0e48ae19 100644 --- a/view/src/Makefile.in +++ b/view/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/view/src/moz.build b/view/src/moz.build index 9d67e943bfd5..abfa6a58623a 100644 --- a/view/src/moz.build +++ b/view/src/moz.build @@ -15,3 +15,5 @@ LIBRARY_NAME = 'gkview_s' FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/widget/android/Makefile.in b/widget/android/Makefile.in index a0aa81a50db0..2ab6b9c2e67e 100644 --- a/widget/android/Makefile.in +++ b/widget/android/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = widget_android EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a include $(topsrcdir)/config/rules.mk diff --git a/widget/android/moz.build b/widget/android/moz.build index 7d62bcd8f4d4..2edf650b975b 100644 --- a/widget/android/moz.build +++ b/widget/android/moz.build @@ -40,3 +40,5 @@ CPP_SOURCES += [ FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/widget/cocoa/Makefile.in b/widget/cocoa/Makefile.in index 183c99ca9228..1a09dc51c937 100644 --- a/widget/cocoa/Makefile.in +++ b/widget/cocoa/Makefile.in @@ -11,10 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - - - CMMSRCS = \ nsBidiKeyboard.mm \ nsClipboard.mm \ diff --git a/widget/cocoa/moz.build b/widget/cocoa/moz.build index dea60daf5374..23fdf03d3455 100644 --- a/widget/cocoa/moz.build +++ b/widget/cocoa/moz.build @@ -21,3 +21,5 @@ EXPORTS += [ LIBRARY_NAME = 'widget_mac' +LIBXUL_LIBRARY = True + diff --git a/widget/gonk/Makefile.in b/widget/gonk/Makefile.in index 617780d89626..cc3b8802a936 100644 --- a/widget/gonk/Makefile.in +++ b/widget/gonk/Makefile.in @@ -24,8 +24,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = widget_gonk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a include $(topsrcdir)/config/rules.mk diff --git a/widget/gonk/moz.build b/widget/gonk/moz.build index 8bd0de5ba5dd..cdc09c309004 100644 --- a/widget/gonk/moz.build +++ b/widget/gonk/moz.build @@ -60,3 +60,6 @@ if CONFIG['ANDROID_VERSION'] == '15': CPP_SOURCES += [ 'HwcComposer2D.cpp' ] + +LIBXUL_LIBRARY = True + diff --git a/widget/gonk/nativewindow/Makefile.in b/widget/gonk/nativewindow/Makefile.in index f9355a696596..204df9618e1a 100644 --- a/widget/gonk/nativewindow/Makefile.in +++ b/widget/gonk/nativewindow/Makefile.in @@ -19,7 +19,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nativewindow -LIBXUL_LIBRARY = 1 STL_FLAGS= include $(topsrcdir)/config/rules.mk diff --git a/widget/gonk/nativewindow/moz.build b/widget/gonk/nativewindow/moz.build index da8d1d239ef8..8598e2e4799d 100644 --- a/widget/gonk/nativewindow/moz.build +++ b/widget/gonk/nativewindow/moz.build @@ -34,3 +34,5 @@ if CONFIG['MOZ_B2G_CAMERA'] or CONFIG['MOZ_OMX_DECODER']: FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in index 415d617b0bd1..a162a1f74658 100644 --- a/widget/gtk2/Makefile.in +++ b/widget/gtk2/Makefile.in @@ -17,7 +17,6 @@ LIBRARY_NAME = widget_gtk3 endif EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 NATIVE_THEME_SUPPORT = 1 diff --git a/widget/gtk2/moz.build b/widget/gtk2/moz.build index 8e76427ead20..3d61e15e7245 100644 --- a/widget/gtk2/moz.build +++ b/widget/gtk2/moz.build @@ -56,3 +56,5 @@ if CONFIG['MOZ_X11']: FAIL_ON_WARNINGS = True +LIBXUL_LIBRARY = True + diff --git a/widget/gtkxtbin/Makefile.in b/widget/gtkxtbin/Makefile.in index a1ba37e3a37f..c84d0971d73c 100644 --- a/widget/gtkxtbin/Makefile.in +++ b/widget/gtkxtbin/Makefile.in @@ -12,8 +12,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - ifdef MOZ_ENABLE_GTK2 CSRCS = \ gtk2xtbin.c \ diff --git a/widget/gtkxtbin/moz.build b/widget/gtkxtbin/moz.build index 5e9a3c87c1a8..5e1fa80cf2bc 100644 --- a/widget/gtkxtbin/moz.build +++ b/widget/gtkxtbin/moz.build @@ -12,3 +12,5 @@ EXPORTS += [ LIBRARY_NAME = 'gtkxtbin' +LIBXUL_LIBRARY = True + diff --git a/widget/os2/Makefile.in b/widget/os2/Makefile.in index 0de7b07f6bd9..d641a02cea64 100644 --- a/widget/os2/Makefile.in +++ b/widget/os2/Makefile.in @@ -12,9 +12,6 @@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 RESFILE = widget.res -LIBXUL_LIBRARY = 1 - - SHARED_LIBRARY_LIBS = \ ../xpwidgets/$(LIB_PREFIX)xpwidgets_s.$(LIB_SUFFIX) \ $(NULL) diff --git a/widget/os2/moz.build b/widget/os2/moz.build index ba01ca3c6442..4a28ff7d176d 100644 --- a/widget/os2/moz.build +++ b/widget/os2/moz.build @@ -29,3 +29,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'wdgtos2' +LIBXUL_LIBRARY = True + diff --git a/widget/qt/Makefile.in b/widget/qt/Makefile.in index 499ba901b0ce..abc779c40fdd 100644 --- a/widget/qt/Makefile.in +++ b/widget/qt/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = widget_qt EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - SHARED_LIBRARY_LIBS = ../xpwidgets/libxpwidgets_s.a include $(topsrcdir)/config/rules.mk diff --git a/widget/qt/moz.build b/widget/qt/moz.build index ae33020d2c09..4c66ce6b55bd 100644 --- a/widget/qt/moz.build +++ b/widget/qt/moz.build @@ -50,3 +50,6 @@ if CONFIG[' MOZ_ENABLE_QTMOBILITY']: 'moc_mozqorientationsensorfilter.cpp', 'mozqorientationsensorfilter.cpp', ] + +LIBXUL_LIBRARY = True + diff --git a/widget/shared/Makefile.in b/widget/shared/Makefile.in index 95af13927349..bbf65964fde1 100644 --- a/widget/shared/Makefile.in +++ b/widget/shared/Makefile.in @@ -11,8 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = widget_shared -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/widget/shared/moz.build b/widget/shared/moz.build index 9ea0dc4b4c3a..190f4111a4e1 100644 --- a/widget/shared/moz.build +++ b/widget/shared/moz.build @@ -14,3 +14,5 @@ CPP_SOURCES += [ 'nsShmImage.cpp', ] +LIBXUL_LIBRARY = True + diff --git a/widget/shared/x11/Makefile.in b/widget/shared/x11/Makefile.in index 819b6fc06f30..51a0b644759e 100644 --- a/widget/shared/x11/Makefile.in +++ b/widget/shared/x11/Makefile.in @@ -11,9 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = widget_shared_x11 -LIBXUL_LIBRARY = 1 - - CSRCS = \ keysym2ucs.c \ $(NULL) diff --git a/widget/shared/x11/moz.build b/widget/shared/x11/moz.build index 41a76827ca6f..6ca115674ece 100644 --- a/widget/shared/x11/moz.build +++ b/widget/shared/x11/moz.build @@ -6,3 +6,5 @@ MODULE = 'widget' +LIBXUL_LIBRARY = True + diff --git a/widget/windows/Makefile.in b/widget/windows/Makefile.in index 3d72c1442a95..8fc92b68f713 100644 --- a/widget/windows/Makefile.in +++ b/widget/windows/Makefile.in @@ -14,8 +14,6 @@ LIBRARY_NAME = widget_windows MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 RESFILE = widget.res -LIBXUL_LIBRARY = 1 - DEFINES += -DMOZ_UNICODE ifdef MOZ_ENABLE_D3D9_LAYER diff --git a/widget/windows/moz.build b/widget/windows/moz.build index f3c3c859a5ad..a4369ab0a9b1 100644 --- a/widget/windows/moz.build +++ b/widget/windows/moz.build @@ -81,3 +81,6 @@ if CONFIG['NS_ENABLE_TSF']: CPP_SOURCES += [ 'nsTextStore.cpp', ] + +LIBXUL_LIBRARY = True + diff --git a/widget/windows/winrt/Makefile.in b/widget/windows/winrt/Makefile.in index adfdbc3899d1..27a0671307cb 100644 --- a/widget/windows/winrt/Makefile.in +++ b/widget/windows/winrt/Makefile.in @@ -11,8 +11,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = widget_winrt EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - DEFINES += -DMOZ_UNICODE ifdef MOZ_ENABLE_D3D9_LAYER diff --git a/widget/windows/winrt/moz.build b/widget/windows/winrt/moz.build index 2e3fe0bcd832..b2ba9e971868 100644 --- a/widget/windows/winrt/moz.build +++ b/widget/windows/winrt/moz.build @@ -27,3 +27,5 @@ EXTRA_COMPONENTS += [ 'MetroUIUtils.manifest', ] +LIBXUL_LIBRARY = True + diff --git a/widget/xpwidgets/Makefile.in b/widget/xpwidgets/Makefile.in index fa345bf80b94..c098f12f01b1 100644 --- a/widget/xpwidgets/Makefile.in +++ b/widget/xpwidgets/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = xpwidgets_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 - SHARED_LIBRARY_LIBS = ../shared/$(LIB_PREFIX)widget_shared.$(LIB_SUFFIX) ifdef MOZ_X11 SHARED_LIBRARY_LIBS += ../shared/x11/$(LIB_PREFIX)widget_shared_x11.$(LIB_SUFFIX) diff --git a/widget/xpwidgets/moz.build b/widget/xpwidgets/moz.build index 8a7e0b667c13..0d2ce6a0acbf 100644 --- a/widget/xpwidgets/moz.build +++ b/widget/xpwidgets/moz.build @@ -54,3 +54,6 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('qt', 'gtk2', 'gtk3', 'windows', 'cocoa'): CPP_SOURCES += [ 'nsNativeTheme.cpp', ] + +LIBXUL_LIBRARY = True + diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in index de07083a71c8..a52c3f4dde9c 100644 --- a/xpcom/base/Makefile.in +++ b/xpcom/base/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = xpcombase_s MSVC_ENABLE_PGO := 1 MOZILLA_INTERNAL_API =1 -LIBXUL_LIBRARY = 1 - CSRCS = \ nsErrorAssertsC.c \ $(NULL) diff --git a/xpcom/base/moz.build b/xpcom/base/moz.build index b8a7148e3e20..68c95e251e5a 100644 --- a/xpcom/base/moz.build +++ b/xpcom/base/moz.build @@ -125,3 +125,6 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': CPP_SOURCES += [ 'nsCrashOnException.cpp', ] + +LIBXUL_LIBRARY = True + diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in index 2592ff88f4c3..9d6c9949c83d 100644 --- a/xpcom/build/Makefile.in +++ b/xpcom/build/Makefile.in @@ -16,7 +16,6 @@ EXTRA_DEPS += $(srcdir)/../glue/objs.mk LIBRARY_NAME = xpcom_core MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 MOZILLA_INTERNAL_API = 1 diff --git a/xpcom/build/moz.build b/xpcom/build/moz.build index ff4ecc635504..7dcefca4b909 100644 --- a/xpcom/build/moz.build +++ b/xpcom/build/moz.build @@ -51,3 +51,6 @@ CPP_SOURCES += [ 'nsXPCOMStrings.cpp', 'nsXPComInit.cpp', ] + +LIBXUL_LIBRARY = True + diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in index bc813c2fd634..0015c606d397 100644 --- a/xpcom/components/Makefile.in +++ b/xpcom/components/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 MOZILLA_INTERNAL_API = 1 LOCAL_INCLUDES = \ diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build index a9d5ac242357..3b4e4d936b4d 100644 --- a/xpcom/components/moz.build +++ b/xpcom/components/moz.build @@ -37,3 +37,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'xpcomcomponents_s' +LIBXUL_LIBRARY = True + diff --git a/xpcom/ds/Makefile.in b/xpcom/ds/Makefile.in index 9d4b81f5077f..9b221d0bc5ee 100644 --- a/xpcom/ds/Makefile.in +++ b/xpcom/ds/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 MOZILLA_INTERNAL_API = 1 include $(topsrcdir)/config/rules.mk diff --git a/xpcom/ds/moz.build b/xpcom/ds/moz.build index 9799f0d48e06..e02b59e7b52a 100644 --- a/xpcom/ds/moz.build +++ b/xpcom/ds/moz.build @@ -116,3 +116,5 @@ EXTRA_COMPONENTS += [ LIBRARY_NAME = 'xpcomds_s' +LIBXUL_LIBRARY = True + diff --git a/xpcom/glue/tests/gtest/Makefile.in b/xpcom/glue/tests/gtest/Makefile.in index 3540438580d7..ea55dfe0b133 100644 --- a/xpcom/glue/tests/gtest/Makefile.in +++ b/xpcom/glue/tests/gtest/Makefile.in @@ -11,8 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES = -I$(srcdir)/../.. include $(topsrcdir)/config/rules.mk diff --git a/xpcom/glue/tests/gtest/moz.build b/xpcom/glue/tests/gtest/moz.build index af85175e6bab..cfe7413f1572 100644 --- a/xpcom/glue/tests/gtest/moz.build +++ b/xpcom/glue/tests/gtest/moz.build @@ -12,3 +12,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'xpcom_glue_gtest' +LIBXUL_LIBRARY = True + diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in index 8b9d8a727efe..529f0213f0de 100644 --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = xpcomio_s MSVC_ENABLE_PGO := 1 MOZILLA_INTERNAL_API = 1 -LIBXUL_LIBRARY = 1 - include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/xpcom/io/moz.build b/xpcom/io/moz.build index e245d3e9e7af..db029f24eab0 100644 --- a/xpcom/io/moz.build +++ b/xpcom/io/moz.build @@ -117,8 +117,10 @@ CPP_SOURCES += [ 'nsWildCard.cpp', ] - if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': CMMSRCS += [ 'CocoaFileUtils.mm', ] + +LIBXUL_LIBRARY = True + diff --git a/xpcom/threads/Makefile.in b/xpcom/threads/Makefile.in index 095ce6e04669..116e50836f19 100644 --- a/xpcom/threads/Makefile.in +++ b/xpcom/threads/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 MOZILLA_INTERNAL_API = 1 -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES = -I$(srcdir)/../components LOCAL_INCLUDES = -I$(srcdir)/../build diff --git a/xpcom/threads/moz.build b/xpcom/threads/moz.build index f145779123de..714f39556516 100644 --- a/xpcom/threads/moz.build +++ b/xpcom/threads/moz.build @@ -51,3 +51,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'xpcomthreads_s' +LIBXUL_LIBRARY = True + diff --git a/xpcom/typelib/xpt/src/Makefile.in b/xpcom/typelib/xpt/src/Makefile.in index a1a9667c424f..61bfaaa6d37b 100644 --- a/xpcom/typelib/xpt/src/Makefile.in +++ b/xpcom/typelib/xpt/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 DIST_INSTALL = 1 USE_STATIC_LIBS = 1 diff --git a/xpcom/typelib/xpt/src/moz.build b/xpcom/typelib/xpt/src/moz.build index cc15578956a0..eb807a209a17 100644 --- a/xpcom/typelib/xpt/src/moz.build +++ b/xpcom/typelib/xpt/src/moz.build @@ -8,3 +8,5 @@ MODULE = 'xpcom' LIBRARY_NAME = 'xpt' +LIBXUL_LIBRARY = True + diff --git a/xpfe/appshell/src/Makefile.in b/xpfe/appshell/src/Makefile.in index 1df09bc94f4f..6aa9ee2fefdb 100644 --- a/xpfe/appshell/src/Makefile.in +++ b/xpfe/appshell/src/Makefile.in @@ -12,8 +12,6 @@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - LOCAL_INCLUDES += -I$(topsrcdir)/dom/base include $(topsrcdir)/config/rules.mk diff --git a/xpfe/appshell/src/moz.build b/xpfe/appshell/src/moz.build index 47ac194438f3..aee1e868bcac 100644 --- a/xpfe/appshell/src/moz.build +++ b/xpfe/appshell/src/moz.build @@ -21,3 +21,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'nsappshell' +LIBXUL_LIBRARY = True + diff --git a/xpfe/components/build/Makefile.in b/xpfe/components/build/Makefile.in index c0957e044dc8..9320543d3472 100644 --- a/xpfe/components/build/Makefile.in +++ b/xpfe/components/build/Makefile.in @@ -12,9 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = appcomps EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 - -# General includes SHARED_LIBRARY_LIBS += ../directory/$(LIB_PREFIX)directory_s.$(LIB_SUFFIX) LOCAL_INCLUDES += -I$(srcdir)/../directory diff --git a/xpfe/components/build/moz.build b/xpfe/components/build/moz.build index d8dc7b191cf1..b3ffd0e6f381 100644 --- a/xpfe/components/build/moz.build +++ b/xpfe/components/build/moz.build @@ -10,3 +10,5 @@ CPP_SOURCES += [ 'nsModule.cpp', ] +LIBXUL_LIBRARY = True + diff --git a/xpfe/components/directory/Makefile.in b/xpfe/components/directory/Makefile.in deleted file mode 100644 index fd7e82c17af4..000000000000 --- a/xpfe/components/directory/Makefile.in +++ /dev/null @@ -1,16 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -LIBXUL_LIBRARY = 1 - -include $(topsrcdir)/config/rules.mk - diff --git a/xpfe/components/directory/moz.build b/xpfe/components/directory/moz.build index 154a0a79449f..576a12f41321 100644 --- a/xpfe/components/directory/moz.build +++ b/xpfe/components/directory/moz.build @@ -18,3 +18,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'directory_s' +LIBXUL_LIBRARY = True + diff --git a/xpfe/components/windowds/Makefile.in b/xpfe/components/windowds/Makefile.in index 1ef51eae8ff0..6cb0ce06bfe5 100644 --- a/xpfe/components/windowds/Makefile.in +++ b/xpfe/components/windowds/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 diff --git a/xpfe/components/windowds/moz.build b/xpfe/components/windowds/moz.build index 22d7ffedf18a..f932234311bd 100644 --- a/xpfe/components/windowds/moz.build +++ b/xpfe/components/windowds/moz.build @@ -18,3 +18,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'windowds' +LIBXUL_LIBRARY = True + From 987ec661d34fdcf87f44709632db8ad69a78eb06 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:56:01 +0200 Subject: [PATCH 68/79] Bug 883284 - Part g: Move conditional LIBXUL_LIBRARY assignments into moz.build; r=gps --- content/xul/content/src/Makefile.in | 1 - content/xul/content/src/moz.build | 2 ++ dom/bluetooth/Makefile.in | 1 - dom/bluetooth/moz.build | 1 + gfx/graphite2/src/Makefile.in | 2 -- gfx/graphite2/src/moz.build | 6 ++++++ gfx/harfbuzz/src/Makefile.in | 4 +--- gfx/harfbuzz/src/moz.build | 6 ++++++ gfx/ots/src/Makefile.in | 2 -- gfx/ots/src/moz.build | 6 ++++++ netwerk/cookie/Makefile.in | 2 -- netwerk/cookie/moz.build | 3 +++ toolkit/components/filepicker/Makefile.in | 1 - toolkit/components/filepicker/moz.build | 1 + .../components/parentalcontrols/Makefile.in | 19 ------------------- toolkit/components/parentalcontrols/moz.build | 12 ++++++------ toolkit/components/places/Makefile.in | 1 - toolkit/components/places/moz.build | 2 ++ tools/profiler/Makefile.in | 1 - tools/profiler/moz.build | 1 + 20 files changed, 35 insertions(+), 39 deletions(-) delete mode 100644 toolkit/components/parentalcontrols/Makefile.in diff --git a/content/xul/content/src/Makefile.in b/content/xul/content/src/Makefile.in index 398004ebb15a..82fa0cafc9f4 100644 --- a/content/xul/content/src/Makefile.in +++ b/content/xul/content/src/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk ifdef MOZ_XUL MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 endif include $(topsrcdir)/config/rules.mk diff --git a/content/xul/content/src/moz.build b/content/xul/content/src/moz.build index 1b70a59c45d8..4f5dc025356f 100644 --- a/content/xul/content/src/moz.build +++ b/content/xul/content/src/moz.build @@ -7,6 +7,8 @@ MODULE = 'xul' if CONFIG['MOZ_XUL']: + LIBXUL_LIBRARY = True + CPP_SOURCES += [ 'nsXULElement.cpp', 'nsXULPopupListener.cpp', diff --git a/dom/bluetooth/Makefile.in b/dom/bluetooth/Makefile.in index 6e62298b7cf9..5cde0888f11d 100644 --- a/dom/bluetooth/Makefile.in +++ b/dom/bluetooth/Makefile.in @@ -24,7 +24,6 @@ VPATH += $(srcdir)/ipc ifneq (,$(MOZ_B2G_BT)) LIBRARY_NAME = dombluetooth_s -LIBXUL_LIBRARY = 1 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) VPATH += \ diff --git a/dom/bluetooth/moz.build b/dom/bluetooth/moz.build index 0da9c0af22db..5b4b54cef02b 100644 --- a/dom/bluetooth/moz.build +++ b/dom/bluetooth/moz.build @@ -15,6 +15,7 @@ # limitations under the License. if CONFIG['MOZ_B2G_BT']: + LIBXUL_LIBRARY = True MODULE = 'dom' XPIDL_MODULE = 'dom_bluetooth' XPIDL_SOURCES += [ diff --git a/gfx/graphite2/src/Makefile.in b/gfx/graphite2/src/Makefile.in index b7067fd9fe0e..142c69fee42d 100644 --- a/gfx/graphite2/src/Makefile.in +++ b/gfx/graphite2/src/Makefile.in @@ -27,8 +27,6 @@ MSVC_ENABLE_PGO := 1 ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = FORCE_STATIC_LIB = 1 -else -LIBXUL_LIBRARY = 1 endif ifeq (WINNT,$(OS_TARGET)) diff --git a/gfx/graphite2/src/moz.build b/gfx/graphite2/src/moz.build index 77bd7cbe8ca5..90e937f98dbd 100644 --- a/gfx/graphite2/src/moz.build +++ b/gfx/graphite2/src/moz.build @@ -6,6 +6,12 @@ MODULE = 'graphite2' +if CONFIG['OS_TARGET'] != 'WINNT': + LIBXUL_LIBRARY = True +else: + # FORCE_STATIC_LIB = True + pass + # This should contain all of the _PUBLIC_HEADERS from files.mk EXPORTS.graphite2 += [ '../include/graphite2/Font.h', diff --git a/gfx/harfbuzz/src/Makefile.in b/gfx/harfbuzz/src/Makefile.in index f7479e374271..836c5f83b6d4 100644 --- a/gfx/harfbuzz/src/Makefile.in +++ b/gfx/harfbuzz/src/Makefile.in @@ -33,9 +33,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk MSVC_ENABLE_PGO := 1 -ifneq ($(OS_ARCH),WINNT) -LIBXUL_LIBRARY = 1 -else +ifeq ($(OS_ARCH),WINNT) FORCE_STATIC_LIB = 1 endif diff --git a/gfx/harfbuzz/src/moz.build b/gfx/harfbuzz/src/moz.build index cb2b1f52f581..a227f1d07422 100644 --- a/gfx/harfbuzz/src/moz.build +++ b/gfx/harfbuzz/src/moz.build @@ -6,6 +6,12 @@ MODULE = 'harfbuzz' +if CONFIG['OS_ARCH'] != 'WINNT': + LIBXUL_LIBRARY = True +else: + # FORCE_STATIC_LIB = True + pass + EXPORTS.harfbuzz += [ 'hb-blob.h', 'hb-buffer.h', diff --git a/gfx/ots/src/Makefile.in b/gfx/ots/src/Makefile.in index ff582f524ffb..ca44278cd357 100644 --- a/gfx/ots/src/Makefile.in +++ b/gfx/ots/src/Makefile.in @@ -37,8 +37,6 @@ MSVC_ENABLE_PGO := 1 ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = FORCE_STATIC_LIB = 1 -else -LIBXUL_LIBRARY = 1 endif CSRCS = \ diff --git a/gfx/ots/src/moz.build b/gfx/ots/src/moz.build index d22b50dd13ce..73d35197b432 100644 --- a/gfx/ots/src/moz.build +++ b/gfx/ots/src/moz.build @@ -6,6 +6,12 @@ MODULE = 'ots' +if CONFIG['OS_TARGET'] != 'WINNT': + LIBXUL_LIBRARY = True +else: + # FORCE_STATIC_LIB = True + pass + EXPORTS += [ '../include/opentype-sanitiser.h', '../include/ots-memory-stream.h', diff --git a/netwerk/cookie/Makefile.in b/netwerk/cookie/Makefile.in index 2090ea61bef6..995a377a85f1 100644 --- a/netwerk/cookie/Makefile.in +++ b/netwerk/cookie/Makefile.in @@ -11,11 +11,9 @@ relativesrcdir = @relativesrcdir@ include $(DEPTH)/config/autoconf.mk -# export required interfaces, even if --disable-cookies has been given ifdef NECKO_COOKIES LIBRARY_NAME = neckocookie_s MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 LOCAL_INCLUDES = \ -I$(topsrcdir)/intl/uconv/src \ diff --git a/netwerk/cookie/moz.build b/netwerk/cookie/moz.build index d07a9f4f29f5..cb2e6c1ed98a 100644 --- a/netwerk/cookie/moz.build +++ b/netwerk/cookie/moz.build @@ -4,6 +4,7 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +# export required interfaces, even if --disable-cookies has been given XPIDL_SOURCES += [ 'nsICookie.idl', 'nsICookie2.idl', @@ -18,6 +19,8 @@ XPIDL_MODULE = 'necko_cookie' MODULE = 'necko' if CONFIG['NECKO_COOKIES']: + LIBXUL_LIBRARY = True + EXPORTS.mozilla.net = [ 'CookieServiceParent.h', 'CookieServiceChild.h', diff --git a/toolkit/components/filepicker/Makefile.in b/toolkit/components/filepicker/Makefile.in index 708c8a443458..3ab977f8b595 100644 --- a/toolkit/components/filepicker/Makefile.in +++ b/toolkit/components/filepicker/Makefile.in @@ -14,7 +14,6 @@ include $(DEPTH)/config/autoconf.mk ifdef MOZ_XUL ifeq (,$(filter android qt os2 cocoa windows,$(MOZ_WIDGET_TOOLKIT))) EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 endif endif diff --git a/toolkit/components/filepicker/moz.build b/toolkit/components/filepicker/moz.build index 701972b9b84d..fe19915a3d3f 100644 --- a/toolkit/components/filepicker/moz.build +++ b/toolkit/components/filepicker/moz.build @@ -6,6 +6,7 @@ if CONFIG['MOZ_XUL'] and \ CONFIG['MOZ_WIDGET_TOOLKIT'] not in ('android', 'qt', 'os2', 'cocoa', 'windows'): + LIBXUL_LIBRARY = True MODULE = 'filepicker' LIBRARY_NAME = 'fileview' XPIDL_SOURCES += [ diff --git a/toolkit/components/parentalcontrols/Makefile.in b/toolkit/components/parentalcontrols/Makefile.in deleted file mode 100644 index 54eb37cda169..000000000000 --- a/toolkit/components/parentalcontrols/Makefile.in +++ /dev/null @@ -1,19 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -ifndef MOZ_DISABLE_PARENTAL_CONTROLS -ifeq (WINNT,$(OS_ARCH)) -LIBXUL_LIBRARY = 1 -endif -endif - -include $(topsrcdir)/config/rules.mk diff --git a/toolkit/components/parentalcontrols/moz.build b/toolkit/components/parentalcontrols/moz.build index be3118c91152..cbd5d4b79eb9 100644 --- a/toolkit/components/parentalcontrols/moz.build +++ b/toolkit/components/parentalcontrols/moz.build @@ -10,9 +10,9 @@ XPIDL_SOURCES += [ MODULE = 'parentalcontrols' -if not CONFIG['MOZ_DISABLE_PARENTAL_CONTROLS']: - if CONFIG['OS_ARCH'] == 'WINNT': - LIBRARY_NAME = 'parentalcontrols_s' - CPP_SOURCES += [ - 'nsParentalControlsServiceWin.cpp', - ] +if not CONFIG['MOZ_DISABLE_PARENTAL_CONTROLS'] and CONFIG['OS_ARCH'] == 'WINNT': + LIBXUL_LIBRARY = True + LIBRARY_NAME = 'parentalcontrols_s' + CPP_SOURCES += [ + 'nsParentalControlsServiceWin.cpp', + ] diff --git a/toolkit/components/places/Makefile.in b/toolkit/components/places/Makefile.in index b0d14d089b7e..34e11032c37f 100644 --- a/toolkit/components/places/Makefile.in +++ b/toolkit/components/places/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk ifdef MOZ_PLACES LIBRARY_NAME = places MSVC_ENABLE_PGO := 1 -LIBXUL_LIBRARY = 1 EXPORT_LIBRARY = 1 LOCAL_INCLUDES += -I$(srcdir)/../build diff --git a/toolkit/components/places/moz.build b/toolkit/components/places/moz.build index 56e8f964982c..47ce150d808e 100644 --- a/toolkit/components/places/moz.build +++ b/toolkit/components/places/moz.build @@ -12,6 +12,8 @@ XPIDL_SOURCES += [ ] if CONFIG['MOZ_PLACES']: + LIBXUL_LIBRARY = True + XPIDL_SOURCES += [ 'mozIAsyncFavicons.idl', 'mozIAsyncHistory.idl', diff --git a/tools/profiler/Makefile.in b/tools/profiler/Makefile.in index 181f84624206..1724fcc89efe 100644 --- a/tools/profiler/Makefile.in +++ b/tools/profiler/Makefile.in @@ -24,7 +24,6 @@ DEFINES += -DARCH_ARMV6 endif EXPORT_LIBRARY = 1 -LIBXUL_LIBRARY = 1 # Uncomment for better debugging in opt builds #MOZ_OPTIMIZE_FLAGS += -O0 -g diff --git a/tools/profiler/moz.build b/tools/profiler/moz.build index 02e2fa0eb9f4..f2972ab28c4d 100644 --- a/tools/profiler/moz.build +++ b/tools/profiler/moz.build @@ -7,6 +7,7 @@ if CONFIG['MOZ_ENABLE_PROFILER_SPS']: FAIL_ON_WARNINGS = not CONFIG['_MSC_VER'] + LIBXUL_LIBRARY = True MODULE = 'profiler' LIBRARY_NAME = 'profiler' From d4017cbff6337dbe4fd459870147eae72e5649ed Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:56:01 +0200 Subject: [PATCH 69/79] Bug 883284 - Part h: Disallow LIBXUL_LIBRARY in Makefiles; r=khuey --- config/rules.mk | 1 + js/src/config/rules.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/config/rules.mk b/config/rules.mk index a05a7a714601..deb830442a97 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -24,6 +24,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \ GTEST_CSRCS \ HOST_CSRCS \ HOST_LIBRARY_NAME \ + LIBXUL_LIBRARY \ MODULE \ NO_DIST_INSTALL \ PARALLEL_DIRS \ diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk index a05a7a714601..deb830442a97 100644 --- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -24,6 +24,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \ GTEST_CSRCS \ HOST_CSRCS \ HOST_LIBRARY_NAME \ + LIBXUL_LIBRARY \ MODULE \ NO_DIST_INSTALL \ PARALLEL_DIRS \ From c3da57d8117353fc04f205216f484aa1f01c281c Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:56:01 +0200 Subject: [PATCH 70/79] Bug 904831 - Part a: Support MSVC_ENABLE_PGO in moz.build; r=gps --- python/mozbuild/mozbuild/frontend/emitter.py | 1 + python/mozbuild/mozbuild/frontend/sandbox_symbols.py | 4 ++++ .../mozbuild/test/backend/data/variable_passthru/moz.build | 1 + python/mozbuild/mozbuild/test/backend/test_recursivemake.py | 3 +++ .../mozbuild/test/frontend/data/variable-passthru/moz.build | 1 + python/mozbuild/mozbuild/test/frontend/test_emitter.py | 1 + 6 files changed, 11 insertions(+) diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py index 3acb662b4de1..93932c6954e4 100644 --- a/python/mozbuild/mozbuild/frontend/emitter.py +++ b/python/mozbuild/mozbuild/frontend/emitter.py @@ -134,6 +134,7 @@ class TreeMetadataEmitter(LoggingMixin): LIBS='LIBS', LIBXUL_LIBRARY='LIBXUL_LIBRARY', MODULE='MODULE', + MSVC_ENABLE_PGO='MSVC_ENABLE_PGO', SDK_LIBRARY='SDK_LIBRARY', SHARED_LIBRARY_LIBS='SHARED_LIBRARY_LIBS', SIMPLE_PROGRAMS='SIMPLE_PROGRAMS', diff --git a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py index e288b6068196..80b9a7f09bf9 100644 --- a/python/mozbuild/mozbuild/frontend/sandbox_symbols.py +++ b/python/mozbuild/mozbuild/frontend/sandbox_symbols.py @@ -215,6 +215,10 @@ VARIABLES = { Implies MOZILLA_INTERNAL_API. """), + 'MSVC_ENABLE_PGO': (bool, bool, False, + """Whether profile-guided optimization is enabled in this directory. + """), + 'SDK_LIBRARY': (StrictOrderingOnAppendList, list, [], """Elements of the distributed SDK. diff --git a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build b/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build index f208953a9e44..3f4270c0c3d9 100644 --- a/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build +++ b/python/mozbuild/mozbuild/test/backend/data/variable_passthru/moz.build @@ -42,3 +42,4 @@ SSRCS = ['bar.S', 'foo.S'] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True diff --git a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py index 23c3839d8e14..ff411d2701c2 100644 --- a/python/mozbuild/mozbuild/test/backend/test_recursivemake.py +++ b/python/mozbuild/mozbuild/test/backend/test_recursivemake.py @@ -207,6 +207,9 @@ class TestRecursiveMakeBackend(BackendTester): 'LIBXUL_LIBRARY': [ 'LIBXUL_LIBRARY := 1', ], + 'MSVC_ENABLE_PGO': [ + 'MSVC_ENABLE_PGO := 1', + ], 'SDK_LIBRARY': [ 'SDK_LIBRARY += bar.sdk', 'SDK_LIBRARY += foo.sdk', diff --git a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build b/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build index 57db2a16aa13..16a0a48d3916 100644 --- a/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build +++ b/python/mozbuild/mozbuild/test/frontend/data/variable-passthru/moz.build @@ -42,5 +42,6 @@ SSRCS = ['fans.S', 'tans.S'] FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True NO_DIST_INSTALL = True diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py index 5737d4518fe5..abba3bf0ebd7 100644 --- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py +++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py @@ -146,6 +146,7 @@ class TestEmitterBasic(unittest.TestCase): LIBRARY_NAME='lib_name', LIBS=['fans.lib', 'tans.lib'], LIBXUL_LIBRARY=True, + MSVC_ENABLE_PGO=True, NO_DIST_INSTALL='1', MODULE='module_name', SDK_LIBRARY=['fans.sdk', 'tans.sdk'], From bdfaa84f5b8cc76ff7eb59069a5fe4ea68b02f94 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:56:01 +0200 Subject: [PATCH 71/79] Bug 904831 - Part b: Move unconditional MSVC_ENABLE_PGO definitions into moz.build; r=gps --- caps/src/Makefile.in | 1 - caps/src/moz.build | 2 ++ chrome/src/Makefile.in | 1 - chrome/src/moz.build | 2 ++ content/base/src/Makefile.in | 1 - content/base/src/moz.build | 2 ++ content/canvas/src/Makefile.in | 1 - content/canvas/src/moz.build | 2 ++ content/events/src/Makefile.in | 1 - content/events/src/moz.build | 2 ++ content/html/content/src/Makefile.in | 1 - content/html/content/src/moz.build | 2 ++ content/html/document/src/Makefile.in | 1 - content/html/document/src/moz.build | 2 ++ content/media/Makefile.in | 1 - content/media/moz.build | 2 ++ content/xbl/src/Makefile.in | 1 - content/xbl/src/moz.build | 2 ++ content/xml/content/src/Makefile.in | 1 - content/xml/content/src/moz.build | 2 ++ content/xml/document/src/Makefile.in | 1 - content/xml/document/src/moz.build | 2 ++ content/xul/document/src/Makefile.in | 1 - content/xul/document/src/moz.build | 2 ++ content/xul/templates/src/Makefile.in | 1 - content/xul/templates/src/moz.build | 2 ++ docshell/base/Makefile.in | 1 - docshell/base/moz.build | 2 ++ docshell/shistory/src/Makefile.in | 1 - docshell/shistory/src/moz.build | 2 ++ dom/base/Makefile.in | 1 - dom/base/moz.build | 2 ++ dom/bindings/Makefile.in | 1 - dom/bindings/moz.build | 2 ++ dom/mobilemessage/src/Makefile.in | 1 - dom/mobilemessage/src/moz.build | 2 ++ dom/plugins/base/Makefile.in | 1 - dom/plugins/base/moz.build | 2 ++ dom/quota/Makefile.in | 1 - dom/quota/moz.build | 2 ++ dom/src/events/Makefile.in | 1 - dom/src/events/moz.build | 2 ++ dom/src/storage/Makefile.in | 1 - dom/src/storage/moz.build | 2 ++ dom/workers/Makefile.in | 1 - dom/workers/moz.build | 2 ++ extensions/cookie/Makefile.in | 1 - extensions/cookie/moz.build | 2 ++ gfx/2d/Makefile.in | 1 - gfx/2d/moz.build | 2 ++ gfx/angle/Makefile.in | 1 - gfx/angle/moz.build | 2 ++ gfx/cairo/cairo/src/Makefile.in | 1 - gfx/cairo/cairo/src/moz.build | 2 ++ gfx/cairo/libpixman/src/Makefile.in | 1 - gfx/cairo/libpixman/src/moz.build | 2 ++ gfx/gl/Makefile.in | 1 - gfx/gl/moz.build | 2 ++ gfx/graphite2/src/Makefile.in | 3 --- gfx/graphite2/src/moz.build | 2 ++ gfx/harfbuzz/src/Makefile.in | 1 - gfx/harfbuzz/src/moz.build | 2 ++ gfx/layers/Makefile.in | 1 - gfx/layers/moz.build | 2 ++ gfx/ots/src/Makefile.in | 2 -- gfx/ots/src/moz.build | 2 ++ gfx/qcms/Makefile.in | 1 - gfx/qcms/moz.build | 2 ++ gfx/skia/Makefile.in | 1 - gfx/skia/moz.build | 2 ++ gfx/src/Makefile.in | 1 - gfx/src/moz.build | 2 ++ gfx/thebes/Makefile.in | 1 - gfx/thebes/moz.build | 2 ++ intl/hyphenation/src/Makefile.in | 1 - intl/hyphenation/src/moz.build | 2 ++ intl/locale/src/Makefile.in | 1 - intl/locale/src/moz.build | 2 ++ intl/lwbrk/src/Makefile.in | 1 - intl/lwbrk/src/moz.build | 2 ++ intl/strres/src/Makefile.in | 1 - intl/strres/src/moz.build | 2 ++ intl/uconv/src/Makefile.in | 1 - intl/uconv/src/moz.build | 2 ++ intl/uconv/util/Makefile.in | 1 - intl/uconv/util/moz.build | 2 ++ js/src/Makefile.in | 1 - js/src/moz.build | 3 +++ js/xpconnect/loader/Makefile.in | 1 - js/xpconnect/loader/moz.build | 2 ++ js/xpconnect/src/Makefile.in | 1 - js/xpconnect/src/moz.build | 2 ++ js/xpconnect/wrappers/Makefile.in | 1 - js/xpconnect/wrappers/moz.build | 2 ++ layout/base/Makefile.in | 1 - layout/base/moz.build | 2 ++ layout/build/Makefile.in | 1 - layout/build/moz.build | 2 ++ layout/forms/Makefile.in | 1 - layout/forms/moz.build | 2 ++ layout/generic/Makefile.in | 1 - layout/generic/moz.build | 2 ++ layout/style/Makefile.in | 1 - layout/style/moz.build | 2 ++ layout/tables/Makefile.in | 1 - layout/tables/moz.build | 2 ++ layout/xul/base/src/Makefile.in | 1 - layout/xul/base/src/moz.build | 2 ++ media/libcubeb/src/Makefile.in | 1 - media/libcubeb/src/moz.build | 2 ++ media/libjpeg/Makefile.in | 2 -- media/libjpeg/moz.build | 2 ++ media/libnestegg/src/Makefile.in | 1 - media/libnestegg/src/moz.build | 2 ++ media/libogg/src/Makefile.in | 1 - media/libogg/src/moz.build | 2 ++ media/libopus/Makefile.in | 1 - media/libopus/moz.build | 2 ++ media/libpng/Makefile.in | 1 - media/libpng/moz.build | 3 +++ media/libsoundtouch/src/Makefile.in | 1 - media/libsoundtouch/src/moz.build | 2 ++ media/libspeex_resampler/src/Makefile.in | 1 - media/libspeex_resampler/src/moz.build | 2 ++ media/libtheora/lib/Makefile.in | 1 - media/libtheora/lib/moz.build | 2 ++ media/libvorbis/lib/Makefile.in | 1 - media/libvorbis/lib/moz.build | 2 ++ media/libvpx/Makefile.in | 1 - media/libvpx/moz.build | 2 ++ modules/libjar/Makefile.in | 1 - modules/libjar/moz.build | 2 ++ modules/libjar/zipwriter/src/Makefile.in | 1 - modules/libjar/zipwriter/src/moz.build | 2 ++ modules/libpref/src/Makefile.in | 1 - modules/libpref/src/moz.build | 2 ++ netwerk/base/src/Makefile.in | 1 - netwerk/base/src/moz.build | 2 ++ netwerk/build/Makefile.in | 1 - netwerk/build/moz.build | 2 ++ netwerk/cache/Makefile.in | 1 - netwerk/cache/moz.build | 2 ++ netwerk/dns/Makefile.in | 3 --- netwerk/dns/moz.build | 2 ++ netwerk/mime/Makefile.in | 1 - netwerk/mime/moz.build | 2 ++ netwerk/protocol/file/Makefile.in | 1 - netwerk/protocol/file/moz.build | 2 ++ netwerk/protocol/ftp/Makefile.in | 1 - netwerk/protocol/ftp/moz.build | 2 ++ netwerk/protocol/http/Makefile.in | 1 - netwerk/protocol/http/moz.build | 2 ++ netwerk/protocol/res/Makefile.in | 1 - netwerk/protocol/res/moz.build | 2 ++ netwerk/protocol/websocket/Makefile.in | 1 - netwerk/protocol/websocket/moz.build | 2 ++ netwerk/streamconv/converters/Makefile.in | 1 - netwerk/streamconv/converters/moz.build | 2 ++ netwerk/streamconv/src/Makefile.in | 1 - netwerk/streamconv/src/moz.build | 2 ++ parser/expat/lib/Makefile.in | 2 -- parser/expat/lib/moz.build | 2 ++ parser/html/Makefile.in | 1 - parser/html/moz.build | 2 ++ parser/xml/src/Makefile.in | 2 -- parser/xml/src/moz.build | 2 ++ security/manager/boot/src/Makefile.in | 1 - security/manager/boot/src/moz.build | 2 ++ toolkit/components/telemetry/Makefile.in | 3 --- toolkit/components/telemetry/moz.build | 2 ++ toolkit/components/url-classifier/Makefile.in | 1 - toolkit/components/url-classifier/moz.build | 2 ++ toolkit/crashreporter/Makefile.in | 2 -- toolkit/crashreporter/google-breakpad/src/common/Makefile.in | 1 - toolkit/crashreporter/google-breakpad/src/common/moz.build | 2 ++ toolkit/crashreporter/moz.build | 2 ++ toolkit/library/Makefile.in | 1 - toolkit/library/moz.build | 2 ++ toolkit/xre/Makefile.in | 1 - toolkit/xre/moz.build | 2 ++ uriloader/base/Makefile.in | 1 - uriloader/base/moz.build | 2 ++ view/src/Makefile.in | 1 - view/src/moz.build | 2 ++ widget/windows/Makefile.in | 1 - widget/windows/moz.build | 2 ++ widget/xpwidgets/Makefile.in | 1 - widget/xpwidgets/moz.build | 2 ++ xpcom/base/Makefile.in | 1 - xpcom/base/moz.build | 2 ++ xpcom/build/Makefile.in | 1 - xpcom/build/moz.build | 2 ++ xpcom/components/Makefile.in | 1 - xpcom/components/moz.build | 2 ++ xpcom/ds/Makefile.in | 1 - xpcom/ds/moz.build | 2 ++ xpcom/io/Makefile.in | 1 - xpcom/io/moz.build | 2 ++ xpcom/reflect/xptcall/src/Makefile.in | 1 - xpcom/reflect/xptcall/src/moz.build | 2 ++ xpcom/reflect/xptinfo/src/Makefile.in | 1 - xpcom/reflect/xptinfo/src/moz.build | 2 ++ xpcom/string/src/Makefile.in | 1 - xpcom/string/src/moz.build | 2 ++ xpcom/threads/Makefile.in | 1 - xpcom/threads/moz.build | 2 ++ xpfe/appshell/src/Makefile.in | 1 - xpfe/appshell/src/moz.build | 2 ++ 208 files changed, 210 insertions(+), 115 deletions(-) diff --git a/caps/src/Makefile.in b/caps/src/Makefile.in index fa3083fad3e1..ea2ddc5aed83 100644 --- a/caps/src/Makefile.in +++ b/caps/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk INCLUDES += -I$(srcdir)/../include \ diff --git a/caps/src/moz.build b/caps/src/moz.build index 01c2ca2ae2da..d5d553251916 100644 --- a/caps/src/moz.build +++ b/caps/src/moz.build @@ -20,3 +20,5 @@ LIBRARY_NAME = 'caps_s' LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/chrome/src/Makefile.in b/chrome/src/Makefile.in index 007975f62740..d8b7edc2b211 100644 --- a/chrome/src/Makefile.in +++ b/chrome/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = chrome_s -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/chrome/src/moz.build b/chrome/src/moz.build index f128712e8943..b7eecd935db0 100644 --- a/chrome/src/moz.build +++ b/chrome/src/moz.build @@ -19,3 +19,5 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/content/base/src/Makefile.in b/content/base/src/Makefile.in index 9759825fcaa5..a3da2fe27afe 100644 --- a/content/base/src/Makefile.in +++ b/content/base/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconbase_s -MSVC_ENABLE_PGO := 1 ifdef MOZ_WEBRTC LOCAL_INCLUDES += \ -I$(topsrcdir)/netwerk/sctp/datachannel \ diff --git a/content/base/src/moz.build b/content/base/src/moz.build index be1a4b13a1e3..e4549860d8c9 100644 --- a/content/base/src/moz.build +++ b/content/base/src/moz.build @@ -174,3 +174,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/content/canvas/src/Makefile.in b/content/canvas/src/Makefile.in index cadc7033d7cd..9a21d93e5afa 100644 --- a/content/canvas/src/Makefile.in +++ b/content/canvas/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconcvs_s -MSVC_ENABLE_PGO := 1 ifdef MOZ_WEBGL LOCAL_INCLUDES += \ -I$(topsrcdir)/js/xpconnect/wrappers \ diff --git a/content/canvas/src/moz.build b/content/canvas/src/moz.build index f9e6c83a5abb..689ae06d8322 100644 --- a/content/canvas/src/moz.build +++ b/content/canvas/src/moz.build @@ -78,3 +78,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/content/events/src/Makefile.in b/content/events/src/Makefile.in index b56a5ac13788..46cb969fe3eb 100644 --- a/content/events/src/Makefile.in +++ b/content/events/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconevents_s -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/events/src/moz.build b/content/events/src/moz.build index 6e5b6e6fc797..d655cb3cb8f7 100644 --- a/content/events/src/moz.build +++ b/content/events/src/moz.build @@ -71,3 +71,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/content/html/content/src/Makefile.in b/content/html/content/src/Makefile.in index 9cfaa0f26a7f..e3bb873aa75f 100644 --- a/content/html/content/src/Makefile.in +++ b/content/html/content/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconhtmlcon_s -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/html/content/src/moz.build b/content/html/content/src/moz.build index 8933e1d970eb..67a2c7b225ae 100644 --- a/content/html/content/src/moz.build +++ b/content/html/content/src/moz.build @@ -158,3 +158,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/content/html/document/src/Makefile.in b/content/html/document/src/Makefile.in index c52e0426a153..4375a7ceac0e 100644 --- a/content/html/document/src/Makefile.in +++ b/content/html/document/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += \ diff --git a/content/html/document/src/moz.build b/content/html/document/src/moz.build index e8b0b9bf451e..4c2a9b627924 100644 --- a/content/html/document/src/moz.build +++ b/content/html/document/src/moz.build @@ -29,3 +29,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/content/media/Makefile.in b/content/media/Makefile.in index 2f6b8bb2cd73..12c8a45c8c52 100644 --- a/content/media/Makefile.in +++ b/content/media/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconmedia_s -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/content/media/moz.build b/content/media/moz.build index 9fcea014d787..a16fdbf33c89 100644 --- a/content/media/moz.build +++ b/content/media/moz.build @@ -139,3 +139,5 @@ if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['BUILD_ARM_NEON']: LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/content/xbl/src/Makefile.in b/content/xbl/src/Makefile.in index 91cfbc713705..92ec1bc2e2eb 100644 --- a/content/xbl/src/Makefile.in +++ b/content/xbl/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkconxbl_s -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/content/xbl/src/moz.build b/content/xbl/src/moz.build index 507d049c06b8..e0c5f245ad28 100644 --- a/content/xbl/src/moz.build +++ b/content/xbl/src/moz.build @@ -40,3 +40,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/content/xml/content/src/Makefile.in b/content/xml/content/src/Makefile.in index f19f9c89f166..120edb1a03dd 100644 --- a/content/xml/content/src/Makefile.in +++ b/content/xml/content/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/content/xml/content/src/moz.build b/content/xml/content/src/moz.build index 89f1347d7d21..3265d714e932 100644 --- a/content/xml/content/src/moz.build +++ b/content/xml/content/src/moz.build @@ -26,3 +26,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/content/xml/document/src/Makefile.in b/content/xml/document/src/Makefile.in index bf4a622b898a..641b20a13297 100644 --- a/content/xml/document/src/Makefile.in +++ b/content/xml/document/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/content/xml/document/src/moz.build b/content/xml/document/src/moz.build index 65e515273b2a..105fe79cff11 100644 --- a/content/xml/document/src/moz.build +++ b/content/xml/document/src/moz.build @@ -23,3 +23,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/content/xul/document/src/Makefile.in b/content/xul/document/src/Makefile.in index a5c2a58fdd37..c07f9df66df6 100644 --- a/content/xul/document/src/Makefile.in +++ b/content/xul/document/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = -I$(srcdir)/../../../base/src \ diff --git a/content/xul/document/src/moz.build b/content/xul/document/src/moz.build index 7759b397835a..049240109278 100644 --- a/content/xul/document/src/moz.build +++ b/content/xul/document/src/moz.build @@ -25,3 +25,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/content/xul/templates/src/Makefile.in b/content/xul/templates/src/Makefile.in index 5d299fb0325d..c2bd2f9eb94b 100644 --- a/content/xul/templates/src/Makefile.in +++ b/content/xul/templates/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = -I$(srcdir)/../../../base/src \ diff --git a/content/xul/templates/src/moz.build b/content/xul/templates/src/moz.build index 84e5fd2fcdbb..9317155aba59 100644 --- a/content/xul/templates/src/moz.build +++ b/content/xul/templates/src/moz.build @@ -39,3 +39,5 @@ LIBRARY_NAME = 'gkconxultmpl_s' LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/docshell/base/Makefile.in b/docshell/base/Makefile.in index 92d8f7a8c32e..e8fc84cff765 100644 --- a/docshell/base/Makefile.in +++ b/docshell/base/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = basedocshell_s -MSVC_ENABLE_PGO := 1 ifdef MOZ_TOOLKIT_SEARCH DEFINES += -DMOZ_TOOLKIT_SEARCH endif diff --git a/docshell/base/moz.build b/docshell/base/moz.build index 0c140fc4625d..171028a4d91e 100644 --- a/docshell/base/moz.build +++ b/docshell/base/moz.build @@ -66,3 +66,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/docshell/shistory/src/Makefile.in b/docshell/shistory/src/Makefile.in index eb3a81c47c5d..d1c664f3fdce 100644 --- a/docshell/shistory/src/Makefile.in +++ b/docshell/shistory/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES += -I$(srcdir)/../../base diff --git a/docshell/shistory/src/moz.build b/docshell/shistory/src/moz.build index d06c58199f5f..4ca6d43c5a80 100644 --- a/docshell/shistory/src/moz.build +++ b/docshell/shistory/src/moz.build @@ -23,3 +23,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/dom/base/Makefile.in b/dom/base/Makefile.in index 5ed7e43abe87..fd8d9e95a0e2 100644 --- a/dom/base/Makefile.in +++ b/dom/base/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = jsdombase_s -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/dom/dom-config.mk ifdef MOZ_JSDEBUGGER diff --git a/dom/base/moz.build b/dom/base/moz.build index 42420083d553..f28260dd7fc2 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -113,3 +113,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/dom/bindings/Makefile.in b/dom/bindings/Makefile.in index c03fc494f6f6..f48d7353894e 100644 --- a/dom/bindings/Makefile.in +++ b/dom/bindings/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = dombindings_s -MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 # Need this to find all our DOM source files. diff --git a/dom/bindings/moz.build b/dom/bindings/moz.build index f8db3cd6b47c..d33971094eab 100644 --- a/dom/bindings/moz.build +++ b/dom/bindings/moz.build @@ -30,3 +30,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/dom/mobilemessage/src/Makefile.in b/dom/mobilemessage/src/Makefile.in index 1018535453e1..999eade2fbd0 100644 --- a/dom/mobilemessage/src/Makefile.in +++ b/dom/mobilemessage/src/Makefile.in @@ -21,7 +21,6 @@ VPATH += $(srcdir)/fallback endif LIBRARY_NAME = dom_mobilemessage_s -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/mobilemessage/src/moz.build b/dom/mobilemessage/src/moz.build index bf9293895598..e90c7bdd6aad 100644 --- a/dom/mobilemessage/src/moz.build +++ b/dom/mobilemessage/src/moz.build @@ -83,3 +83,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/dom/plugins/base/Makefile.in b/dom/plugins/base/Makefile.in index 681faa449cb2..4e5c9d2c4576 100644 --- a/dom/plugins/base/Makefile.in +++ b/dom/plugins/base/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkplugin -MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 ifeq ($(MOZ_WIDGET_TOOLKIT),android) LOCAL_INCLUDES += -I$(topsrcdir)/dom/plugins/base/android diff --git a/dom/plugins/base/moz.build b/dom/plugins/base/moz.build index e8348b1fe935..0deba65014c8 100644 --- a/dom/plugins/base/moz.build +++ b/dom/plugins/base/moz.build @@ -97,3 +97,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] != 'android': LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/dom/quota/Makefile.in b/dom/quota/Makefile.in index 3d610b9563cc..aa2e25a07c4e 100644 --- a/dom/quota/Makefile.in +++ b/dom/quota/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = domquota_s -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/dom/dom-config.mk LOCAL_INCLUDES = \ diff --git a/dom/quota/moz.build b/dom/quota/moz.build index 715f8b13ff30..c037c5726735 100644 --- a/dom/quota/moz.build +++ b/dom/quota/moz.build @@ -43,3 +43,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/dom/src/events/Makefile.in b/dom/src/events/Makefile.in index 12513cd838d4..75914fa5ae74 100644 --- a/dom/src/events/Makefile.in +++ b/dom/src/events/Makefile.in @@ -9,7 +9,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk INCLUDES += -I$(topsrcdir)/dom/base diff --git a/dom/src/events/moz.build b/dom/src/events/moz.build index b9874c2f34ec..785d62ab2990 100644 --- a/dom/src/events/moz.build +++ b/dom/src/events/moz.build @@ -16,3 +16,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/dom/src/storage/Makefile.in b/dom/src/storage/Makefile.in index 021c558c897e..d1242ff1340d 100644 --- a/dom/src/storage/Makefile.in +++ b/dom/src/storage/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = jsdomstorage_s -MSVC_ENABLE_PGO := 1 LOCAL_INCLUDES = \ -I$(topsrcdir)/dom/base \ -I$(topsrcdir)/content/events/src diff --git a/dom/src/storage/moz.build b/dom/src/storage/moz.build index 52a337c343cb..eef23759a91a 100644 --- a/dom/src/storage/moz.build +++ b/dom/src/storage/moz.build @@ -27,3 +27,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/dom/workers/Makefile.in b/dom/workers/Makefile.in index aaa967994152..511613ed3e61 100644 --- a/dom/workers/Makefile.in +++ b/dom/workers/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 LOCAL_INCLUDES = \ -I$(topsrcdir)/content/base/src \ -I$(topsrcdir)/content/events/src \ diff --git a/dom/workers/moz.build b/dom/workers/moz.build index 1ee715dc9384..f46c0dab90ab 100644 --- a/dom/workers/moz.build +++ b/dom/workers/moz.build @@ -61,3 +61,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/extensions/cookie/Makefile.in b/extensions/cookie/Makefile.in index 1511be3376e0..a9a62c975180 100644 --- a/extensions/cookie/Makefile.in +++ b/extensions/cookie/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = cookie -MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/extensions/cookie/moz.build b/extensions/cookie/moz.build index 6e7ada6b1bc4..213da9333d0d 100644 --- a/extensions/cookie/moz.build +++ b/extensions/cookie/moz.build @@ -24,3 +24,5 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/gfx/2d/Makefile.in b/gfx/2d/Makefile.in index 7c372ad6eaa7..79f17a6f2b6d 100644 --- a/gfx/2d/Makefile.in +++ b/gfx/2d/Makefile.in @@ -11,7 +11,6 @@ VPATH = $(srcdir) $(srcdir)/unittest include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gfx2d -MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 DEFINES += -DMOZ_GFX -DUSE_CAIRO -DGFX2D_INTERNAL diff --git a/gfx/2d/moz.build b/gfx/2d/moz.build index ad129782d11d..78e3728621a6 100644 --- a/gfx/2d/moz.build +++ b/gfx/2d/moz.build @@ -104,3 +104,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/gfx/angle/Makefile.in b/gfx/angle/Makefile.in index 444a053ba99a..a92b143c09e0 100644 --- a/gfx/angle/Makefile.in +++ b/gfx/angle/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = endif diff --git a/gfx/angle/moz.build b/gfx/angle/moz.build index 2ca5198fd098..ab2b1f9b83f6 100644 --- a/gfx/angle/moz.build +++ b/gfx/angle/moz.build @@ -112,3 +112,5 @@ LIBRARY_NAME = 'angle' LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/gfx/cairo/cairo/src/Makefile.in b/gfx/cairo/cairo/src/Makefile.in index 4955ccadb73b..1a22b2ec3984 100644 --- a/gfx/cairo/cairo/src/Makefile.in +++ b/gfx/cairo/cairo/src/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 ifdef GNU_CC ifeq ($(OS_TARGET),Android) MODULE_OPTIMIZE_FLAGS = -O2 diff --git a/gfx/cairo/cairo/src/moz.build b/gfx/cairo/cairo/src/moz.build index a9e7cf6eaa7d..18f50c5961f7 100644 --- a/gfx/cairo/cairo/src/moz.build +++ b/gfx/cairo/cairo/src/moz.build @@ -82,3 +82,5 @@ LIBRARY_NAME = 'mozcairo' LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/gfx/cairo/libpixman/src/Makefile.in b/gfx/cairo/libpixman/src/Makefile.in index 8878266d5715..991f376a8f32 100644 --- a/gfx/cairo/libpixman/src/Makefile.in +++ b/gfx/cairo/libpixman/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = mozlibpixman -MSVC_ENABLE_PGO := 1 ifeq ($(OS_TARGET),Android) MODULE_OPTIMIZE_FLAGS = -O2 endif diff --git a/gfx/cairo/libpixman/src/moz.build b/gfx/cairo/libpixman/src/moz.build index a770caf77d11..0d78e6406f37 100644 --- a/gfx/cairo/libpixman/src/moz.build +++ b/gfx/cairo/libpixman/src/moz.build @@ -29,3 +29,5 @@ if CONFIG['OS_ARCH'] != 'Darwin' and CONFIG['GNU_CC']: LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/gfx/gl/Makefile.in b/gfx/gl/Makefile.in index db8a207ab7e1..0794128a6d88 100644 --- a/gfx/gl/Makefile.in +++ b/gfx/gl/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gl -MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 ifeq ($(MOZ_WIDGET_TOOLKIT),windows) ifdef MOZ_WEBGL diff --git a/gfx/gl/moz.build b/gfx/gl/moz.build index 8d06edcdef1b..d1b76d7130f5 100644 --- a/gfx/gl/moz.build +++ b/gfx/gl/moz.build @@ -118,3 +118,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/gfx/graphite2/src/Makefile.in b/gfx/graphite2/src/Makefile.in index 142c69fee42d..c308749a3a7f 100644 --- a/gfx/graphite2/src/Makefile.in +++ b/gfx/graphite2/src/Makefile.in @@ -21,9 +21,6 @@ endif # get the lists of source files and exported headers include $(srcdir)/files.mk -MSVC_ENABLE_PGO := 1 - -# on Windows, we're going to link graphite with gkmedias instead of libxul ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = FORCE_STATIC_LIB = 1 diff --git a/gfx/graphite2/src/moz.build b/gfx/graphite2/src/moz.build index 90e937f98dbd..5a290b529d5c 100644 --- a/gfx/graphite2/src/moz.build +++ b/gfx/graphite2/src/moz.build @@ -65,3 +65,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'mozgraphite2' +MSVC_ENABLE_PGO = True + diff --git a/gfx/harfbuzz/src/Makefile.in b/gfx/harfbuzz/src/Makefile.in index 836c5f83b6d4..7ae75a3efd3d 100644 --- a/gfx/harfbuzz/src/Makefile.in +++ b/gfx/harfbuzz/src/Makefile.in @@ -32,7 +32,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 ifeq ($(OS_ARCH),WINNT) FORCE_STATIC_LIB = 1 endif diff --git a/gfx/harfbuzz/src/moz.build b/gfx/harfbuzz/src/moz.build index a227f1d07422..aa6d3ed09b58 100644 --- a/gfx/harfbuzz/src/moz.build +++ b/gfx/harfbuzz/src/moz.build @@ -57,3 +57,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'mozharfbuzz' +MSVC_ENABLE_PGO = True + diff --git a/gfx/layers/Makefile.in b/gfx/layers/Makefile.in index 7373d46d505c..960ee40c9c25 100644 --- a/gfx/layers/Makefile.in +++ b/gfx/layers/Makefile.in @@ -21,7 +21,6 @@ VPATH = \ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = layers -MSVC_ENABLE_PGO := 1 ifdef MOZ_DEBUG DEFINES += -DD3D_DEBUG_INFO endif diff --git a/gfx/layers/moz.build b/gfx/layers/moz.build index 2e300f5c864e..16a902baa0aa 100644 --- a/gfx/layers/moz.build +++ b/gfx/layers/moz.build @@ -270,3 +270,5 @@ IPDL_SOURCES = [ LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/gfx/ots/src/Makefile.in b/gfx/ots/src/Makefile.in index ca44278cd357..39a44bce6807 100644 --- a/gfx/ots/src/Makefile.in +++ b/gfx/ots/src/Makefile.in @@ -32,8 +32,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 - ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = FORCE_STATIC_LIB = 1 diff --git a/gfx/ots/src/moz.build b/gfx/ots/src/moz.build index 73d35197b432..b720e9dc0e25 100644 --- a/gfx/ots/src/moz.build +++ b/gfx/ots/src/moz.build @@ -53,3 +53,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'mozots' +MSVC_ENABLE_PGO = True + diff --git a/gfx/qcms/Makefile.in b/gfx/qcms/Makefile.in index e58b764e0032..cf3f9fd06904 100644 --- a/gfx/qcms/Makefile.in +++ b/gfx/qcms/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 CSRCS = \ chain.c \ iccread.c \ diff --git a/gfx/qcms/moz.build b/gfx/qcms/moz.build index 4930eb051f4a..2172c2f40b02 100644 --- a/gfx/qcms/moz.build +++ b/gfx/qcms/moz.build @@ -15,3 +15,5 @@ LIBRARY_NAME = 'mozqcms' LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/gfx/skia/Makefile.in b/gfx/skia/Makefile.in index 92a22527b2d0..63f2f5fe9597 100644 --- a/gfx/skia/Makefile.in +++ b/gfx/skia/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 DEFINES += -DSK_A32_SHIFT=24 -DSK_R32_SHIFT=16 -DSK_G32_SHIFT=8 -DSK_B32_SHIFT=0 diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build index dca4227bbfce..51daf634e642 100644 --- a/gfx/skia/moz.build +++ b/gfx/skia/moz.build @@ -551,3 +551,5 @@ LIBRARY_NAME = 'skia' LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/gfx/src/Makefile.in b/gfx/src/Makefile.in index bfc02f47482f..47b98f128ee7 100644 --- a/gfx/src/Makefile.in +++ b/gfx/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/gfx/src/moz.build b/gfx/src/moz.build index a470fd72d5d7..6dede7fe7a92 100644 --- a/gfx/src/moz.build +++ b/gfx/src/moz.build @@ -61,3 +61,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/gfx/thebes/Makefile.in b/gfx/thebes/Makefile.in index 846e32ab1a38..c7f643b873ab 100644 --- a/gfx/thebes/Makefile.in +++ b/gfx/thebes/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = thebes -MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 # gfxSVGGlyphs needs nsDOMParser.h diff --git a/gfx/thebes/moz.build b/gfx/thebes/moz.build index cadc25d1530e..04edc21695b6 100644 --- a/gfx/thebes/moz.build +++ b/gfx/thebes/moz.build @@ -272,3 +272,5 @@ FAIL_ON_WARNINGS = not CONFIG['_MSC_VER'] LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/intl/hyphenation/src/Makefile.in b/intl/hyphenation/src/Makefile.in index d7ebae8c79f7..d6c912df69ec 100644 --- a/intl/hyphenation/src/Makefile.in +++ b/intl/hyphenation/src/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 CSRCS = hyphen.c \ $(NULL) diff --git a/intl/hyphenation/src/moz.build b/intl/hyphenation/src/moz.build index 317573ae57d1..ad05828ef81f 100644 --- a/intl/hyphenation/src/moz.build +++ b/intl/hyphenation/src/moz.build @@ -16,3 +16,5 @@ LIBRARY_NAME = 'hyphenation_s' LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/intl/locale/src/Makefile.in b/intl/locale/src/Makefile.in index 9a53d30c0b61..6432650f77d0 100644 --- a/intl/locale/src/Makefile.in +++ b/intl/locale/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 ifeq ($(MOZ_WIDGET_TOOLKIT), qt) OS_INCLUDES += $(MOZ_QT_CFLAGS) endif diff --git a/intl/locale/src/moz.build b/intl/locale/src/moz.build index d7950e1d9b4e..8cd2c45269ed 100644 --- a/intl/locale/src/moz.build +++ b/intl/locale/src/moz.build @@ -37,3 +37,5 @@ EXTRA_JS_MODULES += [ LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/intl/lwbrk/src/Makefile.in b/intl/lwbrk/src/Makefile.in index 6324825dd8e8..2ae2d24ed892 100644 --- a/intl/lwbrk/src/Makefile.in +++ b/intl/lwbrk/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) else ifeq ($(MOZ_WIDGET_TOOLKIT),gtk3) diff --git a/intl/lwbrk/src/moz.build b/intl/lwbrk/src/moz.build index 6504e0800f1d..9faaf01b3c2a 100644 --- a/intl/lwbrk/src/moz.build +++ b/intl/lwbrk/src/moz.build @@ -33,3 +33,5 @@ LIBRARY_NAME = 'lwbrk_s' LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/intl/strres/src/Makefile.in b/intl/strres/src/Makefile.in index b1618d012444..654736c57b5a 100644 --- a/intl/strres/src/Makefile.in +++ b/intl/strres/src/Makefile.in @@ -10,5 +10,4 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk diff --git a/intl/strres/src/moz.build b/intl/strres/src/moz.build index 13ec4f78be9c..19083f5639dd 100644 --- a/intl/strres/src/moz.build +++ b/intl/strres/src/moz.build @@ -15,3 +15,5 @@ LIBRARY_NAME = 'strres_s' LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/intl/uconv/src/Makefile.in b/intl/uconv/src/Makefile.in index 269ce89973cf..d57c8df4e2a0 100644 --- a/intl/uconv/src/Makefile.in +++ b/intl/uconv/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 LOCAL_INCLUDES = -I$(srcdir)/../util \ -I$(srcdir)/../ucvlatin \ diff --git a/intl/uconv/src/moz.build b/intl/uconv/src/moz.build index 770871592125..51206f26305a 100644 --- a/intl/uconv/src/moz.build +++ b/intl/uconv/src/moz.build @@ -33,3 +33,5 @@ LIBRARY_NAME = 'uconv' LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/intl/uconv/util/Makefile.in b/intl/uconv/util/Makefile.in index afbc2963e795..f65b92b7f2d2 100644 --- a/intl/uconv/util/Makefile.in +++ b/intl/uconv/util/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 CSRCS = \ ugen.c \ diff --git a/intl/uconv/util/moz.build b/intl/uconv/util/moz.build index bb509ee78430..23d211bd823a 100644 --- a/intl/uconv/util/moz.build +++ b/intl/uconv/util/moz.build @@ -17,3 +17,5 @@ LIBRARY_NAME = 'ucvutil_s' LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/js/src/Makefile.in b/js/src/Makefile.in index 9cd7e390fc24..a1e8a4113dfb 100644 --- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -20,7 +20,6 @@ LIBRARY_NAME = mozjs endif STATIC_LIBRARY_NAME = js_static -MSVC_ENABLE_PGO := 1 LIBS = $(NSPR_LIBS) # JavaScript must be built shared, even for static builds, as it is used by diff --git a/js/src/moz.build b/js/src/moz.build index e380dc07b419..82e97b5a9be7 100644 --- a/js/src/moz.build +++ b/js/src/moz.build @@ -339,3 +339,6 @@ else: CPP_SOURCES += [ 'pm_stub.cpp' ] + +MSVC_ENABLE_PGO = True + diff --git a/js/xpconnect/loader/Makefile.in b/js/xpconnect/loader/Makefile.in index eeee7ae801b9..e7f537971503 100644 --- a/js/xpconnect/loader/Makefile.in +++ b/js/xpconnect/loader/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 LOCAL_INCLUDES += \ -I$(srcdir)/../src \ -I$(srcdir)/../wrappers \ diff --git a/js/xpconnect/loader/moz.build b/js/xpconnect/loader/moz.build index 53efc6679460..cd388e660dba 100644 --- a/js/xpconnect/loader/moz.build +++ b/js/xpconnect/loader/moz.build @@ -23,3 +23,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/js/xpconnect/src/Makefile.in b/js/xpconnect/src/Makefile.in index 85ab6af6ec8c..0cc48a7da0d9 100644 --- a/js/xpconnect/src/Makefile.in +++ b/js/xpconnect/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = xpconnect_s -MSVC_ENABLE_PGO := 1 LOCAL_INCLUDES = \ -I$(srcdir)/../wrappers \ -I$(srcdir)/../loader \ diff --git a/js/xpconnect/src/moz.build b/js/xpconnect/src/moz.build index 8620553f3535..5adf20a1bd77 100644 --- a/js/xpconnect/src/moz.build +++ b/js/xpconnect/src/moz.build @@ -57,3 +57,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/js/xpconnect/wrappers/Makefile.in b/js/xpconnect/wrappers/Makefile.in index 97f34e77c688..c1d1c7d086cd 100644 --- a/js/xpconnect/wrappers/Makefile.in +++ b/js/xpconnect/wrappers/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 LOCAL_INCLUDES = \ -I$(srcdir)/../src \ -I$(srcdir)/../../../dom/base \ diff --git a/js/xpconnect/wrappers/moz.build b/js/xpconnect/wrappers/moz.build index df6e6a36eede..46de979d09f6 100644 --- a/js/xpconnect/wrappers/moz.build +++ b/js/xpconnect/wrappers/moz.build @@ -26,3 +26,5 @@ FAIL_ON_WARNINGS = not CONFIG['_MSC_VER'] LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/layout/base/Makefile.in b/layout/base/Makefile.in index de62474e8cab..6680a227a3e6 100644 --- a/layout/base/Makefile.in +++ b/layout/base/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkbase_s -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/layout/base/moz.build b/layout/base/moz.build index d1e5fa5cb2c7..fb9e198fe959 100644 --- a/layout/base/moz.build +++ b/layout/base/moz.build @@ -103,3 +103,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/layout/build/Makefile.in b/layout/build/Makefile.in index 242eab17e281..406627e50449 100644 --- a/layout/build/Makefile.in +++ b/layout/build/Makefile.in @@ -16,7 +16,6 @@ SHELL := ksh endif LIBRARY_NAME = gklayout -MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 SHARED_LIBRARY_LIBS = \ ../base/$(LIB_PREFIX)gkbase_s.$(LIB_SUFFIX) \ diff --git a/layout/build/moz.build b/layout/build/moz.build index 3adbf744d90a..a063b7955d13 100644 --- a/layout/build/moz.build +++ b/layout/build/moz.build @@ -22,3 +22,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/layout/forms/Makefile.in b/layout/forms/Makefile.in index b984dcf28bc3..6ec071a7d543 100644 --- a/layout/forms/Makefile.in +++ b/layout/forms/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/layout/forms/moz.build b/layout/forms/moz.build index 4cfe64fb8186..ff06bf9815a4 100644 --- a/layout/forms/moz.build +++ b/layout/forms/moz.build @@ -42,3 +42,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/layout/generic/Makefile.in b/layout/generic/Makefile.in index 8f62f80f65fe..df29b7dfc320 100644 --- a/layout/generic/Makefile.in +++ b/layout/generic/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkgeneric_s -MSVC_ENABLE_PGO := 1 RESOURCES_HTML = \ $(srcdir)/folder.png \ $(NULL) diff --git a/layout/generic/moz.build b/layout/generic/moz.build index 1465ebf0db60..97a7766bceee 100644 --- a/layout/generic/moz.build +++ b/layout/generic/moz.build @@ -98,3 +98,5 @@ FAIL_ON_WARNINGS = not CONFIG['_MSC_VER'] LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/layout/style/Makefile.in b/layout/style/Makefile.in index aea2b153e2a9..d7a2d19b355d 100644 --- a/layout/style/Makefile.in +++ b/layout/style/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkstyle_s -MSVC_ENABLE_PGO := 1 ifdef GNU_CC OS_CFLAGS := $(OS_CFLAGS) -Wshadow OS_CXXFLAGS := $(OS_CXXFLAGS) -Wshadow diff --git a/layout/style/moz.build b/layout/style/moz.build index 031ab5bc1f24..76e6c7d7fada 100644 --- a/layout/style/moz.build +++ b/layout/style/moz.build @@ -127,3 +127,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/layout/tables/Makefile.in b/layout/tables/Makefile.in index 0fae96679a9d..e41c30be4383 100644 --- a/layout/tables/Makefile.in +++ b/layout/tables/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk DEFINES += -DDEBUG_TABLE_STRATEGY_off diff --git a/layout/tables/moz.build b/layout/tables/moz.build index 74f25260eed6..3783822a1bcc 100644 --- a/layout/tables/moz.build +++ b/layout/tables/moz.build @@ -33,3 +33,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/layout/xul/base/src/Makefile.in b/layout/xul/base/src/Makefile.in index 92f9aff37574..8f7c51902754 100644 --- a/layout/xul/base/src/Makefile.in +++ b/layout/xul/base/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = gkxulbase_s -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/layout/xul/base/src/moz.build b/layout/xul/base/src/moz.build index aa5eca39ec67..327500aa9a4b 100644 --- a/layout/xul/base/src/moz.build +++ b/layout/xul/base/src/moz.build @@ -58,3 +58,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/media/libcubeb/src/Makefile.in b/media/libcubeb/src/Makefile.in index 07222f0122f0..6e9ec8e828b8 100644 --- a/media/libcubeb/src/Makefile.in +++ b/media/libcubeb/src/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 FORCE_STATIC_LIB= 1 ifeq ($(OS_TARGET),WINNT) VISIBILITY_FLAGS = diff --git a/media/libcubeb/src/moz.build b/media/libcubeb/src/moz.build index f7080734b712..8557dd4540b5 100644 --- a/media/libcubeb/src/moz.build +++ b/media/libcubeb/src/moz.build @@ -49,3 +49,5 @@ if CONFIG['OS_TARGET'] == 'Android': LIBRARY_NAME = 'cubeb' +MSVC_ENABLE_PGO = True + diff --git a/media/libjpeg/Makefile.in b/media/libjpeg/Makefile.in index bfd2aaf20d5f..9351e2d140d9 100644 --- a/media/libjpeg/Makefile.in +++ b/media/libjpeg/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 - ifeq ($(OS_ARCH),WINNT) VISIBILITY_FLAGS = endif diff --git a/media/libjpeg/moz.build b/media/libjpeg/moz.build index dfad21dba75b..fb421de0ad33 100644 --- a/media/libjpeg/moz.build +++ b/media/libjpeg/moz.build @@ -148,3 +148,5 @@ else: # No SIMD support? LIBRARY_NAME = 'mozjpeg' +MSVC_ENABLE_PGO = True + diff --git a/media/libnestegg/src/Makefile.in b/media/libnestegg/src/Makefile.in index e649308c4641..a01dfc33a274 100644 --- a/media/libnestegg/src/Makefile.in +++ b/media/libnestegg/src/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 FORCE_STATIC_LIB= 1 ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = diff --git a/media/libnestegg/src/moz.build b/media/libnestegg/src/moz.build index f9609973b463..e7273fdbb67a 100644 --- a/media/libnestegg/src/moz.build +++ b/media/libnestegg/src/moz.build @@ -13,3 +13,5 @@ CSRCS += [ LIBRARY_NAME = 'nestegg' +MSVC_ENABLE_PGO = True + diff --git a/media/libogg/src/Makefile.in b/media/libogg/src/Makefile.in index e649308c4641..a01dfc33a274 100644 --- a/media/libogg/src/Makefile.in +++ b/media/libogg/src/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 FORCE_STATIC_LIB= 1 ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = diff --git a/media/libogg/src/moz.build b/media/libogg/src/moz.build index 3482fd3bb54f..f387bf1cc928 100644 --- a/media/libogg/src/moz.build +++ b/media/libogg/src/moz.build @@ -13,3 +13,5 @@ CSRCS += [ LIBRARY_NAME = 'ogg' +MSVC_ENABLE_PGO = True + diff --git a/media/libopus/Makefile.in b/media/libopus/Makefile.in index 9ad81821479d..fd15d63ecd20 100644 --- a/media/libopus/Makefile.in +++ b/media/libopus/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 FORCE_STATIC_LIB= 1 DEFINES += \ diff --git a/media/libopus/moz.build b/media/libopus/moz.build index d6f6948ce4b4..5fae69582a84 100644 --- a/media/libopus/moz.build +++ b/media/libopus/moz.build @@ -15,3 +15,5 @@ EXPORTS.opus += [ LIBRARY_NAME = 'opus' +MSVC_ENABLE_PGO = True + diff --git a/media/libpng/Makefile.in b/media/libpng/Makefile.in index 2ec10ee96823..36e022bc378f 100644 --- a/media/libpng/Makefile.in +++ b/media/libpng/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 FORCE_STATIC_LIB= 1 ifeq ($(OS_ARCH),WINNT) VISIBILITY_FLAGS= diff --git a/media/libpng/moz.build b/media/libpng/moz.build index 69f76927a3c1..3513d925bdc6 100644 --- a/media/libpng/moz.build +++ b/media/libpng/moz.build @@ -46,3 +46,6 @@ if CONFIG['MOZ_PNG_ARM_NEON']: ] LIBRARY_NAME = 'mozpng' + +MSVC_ENABLE_PGO = True + diff --git a/media/libsoundtouch/src/Makefile.in b/media/libsoundtouch/src/Makefile.in index 76e26a107d02..f1939894abdc 100644 --- a/media/libsoundtouch/src/Makefile.in +++ b/media/libsoundtouch/src/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 SHORT_LIBNAME = soundt VISIBILITY_FLAGS = EXTRA_DSO_LDOPTS += $(MOZALLOC_LIB) diff --git a/media/libsoundtouch/src/moz.build b/media/libsoundtouch/src/moz.build index 91987ea6b8ee..20d5ce907c88 100644 --- a/media/libsoundtouch/src/moz.build +++ b/media/libsoundtouch/src/moz.build @@ -35,3 +35,5 @@ if CONFIG['INTEL_ARCHITECTURE']: LIBRARY_NAME = 'soundtouch' +MSVC_ENABLE_PGO = True + diff --git a/media/libspeex_resampler/src/Makefile.in b/media/libspeex_resampler/src/Makefile.in index 4ec5a486a0ad..8acb63a08d46 100644 --- a/media/libspeex_resampler/src/Makefile.in +++ b/media/libspeex_resampler/src/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 FORCE_STATIC_LIB = 1 # We don't compile the full speex codec, only the resampler. diff --git a/media/libspeex_resampler/src/moz.build b/media/libspeex_resampler/src/moz.build index c41396f6e1e6..bebb2aa1e362 100644 --- a/media/libspeex_resampler/src/moz.build +++ b/media/libspeex_resampler/src/moz.build @@ -18,3 +18,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'speex_resampler' +MSVC_ENABLE_PGO = True + diff --git a/media/libtheora/lib/Makefile.in b/media/libtheora/lib/Makefile.in index 9c46fc219258..c8c2e4836c7e 100644 --- a/media/libtheora/lib/Makefile.in +++ b/media/libtheora/lib/Makefile.in @@ -8,7 +8,6 @@ srcdir = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 FORCE_STATIC_LIB = 1 ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = diff --git a/media/libtheora/lib/moz.build b/media/libtheora/lib/moz.build index 574863b42f5c..a2b52afc8830 100644 --- a/media/libtheora/lib/moz.build +++ b/media/libtheora/lib/moz.build @@ -8,3 +8,5 @@ MODULE = 'theora' LIBRARY_NAME = 'theora' +MSVC_ENABLE_PGO = True + diff --git a/media/libvorbis/lib/Makefile.in b/media/libvorbis/lib/Makefile.in index d3140b4c6e8b..d50520df9d00 100644 --- a/media/libvorbis/lib/Makefile.in +++ b/media/libvorbis/lib/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 FORCE_STATIC_LIB= 1 ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = diff --git a/media/libvorbis/lib/moz.build b/media/libvorbis/lib/moz.build index 8baff4775824..306e376d4790 100644 --- a/media/libvorbis/lib/moz.build +++ b/media/libvorbis/lib/moz.build @@ -8,3 +8,5 @@ MODULE = 'vorbis' LIBRARY_NAME = 'vorbis' +MSVC_ENABLE_PGO = True + diff --git a/media/libvpx/Makefile.in b/media/libvpx/Makefile.in index 73f93e77d004..3c0837b99808 100644 --- a/media/libvpx/Makefile.in +++ b/media/libvpx/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk DEFINES += -DHAVE_CONFIG_H=vpx_config.h -MSVC_ENABLE_PGO := 1 FORCE_STATIC_LIB= 1 ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = diff --git a/media/libvpx/moz.build b/media/libvpx/moz.build index 3384c26d8747..6924633b77e0 100644 --- a/media/libvpx/moz.build +++ b/media/libvpx/moz.build @@ -38,3 +38,5 @@ if CONFIG['VPX_NEED_OBJ_INT_EXTRACT']: LIBRARY_NAME = 'vpx' +MSVC_ENABLE_PGO = True + diff --git a/modules/libjar/Makefile.in b/modules/libjar/Makefile.in index 83b3b15b44df..5416d2022042 100644 --- a/modules/libjar/Makefile.in +++ b/modules/libjar/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = jar$(VERSION_NUMBER) -MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/modules/libjar/moz.build b/modules/libjar/moz.build index c738fa8e453e..152b5faf733f 100644 --- a/modules/libjar/moz.build +++ b/modules/libjar/moz.build @@ -38,3 +38,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/modules/libjar/zipwriter/src/Makefile.in b/modules/libjar/zipwriter/src/Makefile.in index 14633eaa92aa..6a11f41acd17 100644 --- a/modules/libjar/zipwriter/src/Makefile.in +++ b/modules/libjar/zipwriter/src/Makefile.in @@ -9,6 +9,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 include $(topsrcdir)/config/rules.mk diff --git a/modules/libjar/zipwriter/src/moz.build b/modules/libjar/zipwriter/src/moz.build index b89a6a4f5b88..f2102b2072d4 100644 --- a/modules/libjar/zipwriter/src/moz.build +++ b/modules/libjar/zipwriter/src/moz.build @@ -19,3 +19,5 @@ LIBRARY_NAME = 'zipwriter' LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in index 8c78cf30a4d1..04e7101a996b 100644 --- a/modules/libpref/src/Makefile.in +++ b/modules/libpref/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = pref -MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 DEFINES += -DOS_ARCH=$(OS_ARCH) \ -DMOZ_WIDGET_TOOLKIT=$(MOZ_WIDGET_TOOLKIT) \ diff --git a/modules/libpref/src/moz.build b/modules/libpref/src/moz.build index 138f26ee5c5e..bcafc630a00c 100644 --- a/modules/libpref/src/moz.build +++ b/modules/libpref/src/moz.build @@ -16,3 +16,5 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/netwerk/base/src/Makefile.in b/netwerk/base/src/Makefile.in index e6b6f485253c..acd989d1361d 100644 --- a/netwerk/base/src/Makefile.in +++ b/netwerk/base/src/Makefile.in @@ -12,7 +12,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = neckobase_s -MSVC_ENABLE_PGO := 1 LOCAL_INCLUDES += -I$(topsrcdir)/dom/base ifdef MOZ_PLATFORM_MAEMO diff --git a/netwerk/base/src/moz.build b/netwerk/base/src/moz.build index 97a0b2435415..250c8bbac44d 100644 --- a/netwerk/base/src/moz.build +++ b/netwerk/base/src/moz.build @@ -115,3 +115,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/netwerk/build/Makefile.in b/netwerk/build/Makefile.in index a793cf4ef873..bb8f2897b6c5 100644 --- a/netwerk/build/Makefile.in +++ b/netwerk/build/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = necko -MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 SHARED_LIBRARY_LIBS = \ ../base/src/$(LIB_PREFIX)neckobase_s.$(LIB_SUFFIX) \ diff --git a/netwerk/build/moz.build b/netwerk/build/moz.build index 70901e87fa90..7da937ee2593 100644 --- a/netwerk/build/moz.build +++ b/netwerk/build/moz.build @@ -18,3 +18,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/netwerk/cache/Makefile.in b/netwerk/cache/Makefile.in index 11b4276d90ff..0dd1d76ba806 100644 --- a/netwerk/cache/Makefile.in +++ b/netwerk/cache/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 LOCAL_INCLUDES = \ -I$(srcdir)/../base/src \ $(NULL) diff --git a/netwerk/cache/moz.build b/netwerk/cache/moz.build index 119a106c8175..7c7594947c62 100644 --- a/netwerk/cache/moz.build +++ b/netwerk/cache/moz.build @@ -48,3 +48,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/netwerk/dns/Makefile.in b/netwerk/dns/Makefile.in index e750b5704241..7054b5dae24c 100644 --- a/netwerk/dns/Makefile.in +++ b/netwerk/dns/Makefile.in @@ -10,9 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 - -# need to include etld_data.inc LOCAL_INCLUDES = \ -I$(srcdir)/../base/src \ -I. \ diff --git a/netwerk/dns/moz.build b/netwerk/dns/moz.build index 6e429eb0c661..bc967b2fe926 100644 --- a/netwerk/dns/moz.build +++ b/netwerk/dns/moz.build @@ -41,3 +41,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/netwerk/mime/Makefile.in b/netwerk/mime/Makefile.in index 80b5b90d2298..4c60501bcae7 100644 --- a/netwerk/mime/Makefile.in +++ b/netwerk/mime/Makefile.in @@ -9,6 +9,5 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk diff --git a/netwerk/mime/moz.build b/netwerk/mime/moz.build index d84d8a084a8a..7857a39975a7 100644 --- a/netwerk/mime/moz.build +++ b/netwerk/mime/moz.build @@ -26,3 +26,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/netwerk/protocol/file/Makefile.in b/netwerk/protocol/file/Makefile.in index fc795ec599bd..30ab47b11c5f 100644 --- a/netwerk/protocol/file/Makefile.in +++ b/netwerk/protocol/file/Makefile.in @@ -9,7 +9,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/xpcom/ds \ diff --git a/netwerk/protocol/file/moz.build b/netwerk/protocol/file/moz.build index 575a5a18d06c..98dd51a60130 100644 --- a/netwerk/protocol/file/moz.build +++ b/netwerk/protocol/file/moz.build @@ -24,3 +24,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/netwerk/protocol/ftp/Makefile.in b/netwerk/protocol/ftp/Makefile.in index 92c2c81f7540..7b64e080b3a5 100644 --- a/netwerk/protocol/ftp/Makefile.in +++ b/netwerk/protocol/ftp/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkftp_s -MSVC_ENABLE_PGO := 1 LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/xpcom/ds \ diff --git a/netwerk/protocol/ftp/moz.build b/netwerk/protocol/ftp/moz.build index a595e22076aa..67fbf771a4cc 100644 --- a/netwerk/protocol/ftp/moz.build +++ b/netwerk/protocol/ftp/moz.build @@ -38,3 +38,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/netwerk/protocol/http/Makefile.in b/netwerk/protocol/http/Makefile.in index b5a21e0ec730..9918a6966f37 100644 --- a/netwerk/protocol/http/Makefile.in +++ b/netwerk/protocol/http/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkhttp_s -MSVC_ENABLE_PGO := 1 LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/xpcom/ds \ diff --git a/netwerk/protocol/http/moz.build b/netwerk/protocol/http/moz.build index 166224f6d116..ecc190ac93e4 100644 --- a/netwerk/protocol/http/moz.build +++ b/netwerk/protocol/http/moz.build @@ -84,3 +84,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/netwerk/protocol/res/Makefile.in b/netwerk/protocol/res/Makefile.in index 5f6088d2a543..a296b85597a3 100644 --- a/netwerk/protocol/res/Makefile.in +++ b/netwerk/protocol/res/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkres_s -MSVC_ENABLE_PGO := 1 LOCAL_INCLUDES = \ -I$(topsrcdir)/netwerk/base/src \ $(NULL) diff --git a/netwerk/protocol/res/moz.build b/netwerk/protocol/res/moz.build index f7b096fac096..67216dc63098 100644 --- a/netwerk/protocol/res/moz.build +++ b/netwerk/protocol/res/moz.build @@ -20,3 +20,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/netwerk/protocol/websocket/Makefile.in b/netwerk/protocol/websocket/Makefile.in index 5a36c7f359e9..8c1a829296f6 100644 --- a/netwerk/protocol/websocket/Makefile.in +++ b/netwerk/protocol/websocket/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = nkwebsocket_s -MSVC_ENABLE_PGO := 1 LOCAL_INCLUDES = \ -I$(srcdir)/../../base/src \ -I$(topsrcdir)/content/base/src \ diff --git a/netwerk/protocol/websocket/moz.build b/netwerk/protocol/websocket/moz.build index 86dfec9103f4..702033870687 100644 --- a/netwerk/protocol/websocket/moz.build +++ b/netwerk/protocol/websocket/moz.build @@ -35,3 +35,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/netwerk/streamconv/converters/Makefile.in b/netwerk/streamconv/converters/Makefile.in index 10f51e262a3d..791cb8105768 100644 --- a/netwerk/streamconv/converters/Makefile.in +++ b/netwerk/streamconv/converters/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 LOCAL_INCLUDES = \ -I$(topsrcdir)/netwerk/base/src \ $(NULL) diff --git a/netwerk/streamconv/converters/moz.build b/netwerk/streamconv/converters/moz.build index 60511e35645c..132f3e449c51 100644 --- a/netwerk/streamconv/converters/moz.build +++ b/netwerk/streamconv/converters/moz.build @@ -34,3 +34,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/netwerk/streamconv/src/Makefile.in b/netwerk/streamconv/src/Makefile.in index 4f19a9cc820a..ac724e1bc29c 100644 --- a/netwerk/streamconv/src/Makefile.in +++ b/netwerk/streamconv/src/Makefile.in @@ -10,6 +10,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk diff --git a/netwerk/streamconv/src/moz.build b/netwerk/streamconv/src/moz.build index ced1bd13a17a..8c27f545d813 100644 --- a/netwerk/streamconv/src/moz.build +++ b/netwerk/streamconv/src/moz.build @@ -23,3 +23,5 @@ LIBRARY_NAME = 'nkconv_s' LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/parser/expat/lib/Makefile.in b/parser/expat/lib/Makefile.in index 473ed6bdd248..122d29536fb3 100644 --- a/parser/expat/lib/Makefile.in +++ b/parser/expat/lib/Makefile.in @@ -9,8 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 - CSRCS = \ xmlparse.c \ xmlrole.c \ diff --git a/parser/expat/lib/moz.build b/parser/expat/lib/moz.build index bea67ad77fc4..2a79246c176c 100644 --- a/parser/expat/lib/moz.build +++ b/parser/expat/lib/moz.build @@ -13,3 +13,5 @@ EXPORTS += [ LIBRARY_NAME = 'mozexpat_s' +MSVC_ENABLE_PGO = True + diff --git a/parser/html/Makefile.in b/parser/html/Makefile.in index 5244de8fc7fc..97a3eaf678a8 100644 --- a/parser/html/Makefile.in +++ b/parser/html/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk INCLUDES += \ diff --git a/parser/html/moz.build b/parser/html/moz.build index a731cf5e236b..4a352300197b 100644 --- a/parser/html/moz.build +++ b/parser/html/moz.build @@ -87,3 +87,5 @@ LIBRARY_NAME = 'html5p_s' LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/parser/xml/src/Makefile.in b/parser/xml/src/Makefile.in index 7f846873003b..e94516bfe7fa 100644 --- a/parser/xml/src/Makefile.in +++ b/parser/xml/src/Makefile.in @@ -9,7 +9,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 - MOZILLA_INTERNAL_API = 1 include $(topsrcdir)/config/rules.mk diff --git a/parser/xml/src/moz.build b/parser/xml/src/moz.build index 105c78544d33..da2da0bbf550 100644 --- a/parser/xml/src/moz.build +++ b/parser/xml/src/moz.build @@ -22,3 +22,5 @@ LIBRARY_NAME = 'saxp' LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/security/manager/boot/src/Makefile.in b/security/manager/boot/src/Makefile.in index c5f34657d7e6..63ed85672c26 100644 --- a/security/manager/boot/src/Makefile.in +++ b/security/manager/boot/src/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 DEFINES += -D__STDC_CONSTANT_MACROS diff --git a/security/manager/boot/src/moz.build b/security/manager/boot/src/moz.build index 50a7335058da..a4d0ac0816ac 100644 --- a/security/manager/boot/src/moz.build +++ b/security/manager/boot/src/moz.build @@ -21,3 +21,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/toolkit/components/telemetry/Makefile.in b/toolkit/components/telemetry/Makefile.in index a208b6508c36..e81d7a8ffef8 100644 --- a/toolkit/components/telemetry/Makefile.in +++ b/toolkit/components/telemetry/Makefile.in @@ -14,9 +14,6 @@ include $(topsrcdir)/config/makefiles/rcs.mk EXPORT_LIBRARY = 1 LIBRARY_NAME = telemetry -MSVC_ENABLE_PGO := 1 - - LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/build LOCAL_INCLUDES += -I$(topsrcdir)/xpcom/threads diff --git a/toolkit/components/telemetry/moz.build b/toolkit/components/telemetry/moz.build index ca7b3b118d4b..f1780f693436 100644 --- a/toolkit/components/telemetry/moz.build +++ b/toolkit/components/telemetry/moz.build @@ -41,3 +41,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/toolkit/components/url-classifier/Makefile.in b/toolkit/components/url-classifier/Makefile.in index f47ac69579c0..844f17d5b616 100644 --- a/toolkit/components/url-classifier/Makefile.in +++ b/toolkit/components/url-classifier/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 LOCAL_INCLUDES = \ -I$(srcdir)/../build \ $(SQLITE_CFLAGS) \ diff --git a/toolkit/components/url-classifier/moz.build b/toolkit/components/url-classifier/moz.build index 63061a47be25..4112828827f8 100644 --- a/toolkit/components/url-classifier/moz.build +++ b/toolkit/components/url-classifier/moz.build @@ -52,3 +52,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/toolkit/crashreporter/Makefile.in b/toolkit/crashreporter/Makefile.in index bf40f1967779..44bf8ed09477 100644 --- a/toolkit/crashreporter/Makefile.in +++ b/toolkit/crashreporter/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = exception_handler_s -MSVC_ENABLE_PGO := 1 - ifeq ($(OS_ARCH),Linux) # MOZ_APP_NAME is needed on Android, where we # need to launch by package name. diff --git a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in index 604f650cae8d..3c0729b87ca3 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/Makefile.in +++ b/toolkit/crashreporter/google-breakpad/src/common/Makefile.in @@ -9,7 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 ifneq (WINNT,$(OS_TARGET)) ifdef MOZ_CRASHREPORTER endif diff --git a/toolkit/crashreporter/google-breakpad/src/common/moz.build b/toolkit/crashreporter/google-breakpad/src/common/moz.build index 4a795de910d8..836203cf7f75 100644 --- a/toolkit/crashreporter/google-breakpad/src/common/moz.build +++ b/toolkit/crashreporter/google-breakpad/src/common/moz.build @@ -68,3 +68,5 @@ if CONFIG['OS_TARGET'] == 'Android': LIBRARY_NAME = 'breakpad_common_s' +MSVC_ENABLE_PGO = True + diff --git a/toolkit/crashreporter/moz.build b/toolkit/crashreporter/moz.build index bd487aac6da0..de7a456210b6 100644 --- a/toolkit/crashreporter/moz.build +++ b/toolkit/crashreporter/moz.build @@ -79,3 +79,5 @@ EXTRA_JS_MODULES += [ LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in index 578e5d7f5656..e492f57358ff 100644 --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in @@ -12,7 +12,6 @@ include $(DEPTH)/config/autoconf.mk include $(topsrcdir)/rdf/util/src/objs.mk include $(topsrcdir)/intl/unicharutil/util/objs.mk -MSVC_ENABLE_PGO := 1 FORCE_SHARED_LIB = 1 MOZILLA_INTERNAL_API = 1 diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build index 747af4d0c0c1..8627ac1c283d 100644 --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build @@ -46,3 +46,5 @@ if CONFIG['OS_ARCH'] == 'OS2': 'dlldeps-zlib.cpp', ] +MSVC_ENABLE_PGO = True + diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in index 7cdafe8616c0..59623b2c60b2 100644 --- a/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in @@ -18,7 +18,6 @@ include $(topsrcdir)/config/makefiles/makeutils.mk milestone_txt = $(topsrcdir)/config/milestone.txt LIBRARY_NAME = xulapp_s -MSVC_ENABLE_PGO := 1 ifeq ($(MOZ_GL_DEFAULT_PROVIDER),GLX) DEFINES += -DUSE_GLX_TEST endif diff --git a/toolkit/xre/moz.build b/toolkit/xre/moz.build index e8f5cf0ddd50..ca01069a3d68 100644 --- a/toolkit/xre/moz.build +++ b/toolkit/xre/moz.build @@ -96,3 +96,5 @@ if CONFIG['MOZ_UPDATER']: LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/uriloader/base/Makefile.in b/uriloader/base/Makefile.in index 7238228cb4ae..7ced9a43e805 100644 --- a/uriloader/base/Makefile.in +++ b/uriloader/base/Makefile.in @@ -10,6 +10,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk diff --git a/uriloader/base/moz.build b/uriloader/base/moz.build index 51993b6e2308..594aa2ffb177 100644 --- a/uriloader/base/moz.build +++ b/uriloader/base/moz.build @@ -34,3 +34,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/view/src/Makefile.in b/view/src/Makefile.in index 674b0e48ae19..1498bab29b73 100644 --- a/view/src/Makefile.in +++ b/view/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/view/src/moz.build b/view/src/moz.build index abfa6a58623a..8df424736cf8 100644 --- a/view/src/moz.build +++ b/view/src/moz.build @@ -17,3 +17,5 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/widget/windows/Makefile.in b/widget/windows/Makefile.in index 8fc92b68f713..c6558045b265 100644 --- a/widget/windows/Makefile.in +++ b/widget/windows/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = widget_windows -MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 RESFILE = widget.res DEFINES += -DMOZ_UNICODE diff --git a/widget/windows/moz.build b/widget/windows/moz.build index a4369ab0a9b1..6f33a6e922aa 100644 --- a/widget/windows/moz.build +++ b/widget/windows/moz.build @@ -84,3 +84,5 @@ if CONFIG['NS_ENABLE_TSF']: LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/widget/xpwidgets/Makefile.in b/widget/xpwidgets/Makefile.in index c098f12f01b1..d8285c62317a 100644 --- a/widget/xpwidgets/Makefile.in +++ b/widget/xpwidgets/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = xpwidgets_s -MSVC_ENABLE_PGO := 1 SHARED_LIBRARY_LIBS = ../shared/$(LIB_PREFIX)widget_shared.$(LIB_SUFFIX) ifdef MOZ_X11 SHARED_LIBRARY_LIBS += ../shared/x11/$(LIB_PREFIX)widget_shared_x11.$(LIB_SUFFIX) diff --git a/widget/xpwidgets/moz.build b/widget/xpwidgets/moz.build index 0d2ce6a0acbf..b100788698ac 100644 --- a/widget/xpwidgets/moz.build +++ b/widget/xpwidgets/moz.build @@ -57,3 +57,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] in ('qt', 'gtk2', 'gtk3', 'windows', 'cocoa'): LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in index a52c3f4dde9c..d97e66dda121 100644 --- a/xpcom/base/Makefile.in +++ b/xpcom/base/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = xpcombase_s -MSVC_ENABLE_PGO := 1 MOZILLA_INTERNAL_API =1 CSRCS = \ nsErrorAssertsC.c \ diff --git a/xpcom/base/moz.build b/xpcom/base/moz.build index 68c95e251e5a..16182db18e8e 100644 --- a/xpcom/base/moz.build +++ b/xpcom/base/moz.build @@ -128,3 +128,5 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/xpcom/build/Makefile.in b/xpcom/build/Makefile.in index 9d6c9949c83d..4fe9203e20aa 100644 --- a/xpcom/build/Makefile.in +++ b/xpcom/build/Makefile.in @@ -15,7 +15,6 @@ include $(srcdir)/../glue/objs.mk EXTRA_DEPS += $(srcdir)/../glue/objs.mk LIBRARY_NAME = xpcom_core -MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 MOZILLA_INTERNAL_API = 1 diff --git a/xpcom/build/moz.build b/xpcom/build/moz.build index 7dcefca4b909..bc794608b2ba 100644 --- a/xpcom/build/moz.build +++ b/xpcom/build/moz.build @@ -54,3 +54,5 @@ CPP_SOURCES += [ LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in index 0015c606d397..e23d24777374 100644 --- a/xpcom/components/Makefile.in +++ b/xpcom/components/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 MOZILLA_INTERNAL_API = 1 LOCAL_INCLUDES = \ diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build index 3b4e4d936b4d..88e253482075 100644 --- a/xpcom/components/moz.build +++ b/xpcom/components/moz.build @@ -39,3 +39,5 @@ LIBRARY_NAME = 'xpcomcomponents_s' LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/xpcom/ds/Makefile.in b/xpcom/ds/Makefile.in index 9b221d0bc5ee..7408bb7dc791 100644 --- a/xpcom/ds/Makefile.in +++ b/xpcom/ds/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 MOZILLA_INTERNAL_API = 1 include $(topsrcdir)/config/rules.mk diff --git a/xpcom/ds/moz.build b/xpcom/ds/moz.build index e02b59e7b52a..01a7d07ca520 100644 --- a/xpcom/ds/moz.build +++ b/xpcom/ds/moz.build @@ -118,3 +118,5 @@ LIBRARY_NAME = 'xpcomds_s' LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in index 529f0213f0de..b66e3b2d911c 100644 --- a/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = xpcomio_s -MSVC_ENABLE_PGO := 1 MOZILLA_INTERNAL_API = 1 include $(topsrcdir)/config/rules.mk include $(topsrcdir)/ipc/chromium/chromium-config.mk diff --git a/xpcom/io/moz.build b/xpcom/io/moz.build index db029f24eab0..dfa091596cac 100644 --- a/xpcom/io/moz.build +++ b/xpcom/io/moz.build @@ -124,3 +124,5 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/xpcom/reflect/xptcall/src/Makefile.in b/xpcom/reflect/xptcall/src/Makefile.in index 510cbdbb7e54..bdef57704cf7 100644 --- a/xpcom/reflect/xptcall/src/Makefile.in +++ b/xpcom/reflect/xptcall/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 MOZILLA_INTERNAL_API = 1 # we don't want the shared lib, but we want to force the creation of a static lib. diff --git a/xpcom/reflect/xptcall/src/moz.build b/xpcom/reflect/xptcall/src/moz.build index b519027a8e7f..4b47db7ed1a1 100644 --- a/xpcom/reflect/xptcall/src/moz.build +++ b/xpcom/reflect/xptcall/src/moz.build @@ -14,3 +14,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'xptcall' +MSVC_ENABLE_PGO = True + diff --git a/xpcom/reflect/xptinfo/src/Makefile.in b/xpcom/reflect/xptinfo/src/Makefile.in index 671ceaeef977..11aaffa7c0d9 100644 --- a/xpcom/reflect/xptinfo/src/Makefile.in +++ b/xpcom/reflect/xptinfo/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 MOZILLA_INTERNAL_API = 1 # we don't want the shared lib, but we want to force the creation of a static lib. diff --git a/xpcom/reflect/xptinfo/src/moz.build b/xpcom/reflect/xptinfo/src/moz.build index b2685a7bcfaa..f257aab15a1b 100644 --- a/xpcom/reflect/xptinfo/src/moz.build +++ b/xpcom/reflect/xptinfo/src/moz.build @@ -15,3 +15,5 @@ CPP_SOURCES += [ LIBRARY_NAME = 'xptinfo' +MSVC_ENABLE_PGO = True + diff --git a/xpcom/string/src/Makefile.in b/xpcom/string/src/Makefile.in index 2b6af773628b..74695176e0ea 100644 --- a/xpcom/string/src/Makefile.in +++ b/xpcom/string/src/Makefile.in @@ -11,7 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 MOZILLA_INTERNAL_API = 1 # we don't want the shared lib, but we want to force the creation of a diff --git a/xpcom/string/src/moz.build b/xpcom/string/src/moz.build index f95e2d4b182e..2d8540aa3d2d 100644 --- a/xpcom/string/src/moz.build +++ b/xpcom/string/src/moz.build @@ -27,3 +27,5 @@ if CONFIG['INTEL_ARCHITECTURE']: LIBRARY_NAME = 'string_s' +MSVC_ENABLE_PGO = True + diff --git a/xpcom/threads/Makefile.in b/xpcom/threads/Makefile.in index 116e50836f19..e41bcf67fbb7 100644 --- a/xpcom/threads/Makefile.in +++ b/xpcom/threads/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 MOZILLA_INTERNAL_API = 1 LOCAL_INCLUDES = -I$(srcdir)/../components LOCAL_INCLUDES = -I$(srcdir)/../build diff --git a/xpcom/threads/moz.build b/xpcom/threads/moz.build index 714f39556516..c31d1f03cc90 100644 --- a/xpcom/threads/moz.build +++ b/xpcom/threads/moz.build @@ -53,3 +53,5 @@ LIBRARY_NAME = 'xpcomthreads_s' LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + diff --git a/xpfe/appshell/src/Makefile.in b/xpfe/appshell/src/Makefile.in index 6aa9ee2fefdb..19fa4d68cabc 100644 --- a/xpfe/appshell/src/Makefile.in +++ b/xpfe/appshell/src/Makefile.in @@ -10,7 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 LOCAL_INCLUDES += -I$(topsrcdir)/dom/base diff --git a/xpfe/appshell/src/moz.build b/xpfe/appshell/src/moz.build index aee1e868bcac..09de5b4ed525 100644 --- a/xpfe/appshell/src/moz.build +++ b/xpfe/appshell/src/moz.build @@ -23,3 +23,5 @@ LIBRARY_NAME = 'nsappshell' LIBXUL_LIBRARY = True +MSVC_ENABLE_PGO = True + From db8e00e85fffaf826f4143a1b30a36be1f8cd1f9 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:56:01 +0200 Subject: [PATCH 72/79] Bug 904831 - Part c: Move conditional MSVC_ENABLE_PGO definitions into moz.build and remove empty makefiles; r=mshal --- content/xul/content/src/Makefile.in | 4 ---- content/xul/content/src/moz.build | 1 + gfx/graphite2/src/Makefile.in | 1 + intl/strres/src/Makefile.in | 13 ------------- netwerk/cookie/Makefile.in | 1 - netwerk/cookie/moz.build | 1 + netwerk/dns/Makefile.in | 1 + netwerk/mime/Makefile.in | 13 ------------- netwerk/streamconv/src/Makefile.in | 14 -------------- toolkit/components/places/Makefile.in | 1 - toolkit/components/places/moz.build | 1 + uriloader/base/Makefile.in | 14 -------------- 12 files changed, 5 insertions(+), 60 deletions(-) delete mode 100644 intl/strres/src/Makefile.in delete mode 100644 netwerk/mime/Makefile.in delete mode 100644 netwerk/streamconv/src/Makefile.in delete mode 100644 uriloader/base/Makefile.in diff --git a/content/xul/content/src/Makefile.in b/content/xul/content/src/Makefile.in index 82fa0cafc9f4..7014a593e37a 100644 --- a/content/xul/content/src/Makefile.in +++ b/content/xul/content/src/Makefile.in @@ -9,10 +9,6 @@ srcdir = @srcdir@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifdef MOZ_XUL -MSVC_ENABLE_PGO := 1 -endif - include $(topsrcdir)/config/rules.mk LOCAL_INCLUDES = \ diff --git a/content/xul/content/src/moz.build b/content/xul/content/src/moz.build index 4f5dc025356f..2c209b0cf729 100644 --- a/content/xul/content/src/moz.build +++ b/content/xul/content/src/moz.build @@ -8,6 +8,7 @@ MODULE = 'xul' if CONFIG['MOZ_XUL']: LIBXUL_LIBRARY = True + MSVC_ENABLE_PGO = True CPP_SOURCES += [ 'nsXULElement.cpp', diff --git a/gfx/graphite2/src/Makefile.in b/gfx/graphite2/src/Makefile.in index c308749a3a7f..c9ffeb519c0f 100644 --- a/gfx/graphite2/src/Makefile.in +++ b/gfx/graphite2/src/Makefile.in @@ -21,6 +21,7 @@ endif # get the lists of source files and exported headers include $(srcdir)/files.mk +# on Windows, we're going to link graphite with gkmedias instead of libxul ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = FORCE_STATIC_LIB = 1 diff --git a/intl/strres/src/Makefile.in b/intl/strres/src/Makefile.in deleted file mode 100644 index 654736c57b5a..000000000000 --- a/intl/strres/src/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -include $(topsrcdir)/config/rules.mk diff --git a/netwerk/cookie/Makefile.in b/netwerk/cookie/Makefile.in index 995a377a85f1..b1748746821e 100644 --- a/netwerk/cookie/Makefile.in +++ b/netwerk/cookie/Makefile.in @@ -13,7 +13,6 @@ include $(DEPTH)/config/autoconf.mk ifdef NECKO_COOKIES LIBRARY_NAME = neckocookie_s -MSVC_ENABLE_PGO := 1 LOCAL_INCLUDES = \ -I$(topsrcdir)/intl/uconv/src \ diff --git a/netwerk/cookie/moz.build b/netwerk/cookie/moz.build index cb2e6c1ed98a..d66179c89a6a 100644 --- a/netwerk/cookie/moz.build +++ b/netwerk/cookie/moz.build @@ -20,6 +20,7 @@ MODULE = 'necko' if CONFIG['NECKO_COOKIES']: LIBXUL_LIBRARY = True + MSVC_ENABLE_PGO = True EXPORTS.mozilla.net = [ 'CookieServiceParent.h', diff --git a/netwerk/dns/Makefile.in b/netwerk/dns/Makefile.in index 7054b5dae24c..ba242011bae1 100644 --- a/netwerk/dns/Makefile.in +++ b/netwerk/dns/Makefile.in @@ -10,6 +10,7 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk +# need to include etld_data.inc LOCAL_INCLUDES = \ -I$(srcdir)/../base/src \ -I. \ diff --git a/netwerk/mime/Makefile.in b/netwerk/mime/Makefile.in deleted file mode 100644 index 4c60501bcae7..000000000000 --- a/netwerk/mime/Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ -include $(DEPTH)/config/autoconf.mk - -include $(topsrcdir)/config/rules.mk - diff --git a/netwerk/streamconv/src/Makefile.in b/netwerk/streamconv/src/Makefile.in deleted file mode 100644 index ac724e1bc29c..000000000000 --- a/netwerk/streamconv/src/Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -include $(topsrcdir)/config/rules.mk - diff --git a/toolkit/components/places/Makefile.in b/toolkit/components/places/Makefile.in index 34e11032c37f..5d70b5ab787f 100644 --- a/toolkit/components/places/Makefile.in +++ b/toolkit/components/places/Makefile.in @@ -11,7 +11,6 @@ include $(DEPTH)/config/autoconf.mk ifdef MOZ_PLACES LIBRARY_NAME = places -MSVC_ENABLE_PGO := 1 EXPORT_LIBRARY = 1 LOCAL_INCLUDES += -I$(srcdir)/../build diff --git a/toolkit/components/places/moz.build b/toolkit/components/places/moz.build index 47ce150d808e..f2df50137913 100644 --- a/toolkit/components/places/moz.build +++ b/toolkit/components/places/moz.build @@ -13,6 +13,7 @@ XPIDL_SOURCES += [ if CONFIG['MOZ_PLACES']: LIBXUL_LIBRARY = True + MSVC_ENABLE_PGO = True XPIDL_SOURCES += [ 'mozIAsyncFavicons.idl', diff --git a/uriloader/base/Makefile.in b/uriloader/base/Makefile.in deleted file mode 100644 index 7ced9a43e805..000000000000 --- a/uriloader/base/Makefile.in +++ /dev/null @@ -1,14 +0,0 @@ -# vim:set noet: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -include $(topsrcdir)/config/rules.mk - From d2a26bacbc34d366f418752df68c17529690ebd8 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:56:02 +0200 Subject: [PATCH 73/79] Bug 904831 - Part d: Disallow MSVC_ENABLE_PGO in Makefiles; r=khuey --- config/rules.mk | 1 + js/src/config/rules.mk | 1 + 2 files changed, 2 insertions(+) diff --git a/config/rules.mk b/config/rules.mk index deb830442a97..14c9b4c646b1 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -26,6 +26,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \ HOST_LIBRARY_NAME \ LIBXUL_LIBRARY \ MODULE \ + MSVC_ENABLE_PGO \ NO_DIST_INSTALL \ PARALLEL_DIRS \ SIMPLE_PROGRAMS \ diff --git a/js/src/config/rules.mk b/js/src/config/rules.mk index deb830442a97..14c9b4c646b1 100644 --- a/js/src/config/rules.mk +++ b/js/src/config/rules.mk @@ -26,6 +26,7 @@ _MOZBUILD_EXTERNAL_VARIABLES := \ HOST_LIBRARY_NAME \ LIBXUL_LIBRARY \ MODULE \ + MSVC_ENABLE_PGO \ NO_DIST_INSTALL \ PARALLEL_DIRS \ SIMPLE_PROGRAMS \ From 04a948975a43869a4989e39247a61c4a39709ac0 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:56:02 +0200 Subject: [PATCH 74/79] Bug 906619 - Part a: Move unconditional CSRCS to moz.build; r=mshal --- build/unix/elfhack/Makefile.in | 5 -- build/unix/elfhack/moz.build | 6 ++ db/sqlite3/src/Makefile.in | 4 -- db/sqlite3/src/moz.build | 4 ++ gfx/cairo/cairo/src/Makefile.in | 73 ------------------------ gfx/cairo/cairo/src/moz.build | 73 ++++++++++++++++++++++++ gfx/cairo/libpixman/src/Makefile.in | 33 ----------- gfx/cairo/libpixman/src/moz.build | 33 +++++++++++ gfx/qcms/Makefile.in | 8 --- gfx/qcms/moz.build | 8 +++ image/decoders/Makefile.in | 3 - image/decoders/moz.build | 4 ++ intl/hyphenation/src/Makefile.in | 15 ----- intl/hyphenation/src/moz.build | 4 ++ intl/uconv/util/Makefile.in | 6 -- intl/uconv/util/moz.build | 6 ++ intl/unicharutil/tools/Makefile.in | 2 - intl/unicharutil/tools/moz.build | 4 ++ js/src/editline/Makefile.in | 2 - js/src/editline/moz.build | 5 ++ media/libspeex_resampler/src/Makefile.in | 4 -- media/libspeex_resampler/src/moz.build | 4 ++ media/libtheora/lib/Makefile.in | 16 ------ media/libtheora/lib/moz.build | 16 ++++++ media/libtremor/lib/Makefile.in | 15 ----- media/libtremor/lib/moz.build | 15 +++++ media/libvorbis/lib/Makefile.in | 23 -------- media/libvorbis/lib/moz.build | 23 ++++++++ media/libvpx/Makefile.in | 52 ----------------- media/libvpx/moz.build | 52 +++++++++++++++++ modules/libbz2/src/Makefile.in | 11 ---- modules/libbz2/src/moz.build | 10 ++++ modules/libmar/sign/Makefile.in | 5 -- modules/libmar/sign/moz.build | 5 ++ modules/libmar/src/Makefile.in | 6 -- modules/libmar/src/moz.build | 6 ++ modules/libmar/verify/Makefile.in | 5 -- modules/libmar/verify/moz.build | 5 ++ other-licenses/android/Makefile.in | 19 ------ other-licenses/android/moz.build | 19 ++++++ parser/expat/lib/Makefile.in | 6 -- parser/expat/lib/moz.build | 6 ++ security/manager/ssl/src/Makefile.in | 2 - security/manager/ssl/src/moz.build | 4 ++ widget/gtk2/Makefile.in | 4 -- widget/gtk2/moz.build | 4 ++ widget/shared/x11/Makefile.in | 4 -- widget/shared/x11/moz.build | 4 ++ xpcom/base/Makefile.in | 4 -- xpcom/base/moz.build | 5 ++ xpcom/typelib/xpt/src/Makefile.in | 2 - xpcom/typelib/xpt/src/moz.build | 6 ++ 52 files changed, 331 insertions(+), 329 deletions(-) delete mode 100644 intl/hyphenation/src/Makefile.in diff --git a/build/unix/elfhack/Makefile.in b/build/unix/elfhack/Makefile.in index d14409ef5bf5..6c79089b0cbd 100644 --- a/build/unix/elfhack/Makefile.in +++ b/build/unix/elfhack/Makefile.in @@ -24,11 +24,6 @@ HOST_CPPSRCS = \ OS_CXXFLAGS := $(filter-out -fno-exceptions,$(OS_CXXFLAGS)) -fexceptions -CSRCS := \ - test-ctors.c \ - test-array.c \ - $(NULL) - ifndef CROSS_COMPILE CSRCS += dummy.c endif diff --git a/build/unix/elfhack/moz.build b/build/unix/elfhack/moz.build index 11e0390ba054..7d136e84a085 100644 --- a/build/unix/elfhack/moz.build +++ b/build/unix/elfhack/moz.build @@ -6,3 +6,9 @@ NO_DIST_INSTALL = True DIRS += ['inject'] + +CSRCS += [ + 'test-array.c', + 'test-ctors.c', +] + diff --git a/db/sqlite3/src/Makefile.in b/db/sqlite3/src/Makefile.in index 92766806b30f..88a2cfe36b8e 100644 --- a/db/sqlite3/src/Makefile.in +++ b/db/sqlite3/src/Makefile.in @@ -60,10 +60,6 @@ ifeq ($(OS_ARCH),WINNT) MODULE_OPTIMIZE_FLAGS = -O2 endif -CSRCS = \ - sqlite3.c \ - $(NULL) - # -DSQLITE_SECURE_DELETE=1 will cause SQLITE to 0-fill delete data so we # don't have to vacuum to make sure the data is not visible in the file. # -DSQLITE_ENABLE_FTS3=1 enables the full-text index module. diff --git a/db/sqlite3/src/moz.build b/db/sqlite3/src/moz.build index 5293980f6d03..0fac784d0aa4 100644 --- a/db/sqlite3/src/moz.build +++ b/db/sqlite3/src/moz.build @@ -12,3 +12,7 @@ EXPORTS += [ LIBRARY_NAME = 'mozsqlite3' +CSRCS += [ + 'sqlite3.c', +] + diff --git a/gfx/cairo/cairo/src/Makefile.in b/gfx/cairo/cairo/src/Makefile.in index 1a22b2ec3984..21e1506502e6 100644 --- a/gfx/cairo/cairo/src/Makefile.in +++ b/gfx/cairo/cairo/src/Makefile.in @@ -16,79 +16,6 @@ endif endif -CSRCS = \ - cairo.c \ - cairo-analysis-surface.c \ - cairo-arc.c \ - cairo-array.c \ - cairo-atomic.c \ - cairo-base64-stream.c \ - cairo-bentley-ottmann.c \ - cairo-bentley-ottmann-rectilinear.c \ - cairo-bentley-ottmann-rectangular.c \ - cairo-botor-scan-converter.c \ - cairo-boxes.c \ - cairo-cache.c \ - cairo-clip.c \ - cairo-color.c \ - cairo-composite-rectangles.c \ - cairo-debug.c \ - cairo-device.c \ - cairo-fixed.c \ - cairo-font-face.c \ - cairo-font-face-twin.c \ - cairo-font-face-twin-data.c \ - cairo-font-options.c \ - cairo-freed-pool.c \ - cairo-freelist.c \ - cairo-gstate.c \ - cairo-hash.c \ - cairo-hull.c \ - cairo-image-info.c \ - cairo-image-surface.c \ - cairo-lzw.c \ - cairo-matrix.c \ - cairo-misc.c \ - cairo-mutex.c \ - cairo-observer.c \ - cairo-output-stream.c \ - cairo-paginated-surface.c \ - cairo-path.c \ - cairo-path-bounds.c \ - cairo-path-fill.c \ - cairo-path-fixed.c \ - cairo-path-in-fill.c \ - cairo-path-stroke.c \ - cairo-pattern.c \ - cairo-pen.c \ - cairo-polygon.c \ - cairo-recording-surface.c \ - cairo-rectangle.c \ - cairo-rectangular-scan-converter.c \ - cairo-region.c \ - cairo-scaled-font.c \ - cairo-scaled-font-subsets.c \ - cairo-slope.c \ - cairo-spans.c \ - cairo-spline.c \ - cairo-stroke-style.c \ - cairo-surface.c \ - cairo-surface-clipper.c \ - cairo-surface-fallback.c \ - cairo-surface-offset.c \ - cairo-surface-snapshot.c \ - cairo-surface-subsurface.c \ - cairo-surface-wrapper.c \ - cairo-tee-surface.c \ - cairo-tor-scan-converter.c \ - cairo-toy-font-face.c \ - cairo-traps.c \ - cairo-unicode.c \ - cairo-user-font.c \ - cairo-version.c \ - cairo-wideint.c \ - $(NULL) - ifneq ($(MOZ_WIDGET_TOOLKIT),cocoa) CSRCS += cairo-deflate-stream.c endif diff --git a/gfx/cairo/cairo/src/moz.build b/gfx/cairo/cairo/src/moz.build index 18f50c5961f7..53535922c5a2 100644 --- a/gfx/cairo/cairo/src/moz.build +++ b/gfx/cairo/cairo/src/moz.build @@ -82,5 +82,78 @@ LIBRARY_NAME = 'mozcairo' LIBXUL_LIBRARY = True +CSRCS += [ + 'cairo-analysis-surface.c', + 'cairo-arc.c', + 'cairo-array.c', + 'cairo-atomic.c', + 'cairo-base64-stream.c', + 'cairo-bentley-ottmann-rectangular.c', + 'cairo-bentley-ottmann-rectilinear.c', + 'cairo-bentley-ottmann.c', + 'cairo-botor-scan-converter.c', + 'cairo-boxes.c', + 'cairo-cache.c', + 'cairo-clip.c', + 'cairo-color.c', + 'cairo-composite-rectangles.c', + 'cairo-debug.c', + 'cairo-device.c', + 'cairo-fixed.c', + 'cairo-font-face-twin-data.c', + 'cairo-font-face-twin.c', + 'cairo-font-face.c', + 'cairo-font-options.c', + 'cairo-freed-pool.c', + 'cairo-freelist.c', + 'cairo-gstate.c', + 'cairo-hash.c', + 'cairo-hull.c', + 'cairo-image-info.c', + 'cairo-image-surface.c', + 'cairo-lzw.c', + 'cairo-matrix.c', + 'cairo-misc.c', + 'cairo-mutex.c', + 'cairo-observer.c', + 'cairo-output-stream.c', + 'cairo-paginated-surface.c', + 'cairo-path-bounds.c', + 'cairo-path-fill.c', + 'cairo-path-fixed.c', + 'cairo-path-in-fill.c', + 'cairo-path-stroke.c', + 'cairo-path.c', + 'cairo-pattern.c', + 'cairo-pen.c', + 'cairo-polygon.c', + 'cairo-recording-surface.c', + 'cairo-rectangle.c', + 'cairo-rectangular-scan-converter.c', + 'cairo-region.c', + 'cairo-scaled-font-subsets.c', + 'cairo-scaled-font.c', + 'cairo-slope.c', + 'cairo-spans.c', + 'cairo-spline.c', + 'cairo-stroke-style.c', + 'cairo-surface-clipper.c', + 'cairo-surface-fallback.c', + 'cairo-surface-offset.c', + 'cairo-surface-snapshot.c', + 'cairo-surface-subsurface.c', + 'cairo-surface-wrapper.c', + 'cairo-surface.c', + 'cairo-tee-surface.c', + 'cairo-tor-scan-converter.c', + 'cairo-toy-font-face.c', + 'cairo-traps.c', + 'cairo-unicode.c', + 'cairo-user-font.c', + 'cairo-version.c', + 'cairo-wideint.c', + 'cairo.c', +] + MSVC_ENABLE_PGO = True diff --git a/gfx/cairo/libpixman/src/Makefile.in b/gfx/cairo/libpixman/src/Makefile.in index 991f376a8f32..482f2d973af5 100644 --- a/gfx/cairo/libpixman/src/Makefile.in +++ b/gfx/cairo/libpixman/src/Makefile.in @@ -83,39 +83,6 @@ endif endif -CSRCS = \ - pixman-access.c \ - pixman-access-accessors.c \ - pixman-arm.c \ - pixman-bits-image.c \ - pixman.c \ - pixman-combine16.c \ - pixman-combine32.c \ - pixman-combine-float.c \ - pixman-conical-gradient.c \ - pixman-edge.c \ - pixman-edge-accessors.c \ - pixman-fast-path.c \ - pixman-filter.c \ - pixman-general.c \ - pixman-gradient-walker.c \ - pixman-glyph.c \ - pixman-image.c \ - pixman-implementation.c \ - pixman-linear-gradient.c \ - pixman-matrix.c \ - pixman-mips.c \ - pixman-noop.c \ - pixman-ppc.c \ - pixman-radial-gradient.c \ - pixman-region16.c \ - pixman-region32.c \ - pixman-solid-fill.c \ - pixman-trap.c \ - pixman-utils.c \ - pixman-x86.c \ - $(NULL) - ifdef USE_MMX CSRCS += pixman-mmx.c DEFINES += -DUSE_MMX diff --git a/gfx/cairo/libpixman/src/moz.build b/gfx/cairo/libpixman/src/moz.build index 0d78e6406f37..559a08928896 100644 --- a/gfx/cairo/libpixman/src/moz.build +++ b/gfx/cairo/libpixman/src/moz.build @@ -29,5 +29,38 @@ if CONFIG['OS_ARCH'] != 'Darwin' and CONFIG['GNU_CC']: LIBXUL_LIBRARY = True +CSRCS += [ + 'pixman-access-accessors.c', + 'pixman-access.c', + 'pixman-arm.c', + 'pixman-bits-image.c', + 'pixman-combine-float.c', + 'pixman-combine16.c', + 'pixman-combine32.c', + 'pixman-conical-gradient.c', + 'pixman-edge-accessors.c', + 'pixman-edge.c', + 'pixman-fast-path.c', + 'pixman-filter.c', + 'pixman-general.c', + 'pixman-glyph.c', + 'pixman-gradient-walker.c', + 'pixman-image.c', + 'pixman-implementation.c', + 'pixman-linear-gradient.c', + 'pixman-matrix.c', + 'pixman-mips.c', + 'pixman-noop.c', + 'pixman-ppc.c', + 'pixman-radial-gradient.c', + 'pixman-region16.c', + 'pixman-region32.c', + 'pixman-solid-fill.c', + 'pixman-trap.c', + 'pixman-utils.c', + 'pixman-x86.c', + 'pixman.c', +] + MSVC_ENABLE_PGO = True diff --git a/gfx/qcms/Makefile.in b/gfx/qcms/Makefile.in index cf3f9fd06904..61a8f7857621 100644 --- a/gfx/qcms/Makefile.in +++ b/gfx/qcms/Makefile.in @@ -9,14 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CSRCS = \ - chain.c \ - iccread.c \ - matrix.c \ - transform.c \ - transform_util.c \ - $(NULL) - ifeq (86,$(findstring 86,$(OS_TEST))) CSRCS += transform-sse2.c ifdef _MSC_VER diff --git a/gfx/qcms/moz.build b/gfx/qcms/moz.build index 2172c2f40b02..92489f90592a 100644 --- a/gfx/qcms/moz.build +++ b/gfx/qcms/moz.build @@ -15,5 +15,13 @@ LIBRARY_NAME = 'mozqcms' LIBXUL_LIBRARY = True +CSRCS += [ + 'chain.c', + 'iccread.c', + 'matrix.c', + 'transform.c', + 'transform_util.c', +] + MSVC_ENABLE_PGO = True diff --git a/image/decoders/Makefile.in b/image/decoders/Makefile.in index f00741ef3106..559787ae8f4c 100644 --- a/image/decoders/Makefile.in +++ b/image/decoders/Makefile.in @@ -10,9 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CSRCS = iccjpeg.c \ - $(NULL) - # Decoders need RasterImage.h LOCAL_INCLUDES += -I$(topsrcdir)/image/src/ diff --git a/image/decoders/moz.build b/image/decoders/moz.build index c9e80a84800e..a78a9de755f4 100644 --- a/image/decoders/moz.build +++ b/image/decoders/moz.build @@ -40,3 +40,7 @@ FAIL_ON_WARNINGS = True LIBXUL_LIBRARY = True +CSRCS += [ + 'iccjpeg.c', +] + diff --git a/intl/hyphenation/src/Makefile.in b/intl/hyphenation/src/Makefile.in deleted file mode 100644 index d6c912df69ec..000000000000 --- a/intl/hyphenation/src/Makefile.in +++ /dev/null @@ -1,15 +0,0 @@ -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -DEPTH = @DEPTH@ -topsrcdir = @top_srcdir@ -srcdir = @srcdir@ -VPATH = @srcdir@ - -include $(DEPTH)/config/autoconf.mk - -CSRCS = hyphen.c \ - $(NULL) - -include $(topsrcdir)/config/rules.mk diff --git a/intl/hyphenation/src/moz.build b/intl/hyphenation/src/moz.build index ad05828ef81f..8a066b20ae44 100644 --- a/intl/hyphenation/src/moz.build +++ b/intl/hyphenation/src/moz.build @@ -16,5 +16,9 @@ LIBRARY_NAME = 'hyphenation_s' LIBXUL_LIBRARY = True +CSRCS += [ + 'hyphen.c', +] + MSVC_ENABLE_PGO = True diff --git a/intl/uconv/util/Makefile.in b/intl/uconv/util/Makefile.in index f65b92b7f2d2..a67f1930d843 100644 --- a/intl/uconv/util/Makefile.in +++ b/intl/uconv/util/Makefile.in @@ -11,11 +11,5 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -CSRCS = \ - ugen.c \ - uscan.c \ - umap.c \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/intl/uconv/util/moz.build b/intl/uconv/util/moz.build index 23d211bd823a..d409aec6ceb4 100644 --- a/intl/uconv/util/moz.build +++ b/intl/uconv/util/moz.build @@ -17,5 +17,11 @@ LIBRARY_NAME = 'ucvutil_s' LIBXUL_LIBRARY = True +CSRCS += [ + 'ugen.c', + 'umap.c', + 'uscan.c', +] + MSVC_ENABLE_PGO = True diff --git a/intl/unicharutil/tools/Makefile.in b/intl/unicharutil/tools/Makefile.in index 5879baff2ad3..18d899e6f64e 100644 --- a/intl/unicharutil/tools/Makefile.in +++ b/intl/unicharutil/tools/Makefile.in @@ -10,8 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CSRCS = ucgendat.c - # XXX need configure test EX_LIBS = $(shell $(GLIB_CONFIG) --libs) diff --git a/intl/unicharutil/tools/moz.build b/intl/unicharutil/tools/moz.build index b1c8c8fdd8e4..f1ee55367d0c 100644 --- a/intl/unicharutil/tools/moz.build +++ b/intl/unicharutil/tools/moz.build @@ -8,3 +8,7 @@ MODULE = 'ucgendat' PROGRAM = 'ucgendat' +CSRCS += [ + 'ucgendat.c', +] + diff --git a/js/src/editline/Makefile.in b/js/src/editline/Makefile.in index 73eb880c1489..5c3ae6c8d77e 100644 --- a/js/src/editline/Makefile.in +++ b/js/src/editline/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk FORCE_STATIC_LIB = 1 -CSRCS = editline.c sysunix.c - DEFINES += -DANSI_ARROWS -DHAVE_TCGETATTR -DHIDE -DUSE_DIRENT -DSYS_UNIX \ -DHAVE_STDLIB -DUNIQUE_HISTORY diff --git a/js/src/editline/moz.build b/js/src/editline/moz.build index e706fe89c7c5..01514ad740fc 100644 --- a/js/src/editline/moz.build +++ b/js/src/editline/moz.build @@ -6,3 +6,8 @@ LIBRARY_NAME = 'editline' +CSRCS += [ + 'editline.c', + 'sysunix.c', +] + diff --git a/media/libspeex_resampler/src/Makefile.in b/media/libspeex_resampler/src/Makefile.in index 8acb63a08d46..cb0b02570e3f 100644 --- a/media/libspeex_resampler/src/Makefile.in +++ b/media/libspeex_resampler/src/Makefile.in @@ -25,10 +25,6 @@ else DEFINES += -DFLOATING_POINT endif -CSRCS = \ - resample.c \ - $(NULL) - include $(topsrcdir)/config/rules.mk # Only use SSE code when using floating point samples, and on x86 diff --git a/media/libspeex_resampler/src/moz.build b/media/libspeex_resampler/src/moz.build index bebb2aa1e362..b12bdcd3e3a7 100644 --- a/media/libspeex_resampler/src/moz.build +++ b/media/libspeex_resampler/src/moz.build @@ -18,5 +18,9 @@ CPP_SOURCES += [ LIBRARY_NAME = 'speex_resampler' +CSRCS += [ + 'resample.c', +] + MSVC_ENABLE_PGO = True diff --git a/media/libtheora/lib/Makefile.in b/media/libtheora/lib/Makefile.in index c8c2e4836c7e..57fbd8d4be98 100644 --- a/media/libtheora/lib/Makefile.in +++ b/media/libtheora/lib/Makefile.in @@ -29,22 +29,6 @@ endif VPATH := $(srcdir) -CSRCS = \ - apiwrapper.c \ - bitpack.c \ - decapiwrapper.c \ - decinfo.c \ - decode.c \ - dequant.c \ - fragment.c \ - huffdec.c \ - idct.c \ - info.c \ - internal.c \ - quant.c \ - state.c \ - $(NULL) - ifeq ($(findstring 86,$(OS_TEST)), 86) ifdef _MSC_VER ifneq (64,$(findstring 64,$(OS_TEST))) diff --git a/media/libtheora/lib/moz.build b/media/libtheora/lib/moz.build index a2b52afc8830..ec9cabc98e74 100644 --- a/media/libtheora/lib/moz.build +++ b/media/libtheora/lib/moz.build @@ -8,5 +8,21 @@ MODULE = 'theora' LIBRARY_NAME = 'theora' +CSRCS += [ + 'apiwrapper.c', + 'bitpack.c', + 'decapiwrapper.c', + 'decinfo.c', + 'decode.c', + 'dequant.c', + 'fragment.c', + 'huffdec.c', + 'idct.c', + 'info.c', + 'internal.c', + 'quant.c', + 'state.c', +] + MSVC_ENABLE_PGO = True diff --git a/media/libtremor/lib/Makefile.in b/media/libtremor/lib/Makefile.in index 31c3380813ba..5eb7a4188018 100644 --- a/media/libtremor/lib/Makefile.in +++ b/media/libtremor/lib/Makefile.in @@ -12,21 +12,6 @@ include $(DEPTH)/config/autoconf.mk FORCE_STATIC_LIB= 1 LOCAL_INCLUDES += -I$(topsrcdir)/media/libtremor/include/tremor -CSRCS = \ - tremor_block.c \ - tremor_codebook.c \ - tremor_floor1.c \ - tremor_floor0.c \ - tremor_info.c \ - tremor_mapping0.c \ - tremor_mdct.c \ - tremor_registry.c \ - tremor_res012.c \ - tremor_sharedbook.c \ - tremor_synthesis.c \ - tremor_window.c \ - $(NULL) - ifeq ($(OS_ARCH),AIX) DEFINES += -Dalloca=__alloca endif diff --git a/media/libtremor/lib/moz.build b/media/libtremor/lib/moz.build index 25983a0738f1..a55a1c10b58c 100644 --- a/media/libtremor/lib/moz.build +++ b/media/libtremor/lib/moz.build @@ -8,3 +8,18 @@ MODULE = 'tremor' LIBRARY_NAME = 'tremor' +CSRCS += [ + 'tremor_block.c', + 'tremor_codebook.c', + 'tremor_floor0.c', + 'tremor_floor1.c', + 'tremor_info.c', + 'tremor_mapping0.c', + 'tremor_mdct.c', + 'tremor_registry.c', + 'tremor_res012.c', + 'tremor_sharedbook.c', + 'tremor_synthesis.c', + 'tremor_window.c', +] + diff --git a/media/libvorbis/lib/Makefile.in b/media/libvorbis/lib/Makefile.in index d50520df9d00..030d2c1625fb 100644 --- a/media/libvorbis/lib/Makefile.in +++ b/media/libvorbis/lib/Makefile.in @@ -14,29 +14,6 @@ ifeq (WINNT,$(OS_TARGET)) VISIBILITY_FLAGS = endif -CSRCS = \ - vorbis_mdct.c \ - vorbis_smallft.c \ - vorbis_block.c \ - vorbis_info.c \ - vorbis_envelope.c \ - vorbis_window.c \ - vorbis_lsp.c \ - vorbis_lpc.c \ - vorbis_analysis.c \ - vorbis_synthesis.c \ - vorbis_psy.c \ - vorbis_floor1.c \ - vorbis_floor0.c \ - vorbis_res0.c \ - vorbis_mapping0.c \ - vorbis_registry.c \ - vorbis_codebook.c \ - vorbis_sharedbook.c \ - vorbis_lookup.c \ - vorbis_bitrate.c \ - $(NULL) - ifeq ($(OS_ARCH),AIX) DEFINES += -Dalloca=__alloca endif diff --git a/media/libvorbis/lib/moz.build b/media/libvorbis/lib/moz.build index 306e376d4790..6f86b3aca2bb 100644 --- a/media/libvorbis/lib/moz.build +++ b/media/libvorbis/lib/moz.build @@ -8,5 +8,28 @@ MODULE = 'vorbis' LIBRARY_NAME = 'vorbis' +CSRCS += [ + 'vorbis_analysis.c', + 'vorbis_bitrate.c', + 'vorbis_block.c', + 'vorbis_codebook.c', + 'vorbis_envelope.c', + 'vorbis_floor0.c', + 'vorbis_floor1.c', + 'vorbis_info.c', + 'vorbis_lookup.c', + 'vorbis_lpc.c', + 'vorbis_lsp.c', + 'vorbis_mapping0.c', + 'vorbis_mdct.c', + 'vorbis_psy.c', + 'vorbis_registry.c', + 'vorbis_res0.c', + 'vorbis_sharedbook.c', + 'vorbis_smallft.c', + 'vorbis_synthesis.c', + 'vorbis_window.c', +] + MSVC_ENABLE_PGO = True diff --git a/media/libvpx/Makefile.in b/media/libvpx/Makefile.in index 3c0837b99808..923568845c12 100644 --- a/media/libvpx/Makefile.in +++ b/media/libvpx/Makefile.in @@ -66,58 +66,6 @@ ASFLAGS=$(VPX_ASFLAGS) -I. -I$(topsrcdir)/media/libvpx/ -I$(topsrcdir)/media/lib AS_DASH_C_FLAG=$(VPX_DASH_C_FLAG) ASM_SUFFIX=$(VPX_ASM_SUFFIX) -CSRCS += \ - vpx_config_c.c \ - vp8_dx_iface.c \ - alloccommon.c \ - blockd.c \ - debugmodes.c \ - dequantize.c \ - entropy.c \ - entropymode.c \ - entropymv.c \ - extend.c \ - filter.c \ - findnearmv.c \ - idct_blk.c \ - idctllm.c \ - loopfilter.c \ - loopfilter_filters.c \ - mbpitch.c \ - modecont.c \ - modecontext.c \ - postproc.c \ - quant_common.c \ - reconinter.c \ - reconintra.c \ - reconintra4x4.c \ - sad_c.c \ - setupintrarecon.c \ - swapyv12buffer.c \ - treecoder.c \ - variance_c.c \ - systemdependent.c \ - dboolhuff.c \ - decodemv.c \ - decodframe.c \ - detokenize.c \ - reconintra_mt.c \ - onyxd_if.c \ - threading.c \ - dsystemdependent.c \ - vpx_codec.c \ - vpx_decoder.c \ - vpx_decoder_compat.c \ - vpx_encoder.c \ - vpx_image.c \ - vpx_mem.c \ - gen_scalers.c \ - vpxscale.c \ - scalesystemdependent.c \ - yv12config.c \ - yv12extend.c \ - $(NULL) - ifdef MOZ_VP8_ERROR_CONCEALMENT CSRCS += \ error_concealment.c \ diff --git a/media/libvpx/moz.build b/media/libvpx/moz.build index 6924633b77e0..c6723b793c01 100644 --- a/media/libvpx/moz.build +++ b/media/libvpx/moz.build @@ -38,5 +38,57 @@ if CONFIG['VPX_NEED_OBJ_INT_EXTRACT']: LIBRARY_NAME = 'vpx' +CSRCS += [ + 'alloccommon.c', + 'blockd.c', + 'dboolhuff.c', + 'debugmodes.c', + 'decodemv.c', + 'decodframe.c', + 'dequantize.c', + 'detokenize.c', + 'dsystemdependent.c', + 'entropy.c', + 'entropymode.c', + 'entropymv.c', + 'extend.c', + 'filter.c', + 'findnearmv.c', + 'gen_scalers.c', + 'idct_blk.c', + 'idctllm.c', + 'loopfilter.c', + 'loopfilter_filters.c', + 'mbpitch.c', + 'modecont.c', + 'modecontext.c', + 'onyxd_if.c', + 'postproc.c', + 'quant_common.c', + 'reconinter.c', + 'reconintra.c', + 'reconintra4x4.c', + 'reconintra_mt.c', + 'sad_c.c', + 'scalesystemdependent.c', + 'setupintrarecon.c', + 'swapyv12buffer.c', + 'systemdependent.c', + 'threading.c', + 'treecoder.c', + 'variance_c.c', + 'vp8_dx_iface.c', + 'vpx_codec.c', + 'vpx_config_c.c', + 'vpx_decoder.c', + 'vpx_decoder_compat.c', + 'vpx_encoder.c', + 'vpx_image.c', + 'vpx_mem.c', + 'vpxscale.c', + 'yv12config.c', + 'yv12extend.c', +] + MSVC_ENABLE_PGO = True diff --git a/modules/libbz2/src/Makefile.in b/modules/libbz2/src/Makefile.in index a904528887be..e8df0a2c33a3 100644 --- a/modules/libbz2/src/Makefile.in +++ b/modules/libbz2/src/Makefile.in @@ -22,17 +22,6 @@ endif # define it here anyways for consistency. DEFINES += -D_FILE_OFFSET_BITS=64 -CSRCS = \ - blocksort.c \ - bzlib.c \ - compress.c \ - crctable.c \ - decompress.c \ - huffman.c \ - randtable.c \ - $(NULL) - - include $(topsrcdir)/config/rules.mk # The intermediate (.ii/.s) files for host and target can have the same name... diff --git a/modules/libbz2/src/moz.build b/modules/libbz2/src/moz.build index b2eb05eff99d..e72f5736d8f3 100644 --- a/modules/libbz2/src/moz.build +++ b/modules/libbz2/src/moz.build @@ -26,3 +26,13 @@ HOST_LIBRARY_NAME = 'hostbz2' LIBRARY_NAME = 'bz2' +CSRCS += [ + 'blocksort.c', + 'bzlib.c', + 'compress.c', + 'crctable.c', + 'decompress.c', + 'huffman.c', + 'randtable.c', +] + diff --git a/modules/libmar/sign/Makefile.in b/modules/libmar/sign/Makefile.in index 66e3bbb77824..c36adb7010db 100644 --- a/modules/libmar/sign/Makefile.in +++ b/modules/libmar/sign/Makefile.in @@ -15,11 +15,6 @@ USE_STATIC_LIBS = 1 endif # This makefile just builds support for reading archives. -CSRCS = \ - mar_sign.c \ - nss_secutil.c \ - $(NULL) - LOCAL_INCLUDES += -I$(srcdir)/../src \ -I$(srcdir)/../verify \ -I$(topsrcdir)/dist/include \ diff --git a/modules/libmar/sign/moz.build b/modules/libmar/sign/moz.build index eb2b30041157..f1a64bc6aa6c 100644 --- a/modules/libmar/sign/moz.build +++ b/modules/libmar/sign/moz.build @@ -8,3 +8,8 @@ MODULE = 'signmar' LIBRARY_NAME = 'signmar' +CSRCS += [ + 'mar_sign.c', + 'nss_secutil.c', +] + diff --git a/modules/libmar/src/Makefile.in b/modules/libmar/src/Makefile.in index ff39d8f0b65a..5b1f66beb89d 100644 --- a/modules/libmar/src/Makefile.in +++ b/modules/libmar/src/Makefile.in @@ -18,12 +18,6 @@ endif # This makefile just builds support for reading archives. -CSRCS = \ - mar_create.c \ - mar_extract.c \ - mar_read.c \ - $(NULL) - include $(topsrcdir)/config/rules.mk # The intermediate (.ii/.s) files for host and target can have the same name... diff --git a/modules/libmar/src/moz.build b/modules/libmar/src/moz.build index 67da1cd87d9f..da03a8496776 100644 --- a/modules/libmar/src/moz.build +++ b/modules/libmar/src/moz.build @@ -20,3 +20,9 @@ HOST_LIBRARY_NAME = 'hostmar' LIBRARY_NAME = 'mar' +CSRCS += [ + 'mar_create.c', + 'mar_extract.c', + 'mar_read.c', +] + diff --git a/modules/libmar/verify/Makefile.in b/modules/libmar/verify/Makefile.in index d6634f14c8bb..60eb6a93dd80 100644 --- a/modules/libmar/verify/Makefile.in +++ b/modules/libmar/verify/Makefile.in @@ -15,11 +15,6 @@ USE_STATIC_LIBS = 1 endif # This makefile just builds support for reading archives. -CSRCS = \ - mar_verify.c \ - cryptox.c \ - $(NULL) - LOCAL_INCLUDES += -I$(srcdir)/../src ifneq ($(OS_ARCH),WINNT) diff --git a/modules/libmar/verify/moz.build b/modules/libmar/verify/moz.build index f057e23d0a65..c84df29bb65c 100644 --- a/modules/libmar/verify/moz.build +++ b/modules/libmar/verify/moz.build @@ -8,3 +8,8 @@ MODULE = 'verifymar' LIBRARY_NAME = 'verifymar' +CSRCS += [ + 'cryptox.c', + 'mar_verify.c', +] + diff --git a/other-licenses/android/Makefile.in b/other-licenses/android/Makefile.in index f21bd530bf72..f6da3203e255 100644 --- a/other-licenses/android/Makefile.in +++ b/other-licenses/android/Makefile.in @@ -11,23 +11,4 @@ include $(DEPTH)/config/autoconf.mk FORCE_STATIC_LIB = 1 -CSRCS = \ - ev_streams.c \ - ev_timers.c \ - getaddrinfo.c \ - ns_name.c \ - ns_netint.c \ - ns_parse.c \ - ns_print.c \ - ns_samedomain.c \ - ns_ttl.c \ - res_comp.c \ - res_data.c \ - res_debug.c \ - res_init.c \ - res_mkquery.c \ - res_send.c \ - res_state.c \ - $(NULL) - include $(topsrcdir)/config/rules.mk diff --git a/other-licenses/android/moz.build b/other-licenses/android/moz.build index 4a7bec51bbbc..1ed4e12a131e 100644 --- a/other-licenses/android/moz.build +++ b/other-licenses/android/moz.build @@ -8,3 +8,22 @@ MODULE = 'android' LIBRARY_NAME = 'android' +CSRCS += [ + 'ev_streams.c', + 'ev_timers.c', + 'getaddrinfo.c', + 'ns_name.c', + 'ns_netint.c', + 'ns_parse.c', + 'ns_print.c', + 'ns_samedomain.c', + 'ns_ttl.c', + 'res_comp.c', + 'res_data.c', + 'res_debug.c', + 'res_init.c', + 'res_mkquery.c', + 'res_send.c', + 'res_state.c', +] + diff --git a/parser/expat/lib/Makefile.in b/parser/expat/lib/Makefile.in index 122d29536fb3..cad77fbbc5a4 100644 --- a/parser/expat/lib/Makefile.in +++ b/parser/expat/lib/Makefile.in @@ -9,12 +9,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -CSRCS = \ - xmlparse.c \ - xmlrole.c \ - xmltok.c \ - $(NULL) - # We want only the static lib, not the shared lib FORCE_STATIC_LIB = 1 diff --git a/parser/expat/lib/moz.build b/parser/expat/lib/moz.build index 2a79246c176c..d2aafa1b3b8d 100644 --- a/parser/expat/lib/moz.build +++ b/parser/expat/lib/moz.build @@ -13,5 +13,11 @@ EXPORTS += [ LIBRARY_NAME = 'mozexpat_s' +CSRCS += [ + 'xmlparse.c', + 'xmlrole.c', + 'xmltok.c', +] + MSVC_ENABLE_PGO = True diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in index ae8822ae7160..29e94ee41a47 100644 --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in @@ -12,8 +12,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk EXPORT_LIBRARY = 1 -CSRCS += md4.c - DEFINES += \ -DNSS_ENABLE_ECC \ -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build index 033c708b043b..0280ba3db4c4 100644 --- a/security/manager/ssl/src/moz.build +++ b/security/manager/ssl/src/moz.build @@ -85,5 +85,9 @@ if CONFIG['MOZ_XUL']: LIBRARY_NAME = 'pipnss' +CSRCS += [ + 'md4.c', +] + LIBXUL_LIBRARY = True diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in index a162a1f74658..35b44bf65c1d 100644 --- a/widget/gtk2/Makefile.in +++ b/widget/gtk2/Makefile.in @@ -21,10 +21,6 @@ NATIVE_THEME_SUPPORT = 1 -CSRCS = \ - mozcontainer.c \ - $(NULL) - ifdef ACCESSIBILITY CSRCS += maiRedundantObjectFactory.c endif diff --git a/widget/gtk2/moz.build b/widget/gtk2/moz.build index 3d61e15e7245..e36e698be486 100644 --- a/widget/gtk2/moz.build +++ b/widget/gtk2/moz.build @@ -56,5 +56,9 @@ if CONFIG['MOZ_X11']: FAIL_ON_WARNINGS = True +CSRCS += [ + 'mozcontainer.c', +] + LIBXUL_LIBRARY = True diff --git a/widget/shared/x11/Makefile.in b/widget/shared/x11/Makefile.in index 51a0b644759e..5abd98e96a80 100644 --- a/widget/shared/x11/Makefile.in +++ b/widget/shared/x11/Makefile.in @@ -11,10 +11,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = widget_shared_x11 -CSRCS = \ - keysym2ucs.c \ - $(NULL) - include $(topsrcdir)/config/rules.mk CXXFLAGS += $(TK_CFLAGS) diff --git a/widget/shared/x11/moz.build b/widget/shared/x11/moz.build index 6ca115674ece..5c5512fbef17 100644 --- a/widget/shared/x11/moz.build +++ b/widget/shared/x11/moz.build @@ -6,5 +6,9 @@ MODULE = 'widget' +CSRCS += [ + 'keysym2ucs.c', +] + LIBXUL_LIBRARY = True diff --git a/xpcom/base/Makefile.in b/xpcom/base/Makefile.in index d97e66dda121..ada307375950 100644 --- a/xpcom/base/Makefile.in +++ b/xpcom/base/Makefile.in @@ -12,10 +12,6 @@ include $(DEPTH)/config/autoconf.mk LIBRARY_NAME = xpcombase_s MOZILLA_INTERNAL_API =1 -CSRCS = \ - nsErrorAssertsC.c \ - $(NULL) - ifeq ($(OS_ARCH),WINNT) ifdef MOZ_DEBUG diff --git a/xpcom/base/moz.build b/xpcom/base/moz.build index 16182db18e8e..8e6b77583a20 100644 --- a/xpcom/base/moz.build +++ b/xpcom/base/moz.build @@ -126,6 +126,11 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows': 'nsCrashOnException.cpp', ] +CSRCS += [ + 'nsErrorAssertsC.c', +] + + LIBXUL_LIBRARY = True MSVC_ENABLE_PGO = True diff --git a/xpcom/typelib/xpt/src/Makefile.in b/xpcom/typelib/xpt/src/Makefile.in index 61bfaaa6d37b..9a6bf832281e 100644 --- a/xpcom/typelib/xpt/src/Makefile.in +++ b/xpcom/typelib/xpt/src/Makefile.in @@ -13,8 +13,6 @@ include $(DEPTH)/config/autoconf.mk DIST_INSTALL = 1 USE_STATIC_LIBS = 1 -CSRCS = xpt_arena.c xpt_struct.c xpt_xdr.c - include $(topsrcdir)/config/rules.mk ifdef _MSC_VER diff --git a/xpcom/typelib/xpt/src/moz.build b/xpcom/typelib/xpt/src/moz.build index eb807a209a17..0f41fc4926b6 100644 --- a/xpcom/typelib/xpt/src/moz.build +++ b/xpcom/typelib/xpt/src/moz.build @@ -8,5 +8,11 @@ MODULE = 'xpcom' LIBRARY_NAME = 'xpt' +CSRCS += [ + 'xpt_arena.c', + 'xpt_struct.c', + 'xpt_xdr.c', +] + LIBXUL_LIBRARY = True From 2dbbef83128e66eba6699c3762b931f3c8df5ab1 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:56:02 +0200 Subject: [PATCH 75/79] Bug 906619 - Part b: move the CSRCS definition in intl/lwbrk/src into moz.build; r=mshal --- intl/lwbrk/src/Makefile.in | 14 -------------- intl/lwbrk/src/moz.build | 4 ++++ 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/intl/lwbrk/src/Makefile.in b/intl/lwbrk/src/Makefile.in index 2ae2d24ed892..9d01272aa376 100644 --- a/intl/lwbrk/src/Makefile.in +++ b/intl/lwbrk/src/Makefile.in @@ -10,20 +10,6 @@ VPATH = @srcdir@ include $(DEPTH)/config/autoconf.mk -ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) -else -ifeq ($(MOZ_WIDGET_TOOLKIT),gtk3) -else -ifeq ($(MOZ_WIDGET_TOOLKIT),windows) -else -ifeq ($(MOZ_WIDGET_TOOLKIT), cocoa) -else -CSRCS = rulebrk.c -endif -endif -endif -endif - include $(topsrcdir)/config/rules.mk ifdef MOZ_WIDGET_GTK diff --git a/intl/lwbrk/src/moz.build b/intl/lwbrk/src/moz.build index 9faaf01b3c2a..cb9c6c858de6 100644 --- a/intl/lwbrk/src/moz.build +++ b/intl/lwbrk/src/moz.build @@ -28,6 +28,10 @@ else: CPP_SOURCES += [ 'nsRuleBreaker.cpp', ] + CSRCS += [ + 'rulebrk.c', + ] + LIBRARY_NAME = 'lwbrk_s' From 74462466d74e2265efe0f058efa2afc8c3dea600 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:56:02 +0200 Subject: [PATCH 76/79] Bug 907337 - Remove the special case for NO_DIST_INSTALL in emitter.py; r=mshal It is obsoleted by the general case in recursivemake.py. --- python/mozbuild/mozbuild/frontend/emitter.py | 4 +--- python/mozbuild/mozbuild/test/frontend/test_emitter.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/python/mozbuild/mozbuild/frontend/emitter.py b/python/mozbuild/mozbuild/frontend/emitter.py index 93932c6954e4..e262b795c04a 100644 --- a/python/mozbuild/mozbuild/frontend/emitter.py +++ b/python/mozbuild/mozbuild/frontend/emitter.py @@ -135,6 +135,7 @@ class TreeMetadataEmitter(LoggingMixin): LIBXUL_LIBRARY='LIBXUL_LIBRARY', MODULE='MODULE', MSVC_ENABLE_PGO='MSVC_ENABLE_PGO', + NO_DIST_INSTALL='NO_DIST_INSTALL', SDK_LIBRARY='SDK_LIBRARY', SHARED_LIBRARY_LIBS='SHARED_LIBRARY_LIBS', SIMPLE_PROGRAMS='SIMPLE_PROGRAMS', @@ -144,9 +145,6 @@ class TreeMetadataEmitter(LoggingMixin): if sandbox[moz]: passthru.variables[mak] = sandbox[moz] - if sandbox['NO_DIST_INSTALL']: - passthru.variables['NO_DIST_INSTALL'] = '1' - if passthru.variables: yield passthru diff --git a/python/mozbuild/mozbuild/test/frontend/test_emitter.py b/python/mozbuild/mozbuild/test/frontend/test_emitter.py index abba3bf0ebd7..3986f4923885 100644 --- a/python/mozbuild/mozbuild/test/frontend/test_emitter.py +++ b/python/mozbuild/mozbuild/test/frontend/test_emitter.py @@ -147,7 +147,7 @@ class TestEmitterBasic(unittest.TestCase): LIBS=['fans.lib', 'tans.lib'], LIBXUL_LIBRARY=True, MSVC_ENABLE_PGO=True, - NO_DIST_INSTALL='1', + NO_DIST_INSTALL=True, MODULE='module_name', SDK_LIBRARY=['fans.sdk', 'tans.sdk'], SHARED_LIBRARY_LIBS=['fans.sll', 'tans.sll'], From 05f294ce31380098ff81c63780727b467cde490a Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:56:02 +0200 Subject: [PATCH 77/79] Bug 906503 - Remove nsIExceptionProvider; r=bholley It is replaced by a direct special case in the caller. --- dom/base/moz.build | 1 + dom/base/nsDOMScriptObjectFactory.cpp | 64 --------------------- dom/base/nsDOMScriptObjectFactory.h | 7 --- dom/base/nsJSEnvironment.cpp | 8 +-- xpcom/base/nsExceptionService.cpp | 82 ++++++++------------------- xpcom/base/nsExceptionService.h | 5 +- xpcom/base/nsIExceptionService.idl | 23 +------- 7 files changed, 31 insertions(+), 159 deletions(-) diff --git a/dom/base/moz.build b/dom/base/moz.build index f28260dd7fc2..4829577bbf75 100644 --- a/dom/base/moz.build +++ b/dom/base/moz.build @@ -22,6 +22,7 @@ EXPORTS += [ 'nsDOMCID.h', 'nsDOMClassInfoClasses.h', 'nsDOMClassInfoID.h', + 'nsDOMException.h', 'nsDOMJSUtils.h', 'nsDOMNavigationTiming.h', 'nsDOMString.h', diff --git a/dom/base/nsDOMScriptObjectFactory.cpp b/dom/base/nsDOMScriptObjectFactory.cpp index c73f476f2bf4..c270975ef000 100644 --- a/dom/base/nsDOMScriptObjectFactory.cpp +++ b/dom/base/nsDOMScriptObjectFactory.cpp @@ -33,8 +33,6 @@ using mozilla::dom::GetNameSpaceManager; -nsIExceptionProvider* gExceptionProvider = nullptr; - nsDOMScriptObjectFactory::nsDOMScriptObjectFactory() { nsCOMPtr observerService = @@ -43,20 +41,6 @@ nsDOMScriptObjectFactory::nsDOMScriptObjectFactory() observerService->AddObserver(this, NS_XPCOM_SHUTDOWN_OBSERVER_ID, false); } - nsCOMPtr provider = new nsDOMExceptionProvider(); - nsCOMPtr xs = - do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID); - - if (xs) { - xs->RegisterExceptionProvider(provider, NS_ERROR_MODULE_DOM); - xs->RegisterExceptionProvider(provider, NS_ERROR_MODULE_SVG); - xs->RegisterExceptionProvider(provider, NS_ERROR_MODULE_DOM_XPATH); - xs->RegisterExceptionProvider(provider, NS_ERROR_MODULE_DOM_INDEXEDDB); - xs->RegisterExceptionProvider(provider, NS_ERROR_MODULE_DOM_FILEHANDLE); - } - - NS_ASSERTION(!gExceptionProvider, "Registered twice?!"); - provider.swap(gExceptionProvider); } NS_INTERFACE_MAP_BEGIN(nsDOMScriptObjectFactory) @@ -121,26 +105,6 @@ nsDOMScriptObjectFactory::Observe(nsISupports *aSubject, nsGlobalWindow::ShutDown(); nsDOMClassInfo::ShutDown(); - - if (gExceptionProvider) { - nsCOMPtr xs = - do_GetService(NS_EXCEPTIONSERVICE_CONTRACTID); - - if (xs) { - xs->UnregisterExceptionProvider(gExceptionProvider, - NS_ERROR_MODULE_DOM); - xs->UnregisterExceptionProvider(gExceptionProvider, - NS_ERROR_MODULE_SVG); - xs->UnregisterExceptionProvider(gExceptionProvider, - NS_ERROR_MODULE_DOM_XPATH); - xs->UnregisterExceptionProvider(gExceptionProvider, - NS_ERROR_MODULE_DOM_INDEXEDDB); - xs->UnregisterExceptionProvider(gExceptionProvider, - NS_ERROR_MODULE_DOM_FILEHANDLE); - } - - NS_RELEASE(gExceptionProvider); - } } return NS_OK; @@ -166,31 +130,3 @@ nsDOMScriptObjectFactory::RegisterDOMClassInfo(const char *aName, aHasClassInterface, aConstructorCID); } - -NS_IMPL_ISUPPORTS1(nsDOMExceptionProvider, nsIExceptionProvider) - -NS_IMETHODIMP -nsDOMExceptionProvider::GetException(nsresult result, - nsIException *aDefaultException, - nsIException **_retval) -{ - if (!NS_IsMainThread()) { - return NS_ERROR_NOT_IMPLEMENTED; - } - - switch (NS_ERROR_GET_MODULE(result)) - { - case NS_ERROR_MODULE_DOM: - case NS_ERROR_MODULE_SVG: - case NS_ERROR_MODULE_DOM_XPATH: - case NS_ERROR_MODULE_DOM_FILE: - case NS_ERROR_MODULE_DOM_INDEXEDDB: - case NS_ERROR_MODULE_DOM_FILEHANDLE: - return NS_NewDOMException(result, aDefaultException, _retval); - default: - NS_WARNING("Trying to create an exception for the wrong error module."); - return NS_ERROR_FAILURE; - } - NS_NOTREACHED("Not reached"); - return NS_ERROR_UNEXPECTED; -} diff --git a/dom/base/nsDOMScriptObjectFactory.h b/dom/base/nsDOMScriptObjectFactory.h index e86c34132fd9..110e7d8ef266 100644 --- a/dom/base/nsDOMScriptObjectFactory.h +++ b/dom/base/nsDOMScriptObjectFactory.h @@ -20,7 +20,6 @@ #include "nsIDOMScriptObjectFactory.h" #include "nsIObserver.h" -#include "nsIExceptionService.h" #include "mozilla/Attributes.h" class nsDOMScriptObjectFactory MOZ_FINAL : public nsIDOMScriptObjectFactory, @@ -47,9 +46,3 @@ public: const nsCID *aConstructorCID) MOZ_OVERRIDE; }; -class nsDOMExceptionProvider MOZ_FINAL : public nsIExceptionProvider -{ -public: - NS_DECL_THREADSAFE_ISUPPORTS - NS_DECL_NSIEXCEPTIONPROVIDER -}; diff --git a/dom/base/nsJSEnvironment.cpp b/dom/base/nsJSEnvironment.cpp index 9691d128e22c..cefe79c494de 100644 --- a/dom/base/nsJSEnvironment.cpp +++ b/dom/base/nsJSEnvironment.cpp @@ -2853,10 +2853,10 @@ nsJSContext::EnsureStatics() obs->AddObserver(observer, "memory-pressure", false); obs->AddObserver(observer, "quit-application", false); - // We need to explicitly get the nsIDOMScriptObjectFactory service in order - // to force its constructor to run, which registers various exceptions - // providers and other things. It would be nice to make this more explicit - // and less side-effect-y. + // Bug 907848 - We need to explicitly get the nsIDOMScriptObjectFactory + // service in order to force its constructor to run, which registers a + // shutdown observer. It would be nice to make this more explicit and less + // side-effect-y. nsCOMPtr factory = do_GetService(kDOMScriptObjectFactoryCID); if (!factory) { MOZ_CRASH(); diff --git a/xpcom/base/nsExceptionService.cpp b/xpcom/base/nsExceptionService.cpp index ab3cf4d66b85..430eccd08575 100644 --- a/xpcom/base/nsExceptionService.cpp +++ b/xpcom/base/nsExceptionService.cpp @@ -3,16 +3,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include "nsExceptionService.h" + #include "mozilla/Attributes.h" #include "mozilla/DebugOnly.h" - -#include "nsISupports.h" -#include "nsExceptionService.h" -#include "nsIServiceManager.h" +#include "mozilla/Services.h" #include "nsCOMPtr.h" +#include "nsDOMException.h" +#include "nsIServiceManager.h" +#include "nsISupports.h" +#include "nsThreadUtils.h" #include "pratom.h" #include "prthread.h" -#include "mozilla/Services.h" using namespace mozilla; @@ -21,24 +23,6 @@ static const unsigned BAD_TLS_INDEX = (unsigned) -1; #define CHECK_SERVICE_USE_OK() if (!sLock) return NS_ERROR_NOT_INITIALIZED #define CHECK_MANAGER_USE_OK() if (!mService || !nsExceptionService::sLock) return NS_ERROR_NOT_INITIALIZED -// A key for our registered module providers hashtable -class nsProviderKey : public nsHashKey { -protected: - uint32_t mKey; -public: - nsProviderKey(uint32_t key) : mKey(key) {} - uint32_t HashCode(void) const { - return mKey; - } - bool Equals(const nsHashKey *aKey) const { - return mKey == ((const nsProviderKey *) aKey)->mKey; - } - nsHashKey *Clone() const { - return new nsProviderKey(mKey); - } - uint32_t GetValue() { return mKey; } -}; - /** Exception Manager definition **/ class nsExceptionManager MOZ_FINAL : public nsIExceptionManager { @@ -129,7 +113,6 @@ NS_IMPL_ISUPPORTS3(nsExceptionService, nsIObserver) nsExceptionService::nsExceptionService() - : mProviders(4, true) /* small, thread-safe hashtable */ { #ifdef DEBUG if (PR_ATOMIC_INCREMENT(&totalInstances)!=1) { @@ -174,7 +157,6 @@ void nsExceptionService::ThreadDestruct( void *data ) void nsExceptionService::Shutdown() { - mProviders.Reset(); if (sLock) { DropAllThreads(); delete sLock; @@ -230,30 +212,6 @@ NS_IMETHODIMP nsExceptionService::GetCurrentExceptionManager(nsIExceptionManager return NS_OK; } -/* void registerErrorProvider (in nsIExceptionProvider provider, in uint32_t moduleCode); */ -NS_IMETHODIMP nsExceptionService::RegisterExceptionProvider(nsIExceptionProvider *provider, uint32_t errorModule) -{ - CHECK_SERVICE_USE_OK(); - - nsProviderKey key(errorModule); - if (mProviders.Put(&key, provider)) { - NS_WARNING("Registration of exception provider overwrote another provider with the same module code!"); - } - return NS_OK; -} - -/* void unregisterErrorProvider (in nsIExceptionProvider provider, in uint32_t errorModule); */ -NS_IMETHODIMP nsExceptionService::UnregisterExceptionProvider(nsIExceptionProvider *provider, uint32_t errorModule) -{ - CHECK_SERVICE_USE_OK(); - nsProviderKey key(errorModule); - if (!mProviders.Remove(&key)) { - NS_WARNING("Attempt to unregister an unregistered exception provider!"); - return NS_ERROR_UNEXPECTED; - } - return NS_OK; -} - // nsIObserver NS_IMETHODIMP nsExceptionService::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *someData) { @@ -275,18 +233,26 @@ nsExceptionService::DoGetExceptionFromProvider(nsresult errCode, return NS_OK; NS_RELEASE(*_exc); } - nsProviderKey key(NS_ERROR_GET_MODULE(errCode)); - nsCOMPtr provider = - dont_AddRef((nsIExceptionProvider *)mProviders.Get(&key)); - // No provider so we'll return the default exception - if (!provider) { - *_exc = defaultException; - NS_IF_ADDREF(*_exc); - return NS_OK; + switch (NS_ERROR_GET_MODULE(errCode)) { + case NS_ERROR_MODULE_DOM: + case NS_ERROR_MODULE_SVG: + case NS_ERROR_MODULE_DOM_XPATH: + case NS_ERROR_MODULE_DOM_INDEXEDDB: + case NS_ERROR_MODULE_DOM_FILEHANDLE: + if (NS_IsMainThread()) { + return NS_NewDOMException(errCode, defaultException, _exc); + } + break; + + default: + break; } - return provider->GetException(errCode, defaultException, _exc); + // No provider so we'll return the default exception + *_exc = defaultException; + NS_IF_ADDREF(*_exc); + return NS_OK; } // thread management diff --git a/xpcom/base/nsExceptionService.h b/xpcom/base/nsExceptionService.h index ee86f9a42854..b4a2c52d3067 100644 --- a/xpcom/base/nsExceptionService.h +++ b/xpcom/base/nsExceptionService.h @@ -43,10 +43,7 @@ public: static void DropAllThreads(); static nsExceptionManager *firstThread; - nsSupportsHashtable mProviders; - - /* single lock protects both providers hashtable - and thread list */ + /* Protects the thread list. */ static mozilla::Mutex* sLock; static unsigned tlsIndex; diff --git a/xpcom/base/nsIExceptionService.idl b/xpcom/base/nsIExceptionService.idl index 1a9d75d8d53f..fcc816af3882 100644 --- a/xpcom/base/nsIExceptionService.idl +++ b/xpcom/base/nsIExceptionService.idl @@ -6,16 +6,6 @@ #include "nsISupports.idl" #include "nsIException.idl" -// An exception provider. These can turn special nsresult codes -// into nsIExceptions - -[scriptable, uuid(0577744c-c1d2-47f2-8bcc-ce7a9e5a88fc)] -interface nsIExceptionProvider : nsISupports -{ - /** Gets an nsIException or returns NULL if not possible. **/ - nsIException getException(in nsresult result, in nsIException defaultException); -}; - // A ScriptErrorManager for a single thread. These objects // are _not_ thread-safe. Use the ScriptErrorService // to get a script error manager for your current thread. @@ -36,22 +26,11 @@ interface nsIExceptionManager : nsISupports // The Exception Service. Allows you to get an set exceptions in a thread // safe manner, or to get an ExceptionManager for your specific thread. -[scriptable, uuid(35A88F54-F267-4414-92A7-191F6454AB52)] +[scriptable, uuid(8f9ccabb-a68b-43e3-b570-dd8c3179d2fb)] interface nsIExceptionService : nsIExceptionManager { /** Obtains an exception manager for the current thread. */ readonly attribute nsIExceptionManager currentExceptionManager; - - /** Installs an "exception provider" which is capable of - translating an nsresult into an exception. This enables - error providers to return simple nsresults and only provide - rich errors when specifically requested. It also has the - advantage of allowing code like the DOM to handle all errors - in a single function rather than at each XPCOM entry point. - NOTE: This interface must be thread-safe - it will be called - on whatever thread needs the error translation performed.*/ - void registerExceptionProvider( in nsIExceptionProvider provider, in uint32_t moduleCode ); - void unregisterExceptionProvider( in nsIExceptionProvider provider, in uint32_t moduleCode ); }; From 506173515d7eb416d2184518e7cd4369ef7135e1 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 08:56:07 +0200 Subject: [PATCH 78/79] No bug - Use Unix line endings in nsSandboxFlags.h. --- content/base/src/nsSandboxFlags.h | 126 +++++++++++++++--------------- 1 file changed, 63 insertions(+), 63 deletions(-) diff --git a/content/base/src/nsSandboxFlags.h b/content/base/src/nsSandboxFlags.h index de80c8f8b186..669d84a9d5c3 100644 --- a/content/base/src/nsSandboxFlags.h +++ b/content/base/src/nsSandboxFlags.h @@ -1,63 +1,63 @@ -/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ -/* This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -/* - * Constant flags that describe how a document is sandboxed according to the - * HTML5 spec. - */ - -#ifndef nsSandboxFlags_h___ -#define nsSandboxFlags_h___ - -/** - * This flag prevents content from navigating browsing contexts other than - * the sandboxed browsing context itself (or browsing contexts further - * nested inside it), and the top-level browsing context. - */ -const unsigned long SANDBOXED_NAVIGATION = 0x1; - -/** - * This flag prevents content from navigating their top-level browsing - * context. - */ -const unsigned long SANDBOXED_TOPLEVEL_NAVIGATION = 0x2; - -/** - * This flag prevents content from instantiating plugins, whether using the - * embed element, the object element, the applet element, or through - * navigation of a nested browsing context, unless those plugins can be - * secured. - */ -const unsigned long SANDBOXED_PLUGINS = 0x4; - -/** - * This flag forces content into a unique origin, thus preventing it from - * accessing other content from the same origin. - * This flag also prevents script from reading from or writing to the - * document.cookie IDL attribute, and blocks access to localStorage. - */ -const unsigned long SANDBOXED_ORIGIN = 0x8; - -/** - * This flag blocks form submission. - */ -const unsigned long SANDBOXED_FORMS = 0x10; - -/** - * This flag blocks script execution. - */ -const unsigned long SANDBOXED_SCRIPTS = 0x20; - -/** - * This flag blocks features that trigger automatically, such as - * automatically playing a video or automatically focusing a form control. - */ -const unsigned long SANDBOXED_AUTOMATIC_FEATURES = 0x40; - -/** - * This flag blocks the document from acquiring pointerlock. - */ -const unsigned long SANDBOXED_POINTER_LOCK = 0x80; -#endif +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +/* + * Constant flags that describe how a document is sandboxed according to the + * HTML5 spec. + */ + +#ifndef nsSandboxFlags_h___ +#define nsSandboxFlags_h___ + +/** + * This flag prevents content from navigating browsing contexts other than + * the sandboxed browsing context itself (or browsing contexts further + * nested inside it), and the top-level browsing context. + */ +const unsigned long SANDBOXED_NAVIGATION = 0x1; + +/** + * This flag prevents content from navigating their top-level browsing + * context. + */ +const unsigned long SANDBOXED_TOPLEVEL_NAVIGATION = 0x2; + +/** + * This flag prevents content from instantiating plugins, whether using the + * embed element, the object element, the applet element, or through + * navigation of a nested browsing context, unless those plugins can be + * secured. + */ +const unsigned long SANDBOXED_PLUGINS = 0x4; + +/** + * This flag forces content into a unique origin, thus preventing it from + * accessing other content from the same origin. + * This flag also prevents script from reading from or writing to the + * document.cookie IDL attribute, and blocks access to localStorage. + */ +const unsigned long SANDBOXED_ORIGIN = 0x8; + +/** + * This flag blocks form submission. + */ +const unsigned long SANDBOXED_FORMS = 0x10; + +/** + * This flag blocks script execution. + */ +const unsigned long SANDBOXED_SCRIPTS = 0x20; + +/** + * This flag blocks features that trigger automatically, such as + * automatically playing a video or automatically focusing a form control. + */ +const unsigned long SANDBOXED_AUTOMATIC_FEATURES = 0x40; + +/** + * This flag blocks the document from acquiring pointerlock. + */ +const unsigned long SANDBOXED_POINTER_LOCK = 0x80; +#endif From b1b7669c2b1155e6b8d820449f3b2ef5e7efe3ef Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 22 Aug 2013 11:22:03 +0200 Subject: [PATCH 79/79] Bug 904831 - Followup: clobber --- CLOBBER | 4 +--- content/base/src/nsXMLHttpRequest.cpp | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CLOBBER b/CLOBBER index 385297d37b3b..93fabcfe40df 100644 --- a/CLOBBER +++ b/CLOBBER @@ -18,6 +18,4 @@ # Modifying this file will now automatically clobber the buildbot machines \o/ # -In Bug 863306 comment #42 sheriff KWierso states that we should CLOBBER every time -that WebRTC code is changed, which will be awesome. - +Bug 904831 - MSVC_ENABLE_PGO in js/src/Makefile.in diff --git a/content/base/src/nsXMLHttpRequest.cpp b/content/base/src/nsXMLHttpRequest.cpp index 40713c2cf134..21b6dd116931 100644 --- a/content/base/src/nsXMLHttpRequest.cpp +++ b/content/base/src/nsXMLHttpRequest.cpp @@ -65,6 +65,7 @@ #include "nsIPermissionManager.h" #include "nsMimeTypes.h" #include "nsIHttpChannelInternal.h" +#include "nsCharSeparatedTokenizer.h" #include "nsFormData.h" #include "nsStreamListenerWrapper.h"