Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Side by Side Diff: Source/core/input/EventHandler.cpp

Issue 1210253003: Fix wheel event dispatch logic to fallback to document when hit-test fails (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Replace with passing Active to be consistent Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 1707 matching lines...) Expand 10 before | Expand all | Expand 10 after
1718 return false; 1718 return false;
1719 1719
1720 RefPtrWillBeRawPtr<FrameView> protector(m_frame->view()); 1720 RefPtrWillBeRawPtr<FrameView> protector(m_frame->view());
1721 1721
1722 FrameView* view = m_frame->view(); 1722 FrameView* view = m_frame->view();
1723 if (!view) 1723 if (!view)
1724 return false; 1724 return false;
1725 1725
1726 LayoutPoint vPoint = view->rootFrameToContents(event.position()); 1726 LayoutPoint vPoint = view->rootFrameToContents(event.position());
1727 1727
1728 HitTestRequest request(HitTestRequest::ReadOnly); 1728 // Pass Active to ensure that hit-test result in current document if otherwi se empty
1729 // TODO(majidvp): Avoid using Active to trigger hit-testing fallback. See ht tp://crbug.com/505825
1730 HitTestRequest request(HitTestRequest::ReadOnly | HitTestRequest::Active);
Rick Byers 2015/06/30 20:14:49 I assume you've done a search to verify that this
majidvp 2015/06/30 22:48:32 Yes I have. It shouldn't have any other side effec
Rick Byers 2015/07/01 13:41:03 Alright, good enough for a temporary hack. Thanks
1729 HitTestResult result(request, vPoint); 1731 HitTestResult result(request, vPoint);
1730 doc->layoutView()->hitTest(result); 1732 doc->layoutView()->hitTest(result);
1731 1733
1732 Node* node = result.innerNode(); 1734 Node* node = result.innerNode();
1733 // Wheel events should not dispatch to text nodes. 1735 // Wheel events should not dispatch to text nodes.
1734 if (node && node->isTextNode()) 1736 if (node && node->isTextNode())
1735 node = ComposedTreeTraversal::parent(*node); 1737 node = ComposedTreeTraversal::parent(*node);
1736 1738
1737 bool isOverWidget; 1739 bool isOverWidget;
1738 if (event.useLatchedEventNode()) { 1740 if (event.useLatchedEventNode()) {
(...skipping 2022 matching lines...) Expand 10 before | Expand all | Expand 10 after
3761 unsigned EventHandler::accessKeyModifiers() 3763 unsigned EventHandler::accessKeyModifiers()
3762 { 3764 {
3763 #if OS(MACOSX) 3765 #if OS(MACOSX)
3764 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; 3766 return PlatformEvent::CtrlKey | PlatformEvent::AltKey;
3765 #else 3767 #else
3766 return PlatformEvent::AltKey; 3768 return PlatformEvent::AltKey;
3767 #endif 3769 #endif
3768 } 3770 }
3769 3771
3770 } // namespace blink 3772 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698