From 9b092b10511182574aac108f5e101c7f937044ac Mon Sep 17 00:00:00 2001 From: Monica Chew Date: Thu, 20 Mar 2014 14:25:35 -0700 Subject: [PATCH 01/46] Bug 985623: Force url classifier clients to specify which tables to lookup, add a pref to skip hash completion checks (r=gcp) --- .../safebrowsing/content/test/head.js | 2 + modules/libpref/src/init/all.js | 5 +- .../downloads/ApplicationReputation.cpp | 14 +++- .../components/url-classifier/Classifier.cpp | 29 ++++++- .../components/url-classifier/Classifier.h | 8 +- .../nsIUrlClassifierDBService.idl | 7 +- .../nsUrlClassifierDBService.cpp | 78 ++++++++++++------- .../url-classifier/nsUrlClassifierDBService.h | 4 + .../url-classifier/nsUrlClassifierProxies.cpp | 6 +- .../url-classifier/nsUrlClassifierProxies.h | 3 + .../tests/mochitest/test_classifier.html | 6 +- .../mochitest/test_classifier_worker.html | 6 +- .../test_lookup_system_principal.html | 4 +- .../tests/unit/head_urlclassifier.js | 15 ++-- .../tests/unit/test_dbservice.js | 26 +++---- .../tests/unit/test_digest256.js | 20 ++--- 16 files changed, 163 insertions(+), 70 deletions(-) diff --git a/browser/components/safebrowsing/content/test/head.js b/browser/components/safebrowsing/content/test/head.js index ca2b3723a1d9..b3e288ae397f 100644 --- a/browser/components/safebrowsing/content/test/head.js +++ b/browser/components/safebrowsing/content/test/head.js @@ -1,3 +1,5 @@ // Force SafeBrowsing to be initialized for the tests +Services.prefs.setCharPref("urlclassifier.malware_table", "test-malware-simple"); +Services.prefs.setCharPref("urlclassifier.phish_table", "test-phish-simple"); SafeBrowsing.init(); diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js index e5c481dc8817..2d350cd40bf6 100644 --- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js @@ -4388,10 +4388,11 @@ pref("dom.voicemail.defaultServiceId", 0); pref("dom.inter-app-communication-api.enabled", false); // The tables used for Safebrowsing phishing and malware checks. -pref("urlclassifier.malware_table", "goog-malware-shavar"); -pref("urlclassifier.phish_table", "goog-phish-shavar"); +pref("urlclassifier.malware_table", "goog-malware-shavar,test-malware-simple"); +pref("urlclassifier.phish_table", "goog-phish-shavar,test-phish-simple"); pref("urlclassifier.download_block_table", ""); pref("urlclassifier.download_allow_table", ""); +pref("urlclassifier.disallow_completions", "test-malware-simple,test-phish-simple,goog-downloadwhite-digest256"); // Turn off Spatial navigation by default. pref("snav.enabled", false); diff --git a/toolkit/components/downloads/ApplicationReputation.cpp b/toolkit/components/downloads/ApplicationReputation.cpp index da8f6d3a1fe3..a1918936414c 100644 --- a/toolkit/components/downloads/ApplicationReputation.cpp +++ b/toolkit/components/downloads/ApplicationReputation.cpp @@ -273,7 +273,19 @@ PendingDBLookup::LookupSpecInternal(const nsACString& aSpec) LOG(("Checking DB service for principal %s [this = %p]", mSpec.get(), this)); nsCOMPtr dbService = do_GetService(NS_URLCLASSIFIERDBSERVICE_CONTRACTID, &rv); - return dbService->Lookup(principal, this); + nsAutoCString tables; + nsAutoCString allowlist; + Preferences::GetCString(PREF_DOWNLOAD_ALLOW_TABLE, &allowlist); + if (!allowlist.IsEmpty()) { + tables.Append(allowlist); + } + nsAutoCString blocklist; + Preferences::GetCString(PREF_DOWNLOAD_BLOCK_TABLE, &blocklist); + if (!mAllowlistOnly && !blocklist.IsEmpty()) { + tables.Append(","); + tables.Append(blocklist); + } + return dbService->Lookup(principal, tables, this); } NS_IMETHODIMP diff --git a/toolkit/components/url-classifier/Classifier.cpp b/toolkit/components/url-classifier/Classifier.cpp index 0eb2b1a10046..020684ca7574 100644 --- a/toolkit/components/url-classifier/Classifier.cpp +++ b/toolkit/components/url-classifier/Classifier.cpp @@ -32,6 +32,28 @@ extern PRLogModuleInfo *gUrlClassifierDbServiceLog; namespace mozilla { namespace safebrowsing { +void +Classifier::SplitTables(const nsACString& str, nsTArray& tables) +{ + tables.Clear(); + + nsACString::const_iterator begin, iter, end; + str.BeginReading(begin); + str.EndReading(end); + while (begin != end) { + iter = begin; + FindCharInReadable(',', iter, end); + nsDependentCSubstring table = Substring(begin,iter); + if (!table.IsEmpty()) { + tables.AppendElement(Substring(begin, iter)); + } + begin = iter; + if (begin != end) { + begin++; + } + } +} + Classifier::Classifier() : mFreshTime(45 * 60) { @@ -195,7 +217,9 @@ Classifier::TableRequest(nsACString& aResult) } nsresult -Classifier::Check(const nsACString& aSpec, LookupResultArray& aResults) +Classifier::Check(const nsACString& aSpec, + const nsACString& aTables, + LookupResultArray& aResults) { Telemetry::AutoTimer timer; @@ -207,10 +231,11 @@ Classifier::Check(const nsACString& aSpec, LookupResultArray& aResults) NS_ENSURE_SUCCESS(rv, rv); nsTArray activeTables; - ActiveTables(activeTables); + SplitTables(aTables, activeTables); nsTArray cacheArray; for (uint32_t i = 0; i < activeTables.Length(); i++) { + LOG(("Checking table %s", activeTables[i].get())); LookupCache *cache = GetLookupCache(activeTables[i]); if (cache) { cacheArray.AppendElement(cache); diff --git a/toolkit/components/url-classifier/Classifier.h b/toolkit/components/url-classifier/Classifier.h index 0633fab851f6..246b3cd714c9 100644 --- a/toolkit/components/url-classifier/Classifier.h +++ b/toolkit/components/url-classifier/Classifier.h @@ -43,9 +43,11 @@ public: nsresult ActiveTables(nsTArray& aTables); /** - * Check a URL against the database. + * Check a URL against the specified tables. */ - nsresult Check(const nsACString& aSpec, LookupResultArray& aResults); + nsresult Check(const nsACString& aSpec, + const nsACString& tables, + LookupResultArray& aResults); /** * Apply the table updates in the array. Takes ownership of @@ -68,6 +70,8 @@ public: const nsACString& aTableName, uint32_t aCount, PrefixArray* aNoiseEntries); + static void SplitTables(const nsACString& str, nsTArray& tables); + private: void DropStores(); nsresult CreateStoreDirectory(); diff --git a/toolkit/components/url-classifier/nsIUrlClassifierDBService.idl b/toolkit/components/url-classifier/nsIUrlClassifierDBService.idl index f3d91b8d6435..5fae66527683 100644 --- a/toolkit/components/url-classifier/nsIUrlClassifierDBService.idl +++ b/toolkit/components/url-classifier/nsIUrlClassifierDBService.idl @@ -66,17 +66,18 @@ interface nsIUrlClassifierUpdateObserver : nsISupports { * It provides async methods for querying and updating the database. As the * methods complete, they call the callback function. */ -[scriptable, uuid(8a389f21-f821-4e29-9c6b-3de6f33cd7cf)] +[scriptable, uuid(3f9e61e5-01bd-45d0-8dd2-f1abcd20dbb7)] interface nsIUrlClassifierDBService : nsISupports { /** - * Looks up a URI in the database. + * Looks up a URI in the specified tables. * * @param principal: The principal containing the URI to search. * @param c: The callback will be called with a comma-separated list * of tables to which the key belongs. */ void lookup(in nsIPrincipal principal, + in ACString tables, in nsIUrlClassifierCallback c); /** @@ -184,7 +185,7 @@ interface nsIUrlClassifierDBService : nsISupports * Interface for the actual worker thread. Implementations of this need not * be thread aware and just work on the database. */ -[scriptable, uuid(0445be75-b114-43ea-89dc-aa16af26e77e)] +[scriptable, uuid(abcd7978-c304-4a7d-a44c-33c2ed5441e7)] interface nsIUrlClassifierDBServiceWorker : nsIUrlClassifierDBService { // Provide a way to forcibly close the db connection. diff --git a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp index 882e67c1e766..cf31a187bb18 100644 --- a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp +++ b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp @@ -73,6 +73,7 @@ PRLogModuleInfo *gUrlClassifierDbServiceLog = nullptr; #define PHISH_TABLE_PREF "urlclassifier.phish_table" #define DOWNLOAD_BLOCK_TABLE_PREF "urlclassifier.download_block_table" #define DOWNLOAD_ALLOW_TABLE_PREF "urlclassifier.download_allow_table" +#define DISALLOW_COMPLETION_TABLE_PREF "urlclassifier.disallow_completions" #define CONFIRM_AGE_PREF "urlclassifier.max-complete-age" #define CONFIRM_AGE_DEFAULT_SEC (45 * 60) @@ -90,24 +91,6 @@ static bool gShuttingDownThread = false; static mozilla::Atomic gFreshnessGuarantee(CONFIRM_AGE_DEFAULT_SEC); -static void -SplitTables(const nsACString& str, nsTArray& tables) -{ - tables.Clear(); - - nsACString::const_iterator begin, iter, end; - str.BeginReading(begin); - str.EndReading(end); - while (begin != end) { - iter = begin; - FindCharInReadable(',', iter, end); - tables.AppendElement(Substring(begin, iter)); - begin = iter; - if (begin != end) - begin++; - } -} - // ------------------------------------------------------------------------- // Actual worker implemenatation class nsUrlClassifierDBServiceWorker MOZ_FINAL : @@ -123,7 +106,9 @@ public: nsresult Init(uint32_t aGethashNoise, nsCOMPtr aCacheDir); // Queue a lookup for the worker to perform, called in the main thread. + // tables is a comma-separated list of tables to query nsresult QueueLookup(const nsACString& lookupKey, + const nsACString& tables, nsIUrlClassifierLookupCallback* callback); // Handle any queued-up lookups. We call this function during long-running @@ -149,7 +134,9 @@ private: void ResetUpdate(); // Perform a classifier lookup for a given url. - nsresult DoLookup(const nsACString& spec, nsIUrlClassifierLookupCallback* c); + nsresult DoLookup(const nsACString& spec, + const nsACString& tables, + nsIUrlClassifierLookupCallback* c); nsresult AddNoise(const Prefix aPrefix, const nsCString tableName, @@ -192,6 +179,7 @@ private: public: TimeStamp mStartTime; nsCString mKey; + nsCString mTables; nsCOMPtr mCallback; }; @@ -231,6 +219,7 @@ nsUrlClassifierDBServiceWorker::Init(uint32_t aGethashNoise, nsresult nsUrlClassifierDBServiceWorker::QueueLookup(const nsACString& spec, + const nsACString& tables, nsIUrlClassifierLookupCallback* callback) { MutexAutoLock lock(mPendingLookupLock); @@ -241,6 +230,7 @@ nsUrlClassifierDBServiceWorker::QueueLookup(const nsACString& spec, lookup->mStartTime = TimeStamp::Now(); lookup->mKey = spec; lookup->mCallback = callback; + lookup->mTables = tables; return NS_OK; } @@ -258,6 +248,7 @@ nsUrlClassifierDBServiceWorker::QueueLookup(const nsACString& spec, */ nsresult nsUrlClassifierDBServiceWorker::DoLookup(const nsACString& spec, + const nsACString& tables, nsIUrlClassifierLookupCallback* c) { if (gShuttingDownThread) { @@ -288,7 +279,7 @@ nsUrlClassifierDBServiceWorker::DoLookup(const nsACString& spec, // we ignore failures from Check because we'd rather return the // results that were found than fail. mClassifier->SetFreshTime(gFreshnessGuarantee); - mClassifier->Check(spec, *results); + mClassifier->Check(spec, tables, *results); LOG(("Found %d results.", results->Length())); @@ -336,7 +327,7 @@ nsUrlClassifierDBServiceWorker::HandlePendingLookups() mPendingLookups.RemoveElementAt(0); { MutexAutoUnlock unlock(mPendingLookupLock); - DoLookup(lookup.mKey, lookup.mCallback); + DoLookup(lookup.mKey, lookup.mTables, lookup.mCallback); } double lookupTime = (TimeStamp::Now() - lookup.mStartTime).ToMilliseconds(); Telemetry::Accumulate(Telemetry::URLCLASSIFIER_LOOKUP_TIME, @@ -378,6 +369,7 @@ nsUrlClassifierDBServiceWorker::AddNoise(const Prefix aPrefix, // Lookup a key in the db. NS_IMETHODIMP nsUrlClassifierDBServiceWorker::Lookup(nsIPrincipal* aPrincipal, + const nsACString& aTables, nsIUrlClassifierCallback* c) { return HandlePendingLookups(); @@ -447,7 +439,7 @@ nsUrlClassifierDBServiceWorker::BeginUpdate(nsIUrlClassifierUpdateObserver *obse mUpdateStatus = NS_OK; mUpdateObserver = observer; - SplitTables(tables, mUpdateTables); + Classifier::SplitTables(tables, mUpdateTables); return NS_OK; } @@ -1101,6 +1093,9 @@ nsUrlClassifierDBService::Init() DOWNLOAD_BLOCK_TABLE_PREF)); mGethashTables.AppendElement(Preferences::GetCString( DOWNLOAD_ALLOW_TABLE_PREF)); + nsCString tables; + Preferences::GetCString(DISALLOW_COMPLETION_TABLE_PREF, &tables); + Classifier::SplitTables(tables, mDisallowCompletionsTables); // Do we *really* need to be able to change all of these at runtime? Preferences::AddStrongObserver(this, CHECK_MALWARE_PREF); @@ -1111,6 +1106,7 @@ nsUrlClassifierDBService::Init() Preferences::AddStrongObserver(this, MALWARE_TABLE_PREF); Preferences::AddStrongObserver(this, DOWNLOAD_BLOCK_TABLE_PREF); Preferences::AddStrongObserver(this, DOWNLOAD_ALLOW_TABLE_PREF); + Preferences::AddStrongObserver(this, DISALLOW_COMPLETION_TABLE_PREF); // Force PSM loading on main thread nsresult rv; @@ -1156,6 +1152,7 @@ nsUrlClassifierDBService::Init() return NS_OK; } +// nsChannelClassifier is the only consumer of this interface. NS_IMETHODIMP nsUrlClassifierDBService::Classify(nsIPrincipal* aPrincipal, nsIURIClassifierCallback* c, @@ -1173,7 +1170,19 @@ nsUrlClassifierDBService::Classify(nsIPrincipal* aPrincipal, new nsUrlClassifierClassifyCallback(c, mCheckMalware, mCheckPhishing); if (!callback) return NS_ERROR_OUT_OF_MEMORY; - nsresult rv = LookupURI(aPrincipal, callback, false, result); + nsAutoCString tables; + nsAutoCString malware; + Preferences::GetCString(MALWARE_TABLE_PREF, &malware); + if (!malware.IsEmpty()) { + tables.Append(malware); + } + nsAutoCString phishing; + Preferences::GetCString(PHISH_TABLE_PREF, &phishing); + if (!phishing.IsEmpty()) { + tables.Append(","); + tables.Append(phishing); + } + nsresult rv = LookupURI(aPrincipal, tables, callback, false, result); if (rv == NS_ERROR_MALFORMED_URI) { *result = false; // The URI had no hostname, don't try to classify it. @@ -1186,16 +1195,18 @@ nsUrlClassifierDBService::Classify(nsIPrincipal* aPrincipal, NS_IMETHODIMP nsUrlClassifierDBService::Lookup(nsIPrincipal* aPrincipal, + const nsACString& tables, nsIUrlClassifierCallback* c) { NS_ENSURE_TRUE(gDbBackgroundThread, NS_ERROR_NOT_INITIALIZED); bool dummy; - return LookupURI(aPrincipal, c, true, &dummy); + return LookupURI(aPrincipal, tables, c, true, &dummy); } nsresult nsUrlClassifierDBService::LookupURI(nsIPrincipal* aPrincipal, + const nsACString& tables, nsIUrlClassifierCallback* c, bool forceLookup, bool *didLookup) @@ -1262,11 +1273,12 @@ nsUrlClassifierDBService::LookupURI(nsIPrincipal* aPrincipal, // Queue this lookup and call the lookup function to flush the queue if // necessary. - rv = mWorker->QueueLookup(key, proxyCallback); + rv = mWorker->QueueLookup(key, tables, proxyCallback); NS_ENSURE_SUCCESS(rv, rv); // This seems to just call HandlePendingLookups. - return mWorkerProxy->Lookup(nullptr, nullptr); + nsAutoCString dummy; + return mWorkerProxy->Lookup(nullptr, dummy, nullptr); } NS_IMETHODIMP @@ -1385,14 +1397,20 @@ bool nsUrlClassifierDBService::GetCompleter(const nsACString &tableName, nsIUrlClassifierHashCompleter **completer) { + // If we have specified a completer, go ahead and query it. This is only + // used by tests. if (mCompleters.Get(tableName, completer)) { return true; } - if (!mGethashTables.Contains(tableName)) { + // If we don't know about this table at all, or are disallowing completions + // for it, skip completion checks. + if (!mGethashTables.Contains(tableName) || + mDisallowCompletionsTables.Contains(tableName)) { return false; } + // Otherwise, call gethash to find the hash completions. return NS_SUCCEEDED(CallGetService(NS_URLCLASSIFIERHASHCOMPLETER_CONTRACTID, completer)); } @@ -1423,6 +1441,11 @@ nsUrlClassifierDBService::Observe(nsISupports *aSubject, const char *aTopic, DOWNLOAD_BLOCK_TABLE_PREF)); mGethashTables.AppendElement(Preferences::GetCString( DOWNLOAD_ALLOW_TABLE_PREF)); + } else if (NS_LITERAL_STRING(DISALLOW_COMPLETION_TABLE_PREF).Equals(aData)) { + mDisallowCompletionsTables.Clear(); + nsCString tables; + Preferences::GetCString(DISALLOW_COMPLETION_TABLE_PREF, &tables); + Classifier::SplitTables(tables, mDisallowCompletionsTables); } else if (NS_LITERAL_STRING(CONFIRM_AGE_PREF).Equals(aData)) { gFreshnessGuarantee = Preferences::GetInt(CONFIRM_AGE_PREF, CONFIRM_AGE_DEFAULT_SEC); @@ -1456,6 +1479,7 @@ nsUrlClassifierDBService::Shutdown() prefs->RemoveObserver(MALWARE_TABLE_PREF, this); prefs->RemoveObserver(DOWNLOAD_BLOCK_TABLE_PREF, this); prefs->RemoveObserver(DOWNLOAD_ALLOW_TABLE_PREF, this); + prefs->RemoveObserver(DISALLOW_COMPLETION_TABLE_PREF, this); prefs->RemoveObserver(CONFIRM_AGE_PREF, this); } diff --git a/toolkit/components/url-classifier/nsUrlClassifierDBService.h b/toolkit/components/url-classifier/nsUrlClassifierDBService.h index 668385b7673f..5a81b5009f89 100644 --- a/toolkit/components/url-classifier/nsUrlClassifierDBService.h +++ b/toolkit/components/url-classifier/nsUrlClassifierDBService.h @@ -71,6 +71,7 @@ private: nsUrlClassifierDBService(nsUrlClassifierDBService&); nsresult LookupURI(nsIPrincipal* aPrincipal, + const nsACString& tables, nsIUrlClassifierCallback* c, bool forceCheck, bool *didCheck); @@ -103,6 +104,9 @@ private: // The list of tables that can use the default hash completer object. nsTArray mGethashTables; + // The list of tables that should never be hash completed. + nsTArray mDisallowCompletionsTables; + // Thread that we do the updates on. static nsIThread* gDbBackgroundThread; }; diff --git a/toolkit/components/url-classifier/nsUrlClassifierProxies.cpp b/toolkit/components/url-classifier/nsUrlClassifierProxies.cpp index fad3e905d146..ee3d0af0c88d 100644 --- a/toolkit/components/url-classifier/nsUrlClassifierProxies.cpp +++ b/toolkit/components/url-classifier/nsUrlClassifierProxies.cpp @@ -23,16 +23,18 @@ NS_IMPL_ISUPPORTS1(UrlClassifierDBServiceWorkerProxy, NS_IMETHODIMP UrlClassifierDBServiceWorkerProxy::Lookup(nsIPrincipal* aPrincipal, + const nsACString& aTables, nsIUrlClassifierCallback* aCB) { - nsCOMPtr r = new LookupRunnable(mTarget, aPrincipal, aCB); + nsCOMPtr r = new LookupRunnable(mTarget, aPrincipal, aTables, + aCB); return DispatchToWorkerThread(r); } NS_IMETHODIMP UrlClassifierDBServiceWorkerProxy::LookupRunnable::Run() { - (void) mTarget->Lookup(mPrincipal, mCB); + (void) mTarget->Lookup(mPrincipal, mLookupTables, mCB); return NS_OK; } diff --git a/toolkit/components/url-classifier/nsUrlClassifierProxies.h b/toolkit/components/url-classifier/nsUrlClassifierProxies.h index c3b1a2024c68..45e3d7644032 100644 --- a/toolkit/components/url-classifier/nsUrlClassifierProxies.h +++ b/toolkit/components/url-classifier/nsUrlClassifierProxies.h @@ -34,9 +34,11 @@ public: public: LookupRunnable(nsIUrlClassifierDBServiceWorker* aTarget, nsIPrincipal* aPrincipal, + const nsACString& aTables, nsIUrlClassifierCallback* aCB) : mTarget(aTarget) , mPrincipal(aPrincipal) + , mLookupTables(aTables) , mCB(aCB) { } @@ -45,6 +47,7 @@ public: private: nsCOMPtr mTarget; nsCOMPtr mPrincipal; + nsCString mLookupTables; nsCOMPtr mCB; }; diff --git a/toolkit/components/url-classifier/tests/mochitest/test_classifier.html b/toolkit/components/url-classifier/tests/mochitest/test_classifier.html index 89493441dda4..13955903a1f6 100644 --- a/toolkit/components/url-classifier/tests/mochitest/test_classifier.html +++ b/toolkit/components/url-classifier/tests/mochitest/test_classifier.html @@ -6,7 +6,6 @@ -

