diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-08 22:02:26 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-08 22:02:26 +0000 |
| commit | f4038e86c5b2631523f26dbdd1cbfa311998dce8 (patch) | |
| tree | 0ccd3ed5cd7c205f5cbe1a2035fb4c367dce509c /webkit | |
| parent | 12125442a70ca9068934dff1799d5be655956df7 (diff) | |
| download | chromium_src-f4038e86c5b2631523f26dbdd1cbfa311998dce8.zip chromium_src-f4038e86c5b2631523f26dbdd1cbfa311998dce8.tar.gz chromium_src-f4038e86c5b2631523f26dbdd1cbfa311998dce8.tar.bz2 | |
Take out temp code now that WebKit patch has landed.
TBR=darin
Review URL: http://codereview.chromium.org/671018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@40948 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/glue/plugins/webplugin_delegate_impl_gtk.cc | 6 | ||||
| -rw-r--r-- | webkit/glue/plugins/webplugin_delegate_impl_win.cc | 6 |
2 files changed, 0 insertions, 12 deletions
diff --git a/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc b/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc index 23f4143..081b54b 100644 --- a/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc +++ b/webkit/glue/plugins/webplugin_delegate_impl_gtk.cc @@ -20,8 +20,6 @@ #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/WebKit/chromium/public/WebCursorInfo.h" #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" -// TODO(jabdelmalek): remove me once two sided patch lands -#include "third_party/WebKit/WebKit/chromium/public/WebPluginContainer.h" #include "webkit/glue/webplugin.h" #include "webkit/glue/plugins/gtk_plugin_container.h" #include "webkit/glue/plugins/plugin_constants_win.h" @@ -698,12 +696,8 @@ bool WebPluginDelegateImpl::PlatformHandleInputEvent( } bool ret = instance()->NPP_HandleEvent(&np_event) != 0; - // TODO(jabdelmalek): remove the ifdef, and include, once the WebKit side - // lands. -#ifdef WEBPLUGINCONTAINER_DOESNT_MODIFY_HANDLED // Flash always returns false, even when the event is handled. ret = true; -#endif #if 0 if (event->event == WM_MOUSEMOVE) { diff --git a/webkit/glue/plugins/webplugin_delegate_impl_win.cc b/webkit/glue/plugins/webplugin_delegate_impl_win.cc index a11fc40..e4f58c3 100644 --- a/webkit/glue/plugins/webplugin_delegate_impl_win.cc +++ b/webkit/glue/plugins/webplugin_delegate_impl_win.cc @@ -18,8 +18,6 @@ #include "base/win_util.h" #include "skia/ext/platform_canvas.h" #include "third_party/WebKit/WebKit/chromium/public/WebInputEvent.h" -// TODO(jabdelmalek): remove me once two sided patch lands -#include "third_party/WebKit/WebKit/chromium/public/WebPluginContainer.h" #include "webkit/default_plugin/plugin_impl.h" #include "webkit/glue/plugins/plugin_constants_win.h" #include "webkit/glue/plugins/plugin_instance.h" @@ -1146,15 +1144,11 @@ bool WebPluginDelegateImpl::PlatformHandleInputEvent( bool ret = instance()->NPP_HandleEvent(&np_event) != 0; - // TODO(jabdelmalek): remove the ifdef, and include, once the WebKit side - // lands. -#ifdef WEBPLUGINCONTAINER_DOESNT_MODIFY_HANDLED // Flash and SilverLight always return false, even when they swallow the // event. Flash does this because it passes the event to its window proc, // which is supposed to return 0 if an event was handled. There are few // exceptions, such as IME, where it sometimes returns true. ret = true; -#endif if (np_event.event == WM_MOUSEMOVE) { // Snag a reference to the current cursor ASAP in case the plugin modified |