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

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

Issue 2411433002: Move ENABLE_PEPPER_CDMS to a buildflag header. (Closed)
Patch Set: Fixes 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
« no previous file with comments | « content/renderer/media/cdm/render_cdm_factory.cc ('k') | content/test/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 #include "content/renderer/render_frame_impl.h" 5 #include "content/renderer/render_frame_impl.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 #include "media/blink/url_index.h" 148 #include "media/blink/url_index.h"
149 #include "media/blink/webencryptedmediaclient_impl.h" 149 #include "media/blink/webencryptedmediaclient_impl.h"
150 #include "media/blink/webmediaplayer_impl.h" 150 #include "media/blink/webmediaplayer_impl.h"
151 #include "media/renderers/gpu_video_accelerator_factories.h" 151 #include "media/renderers/gpu_video_accelerator_factories.h"
152 #include "mojo/edk/js/core.h" 152 #include "mojo/edk/js/core.h"
153 #include "mojo/edk/js/support.h" 153 #include "mojo/edk/js/support.h"
154 #include "net/base/data_url.h" 154 #include "net/base/data_url.h"
155 #include "net/base/net_errors.h" 155 #include "net/base/net_errors.h"
156 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" 156 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
157 #include "net/http/http_util.h" 157 #include "net/http/http_util.h"
158 #include "ppapi/features/features.h"
158 #include "services/shell/public/cpp/interface_provider.h" 159 #include "services/shell/public/cpp/interface_provider.h"
159 #include "services/shell/public/cpp/interface_registry.h" 160 #include "services/shell/public/cpp/interface_registry.h"
160 #include "storage/common/data_element.h" 161 #include "storage/common/data_element.h"
161 #include "third_party/WebKit/public/platform/FilePathConversion.h" 162 #include "third_party/WebKit/public/platform/FilePathConversion.h"
162 #include "third_party/WebKit/public/platform/URLConversion.h" 163 #include "third_party/WebKit/public/platform/URLConversion.h"
163 #include "third_party/WebKit/public/platform/WebCachePolicy.h" 164 #include "third_party/WebKit/public/platform/WebCachePolicy.h"
164 #include "third_party/WebKit/public/platform/WebData.h" 165 #include "third_party/WebKit/public/platform/WebData.h"
165 #include "third_party/WebKit/public/platform/WebMediaPlayer.h" 166 #include "third_party/WebKit/public/platform/WebMediaPlayer.h"
166 #include "third_party/WebKit/public/platform/WebMediaPlayerSource.h" 167 #include "third_party/WebKit/public/platform/WebMediaPlayerSource.h"
167 #include "third_party/WebKit/public/platform/WebPoint.h" 168 #include "third_party/WebKit/public/platform/WebPoint.h"
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
220 221
221 #include "content/renderer/java/gin_java_bridge_dispatcher.h" 222 #include "content/renderer/java/gin_java_bridge_dispatcher.h"
222 #include "content/renderer/media/android/renderer_media_player_manager.h" 223 #include "content/renderer/media/android/renderer_media_player_manager.h"
223 #include "content/renderer/media/android/renderer_surface_view_manager.h" 224 #include "content/renderer/media/android/renderer_surface_view_manager.h"
224 #include "content/renderer/media/android/stream_texture_factory.h" 225 #include "content/renderer/media/android/stream_texture_factory.h"
225 #include "content/renderer/media/android/webmediaplayer_android.h" 226 #include "content/renderer/media/android/webmediaplayer_android.h"
226 #include "media/base/android/media_codec_util.h" 227 #include "media/base/android/media_codec_util.h"
227 #include "third_party/WebKit/public/platform/WebFloatPoint.h" 228 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
228 #endif 229 #endif
229 230
230 #if defined(ENABLE_PEPPER_CDMS) 231 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
231 #include "content/renderer/media/cdm/pepper_cdm_wrapper_impl.h" 232 #include "content/renderer/media/cdm/pepper_cdm_wrapper_impl.h"
232 #include "content/renderer/media/cdm/render_cdm_factory.h" 233 #include "content/renderer/media/cdm/render_cdm_factory.h"
233 #endif 234 #endif
234 235
235 #if defined(ENABLE_MOJO_MEDIA) 236 #if defined(ENABLE_MOJO_MEDIA)
236 #include "content/renderer/media/media_interface_provider.h" 237 #include "content/renderer/media/media_interface_provider.h"
237 #endif 238 #endif
238 239
239 #if defined(ENABLE_MOJO_CDM) 240 #if defined(ENABLE_MOJO_CDM)
240 #include "media/mojo/clients/mojo_cdm_factory.h" // nogncheck 241 #include "media/mojo/clients/mojo_cdm_factory.h" // nogncheck
(...skipping 6051 matching lines...) Expand 10 before | Expand all | Expand 10 after
6292 if (cdm_factory_) 6293 if (cdm_factory_)
6293 return cdm_factory_.get(); 6294 return cdm_factory_.get();
6294 6295
6295 #if defined(ENABLE_MOJO_CDM) 6296 #if defined(ENABLE_MOJO_CDM)
6296 if (UseMojoCdm()) { 6297 if (UseMojoCdm()) {
6297 cdm_factory_.reset(new media::MojoCdmFactory(GetMediaInterfaceProvider())); 6298 cdm_factory_.reset(new media::MojoCdmFactory(GetMediaInterfaceProvider()));
6298 return cdm_factory_.get(); 6299 return cdm_factory_.get();
6299 } 6300 }
6300 #endif // defined(ENABLE_MOJO_CDM) 6301 #endif // defined(ENABLE_MOJO_CDM)
6301 6302
6302 #if defined(ENABLE_PEPPER_CDMS) 6303 #if BUILDFLAG(ENABLE_PEPPER_CDMS)
6303 DCHECK(frame_); 6304 DCHECK(frame_);
6304 cdm_factory_.reset( 6305 cdm_factory_.reset(
6305 new RenderCdmFactory(base::Bind(&PepperCdmWrapperImpl::Create, frame_))); 6306 new RenderCdmFactory(base::Bind(&PepperCdmWrapperImpl::Create, frame_)));
6306 #endif // defined(ENABLE_PEPPER_CDMS) 6307 #endif // BUILDFLAG(ENABLE_PEPPER_CDMS)
6307 6308
6308 return cdm_factory_.get(); 6309 return cdm_factory_.get();
6309 } 6310 }
6310 6311
6311 media::DecoderFactory* RenderFrameImpl::GetDecoderFactory() { 6312 media::DecoderFactory* RenderFrameImpl::GetDecoderFactory() {
6312 #if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_DECODER) 6313 #if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_DECODER)
6313 if (!decoder_factory_) { 6314 if (!decoder_factory_) {
6314 decoder_factory_.reset( 6315 decoder_factory_.reset(
6315 new media::MojoDecoderFactory(GetMediaInterfaceProvider())); 6316 new media::MojoDecoderFactory(GetMediaInterfaceProvider()));
6316 } 6317 }
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
6484 // event target. Potentially a Pepper plugin will receive the event. 6485 // event target. Potentially a Pepper plugin will receive the event.
6485 // In order to tell whether a plugin gets the last mouse event and which it 6486 // In order to tell whether a plugin gets the last mouse event and which it
6486 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets 6487 // is, we set |pepper_last_mouse_event_target_| to null here. If a plugin gets
6487 // the event, it will notify us via DidReceiveMouseEvent() and set itself as 6488 // the event, it will notify us via DidReceiveMouseEvent() and set itself as
6488 // |pepper_last_mouse_event_target_|. 6489 // |pepper_last_mouse_event_target_|.
6489 pepper_last_mouse_event_target_ = nullptr; 6490 pepper_last_mouse_event_target_ = nullptr;
6490 #endif 6491 #endif
6491 } 6492 }
6492 6493
6493 } // namespace content 6494 } // namespace content
OLDNEW
« no previous file with comments | « content/renderer/media/cdm/render_cdm_factory.cc ('k') | content/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698