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

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

Issue 1814863002: Make page popups work under OOPIF (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disabled test on Mac Created 4 years, 9 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 2834 matching lines...) Expand 10 before | Expand all | Expand 10 after
2845 } else { 2845 } else {
2846 locationInRootFrame = IntPoint( 2846 locationInRootFrame = IntPoint(
2847 rightAligned 2847 rightAligned
2848 ? visualViewport.visibleRect().maxX() - kContextMenuMargin 2848 ? visualViewport.visibleRect().maxX() - kContextMenuMargin
2849 : visualViewport.location().x() + kContextMenuMargin, 2849 : visualViewport.location().x() + kContextMenuMargin,
2850 visualViewport.location().y() + kContextMenuMargin); 2850 visualViewport.location().y() + kContextMenuMargin);
2851 } 2851 }
2852 2852
2853 m_frame->view()->setCursor(pointerCursor()); 2853 m_frame->view()->setCursor(pointerCursor());
2854 IntPoint locationInViewport = visualViewport.rootFrameToViewport(locationInR ootFrame); 2854 IntPoint locationInViewport = visualViewport.rootFrameToViewport(locationInR ootFrame);
2855 IntPoint globalPosition = view->getHostWindow()->viewportToScreen(IntRect(lo cationInViewport, IntSize())).location(); 2855 IntPoint globalPosition = view->getHostWindow()->viewportToScreen(IntRect(lo cationInViewport, IntSize()), m_frame->view()).location();
2856 2856
2857 Node* targetNode = overrideTargetElement ? overrideTargetElement : doc->focu sedElement(); 2857 Node* targetNode = overrideTargetElement ? overrideTargetElement : doc->focu sedElement();
2858 if (!targetNode) 2858 if (!targetNode)
2859 targetNode = doc; 2859 targetNode = doc;
2860 2860
2861 // Use the focused node as the target for hover and active. 2861 // Use the focused node as the target for hover and active.
2862 HitTestRequest request(HitTestRequest::Active); 2862 HitTestRequest request(HitTestRequest::Active);
2863 HitTestResult result(request, locationInRootFrame); 2863 HitTestResult result(request, locationInRootFrame);
2864 result.setInnerNode(targetNode); 2864 result.setInnerNode(targetNode);
2865 doc->updateHoverActiveState(request, result.innerElement()); 2865 doc->updateHoverActiveState(request, result.innerElement());
(...skipping 1107 matching lines...) Expand 10 before | Expand all | Expand 10 after
3973 PlatformEvent::Modifiers EventHandler::accessKeyModifiers() 3973 PlatformEvent::Modifiers EventHandler::accessKeyModifiers()
3974 { 3974 {
3975 #if OS(MACOSX) 3975 #if OS(MACOSX)
3976 return static_cast<PlatformEvent::Modifiers>(PlatformEvent::CtrlKey | Platfo rmEvent::AltKey); 3976 return static_cast<PlatformEvent::Modifiers>(PlatformEvent::CtrlKey | Platfo rmEvent::AltKey);
3977 #else 3977 #else
3978 return PlatformEvent::AltKey; 3978 return PlatformEvent::AltKey;
3979 #endif 3979 #endif
3980 } 3980 }
3981 3981
3982 } // namespace blink 3982 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/core/frame/FrameView.cpp ('k') | third_party/WebKit/Source/core/inspector/InspectorInputAgent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698