third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp - Issue 1980893002: Remove OwnPtr::release() calls in core/ (part 4).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1980893002: Remove OwnPtr::release() calls in core/ (part 4). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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 | « third_party/WebKit/Source/core/page/scrolling/ScrollStateTest.cpp ('k') | third_party/WebKit/Source/core/paint/FilterPainter.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 120b2a1e3cd90b850cbba145b5db087969ca3642..97799b10a5ac01fb9daa42727134a48aab38e27a 100644

--- a/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp

+++ b/third_party/WebKit/Source/core/page/scrolling/ScrollingCoordinator.cpp

@@ -286,7 +286,7 @@ static PassOwnPtr<WebScrollbarLayer> createScrollbarLayer(Scrollbar& scrollbar,

OwnPtr<WebScrollbarLayer> scrollbarLayer = adoptPtr(Platform::current()->compositorSupport()->createScrollbarLayer(WebScrollbarImpl::create(&scrollbar), painter, geometry.leakPtr()));

GraphicsLayer::registerContentsLayer(scrollbarLayer->layer());

- return scrollbarLayer.release();

+ return scrollbarLayer;

}

PassOwnPtr<WebScrollbarLayer> ScrollingCoordinator::createSolidColorScrollbarLayer(ScrollbarOrientation orientation, int thumbThickness, int trackStart, bool isLeftSideVerticalScrollbar)

@@ -294,7 +294,7 @@ PassOwnPtr<WebScrollbarLayer> ScrollingCoordinator::createSolidColorScrollbarLay

WebScrollbar::Orientation webOrientation = (orientation == HorizontalScrollbar) ? WebScrollbar::Horizontal : WebScrollbar::Vertical;

OwnPtr<WebScrollbarLayer> scrollbarLayer = adoptPtr(Platform::current()->compositorSupport()->createSolidColorScrollbarLayer(webOrientation, thumbThickness, trackStart, isLeftSideVerticalScrollbar));

GraphicsLayer::registerContentsLayer(scrollbarLayer->layer());

- return scrollbarLayer.release();

+ return scrollbarLayer;

}

static void detachScrollbarLayer(GraphicsLayer* scrollbarGraphicsLayer)

@@ -356,7 +356,7 @@ void ScrollingCoordinator::scrollableAreaScrollbarLayerDidChange(ScrollableArea*

} else {

webScrollbarLayer = createScrollbarLayer(scrollbar, m_page->deviceScaleFactor());

}

- scrollbarLayer = addWebScrollbarLayer(scrollableArea, orientation, webScrollbarLayer.release());

+ scrollbarLayer = addWebScrollbarLayer(scrollableArea, orientation, std::move(webScrollbarLayer));

}

WebLayer* scrollLayer = toWebLayer(scrollableArea->layerForScrolling());