| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. | 2 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. |
| 3 * Copyright (C) 2011 Apple Inc. All rights reserved. | 3 * Copyright (C) 2011 Apple Inc. All rights reserved. |
| 4 * | 4 * |
| 5 * Redistribution and use in source and binary forms, with or without | 5 * Redistribution and use in source and binary forms, with or without |
| 6 * modification, are permitted provided that the following conditions are | 6 * modification, are permitted provided that the following conditions are |
| 7 * met: | 7 * met: |
| 8 * | 8 * |
| 9 * * Redistributions of source code must retain the above copyright | 9 * * Redistributions of source code must retain the above copyright |
| 10 * notice, this list of conditions and the following disclaimer. | 10 * notice, this list of conditions and the following disclaimer. |
| (...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 530 const WebInputEvent* inputEvent = WebViewImpl::currentInputEvent(); | 530 const WebInputEvent* inputEvent = WebViewImpl::currentInputEvent(); |
| 531 if (!inputEvent || (inputEvent->type != WebInputEvent::MouseUp && (inputEven
t->type != WebInputEvent::RawKeyDown && inputEvent->type != WebInputEvent::KeyDo
wn) | 531 if (!inputEvent || (inputEvent->type != WebInputEvent::MouseUp && (inputEven
t->type != WebInputEvent::RawKeyDown && inputEvent->type != WebInputEvent::KeyDo
wn) |
| 532 && inputEvent->type != WebInputEvent::GestureTap)) | 532 && inputEvent->type != WebInputEvent::GestureTap)) |
| 533 return false; | 533 return false; |
| 534 | 534 |
| 535 unsigned short buttonNumber; | 535 unsigned short buttonNumber; |
| 536 if (WebInputEvent::isMouseEventType(inputEvent->type)) { | 536 if (WebInputEvent::isMouseEventType(inputEvent->type)) { |
| 537 const WebMouseEvent* mouseEvent = static_cast<const WebMouseEvent*>(inpu
tEvent); | 537 const WebMouseEvent* mouseEvent = static_cast<const WebMouseEvent*>(inpu
tEvent); |
| 538 | 538 |
| 539 switch (mouseEvent->button) { | 539 switch (mouseEvent->button) { |
| 540 case WebMouseEvent::ButtonLeft: | 540 case WebMouseEvent::Button::Left: |
| 541 buttonNumber = 0; | 541 buttonNumber = 0; |
| 542 break; | 542 break; |
| 543 case WebMouseEvent::ButtonMiddle: | 543 case WebMouseEvent::Button::Middle: |
| 544 buttonNumber = 1; | 544 buttonNumber = 1; |
| 545 break; | 545 break; |
| 546 case WebMouseEvent::ButtonRight: | 546 case WebMouseEvent::Button::Right: |
| 547 buttonNumber = 2; | 547 buttonNumber = 2; |
| 548 break; | 548 break; |
| 549 default: | 549 default: |
| 550 return false; | 550 return false; |
| 551 } | 551 } |
| 552 } else { | 552 } else { |
| 553 // The click is simulated when triggering the keypress event. | 553 // The click is simulated when triggering the keypress event. |
| 554 buttonNumber = 0; | 554 buttonNumber = 0; |
| 555 } | 555 } |
| 556 bool ctrl = inputEvent->modifiers & WebMouseEvent::ControlKey; | 556 bool ctrl = inputEvent->modifiers & WebMouseEvent::ControlKey; |
| (...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1029 { | 1029 { |
| 1030 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())->
devToolsAgentImpl(); | 1030 return WebLocalFrameImpl::fromFrame(m_webFrame->frame()->localFrameRoot())->
devToolsAgentImpl(); |
| 1031 } | 1031 } |
| 1032 | 1032 |
| 1033 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) | 1033 KURL FrameLoaderClientImpl::overrideFlashEmbedWithHTML(const KURL& url) |
| 1034 { | 1034 { |
| 1035 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); | 1035 return m_webFrame->client()->overrideFlashEmbedWithHTML(WebURL(url)); |
| 1036 } | 1036 } |
| 1037 | 1037 |
| 1038 } // namespace blink | 1038 } // namespace blink |
| OLD | NEW |