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

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

Issue 23728003: Return Frame&, not Frame* from RenderView::frame() (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: fixed PopupMenuTest build Created 7 years, 3 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/editing/Caret.cpp ('k') | Source/core/page/Frame.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1033 matching lines...) Expand 10 before | Expand all | Expand 10 after
1044 return 0; 1044 return 0;
1045 1045
1046 RenderObject* renderer = node->renderer(); 1046 RenderObject* renderer = node->renderer();
1047 if (!renderer || !renderer->isWidget()) 1047 if (!renderer || !renderer->isWidget())
1048 return 0; 1048 return 0;
1049 1049
1050 Widget* widget = toRenderWidget(renderer)->widget(); 1050 Widget* widget = toRenderWidget(renderer)->widget();
1051 if (!widget || !widget->isFrameView()) 1051 if (!widget || !widget->isFrameView())
1052 return 0; 1052 return 0;
1053 1053
1054 return toFrameView(widget)->frame(); 1054 return &toFrameView(widget)->frame();
1055 } 1055 }
1056 1056
1057 static bool isSubmitImage(Node* node) 1057 static bool isSubmitImage(Node* node)
1058 { 1058 {
1059 return node && node->hasTagName(inputTag) && toHTMLInputElement(node)->isIma geButton(); 1059 return node && node->hasTagName(inputTag) && toHTMLInputElement(node)->isIma geButton();
1060 } 1060 }
1061 1061
1062 // Returns true if the node's editable block is not current focused for editing 1062 // Returns true if the node's editable block is not current focused for editing
1063 static bool nodeIsNotBeingEdited(Node* node, Frame* frame) 1063 static bool nodeIsNotBeingEdited(Node* node, Frame* frame)
1064 { 1064 {
(...skipping 1391 matching lines...) Expand 10 before | Expand all | Expand 10 after
2456 } 2456 }
2457 2457
2458 bool EventHandler::passGestureEventToWidget(const PlatformGestureEvent& gestureE vent, Widget* widget) 2458 bool EventHandler::passGestureEventToWidget(const PlatformGestureEvent& gestureE vent, Widget* widget)
2459 { 2459 {
2460 if (!widget) 2460 if (!widget)
2461 return false; 2461 return false;
2462 2462
2463 if (!widget->isFrameView()) 2463 if (!widget->isFrameView())
2464 return false; 2464 return false;
2465 2465
2466 return toFrameView(widget)->frame()->eventHandler()->handleGestureEvent(gest ureEvent); 2466 return toFrameView(widget)->frame().eventHandler()->handleGestureEvent(gestu reEvent);
2467 } 2467 }
2468 2468
2469 bool EventHandler::passGestureEventToWidgetIfPossible(const PlatformGestureEvent & gestureEvent, RenderObject* renderer) 2469 bool EventHandler::passGestureEventToWidgetIfPossible(const PlatformGestureEvent & gestureEvent, RenderObject* renderer)
2470 { 2470 {
2471 if (m_lastHitTestResultOverWidget && renderer && renderer->isWidget()) { 2471 if (m_lastHitTestResultOverWidget && renderer && renderer->isWidget()) {
2472 Widget* widget = toRenderWidget(renderer)->widget(); 2472 Widget* widget = toRenderWidget(renderer)->widget();
2473 return widget && passGestureEventToWidget(gestureEvent, widget); 2473 return widget && passGestureEventToWidget(gestureEvent, widget);
2474 } 2474 }
2475 return false; 2475 return false;
2476 } 2476 }
(...skipping 1336 matching lines...) Expand 10 before | Expand all | Expand 10 after
3813 // We can sometimes get a null widget! EventHandlerMac handles a null 3813 // We can sometimes get a null widget! EventHandlerMac handles a null
3814 // widget by returning false, so we do the same. 3814 // widget by returning false, so we do the same.
3815 if (!widget) 3815 if (!widget)
3816 return false; 3816 return false;
3817 3817
3818 // If not a FrameView, then probably a plugin widget. Those will receive 3818 // If not a FrameView, then probably a plugin widget. Those will receive
3819 // the event via an EventTargetNode dispatch when this returns false. 3819 // the event via an EventTargetNode dispatch when this returns false.
3820 if (!widget->isFrameView()) 3820 if (!widget->isFrameView())
3821 return false; 3821 return false;
3822 3822
3823 return toFrameView(widget)->frame()->eventHandler()->handleWheelEvent(wheelE vent); 3823 return toFrameView(widget)->frame().eventHandler()->handleWheelEvent(wheelEv ent);
3824 } 3824 }
3825 3825
3826 bool EventHandler::passWidgetMouseDownEventToWidget(const MouseEventWithHitTestR esults& event) 3826 bool EventHandler::passWidgetMouseDownEventToWidget(const MouseEventWithHitTestR esults& event)
3827 { 3827 {
3828 // Figure out which view to send the event to. 3828 // Figure out which view to send the event to.
3829 if (!event.targetNode() || !event.targetNode()->renderer() || !event.targetN ode()->renderer()->isWidget()) 3829 if (!event.targetNode() || !event.targetNode()->renderer() || !event.targetN ode()->renderer()->isWidget())
3830 return false; 3830 return false;
3831 return false; 3831 return false;
3832 } 3832 }
3833 3833
(...skipping 14 matching lines...) Expand all
3848 unsigned EventHandler::accessKeyModifiers() 3848 unsigned EventHandler::accessKeyModifiers()
3849 { 3849 {
3850 #if OS(DARWIN) 3850 #if OS(DARWIN)
3851 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; 3851 return PlatformEvent::CtrlKey | PlatformEvent::AltKey;
3852 #else 3852 #else
3853 return PlatformEvent::AltKey; 3853 return PlatformEvent::AltKey;
3854 #endif 3854 #endif
3855 } 3855 }
3856 3856
3857 } // namespace WebCore 3857 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/editing/Caret.cpp ('k') | Source/core/page/Frame.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698