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

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

Issue 2540263003: Carry MediaStreamComponent properties on clone. (Closed)
Patch Set: added test + todo comments Created 4 years 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"
(...skipping 22 matching lines...) Expand all
33 HTMLCanvasElement* CanvasCaptureMediaStreamTrack::canvas() const { 33 HTMLCanvasElement* CanvasCaptureMediaStreamTrack::canvas() const {
34 return m_canvasElement.get(); 34 return m_canvasElement.get();
35 } 35 }
36 36
37 void CanvasCaptureMediaStreamTrack::requestFrame() { 37 void CanvasCaptureMediaStreamTrack::requestFrame() {
38 m_drawListener->requestFrame(); 38 m_drawListener->requestFrame();
39 } 39 }
40 40
41 CanvasCaptureMediaStreamTrack* CanvasCaptureMediaStreamTrack::clone( 41 CanvasCaptureMediaStreamTrack* CanvasCaptureMediaStreamTrack::clone(
42 ExecutionContext* context) { 42 ExecutionContext* context) {
43 MediaStreamComponent* clonedComponent = 43 MediaStreamComponent* clonedComponent = component()->clone();
44 MediaStreamComponent::create(component()->source());
45 CanvasCaptureMediaStreamTrack* clonedTrack = 44 CanvasCaptureMediaStreamTrack* clonedTrack =
46 new CanvasCaptureMediaStreamTrack(*this, clonedComponent); 45 new CanvasCaptureMediaStreamTrack(*this, clonedComponent);
47 MediaStreamCenter::instance().didCreateMediaStreamTrack(clonedComponent); 46 MediaStreamCenter::instance().didCreateMediaStreamTrack(clonedComponent);
48 return clonedTrack; 47 return clonedTrack;
49 } 48 }
50 49
51 DEFINE_TRACE(CanvasCaptureMediaStreamTrack) { 50 DEFINE_TRACE(CanvasCaptureMediaStreamTrack) {
52 visitor->trace(m_canvasElement); 51 visitor->trace(m_canvasElement);
53 visitor->trace(m_drawListener); 52 visitor->trace(m_drawListener);
54 MediaStreamTrack::trace(visitor); 53 MediaStreamTrack::trace(visitor);
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 if (frameRate == 0) { 85 if (frameRate == 0) {
87 m_drawListener = OnRequestCanvasDrawListener::create(std::move(handler)); 86 m_drawListener = OnRequestCanvasDrawListener::create(std::move(handler));
88 } else { 87 } else {
89 m_drawListener = 88 m_drawListener =
90 TimedCanvasDrawListener::create(std::move(handler), frameRate); 89 TimedCanvasDrawListener::create(std::move(handler), frameRate);
91 } 90 }
92 m_canvasElement->addListener(m_drawListener.get()); 91 m_canvasElement->addListener(m_drawListener.get());
93 } 92 }
94 93
95 } // namespace blink 94 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698