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

Unified Diff: Source/core/page/EventHandler.cpp

Issue 603193005: Move the Widget hierarchy to the Oilpan heap. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Add ~Scrollbar assert Created 6 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 side-by-side diff with in-line comments
Download patch
Index: Source/core/page/EventHandler.cpp
diff --git a/Source/core/page/EventHandler.cpp b/Source/core/page/EventHandler.cpp
index a9031ea4fc53df5498a3fb8b91c1f33420978c91..7e3b45cc3b47c624633eb45b3fa36776579d27a3 100644
--- a/Source/core/page/EventHandler.cpp
+++ b/Source/core/page/EventHandler.cpp
@@ -244,11 +244,13 @@ void EventHandler::trace(Visitor* visitor)
visitor->trace(m_nodeUnderMouse);
visitor->trace(m_lastNodeUnderMouse);
visitor->trace(m_lastMouseMoveEventSubframe);
+ visitor->trace(m_lastScrollbarUnderMouse);
visitor->trace(m_clickNode);
visitor->trace(m_dragTarget);
visitor->trace(m_frameSetBeingResized);
visitor->trace(m_latchedWheelEventNode);
visitor->trace(m_previousWheelScrolledNode);
+ visitor->trace(m_scrollbarHandlingScrollGesture);
visitor->trace(m_targetForTouchID);
visitor->trace(m_touchSequenceDocument);
visitor->trace(m_scrollGestureHandlingNode);
@@ -1202,7 +1204,7 @@ bool EventHandler::handleMousePressEvent(const PlatformMouseEvent& mouseEvent)
{
TRACE_EVENT0("blink", "EventHandler::handleMousePressEvent");
- RefPtr<FrameView> protector(m_frame->view());
+ RefPtrWillBeRawPtr<FrameView> protector(m_frame->view());
UserGestureIndicator gestureIndicator(DefinitelyProcessingUserGesture);
m_frame->localFrameRoot()->eventHandler().m_lastMouseDownUserGestureToken = gestureIndicator.currentToken();
@@ -1347,7 +1349,7 @@ bool EventHandler::handleMouseMoveEvent(const PlatformMouseEvent& event)
{
TRACE_EVENT0("blink", "EventHandler::handleMouseMoveEvent");
- RefPtr<FrameView> protector(m_frame->view());
+ RefPtrWillBeRawPtr<FrameView> protector(m_frame->view());
MaximumDurationTracker maxDurationTracker(&m_maxMouseMovedDuration);
HitTestResult hoveredNode = HitTestResult(LayoutPoint());
@@ -1376,7 +1378,7 @@ void EventHandler::handleMouseLeaveEvent(const PlatformMouseEvent& event)
{
TRACE_EVENT0("blink", "EventHandler::handleMouseLeaveEvent");
- RefPtr<FrameView> protector(m_frame->view());
+ RefPtrWillBeRawPtr<FrameView> protector(m_frame->view());
handleMouseMoveOrLeaveEvent(event);
}
@@ -1501,7 +1503,7 @@ bool EventHandler::handleMouseReleaseEvent(const PlatformMouseEvent& mouseEvent)
{
TRACE_EVENT0("blink", "EventHandler::handleMouseReleaseEvent");
- RefPtr<FrameView> protector(m_frame->view());
+ RefPtrWillBeRawPtr<FrameView> protector(m_frame->view());
m_frame->selection().setCaretBlinkingSuspended(false);
@@ -1955,7 +1957,7 @@ bool EventHandler::handleWheelEvent(const PlatformWheelEvent& event)
if (!doc->renderView())
return false;
- RefPtr<FrameView> protector(m_frame->view());
+ RefPtrWillBeRawPtr<FrameView> protector(m_frame->view());
FrameView* view = m_frame->view();
if (!view)
@@ -2100,7 +2102,7 @@ bool EventHandler::handleGestureEventInFrame(const GestureEventWithHitTestResult
ASSERT(!targetedEvent.event().isScrollEvent());
RefPtrWillBeRawPtr<Node> eventTarget = targetedEvent.hitTestResult().innerNode();
- RefPtr<Scrollbar> scrollbar = targetedEvent.hitTestResult().scrollbar();
+ RefPtrWillBeRawPtr<Scrollbar> scrollbar = targetedEvent.hitTestResult().scrollbar();
const PlatformGestureEvent& gestureEvent = targetedEvent.event();
if (scrollbar) {
@@ -2144,7 +2146,7 @@ bool EventHandler::handleGestureScrollEvent(const PlatformGestureEvent& gestureE
TRACE_EVENT0("input", "EventHandler::handleGestureScrollEvent");
RefPtrWillBeRawPtr<Node> eventTarget = nullptr;
- RefPtr<Scrollbar> scrollbar;
+ RefPtrWillBeRawPtr<Scrollbar> scrollbar = nullptr;
if (gestureEvent.type() != PlatformEvent::GestureScrollBegin) {
scrollbar = m_scrollbarHandlingScrollGesture.get();
eventTarget = m_scrollGestureHandlingNode.get();
@@ -2211,7 +2213,7 @@ bool EventHandler::handleGestureScrollEvent(const PlatformGestureEvent& gestureE
bool EventHandler::handleGestureTap(const GestureEventWithHitTestResults& targetedEvent)
{
- RefPtr<FrameView> protector(m_frame->view());
+ RefPtrWillBeRawPtr<FrameView> protector(m_frame->view());
const PlatformGestureEvent& gestureEvent = targetedEvent.event();
HitTestRequest::HitTestRequestType hitType = getHitTypeForGestureType(gestureEvent.type());
@@ -2305,7 +2307,7 @@ bool EventHandler::handleGestureLongPress(const GestureEventWithHitTestResults&
m_mouseDownMayStartDrag = true;
dragState().m_dragSrc = nullptr;
m_mouseDownPos = m_frame->view()->windowToContents(mouseDragEvent.position());
- RefPtr<FrameView> protector(m_frame->view());
+ RefPtrWillBeRawPtr<FrameView> protector(m_frame->view());
handleDrag(mev, DontCheckDragHysteresis);
if (m_didStartDrag) {
m_longTapShouldInvokeContextMenu = true;
@@ -2439,7 +2441,7 @@ bool EventHandler::handleGestureScrollUpdate(const PlatformGestureEvent& gesture
if (!renderer)
return false;
- RefPtr<FrameView> protector(m_frame->view());
+ RefPtrWillBeRawPtr<FrameView> protector(m_frame->view());
Node* stopNode = 0;
bool scrollShouldNotPropagate = gestureEvent.type() == PlatformEvent::GestureScrollUpdateWithoutPropagation;
@@ -2995,7 +2997,7 @@ bool EventHandler::isKeyEventAllowedInFullScreen(Fullscreen* fullscreen, const P
bool EventHandler::keyEvent(const PlatformKeyboardEvent& initialKeyEvent)
{
- RefPtr<FrameView> protector(m_frame->view());
+ RefPtrWillBeRawPtr<FrameView> protector(m_frame->view());
ASSERT(m_frame->document());
if (Fullscreen* fullscreen = Fullscreen::fromIfExists(*m_frame->document())) {

Powered by Google App Engine
This is Rietveld 408576698