| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. | 2 * Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All rights reserv
ed. |
| 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) | 3 * Copyright (C) 2006 Alexey Proskuryakov (ap@webkit.org) |
| 4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) | 4 * Copyright (C) 2012 Digia Plc. and/or its subsidiary(-ies) |
| 5 * | 5 * |
| 6 * Redistribution and use in source and binary forms, with or without | 6 * Redistribution and use in source and binary forms, with or without |
| 7 * modification, are permitted provided that the following conditions | 7 * modification, are permitted provided that the following conditions |
| 8 * are met: | 8 * are met: |
| 9 * 1. Redistributions of source code must retain the above copyright | 9 * 1. 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 821 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 832 { | 832 { |
| 833 return autoscrollController() && autoscrollController()->panScrollInProgress
(); | 833 return autoscrollController() && autoscrollController()->panScrollInProgress
(); |
| 834 } | 834 } |
| 835 | 835 |
| 836 HitTestResult EventHandler::hitTestResultAtPoint(const LayoutPoint& point, HitTe
stRequest::HitTestRequestType hitType, const LayoutSize& padding) | 836 HitTestResult EventHandler::hitTestResultAtPoint(const LayoutPoint& point, HitTe
stRequest::HitTestRequestType hitType, const LayoutSize& padding) |
| 837 { | 837 { |
| 838 TRACE_EVENT0("blink", "EventHandler::hitTestResultAtPoint"); | 838 TRACE_EVENT0("blink", "EventHandler::hitTestResultAtPoint"); |
| 839 | 839 |
| 840 // We always send hitTestResultAtPoint to the main frame if we have one, | 840 // We always send hitTestResultAtPoint to the main frame if we have one, |
| 841 // otherwise we might hit areas that are obscured by higher frames. | 841 // otherwise we might hit areas that are obscured by higher frames. |
| 842 if (Page* page = m_frame->page()) { | 842 if (m_frame->page()) { |
| 843 LocalFrame* mainFrame = page->mainFrame()->isLocalFrame() ? page->deprec
atedLocalMainFrame() : 0; | 843 LocalFrame* mainFrame = m_frame->localFrameRoot(); |
| 844 if (mainFrame && m_frame != mainFrame) { | 844 if (mainFrame && m_frame != mainFrame) { |
| 845 FrameView* frameView = m_frame->view(); | 845 FrameView* frameView = m_frame->view(); |
| 846 FrameView* mainView = mainFrame->view(); | 846 FrameView* mainView = mainFrame->view(); |
| 847 if (frameView && mainView) { | 847 if (frameView && mainView) { |
| 848 IntPoint mainFramePoint = mainView->rootViewToContents(frameView
->contentsToRootView(roundedIntPoint(point))); | 848 IntPoint mainFramePoint = mainView->rootViewToContents(frameView
->contentsToRootView(roundedIntPoint(point))); |
| 849 return mainFrame->eventHandler().hitTestResultAtPoint(mainFrameP
oint, hitType, padding); | 849 return mainFrame->eventHandler().hitTestResultAtPoint(mainFrameP
oint, hitType, padding); |
| 850 } | 850 } |
| 851 } | 851 } |
| 852 } | 852 } |
| 853 | 853 |
| (...skipping 2954 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3808 unsigned EventHandler::accessKeyModifiers() | 3808 unsigned EventHandler::accessKeyModifiers() |
| 3809 { | 3809 { |
| 3810 #if OS(MACOSX) | 3810 #if OS(MACOSX) |
| 3811 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; | 3811 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; |
| 3812 #else | 3812 #else |
| 3813 return PlatformEvent::AltKey; | 3813 return PlatformEvent::AltKey; |
| 3814 #endif | 3814 #endif |
| 3815 } | 3815 } |
| 3816 | 3816 |
| 3817 } // namespace WebCore | 3817 } // namespace WebCore |
| OLD | NEW |