From e7a0355a3c06420cda2ead75c78cad08873fe504 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Thu, 11 Oct 2012 19:12:59 +0000 Subject: [PATCH] Merge revision 852 changes: - Mac: Fix display of Flash plugins (issue #741). git-svn-id: https://chromiumembedded.googlecode.com/svn/branches/1271@853 5089003a-bbd8-11dd-ad1f-f1f9622dbc98 --- cef1/libcef/cef_process_ui_thread_mac.mm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cef1/libcef/cef_process_ui_thread_mac.mm b/cef1/libcef/cef_process_ui_thread_mac.mm index 0ef7ebfaa..f4c93c9df 100644 --- a/cef1/libcef/cef_process_ui_thread_mac.mm +++ b/cef1/libcef/cef_process_ui_thread_mac.mm @@ -9,7 +9,9 @@ #include "libcef/cef_process_ui_thread.h" #include "libcef/browser_webkit_glue.h" #include "libcef/cef_context.h" +#include "base/command_line.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h" +#include "ui/base/ui_base_switches.h" void CefProcessUIThread::PlatformInit() { // The NSApplication instance must implement the CefAppProtocol protocol. @@ -18,6 +20,10 @@ void CefProcessUIThread::PlatformInit() { // On Mac, the select popup menus are rendered by the browser. WebKit::WebView::setUseExternalPopupMenus(true); + + // Core Animation mode for plugins is not supported. + CommandLine::ForCurrentProcess()->AppendSwitch( + switches::kDisableCoreAnimationPlugins); } void CefProcessUIThread::PlatformCleanUp() {