Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1070)

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
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.");

Powered by Google App Engine
This is Rietveld 408576698