Make accelerated plugin support aware of the requirement to use the

real OpenGL implementation rather than the Mesa software renderer. If
not using desktop GL, then do not advertise Core Animation support,
and make accelerated surface initialization fail.

BUG=68751
TEST=none (ran reliability_tests with these changes)

Review URL: http://codereview.chromium.org/6166003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70909 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 17 insertions, 1 deletions

diff --git a/webkit/plugins/npapi/plugin_host.cc b/webkit/plugins/npapi/plugin_host.cc
index 7bea68b..7e502da 100644
--- a/webkit/plugins/npapi/plugin_host.cc
+++ b/webkit/plugins/npapi/plugin_host.cc
@@ -4,6 +4,8 @@
 
 #include "webkit/plugins/npapi/plugin_host.h"
 
+#include "app/gfx/gl/gl_context.h"
+#include "app/gfx/gl/gl_implementation.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/scoped_ptr.h"
@@ -51,7 +53,21 @@ static PluginInstance* FindInstance(NPP id) {
 static bool SupportsSharingAcceleratedSurfaces() {
   int32 major, minor, bugfix;
   base::SysInfo::OperatingSystemVersionNumbers(&major, &minor, &bugfix);
-  return major > 10 || (major == 10 && minor > 5);
+  bool isSnowLeopardOrLater = major > 10 || (major == 10 && minor > 5);
+  if (!isSnowLeopardOrLater)
+    return false;
+  // We also need to be running with desktop GL and not the software
+  // OSMesa renderer in order to share accelerated surfaces between
+  // processes.
+  gfx::GLImplementation implementation = gfx::GetGLImplementation();
+  if (implementation == gfx::kGLImplementationNone) {
+    // Not initialized yet.
+    if (!gfx::GLContext::InitializeOneOff()) {
+      return false;
+    }
+    implementation = gfx::GetGLImplementation();
+  }
+  return (implementation == gfx::kGLImplementationDesktopGL);
 }
 #endif