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

Unified Diff: Source/web/WebViewImpl.cpp

Issue 23677012: Tell the root layer it has a wheel handler when a select is active (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: use WheelController instead 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/web/WebViewImpl.cpp
diff --git a/Source/web/WebViewImpl.cpp b/Source/web/WebViewImpl.cpp
index 3cd8a54068bd35a1e95930c193eb081fc28904e9..9c768d473aefd7e4cde3f72bc3357bf936739bd5 100644
--- a/Source/web/WebViewImpl.cpp
+++ b/Source/web/WebViewImpl.cpp
@@ -98,6 +98,7 @@
#include "core/dom/KeyboardEvent.h"
#include "core/dom/NodeRenderStyle.h"
#include "core/dom/Text.h"
+#include "core/dom/WheelController.h"
#include "core/dom/WheelEvent.h"
#include "core/editing/Editor.h"
#include "core/editing/FrameSelection.h"
@@ -1531,6 +1532,8 @@ void WebViewImpl::popupOpened(WebCore::PopupContainer* popupContainer)
if (popupContainer->popupType() == WebCore::PopupContainer::Select) {
ASSERT(!m_selectPopup);
m_selectPopup = popupContainer;
+ Document* document = mainFrameImpl()->frame()->document();
+ WheelController::from(document)->didAddWheelEventHandler(document);
}
}
@@ -1539,6 +1542,8 @@ void WebViewImpl::popupClosed(WebCore::PopupContainer* popupContainer)
if (popupContainer->popupType() == WebCore::PopupContainer::Select) {
ASSERT(m_selectPopup);
m_selectPopup = 0;
+ Document* document = mainFrameImpl()->frame()->document();
+ WheelController::from(document)->didRemoveWheelEventHandler(document);
}
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698