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

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

Issue 2723993002: Rename platform/Widget to platform/FrameViewBase in core. (Closed)
Patch Set: Created 3 years, 9 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2011 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 972 matching lines...) Expand 10 before | Expand all | Expand 10 after
983 // Map corner to top-frame coords. 983 // Map corner to top-frame coords.
984 corner = scrollableArea->box() 984 corner = scrollableArea->box()
985 .localToAbsoluteQuad(FloatRect(corner), 985 .localToAbsoluteQuad(FloatRect(corner),
986 TraverseDocumentBoundaries) 986 TraverseDocumentBoundaries)
987 .enclosingBoundingBox(); 987 .enclosingBoundingBox();
988 shouldHandleScrollGestureOnMainThreadRegion.unite(corner); 988 shouldHandleScrollGestureOnMainThreadRegion.unite(corner);
989 } 989 }
990 } 990 }
991 991
992 if (const FrameView::ChildrenWidgetSet* children = frameView->children()) { 992 if (const FrameView::ChildrenWidgetSet* children = frameView->children()) {
993 for (const Member<Widget>& child : *children) { 993 for (const Member<FrameViewBase>& child : *children) {
994 if (!(*child).isPluginView()) 994 if (!(*child).isPluginView())
995 continue; 995 continue;
996 996
997 PluginView* pluginView = toPluginView(child.get()); 997 PluginView* pluginView = toPluginView(child.get());
998 if (pluginView->wantsWheelEvents()) { 998 if (pluginView->wantsWheelEvents()) {
999 IntRect box = frameView->convertToRootFrame(pluginView->frameRect()); 999 IntRect box = frameView->convertToRootFrame(pluginView->frameRect());
1000 shouldHandleScrollGestureOnMainThreadRegion.unite(box); 1000 shouldHandleScrollGestureOnMainThreadRegion.unite(box);
1001 } 1001 }
1002 } 1002 }
1003 } 1003 }
(...skipping 184 matching lines...) Expand 10 before | Expand all | Expand 10 after
1188 frameView ? toWebLayer(frameView->layoutViewportScrollableArea() 1188 frameView ? toWebLayer(frameView->layoutViewportScrollableArea()
1189 ->layerForScrolling()) 1189 ->layerForScrolling())
1190 : nullptr) { 1190 : nullptr) {
1191 return WebSize(frameView->layoutViewportScrollableArea()->contentsSize()) != 1191 return WebSize(frameView->layoutViewportScrollableArea()->contentsSize()) !=
1192 scrollLayer->bounds(); 1192 scrollLayer->bounds();
1193 } 1193 }
1194 return false; 1194 return false;
1195 } 1195 }
1196 1196
1197 } // namespace blink 1197 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698