summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-18 21:17:08 +0000
committerstuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-18 21:17:08 +0000
commitefe233d692f21e32c5005952b9abd56ce6123f28 (patch)
tree0868ce3273daf13aa166c672e6a2dd45aabd2584 /webkit
parentbbf2e836e4209b1fcdad802089a2d4fbde6f3661 (diff)
downloadchromium_src-efe233d692f21e32c5005952b9abd56ce6123f28.zip
chromium_src-efe233d692f21e32c5005952b9abd56ce6123f28.tar.gz
chromium_src-efe233d692f21e32c5005952b9abd56ce6123f28.tar.bz2
Revert 32398 - Re-enable Cocoa event model for plugins
BUG=28159 TEST=Flash 10.1 pre-release should use Cocoa event model (which currently means playback stalls when there are no mouse events coming in). Review URL: http://codereview.chromium.org/399079 TBR=amanda@chromium.org Review URL: http://codereview.chromium.org/402064 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/glue/plugins/plugin_host.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/webkit/glue/plugins/plugin_host.cc b/webkit/glue/plugins/plugin_host.cc
index 2e675274..7abe811 100644
--- a/webkit/glue/plugins/plugin_host.cc
+++ b/webkit/glue/plugins/plugin_host.cc
@@ -851,6 +851,7 @@ 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<NPBool*>(value);
@@ -860,7 +861,6 @@ 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<NPBool*>(value);
@@ -952,10 +952,11 @@ NPError NPN_SetValue(NPP id, NPPVariable variable, void *value) {
}
case NPPVpluginEventModel:
{
- // we only support the Carbon event model
+ // we support Carbon and Cocoa event models
int model = reinterpret_cast<int>(value);
switch (model) {
case NPEventModelCarbon:
+ case NPEventModelCocoa:
plugin->set_event_model(model);
return NPERR_NO_ERROR;
break;