Bug 1098064 part B - remove nsIPluginHost.isPluginOOP, r=jimm
authorBenjamin Smedberg <benjamin@smedbergs.us>
Fri, 14 Aug 2015 13:28:33 -0400
changeset 258304 e4c9fd404528275098405dd4c2c06cca03c96ff0
parent 258303 32e5b68506f4e506f2ddf6f59d0cb4576f2a846a
child 258305 4e8302a104fb60363acb50b94eca484c58bc00e4
push id63876
push userbsmedberg@mozilla.com
push dateTue, 18 Aug 2015 23:56:18 +0000
treeherdermozilla-inbound@4e8302a104fb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjimm
bugs1098064
milestone43.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
Bug 1098064 part B - remove nsIPluginHost.isPluginOOP, r=jimm
dom/plugins/base/nsIPluginHost.idl
dom/plugins/base/nsPluginHost.cpp
testing/mochitest/tests/SimpleTest/SimpleTest.js
--- a/dom/plugins/base/nsIPluginHost.idl
+++ b/dom/plugins/base/nsIPluginHost.idl
@@ -31,17 +31,17 @@ interface nsIPluginPlayPreviewInfo : nsI
 interface nsIClearSiteDataCallback : nsISupports
 {
     /**
      * callback with the result from a call to clearSiteData
      */
     void callback(in nsresult rv);
 };
 
-[scriptable, uuid(50677599-323f-4c7d-a450-307bdb7acbf0)]
+[scriptable, uuid(0f73bbd2-fc89-41df-b31b-38c09903d187)]
 interface nsIPluginHost : nsISupports
 {
   /**
    * Causes the plugins directory to be searched again for new plugin
    * libraries.
    */
   void reloadPlugins();
 
@@ -188,15 +188,9 @@ interface nsIPluginHost : nsISupports
   nsIFakePluginTag getFakePlugin(in AUTF8String mimeType);
 
   /**
    * Unregister a fake plugin.  The argument can be the .handlerURI.spec of an
    * existing nsIFakePluginTag, or just a known handler URI string that was
    * passed in the FakePluginTagInit when registering.
    */
   void unregisterFakePlugin(in AUTF8String handlerURI);
-
-  /**
-   * Returns true if plugins with the given mimetype will run out of process.
-   */
-  boolean isPluginOOP(in AUTF8String aMimeType);
 };
-
--- a/dom/plugins/base/nsPluginHost.cpp
+++ b/dom/plugins/base/nsPluginHost.cpp
@@ -1096,24 +1096,16 @@ nsPluginHost::GetBlocklistStateForType(c
   nsresult rv = GetPluginTagForType(aMimeType,
                                     aExcludeFlags,
                                     getter_AddRefs(tag));
   NS_ENSURE_SUCCESS(rv, rv);
   return tag->GetBlocklistState(aState);
 }
 
 NS_IMETHODIMP
-nsPluginHost::IsPluginOOP(const nsACString& aMimeType,
-                          bool* aResult)
-{
-  *aResult = true;
-  return NS_OK;
-}
-
-NS_IMETHODIMP
 nsPluginHost::GetPermissionStringForType(const nsACString &aMimeType,
                                          uint32_t aExcludeFlags,
                                          nsACString &aPermissionString)
 {
   nsCOMPtr<nsIPluginTag> tag;
   nsresult rv = GetPluginTagForType(aMimeType, aExcludeFlags,
                                     getter_AddRefs(tag));
   NS_ENSURE_SUCCESS(rv, rv);
--- a/testing/mochitest/tests/SimpleTest/SimpleTest.js
+++ b/testing/mochitest/tests/SimpleTest/SimpleTest.js
@@ -213,20 +213,17 @@ if (typeof(computedStyle) == 'undefined'
         return style.getPropertyValue(selectorCase);
     };
 }
 
 /**
  * Check for OOP test plugin
 **/
 SimpleTest.testPluginIsOOP = function () {
-    var testPluginIsOOP = false;
-    var ph = SpecialPowers.Cc["@mozilla.org/plugin/host;1"]
-                          .getService(SpecialPowers.Ci.nsIPluginHost);
-    return ph.isPluginOOP("application/x-test");
+    return true;
 };
 
 SimpleTest._tests = [];
 SimpleTest._stopOnLoad = true;
 SimpleTest._cleanupFunctions = [];
 SimpleTest.expected = 'pass';
 SimpleTest.num_failed = 0;
 SimpleTest._inChaosMode = false;