diff options
| author | Steve Block <steveblock@google.com> | 2009-10-09 13:27:03 +0100 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2009-10-20 00:41:59 +0100 |
| commit | 3f252f84468859d129a8c6a9302412d2e6e5a3fa (patch) | |
| tree | 109b326a088d13e83fd53b4bace151f800647c1a /WebCore/plugins | |
| parent | 231d4e3152a9c27a73b6ac7badbe6be673aa3ddf (diff) | |
| download | external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.zip external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.tar.gz external_webkit-3f252f84468859d129a8c6a9302412d2e6e5a3fa.tar.bz2 | |
Merge webkit.org at R49305 : Fix merge conflicts.
Change-Id: I9e0ffbe9b9b824399653da038093874e315ccd6a
Diffstat (limited to 'WebCore/plugins')
| -rw-r--r-- | WebCore/plugins/PluginView.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/WebCore/plugins/PluginView.cpp b/WebCore/plugins/PluginView.cpp index 02fcbce..976e3ea 100644 --- a/WebCore/plugins/PluginView.cpp +++ b/WebCore/plugins/PluginView.cpp @@ -164,20 +164,16 @@ void PluginView::handleEvent(Event* event) handleMouseEvent(static_cast<MouseEvent*>(event)); else if (event->isKeyboardEvent()) handleKeyboardEvent(static_cast<KeyboardEvent*>(event)); -<<<<<<< HEAD:WebCore/plugins/PluginView.cpp #if defined(ANDROID_PLUGINS) else if (event->isTouchEvent()) handleTouchEvent(static_cast<TouchEvent*>(event)); -======= +#endif #if defined(Q_WS_X11) else if (event->type() == eventNames().DOMFocusOutEvent) handleFocusOutEvent(); else if (event->type() == eventNames().DOMFocusInEvent) handleFocusInEvent(); ->>>>>>> webkit.org at 49305:WebCore/plugins/PluginView.cpp #endif -<<<<<<< HEAD:WebCore/plugins/PluginView.cpp -======= } void PluginView::init() @@ -220,7 +216,6 @@ bool PluginView::startOrAddToUnstartedList() } return start(); ->>>>>>> webkit.org at 49305:WebCore/plugins/PluginView.cpp } @@ -332,13 +327,10 @@ void PluginView::stop() m_isStarted = false; #if USE(JSC) JSC::JSLock::DropAllLocks dropAllLocks(JSC::SilenceAssertionsOnly); -<<<<<<< HEAD:WebCore/plugins/PluginView.cpp #endif -======= #if ENABLE(NETSCAPE_PLUGIN_API) #if !PLATFORM(WX) // FIXME: Revisit this when implementing plugins for wx ->>>>>>> webkit.org at 49305:WebCore/plugins/PluginView.cpp #ifdef XP_WIN // Unsubclass the window if (m_isWindowed) { |