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

Side by Side Diff: third_party/WebKit/Source/modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.h" 5 #include "modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.h"
6 6
7 #include "core/html/HTMLCanvasElement.h" 7 #include "core/html/HTMLCanvasElement.h"
8 #include "modules/mediacapturefromelement/AutoCanvasDrawListener.h" 8 #include "modules/mediacapturefromelement/AutoCanvasDrawListener.h"
9 #include "modules/mediacapturefromelement/OnRequestCanvasDrawListener.h" 9 #include "modules/mediacapturefromelement/OnRequestCanvasDrawListener.h"
10 #include "modules/mediacapturefromelement/TimedCanvasDrawListener.h" 10 #include "modules/mediacapturefromelement/TimedCanvasDrawListener.h"
11 #include "platform/mediastream/MediaStreamCenter.h" 11 #include "platform/mediastream/MediaStreamCenter.h"
12 #include <memory>
12 13
13 namespace blink { 14 namespace blink {
14 15
15 CanvasCaptureMediaStreamTrack* CanvasCaptureMediaStreamTrack::create(MediaStream Component* component, HTMLCanvasElement* element, PassOwnPtr<WebCanvasCaptureHan dler> handler) 16 CanvasCaptureMediaStreamTrack* CanvasCaptureMediaStreamTrack::create(MediaStream Component* component, HTMLCanvasElement* element, std::unique_ptr<WebCanvasCaptu reHandler> handler)
16 { 17 {
17 return new CanvasCaptureMediaStreamTrack(component, element, std::move(handl er)); 18 return new CanvasCaptureMediaStreamTrack(component, element, std::move(handl er));
18 } 19 }
19 20
20 CanvasCaptureMediaStreamTrack* CanvasCaptureMediaStreamTrack::create(MediaStream Component* component, HTMLCanvasElement* element, PassOwnPtr<WebCanvasCaptureHan dler> handler, double frameRate) 21 CanvasCaptureMediaStreamTrack* CanvasCaptureMediaStreamTrack::create(MediaStream Component* component, HTMLCanvasElement* element, std::unique_ptr<WebCanvasCaptu reHandler> handler, double frameRate)
21 { 22 {
22 return new CanvasCaptureMediaStreamTrack(component, element, std::move(handl er), frameRate); 23 return new CanvasCaptureMediaStreamTrack(component, element, std::move(handl er), frameRate);
23 } 24 }
24 25
25 HTMLCanvasElement* CanvasCaptureMediaStreamTrack::canvas() const 26 HTMLCanvasElement* CanvasCaptureMediaStreamTrack::canvas() const
26 { 27 {
27 return m_canvasElement.get(); 28 return m_canvasElement.get();
28 } 29 }
29 30
30 void CanvasCaptureMediaStreamTrack::requestFrame() 31 void CanvasCaptureMediaStreamTrack::requestFrame()
(...skipping 18 matching lines...) Expand all
49 50
50 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(const CanvasCapture MediaStreamTrack& track, MediaStreamComponent* component) 51 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(const CanvasCapture MediaStreamTrack& track, MediaStreamComponent* component)
51 :MediaStreamTrack(track.m_canvasElement->getExecutionContext(), component) 52 :MediaStreamTrack(track.m_canvasElement->getExecutionContext(), component)
52 , m_canvasElement(track.m_canvasElement) 53 , m_canvasElement(track.m_canvasElement)
53 , m_drawListener(track.m_drawListener) 54 , m_drawListener(track.m_drawListener)
54 { 55 {
55 suspendIfNeeded(); 56 suspendIfNeeded();
56 m_canvasElement->addListener(m_drawListener.get()); 57 m_canvasElement->addListener(m_drawListener.get());
57 } 58 }
58 59
59 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(MediaStreamComponen t* component, HTMLCanvasElement* element, PassOwnPtr<WebCanvasCaptureHandler> ha ndler) 60 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(MediaStreamComponen t* component, HTMLCanvasElement* element, std::unique_ptr<WebCanvasCaptureHandle r> handler)
60 : MediaStreamTrack(element->getExecutionContext(), component) 61 : MediaStreamTrack(element->getExecutionContext(), component)
61 , m_canvasElement(element) 62 , m_canvasElement(element)
62 { 63 {
63 suspendIfNeeded(); 64 suspendIfNeeded();
64 m_drawListener = AutoCanvasDrawListener::create(std::move(handler)); 65 m_drawListener = AutoCanvasDrawListener::create(std::move(handler));
65 m_canvasElement->addListener(m_drawListener.get()); 66 m_canvasElement->addListener(m_drawListener.get());
66 } 67 }
67 68
68 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(MediaStreamComponen t* component, HTMLCanvasElement* element, PassOwnPtr<WebCanvasCaptureHandler> ha ndler, double frameRate) 69 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(MediaStreamComponen t* component, HTMLCanvasElement* element, std::unique_ptr<WebCanvasCaptureHandle r> handler, double frameRate)
69 : MediaStreamTrack(element->getExecutionContext(), component) 70 : MediaStreamTrack(element->getExecutionContext(), component)
70 , m_canvasElement(element) 71 , m_canvasElement(element)
71 { 72 {
72 suspendIfNeeded(); 73 suspendIfNeeded();
73 if (frameRate == 0) { 74 if (frameRate == 0) {
74 m_drawListener = OnRequestCanvasDrawListener::create(std::move(handler)) ; 75 m_drawListener = OnRequestCanvasDrawListener::create(std::move(handler)) ;
75 } else { 76 } else {
76 m_drawListener = TimedCanvasDrawListener::create(std::move(handler), fra meRate); 77 m_drawListener = TimedCanvasDrawListener::create(std::move(handler), fra meRate);
77 } 78 }
78 m_canvasElement->addListener(m_drawListener.get()); 79 m_canvasElement->addListener(m_drawListener.get());
79 } 80 }
80 81
81 } // namespace blink 82 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698