| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights |
| 3 * reserved. | 3 * reserved. |
| 4 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) | 4 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) |
| 5 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) | 5 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) |
| 6 * | 6 * |
| 7 * Redistribution and use in source and binary forms, with or without | 7 * Redistribution and use in source and binary forms, with or without |
| 8 * modification, are permitted provided that the following conditions | 8 * modification, are permitted provided that the following conditions |
| 9 * are met: | 9 * are met: |
| 10 * 1. Redistributions of source code must retain the above copyright | 10 * 1. Redistributions of source code must retain the above copyright |
| (...skipping 717 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 728 event_result = WebInputEventResult::kHandledSystem; | 728 event_result = WebInputEventResult::kHandledSystem; |
| 729 else | 729 else |
| 730 event_result = mouse_event_manager_->HandleMousePressEvent(mev); | 730 event_result = mouse_event_manager_->HandleMousePressEvent(mev); |
| 731 } | 731 } |
| 732 | 732 |
| 733 if (mev.GetHitTestResult().InnerNode() && | 733 if (mev.GetHitTestResult().InnerNode() && |
| 734 mouse_event.button == WebPointerProperties::Button::kLeft) { | 734 mouse_event.button == WebPointerProperties::Button::kLeft) { |
| 735 DCHECK_EQ(WebInputEvent::kMouseDown, mouse_event.GetType()); | 735 DCHECK_EQ(WebInputEvent::kMouseDown, mouse_event.GetType()); |
| 736 HitTestResult result = mev.GetHitTestResult(); | 736 HitTestResult result = mev.GetHitTestResult(); |
| 737 result.SetToShadowHostIfInRestrictedShadowRoot(); | 737 result.SetToShadowHostIfInRestrictedShadowRoot(); |
| 738 frame_->GetChromeClient().OnMouseDown(result.InnerNode()); | 738 frame_->GetChromeClient().OnMouseDown(*result.InnerNode()); |
| 739 } | 739 } |
| 740 | 740 |
| 741 return event_result; | 741 return event_result; |
| 742 } | 742 } |
| 743 | 743 |
| 744 WebInputEventResult EventHandler::HandleMouseMoveEvent( | 744 WebInputEventResult EventHandler::HandleMouseMoveEvent( |
| 745 const WebMouseEvent& event, | 745 const WebMouseEvent& event, |
| 746 const Vector<WebMouseEvent>& coalesced_events) { | 746 const Vector<WebMouseEvent>& coalesced_events) { |
| 747 TRACE_EVENT0("blink", "EventHandler::handleMouseMoveEvent"); | 747 TRACE_EVENT0("blink", "EventHandler::handleMouseMoveEvent"); |
| 748 | 748 |
| (...skipping 1362 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2111 MouseEventWithHitTestResults& mev, | 2111 MouseEventWithHitTestResults& mev, |
| 2112 LocalFrame* subframe) { | 2112 LocalFrame* subframe) { |
| 2113 WebInputEventResult result = | 2113 WebInputEventResult result = |
| 2114 subframe->GetEventHandler().HandleMouseReleaseEvent(mev.Event()); | 2114 subframe->GetEventHandler().HandleMouseReleaseEvent(mev.Event()); |
| 2115 if (result != WebInputEventResult::kNotHandled) | 2115 if (result != WebInputEventResult::kNotHandled) |
| 2116 return result; | 2116 return result; |
| 2117 return WebInputEventResult::kHandledSystem; | 2117 return WebInputEventResult::kHandledSystem; |
| 2118 } | 2118 } |
| 2119 | 2119 |
| 2120 } // namespace blink | 2120 } // namespace blink |
| OLD | NEW |