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 75ca942fa2871655b6e1917a3c97c6a32a2d5b06..e3bad2a35f823f06e0b5bdb92c6a89f409c95fbd 100644 |
--- a/third_party/WebKit/Source/modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.cpp |
+++ b/third_party/WebKit/Source/modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.cpp |
@@ -7,14 +7,15 @@ |
#include "core/html/HTMLCanvasElement.h" |
#include "modules/mediacapturefromelement/AutoCanvasDrawListener.h" |
+#include "modules/mediacapturefromelement/TimedCanvasDrawListener.h" |
#include "platform/NotImplemented.h" |
namespace blink { |
-CanvasCaptureMediaStreamTrack* CanvasCaptureMediaStreamTrack::create(MediaStreamComponent* component, PassRefPtrWillBeRawPtr<HTMLCanvasElement> element, const PassOwnPtr<WebCanvasCaptureHandler> handler) |
+CanvasCaptureMediaStreamTrack* CanvasCaptureMediaStreamTrack::create(MediaStreamComponent* component, PassRefPtrWillBeRawPtr<HTMLCanvasElement> element, const PassOwnPtr<WebCanvasCaptureHandler> handler, bool givenframeRate, double frameRate) |
esprehn
2015/12/11 10:38:23
ditto
emircan
2015/12/11 19:25:15
Done.
|
{ |
- return new CanvasCaptureMediaStreamTrack(component, element, handler); |
+ return new CanvasCaptureMediaStreamTrack(component, element, handler, givenframeRate, frameRate); |
esprehn
2015/12/11 10:38:23
givenFrameRate
emircan
2015/12/11 19:25:15
Done.
|
} |
HTMLCanvasElement* CanvasCaptureMediaStreamTrack::canvas() const |
@@ -35,12 +36,16 @@ DEFINE_TRACE(CanvasCaptureMediaStreamTrack) |
MediaStreamTrack::trace(visitor); |
} |
-CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(MediaStreamComponent* component, PassRefPtrWillBeRawPtr<HTMLCanvasElement> element, const PassOwnPtr<WebCanvasCaptureHandler> handler) |
+CanvasCaptureMediaStreamTrack::CanvasCaptureMediaStreamTrack(MediaStreamComponent* component, PassRefPtrWillBeRawPtr<HTMLCanvasElement> element, const PassOwnPtr<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.
|
: MediaStreamTrack(element->executionContext(), component) |
, m_canvasElement(element) |
{ |
suspendIfNeeded(); |
- m_drawListener = AutoCanvasDrawListener::create(handler); |
+ if (givenframeRate) { |
+ m_drawListener = TimedCanvasDrawListener::create(handler, frameRate); |
+ } else { |
+ m_drawListener = AutoCanvasDrawListener::create(handler); |
+ } |
m_canvasElement->addListener(m_drawListener.get()); |
} |