| OLD | NEW |
| 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 | 9 |
| 10 #include "base/auto_reset.h" | 10 #include "base/auto_reset.h" |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 #include "content/renderer/external_popup_menu.h" | 65 #include "content/renderer/external_popup_menu.h" |
| 66 #include "content/renderer/geolocation_dispatcher.h" | 66 #include "content/renderer/geolocation_dispatcher.h" |
| 67 #include "content/renderer/history_controller.h" | 67 #include "content/renderer/history_controller.h" |
| 68 #include "content/renderer/history_serialization.h" | 68 #include "content/renderer/history_serialization.h" |
| 69 #include "content/renderer/image_loading_helper.h" | 69 #include "content/renderer/image_loading_helper.h" |
| 70 #include "content/renderer/ime_event_guard.h" | 70 #include "content/renderer/ime_event_guard.h" |
| 71 #include "content/renderer/internal_document_state_data.h" | 71 #include "content/renderer/internal_document_state_data.h" |
| 72 #include "content/renderer/manifest/manifest_manager.h" | 72 #include "content/renderer/manifest/manifest_manager.h" |
| 73 #include "content/renderer/media/audio_renderer_mixer_manager.h" | 73 #include "content/renderer/media/audio_renderer_mixer_manager.h" |
| 74 #include "content/renderer/media/crypto/render_cdm_factory.h" | 74 #include "content/renderer/media/crypto/render_cdm_factory.h" |
| 75 #include "content/renderer/media/media_permission_dispatcher.h" |
| 75 #include "content/renderer/media/media_stream_dispatcher.h" | 76 #include "content/renderer/media/media_stream_dispatcher.h" |
| 76 #include "content/renderer/media/media_stream_renderer_factory.h" | 77 #include "content/renderer/media/media_stream_renderer_factory.h" |
| 77 #include "content/renderer/media/midi_dispatcher.h" | 78 #include "content/renderer/media/midi_dispatcher.h" |
| 78 #include "content/renderer/media/render_media_log.h" | 79 #include "content/renderer/media/render_media_log.h" |
| 79 #include "content/renderer/media/user_media_client_impl.h" | 80 #include "content/renderer/media/user_media_client_impl.h" |
| 80 #include "content/renderer/media/webmediaplayer_ms.h" | 81 #include "content/renderer/media/webmediaplayer_ms.h" |
| 81 #include "content/renderer/mojo/service_registry_js_wrapper.h" | 82 #include "content/renderer/mojo/service_registry_js_wrapper.h" |
| 82 #include "content/renderer/notification_permission_dispatcher.h" | 83 #include "content/renderer/notification_permission_dispatcher.h" |
| 83 #include "content/renderer/npapi/plugin_channel_host.h" | 84 #include "content/renderer/npapi/plugin_channel_host.h" |
| 84 #include "content/renderer/pepper/plugin_instance_throttler_impl.h" | 85 #include "content/renderer/pepper/plugin_instance_throttler_impl.h" |
| (...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 668 proxy_routing_id_(MSG_ROUTING_NONE), | 669 proxy_routing_id_(MSG_ROUTING_NONE), |
| 669 #if defined(ENABLE_PLUGINS) | 670 #if defined(ENABLE_PLUGINS) |
| 670 plugin_power_saver_helper_(NULL), | 671 plugin_power_saver_helper_(NULL), |
| 671 #endif | 672 #endif |
| 672 cookie_jar_(this), | 673 cookie_jar_(this), |
| 673 selection_text_offset_(0), | 674 selection_text_offset_(0), |
| 674 selection_range_(gfx::Range::InvalidRange()), | 675 selection_range_(gfx::Range::InvalidRange()), |
| 675 handling_select_range_(false), | 676 handling_select_range_(false), |
| 676 notification_permission_dispatcher_(NULL), | 677 notification_permission_dispatcher_(NULL), |
| 677 web_user_media_client_(NULL), | 678 web_user_media_client_(NULL), |
| 679 media_permission_dispatcher_(NULL), |
| 678 midi_dispatcher_(NULL), | 680 midi_dispatcher_(NULL), |
| 679 #if defined(OS_ANDROID) | 681 #if defined(OS_ANDROID) |
| 680 media_player_manager_(NULL), | 682 media_player_manager_(NULL), |
| 681 #endif | 683 #endif |
| 682 #if defined(ENABLE_BROWSER_CDMS) | 684 #if defined(ENABLE_BROWSER_CDMS) |
| 683 cdm_manager_(NULL), | 685 cdm_manager_(NULL), |
| 684 #endif | 686 #endif |
| 685 #if defined(VIDEO_HOLE) | 687 #if defined(VIDEO_HOLE) |
| 686 contains_media_player_(false), | 688 contains_media_player_(false), |
| 687 #endif | 689 #endif |
| (...skipping 2694 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3382 if (!web_encrypted_media_client_) { | 3384 if (!web_encrypted_media_client_) { |
| 3383 #if defined(ENABLE_PEPPER_CDMS) | 3385 #if defined(ENABLE_PEPPER_CDMS) |
| 3384 scoped_ptr<media::CdmFactory> cdm_factory( | 3386 scoped_ptr<media::CdmFactory> cdm_factory( |
| 3385 new RenderCdmFactory(base::Bind(PepperCdmWrapperImpl::Create, frame_))); | 3387 new RenderCdmFactory(base::Bind(PepperCdmWrapperImpl::Create, frame_))); |
| 3386 #elif defined(ENABLE_BROWSER_CDMS) | 3388 #elif defined(ENABLE_BROWSER_CDMS) |
| 3387 scoped_ptr<media::CdmFactory> cdm_factory( | 3389 scoped_ptr<media::CdmFactory> cdm_factory( |
| 3388 new RenderCdmFactory(GetCdmManager())); | 3390 new RenderCdmFactory(GetCdmManager())); |
| 3389 #else | 3391 #else |
| 3390 scoped_ptr<media::CdmFactory> cdm_factory(new RenderCdmFactory()); | 3392 scoped_ptr<media::CdmFactory> cdm_factory(new RenderCdmFactory()); |
| 3391 #endif | 3393 #endif |
| 3392 web_encrypted_media_client_.reset( | 3394 |
| 3393 new media::WebEncryptedMediaClientImpl(cdm_factory.Pass())); | 3395 DCHECK(!media_permission_dispatcher_); |
| 3396 media_permission_dispatcher_ = new MediaPermissionDispatcher(this); |
| 3397 |
| 3398 web_encrypted_media_client_.reset(new media::WebEncryptedMediaClientImpl( |
| 3399 cdm_factory.Pass(), media_permission_dispatcher_)); |
| 3394 } | 3400 } |
| 3395 return web_encrypted_media_client_.get(); | 3401 return web_encrypted_media_client_.get(); |
| 3396 } | 3402 } |
| 3397 | 3403 |
| 3398 blink::WebMIDIClient* RenderFrameImpl::webMIDIClient() { | 3404 blink::WebMIDIClient* RenderFrameImpl::webMIDIClient() { |
| 3399 if (!midi_dispatcher_) | 3405 if (!midi_dispatcher_) |
| 3400 midi_dispatcher_ = new MidiDispatcher(this); | 3406 midi_dispatcher_ = new MidiDispatcher(this); |
| 3401 return midi_dispatcher_; | 3407 return midi_dispatcher_; |
| 3402 } | 3408 } |
| 3403 | 3409 |
| (...skipping 1044 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4448 | 4454 |
| 4449 #if defined(ENABLE_BROWSER_CDMS) | 4455 #if defined(ENABLE_BROWSER_CDMS) |
| 4450 RendererCdmManager* RenderFrameImpl::GetCdmManager() { | 4456 RendererCdmManager* RenderFrameImpl::GetCdmManager() { |
| 4451 if (!cdm_manager_) | 4457 if (!cdm_manager_) |
| 4452 cdm_manager_ = new RendererCdmManager(this); | 4458 cdm_manager_ = new RendererCdmManager(this); |
| 4453 return cdm_manager_; | 4459 return cdm_manager_; |
| 4454 } | 4460 } |
| 4455 #endif // defined(ENABLE_BROWSER_CDMS) | 4461 #endif // defined(ENABLE_BROWSER_CDMS) |
| 4456 | 4462 |
| 4457 } // namespace content | 4463 } // namespace content |
| OLD | NEW |