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

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

Issue 1508023002: Add TimedCanvasDrawListener (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@spec-change
Patch Set: 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 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 "config.h" 5 #include "config.h"
6 #include "modules/mediacapturefromelement/HTMLCanvasElementCapture.h" 6 #include "modules/mediacapturefromelement/HTMLCanvasElementCapture.h"
7 7
8 #include "core/dom/ExceptionCode.h" 8 #include "core/dom/ExceptionCode.h"
9 #include "core/html/HTMLCanvasElement.h" 9 #include "core/html/HTMLCanvasElement.h"
10 #include "modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.h" 10 #include "modules/mediacapturefromelement/CanvasCaptureMediaStreamTrack.h"
11 #include "modules/mediastream/MediaStream.h" 11 #include "modules/mediastream/MediaStream.h"
12 #include "public/platform/Platform.h" 12 #include "public/platform/Platform.h"
13 #include "public/platform/WebCanvasCaptureHandler.h" 13 #include "public/platform/WebCanvasCaptureHandler.h"
14 #include "public/platform/WebMediaStream.h" 14 #include "public/platform/WebMediaStream.h"
15 #include "public/platform/WebMediaStreamTrack.h" 15 #include "public/platform/WebMediaStreamTrack.h"
16 16
17 namespace { 17 namespace {
18 const double kDefaultFrameRate = 60.0; 18 const double kDefaultFrameRate = 60.0;
19 } // anonymous namespace 19 } // anonymous namespace
20 20
21 namespace blink { 21 namespace blink {
22 22
23 MediaStream* HTMLCanvasElementCapture::captureStream(HTMLCanvasElement& element, ExceptionState& exceptionState) 23 MediaStream* HTMLCanvasElementCapture::captureStream(HTMLCanvasElement& element, ExceptionState& exceptionState)
24 { 24 {
25 return HTMLCanvasElementCapture::captureStream(element, false, kDefaultFrame Rate, exceptionState);
26 }
27
28 MediaStream* HTMLCanvasElementCapture::captureStream(HTMLCanvasElement& element, double frameRate, ExceptionState& exceptionState)
29 {
30 return HTMLCanvasElementCapture::captureStream(element, true, frameRate, exc eptionState);
31 }
32
33 MediaStream* HTMLCanvasElementCapture::captureStream(HTMLCanvasElement& element, bool givenframeRate, double frameRate, ExceptionState& exceptionState)
34 {
25 if (!element.originClean()) { 35 if (!element.originClean()) {
26 exceptionState.throwDOMException(SecurityError, "Canvas is not origin-cl ean."); 36 exceptionState.throwDOMException(SecurityError, "Canvas is not origin-cl ean.");
27 return MediaStream::create(element.executionContext()); 37 return MediaStream::create(element.executionContext());
28 } 38 }
29 39
30 WebMediaStreamTrack track; 40 WebMediaStreamTrack track;
31 WebSize size(element.width(), element.height()); 41 WebSize size(element.width(), element.height());
32 OwnPtr<WebCanvasCaptureHandler> handler = adoptPtr(Platform::current()->crea teCanvasCaptureHandler(size, kDefaultFrameRate, &track)); 42 OwnPtr<WebCanvasCaptureHandler> handler = adoptPtr(Platform::current()->crea teCanvasCaptureHandler(size, frameRate, &track));
33 ASSERT(handler); 43 ASSERT(handler);
34 if (!handler) { 44 if (!handler) {
35 exceptionState.throwDOMException(NotSupportedError, "No CanvasCapture ha ndler can be created."); 45 exceptionState.throwDOMException(NotSupportedError, "No CanvasCapture ha ndler can be created.");
36 return MediaStream::create(element.executionContext()); 46 return MediaStream::create(element.executionContext());
37 } 47 }
38 48
39 MediaStreamTrackVector tracks; 49 MediaStreamTrackVector tracks;
40 tracks.append(CanvasCaptureMediaStreamTrack::create(track, &element, handler .release())); 50 tracks.append(CanvasCaptureMediaStreamTrack::create(track, &element, handler .release(), givenframeRate, frameRate));
41 return MediaStream::create(element.executionContext(), tracks); 51 return MediaStream::create(element.executionContext(), tracks);
42 } 52 }
43 53
44 } // namespace blink 54 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698