| 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 5f013b185cfcb8dc0f99b02cb061c6541442a231..9c3b32e6e99eee9ad99e90f4dab54ccc48cc3438 100644
|
| --- a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
|
| +++ b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp
|
| @@ -81,9 +81,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)
|
| @@ -445,7 +445,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();
|
| @@ -459,7 +459,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));
|
| }
|
| @@ -767,7 +767,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;
|
|
|
|
|