@@ -61,6 +60,11 @@ function doUpdate(update) { dbService.finishUpdate(); } +SpecialPowers.pushPrefEnv( + {"set" : [["urlclassifier.malware_table", "test-malware-simple"], + ["urlclassifier.phish_table", "test-phish-simple"]]}, + function() { doUpdate(testUpdate); }); + // Expected finish() call is in "classifierFrame.html". SimpleTest.waitForExplicitFinish(); diff --git a/toolkit/components/url-classifier/tests/mochitest/test_classifier_worker.html b/toolkit/components/url-classifier/tests/mochitest/test_classifier_worker.html index d2b0e41bbee5..2b20fe040d72 100644 --- a/toolkit/components/url-classifier/tests/mochitest/test_classifier_worker.html +++ b/toolkit/components/url-classifier/tests/mochitest/test_classifier_worker.html @@ -6,7 +6,6 @@ -

@@ -73,6 +72,11 @@ function onmessage(event) is(pieces[0], "success", pieces[1]); } +SpecialPowers.pushPrefEnv( + {"set" : [["urlclassifier.malware_table", "test-malware-simple"], + ["urlclassifier.phish_table", "test-phish-simple"]]}, + function() { doUpdate(testUpdate); }); + window.addEventListener("message", onmessage, false); SimpleTest.waitForExplicitFinish(); diff --git a/toolkit/components/url-classifier/tests/mochitest/test_lookup_system_principal.html b/toolkit/components/url-classifier/tests/mochitest/test_lookup_system_principal.html index 25d637eeb297..fa61e6a00b4d 100644 --- a/toolkit/components/url-classifier/tests/mochitest/test_lookup_system_principal.html +++ b/toolkit/components/url-classifier/tests/mochitest/test_lookup_system_principal.html @@ -19,11 +19,11 @@ var Ci = Components.interfaces; var dbService = Cc["@mozilla.org/url-classifier/dbservice;1"] .getService(Ci.nsIUrlClassifierDBService); -dbService.lookup(document.nodePrincipal, function(arg) {}); +dbService.lookup(document.nodePrincipal, "", function(arg) {}); ok(true, "lookup() didn't crash"); - \ No newline at end of file + diff --git a/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js b/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js index 95158ebaf1a5..25ccbc056be3 100644 --- a/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js +++ b/toolkit/components/url-classifier/tests/unit/head_urlclassifier.js @@ -31,6 +31,9 @@ prefBranch.setIntPref("urlclassifier.gethashnoise", 0); prefBranch.setBoolPref("browser.safebrowsing.malware.enabled", true); prefBranch.setBoolPref("browser.safebrowsing.enabled", true); +// Enable all completions for tests +prefBranch.setCharPref("urlclassifier.disallow_completions", ""); + function delFile(name) { try { // Delete a previously created sqlite file @@ -53,6 +56,8 @@ function cleanUp() { delFile("safebrowsing/test-malware-simple.pset"); } +var allTables = "test-phish-simple,test-malware-simple"; + var dbservice = Cc["@mozilla.org/url-classifier/dbservice;1"].getService(Ci.nsIUrlClassifierDBService); var streamUpdater = Cc["@mozilla.org/url-classifier/streamupdater;1"] .getService(Ci.nsIUrlClassifierStreamUpdater); @@ -200,11 +205,11 @@ checkUrls: function(urls, expected, cb) if (urls.length > 0) { var fragment = urls.shift(); var principal = secMan.getNoAppCodebasePrincipal(iosvc.newURI("http://" + fragment, null, null)); - dbservice.lookup(principal, - function(arg) { - do_check_eq(expected, arg); - doLookup(); - }, true); + dbservice.lookup(principal, allTables, + function(arg) { + do_check_eq(expected, arg); + doLookup(); + }, true); } else { cb(); } diff --git a/toolkit/components/url-classifier/tests/unit/test_dbservice.js b/toolkit/components/url-classifier/tests/unit/test_dbservice.js index 9730f5fedb9c..0f9108be83c2 100644 --- a/toolkit/components/url-classifier/tests/unit/test_dbservice.js +++ b/toolkit/components/url-classifier/tests/unit/test_dbservice.js @@ -96,7 +96,7 @@ function checkNoHost() var exception; try { var principal = secMan.getNoAppCodebasePrincipal(iosvc.newURI("data:text/html,test", null, null)); - dbservice.lookup(principal); + dbservice.lookup(principal, allTables); exception = false; } catch(e) { @@ -115,7 +115,7 @@ function tablesCallbackWithoutSub(tables) // there's a leading \n here because splitting left an empty string // after the trailing newline, which will sort first do_check_eq(parts.join("\n"), - "\ntesting-malware-simple;a:1\ntesting-phish-simple;a:2"); + "\ntest-malware-simple;a:1\ntest-phish-simple;a:2"); checkNoHost(); } @@ -133,12 +133,12 @@ function tablesCallbackWithSub(tables) // there's a leading \n here because splitting left an empty string // after the trailing newline, which will sort first do_check_eq(parts.join("\n"), - "\ntesting-malware-simple;a:1\ntesting-phish-simple;a:2:s:3"); + "\ntest-malware-simple;a:1\ntest-phish-simple;a:2:s:3"); // verify that expiring a sub chunk removes its name from the list var data = "n:1000\n" + - "i:testing-phish-simple\n" + + "i:test-phish-simple\n" + "sd:3\n"; doSimpleUpdate(data, expireSubSuccess, testFailure); @@ -157,7 +157,7 @@ function checkDone() { function phishExists(result) { dumpn("phishExists: " + result); try { - do_check_true(result.indexOf("testing-phish-simple") != -1); + do_check_true(result.indexOf("test-phish-simple") != -1); } finally { checkDone(); } @@ -166,7 +166,7 @@ function phishExists(result) { function phishDoesntExist(result) { dumpn("phishDoesntExist: " + result); try { - do_check_true(result.indexOf("testing-phish-simple") == -1); + do_check_true(result.indexOf("test-phish-simple") == -1); } finally { checkDone(); } @@ -176,7 +176,7 @@ function malwareExists(result) { dumpn("malwareExists: " + result); try { - do_check_true(result.indexOf("testing-malware-simple") != -1); + do_check_true(result.indexOf("test-malware-simple") != -1); } finally { checkDone(); } @@ -188,19 +188,19 @@ function checkState() for (var key in phishExpected) { var principal = secMan.getNoAppCodebasePrincipal(iosvc.newURI("http://" + key, null, null)); - dbservice.lookup(principal, phishExists, true); + dbservice.lookup(principal, allTables, phishExists, true); numExpecting++; } for (var key in phishUnexpected) { var principal = secMan.getNoAppCodebasePrincipal(iosvc.newURI("http://" + key, null, null)); - dbservice.lookup(principal, phishDoesntExist, true); + dbservice.lookup(principal, allTables, phishDoesntExist, true); numExpecting++; } for (var key in malwareExpected) { var principal = secMan.getNoAppCodebasePrincipal(iosvc.newURI("http://" + key, null, null)); - dbservice.lookup(principal, malwareExists, true); + dbservice.lookup(principal, allTables, malwareExists, true); numExpecting++; } } @@ -214,7 +214,7 @@ function testSubSuccess(result) function do_subs() { var data = "n:1000\n" + - "i:testing-phish-simple\n" + + "i:test-phish-simple\n" + "s:3:32:" + chunk3Sub.length + "\n" + chunk3Sub + "\n" + "ad:1\n" + @@ -236,7 +236,7 @@ function do_adds() { var data = "n:1000\n" + - "i:testing-phish-simple\n" + + "i:test-phish-simple\n" + "a:1:32:" + chunk1.length + "\n" + chunk1 + "\n" + "a:2:32:" + chunk2.length + "\n" + @@ -247,7 +247,7 @@ function do_adds() { chunk5 + "\n" + "a:6:32:" + chunk6.length + "\n" + chunk6 + "\n" + - "i:testing-malware-simple\n" + + "i:test-malware-simple\n" + "a:1:32:" + chunk2.length + "\n" + chunk2 + "\n"; diff --git a/toolkit/components/url-classifier/tests/unit/test_digest256.js b/toolkit/components/url-classifier/tests/unit/test_digest256.js index 475714c4dceb..db74a20bdd06 100644 --- a/toolkit/components/url-classifier/tests/unit/test_digest256.js +++ b/toolkit/components/url-classifier/tests/unit/test_digest256.js @@ -125,11 +125,12 @@ add_test(function test_update() { add_test(function test_url_not_whitelisted() { let uri = createURI("http://example.com"); let principal = gSecMan.getNoAppCodebasePrincipal(uri); - gDbService.lookup(principal, function handleEvent(aEvent) { - // This URI is not on any lists. - do_check_eq("", aEvent); - run_next_test(); - }); + gDbService.lookup(principal, "goog-downloadwhite-digest256", + function handleEvent(aEvent) { + // This URI is not on any lists. + do_check_eq("", aEvent); + run_next_test(); + }); }); add_test(function test_url_whitelisted() { @@ -137,8 +138,9 @@ add_test(function test_url_whitelisted() { // 93CA5F48E15E9861CD37C2D95DB43D23CC6E6DE5C3F8FA6E8BE66F97CC518907 let uri = createURI("http://whitelisted.com"); let principal = gSecMan.getNoAppCodebasePrincipal(uri); - gDbService.lookup(principal, function handleEvent(aEvent) { - do_check_eq("goog-downloadwhite-digest256", aEvent); - run_next_test(); - }); + gDbService.lookup(principal, "goog-downloadwhite-digest256", + function handleEvent(aEvent) { + do_check_eq("goog-downloadwhite-digest256", aEvent); + run_next_test(); + }); }); From 45a1e29229805b5846b81f7f88ef944564e42b14 Mon Sep 17 00:00:00 2001 From: "L. David Baron" Date: Sun, 23 Mar 2014 18:44:49 -0700 Subject: [PATCH 02/46] Bug 986406 - Don't skip entire reftest directories on Android. r=roc --- layout/reftests/border-image/reftest.list | 4 +-- layout/reftests/box-shadow/reftest.list | 2 +- .../reftests/css-disabled/select/reftest.list | 2 +- layout/reftests/first-letter/reftest.list | 2 +- layout/reftests/forms/button/reftest.list | 8 +++--- layout/reftests/forms/input/file/reftest.list | 12 ++++---- .../reftests/forms/input/number/reftest.list | 8 +++--- .../reftests/forms/input/range/reftest.list | 2 +- layout/reftests/forms/meter/reftest.list | 2 +- layout/reftests/native-theme/reftest.list | 4 ++- layout/reftests/reftest.list | 28 +++++++++---------- layout/reftests/scrolling/reftest.list | 2 +- layout/reftests/text-shadow/reftest.list | 4 +-- 13 files changed, 41 insertions(+), 39 deletions(-) diff --git a/layout/reftests/border-image/reftest.list b/layout/reftests/border-image/reftest.list index c5d0cfb27d07..a287bddac5f7 100644 --- a/layout/reftests/border-image/reftest.list +++ b/layout/reftests/border-image/reftest.list @@ -15,8 +15,8 @@ != different-h-v-2.html different-h-v-ref.html != different-h-v-1.html different-h-v-2.html == center-scaling-1.html center-scaling-1-ref.html -== center-scaling-2.html center-scaling-2-ref.html -== center-scaling-3.html center-scaling-3-ref.html +fails-if(Android) == center-scaling-2.html center-scaling-2-ref.html # very different scaling (blurriness) on some sides +fails-if(Android) == center-scaling-3.html center-scaling-3-ref.html # very different scaling (blurriness) on some sides == center-scaling-4t.html center-scaling-4t-ref.html == center-scaling-4r.html center-scaling-4r-ref.html == center-scaling-4b.html center-scaling-4b-ref.html diff --git a/layout/reftests/box-shadow/reftest.list b/layout/reftests/box-shadow/reftest.list index 2c8f6e915e49..e18a0f50c05e 100644 --- a/layout/reftests/box-shadow/reftest.list +++ b/layout/reftests/box-shadow/reftest.list @@ -2,7 +2,7 @@ != boxshadow-blur.html boxshadow-blur-notref.html != boxshadow-blur.html boxshadow-blur-notref2.html random == boxshadow-blur-2.html boxshadow-blur-2-ref.html # fixedpoint division in blur code makes this fail -random fails-if(Android) != boxshadow-blur-2.html boxshadow-blur-2-notref.html # fixedpoint division in blur code makes this fail +random != boxshadow-blur-2.html boxshadow-blur-2-notref.html # fixedpoint division in blur code makes this fail == boxshadow-multiple.html boxshadow-multiple-ref.html == boxshadow-spread.html boxshadow-spread-ref.html == tableboxshadow-basic.html tableboxshadow-basic-ref.html diff --git a/layout/reftests/css-disabled/select/reftest.list b/layout/reftests/css-disabled/select/reftest.list index a7a546c3339f..b825d6b2c5e2 100644 --- a/layout/reftests/css-disabled/select/reftest.list +++ b/layout/reftests/css-disabled/select/reftest.list @@ -1,7 +1,7 @@ == select-fieldset-1.html select-fieldset-ref.html fails-if(Android) == select-fieldset-2.html select-fieldset-ref-disabled.html fails-if(Android) == select-fieldset-3.html select-fieldset-ref-disabled.html -fails-if(Android) == select-fieldset-4.html select-fieldset-ref.html +== select-fieldset-4.html select-fieldset-ref.html == select-fieldset-legend-1.html select-fieldset-legend-ref-1.html fails-if(Android) == select-fieldset-legend-2.html select-fieldset-legend-ref-2.html fails-if(Android) == select-fieldset-legend-3.html select-fieldset-legend-ref-3.html diff --git a/layout/reftests/first-letter/reftest.list b/layout/reftests/first-letter/reftest.list index 30bd3a84ba4e..bcb407152d05 100644 --- a/layout/reftests/first-letter/reftest.list +++ b/layout/reftests/first-letter/reftest.list @@ -23,7 +23,7 @@ fails == quote-1e.html quote-1-ref.html # bug 509685 == quote-1e.html quote-1b.html == quote-1f.html quote-1-ref.html fails == dynamic-1.html dynamic-1-ref.html # bug 8253 -fails-if(Android) random-if(d2d) == dynamic-2.html dynamic-2-ref.html +random-if(d2d) == dynamic-2.html dynamic-2-ref.html == dynamic-3a.html dynamic-3-ref.html == dynamic-3b.html dynamic-3-ref.html == 23605-1.html 23605-1-ref.html diff --git a/layout/reftests/forms/button/reftest.list b/layout/reftests/forms/button/reftest.list index 4a85f05d0797..2ffdde8909a4 100644 --- a/layout/reftests/forms/button/reftest.list +++ b/layout/reftests/forms/button/reftest.list @@ -6,10 +6,10 @@ asserts(1) != first-letter-1.html first-letter-1-noref.html # The buttons in these tests have some fancy shading applied to their corners # on B2G, despite their "-moz-appearance: none; background: gray", so they # don't quite match the reference case's normal
. That's why they're fuzzy. -fuzzy-if(B2G,125,20) == percent-height-child-1.html percent-height-child-1-ref.html -fuzzy-if(B2G,125,80) == percent-height-child-2.html percent-height-child-2-ref.html -fuzzy-if(B2G,125,20) == percent-width-child-1.html percent-width-child-1-ref.html -fuzzy-if(B2G,125,80) == percent-width-child-2.html percent-width-child-2-ref.html +fuzzy-if(B2G||Android,125,20) == percent-height-child-1.html percent-height-child-1-ref.html +fuzzy-if(B2G||Android,125,80) == percent-height-child-2.html percent-height-child-2-ref.html +fuzzy-if(B2G||Android,125,20) == percent-width-child-1.html percent-width-child-1-ref.html +fuzzy-if(B2G||Android,125,80) == percent-width-child-2.html percent-width-child-2-ref.html == vertical-centering.html vertical-centering-ref.html diff --git a/layout/reftests/forms/input/file/reftest.list b/layout/reftests/forms/input/file/reftest.list index eb7653b5aaf9..61d9367c4a6c 100644 --- a/layout/reftests/forms/input/file/reftest.list +++ b/layout/reftests/forms/input/file/reftest.list @@ -1,8 +1,8 @@ # B2G failures: bug 855352. -fails-if(B2G) fuzzy-if(OSX==10.6,8,128) skip-if(B2G&&browserIsRemote) == simple.html simple-ref.xul # bug 974780 -fails-if(B2G) fuzzy-if(OSX==10.6,8,64) skip-if(B2G&&browserIsRemote) == rtl.html rtl-ref.xul # bug 974780 -fails-if(B2G) fuzzy-if(OSX==10.6,8,128) skip-if(B2G&&browserIsRemote) == size.html simple-ref.xul # bug 974780 -fails-if(B2G) fuzzy-if(OSX==10.6,8,64) skip-if(B2G&&browserIsRemote) == background.html background-ref.xul # bug 974780 -fails-if(B2G) skip-if(B2G&&browserIsRemote) == style.html style-ref.xul # bug 974780 +fails-if(B2G||Android) fuzzy-if(OSX==10.6,8,128) skip-if(B2G&&browserIsRemote) == simple.html simple-ref.xul # bug 974780 +fails-if(B2G||Android) fuzzy-if(OSX==10.6,8,64) skip-if(B2G&&browserIsRemote) == rtl.html rtl-ref.xul # bug 974780 +fails-if(B2G||Android) fuzzy-if(OSX==10.6,8,128) skip-if(B2G&&browserIsRemote) == size.html simple-ref.xul # bug 974780 +fails-if(B2G||Android) fuzzy-if(OSX==10.6,8,64) skip-if(B2G&&browserIsRemote) == background.html background-ref.xul # bug 974780 +fails-if(B2G||Android) skip-if(B2G&&browserIsRemote) == style.html style-ref.xul # bug 974780 != width-clip.html width-clip-ref.html -fails-if(B2G) == color-inherit.html color-inherit-ref.html +fails-if(B2G||Android) == color-inherit.html color-inherit-ref.html diff --git a/layout/reftests/forms/input/number/reftest.list b/layout/reftests/forms/input/number/reftest.list index a2918e770100..edfe074ad053 100644 --- a/layout/reftests/forms/input/number/reftest.list +++ b/layout/reftests/forms/input/number/reftest.list @@ -24,10 +24,10 @@ fuzzy-if(/^Windows\x20NT\x205\.1/.test(http.oscpu),64,4) fuzzy-if(cocoaWidget,63 == number-auto-width-1.html number-auto-width-1-ref.html # min-height/max-height tests: -skip-if(B2G) == number-min-height-1.html number-min-height-1-ref.html -skip-if(B2G) == number-min-height-2.html number-min-height-2-ref.html -skip-if(B2G) == number-max-height-1.html number-max-height-1-ref.html -skip-if(B2G) == number-max-height-2.html number-max-height-2-ref.html +skip-if(B2G||Android) == number-min-height-1.html number-min-height-1-ref.html +skip-if(B2G||Android) == number-min-height-2.html number-min-height-2-ref.html +skip-if(B2G||Android) == number-max-height-1.html number-max-height-1-ref.html +skip-if(B2G||Android) == number-max-height-2.html number-max-height-2-ref.html # focus # autofocus is disabled on B2G diff --git a/layout/reftests/forms/input/range/reftest.list b/layout/reftests/forms/input/range/reftest.list index 830db2254760..f7c74f31aaf4 100644 --- a/layout/reftests/forms/input/range/reftest.list +++ b/layout/reftests/forms/input/range/reftest.list @@ -27,7 +27,7 @@ fuzzy-if(B2G,1,1) == max-prop.html 100pct-common-ref.html == direction-unthemed-1.html direction-unthemed-1-ref.html # ::-moz-range-progress pseudo-element: -fails-if(B2G) == moz-range-progress-1.html moz-range-progress-1-ref.html +fails-if(B2G||Android) == moz-range-progress-1.html moz-range-progress-1-ref.html == moz-range-progress-2.html moz-range-progress-2-ref.html == moz-range-progress-3.html moz-range-progress-3-ref.html diff --git a/layout/reftests/forms/meter/reftest.list b/layout/reftests/forms/meter/reftest.list index fe30d2b86c26..17a4a8aa8194 100644 --- a/layout/reftests/forms/meter/reftest.list +++ b/layout/reftests/forms/meter/reftest.list @@ -1,4 +1,4 @@ -== values.html values-ref.html +fuzzy-if(Android,128,16) == values.html values-ref.html == values-rtl.html values-rtl-ref.html == margin-padding.html margin-padding-ref.html == margin-padding-rtl.html margin-padding-rtl-ref.html diff --git a/layout/reftests/native-theme/reftest.list b/layout/reftests/native-theme/reftest.list index 23dd3363bf7d..ce5cf67ee6da 100644 --- a/layout/reftests/native-theme/reftest.list +++ b/layout/reftests/native-theme/reftest.list @@ -76,7 +76,9 @@ skip-if(!winWidget) == scroll-thumb-minimum-size-notheme.html scroll-thumb-minim # These tests have been written to test the overflow of the window widget # (bug 568825) but we can't test it on Windows and Cocoa because they have # animated progress bars. +# Nothing shows up on Android, presumably because that appearance type is +# not implemented. skip-if(cocoaWidget) skip-if(winWidget) == progress-overflow.html progress-overflow-ref.html -skip-if(cocoaWidget) skip-if(winWidget) != progress-overflow-small.html progress-nobar.html +fails-if(Android) skip-if(cocoaWidget) skip-if(winWidget) != progress-overflow-small.html progress-nobar.html == 676387-1.xul 676387-1-ref.xul diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list index 825f1a878867..077a4b2687f6 100644 --- a/layout/reftests/reftest.list +++ b/layout/reftests/reftest.list @@ -25,7 +25,7 @@ skip-if(B2G) include backgrounds/reftest.list skip-if(B2G) include bidi/reftest.list # border-image -skip-if(Android||B2G) include border-image/reftest.list +skip-if(B2G) include border-image/reftest.list # border-radius/ skip-if(B2G) include border-radius/reftest.list @@ -40,7 +40,7 @@ skip-if(B2G) include box-ordinal/reftest.list skip-if(B2G) include box-properties/reftest.list # box-shadow/ -skip-if(Android||B2G) include box-shadow/reftest.list +skip-if(B2G) include box-shadow/reftest.list # bugs/ include bugs/reftest.list @@ -52,7 +52,7 @@ include canvas/reftest.list include css-animations/reftest.list # blending/ -skip-if(B2G||Android) include css-blending/reftest.list +skip-if(B2G) include css-blending/reftest.list # css calc() tests include css-calc/reftest.list @@ -64,10 +64,10 @@ skip-if(B2G) include css-charset/reftest.list skip-if(B2G) include css-default/reftest.list # css :disable tests -skip-if(Android||B2G) include css-disabled/reftest.list +skip-if(B2G) include css-disabled/reftest.list # css :enable tests -skip-if(Android||B2G) include css-enabled/reftest.list +skip-if(B2G) include css-enabled/reftest.list # css @import tests skip-if(B2G) include css-import/reftest.list @@ -91,10 +91,10 @@ skip-if(B2G) include css-required/reftest.list skip-if(B2G) include css-optional/reftest.list # css valid -skip-if(Android||B2G) include css-valid/reftest.list +skip-if(B2G) include css-valid/reftest.list # css invalid -skip-if(Android||B2G) include css-invalid/reftest.list +skip-if(B2G) include css-invalid/reftest.list # css-submit-invalid skip-if(B2G) include css-submit-invalid/reftest.list @@ -109,10 +109,10 @@ include css-selectors/reftest.list skip-if(B2G) include css-transitions/reftest.list # css :-moz-ui-invalid -skip-if(Android||B2G) include css-ui-invalid/reftest.list +skip-if(B2G) include css-ui-invalid/reftest.list # css :-moz-ui-valid -skip-if(Android||B2G) include css-ui-valid/reftest.list +skip-if(B2G) include css-ui-valid/reftest.list # css values and units skip-if(B2G) include css-valuesandunits/reftest.list @@ -145,7 +145,7 @@ skip-if(B2G) include dom/reftest.list skip-if(B2G) include generated-content/reftest.list # first-letter/ -skip-if(Android||B2G) include first-letter/reftest.list +skip-if(B2G) include first-letter/reftest.list # first-line/ skip-if(B2G) include first-line/reftest.list @@ -169,7 +169,7 @@ skip-if(B2G&&browserIsRemote) include font-inflation/reftest.list skip-if(B2G) include font-matching/reftest.list # forms -skip-if(Android) include forms/reftest.list +include forms/reftest.list # gfx include ../../gfx/tests/reftest/reftest.list @@ -217,7 +217,7 @@ skip-if(B2G) include margin-collapsing/reftest.list skip-if(B2G) include marquee/reftest.list # native-theme/ -skip-if(Android||B2G) include native-theme/reftest.list +skip-if(B2G) include native-theme/reftest.list # netwerk/ skip-if(B2G) include ../../netwerk/test/reftest/reftest.list @@ -256,7 +256,7 @@ skip-if(B2G) include pagination/reftest.list skip-if(B2G) include scoped-style/reftest.list # scrolling -skip-if(Android&&AndroidVersion>=15) include scrolling/reftest.list +include scrolling/reftest.list # selection include selection/reftest.list @@ -297,7 +297,7 @@ skip-if(B2G) include text-decoration/reftest.list skip-if(B2G) include text-indent/reftest.list # text-shadow/ -skip-if(Android||B2G) include text-shadow/reftest.list +skip-if(B2G) include text-shadow/reftest.list # text-svgglyphs/ include text-svgglyphs/reftest.list diff --git a/layout/reftests/scrolling/reftest.list b/layout/reftests/scrolling/reftest.list index c80f653c4ca2..d474ed9e66e0 100644 --- a/layout/reftests/scrolling/reftest.list +++ b/layout/reftests/scrolling/reftest.list @@ -12,7 +12,7 @@ skip-if(B2G&&browserIsRemote) HTTP == simple-1.html simple-1.html?ref skip-if(B2G) HTTP == subpixel-1.html#d subpixel-1-ref.html#d fuzzy-if(Android,4,120) HTTP == text-1.html text-1.html?ref fuzzy-if(Android,4,120) HTTP == text-2.html?up text-2.html?ref -skip-if(B2G) fuzzy-if(Android&&AndroidVersion<15,251,722) fails-if(Android&&AndroidVersion>=15) HTTP == transformed-1.html transformed-1.html?ref #Bug 900607 +skip-if(B2G) fuzzy-if(Android&&AndroidVersion<15,251,722) HTTP == transformed-1.html transformed-1.html?ref HTTP == transformed-1.html?up transformed-1.html?ref fuzzy-if(Android,5,20000) == uncovering-1.html uncovering-1-ref.html fuzzy-if(Android,5,20000) == uncovering-2.html uncovering-2-ref.html diff --git a/layout/reftests/text-shadow/reftest.list b/layout/reftests/text-shadow/reftest.list index 94e924a3707e..4256191a260c 100644 --- a/layout/reftests/text-shadow/reftest.list +++ b/layout/reftests/text-shadow/reftest.list @@ -24,9 +24,9 @@ HTTP(..) == blur-opacity.html blur-opacity-ref.html == overflow-not-scrollable-2.html overflow-not-scrollable-2-ref.html needs-focus != text-shadow-selected-1.html text-shadow-selected-1-notref.html -needs-focus == text-shadow-selected-1.html text-shadow-selected-1-ref.html +fails-if(Android) needs-focus == text-shadow-selected-1.html text-shadow-selected-1-ref.html # different foreground color on Android needs-focus != text-shadow-selected-2.html text-shadow-selected-2-notref.html -needs-focus == text-shadow-selected-2.html text-shadow-selected-2-ref.html +fails-if(Android) needs-focus == text-shadow-selected-2.html text-shadow-selected-2-ref.html # different foreground color on Android # bug 692744 == text-shadow-on-space-1.html text-shadow-on-space-1-ref.html From ba666ea10efd92d9095d1073c8b95d840fdf90c8 Mon Sep 17 00:00:00 2001 From: "L. David Baron" Date: Sun, 23 Mar 2014 18:44:50 -0700 Subject: [PATCH 03/46] Bug 986409 - Skip fewer entire reftest directories on B2G. r=roc --- .../content/reftests/autofocus/reftest.list | 20 +- .../elements/global-attributes/reftest.list | 4 +- editor/reftests/reftest.list | 4 +- layout/reftests/bidi/reftest.list | 2 +- layout/reftests/border-image/reftest.list | 4 +- layout/reftests/box-shadow/reftest.list | 8 +- layout/reftests/counters/reftest.list | 2 +- .../reftests/css-disabled/button/reftest.list | 8 +- .../reftests/css-disabled/select/reftest.list | 8 +- .../reftests/css-enabled/button/reftest.list | 8 +- .../reftests/css-enabled/select/reftest.list | 8 +- .../reftests/css-ui-valid/input/reftest.list | 4 +- .../reftests/css-ui-valid/select/reftest.list | 4 +- layout/reftests/css-valid/input/reftest.list | 4 +- layout/reftests/css-valid/select/reftest.list | 4 +- .../reftests/css-valid/textarea/reftest.list | 2 +- layout/reftests/first-letter/reftest.list | 2 +- layout/reftests/mathml/reftest.list | 22 +-- layout/reftests/pagination/reftest.list | 2 +- .../percent-overflow-sizing/reftest.list | 2 +- layout/reftests/printing/reftest.list | 16 +- layout/reftests/reftest.list | 175 +++++++++--------- layout/reftests/table-width/reftest.list | 6 +- layout/reftests/text-shadow/reftest.list | 4 +- .../submitted/css21/pagination/reftest.list | 4 +- .../w3c-css/submitted/ui3/reftest.list | 2 +- layout/reftests/xul/reftest.list | 2 +- 27 files changed, 166 insertions(+), 165 deletions(-) diff --git a/content/html/content/reftests/autofocus/reftest.list b/content/html/content/reftests/autofocus/reftest.list index 270abb7f6c1c..c8e7ad5132bb 100644 --- a/content/html/content/reftests/autofocus/reftest.list +++ b/content/html/content/reftests/autofocus/reftest.list @@ -1,13 +1,13 @@ default-preferences pref(dom.forms.number,true) -needs-focus == input-load.html input-ref.html -needs-focus == input-create.html input-ref.html -needs-focus == input-number.html input-number-ref.html -needs-focus == button-load.html button-ref.html -needs-focus == button-create.html button-ref.html -needs-focus == textarea-load.html textarea-ref.html -needs-focus == textarea-create.html textarea-ref.html -needs-focus == select-load.html select-ref.html -needs-focus == select-create.html select-ref.html +skip-if(B2G) needs-focus == input-load.html input-ref.html # B2G timed out waiting for reftest-wait to be removed +skip-if(B2G) needs-focus == input-create.html input-ref.html # B2G timed out waiting for reftest-wait to be removed +skip-if(B2G) needs-focus == input-number.html input-number-ref.html # B2G timed out waiting for reftest-wait to be removed +skip-if(B2G) needs-focus == button-load.html button-ref.html # B2G timed out waiting for reftest-wait to be removed +skip-if(B2G) needs-focus == button-create.html button-ref.html # B2G timed out waiting for reftest-wait to be removed +skip-if(B2G) needs-focus == textarea-load.html textarea-ref.html # B2G timed out waiting for reftest-wait to be removed +skip-if(B2G) needs-focus == textarea-create.html textarea-ref.html # B2G timed out waiting for reftest-wait to be removed +skip-if(B2G) needs-focus == select-load.html select-ref.html # B2G timed out waiting for reftest-wait to be removed +skip-if(B2G) needs-focus == select-create.html select-ref.html # B2G timed out waiting for reftest-wait to be removed needs-focus == autofocus-after-load.html autofocus-after-load-ref.html -needs-focus == autofocus-leaves-iframe.html autofocus-leaves-iframe-ref.html +fails-if(B2G) needs-focus == autofocus-leaves-iframe.html autofocus-leaves-iframe-ref.html # B2G focus difference between test and reference skip-if(B2G) needs-focus == autofocus-after-body-focus.html autofocus-after-body-focus-ref.html # bug 773482 diff --git a/dom/imptests/html/html/dom/elements/global-attributes/reftest.list b/dom/imptests/html/html/dom/elements/global-attributes/reftest.list index c0b8bda1c685..59e73db33c12 100644 --- a/dom/imptests/html/html/dom/elements/global-attributes/reftest.list +++ b/dom/imptests/html/html/dom/elements/global-attributes/reftest.list @@ -46,10 +46,10 @@ == dir_auto-pre-N-EN.html dir_auto-pre-N-EN-ref.html == dir_auto-R.html dir_auto-R-ref.html == dir_auto-textarea-mixed.html dir_auto-textarea-mixed-ref.html -== dir_auto-textarea-N-between-Rs.html dir_auto-textarea-N-between-Rs-ref.html +fails-if(B2G) == dir_auto-textarea-N-between-Rs.html dir_auto-textarea-N-between-Rs-ref.html # B2G scrollbar on opposite side == dir_auto-textarea-N-EN.html dir_auto-textarea-N-EN-ref.html == dir_auto-textarea-script-mixed.html dir_auto-textarea-script-mixed-ref.html -== dir_auto-textarea-script-N-between-Rs.html dir_auto-textarea-script-N-between-Rs-ref.html +fails-if(B2G) == dir_auto-textarea-script-N-between-Rs.html dir_auto-textarea-script-N-between-Rs-ref.html # B2G scrollbar on reference only == dir_auto-textarea-script-N-EN.html dir_auto-textarea-script-N-EN-ref.html == lang-xyzzy.html lang-xyzzy-ref.html == lang-xmllang-01.html lang-xmllang-01-ref.html diff --git a/editor/reftests/reftest.list b/editor/reftests/reftest.list index 7fc2c7e01a98..c3d644ca0293 100644 --- a/editor/reftests/reftest.list +++ b/editor/reftests/reftest.list @@ -61,7 +61,7 @@ needs-focus == caret_on_focus.html caret_on_focus-ref.html needs-focus != caret_on_textarea_lastline.html caret_on_textarea_lastline-ref.html needs-focus == input-text-onfocus-reframe.html input-text-onfocus-reframe-ref.html needs-focus == input-text-notheme-onfocus-reframe.html input-text-notheme-onfocus-reframe-ref.html -needs-focus == caret_after_reframe.html caret_after_reframe-ref.html +skip-if(B2G) needs-focus == caret_after_reframe.html caret_after_reframe-ref.html # B2G timed out waiting for reftest-wait to be removed == nobogusnode-1.html nobogusnode-ref.html == nobogusnode-2.html nobogusnode-ref.html == spellcheck-hyphen-valid.html spellcheck-hyphen-valid-ref.html @@ -110,7 +110,7 @@ needs-focus == 824080-7.html 824080-7-ref.html needs-focus != 824080-6.html 824080-7.html # Bug 674927: copy spellcheck-textarea tests to contenteditable == spellcheck-contenteditable-attr.html spellcheck-contenteditable-nofocus-ref.html -fails-if(Android) needs-focus != spellcheck-contenteditable-attr.html spellcheck-contenteditable-ref.html +fails-if(Android||B2G) needs-focus != spellcheck-contenteditable-attr.html spellcheck-contenteditable-ref.html # B2G no spellcheck underline needs-focus == spellcheck-contenteditable-focused.html spellcheck-contenteditable-ref.html needs-focus == spellcheck-contenteditable-focused-reframe.html spellcheck-contenteditable-ref.html == spellcheck-contenteditable-nofocus.html spellcheck-contenteditable-disabled-ref.html diff --git a/layout/reftests/bidi/reftest.list b/layout/reftests/bidi/reftest.list index fbea5ec677a1..1286dd469326 100644 --- a/layout/reftests/bidi/reftest.list +++ b/layout/reftests/bidi/reftest.list @@ -140,5 +140,5 @@ skip-if(B2G) == 726420-1.html 726420-1-ref.html == 779003-1-dynamic.html 779003-1-ref.html == 847242-1.html 847242-1-ref.html == 869833-1.xul 869833-1-ref.xul -== 922530-1.html 922530-1-ref.html +fails-if(B2G) == 922530-1.html 922530-1-ref.html # B2G kerning == 922550-1.html 922550-1-ref.html diff --git a/layout/reftests/border-image/reftest.list b/layout/reftests/border-image/reftest.list index a287bddac5f7..10289f925473 100644 --- a/layout/reftests/border-image/reftest.list +++ b/layout/reftests/border-image/reftest.list @@ -15,8 +15,8 @@ != different-h-v-2.html different-h-v-ref.html != different-h-v-1.html different-h-v-2.html == center-scaling-1.html center-scaling-1-ref.html -fails-if(Android) == center-scaling-2.html center-scaling-2-ref.html # very different scaling (blurriness) on some sides -fails-if(Android) == center-scaling-3.html center-scaling-3-ref.html # very different scaling (blurriness) on some sides +fails-if(Android||B2G) == center-scaling-2.html center-scaling-2-ref.html # Android/B2G: very different scaling (blurriness) on some sides +fails-if(Android||B2G) == center-scaling-3.html center-scaling-3-ref.html # Android/B2G: very different scaling (blurriness) on some sides == center-scaling-4t.html center-scaling-4t-ref.html == center-scaling-4r.html center-scaling-4r-ref.html == center-scaling-4b.html center-scaling-4b-ref.html diff --git a/layout/reftests/box-shadow/reftest.list b/layout/reftests/box-shadow/reftest.list index e18a0f50c05e..680ab08f777e 100644 --- a/layout/reftests/box-shadow/reftest.list +++ b/layout/reftests/box-shadow/reftest.list @@ -9,8 +9,8 @@ random != boxshadow-blur-2.html boxshadow-blur-2-notref.html # fixedpoint divisi == tableboxshadow-trshadow.html tableboxshadow-trshadow-ref.html == tableboxshadow-tdshadow.html tableboxshadow-tdshadow-ref.html == boxshadow-rounding.html boxshadow-rounding-ref.html -fails-if(Android) == boxshadow-button.html boxshadow-button-ref.html -fails-if(Android) == boxshadow-fileupload.html boxshadow-fileupload-ref.html +fails-if(Android||B2G) == boxshadow-button.html boxshadow-button-ref.html +fails-if(Android||B2G) == boxshadow-fileupload.html boxshadow-fileupload-ref.html == boxshadow-inner-basic.html boxshadow-inner-basic-ref.svg random-if(layersGPUAccelerated) == boxshadow-mixed.html boxshadow-mixed-ref.html random-if(d2d) == boxshadow-rounded-spread.html boxshadow-rounded-spread-ref.html @@ -25,6 +25,6 @@ random-if(d2d) == boxshadow-threecorners.html boxshadow-threecorners-ref.html == overflow-not-scrollable-1.html overflow-not-scrollable-1-ref.html == overflow-not-scrollable-1.html overflow-not-scrollable-1-ref2.html == overflow-not-scrollable-2.html overflow-not-scrollable-2-ref.html -fails-if(Android) == 611574-1.html 611574-1-ref.html -fails-if(Android) == 611574-2.html 611574-2-ref.html +fails-if(Android||B2G) == 611574-1.html 611574-1-ref.html +fails-if(Android||B2G) == 611574-2.html 611574-2-ref.html fuzzy-if(winWidget,5,30) == fieldset.html fieldset-ref.html # minor anti-aliasing problem on Windows diff --git a/layout/reftests/counters/reftest.list b/layout/reftests/counters/reftest.list index 6eed3fd6bde5..c0d3cbebbc92 100644 --- a/layout/reftests/counters/reftest.list +++ b/layout/reftests/counters/reftest.list @@ -68,7 +68,7 @@ == counter-ua-limits-list-00.html counter-ua-limits-list-00-ref.html == counter-ua-limits-list-01.html counter-ua-limits-list-01-ref.html == multiple-thai-counters.html multiple-thai-counters-ref.html -== counter-suffix.html counter-suffix-ref.html +fails-if(B2G) == counter-suffix.html counter-suffix-ref.html # B2G kerning == counter-cjk-decimal.html counter-cjk-decimal-ref.html == counter-japanese-informal.html counter-japanese-informal-ref.html == counter-japanese-formal.html counter-japanese-formal-ref.html diff --git a/layout/reftests/css-disabled/button/reftest.list b/layout/reftests/css-disabled/button/reftest.list index c0990bb65f8d..b797b63e4011 100644 --- a/layout/reftests/css-disabled/button/reftest.list +++ b/layout/reftests/css-disabled/button/reftest.list @@ -1,9 +1,9 @@ == button-fieldset-1.html button-fieldset-ref.html -fails-if(Android) == button-fieldset-2.html button-fieldset-ref.html -fails-if(Android) == button-fieldset-3.html button-fieldset-ref.html +fails-if(Android||B2G) == button-fieldset-2.html button-fieldset-ref.html +fails-if(Android||B2G) == button-fieldset-3.html button-fieldset-ref.html == button-fieldset-4.html button-fieldset-ref.html == button-fieldset-legend-1.html button-fieldset-legend-ref-1.html -fails-if(Android) == button-fieldset-legend-2.html button-fieldset-legend-ref-2.html -fails-if(Android) == button-fieldset-legend-3.html button-fieldset-legend-ref-3.html +fails-if(Android||B2G) == button-fieldset-legend-2.html button-fieldset-legend-ref-2.html +fails-if(Android||B2G) == button-fieldset-legend-3.html button-fieldset-legend-ref-3.html == button-fieldset-legend-4.html button-fieldset-legend-ref-4.html == button-fieldset-legend-5.html button-fieldset-legend-ref-5.html diff --git a/layout/reftests/css-disabled/select/reftest.list b/layout/reftests/css-disabled/select/reftest.list index b825d6b2c5e2..42fcd36df396 100644 --- a/layout/reftests/css-disabled/select/reftest.list +++ b/layout/reftests/css-disabled/select/reftest.list @@ -1,9 +1,9 @@ == select-fieldset-1.html select-fieldset-ref.html -fails-if(Android) == select-fieldset-2.html select-fieldset-ref-disabled.html -fails-if(Android) == select-fieldset-3.html select-fieldset-ref-disabled.html +fails-if(Android||B2G) == select-fieldset-2.html select-fieldset-ref-disabled.html +fails-if(Android||B2G) == select-fieldset-3.html select-fieldset-ref-disabled.html == select-fieldset-4.html select-fieldset-ref.html == select-fieldset-legend-1.html select-fieldset-legend-ref-1.html -fails-if(Android) == select-fieldset-legend-2.html select-fieldset-legend-ref-2.html -fails-if(Android) == select-fieldset-legend-3.html select-fieldset-legend-ref-3.html +fails-if(Android||B2G) == select-fieldset-legend-2.html select-fieldset-legend-ref-2.html +fails-if(Android||B2G) == select-fieldset-legend-3.html select-fieldset-legend-ref-3.html == select-fieldset-legend-4.html select-fieldset-legend-ref-4.html == select-fieldset-legend-5.html select-fieldset-legend-ref-5.html diff --git a/layout/reftests/css-enabled/button/reftest.list b/layout/reftests/css-enabled/button/reftest.list index c0990bb65f8d..b797b63e4011 100644 --- a/layout/reftests/css-enabled/button/reftest.list +++ b/layout/reftests/css-enabled/button/reftest.list @@ -1,9 +1,9 @@ == button-fieldset-1.html button-fieldset-ref.html -fails-if(Android) == button-fieldset-2.html button-fieldset-ref.html -fails-if(Android) == button-fieldset-3.html button-fieldset-ref.html +fails-if(Android||B2G) == button-fieldset-2.html button-fieldset-ref.html +fails-if(Android||B2G) == button-fieldset-3.html button-fieldset-ref.html == button-fieldset-4.html button-fieldset-ref.html == button-fieldset-legend-1.html button-fieldset-legend-ref-1.html -fails-if(Android) == button-fieldset-legend-2.html button-fieldset-legend-ref-2.html -fails-if(Android) == button-fieldset-legend-3.html button-fieldset-legend-ref-3.html +fails-if(Android||B2G) == button-fieldset-legend-2.html button-fieldset-legend-ref-2.html +fails-if(Android||B2G) == button-fieldset-legend-3.html button-fieldset-legend-ref-3.html == button-fieldset-legend-4.html button-fieldset-legend-ref-4.html == button-fieldset-legend-5.html button-fieldset-legend-ref-5.html diff --git a/layout/reftests/css-enabled/select/reftest.list b/layout/reftests/css-enabled/select/reftest.list index b825d6b2c5e2..42fcd36df396 100644 --- a/layout/reftests/css-enabled/select/reftest.list +++ b/layout/reftests/css-enabled/select/reftest.list @@ -1,9 +1,9 @@ == select-fieldset-1.html select-fieldset-ref.html -fails-if(Android) == select-fieldset-2.html select-fieldset-ref-disabled.html -fails-if(Android) == select-fieldset-3.html select-fieldset-ref-disabled.html +fails-if(Android||B2G) == select-fieldset-2.html select-fieldset-ref-disabled.html +fails-if(Android||B2G) == select-fieldset-3.html select-fieldset-ref-disabled.html == select-fieldset-4.html select-fieldset-ref.html == select-fieldset-legend-1.html select-fieldset-legend-ref-1.html -fails-if(Android) == select-fieldset-legend-2.html select-fieldset-legend-ref-2.html -fails-if(Android) == select-fieldset-legend-3.html select-fieldset-legend-ref-3.html +fails-if(Android||B2G) == select-fieldset-legend-2.html select-fieldset-legend-ref-2.html +fails-if(Android||B2G) == select-fieldset-legend-3.html select-fieldset-legend-ref-3.html == select-fieldset-legend-4.html select-fieldset-legend-ref-4.html == select-fieldset-legend-5.html select-fieldset-legend-ref-5.html diff --git a/layout/reftests/css-ui-valid/input/reftest.list b/layout/reftests/css-ui-valid/input/reftest.list index b87a73067f69..4ee70ff06233 100644 --- a/layout/reftests/css-ui-valid/input/reftest.list +++ b/layout/reftests/css-ui-valid/input/reftest.list @@ -1,7 +1,7 @@ == input-valid.html input-ref.html fuzzy(11,4) == input-customerror.html input-ref.html -fails-if(Android) == input-disabled.html input-ref.html -fails-if(Android) == input-dyn-disabled.html input-ref.html +fails-if(Android||B2G) == input-disabled.html input-ref.html +fails-if(Android||B2G) == input-dyn-disabled.html input-ref.html == input-dyn-not-disabled.html input-ref.html == input-dyn-not-disabled-changed.html input-ref.html == input-readonly.html input-ref.html diff --git a/layout/reftests/css-ui-valid/select/reftest.list b/layout/reftests/css-ui-valid/select/reftest.list index 094b161fc09a..67f3d582856a 100644 --- a/layout/reftests/css-ui-valid/select/reftest.list +++ b/layout/reftests/css-ui-valid/select/reftest.list @@ -12,7 +12,7 @@ needs-focus == select-required-valid-changed-2.html select-required-ref.html needs-focus == select-required-multiple-invalid.html select-required-multiple-ref.html needs-focus == select-required-multiple-valid.html select-required-multiple-ref.html fuzzy(64,4) needs-focus == select-required-multiple-valid-changed.html select-required-multiple-ref.html -fails-if(Android) needs-focus == select-disabled-fieldset-1.html select-fieldset-ref.html -fails-if(Android) needs-focus == select-disabled-fieldset-2.html select-fieldset-ref.html +fails-if(Android||B2G) needs-focus == select-disabled-fieldset-1.html select-fieldset-ref.html +fails-if(Android||B2G) needs-focus == select-disabled-fieldset-2.html select-fieldset-ref.html needs-focus == select-fieldset-legend.html select-fieldset-legend-ref.html needs-focus == select-novalidate.html select-required-ref.html diff --git a/layout/reftests/css-valid/input/reftest.list b/layout/reftests/css-valid/input/reftest.list index 704f5ad76cb6..93676a00d542 100644 --- a/layout/reftests/css-valid/input/reftest.list +++ b/layout/reftests/css-valid/input/reftest.list @@ -1,7 +1,7 @@ == input-valid.html input-ref.html fuzzy(64,4) == input-customerror.html input-ref.html -fails-if(Android) == input-disabled.html input-ref.html -fails-if(Android) == input-dyn-disabled.html input-ref.html +fails-if(Android||B2G) == input-disabled.html input-ref.html +fails-if(Android||B2G) == input-dyn-disabled.html input-ref.html == input-dyn-not-disabled.html input-ref.html == input-readonly.html input-ref.html == input-dyn-readonly.html input-ref.html diff --git a/layout/reftests/css-valid/select/reftest.list b/layout/reftests/css-valid/select/reftest.list index d380afbda290..5264cb631aa3 100644 --- a/layout/reftests/css-valid/select/reftest.list +++ b/layout/reftests/css-valid/select/reftest.list @@ -7,6 +7,6 @@ needs-focus == select-required-invalid.html select-required-ref.html needs-focus == select-required-valid.html select-required-ref.html needs-focus == select-required-multiple-invalid.html select-required-multiple-ref.html needs-focus == select-required-multiple-valid.html select-required-multiple-ref.html -fails-if(Android) needs-focus == select-disabled-fieldset-1.html select-fieldset-ref.html -fails-if(Android) needs-focus == select-disabled-fieldset-2.html select-fieldset-ref.html +fails-if(Android||B2G) needs-focus == select-disabled-fieldset-1.html select-fieldset-ref.html +fails-if(Android||B2G) needs-focus == select-disabled-fieldset-2.html select-fieldset-ref.html needs-focus == select-fieldset-legend.html select-fieldset-legend-ref.html diff --git a/layout/reftests/css-valid/textarea/reftest.list b/layout/reftests/css-valid/textarea/reftest.list index c3fd5ee19ca0..23acf4639642 100644 --- a/layout/reftests/css-valid/textarea/reftest.list +++ b/layout/reftests/css-valid/textarea/reftest.list @@ -1,6 +1,6 @@ == textarea-valid.html textarea-ref.html fuzzy(11,4) == textarea-customerror.html textarea-ref.html -fails-if(Android) == textarea-disabled.html textarea-ref.html +fails-if(Android||B2G) == textarea-disabled.html textarea-ref.html fuzzy(11,4) fails-if(Android||B2G) == textarea-dyn-disabled.html textarea-ref.html fuzzy(11,4) == textarea-dyn-not-disabled.html textarea-ref.html == textarea-readonly.html textarea-ref.html diff --git a/layout/reftests/first-letter/reftest.list b/layout/reftests/first-letter/reftest.list index bcb407152d05..b510dfd736fe 100644 --- a/layout/reftests/first-letter/reftest.list +++ b/layout/reftests/first-letter/reftest.list @@ -59,7 +59,7 @@ fails-if(!cocoaWidget) == 329069-5.html 329069-5-ref.html # bug 603710 == 469227-1.html 469227-1-ref.html == 484400-1.html 484400-1-ref.html == 594303-1.html 594303-1-ref.html -fails-if(!gtk2Widget&&!Android) == 617869-1.html 617869-1-ref.html +fails-if(winWidget||cocoaWidget) == 617869-1.html 617869-1-ref.html == 723509-1.html 723509-1-ref.html == 922550-1.html 922550-1-ref.html == 958249.html 958249-ref.html diff --git a/layout/reftests/mathml/reftest.list b/layout/reftests/mathml/reftest.list index d381c1f0aaef..89f6567609e5 100644 --- a/layout/reftests/mathml/reftest.list +++ b/layout/reftests/mathml/reftest.list @@ -98,9 +98,9 @@ skip-if(B2G) == quotes-1.xhtml quotes-1-ref.xhtml == mpadded-5.html mpadded-5-ref.html == mpadded-1-2.html mpadded-1-2-ref.html == mpadded-6.html mpadded-6-ref.html -== mpadded-7.html mpadded-7-ref.html -== mpadded-8.html mpadded-8-ref.html -== mpadded-9.html mpadded-9-ref.html +fails-if(B2G) == mpadded-7.html mpadded-7-ref.html # B2G: slight character width variation +fails-if(B2G) == mpadded-8.html mpadded-8-ref.html # B2G: slight character width variation +fails-if(B2G) == mpadded-9.html mpadded-9-ref.html # B2G: slight character width variation == math-display.html math-display-ref.html == scriptlevel-1.html scriptlevel-1-ref.html == scriptlevel-movablelimits-1.html scriptlevel-movablelimits-1-ref.html @@ -152,7 +152,7 @@ fails == whitespace-trim-4.html whitespace-trim-4-ref.html # Bug 787215 == operator-1.xhtml operator-1-ref.xhtml == scriptshift-1.xhtml scriptshift-1-ref.xhtml == number-size-1.xhtml number-size-1-ref.xhtml -== multiscripts-1.html multiscripts-1-ref.html +fails-if(B2G) == multiscripts-1.html multiscripts-1-ref.html # B2G - slight height variation from font metrics == mathml-mmultiscript-base.html mathml-mmultiscript-base-ref.html == mathml-mmultiscript-mprescript.html mathml-mmultiscript-mprescript-ref.html != menclose-1a.html menclose-1-ref.html @@ -171,21 +171,21 @@ fails == whitespace-trim-4.html whitespace-trim-4-ref.html # Bug 787215 != menclose-1n.html menclose-1-ref.html != menclose-1o.html menclose-1-ref.html != menclose-1p.html menclose-1-ref.html -== menclose-2-actuarial.html menclose-2-actuarial-ref.html +fails-if(B2G) == menclose-2-actuarial.html menclose-2-actuarial-ref.html # B2G slight thickness variation == menclose-2-bottom.html menclose-2-bottom-ref.html -== menclose-2-box.html menclose-2-box-ref.html +fails-if(B2G) == menclose-2-box.html menclose-2-box-ref.html # B2G slight thickness variation == menclose-2-circle.html menclose-2-circle-ref.html == menclose-2-downdiagonalstrike.html menclose-2-downdiagonalstrike-ref.html == menclose-2-horizontalstrike.html menclose-2-horizontalstrike-ref.html -== menclose-2-left.html menclose-2-left-ref.html +fails-if(B2G) == menclose-2-left.html menclose-2-left-ref.html # B2G slight thickness variation == menclose-2-longdiv.html menclose-2-longdiv-ref.html == menclose-2-right.html menclose-2-right-ref.html -== menclose-2-roundedbox.html menclose-2-roundedbox-ref.html -== menclose-2-top.html menclose-2-top-ref.html -== menclose-2-updiagonalarrow.html menclose-2-updiagonalarrow-ref.html +fails-if(B2G) == menclose-2-roundedbox.html menclose-2-roundedbox-ref.html # B2G slight thickness variation +fails-if(B2G) == menclose-2-top.html menclose-2-top-ref.html # B2G slight thickness variation +fails-if(B2G) == menclose-2-updiagonalarrow.html menclose-2-updiagonalarrow-ref.html # B2G slight thickness variation == menclose-2-updiagonalstrike.html menclose-2-updiagonalstrike-ref.html == menclose-2-verticalstrike.html menclose-2-verticalstrike-ref.html -== menclose-2-roundedbox.html menclose-2-roundedbox-ref.html +fails-if(B2G) == menclose-2-roundedbox.html menclose-2-roundedbox-ref.html # B2G slight thickness variation == menclose-3-box.html menclose-3-box-ref.html == menclose-3-madruwb.html menclose-3-madruwb-ref.html fails random-if(winWidget) == menclose-3-radical.html menclose-3-radical-ref.html # Bug 973917 diff --git a/layout/reftests/pagination/reftest.list b/layout/reftests/pagination/reftest.list index 2d94e7d66fd6..0bccdcdd5767 100644 --- a/layout/reftests/pagination/reftest.list +++ b/layout/reftests/pagination/reftest.list @@ -60,4 +60,4 @@ skip-if(B2G) == table-caption-splitaftercaption-7.html table-caption-splitafterc # == table-caption-splitaftercaption-10.html blank.html # bug 672654 # == table-caption-splitaftercaption-11.html blank.html # bug 672654 == column-balancing-break-inside-avoid-2.html column-balancing-break-inside-avoid-2-ref.html -== combobox-page-break-inside.html combobox-page-break-inside-ref.html +fails-if(B2G) == combobox-page-break-inside.html combobox-page-break-inside-ref.html # reftest-print doesn't work on B2G diff --git a/layout/reftests/percent-overflow-sizing/reftest.list b/layout/reftests/percent-overflow-sizing/reftest.list index e2eb72688dae..72ea1f912800 100644 --- a/layout/reftests/percent-overflow-sizing/reftest.list +++ b/layout/reftests/percent-overflow-sizing/reftest.list @@ -11,7 +11,7 @@ skip-if(B2G) fails-if(Android&&browserIsRemote) == hScrollAbsHeightQuirks.html g skip-if(B2G) fails-if(Android&&browserIsRemote) == hScrollSimpleHeightD.html greenboxhbar.html # bug 650591, 732565 # bug 773482 skip-if(B2G) fails-if(Android&&browserIsRemote) == hScrollSimpleHeightQuirks-1D.html greenboxhbar.html # bug 650591, 732565 # bug 773482 skip-if(B2G) fails-if(Android&&browserIsRemote) == hScrollSimpleHeightQuirks-2D.html greenboxhbar.html # bug 650591, 732565 # bug 773482 -fails-if(Android&&browserIsRemote) == hScrollSimpleHeightQuirks-3D.html greenboxhbar.html # bug 650591, 732565 +fails-if(B2G) fails-if(Android&&browserIsRemote) == hScrollSimpleHeightQuirks-3D.html greenboxhbar.html # bug 650591, 732565 skip-if(B2G) fails-if(Android&&browserIsRemote) == hScrollAbsHeightD.html greenboxhbar.html # bug 650591, 732565 # bug 773482 skip-if(B2G) fails-if(Android&&browserIsRemote) == hScrollAbsHeightQuirksD.html greenboxhbar.html # bug 650591, 732565 # bug 773482 == simpleMinHeight100D.html greenbox.html diff --git a/layout/reftests/printing/reftest.list b/layout/reftests/printing/reftest.list index b8f1fbbfc9b1..c535280589ec 100644 --- a/layout/reftests/printing/reftest.list +++ b/layout/reftests/printing/reftest.list @@ -5,13 +5,13 @@ == 272830-1.html 272830-1-ref.html == 318022-1.html 318022-1-ref.html == 403669-1.html 403669-1-ref.html -== 381497-n.html 381497-f.html +fails-if(B2G) == 381497-n.html 381497-f.html # reftest-print doesn't work on B2G (scrollbar difference only) == test-async-print.html 272830-1-ref.html -== 129941-1a.html 129941-1-ref.html +fails-if(B2G) == 129941-1a.html 129941-1-ref.html # reftest-print doesn't work on B2G == 129941-1b.html 129941-1-ref.html == 609227-1.html 609227-1-ref.html -== 609227-2a.html 609227-2-ref.html -== 609227-2b.html 609227-2-ref.html +fails-if(B2G) == 609227-2a.html 609227-2-ref.html # reftest-print doesn't work on B2G +fails-if(B2G) == 609227-2b.html 609227-2-ref.html # reftest-print doesn't work on B2G == 577450-1.html 577450-1-ref.html == 626395-1a.html 626395-1-ref.html == 626395-1b.html 626395-1-ref.html @@ -20,15 +20,15 @@ == 626395-2c.html 626395-2-ref.html == 626395-2d.html 626395-2-ref.html == 652178-1.html 652178-1-ref.html -== 115199-1.html 115199-1-ref.html +fails-if(B2G) == 115199-1.html 115199-1-ref.html # reftest-print doesn't work on B2G == 115199-2a.html 115199-2-ref.html == 115199-2b.html 115199-2-ref.html == 652178-1.html 652178-1-ref2.html -fuzzy-if(cocoaWidget,1,5000) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),255,100) == 745025-1.html 745025-1-ref.html -== 820496-1.html 820496-1-ref.html +fails-if(B2G) fuzzy-if(cocoaWidget,1,5000) fuzzy-if(/^Windows\x20NT\x206\.1/.test(http.oscpu),255,100) == 745025-1.html 745025-1-ref.html # reftest-print doesn't work on B2G +fails-if(B2G) == 820496-1.html 820496-1-ref.html # reftest-print doesn't work on B2G (scrollbar difference only) # NOTE: These tests don't yet rigorously test what they're # trying to test (shrink-to-fit behavior), due to bug 967311. -== 960822.html 960822-ref.html +fails-if(B2G) == 960822.html 960822-ref.html # reftest-print doesn't work on B2G (scrollbar difference only) == 966419-1.html 966419-1-ref.html == 966419-2.html 966419-2-ref.html diff --git a/layout/reftests/reftest.list b/layout/reftests/reftest.list index 077a4b2687f6..cd3db12288d2 100644 --- a/layout/reftests/reftest.list +++ b/layout/reftests/reftest.list @@ -12,35 +12,35 @@ include reftest-sanity/reftest.list include ../../image/test/reftest/reftest.list # CSSWG tests -skip-if(B2G) include w3c-css/submitted/reftest.list -skip-if(B2G) include w3c-css/received/reftest.list +include w3c-css/submitted/reftest.list +include w3c-css/received/reftest.list # relative and absolute positioning -skip-if(B2G) include abs-pos/reftest.list +include abs-pos/reftest.list # backgrounds/ -skip-if(B2G) include backgrounds/reftest.list +include backgrounds/reftest.list # bidi/ -skip-if(B2G) include bidi/reftest.list +include bidi/reftest.list # border-image -skip-if(B2G) include border-image/reftest.list +include border-image/reftest.list # border-radius/ -skip-if(B2G) include border-radius/reftest.list +include border-radius/reftest.list # -moz-box tests -skip-if(B2G) include box/reftest.list +include box/reftest.list # box-ordinal/ -skip-if(B2G) include box-ordinal/reftest.list +include box-ordinal/reftest.list # box-properties/ -skip-if(B2G) include box-properties/reftest.list +include box-properties/reftest.list # box-shadow/ -skip-if(B2G) include box-shadow/reftest.list +include box-shadow/reftest.list # bugs/ include bugs/reftest.list @@ -52,70 +52,70 @@ include canvas/reftest.list include css-animations/reftest.list # blending/ -skip-if(B2G) include css-blending/reftest.list +include css-blending/reftest.list # css calc() tests include css-calc/reftest.list # css character encoding tests -skip-if(B2G) include css-charset/reftest.list +include css-charset/reftest.list # css default pseudo class tests -skip-if(B2G) include css-default/reftest.list +include css-default/reftest.list # css :disable tests -skip-if(B2G) include css-disabled/reftest.list +include css-disabled/reftest.list # css :enable tests -skip-if(B2G) include css-enabled/reftest.list +include css-enabled/reftest.list # css @import tests -skip-if(B2G) include css-import/reftest.list +include css-import/reftest.list # css gradients include css-gradients/reftest.list # css media queries (tests for print mode) -skip-if(B2G) include css-mediaqueries/reftest.list +include css-mediaqueries/reftest.list # css parsing -skip-if(B2G) include css-parsing/reftest.list +include css-parsing/reftest.list # css placeholder -skip-if(B2G) include css-placeholder/reftest.list +include css-placeholder/reftest.list # css required -skip-if(B2G) include css-required/reftest.list +include css-required/reftest.list # css optional -skip-if(B2G) include css-optional/reftest.list +include css-optional/reftest.list # css valid -skip-if(B2G) include css-valid/reftest.list +include css-valid/reftest.list # css invalid -skip-if(B2G) include css-invalid/reftest.list +include css-invalid/reftest.list # css-submit-invalid -skip-if(B2G) include css-submit-invalid/reftest.list +include css-submit-invalid/reftest.list # css text-overflow -skip-if(B2G) include text-overflow/reftest.list +include text-overflow/reftest.list # css selectors include css-selectors/reftest.list # css transitions -skip-if(B2G) include css-transitions/reftest.list +include css-transitions/reftest.list # css :-moz-ui-invalid -skip-if(B2G) include css-ui-invalid/reftest.list +include css-ui-invalid/reftest.list # css :-moz-ui-valid -skip-if(B2G) include css-ui-valid/reftest.list +include css-ui-valid/reftest.list # css values and units -skip-if(B2G) include css-valuesandunits/reftest.list +include css-valuesandunits/reftest.list # css variables include css-variables/reftest.list @@ -124,49 +124,49 @@ include css-variables/reftest.list # layout/style/test/test_visited_reftests instead of using the reftest # harness. -skip-if(B2G) include cssom/reftest.list +include cssom/reftest.list # columns/ -skip-if(B2G) include columns/reftest.list +include columns/reftest.list # content/ include ../../content/test/reftest/reftest.list # counters/ -skip-if(B2G) include counters/reftest.list +include counters/reftest.list # datalist -skip-if(B2G) include datalist/reftest.list +include datalist/reftest.list # dom/ -skip-if(B2G) include dom/reftest.list +include dom/reftest.list # generated-content/ -skip-if(B2G) include generated-content/reftest.list +include generated-content/reftest.list # first-letter/ -skip-if(B2G) include first-letter/reftest.list +include first-letter/reftest.list # first-line/ -skip-if(B2G) include first-line/reftest.list +include first-line/reftest.list # flexbox (display: flex, display: inline-flex) include flexbox/reftest.list # floats/ -skip-if(B2G) include floats/reftest.list +include floats/reftest.list # font-face include font-face/reftest.list # font features (opentype) -skip-if(B2G) include font-features/reftest.list +include font-features/reftest.list # mobile font size inflation -skip-if(B2G&&browserIsRemote) include font-inflation/reftest.list +include font-inflation/reftest.list # font matching -skip-if(B2G) include font-matching/reftest.list +include font-matching/reftest.list # forms include forms/reftest.list @@ -175,57 +175,58 @@ include forms/reftest.list include ../../gfx/tests/reftest/reftest.list # block-inside-inline splits -skip-if(B2G) include ib-split/reftest.list +include ib-split/reftest.list # image/ include image/reftest.list # image-element/ -skip-if(B2G) include image-element/reftest.list +include image-element/reftest.list # image-rect/ -skip-if(B2G) include image-rect/reftest.list +include image-rect/reftest.list # image-region/ -skip-if(B2G) include image-region/reftest.list +include image-region/reftest.list # indic shaping with harfbuzz -skip-if(B2G) include indic-shaping/reftest.list +include indic-shaping/reftest.list # inline layout include inline/reftest.list # inline borders and padding -skip-if(B2G) include inline-borderpadding/reftest.list +include inline-borderpadding/reftest.list # layers/ include layers/reftest.list # line-breaking/ -skip-if(B2G) include line-breaking/reftest.list +include line-breaking/reftest.list # list-item/ -skip-if(B2G) include list-item/reftest.list +include list-item/reftest.list # mathml/ -skip-if(B2G) include mathml/reftest.list +include mathml/reftest.list # margin-collapsing -skip-if(B2G) include margin-collapsing/reftest.list +include margin-collapsing/reftest.list # marquee/ -skip-if(B2G) include marquee/reftest.list +include marquee/reftest.list # native-theme/ +# skipping for B2G since something around radio-nonnative.html makes the whole suite hang skip-if(B2G) include native-theme/reftest.list # netwerk/ -skip-if(B2G) include ../../netwerk/test/reftest/reftest.list +include ../../netwerk/test/reftest/reftest.list include outline/reftest.list # object/ -skip-if(B2G) include object/reftest.list +include object/reftest.list # ogg-video/ include ogg-video/reftest.list @@ -234,26 +235,26 @@ include ogg-video/reftest.list include webm-video/reftest.list # parser/ -skip-if(B2G) include ../../parser/htmlparser/tests/reftest/reftest.list +include ../../parser/htmlparser/tests/reftest/reftest.list # percent-overflow-sizing/ -skip-if(B2G) include percent-overflow-sizing/reftest.list +include percent-overflow-sizing/reftest.list # pixel-rounding/ -skip-if(B2G) include pixel-rounding/reftest.list +include pixel-rounding/reftest.list # plugin/ -skip-if(B2G) include ../../dom/plugins/test/reftest/reftest.list +include ../../dom/plugins/test/reftest/reftest.list # position-dynamic-changes/ include position-dynamic-changes/reftest.list # printing -skip-if(B2G) include printing/reftest.list -skip-if(B2G) include pagination/reftest.list +include printing/reftest.list +include pagination/reftest.list # + + +
+ XXX + XXX + XXX + +
+ + diff --git a/layout/reftests/bugs/983691-ref.html b/layout/reftests/bugs/983691-ref.html new file mode 100644 index 000000000000..28f41e5d5341 --- /dev/null +++ b/layout/reftests/bugs/983691-ref.html @@ -0,0 +1,18 @@ + + + + + + + +
+ XXX XXX XXX +
+ + diff --git a/layout/reftests/bugs/reftest.list b/layout/reftests/bugs/reftest.list index dbe12dd5d9ce..d9e6a4941b22 100644 --- a/layout/reftests/bugs/reftest.list +++ b/layout/reftests/bugs/reftest.list @@ -1803,3 +1803,4 @@ skip-if(Android) == 966510-2.html 966510-2-ref.html # same as above == 983084-1.html 983084-1-ref.html == 983084-2.html 983084-2-ref.html == 983084-3.html 983084-1-ref.html +== 983691-1.html 983691-ref.html From b399bb4bc0fc9af28d212549bcd08bfb5ed820d8 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 02:35:52 -0700 Subject: [PATCH 29/46] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/9fc2a79c615a Author: Yuren Ju Desc: Merge pull request #17510 from yurenju/stage3 Bug 897352 - [gaia build system] Transition to a build_stage for assembl... r=@ochameau ======== https://hg.mozilla.org/integration/gaia-central/rev/26e9ea2e0fbc Author: Yuren Ju Desc: Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps Conflicts: Makefile apps/communications/build/build.js build/copy-build-stage-manifest.js build/test/integration/distribution.test.js build/utils-xpc.js build/utils.js build/webapp-manifests.js ======== https://hg.mozilla.org/integration/gaia-central/rev/297745511a1a Author: gitmai Desc: Merge pull request #17474 from gitmai/bug-986473-CC-modify-parameters Bug 986473 -Modify cost control parameters r=salva ======== https://hg.mozilla.org/integration/gaia-central/rev/9c49ef2d5808 Author: mai Desc: Bug 986473 -Modify cost control parameters --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 8f812d8c5734..14dd74fb0576 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "9deb1e43dd2e583b812b26708c31e772eeae9c3b", + "revision": "9fc2a79c615a72c15c995ffc342e574b342a6e60", "repo_path": "/integration/gaia-central" } From 1d511614734d322ad98f4d4a24545541ac90eb9a Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 02:41:05 -0700 Subject: [PATCH 30/46] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index a8528dfe9534..2cc5f18ecf68 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index d5cdb27c29d0..86ad40906f02 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 5a748bb50edd..507621856945 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index a8528dfe9534..2cc5f18ecf68 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index f75b3bbd018c..de8005d07359 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 837a8f543b20..468a5f229464 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 99709abf9a12..191943446236 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 050896a3c6ce..1350e60e9347 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 87aaeaecb99a..56bc8493ecbf 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 9e3f320cd46c..caa51baca9f0 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From f48e139273723e965f9d4185c7a512e511344ab8 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Mon, 24 Mar 2014 10:44:28 +0100 Subject: [PATCH 31/46] Bug 985949: Fix pointer handling in BlueZ backend, r=echou This is caused by bug 967364. We need to hand over data structures to DBus operations and forget about them if the operation returned success. Until now, we could just tell their nsRefPtrs to |forget| about them, but with bug 967364 applied we need to swap an empty value into the pointer. --- dom/bluetooth/bluez/BluetoothDBusService.cpp | 27 ++++++++++---------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/dom/bluetooth/bluez/BluetoothDBusService.cpp b/dom/bluetooth/bluez/BluetoothDBusService.cpp index 9812bdefcfdf..da099d4a4971 100644 --- a/dom/bluetooth/bluez/BluetoothDBusService.cpp +++ b/dom/bluetooth/bluez/BluetoothDBusService.cpp @@ -46,6 +46,7 @@ #include "mozilla/Mutex.h" #include "mozilla/NullPtr.h" #include "mozilla/StaticMutex.h" +#include "mozilla/unused.h" #if defined(MOZ_WIDGET_GONK) #include "cutils/properties.h" @@ -1116,7 +1117,7 @@ AppendDeviceName(BluetoothSignal& aSignal) NS_ENSURE_TRUE_VOID(success); - handler.forget(); + unused << handler.forget(); // picked up by callback handler } static DBusHandlerResult @@ -1461,7 +1462,7 @@ private: NS_ENSURE_TRUE(success, false); - handler.forget(); + unused << handler.forget(); // picked up by callback handler return true; } @@ -1505,7 +1506,7 @@ public: NS_ENSURE_TRUE_VOID(success); - handler.forget(); + unused << handler.forget(); /* picked up by callback handler */ } private: @@ -2191,7 +2192,7 @@ protected: return false; } - handler.forget(); + unused << handler.forget(); // picked up by callback handler return true; } @@ -2251,7 +2252,7 @@ public: DBUS_TYPE_INVALID); NS_ENSURE_TRUE_VOID(success); - handler.forget(); + unused << handler.forget(); // picked up by callback handler } private: @@ -2321,7 +2322,7 @@ public: DBUS_TYPE_INVALID); NS_ENSURE_TRUE_VOID(success); - mRunnable.forget(); + unused << mRunnable.forget(); // picked up by callback handler } private: @@ -2596,7 +2597,7 @@ protected: NS_ENSURE_TRUE(success, false); - handler.forget(); + unused << handler.forget(); // picked up by callback handler return true; } @@ -2757,7 +2758,7 @@ public: 1000, msg); NS_ENSURE_TRUE_VOID(success); - mRunnable.forget(); + unused << mRunnable.forget(); // picked up by callback handler } private: @@ -2912,7 +2913,7 @@ public: DBUS_TYPE_INVALID); NS_ENSURE_TRUE_VOID(success); - mRunnable.forget(); + unused << mRunnable.forget(); // picked up by callback handler /** * FIXME: Bug 820274 @@ -2984,7 +2985,7 @@ public: DBUS_TYPE_INVALID); NS_ENSURE_TRUE_VOID(success); - mRunnable.forget(); + unused << mRunnable.forget(); // picked up by callback handler } protected: @@ -3511,7 +3512,7 @@ public: DBUS_TYPE_INVALID); NS_ENSURE_TRUE_VOID(success); - handler.forget(); + unused << handler.forget(); // picked up by callback handler } private: @@ -3813,7 +3814,7 @@ public: DBUS_TYPE_INVALID); NS_ENSURE_TRUE_VOID(success); - mRunnable.forget(); + unused << mRunnable.forget(); // picked up by callback handler } private: @@ -3941,7 +3942,7 @@ public: DBUS_TYPE_INVALID); NS_ENSURE_TRUE_VOID(success); - mRunnable.forget(); + unused << mRunnable.forget(); // picked up by callback handler } private: From 697d1bf608c0bd08ad0d64c4b18a7b1a8f6f4dba Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Mon, 24 Mar 2014 10:44:29 +0100 Subject: [PATCH 32/46] Bug 985949: Correctly forget pointer references in Bluedroid backend, r=echou This patch fixes a regression from bug 967364. An nsRefPtr is now correctly cleared by |forget| without causing a crash. --- dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp b/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp index 533e35ecbbf0..d7256e951632 100644 --- a/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp +++ b/dom/bluetooth/bluedroid/BluetoothServiceBluedroid.cpp @@ -31,6 +31,7 @@ #include "mozilla/ipc/UnixSocket.h" #include "mozilla/StaticMutex.h" #include "mozilla/StaticPtr.h" +#include "mozilla/unused.h" using namespace mozilla; using namespace mozilla::ipc; @@ -801,7 +802,7 @@ BluetoothServiceBluedroid::GetDefaultAdapterPathInternal( nsAutoString replyError; DispatchBluetoothReply(runnable.get(), v, replyError); - runnable.forget(); + unused << runnable.forget(); // picked up in DispatchBluetoothReply return NS_OK; } From b34e53264fad1b09cdb8449557d23d5308c896de Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 02:51:18 -0700 Subject: [PATCH 33/46] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/a15a2479ef80 Author: Joan Leon Desc: Merge pull request #17386 from nucliweb/973827-Power-button-modal Power-button-modal ======== https://hg.mozilla.org/integration/gaia-central/rev/37cfe1536eaf Author: Joan Leon Desc: Power-button-modal --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 14dd74fb0576..b9fb6a94b36a 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "9fc2a79c615a72c15c995ffc342e574b342a6e60", + "revision": "a15a2479ef80212bc8ce76cedf5eba5f176a9e51", "repo_path": "/integration/gaia-central" } From 9bd7610f03a877f6428e94b284ac7c802ff99193 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 02:56:01 -0700 Subject: [PATCH 34/46] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 2cc5f18ecf68..a968b7339db1 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 86ad40906f02..798b0e993ff8 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 507621856945..620bddbfeaf8 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 2cc5f18ecf68..a968b7339db1 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index de8005d07359..1c9f6916d66f 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 468a5f229464..50769c1f6b74 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 191943446236..55eae5f9d956 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 1350e60e9347..df40b7dd247e 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 56bc8493ecbf..e96b35a14f12 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index caa51baca9f0..2562271fab16 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 64c7db388946fbefaf8268354b9d4a9c51b2a993 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 03:00:55 -0700 Subject: [PATCH 35/46] Bumping gaia.json for 3 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/08ef2514a1aa Author: Carsten Book -Tomcat- Desc: Revert "Bug 960861 - mozMobileConnections should not be requisites for airplane mode" for suspicion of breaking marionette tests This reverts commit abd710def22c5244dfa8959b15ca49954a58e12c. ======== https://hg.mozilla.org/integration/gaia-central/rev/9fcac81be0ab Author: Arnau Desc: Merge pull request #17321 from pacorampas/973547 Bug 973547 - Enter device name overlay has a wrong layout. ======== https://hg.mozilla.org/integration/gaia-central/rev/1a7947ed3ee4 Author: Paco Rampas Desc: Bug 973547 - Enter device name overlay has a wrong layout. --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index b9fb6a94b36a..24bc6705fa4e 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "a15a2479ef80212bc8ce76cedf5eba5f176a9e51", + "revision": "08ef2514a1aa3b4321deaf8b59340ea6a3cd97e5", "repo_path": "/integration/gaia-central" } From 6d3325756d7d814ea08cf0ad235090b4d0183add Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 03:06:07 -0700 Subject: [PATCH 36/46] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index a968b7339db1..6a12ab8929d1 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 798b0e993ff8..03018634cb61 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 620bddbfeaf8..60bd86163e87 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index a968b7339db1..6a12ab8929d1 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 1c9f6916d66f..dec20c6fee78 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 50769c1f6b74..2381cf5fe6d6 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 55eae5f9d956..99d4fffd84a0 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index df40b7dd247e..9cd240c13a89 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index e96b35a14f12..73ae444a45d0 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 2562271fab16..fde23d25144f 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From d6bbfbebd0cff884b7e9437d56d8d077aab2564c Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 03:15:59 -0700 Subject: [PATCH 37/46] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/32bb22b68077 Author: Arthur Chen Desc: Revert "Bug 961800 - Implement Child Window Factory." This reverts commit 769a5b332ae1fb7758583006567e05ac8dd42dc1. --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 24bc6705fa4e..cccc5c36dbd9 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "08ef2514a1aa3b4321deaf8b59340ea6a3cd97e5", + "revision": "32bb22b68077496b5d7dee92d0b027baaff1fc9c", "repo_path": "/integration/gaia-central" } From 82849f31c97a585857f31313063d5112b32488c3 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 03:21:11 -0700 Subject: [PATCH 38/46] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 6a12ab8929d1..9dad45bd6a8d 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 03018634cb61..17dfd55c9b18 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 60bd86163e87..23a97cf5797f 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 6a12ab8929d1..9dad45bd6a8d 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index dec20c6fee78..beb06a57d5aa 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 2381cf5fe6d6..7aefa6086aa0 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 99d4fffd84a0..9e3cf7cf1f5f 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 9cd240c13a89..9c9961cc450c 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 73ae444a45d0..8f7c2957fa61 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index fde23d25144f..50c3ef886b9e 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 924c66af30be8774cc07c16595bce7cd8eb720e8 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 03:31:00 -0700 Subject: [PATCH 39/46] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/c7df3a8049fe Author: Anthony Ricaud Desc: Revert "Merge pull request #17386 from nucliweb/973827-Power-button-modal" This reverts commit 3ba39ebd3fd4613640f9477898a008580ef8fb41, reversing changes made to ad3ff4d8515803a5467957f3c39faf83653b5510. --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index cccc5c36dbd9..8bda9f536fed 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "32bb22b68077496b5d7dee92d0b027baaff1fc9c", + "revision": "c7df3a8049fe1ba5c364f436b003426a0fafb85f", "repo_path": "/integration/gaia-central" } From 27f07ebc87aa48bd9141e81f52a789555a33c1a7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 03:36:07 -0700 Subject: [PATCH 40/46] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 9dad45bd6a8d..e2ed4eff870f 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 17dfd55c9b18..28b0351ff3fa 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 23a97cf5797f..ddfca709602b 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 9dad45bd6a8d..e2ed4eff870f 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index beb06a57d5aa..f76ef2cd997e 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 7aefa6086aa0..bb5a5c24956f 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 9e3cf7cf1f5f..4640a5f75cd6 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 9c9961cc450c..750edf8bf971 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 8f7c2957fa61..91a4af25980e 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 50c3ef886b9e..57ef455aecb5 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From e38149848b6dcda47e0be333b66077d2eba6a300 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 03:55:53 -0700 Subject: [PATCH 41/46] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/4188aeaa6414 Author: Florin Strugariu Desc: Merge pull request #17505 from viorelaioia/bug_986462 Bug 986462 - Unxfail test_dialer_find_contact as Bug 983054 is fixed ======== https://hg.mozilla.org/integration/gaia-central/rev/ecb3212a1066 Author: Viorela Ioia Desc: Bug 986462 - Unxfail test_dialer_find_contact as Bug 983054 is fixed --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 8bda9f536fed..42d1120a3a8a 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "c7df3a8049fe1ba5c364f436b003426a0fafb85f", + "revision": "4188aeaa641427e5a4f6226ebc81cbd9c1e5d97d", "repo_path": "/integration/gaia-central" } From 81761b7c6206328cd217a14699c7f6a99b70fb54 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 04:01:06 -0700 Subject: [PATCH 42/46] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index e2ed4eff870f..e23179df06d0 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 28b0351ff3fa..e058f5fb02e6 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index ddfca709602b..6445c49341cb 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index e2ed4eff870f..e23179df06d0 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index f76ef2cd997e..60d9fc2ba395 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index bb5a5c24956f..9d6d162988d7 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 4640a5f75cd6..9775313e70a9 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index 750edf8bf971..b4771675f5ce 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 91a4af25980e..2b1822499b64 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 57ef455aecb5..e7441677e10e 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From 7fbb4219144dbb157c32e86b9f7e9cf7fac00e3b Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 04:21:08 -0700 Subject: [PATCH 43/46] Bumping gaia.json for 1 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/27b36387e1e1 Author: Carsten Book -Tomcat- Desc: Revert "Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps" for bustage This reverts commit 498250413b65c91762fd6f62e21b9f81c5ee77c9. --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 42d1120a3a8a..9b83353285a4 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "4188aeaa641427e5a4f6226ebc81cbd9c1e5d97d", + "revision": "27b36387e1e1b8786db7573d86c5b1a06eb5aee7", "repo_path": "/integration/gaia-central" } From 3838a86eef14f0f08116ee5e1727ce73949f8762 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 04:22:34 -0700 Subject: [PATCH 44/46] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index e23179df06d0..af193a8a27ca 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index e058f5fb02e6..fa44ac242255 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 6445c49341cb..4430979fa72d 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index e23179df06d0..af193a8a27ca 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 60d9fc2ba395..0fd57bcc413a 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 9d6d162988d7..2d7d1467f9fa 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index 9775313e70a9..a1ea849e6d53 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index b4771675f5ce..b4541538245c 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index 2b1822499b64..fe1e5d340fd0 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index e7441677e10e..4f56655ee3d9 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - + From b55cca718ccb1ef7447105865b84e0dc87e1fb1f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 04:35:55 -0700 Subject: [PATCH 45/46] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/c4bd8e11f0a7 Author: Cristian Rodriguez Desc: Merge pull request #17241 from crdlc/bug-983594 Bug 983594 - Avoid making several calls from detail view at the same tim... ======== https://hg.mozilla.org/integration/gaia-central/rev/e1abb181711a Author: crdlc Desc: Bug 983594 - Avoid making several calls from detail view at the same time --- b2g/config/gaia.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 9b83353285a4..419befa41dcf 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -4,6 +4,6 @@ "branch": "", "revision": "" }, - "revision": "27b36387e1e1b8786db7573d86c5b1a06eb5aee7", + "revision": "c4bd8e11f0a758c307494392f6cc0d725674c224", "repo_path": "/integration/gaia-central" } From c25f62d5cde48077ef8b3f84cc664d4c16ba6428 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Mon, 24 Mar 2014 04:41:07 -0700 Subject: [PATCH 46/46] Bumping manifests a=b2g-bump --- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/hamachi/sources.xml | 2 +- b2g/config/helix/sources.xml | 2 +- b2g/config/inari/sources.xml | 2 +- b2g/config/leo/sources.xml | 2 +- b2g/config/mako/sources.xml | 2 +- b2g/config/wasabi/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index af193a8a27ca..3a485701f66a 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index fa44ac242255..446e0fdf5843 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 4430979fa72d..74799f7d23cc 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index af193a8a27ca..3a485701f66a 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/hamachi/sources.xml b/b2g/config/hamachi/sources.xml index 0fd57bcc413a..112a19df32a5 100644 --- a/b2g/config/hamachi/sources.xml +++ b/b2g/config/hamachi/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/helix/sources.xml b/b2g/config/helix/sources.xml index 2d7d1467f9fa..414b497b4bd6 100644 --- a/b2g/config/helix/sources.xml +++ b/b2g/config/helix/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/inari/sources.xml b/b2g/config/inari/sources.xml index a1ea849e6d53..d5efb83b2f39 100644 --- a/b2g/config/inari/sources.xml +++ b/b2g/config/inari/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/leo/sources.xml b/b2g/config/leo/sources.xml index b4541538245c..eb59ae71c429 100644 --- a/b2g/config/leo/sources.xml +++ b/b2g/config/leo/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/mako/sources.xml b/b2g/config/mako/sources.xml index fe1e5d340fd0..9e2e422746ae 100644 --- a/b2g/config/mako/sources.xml +++ b/b2g/config/mako/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/wasabi/sources.xml b/b2g/config/wasabi/sources.xml index 4f56655ee3d9..d8dacd90e905 100644 --- a/b2g/config/wasabi/sources.xml +++ b/b2g/config/wasabi/sources.xml @@ -17,7 +17,7 @@ - +