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

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

Issue 235903003: Remove FrameView::containsScrollableArea (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 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
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/rendering/RenderLayerScrollableArea.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/EventHandler.cpp
diff --git a/Source/core/page/EventHandler.cpp b/Source/core/page/EventHandler.cpp
index 1fd074f6935f5f4302910f7571328a41826fd23b..15cfe353bcb4d7dff3d8f24688c96e073307d4fb 100644
--- a/Source/core/page/EventHandler.cpp
+++ b/Source/core/page/EventHandler.cpp
@@ -1450,13 +1450,9 @@ static RenderLayer* layerForNode(Node* node)
ScrollableArea* EventHandler::associatedScrollableArea(const RenderLayer* layer) const
{
- ScrollableArea* layerScrollableArea = layer->scrollableArea();
- if (!layerScrollableArea)
- return 0;
-
- if (FrameView* frameView = m_frame->view()) {
- if (frameView->containsScrollableArea(layerScrollableArea))
- return layerScrollableArea;
+ if (RenderLayerScrollableArea* scrollableArea = layer->scrollableArea()) {
+ if (scrollableArea->scrollsOverflow())
+ return scrollableArea;
}
return 0;
« no previous file with comments | « Source/core/frame/FrameView.cpp ('k') | Source/core/rendering/RenderLayerScrollableArea.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698