Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 11:55:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1283274 - Disable windowless workaround if we detect a flash library that support async rendering. r=aklotz

Browse Source 
MozReview-Commit-ID: 3RubBjRoeEa
This commit is contained in:
Jim Mathies 2016-07-25 15:45:29 -05:00
parent a7d35e9f6b
commit b5801fa3f7
10 changed files with 65 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/plugins/base/nsPluginHost.cpp
View File

@ -2461,6 +2461,7 @@ nsPluginHost::FindPluginsInContent(bool aCreatePluginList, bool* aPluginsChanged
tag.isJavaPlugin(),
tag.isFlashPlugin(),
tag.supportsAsyncInit(),
tag.supportsAsyncRender(),
tag.lastModifiedTime(),
tag.isFromExtension(),
tag.sandboxLevel());
@ -2701,6 +2702,7 @@ nsPluginHost::FindPluginsForContent(uint32_t aPluginEpoch,
tag->mIsJavaPlugin,
tag->mIsFlashPlugin,
tag->mSupportsAsyncInit,
tag->mSupportsAsyncRender,
tag->FileName(),
tag->Version(),
tag->mLastModifiedTime,

4
dom/plugins/base/nsPluginTags.cpp
View File

@ -236,6 +236,7 @@ nsPluginTag::nsPluginTag(nsPluginInfo* aPluginInfo,
mIsJavaPlugin(false),
mIsFlashPlugin(false),
mSupportsAsyncInit(false),
mSupportsAsyncRender(false),
mFullPath(aPluginInfo->fFullPath),
mLastModifiedTime(aLastModifiedTime),
mSandboxLevel(0),
@ -271,6 +272,7 @@ nsPluginTag::nsPluginTag(const char* aName,
mIsJavaPlugin(false),
mIsFlashPlugin(false),
mSupportsAsyncInit(false),
mSupportsAsyncRender(false),
mFullPath(aFullPath),
mLastModifiedTime(aLastModifiedTime),
mSandboxLevel(0),
@ -298,6 +300,7 @@ nsPluginTag::nsPluginTag(uint32_t aId,
bool aIsJavaPlugin,
bool aIsFlashPlugin,
bool aSupportsAsyncInit,
bool aSupportsAsyncRender,
int64_t aLastModifiedTime,
bool aFromExtension,
int32_t aSandboxLevel)
@ -309,6 +312,7 @@ nsPluginTag::nsPluginTag(uint32_t aId,
mIsJavaPlugin(aIsJavaPlugin),
mIsFlashPlugin(aIsFlashPlugin),
mSupportsAsyncInit(aSupportsAsyncInit),
mSupportsAsyncRender(aSupportsAsyncRender),
mLastModifiedTime(aLastModifiedTime),
mSandboxLevel(aSandboxLevel),
mNiceFileName(),

2
dom/plugins/base/nsPluginTags.h
View File

@ -133,6 +133,7 @@ public:
bool aIsJavaPlugin,
bool aIsFlashPlugin,
bool aSupportsAsyncInit,
bool aSupportsAsyncRender,
int64_t aLastModifiedTime,
bool aFromExtension,
int32_t aSandboxLevel);
@ -172,6 +173,7 @@ public:
bool mIsJavaPlugin;
bool mIsFlashPlugin;
bool mSupportsAsyncInit;
bool mSupportsAsyncRender;
nsCString mFullPath; // UTF-8
int64_t mLastModifiedTime;
nsCOMPtr<nsITimer> mUnloadTimer;

1
dom/plugins/base/nsPluginsDir.h
View File

@ -34,6 +34,7 @@ struct nsPluginInfo {
char* fFileName;
char* fFullPath;
char* fVersion;
bool fSupportsAsyncRender;
};
/**

21
dom/plugins/base/nsPluginsDirWin.cpp
View File

@ -109,6 +109,20 @@ static char* GetVersion(void* verbuf)
return nullptr;
}
// Returns a boolean indicating if the key's value contains a string
// entry equal to "1" or "0". No entry for the key returns false.
static bool GetBooleanFlag(void* verbuf, const WCHAR* key,
UINT language, UINT codepage)
{
char* flagStr = GetKeyValue(verbuf, key, language, codepage);
if (!flagStr) {
return false;
}
bool result = (PL_strncmp("1", flagStr, 1) == 0);
PL_strfree(flagStr);
return result;
}
static uint32_t CalculateVariantCount(char* mimeTypes)
{
uint32_t variants = 1;
@ -356,11 +370,12 @@ nsresult nsPluginFile::GetPluginInfo(nsPluginInfo& info, PRLibrary **outLibrary)
if (::GetFileVersionInfoW(lpFilepath, 0, versionsize, verbuf))
{
// TODO: get appropriately-localized info from plugin file
UINT lang = 1033; // language = English
UINT cp = 1252; // codepage = Western
UINT lang = 1033; // language = English, 0x409
UINT cp = 1252; // codepage = Western, 0x4E4
info.fName = GetKeyValue(verbuf, L"ProductName", lang, cp);
info.fDescription = GetKeyValue(verbuf, L"FileDescription", lang, cp);
info.fSupportsAsyncRender = GetBooleanFlag(verbuf, L"AsyncDrawingSupport", lang, cp);
char *mimeType = GetKeyValue(verbuf, L"MIMEType", lang, cp);
char *mimeDescription = GetKeyValue(verbuf, L"FileOpenName", lang, cp);
char *extensions = GetKeyValue(verbuf, L"FileExtents", lang, cp);

5
dom/plugins/ipc/PPluginModule.ipdl
View File

@ -48,6 +48,11 @@ both:
child:
async DisableFlashProtectedMode();
// Sync query to check if a Flash library indicates it
// supports async rendering mode.
intr ModuleSupportsAsyncRender()
returns (bool result);
// Forces the child process to update its plugin function table.
intr NP_GetEntryPoints()
returns (NPError rv);

24
dom/plugins/ipc/PluginModuleChild.cpp
View File

@ -123,6 +123,7 @@ PluginModuleChild::PluginModuleChild(bool aIsChrome)
#ifdef OS_WIN
, mNestedEventHook(nullptr)
, mGlobalCallWndProcHook(nullptr)
, mAsyncRenderSupport(false)
#endif
{
memset(&mFunctions, 0, sizeof(mFunctions));
@ -243,26 +244,29 @@ PluginModuleChild::InitForChrome(const std::string& aPluginFilename,
nsPluginFile pluginFile(localFile);
#if defined(MOZ_X11) || defined(XP_MACOSX)
nsPluginInfo info = nsPluginInfo();
if (NS_FAILED(pluginFile.GetPluginInfo(info, &mLibrary))) {
return false;
}
#if defined(XP_WIN)
// XXX quirks isn't initialized yet
mAsyncRenderSupport = info.fSupportsAsyncRender;
#endif
#if defined(MOZ_X11)
NS_NAMED_LITERAL_CSTRING(flash10Head, "Shockwave Flash 10.");
if (StringBeginsWith(nsDependentCString(info.fDescription), flash10Head)) {
AddQuirk(QUIRK_FLASH_EXPOSE_COORD_TRANSLATION);
}
#else // defined(XP_MACOSX)
#endif
#if defined(XP_MACOSX)
const char* namePrefix = "Plugin Content";
char nameBuffer[80];
snprintf(nameBuffer, sizeof(nameBuffer), "%s (%s)", namePrefix, info.fName);
mozilla::plugins::PluginUtilsOSX::SetProcessName(nameBuffer);
#endif
pluginFile.FreePluginInfo(info);
#if defined(MOZ_X11) || defined(XP_MACOSX)
if (!mLibrary)
#endif
{
@ -2104,6 +2108,18 @@ PluginModuleChild::InitQuirksModes(const nsCString& aMimeType)
mQuirks = GetQuirksFromMimeTypeAndFilename(aMimeType, mPluginFilename);
}
bool
PluginModuleChild::AnswerModuleSupportsAsyncRender(bool* aResult)
{
#if defined(XP_WIN)
*aResult = gChromeInstance->mAsyncRenderSupport;
return true;
#else
NS_NOTREACHED("Shouldn't get here!");
return false;
#endif
}
bool
PluginModuleChild::RecvPPluginInstanceConstructor(PPluginInstanceChild* aActor,
const nsCString& aMimeType,

4
dom/plugins/ipc/PluginModuleChild.h
View File

@ -144,6 +144,8 @@ protected:
virtual bool RecvStopProfiler() override;
virtual bool RecvGatherProfile() override;
virtual bool
AnswerModuleSupportsAsyncRender(bool* aResult) override;
public:
explicit PluginModuleChild(bool aIsChrome);
virtual ~PluginModuleChild();
@ -362,6 +364,8 @@ private:
void ResetEventHooks();
HHOOK mNestedEventHook;
HHOOK mGlobalCallWndProcHook;
public:
bool mAsyncRenderSupport;
#endif
};

11
dom/plugins/ipc/PluginModuleParent.cpp
View File

@ -2714,11 +2714,16 @@ PluginModuleParent::NPP_NewInternal(NPMIMEType pluginType, NPP instance,
if (mIsFlashPlugin) {
parentInstance->InitMetadata(strPluginType, srcAttribute);
#ifdef XP_WIN
// Force windowless mode (bug 1201904) when sandbox level >= 2 or Win64
bool supportsAsyncRender = false;
CallModuleSupportsAsyncRender(&supportsAsyncRender);
#ifdef _WIN64
{
// For 64-bit builds force windowless if the flash library doesn't support
// async rendering regardless of sandbox level.
if (!supportsAsyncRender) {
#else
if (mSandboxLevel >= 2) {
// For 32-bit builds force windowless if the flash library doesn't support
// async rendering and the sandbox level is 2 or greater.
if (!supportsAsyncRender && mSandboxLevel >= 2) {
#endif
NS_NAMED_LITERAL_CSTRING(wmodeAttributeName, "wmode");
NS_NAMED_LITERAL_CSTRING(opaqueAttributeValue, "opaque");

1
dom/plugins/ipc/PluginTypes.ipdlh
View File

@ -17,6 +17,7 @@ struct PluginTag
bool isJavaPlugin;
bool isFlashPlugin;
bool supportsAsyncInit;
bool supportsAsyncRender; // flash specific
nsCString filename;
nsCString version;
int64_t lastModifiedTime;