cef/patch/patches/chrome_pepper_flash_1586.patch
2016-01-07 11:53:39 -08:00

21 lines
603 B
Diff

diff --git pepper_flash.cc pepper_flash.cc
index 3b6cbd9..d4ba7ed 100644
--- pepper_flash.cc
+++ pepper_flash.cc
@@ -121,8 +121,15 @@ bool CheckPepperFlashManifest(const base::DictionaryValue& manifest,
std::string arch;
manifest.GetStringASCII("x-ppapi-arch", &arch);
+#if defined(OS_MACOSX)
+ // On Mac newer versions of the plugin are a universal binary and use "mac"
+ // as the value.
+ if (arch != kPepperFlashArch && arch != kPepperFlashOperatingSystem)
+ return false;
+#else
if (arch != kPepperFlashArch)
return false;
+#endif
*version_out = version;
return true;