third_party/WebKit/Source/modules/mediacapturefromelement/HTMLCanvasElementCapture.cpp - Issue 2050123002: Remove OwnPtr from Blink.

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/modules/mediacapturefromelement/HTMLCanvasElementCapture.cpp

Issue 2050123002: Remove OwnPtr from Blink. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: First attempt to land. Created 4 years, 6 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/modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.cpp ('k') | third_party/WebKit/Source/modules/mediacapturefromelement/OnRequestCanvasDrawListener.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/mediacapturefromelement/HTMLCanvasElementCapture.cpp

diff --git a/third_party/WebKit/Source/modules/mediacapturefromelement/HTMLCanvasElementCapture.cpp b/third_party/WebKit/Source/modules/mediacapturefromelement/HTMLCanvasElementCapture.cpp

index cdf1317e9ef40cea2bcd989253804a2f0a4d7b2c..cb88f4c953e618a3610b432fddb29412813d7a3b 100644

--- a/third_party/WebKit/Source/modules/mediacapturefromelement/HTMLCanvasElementCapture.cpp

+++ b/third_party/WebKit/Source/modules/mediacapturefromelement/HTMLCanvasElementCapture.cpp

@@ -12,6 +12,8 @@

#include "public/platform/WebCanvasCaptureHandler.h"

#include "public/platform/WebMediaStream.h"

#include "public/platform/WebMediaStreamTrack.h"

+#include "wtf/PtrUtil.h"

+#include <memory>

namespace {

const double kDefaultFrameRate = 60.0;

@@ -43,11 +45,11 @@ MediaStream* HTMLCanvasElementCapture::captureStream(HTMLCanvasElement& element,

WebMediaStreamTrack track;

const WebSize size(element.width(), element.height());

- OwnPtr<WebCanvasCaptureHandler> handler;

+ std::unique_ptr<WebCanvasCaptureHandler> handler;

if (givenFrameRate)

- handler = adoptPtr(Platform::current()->createCanvasCaptureHandler(size, frameRate, &track));

+ handler = wrapUnique(Platform::current()->createCanvasCaptureHandler(size, frameRate, &track));

else

- handler = adoptPtr(Platform::current()->createCanvasCaptureHandler(size, kDefaultFrameRate, &track));

+ handler = wrapUnique(Platform::current()->createCanvasCaptureHandler(size, kDefaultFrameRate, &track));

if (!handler) {

exceptionState.throwDOMException(NotSupportedError, "No CanvasCapture handler can be created.");