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

Side by Side Diff: content/renderer/renderer_blink_platform_impl.cc

Issue 1505013002: Create CanvasCaptureMediaStreamTrack in a regular MediaStream (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/renderer/renderer_blink_platform_impl.h" 5 #include "content/renderer/renderer_blink_platform_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/location.h" 10 #include "base/location.h"
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 using blink::WebBlobRegistry; 141 using blink::WebBlobRegistry;
142 using blink::WebCanvasCaptureHandler; 142 using blink::WebCanvasCaptureHandler;
143 using blink::WebDatabaseObserver; 143 using blink::WebDatabaseObserver;
144 using blink::WebFileInfo; 144 using blink::WebFileInfo;
145 using blink::WebFileSystem; 145 using blink::WebFileSystem;
146 using blink::WebGamepad; 146 using blink::WebGamepad;
147 using blink::WebGamepads; 147 using blink::WebGamepads;
148 using blink::WebIDBFactory; 148 using blink::WebIDBFactory;
149 using blink::WebMIDIAccessor; 149 using blink::WebMIDIAccessor;
150 using blink::WebMediaRecorderHandler; 150 using blink::WebMediaRecorderHandler;
151 using blink::WebMediaStream;
152 using blink::WebMediaStreamCenter; 151 using blink::WebMediaStreamCenter;
153 using blink::WebMediaStreamCenterClient; 152 using blink::WebMediaStreamCenterClient;
153 using blink::WebMediaStreamTrack;
154 using blink::WebMimeRegistry; 154 using blink::WebMimeRegistry;
155 using blink::WebRTCPeerConnectionHandler; 155 using blink::WebRTCPeerConnectionHandler;
156 using blink::WebRTCPeerConnectionHandlerClient; 156 using blink::WebRTCPeerConnectionHandlerClient;
157 using blink::WebStorageNamespace; 157 using blink::WebStorageNamespace;
158 using blink::WebSize; 158 using blink::WebSize;
159 using blink::WebString; 159 using blink::WebString;
160 using blink::WebURL; 160 using blink::WebURL;
161 using blink::WebVector; 161 using blink::WebVector;
162 162
163 namespace content { 163 namespace content {
(...skipping 773 matching lines...) Expand 10 before | Expand all | Expand 10 after
937 bool was_enabled = g_sandbox_enabled; 937 bool was_enabled = g_sandbox_enabled;
938 g_sandbox_enabled = enable; 938 g_sandbox_enabled = enable;
939 return was_enabled; 939 return was_enabled;
940 } 940 }
941 941
942 //------------------------------------------------------------------------------ 942 //------------------------------------------------------------------------------
943 943
944 WebCanvasCaptureHandler* RendererBlinkPlatformImpl::createCanvasCaptureHandler( 944 WebCanvasCaptureHandler* RendererBlinkPlatformImpl::createCanvasCaptureHandler(
945 const WebSize& size, 945 const WebSize& size,
946 double frame_rate, 946 double frame_rate,
947 WebMediaStream* stream) { 947 WebMediaStreamTrack* track) {
948 #if defined(ENABLE_WEBRTC) 948 #if defined(ENABLE_WEBRTC)
949 return new CanvasCaptureHandler(size, frame_rate, stream); 949 return new CanvasCaptureHandler(size, frame_rate, track);
950 #else 950 #else
951 return nullptr; 951 return nullptr;
952 #endif // defined(ENABLE_WEBRTC) 952 #endif // defined(ENABLE_WEBRTC)
953 } 953 }
954 954
955 //------------------------------------------------------------------------------ 955 //------------------------------------------------------------------------------
956 956
957 blink::WebSpeechSynthesizer* RendererBlinkPlatformImpl::createSpeechSynthesizer( 957 blink::WebSpeechSynthesizer* RendererBlinkPlatformImpl::createSpeechSynthesizer(
958 blink::WebSpeechSynthesizerClient* client) { 958 blink::WebSpeechSynthesizerClient* client) {
959 return GetContentClient()->renderer()->OverrideSpeechSynthesizer(client); 959 return GetContentClient()->renderer()->OverrideSpeechSynthesizer(client);
(...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after
1288 //------------------------------------------------------------------------------ 1288 //------------------------------------------------------------------------------
1289 1289
1290 void RendererBlinkPlatformImpl::MockBatteryStatusChangedForTesting( 1290 void RendererBlinkPlatformImpl::MockBatteryStatusChangedForTesting(
1291 const blink::WebBatteryStatus& status) { 1291 const blink::WebBatteryStatus& status) {
1292 if (!g_test_battery_status_listener) 1292 if (!g_test_battery_status_listener)
1293 return; 1293 return;
1294 g_test_battery_status_listener->updateBatteryStatus(status); 1294 g_test_battery_status_listener->updateBatteryStatus(status);
1295 } 1295 }
1296 1296
1297 } // namespace content 1297 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698