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

Unified Diff: third_party/WebKit/Source/modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.h

Issue 1505013002: Create CanvasCaptureMediaStreamTrack in a regular MediaStream (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed nits. Created 5 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.h
diff --git a/third_party/WebKit/Source/modules/mediacapturefromelement/CanvasCaptureMediaStream.h b/third_party/WebKit/Source/modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.h
similarity index 50%
rename from third_party/WebKit/Source/modules/mediacapturefromelement/CanvasCaptureMediaStream.h
rename to third_party/WebKit/Source/modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.h
index ff2ea0b9d590c8efb8b885498fd73dac44c25690..4a16350593d18af6873785cd7a15f874e399a624 100644
--- a/third_party/WebKit/Source/modules/mediacapturefromelement/CanvasCaptureMediaStream.h
+++ b/third_party/WebKit/Source/modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CanvasCaptureMediaStream_h
-#define CanvasCaptureMediaStream_h
+#ifndef CanvasCaptureMediaStreamTrack_h
+#define CanvasCaptureMediaStreamTrack_h
#include "core/html/canvas/CanvasDrawListener.h"
-#include "modules/mediastream/MediaStream.h"
+#include "modules/mediastream/MediaStreamTrack.h"
#include "platform/heap/Handle.h"
namespace blink {
@@ -14,19 +14,17 @@ namespace blink {
class HTMLCanvasElement;
class WebCanvasCaptureHandler;
-class CanvasCaptureMediaStream final : public MediaStream {
+class CanvasCaptureMediaStreamTrack final : public MediaStreamTrack {
DEFINE_WRAPPERTYPEINFO();
public:
- static CanvasCaptureMediaStream* create(MediaStreamDescriptor*, PassRefPtrWillBeRawPtr<HTMLCanvasElement>);
- static CanvasCaptureMediaStream* create(MediaStreamDescriptor*, PassRefPtrWillBeRawPtr<HTMLCanvasElement>, const PassOwnPtr<WebCanvasCaptureHandler>);
+ static CanvasCaptureMediaStreamTrack* create(MediaStreamComponent*, PassRefPtrWillBeRawPtr<HTMLCanvasElement>, const PassOwnPtr<WebCanvasCaptureHandler>);
DECLARE_VIRTUAL_TRACE();
HTMLCanvasElement* canvas() const;
void requestFrame();
private:
- CanvasCaptureMediaStream(MediaStreamDescriptor*, PassRefPtrWillBeRawPtr<HTMLCanvasElement>);
- void initialize(const PassOwnPtr<WebCanvasCaptureHandler>);
+ CanvasCaptureMediaStreamTrack(MediaStreamComponent*, PassRefPtrWillBeRawPtr<HTMLCanvasElement>, const PassOwnPtr<WebCanvasCaptureHandler>);
RefPtrWillBeMember<HTMLCanvasElement> m_canvasElement;
Member<CanvasDrawListener> m_drawListener;

Powered by Google App Engine
This is Rietveld 408576698