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

Side by Side Diff: third_party/WebKit/Source/modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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>
13 12
14 namespace blink { 13 namespace blink {
15 14
16 CanvasCaptureMediaStreamTrack* CanvasCaptureMediaStreamTrack::create(MediaStream Component* component, HTMLCanvasElement* element, std::unique_ptr<WebCanvasCaptu reHandler> handler) 15 CanvasCaptureMediaStreamTrack* CanvasCaptureMediaStreamTrack::create(MediaStream Component* component, HTMLCanvasElement* element, PassOwnPtr<WebCanvasCaptureHan dler> handler)
17 { 16 {
18 return new CanvasCaptureMediaStreamTrack(component, element, std::move(handl er)); 17 return new CanvasCaptureMediaStreamTrack(component, element, std::move(handl er));
19 } 18 }
20 19
21 CanvasCaptureMediaStreamTrack* CanvasCaptureMediaStreamTrack::create(MediaStream Component* component, HTMLCanvasElement* element, std::unique_ptr<WebCanvasCaptu reHandler> handler, double frameRate) 20 CanvasCaptureMediaStreamTrack* CanvasCaptureMediaStreamTrack::create(MediaStream Component* component, HTMLCanvasElement* element, PassOwnPtr<WebCanvasCaptureHan dler> handler, double frameRate)
22 { 21 {
23 return new CanvasCaptureMediaStreamTrack(component, element, std::move(handl er), frameRate); 22 return new CanvasCaptureMediaStreamTrack(component, element, std::move(handl er), frameRate);
24 } 23 }
25 24
26 HTMLCanvasElement* CanvasCaptureMediaStreamTrack::canvas() const 25 HTMLCanvasElement* CanvasCaptureMediaStreamTrack::canvas() const
27 { 26 {
28 return m_canvasElement.get(); 27 return m_canvasElement.get();
29 } 28 }
30 29
31 void CanvasCaptureMediaStreamTrack::requestFrame() 30 void CanvasCaptureMediaStreamTrack::requestFrame()
(...skipping 18 matching lines...) Expand all
50 49
51 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(const CanvasCapture MediaStreamTrack& track, MediaStreamComponent* component) 50 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(const CanvasCapture MediaStreamTrack& track, MediaStreamComponent* component)
52 :MediaStreamTrack(track.m_canvasElement->getExecutionContext(), component) 51 :MediaStreamTrack(track.m_canvasElement->getExecutionContext(), component)
53 , m_canvasElement(track.m_canvasElement) 52 , m_canvasElement(track.m_canvasElement)
54 , m_drawListener(track.m_drawListener) 53 , m_drawListener(track.m_drawListener)
55 { 54 {
56 suspendIfNeeded(); 55 suspendIfNeeded();
57 m_canvasElement->addListener(m_drawListener.get()); 56 m_canvasElement->addListener(m_drawListener.get());
58 } 57 }
59 58
60 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(MediaStreamComponen t* component, HTMLCanvasElement* element, std::unique_ptr<WebCanvasCaptureHandle r> handler) 59 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(MediaStreamComponen t* component, HTMLCanvasElement* element, PassOwnPtr<WebCanvasCaptureHandler> ha ndler)
61 : MediaStreamTrack(element->getExecutionContext(), component) 60 : MediaStreamTrack(element->getExecutionContext(), component)
62 , m_canvasElement(element) 61 , m_canvasElement(element)
63 { 62 {
64 suspendIfNeeded(); 63 suspendIfNeeded();
65 m_drawListener = AutoCanvasDrawListener::create(std::move(handler)); 64 m_drawListener = AutoCanvasDrawListener::create(std::move(handler));
66 m_canvasElement->addListener(m_drawListener.get()); 65 m_canvasElement->addListener(m_drawListener.get());
67 } 66 }
68 67
69 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(MediaStreamComponen t* component, HTMLCanvasElement* element, std::unique_ptr<WebCanvasCaptureHandle r> handler, double frameRate) 68 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(MediaStreamComponen t* component, HTMLCanvasElement* element, PassOwnPtr<WebCanvasCaptureHandler> ha ndler, double frameRate)
70 : MediaStreamTrack(element->getExecutionContext(), component) 69 : MediaStreamTrack(element->getExecutionContext(), component)
71 , m_canvasElement(element) 70 , m_canvasElement(element)
72 { 71 {
73 suspendIfNeeded(); 72 suspendIfNeeded();
74 if (frameRate == 0) { 73 if (frameRate == 0) {
75 m_drawListener = OnRequestCanvasDrawListener::create(std::move(handler)) ; 74 m_drawListener = OnRequestCanvasDrawListener::create(std::move(handler)) ;
76 } else { 75 } else {
77 m_drawListener = TimedCanvasDrawListener::create(std::move(handler), fra meRate); 76 m_drawListener = TimedCanvasDrawListener::create(std::move(handler), fra meRate);
78 } 77 }
79 m_canvasElement->addListener(m_drawListener.get()); 78 m_canvasElement->addListener(m_drawListener.get());
80 } 79 }
81 80
82 } // namespace blink 81 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698