| Index: third_party/WebKit/Source/modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.cpp
|
| diff --git a/third_party/WebKit/Source/modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.cpp b/third_party/WebKit/Source/modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.cpp
|
| index 9e7bc7f91810416fd99b83244f2fb599f574d9fe..9d662a405b4e9de37c9628595363cee57b998c47 100644
|
| --- a/third_party/WebKit/Source/modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.cpp
|
| +++ b/third_party/WebKit/Source/modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.cpp
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "core/html/HTMLCanvasElement.h"
|
| #include "modules/mediacapturefromelement/AutoCanvasDrawListener.h"
|
| +#include "modules/mediacapturefromelement/TimedCanvasDrawListener.h"
|
| #include "platform/NotImplemented.h"
|
| #include "platform/mediastream/MediaStreamCenter.h"
|
|
|
| @@ -16,6 +17,11 @@ CanvasCaptureMediaStreamTrack* CanvasCaptureMediaStreamTrack::create(MediaStream
|
| return new CanvasCaptureMediaStreamTrack(component, element, handler);
|
| }
|
|
|
| +CanvasCaptureMediaStreamTrack* CanvasCaptureMediaStreamTrack::create(MediaStreamComponent* component, PassRefPtrWillBeRawPtr<HTMLCanvasElement> element, const PassOwnPtr<WebCanvasCaptureHandler> handler, double frameRate)
|
| +{
|
| + return new CanvasCaptureMediaStreamTrack(component, element, handler, frameRate);
|
| +}
|
| +
|
| HTMLCanvasElement* CanvasCaptureMediaStreamTrack::canvas() const
|
| {
|
| return m_canvasElement.get();
|
| @@ -60,4 +66,15 @@ CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(MediaStreamComponen
|
| m_canvasElement->addListener(m_drawListener.get());
|
| }
|
|
|
| +CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(MediaStreamComponent* component, PassRefPtrWillBeRawPtr<HTMLCanvasElement> element, const PassOwnPtr<WebCanvasCaptureHandler> handler, double frameRate)
|
| + : MediaStreamTrack(element->executionContext(), component)
|
| + , m_canvasElement(element)
|
| +{
|
| + suspendIfNeeded();
|
| + TimedCanvasDrawListener* listener = TimedCanvasDrawListener::create(handler, frameRate);
|
| + m_drawListener = listener;
|
| + m_canvasElement->addListener(m_drawListener.get());
|
| + listener->requestNewFrame();
|
| +}
|
| +
|
| } // namespace blink
|
|
|