merge fx-team to m-c
authorRob Campbell <rcampbell@mozilla.com>
Sat, 15 Dec 2012 09:16:16 -0500
changeset 125170 bb2f453b7c0f6d6c0d461e223745544b24d86261
parent 125169 548d2c909b8175504c44c6f2b126a5fa804cae3c (current diff)
parent 125168 18ff01530d1de687cf2bfc2424f853a1b0ae3fe5 (diff)
child 125246 c6e671c2f43c14fd7f26eb1824bbdb6e38500dc0
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone20.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
merge fx-team to m-c
--- a/browser/app/blocklist.xml
+++ b/browser/app/blocklist.xml
@@ -63,17 +63,17 @@
                   </emItem>
       <emItem  blockID="i78" id="socialnetworktools@mozilla.doslash.org">
                         <versionRange  minVersion="0" maxVersion="*">
                     </versionRange>
                   </emItem>
       <emItem  blockID="i238" id="/^pink@.*\.info$/">
                         <versionRange  minVersion="0" maxVersion="*" severity="3">
                       <targetApplication  id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}">
-                              <versionRange  minVersion="19.0a1" maxVersion="*" />
+                              <versionRange  minVersion="18.0" maxVersion="*" />
                           </targetApplication>
                     </versionRange>
                   </emItem>
       <emItem  blockID="i174" id="info@thebflix.com">
                         <versionRange  minVersion="0" maxVersion="*" severity="3">
                     </versionRange>
                   </emItem>
       <emItem  blockID="i101" id="{3a12052a-66ef-49db-8c39-e5b0bd5c83fa}">
--- a/dom/plugins/base/nsPluginHost.cpp
+++ b/dom/plugins/base/nsPluginHost.cpp
@@ -948,22 +948,16 @@ nsPluginHost::InstantiatePluginInstance(
   }
 
   if (tagType != nsPluginTagType_Embed &&
       tagType != nsPluginTagType_Applet &&
       tagType != nsPluginTagType_Object) {
     return NS_ERROR_FAILURE;
   }
 
-  bool isJava = false;
-  nsPluginTag* pluginTag = FindPluginForType(aMimeType, true);
-  if (pluginTag) {
-    isJava = pluginTag->mIsJavaPlugin;
-  }
-
   rv = SetUpPluginInstance(aMimeType, aURL, instanceOwner);
   if (NS_FAILED(rv)) {
     return NS_ERROR_FAILURE;
   }
 
   nsRefPtr<nsNPAPIPluginInstance> instance;
   rv = instanceOwner->GetInstance(getter_AddRefs(instance));
   if (NS_FAILED(rv)) {
--- a/dom/telephony/test/marionette/manifest.ini
+++ b/dom/telephony/test/marionette/manifest.ini
@@ -30,11 +30,13 @@ disabled = Bug 806138
 [test_incoming_remote_hangup_held.js]
 [test_outgoing_already_held.js]
 [test_outgoing_answer_local_hangup.js]
 [test_outgoing_remote_hangup_held.js]
 [test_incoming_already_held.js]
 [test_swap_held_and_active.js]
 [test_incoming_onstatechange.js]
 [test_outgoing_onstatechange.js]
+disabled = Bug 821966
 [test_redundant_operations.js]
+disabled = Bug 821927
 [test_multiple_hold.js]
-
+disabled = Bug 821958
--- a/xpcom/base/nsCycleCollector.cpp
+++ b/xpcom/base/nsCycleCollector.cpp
@@ -2950,24 +2950,28 @@ uint32_t
 nsCycleCollector::SuspectedCount()
 {
     return mPurpleBuf.Count();
 }
 
 void
 nsCycleCollector::Shutdown()
 {
-    // Here we want to run a final collection and then permanently
-    // disable the collector because the program is shutting down.
-
-    nsCOMPtr<nsCycleCollectorLogger> listener;
-    if (mParams.mLogGraphs) {
-        listener = new nsCycleCollectorLogger();
+#ifndef DEBUG
+#ifndef DEBUG_CC
+    if (PR_GetEnv("XPCOM_CC_RUN_DURING_SHUTDOWN"))
+#endif
+#endif
+    {
+        nsCOMPtr<nsCycleCollectorLogger> listener;
+        if (mParams.mLogGraphs) {
+            listener = new nsCycleCollectorLogger();
+        }
+        Collect(false, nullptr,  SHUTDOWN_COLLECTIONS(mParams), listener);
     }
-    Collect(false, nullptr, SHUTDOWN_COLLECTIONS(mParams), listener);
 
 #ifdef DEBUG_CC
     GCGraphBuilder builder(mGraph, mJSRuntime, nullptr, false);
     mScanInProgress = true;
     SelectPurple(builder);
     mScanInProgress = false;
     if (builder.Count() != 0) {
         printf("Might have been able to release more cycles if the cycle collector would "