| Index: Source/web/WebViewImpl.cpp
|
| diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
|
| index 03a17e4291a42a38a598eb6315447ce66eea4a2f..5ef071365cb7b9caa30a9eba683b56a7c5c5070e 100644
|
| --- a/Source/web/WebViewImpl.cpp
|
| +++ b/Source/web/WebViewImpl.cpp
|
| @@ -1409,7 +1409,11 @@ bool WebViewImpl::scrollViewWithKeyboard(int keyCode, int modifiers)
|
| #endif
|
| if (!mapKeyCodeForScroll(keyCode, &scrollDirection, &scrollGranularity))
|
| return false;
|
| - return bubblingScroll(scrollDirection, scrollGranularity);
|
| +
|
| + LocalFrame* frame = toLocalFrame(focusedWebCoreFrame());
|
| + if (!frame)
|
| + return false;
|
| + return frame->eventHandler().bubblingScroll(scrollDirection, scrollGranularity);
|
| }
|
|
|
| bool WebViewImpl::mapKeyCodeForScroll(int keyCode,
|
| @@ -1462,15 +1466,6 @@ void WebViewImpl::hideSelectPopup()
|
| m_selectPopup->hidePopup();
|
| }
|
|
|
| -bool WebViewImpl::bubblingScroll(ScrollDirection scrollDirection, ScrollGranularity scrollGranularity)
|
| -{
|
| - LocalFrame* frame = toLocalFrame(focusedWebCoreFrame());
|
| - if (!frame)
|
| - return false;
|
| -
|
| - return frame->eventHandler().bubblingScroll(scrollDirection, scrollGranularity);
|
| -}
|
| -
|
| void WebViewImpl::popupOpened(PopupContainer* popupContainer)
|
| {
|
| ASSERT(!m_selectPopup);
|
|
|