From b79612e9649c2920be34805fafae8fb452f011c1 Mon Sep 17 00:00:00 2001
From: Aaron Klotz <aklotz@mozilla.com>
Date: Mon, 12 Oct 2015 13:31:06 -0600
Subject: [PATCH] Bug 1213454: Ensure that mSupportsAsyncInit is propagated
 from content process; r=jimm

--HG--
extra : rebase_source : 94e563c462cf346e900d42d2371dcb4984740c03
---
 dom/plugins/base/nsPluginHost.cpp | 2 ++
 dom/plugins/base/nsPluginTags.cpp | 3 ++-
 dom/plugins/base/nsPluginTags.h   | 1 +
 dom/plugins/ipc/PluginTypes.ipdlh | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
index 87c112897f68..119aa8e15229 100644
--- a/dom/plugins/base/nsPluginHost.cpp
+++ b/dom/plugins/base/nsPluginHost.cpp
@@ -2446,6 +2446,7 @@ nsPluginHost::FindPluginsInContent(bool aCreatePluginList, bool* aPluginsChanged
                                                nsTArray<nsCString>(tag.extensions()),
                                                tag.isJavaPlugin(),
                                                tag.isFlashPlugin(),
+                                               tag.supportsAsyncInit(),
                                                tag.lastModifiedTime(),
                                                tag.isFromExtension());
       AddPluginTag(pluginTag);
@@ -2682,6 +2683,7 @@ nsPluginHost::FindPluginsForContent(uint32_t aPluginEpoch,
                                       tag->Extensions(),
                                       tag->mIsJavaPlugin,
                                       tag->mIsFlashPlugin,
+                                      tag->mSupportsAsyncInit,
                                       tag->FileName(),
                                       tag->Version(),
                                       tag->mLastModifiedTime,
diff --git a/dom/plugins/base/nsPluginTags.cpp b/dom/plugins/base/nsPluginTags.cpp
index 5f06e5b547a1..9fefaa277958 100644
--- a/dom/plugins/base/nsPluginTags.cpp
+++ b/dom/plugins/base/nsPluginTags.cpp
@@ -293,6 +293,7 @@ nsPluginTag::nsPluginTag(uint32_t aId,
                          nsTArray<nsCString> aExtensions,
                          bool aIsJavaPlugin,
                          bool aIsFlashPlugin,
+                         bool aSupportsAsyncInit,
                          int64_t aLastModifiedTime,
                          bool aFromExtension)
   : nsIInternalPluginTag(aName, aDescription, aFileName, aVersion, aMimeTypes,
@@ -302,7 +303,7 @@ nsPluginTag::nsPluginTag(uint32_t aId,
     mLibrary(nullptr),
     mIsJavaPlugin(aIsJavaPlugin),
     mIsFlashPlugin(aIsFlashPlugin),
-    mSupportsAsyncInit(false),
+    mSupportsAsyncInit(aSupportsAsyncInit),
     mLastModifiedTime(aLastModifiedTime),
     mNiceFileName(),
     mCachedBlocklistState(nsIBlocklistService::STATE_NOT_BLOCKED),
diff --git a/dom/plugins/base/nsPluginTags.h b/dom/plugins/base/nsPluginTags.h
index f950a6a87a8b..5c7372cec628 100644
--- a/dom/plugins/base/nsPluginTags.h
+++ b/dom/plugins/base/nsPluginTags.h
@@ -128,6 +128,7 @@ public:
               nsTArray<nsCString> aExtensions,
               bool aIsJavaPlugin,
               bool aIsFlashPlugin,
+              bool aSupportsAsyncInit,
               int64_t aLastModifiedTime,
               bool aFromExtension);
 
diff --git a/dom/plugins/ipc/PluginTypes.ipdlh b/dom/plugins/ipc/PluginTypes.ipdlh
index 77de2c7a35f8..faed6b41e6b3 100644
--- a/dom/plugins/ipc/PluginTypes.ipdlh
+++ b/dom/plugins/ipc/PluginTypes.ipdlh
@@ -16,6 +16,7 @@ struct PluginTag
   nsCString[] extensions;
   bool isJavaPlugin;
   bool isFlashPlugin;
+  bool supportsAsyncInit;
   nsCString filename;
   nsCString version;
   int64_t lastModifiedTime;