Bug 1129267 - Fix by backing out patch for bug 1118615. r=mstange

This commit is contained in:
Steven Michaud
2015-02-09 12:10:33 -06:00
parent 1056864142
commit 32fbb0965d
4 changed files with 1 additions and 24 deletions

View File

@@ -2171,19 +2171,6 @@ _getvalue(NPP npp, NPNVariable variable, void *result)
nsNPAPIPluginInstance *inst =
(nsNPAPIPluginInstance *) (npp ? npp->ndata : nullptr);
double scaleFactor = inst ? inst->GetContentsScaleFactor() : 1.0;
// Work around a Flash ActionScript bug that causes long hangs if
// Flash thinks HiDPI support is available. Adobe is tracking this as
// ADBE 3921114. If this turns out to be Adobe's fault and they fix it,
// we'll no longer need this quirk. See QUIRK_FLASH_HIDE_HIDPI_SUPPORT
// in PluginModuleChild.h, and also bug 1118615.
if (inst) {
const char *mimeType;
inst->GetMIMEType(&mimeType);
NS_NAMED_LITERAL_CSTRING(flash, "application/x-shockwave-flash");
if (!PL_strncasecmp(mimeType, flash.get(), flash.Length())) {
scaleFactor = 1.0;
}
}
*(double*)result = scaleFactor;
return NPERR_NO_ERROR;
}