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

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

Issue 1686483002: Oilpan: Remove most WillBe types from the code base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 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 ab2d5509de0af71a189d0bf07b7ddfd6f36b6bb3..885297b652667dcd2bbd29d3cf97a9d940316eaa 100644
--- a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
+++ b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
@@ -82,9 +82,9 @@ WebLayer* toWebLayer(blink::GraphicsLayer* layer)
namespace blink {
-PassOwnPtrWillBeRawPtr<ScrollingCoordinator> ScrollingCoordinator::create(Page* page)
+RawPtr<ScrollingCoordinator> ScrollingCoordinator::create(Page* page)
{
- return adoptPtrWillBeNoop(new ScrollingCoordinator(page));
+ return new ScrollingCoordinator(page);
}
ScrollingCoordinator::ScrollingCoordinator(Page* page)
@@ -417,7 +417,7 @@ using GraphicsLayerHitTestRects = WTF::HashMap<const GraphicsLayer*, Vector<Layo
// Layers have child frames inside of them. This computes a mapping for the
// current frame which we can consult while walking the layers of that frame.
// Whenever we descend into a new frame, a new map will be created.
-using LayerFrameMap = WillBeHeapHashMap<const PaintLayer*, WillBeHeapVector<RawPtrWillBeMember<const LocalFrame>>>;
+using LayerFrameMap = HeapHashMap<const PaintLayer*, HeapVector<Member<const LocalFrame>>>;
static void makeLayerChildFrameMap(const LocalFrame* currentFrame, LayerFrameMap* map)
{
map->clear();
@@ -431,7 +431,7 @@ static void makeLayerChildFrameMap(const LocalFrame* currentFrame, LayerFrameMap
const PaintLayer* containingLayer = ownerLayoutObject->enclosingLayer();
LayerFrameMap::iterator iter = map->find(containingLayer);
if (iter == map->end())
- map->add(containingLayer, WillBeHeapVector<RawPtrWillBeMember<const LocalFrame>>()).storedValue->value.append(toLocalFrame(child));
+ map->add(containingLayer, HeapVector<Member<const LocalFrame>>()).storedValue->value.append(toLocalFrame(child));
else
iter->value.append(toLocalFrame(child));
}
@@ -746,7 +746,7 @@ Region ScrollingCoordinator::computeShouldHandleScrollGestureOnMainThreadRegion(
}
if (const FrameView::ChildrenWidgetSet* children = frameView->children()) {
- for (const RefPtrWillBeMember<Widget>& child : *children) {
+ for (const Member<Widget>& child : *children) {
if (!(*child).isPluginView())
continue;

Powered by Google App Engine
This is Rietveld 408576698