Bug 816551 - Make PluginHelper._getBindingType return null. r=margaret
authorKartikaya Gupta <kgupta@mozilla.com>
Thu, 13 Dec 2012 17:21:43 -0500
changeset 115973 fb65298e7117d72491c786a32d1c1ec961c1711b
parent 115972 777fd91b7fda0325d0dc715967fc798fd68dd5ef
child 115974 7cfc4ad935b17f3cf60ec567fb1f38b922760e0e
push id19656
push userkgupta@mozilla.com
push dateThu, 13 Dec 2012 22:22:22 +0000
treeherdermozilla-inbound@fb65298e7117 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmargaret
bugs816551
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
Bug 816551 - Make PluginHelper._getBindingType return null. r=margaret
mobile/android/chrome/content/browser.js
--- a/mobile/android/chrome/content/browser.js
+++ b/mobile/android/chrome/content/browser.js
@@ -5978,28 +5978,28 @@ var PluginHelper = {
         break;
       }
     }
   },
 
   // Helper to get the binding handler type from a plugin object
   _getBindingType: function(plugin) {
     if (!(plugin instanceof Ci.nsIObjectLoadingContent))
-      return;
+      return null;
 
     switch (plugin.pluginFallbackType) {
       case Ci.nsIObjectLoadingContent.PLUGIN_UNSUPPORTED:
         return "PluginNotFound";
       case Ci.nsIObjectLoadingContent.PLUGIN_CLICK_TO_PLAY:
         return "PluginClickToPlay";
       case Ci.nsIObjectLoadingContent.PLUGIN_PLAY_PREVIEW:
         return "PluginPlayPreview";
       default:
         // Not all states map to a handler
-        return;
+        return null;
     }
   },
 
 };
 
 var PermissionsHelper = {
 
   _permissonTypes: ["password", "geolocation", "popup", "indexedDB",