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

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

Issue 625073002: Merge RenderWidget into single subclass, RenderPart (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fix unit test failures Created 6 years, 2 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
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 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 #include "core/page/EditorClient.h" 72 #include "core/page/EditorClient.h"
73 #include "core/page/FocusController.h" 73 #include "core/page/FocusController.h"
74 #include "core/page/FrameTree.h" 74 #include "core/page/FrameTree.h"
75 #include "core/page/Page.h" 75 #include "core/page/Page.h"
76 #include "core/page/SpatialNavigation.h" 76 #include "core/page/SpatialNavigation.h"
77 #include "core/page/TouchAdjustment.h" 77 #include "core/page/TouchAdjustment.h"
78 #include "core/rendering/HitTestRequest.h" 78 #include "core/rendering/HitTestRequest.h"
79 #include "core/rendering/HitTestResult.h" 79 #include "core/rendering/HitTestResult.h"
80 #include "core/rendering/RenderFlowThread.h" 80 #include "core/rendering/RenderFlowThread.h"
81 #include "core/rendering/RenderLayer.h" 81 #include "core/rendering/RenderLayer.h"
82 #include "core/rendering/RenderPart.h"
82 #include "core/rendering/RenderTextControlSingleLine.h" 83 #include "core/rendering/RenderTextControlSingleLine.h"
83 #include "core/rendering/RenderView.h" 84 #include "core/rendering/RenderView.h"
84 #include "core/rendering/RenderWidget.h"
85 #include "core/rendering/style/RenderStyle.h" 85 #include "core/rendering/style/RenderStyle.h"
86 #include "core/svg/SVGDocumentExtensions.h" 86 #include "core/svg/SVGDocumentExtensions.h"
87 #include "platform/PlatformGestureEvent.h" 87 #include "platform/PlatformGestureEvent.h"
88 #include "platform/PlatformKeyboardEvent.h" 88 #include "platform/PlatformKeyboardEvent.h"
89 #include "platform/PlatformTouchEvent.h" 89 #include "platform/PlatformTouchEvent.h"
90 #include "platform/PlatformWheelEvent.h" 90 #include "platform/PlatformWheelEvent.h"
91 #include "platform/RuntimeEnabledFeatures.h" 91 #include "platform/RuntimeEnabledFeatures.h"
92 #include "platform/TraceEvent.h" 92 #include "platform/TraceEvent.h"
93 #include "platform/WindowsKeyboardCodes.h" 93 #include "platform/WindowsKeyboardCodes.h"
94 #include "platform/geometry/FloatPoint.h" 94 #include "platform/geometry/FloatPoint.h"
(...skipping 855 matching lines...) Expand 10 before | Expand all | Expand 10 after
950 return 0; 950 return 0;
951 951
952 RenderObject* renderer = node->renderer(); 952 RenderObject* renderer = node->renderer();
953 if (!renderer || !renderer->isWidget()) 953 if (!renderer || !renderer->isWidget())
954 return 0; 954 return 0;
955 955
956 // FIXME: This explicit check is needed only until RemoteFrames have RemoteF rameViews. 956 // FIXME: This explicit check is needed only until RemoteFrames have RemoteF rameViews.
957 if (isHTMLFrameElementBase(node) && toHTMLFrameElementBase(node)->contentFra me() && toHTMLFrameElementBase(node)->contentFrame()->isRemoteFrameTemporary()) 957 if (isHTMLFrameElementBase(node) && toHTMLFrameElementBase(node)->contentFra me() && toHTMLFrameElementBase(node)->contentFrame()->isRemoteFrameTemporary())
958 return 0; 958 return 0;
959 959
960 Widget* widget = toRenderWidget(renderer)->widget(); 960 Widget* widget = toRenderPart(renderer)->widget();
961 if (!widget || !widget->isFrameView()) 961 if (!widget || !widget->isFrameView())
962 return 0; 962 return 0;
963 963
964 return &toFrameView(widget)->frame(); 964 return &toFrameView(widget)->frame();
965 } 965 }
966 966
967 static LocalFrame* subframeForHitTestResult(const MouseEventWithHitTestResults& hitTestResult) 967 static LocalFrame* subframeForHitTestResult(const MouseEventWithHitTestResults& hitTestResult)
968 { 968 {
969 if (!hitTestResult.isOverWidget()) 969 if (!hitTestResult.isOverWidget())
970 return 0; 970 return 0;
(...skipping 1014 matching lines...) Expand 10 before | Expand all | Expand 10 after
1985 m_previousWheelScrolledNode = nullptr; 1985 m_previousWheelScrolledNode = nullptr;
1986 1986
1987 isOverWidget = result.isOverWidget(); 1987 isOverWidget = result.isOverWidget();
1988 } 1988 }
1989 1989
1990 if (node) { 1990 if (node) {
1991 // Figure out which view to send the event to. 1991 // Figure out which view to send the event to.
1992 RenderObject* target = node->renderer(); 1992 RenderObject* target = node->renderer();
1993 1993
1994 if (isOverWidget && target && target->isWidget()) { 1994 if (isOverWidget && target && target->isWidget()) {
1995 Widget* widget = toRenderWidget(target)->widget(); 1995 Widget* widget = toRenderPart(target)->widget();
1996 if (widget && passWheelEventToWidget(event, widget)) 1996 if (widget && passWheelEventToWidget(event, widget))
1997 RETURN_WHEEL_EVENT_HANDLED(); 1997 RETURN_WHEEL_EVENT_HANDLED();
1998 } 1998 }
1999 1999
2000 if (node && !node->dispatchWheelEvent(event)) 2000 if (node && !node->dispatchWheelEvent(event))
2001 RETURN_WHEEL_EVENT_HANDLED(); 2001 RETURN_WHEEL_EVENT_HANDLED();
2002 } 2002 }
2003 2003
2004 // We do another check on the frame view because the event handler can run J S which results in the frame getting destroyed. 2004 // We do another check on the frame view because the event handler can run J S which results in the frame getting destroyed.
2005 view = m_frame->view(); 2005 view = m_frame->view();
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after
2370 bool EventHandler::passScrollGestureEventToWidget(const PlatformGestureEvent& ge stureEvent, RenderObject* renderer) 2370 bool EventHandler::passScrollGestureEventToWidget(const PlatformGestureEvent& ge stureEvent, RenderObject* renderer)
2371 { 2371 {
2372 ASSERT(gestureEvent.isScrollEvent()); 2372 ASSERT(gestureEvent.isScrollEvent());
2373 2373
2374 if (!m_lastGestureScrollOverWidget) 2374 if (!m_lastGestureScrollOverWidget)
2375 return false; 2375 return false;
2376 2376
2377 if (!renderer || !renderer->isWidget()) 2377 if (!renderer || !renderer->isWidget())
2378 return false; 2378 return false;
2379 2379
2380 Widget* widget = toRenderWidget(renderer)->widget(); 2380 Widget* widget = toRenderPart(renderer)->widget();
2381 2381
2382 if (!widget || !widget->isFrameView()) 2382 if (!widget || !widget->isFrameView())
2383 return false; 2383 return false;
2384 2384
2385 return toFrameView(widget)->frame().eventHandler().handleGestureScrollEvent( gestureEvent); 2385 return toFrameView(widget)->frame().eventHandler().handleGestureScrollEvent( gestureEvent);
2386 } 2386 }
2387 2387
2388 bool EventHandler::handleGestureScrollEnd(const PlatformGestureEvent& gestureEve nt) { 2388 bool EventHandler::handleGestureScrollEnd(const PlatformGestureEvent& gestureEve nt) {
2389 RefPtrWillBeRawPtr<Node> node = m_scrollGestureHandlingNode; 2389 RefPtrWillBeRawPtr<Node> node = m_scrollGestureHandlingNode;
2390 clearGestureScrollNodes(); 2390 clearGestureScrollNodes();
(...skipping 1486 matching lines...) Expand 10 before | Expand all | Expand 10 after
3877 unsigned EventHandler::accessKeyModifiers() 3877 unsigned EventHandler::accessKeyModifiers()
3878 { 3878 {
3879 #if OS(MACOSX) 3879 #if OS(MACOSX)
3880 return PlatformEvent::CtrlKey | PlatformEvent::AltKey; 3880 return PlatformEvent::CtrlKey | PlatformEvent::AltKey;
3881 #else 3881 #else
3882 return PlatformEvent::AltKey; 3882 return PlatformEvent::AltKey;
3883 #endif 3883 #endif
3884 } 3884 }
3885 3885
3886 } // namespace blink 3886 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698