Backout of 541618e4babd (bug 1263696) due to performance timeline test bustage

dom/html/HTMLSharedObjectElement.h

@@ -80,7 +80,7 @@ public:
 
   nsresult CopyInnerTo(Element* aDest);
 
-  void StartObjectLoad() { StartObjectLoad(true, false); }
+  void StartObjectLoad() { StartObjectLoad(true); }
 
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED_NO_UNLINK(HTMLSharedObjectElement,
                                                      nsGenericHTMLElement)
@@ -192,12 +192,13 @@ public:
     return GetContentDocument();
   }
 
+private:
+  virtual ~HTMLSharedObjectElement();
+
   /**
    * Calls LoadObject with the correct arguments to start the plugin load.
    */
-  void StartObjectLoad(bool aNotify, bool aForceLoad);
-private:
-  virtual ~HTMLSharedObjectElement();
+  void StartObjectLoad(bool aNotify);
 
   nsIAtom *URIAttrName() const
   {
@@ -227,8 +228,6 @@ private:
    * the content:
    *
    * - If the embed node is the child of a media element
-   * - If the embed node is the child of an object node that already has
-   *   content being loaded.
    *
    * In these cases, this function will return false, which will cause
    * us to skip calling LoadObject.