From bbf2e836e4209b1fcdad802089a2d4fbde6f3661 Mon Sep 17 00:00:00 2001 From: "stuartmorgan@chromium.org" Date: Wed, 18 Nov 2009 21:12:48 +0000 Subject: Remove plugin Cocoa event model temporarily BUG=28159 TEST=Flash 10.1 preview should work reasonably well. Review URL: http://codereview.chromium.org/399079 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32398 0039d316-1c4b-4281-b951-d872f2087c98 --- webkit/glue/plugins/plugin_host.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'webkit/glue') diff --git a/webkit/glue/plugins/plugin_host.cc b/webkit/glue/plugins/plugin_host.cc index 7abe811..2e675274 100644 --- a/webkit/glue/plugins/plugin_host.cc +++ b/webkit/glue/plugins/plugin_host.cc @@ -851,7 +851,6 @@ NPError NPN_GetValue(NPP id, NPNVariable variable, void *value) { } case NPNVsupportsCoreGraphicsBool: case NPNVsupportsCarbonBool: - case NPNVsupportsCocoaBool: { // we do support these drawing and event models. NPBool* supports_model = reinterpret_cast(value); @@ -861,6 +860,7 @@ NPError NPN_GetValue(NPP id, NPNVariable variable, void *value) { } case NPNVsupportsOpenGLBool: case NPNVsupportsCoreAnimationBool: + case NPNVsupportsCocoaBool: { // we do not support these drawing and event models. NPBool* supports_model = reinterpret_cast(value); @@ -952,11 +952,10 @@ NPError NPN_SetValue(NPP id, NPPVariable variable, void *value) { } case NPPVpluginEventModel: { - // we support Carbon and Cocoa event models + // we only support the Carbon event model int model = reinterpret_cast(value); switch (model) { case NPEventModelCarbon: - case NPEventModelCocoa: plugin->set_event_model(model); return NPERR_NO_ERROR; break; -- cgit v1.1