Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 "config.h" | 5 #include "config.h" |
| 6 #include "modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.h" | 6 #include "modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.h" |
| 7 | 7 |
| 8 #include "core/html/HTMLCanvasElement.h" | 8 #include "core/html/HTMLCanvasElement.h" |
| 9 #include "modules/mediacapturefromelement/AutoCanvasDrawListener.h" | 9 #include "modules/mediacapturefromelement/AutoCanvasDrawListener.h" |
| 10 #include "modules/mediacapturefromelement/TimedCanvasDrawListener.h" | |
| 10 #include "platform/NotImplemented.h" | 11 #include "platform/NotImplemented.h" |
| 11 | 12 |
| 12 namespace blink { | 13 namespace blink { |
| 13 | 14 |
| 14 | 15 |
| 15 CanvasCaptureMediaStreamTrack* CanvasCaptureMediaStreamTrack::create(MediaStream Component* component, PassRefPtrWillBeRawPtr<HTMLCanvasElement> element, const P assOwnPtr<WebCanvasCaptureHandler> handler) | 16 CanvasCaptureMediaStreamTrack* CanvasCaptureMediaStreamTrack::create(MediaStream Component* component, PassRefPtrWillBeRawPtr<HTMLCanvasElement> element, const P assOwnPtr<WebCanvasCaptureHandler> handler, bool givenframeRate, double frameRat e) |
|
esprehn
2015/12/11 10:38:23
ditto
emircan
2015/12/11 19:25:15
Done.
| |
| 16 { | 17 { |
| 17 return new CanvasCaptureMediaStreamTrack(component, element, handler); | 18 return new CanvasCaptureMediaStreamTrack(component, element, handler, givenf rameRate, frameRate); |
|
esprehn
2015/12/11 10:38:23
givenFrameRate
emircan
2015/12/11 19:25:15
Done.
| |
| 18 } | 19 } |
| 19 | 20 |
| 20 HTMLCanvasElement* CanvasCaptureMediaStreamTrack::canvas() const | 21 HTMLCanvasElement* CanvasCaptureMediaStreamTrack::canvas() const |
| 21 { | 22 { |
| 22 return m_canvasElement.get(); | 23 return m_canvasElement.get(); |
| 23 } | 24 } |
| 24 | 25 |
| 25 void CanvasCaptureMediaStreamTrack::requestFrame() | 26 void CanvasCaptureMediaStreamTrack::requestFrame() |
| 26 { | 27 { |
| 27 notImplemented(); | 28 notImplemented(); |
| 28 return; | 29 return; |
| 29 } | 30 } |
| 30 | 31 |
| 31 DEFINE_TRACE(CanvasCaptureMediaStreamTrack) | 32 DEFINE_TRACE(CanvasCaptureMediaStreamTrack) |
| 32 { | 33 { |
| 33 visitor->trace(m_canvasElement); | 34 visitor->trace(m_canvasElement); |
| 34 visitor->trace(m_drawListener); | 35 visitor->trace(m_drawListener); |
| 35 MediaStreamTrack::trace(visitor); | 36 MediaStreamTrack::trace(visitor); |
| 36 } | 37 } |
| 37 | 38 |
| 38 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(MediaStreamComponen t* component, PassRefPtrWillBeRawPtr<HTMLCanvasElement> element, const PassOwnPt r<WebCanvasCaptureHandler> handler) | 39 CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(MediaStreamComponen t* component, PassRefPtrWillBeRawPtr<HTMLCanvasElement> element, const PassOwnPt r<WebCanvasCaptureHandler> handler, bool givenframeRate, double frameRate) |
|
esprehn
2015/12/11 10:38:23
givenFrameRate, need to match the frameRate naming
emircan
2015/12/11 19:25:15
Done.
| |
| 39 : MediaStreamTrack(element->executionContext(), component) | 40 : MediaStreamTrack(element->executionContext(), component) |
| 40 , m_canvasElement(element) | 41 , m_canvasElement(element) |
| 41 { | 42 { |
| 42 suspendIfNeeded(); | 43 suspendIfNeeded(); |
| 43 m_drawListener = AutoCanvasDrawListener::create(handler); | 44 if (givenframeRate) { |
| 45 m_drawListener = TimedCanvasDrawListener::create(handler, frameRate); | |
| 46 } else { | |
| 47 m_drawListener = AutoCanvasDrawListener::create(handler); | |
| 48 } | |
| 44 m_canvasElement->addListener(m_drawListener.get()); | 49 m_canvasElement->addListener(m_drawListener.get()); |
| 45 } | 50 } |
| 46 | 51 |
| 47 } // namespace blink | 52 } // namespace blink |
| OLD | NEW |