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

Unified Diff: third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp

Issue 2845583002: Remove FrameViewBase as base class of RemoteFrameView. (Closed)
Patch Set: fix scrollbar inactive Created 3 years, 8 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: third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
diff --git a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
index be89186618379733becce7107e6ef7f3e41ab966..d06b8c13aa79086e0c7794132847ad34fae24188 100644
--- a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
+++ b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
@@ -1005,8 +1005,9 @@ Region ScrollingCoordinator::ComputeShouldHandleScrollGestureOnMainThreadRegion(
}
}
- if (const FrameView::PluginsSet* plugins = frame_view->Plugins()) {
- for (const Member<PluginView>& plugin : *plugins) {
+ for (const auto& child : frame_view->Children()) {
+ if (child->IsPluginView()) {
+ PluginView* plugin = ToPluginView(child);
if (plugin->WantsWheelEvents()) {
IntRect box = frame_view->ConvertToRootFrame(plugin->FrameRect());
should_handle_scroll_gesture_on_main_thread_region.Unite(box);

Powered by Google App Engine
This is Rietveld 408576698