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

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: 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 2878 matching lines...) Expand 10 before | Expand all | Expand 10 after
2889 } else { 2889 } else {
2890 locationInRootFrame = IntPoint( 2890 locationInRootFrame = IntPoint(
2891 rightAligned 2891 rightAligned
2892 ? visualViewport.visibleRect().maxX() - kContextMenuMargin 2892 ? visualViewport.visibleRect().maxX() - kContextMenuMargin
2893 : visualViewport.location().x() + kContextMenuMargin, 2893 : visualViewport.location().x() + kContextMenuMargin,
2894 visualViewport.location().y() + kContextMenuMargin); 2894 visualViewport.location().y() + kContextMenuMargin);
2895 } 2895 }
2896 2896
2897 m_frame->view()->setCursor(pointerCursor()); 2897 m_frame->view()->setCursor(pointerCursor());
2898 IntPoint locationInViewport = visualViewport.rootFrameToViewport(locationInR ootFrame); 2898 IntPoint locationInViewport = visualViewport.rootFrameToViewport(locationInR ootFrame);
2899 IntPoint globalPosition = view->hostWindow()->viewportToScreen(IntRect(locat ionInViewport, IntSize())).location(); 2899 IntPoint globalPosition = view->hostWindow()->viewportToScreen(IntRect(locat ionInViewport, IntSize()), m_frame->view()).location();
2900 2900
2901 Node* targetNode = overrideTargetElement ? overrideTargetElement : doc->focu sedElement(); 2901 Node* targetNode = overrideTargetElement ? overrideTargetElement : doc->focu sedElement();
2902 if (!targetNode) 2902 if (!targetNode)
2903 targetNode = doc; 2903 targetNode = doc;
2904 2904
2905 // Use the focused node as the target for hover and active. 2905 // Use the focused node as the target for hover and active.
2906 HitTestRequest request(HitTestRequest::Active); 2906 HitTestRequest request(HitTestRequest::Active);
2907 HitTestResult result(request, locationInRootFrame); 2907 HitTestResult result(request, locationInRootFrame);
2908 result.setInnerNode(targetNode); 2908 result.setInnerNode(targetNode);
2909 doc->updateHoverActiveState(request, result.innerElement()); 2909 doc->updateHoverActiveState(request, result.innerElement());
(...skipping 1105 matching lines...) Expand 10 before | Expand all | Expand 10 after
4015 PlatformEvent::Modifiers EventHandler::accessKeyModifiers() 4015 PlatformEvent::Modifiers EventHandler::accessKeyModifiers()
4016 { 4016 {
4017 #if OS(MACOSX) 4017 #if OS(MACOSX)
4018 return static_cast<PlatformEvent::Modifiers>(PlatformEvent::CtrlKey | Platfo rmEvent::AltKey); 4018 return static_cast<PlatformEvent::Modifiers>(PlatformEvent::CtrlKey | Platfo rmEvent::AltKey);
4019 #else 4019 #else
4020 return PlatformEvent::AltKey; 4020 return PlatformEvent::AltKey;
4021 #endif 4021 #endif
4022 } 4022 }
4023 4023
4024 } // namespace blink 4024 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698