third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp - Issue 1717283003: tracing: Make ConvertableToTraceFormat move-only scoped_ptr

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/platform/graphics/GraphicsLayer.cpp

Issue 1717283003: tracing: Make ConvertableToTraceFormat move-only scoped_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 4 years, 10 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

« cc/layers/layer_impl.cc ('K') | « third_party/WebKit/Source/platform/graphics/GraphicsLayer.h ('k') | third_party/WebKit/Source/platform/graphics/GraphicsLayerDebugInfo.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp

diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp

index a4eeb81b89dad35d791f15161f0f4ff820495010..6728acc554f25c70ac8734bf80b0f4008b10b071 100644

--- a/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp

+++ b/third_party/WebKit/Source/platform/graphics/GraphicsLayer.cpp

@@ -1237,11 +1237,11 @@ void GraphicsLayer::didScroll()

}

-scoped_refptr<base::trace_event::ConvertableToTraceFormat> GraphicsLayer::TakeDebugInfo(cc::Layer* layer)

+scoped_ptr<base::trace_event::ConvertableToTraceFormat> GraphicsLayer::TakeDebugInfo(cc::Layer* layer)

{

- scoped_refptr<base::trace_event::TracedValue> tracedValue = m_debugInfo.asTracedValue();

+ scoped_ptr<base::trace_event::TracedValue> tracedValue(m_debugInfo.asTracedValue());

tracedValue->SetString("layer_name", WTF::StringUTF8Adaptor(debugName(layer)).asStringPiece());

- return tracedValue;

+ return std::move(tracedValue);

}

PaintController& GraphicsLayer::paintController()