diff options
| author | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-10 17:56:39 +0000 |
|---|---|---|
| committer | dglazkov@google.com <dglazkov@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-10 17:56:39 +0000 |
| commit | 9b451c0bce7c09d32a1f885f2b86fc388ecd8ee7 (patch) | |
| tree | 258cddf035cb585b515ee8d69bc58b3e4e9d8620 /webkit/glue/webplugin_impl.cc | |
| parent | 81f3095725e27bc914f5ce85d99a929f76a347d3 (diff) | |
| download | chromium_src-9b451c0bce7c09d32a1f885f2b86fc388ecd8ee7.zip chromium_src-9b451c0bce7c09d32a1f885f2b86fc388ecd8ee7.tar.gz chromium_src-9b451c0bce7c09d32a1f885f2b86fc388ecd8ee7.tar.bz2 | |
Landing 37604:38097 merge
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5110 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/glue/webplugin_impl.cc')
| -rw-r--r-- | webkit/glue/webplugin_impl.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/webkit/glue/webplugin_impl.cc b/webkit/glue/webplugin_impl.cc index 6d3fef8..80936f9 100644 --- a/webkit/glue/webplugin_impl.cc +++ b/webkit/glue/webplugin_impl.cc @@ -808,9 +808,9 @@ void WebPluginImpl::handleMouseEvent(WebCore::MouseEvent* event) { if (event->shiftKey()) np_event.wParam |= MK_SHIFT; - if ((event->type() == WebCore::EventNames::mousemoveEvent) || - (event->type() == WebCore::EventNames::mouseoutEvent) || - (event->type() == WebCore::EventNames::mouseoverEvent)) { + if ((event->type() == WebCore::eventNames().mousemoveEvent) || + (event->type() == WebCore::eventNames().mouseoutEvent) || + (event->type() == WebCore::eventNames().mouseoverEvent)) { np_event.event = WM_MOUSEMOVE; if (event->buttonDown()) { switch (event->button()) { @@ -825,7 +825,7 @@ void WebPluginImpl::handleMouseEvent(WebCore::MouseEvent* event) { break; } } - } else if (event->type() == WebCore::EventNames::mousedownEvent) { + } else if (event->type() == WebCore::eventNames().mousedownEvent) { // Ensure that the frame containing the plugin has focus. WebCore::Frame* containing_frame = webframe_->frame(); if (WebCore::Page* current_page = containing_frame->page()) { @@ -851,7 +851,7 @@ void WebPluginImpl::handleMouseEvent(WebCore::MouseEvent* event) { np_event.wParam |= MK_RBUTTON; break; } - } else if (event->type() == WebCore::EventNames::mouseupEvent) { + } else if (event->type() == WebCore::eventNames().mouseupEvent) { switch (event->button()) { case WebCore::LeftButton: np_event.event = WM_LBUTTONUP; @@ -889,10 +889,10 @@ void WebPluginImpl::handleKeyboardEvent(WebCore::KeyboardEvent* event) { NPEvent np_event; np_event.wParam = event->keyCode(); - if (event->type() == WebCore::EventNames::keydownEvent) { + if (event->type() == WebCore::eventNames().keydownEvent) { np_event.event = WM_KEYDOWN; np_event.lParam = 0; - } else if (event->type() == WebCore::EventNames::keyupEvent) { + } else if (event->type() == WebCore::eventNames().keyupEvent) { np_event.event = WM_KEYUP; np_event.lParam = 0x8000; } else { |