diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-13 22:18:58 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-13 22:18:58 +0000 |
| commit | a2d489b22f9e3f361adeaf7a09ae88510a2bb1e3 (patch) | |
| tree | ff3dd61a3278c60286a820e9f07952e4571743e5 /webkit/glue/plugins/plugin_instance.cc | |
| parent | 16ead307a2b27b7d02bae66792eaf3c2f904b9c0 (diff) | |
| download | chromium_src-a2d489b22f9e3f361adeaf7a09ae88510a2bb1e3.zip chromium_src-a2d489b22f9e3f361adeaf7a09ae88510a2bb1e3.tar.gz chromium_src-a2d489b22f9e3f361adeaf7a09ae88510a2bb1e3.tar.bz2 | |
Basic windowless plugins, try 2.
In response to Dean's comment on http://codereview.chromium.org/39105,
I redid that patch to put the X munging into the plugin implementation. This
won't work for multiproc, but it's near the correct place and many things will
need to be changed for multiproc.
Review URL: http://codereview.chromium.org/42056
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11674 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/plugins/plugin_instance.cc')
| -rw-r--r-- | webkit/glue/plugins/plugin_instance.cc | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/webkit/glue/plugins/plugin_instance.cc b/webkit/glue/plugins/plugin_instance.cc index 9d28592..6738435 100644 --- a/webkit/glue/plugins/plugin_instance.cc +++ b/webkit/glue/plugins/plugin_instance.cc @@ -4,6 +4,11 @@ #include "config.h" +#include "build/build_config.h" +#if defined(OS_LINUX) +#define MOZ_X11 1 +#endif + #include "webkit/glue/plugins/plugin_instance.h" #include "base/file_util.h" @@ -130,6 +135,12 @@ bool PluginInstance::HandleEvent(UINT message, WPARAM wParam, LPARAM lParam) { windowEvent.wParam = static_cast<uint32>(wParam); return NPP_HandleEvent(&windowEvent) != 0; } +#elif defined(OS_LINUX) +bool PluginInstance::HandleEvent(XEvent* event) { + if (!windowless_) + return false; + return NPP_HandleEvent(event); +} #endif bool PluginInstance::Start(const GURL& url, |