bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
cef/patch/patches/chrome_pepper_flash_1586.patch

21 lines
603 B
Diff
Raw Normal View History

Add Pepper Flash plugin support (issue #1586). A system-wide installation of the Pepper Flash plugin is available from Adobe for Windows and Mac OS X platforms as a separate download. To enable automatic detection and loading of the system-wide installation pass the `--enable-system-flash` command-line flag. The Pepper Flash plugin can also be loaded by specifying the file path and version via the `--ppapi-flash-path=<path> --ppapi-flash-version=<version>` command-line flags. The version can be identified by viewing the manifest.json file in the same directory as the Pepper Flash plugin library.
2015-03-25 22:22:47 +01:00
diff --git pepper_flash.cc pepper_flash.cc
Update to Chromium revision 59d44948 (#323860)
2015-04-20 13:11:11 +02:00
index da1c00d..f96c17d 100644
Add Pepper Flash plugin support (issue #1586). A system-wide installation of the Pepper Flash plugin is available from Adobe for Windows and Mac OS X platforms as a separate download. To enable automatic detection and loading of the system-wide installation pass the `--enable-system-flash` command-line flag. The Pepper Flash plugin can also be loaded by specifying the file path and version via the `--ppapi-flash-path=<path> --ppapi-flash-version=<version>` command-line flags. The version can be identified by viewing the manifest.json file in the same directory as the Pepper Flash plugin library.
2015-03-25 22:22:47 +01:00
--- pepper_flash.cc
+++ pepper_flash.cc
Update to Chromium revision 59d44948 (#323860)
2015-04-20 13:11:11 +02:00
@@ -119,8 +119,15 @@ bool CheckPepperFlashManifest(const base::DictionaryValue& manifest,
Add Pepper Flash plugin support (issue #1586). A system-wide installation of the Pepper Flash plugin is available from Adobe for Windows and Mac OS X platforms as a separate download. To enable automatic detection and loading of the system-wide installation pass the `--enable-system-flash` command-line flag. The Pepper Flash plugin can also be loaded by specifying the file path and version via the `--ppapi-flash-path=<path> --ppapi-flash-version=<version>` command-line flags. The version can be identified by viewing the manifest.json file in the same directory as the Pepper Flash plugin library.
2015-03-25 22:22:47 +01:00
Update to Chromium revision 59d44948 (#323860)
2015-04-20 13:11:11 +02:00
std::string arch;
manifest.GetStringASCII("x-ppapi-arch", &arch);
Add Pepper Flash plugin support (issue #1586). A system-wide installation of the Pepper Flash plugin is available from Adobe for Windows and Mac OS X platforms as a separate download. To enable automatic detection and loading of the system-wide installation pass the `--enable-system-flash` command-line flag. The Pepper Flash plugin can also be loaded by specifying the file path and version via the `--ppapi-flash-path=<path> --ppapi-flash-version=<version>` command-line flags. The version can be identified by viewing the manifest.json file in the same directory as the Pepper Flash plugin library.
2015-03-25 22:22:47 +01:00
+#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;