Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 311 FrameView* view = m_localRoot->frameView(); | 311 FrameView* view = m_localRoot->frameView(); |
| 312 | 312 |
| 313 WebRect damagedRect(0, 0, m_size.width, m_size.height); | 313 WebRect damagedRect(0, 0, m_size.width, m_size.height); |
| 314 view->invalidateRect(damagedRect); | 314 view->invalidateRect(damagedRect); |
| 315 } | 315 } |
| 316 | 316 |
| 317 const WebInputEvent* WebFrameWidgetImpl::m_currentInputEvent = nullptr; | 317 const WebInputEvent* WebFrameWidgetImpl::m_currentInputEvent = nullptr; |
| 318 | 318 |
| 319 WebInputEventResult WebFrameWidgetImpl::handleInputEvent(const WebInputEvent& in putEvent) | 319 WebInputEventResult WebFrameWidgetImpl::handleInputEvent(const WebInputEvent& in putEvent) |
| 320 { | 320 { |
| 321 | |
|
kenrb
2016/02/25 00:58:04
This probably isn't worth touching Blink, I'm gues
wjmaclean
2016/02/25 12:23:02
Done.
| |
| 322 TRACE_EVENT1("input", "WebFrameWidgetImpl::handleInputEvent", "type", inputT ypeToName(inputEvent.type)); | 321 TRACE_EVENT1("input", "WebFrameWidgetImpl::handleInputEvent", "type", inputT ypeToName(inputEvent.type)); |
| 323 | 322 |
| 324 // Report the event to be NOT processed by WebKit, so that the browser can h andle it appropriately. | 323 // Report the event to be NOT processed by WebKit, so that the browser can h andle it appropriately. |
| 325 if (m_ignoreInputEvents) | 324 if (m_ignoreInputEvents) |
| 326 return WebInputEventResult::NotHandled; | 325 return WebInputEventResult::NotHandled; |
| 327 | 326 |
| 328 // FIXME: pass event to m_localRoot's WebDevToolsAgentImpl once available. | 327 // FIXME: pass event to m_localRoot's WebDevToolsAgentImpl once available. |
| 329 | 328 |
| 330 TemporaryChange<const WebInputEvent*> currentEventChange(m_currentInputEvent , &inputEvent); | 329 TemporaryChange<const WebInputEvent*> currentEventChange(m_currentInputEvent , &inputEvent); |
| 331 | 330 |
| (...skipping 750 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1082 | 1081 |
| 1083 HitTestResult WebFrameWidgetImpl::hitTestResultForRootFramePos(const IntPoint& p osInRootFrame) | 1082 HitTestResult WebFrameWidgetImpl::hitTestResultForRootFramePos(const IntPoint& p osInRootFrame) |
| 1084 { | 1083 { |
| 1085 IntPoint docPoint(m_localRoot->frame()->view()->rootFrameToContents(posInRoo tFrame)); | 1084 IntPoint docPoint(m_localRoot->frame()->view()->rootFrameToContents(posInRoo tFrame)); |
| 1086 HitTestResult result = m_localRoot->frame()->eventHandler().hitTestResultAtP oint(docPoint, HitTestRequest::ReadOnly | HitTestRequest::Active); | 1085 HitTestResult result = m_localRoot->frame()->eventHandler().hitTestResultAtP oint(docPoint, HitTestRequest::ReadOnly | HitTestRequest::Active); |
| 1087 result.setToShadowHostIfInUserAgentShadowRoot(); | 1086 result.setToShadowHostIfInUserAgentShadowRoot(); |
| 1088 return result; | 1087 return result; |
| 1089 } | 1088 } |
| 1090 | 1089 |
| 1091 } // namespace blink | 1090 } // namespace blink |
| OLD | NEW |