Chromium Code Reviews| Index: Source/core/page/EventHandler.cpp |
| diff --git a/Source/core/page/EventHandler.cpp b/Source/core/page/EventHandler.cpp |
| index 55a07108fe384eddf4e7d7407552417884a1d2ed..f3a5c71153928c5b8569cffef5fb49706669b3e2 100644 |
| --- a/Source/core/page/EventHandler.cpp |
| +++ b/Source/core/page/EventHandler.cpp |
| @@ -922,10 +922,10 @@ bool EventHandler::bubblingScroll(ScrollDirection direction, ScrollGranularity g |
| FrameView* view = frame->view(); |
| if (view && view->scroll(direction, granularity)) |
| return true; |
| - frame = frame->tree().parent(); |
| - if (!frame) |
| + Frame* parentFrame = frame->tree().parent(); |
| + if (!parentFrame || !parentFrame->isLocalFrame()) |
| return false; |
| - return frame->eventHandler().bubblingScroll(direction, granularity, m_frame->ownerElement()); |
| + return toLocalFrame(parentFrame)->eventHandler().bubblingScroll(direction, granularity, m_frame->ownerElement()); |
| } |
| IntPoint EventHandler::lastKnownMousePosition() const |
| @@ -1509,7 +1509,7 @@ bool EventHandler::handleMouseReleaseEvent(const PlatformMouseEvent& mouseEvent) |
| OwnPtr<UserGestureIndicator> gestureIndicator; |
| if (m_frame->localFrameRoot()->eventHandler().m_lastMouseDownUserGestureToken) |
| - gestureIndicator = adoptPtr(new UserGestureIndicator(m_frame->tree().top()->eventHandler().m_lastMouseDownUserGestureToken.release())); |
| + gestureIndicator = adoptPtr(new UserGestureIndicator(m_frame->localFrameRoot()->eventHandler().m_lastMouseDownUserGestureToken.release())); |
|
dcheng
2014/05/30 21:02:58
How come the diff doesn't include localFrameRoot?
kenrb
2014/05/30 21:43:27
That was a previous CL that already landed. I miss
|
| else |
| gestureIndicator = adoptPtr(new UserGestureIndicator(DefinitelyProcessingUserGesture)); |