Chromium Code Reviews| Index: Source/core/page/scrolling/ScrollingCoordinator.cpp |
| diff --git a/Source/core/page/scrolling/ScrollingCoordinator.cpp b/Source/core/page/scrolling/ScrollingCoordinator.cpp |
| index 4784f8db7b5a475a9a5d372440a532d0694c28a1..be1ffcfee743ce760687fb53f3365fb08972e181 100644 |
| --- a/Source/core/page/scrolling/ScrollingCoordinator.cpp |
| +++ b/Source/core/page/scrolling/ScrollingCoordinator.cpp |
| @@ -241,7 +241,7 @@ static PassOwnPtr<WebScrollbarLayer> createScrollbarLayer(Scrollbar* scrollbar) |
| blink::WebScrollbarThemePainter painter(theme, scrollbar); |
| OwnPtr<blink::WebScrollbarThemeGeometry> geometry(blink::WebScrollbarThemeGeometryNative::create(theme)); |
| - OwnPtr<WebScrollbarLayer> scrollbarLayer = adoptPtr(blink::Platform::current()->compositorSupport()->createScrollbarLayer(new blink::WebScrollbarImpl(scrollbar), painter, geometry.leakPtr())); |
| + OwnPtr<WebScrollbarLayer> scrollbarLayer = adoptPtr(blink::Platform::current()->compositorSupport()->createScrollbarLayer(WebScrollbarImpl::create(scrollbar), painter, geometry.leakPtr())); |
| GraphicsLayer::registerContentsLayer(scrollbarLayer->layer()); |
| return scrollbarLayer.release(); |
| } |
| @@ -721,8 +721,8 @@ Region ScrollingCoordinator::computeShouldHandleScrollGestureOnMainThreadRegion( |
| } |
| } |
| - if (const HashSet<RefPtr<Widget> >* children = frameView->children()) { |
| - for (HashSet<RefPtr<Widget> >::const_iterator it = children->begin(), end = children->end(); it != end; ++it) { |
| + if (const WillBeHeapHashSet<RefPtrWillBeMember<Widget> >* children = frameView->children()) { |
|
haraken
2014/10/11 17:33:02
ChildrenWidgetSet
sof
2014/10/12 08:16:22
Done.
|
| + for (WillBeHeapHashSet<RefPtrWillBeMember<Widget> >::const_iterator it = children->begin(), end = children->end(); it != end; ++it) { |
| if (!(*it)->isPluginView()) |
| continue; |