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

Side by Side Diff: content/renderer/render_frame_impl.h

Issue 2380743004: media: Remove Browser CDM implementation (Closed)
Patch Set: media: Remove Browser CDM implementation Created 4 years, 2 months 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 5 #ifndef CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 6 #define CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
(...skipping 1172 matching lines...) Expand 10 before | Expand all | Expand 10 after
1183 RendererMediaPlayerManager* media_player_manager_; 1183 RendererMediaPlayerManager* media_player_manager_;
1184 RendererMediaSessionManager* media_session_manager_; 1184 RendererMediaSessionManager* media_session_manager_;
1185 #endif 1185 #endif
1186 1186
1187 media::SurfaceManager* media_surface_manager_; 1187 media::SurfaceManager* media_surface_manager_;
1188 1188
1189 // Lazy-bound pointer to the RemoterFactory service in the browser 1189 // Lazy-bound pointer to the RemoterFactory service in the browser
1190 // process. Always use the GetRemoterFactory() accessor instead of this. 1190 // process. Always use the GetRemoterFactory() accessor instead of this.
1191 media::mojom::RemoterFactoryPtr remoter_factory_; 1191 media::mojom::RemoterFactoryPtr remoter_factory_;
1192 1192
1193 #if defined(ENABLE_BROWSER_CDMS)
1194 // Manage all CDMs in this render frame for communicating with the real CDM in
1195 // the browser process. It's okay to use a raw pointer since it's a
1196 // RenderFrameObserver.
1197 RendererCdmManager* cdm_manager_;
1198 #endif
1199
1200 // The CDM and decoder factory attached to this frame, lazily initialized. 1193 // The CDM and decoder factory attached to this frame, lazily initialized.
1201 std::unique_ptr<media::CdmFactory> cdm_factory_; 1194 std::unique_ptr<media::CdmFactory> cdm_factory_;
1202 std::unique_ptr<media::DecoderFactory> decoder_factory_; 1195 std::unique_ptr<media::DecoderFactory> decoder_factory_;
1203 1196
1204 // Media resource cache, lazily initialized. 1197 // Media resource cache, lazily initialized.
1205 linked_ptr<media::UrlIndex> url_index_; 1198 linked_ptr<media::UrlIndex> url_index_;
1206 1199
1207 // The devtools agent for this frame; only created for main frame and 1200 // The devtools agent for this frame; only created for main frame and
1208 // local roots. 1201 // local roots.
1209 DevToolsAgent* devtools_agent_; 1202 DevToolsAgent* devtools_agent_;
(...skipping 91 matching lines...) Expand 10 before | Expand all | Expand 10 after
1301 remote_associated_interfaces_; 1294 remote_associated_interfaces_;
1302 1295
1303 base::WeakPtrFactory<RenderFrameImpl> weak_factory_; 1296 base::WeakPtrFactory<RenderFrameImpl> weak_factory_;
1304 1297
1305 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl); 1298 DISALLOW_COPY_AND_ASSIGN(RenderFrameImpl);
1306 }; 1299 };
1307 1300
1308 } // namespace content 1301 } // namespace content
1309 1302
1310 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_ 1303 #endif // CONTENT_RENDERER_RENDER_FRAME_IMPL_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698