Bug 1282484 - Cache the value of PreferFallback() because ShouldPlay(…

…) is called several times during the load process. r=qDot MozReview-Commit-ID: DqjCHssaJde
dothq · Jan 24, 2017 · cedca66 · cedca66
1 parent 917ff06
commit cedca66
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/dom/base/nsObjectLoadingContent.cpp b/dom/base/nsObjectLoadingContent.cpp
@@ -666,7 +666,9 @@ nsObjectLoadingContent::nsObjectLoadingContent()
   , mIsStopping(false)
   , mIsLoading(false)
   , mScriptRequested(false)
-  , mRewrittenYoutubeEmbed(false) {}
+  , mRewrittenYoutubeEmbed(false)
+  , mPreferFallback(false)
+  , mPreferFallbackKnown(false) {}
 
 nsObjectLoadingContent::~nsObjectLoadingContent()
 {
@@ -3457,7 +3459,13 @@ nsObjectLoadingContent::HasGoodFallback() {
 
 bool
 nsObjectLoadingContent::PreferFallback(bool aIsPluginClickToPlay) {
-  return FavorFallbackMode(aIsPluginClickToPlay) && HasGoodFallback();
+  if (mPreferFallbackKnown) {
+    return mPreferFallback;
+  }
+
+  mPreferFallbackKnown = true;
+  mPreferFallback = FavorFallbackMode(aIsPluginClickToPlay) && HasGoodFallback();
+  return mPreferFallback;
 }
 
 nsIDocument*

diff --git a/dom/base/nsObjectLoadingContent.h b/dom/base/nsObjectLoadingContent.h
@@ -705,6 +705,11 @@ class nsObjectLoadingContent : public nsImageLoadingContent
     // videos.
     bool                        mRewrittenYoutubeEmbed : 1;
 
+    // Cache the answer of PreferFallback() because ShouldPlay is called several
+    // times during the load process.
+    bool                        mPreferFallback : 1;
+    bool                        mPreferFallbackKnown : 1;
+
     nsWeakFrame                 mPrintFrame;
 
     RefPtr<nsPluginInstanceOwner> mInstanceOwner;