Bug 797043 - Followup, only implicitly click-to-play activate actual plugin types. r=josh
authorJohn Schoenick <jschoenick@mozilla.com>
Thu, 18 Oct 2012 15:38:50 -0700
changeset 110944 64c5c57132e8108306d2c873ba8c332315e723e7
parent 110943 9b7c3072b2a3564470b6c0f2fa25ea55d331f2b7
child 110945 bf8679d1a2f0b66905118c4c39b4d5e60ab2d595
push id93
push usernmatsakis@mozilla.com
push dateWed, 31 Oct 2012 21:26:57 +0000
reviewersjosh
bugs797043
milestone19.0a1
Bug 797043 - Followup, only implicitly click-to-play activate actual plugin types. r=josh
content/base/src/nsObjectLoadingContent.cpp
--- a/content/base/src/nsObjectLoadingContent.cpp
+++ b/content/base/src/nsObjectLoadingContent.cpp
@@ -1668,17 +1668,17 @@ nsObjectLoadingContent::LoadObject(bool 
   // reason click-to-play instead
   FallbackType clickToPlayReason;
   if (mType == eType_Plugin && !ShouldPlay(clickToPlayReason)) {
     LOG(("OBJLC [%p]: Marking plugin as click-to-play", this));
     mType = eType_Null;
     fallbackType = clickToPlayReason;
   }
 
-  if (!mActivated && mType != eType_Null) {
+  if (!mActivated && mType == eType_Plugin) {
     // Object passed ShouldPlay and !ShouldPreview, so it should be considered
     // activated until it changes content type
     LOG(("OBJLC [%p]: Object implicitly activated", this));
     mActivated = true;
   }
 
   // Sanity check: We shouldn't have any loaded resources, pending events, or
   // a final listener at this point