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 98 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
109 #include "media/base/audio_renderer_mixer_input.h" | 109 #include "media/base/audio_renderer_mixer_input.h" |
110 #include "media/base/media_log.h" | 110 #include "media/base/media_log.h" |
111 #include "media/blink/webencryptedmediaclient_impl.h" | 111 #include "media/blink/webencryptedmediaclient_impl.h" |
112 #include "media/blink/webmediaplayer_impl.h" | 112 #include "media/blink/webmediaplayer_impl.h" |
113 #include "media/blink/webmediaplayer_params.h" | 113 #include "media/blink/webmediaplayer_params.h" |
114 #include "media/renderers/gpu_video_accelerator_factories.h" | 114 #include "media/renderers/gpu_video_accelerator_factories.h" |
115 #include "net/base/data_url.h" | 115 #include "net/base/data_url.h" |
116 #include "net/base/net_errors.h" | 116 #include "net/base/net_errors.h" |
117 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" | 117 #include "net/base/registry_controlled_domains/registry_controlled_domain.h" |
118 #include "net/http/http_util.h" | 118 #include "net/http/http_util.h" |
119 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" | 119 #include "third_party/WebKit/public/platform/WebMediaPlayerClient.h" |
ddorwin
2015/07/14 18:25:10
ditto
Srirama
2015/07/15 06:14:24
Done.
| |
120 #include "third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h" | 120 #include "third_party/WebKit/public/platform/WebStorageQuotaCallbacks.h" |
121 #include "third_party/WebKit/public/platform/WebString.h" | 121 #include "third_party/WebKit/public/platform/WebString.h" |
122 #include "third_party/WebKit/public/platform/WebURL.h" | 122 #include "third_party/WebKit/public/platform/WebURL.h" |
123 #include "third_party/WebKit/public/platform/WebURLError.h" | 123 #include "third_party/WebKit/public/platform/WebURLError.h" |
124 #include "third_party/WebKit/public/platform/WebURLResponse.h" | 124 #include "third_party/WebKit/public/platform/WebURLResponse.h" |
125 #include "third_party/WebKit/public/platform/WebVector.h" | 125 #include "third_party/WebKit/public/platform/WebVector.h" |
126 #include "third_party/WebKit/public/web/WebColorSuggestion.h" | 126 #include "third_party/WebKit/public/web/WebColorSuggestion.h" |
127 #include "third_party/WebKit/public/web/WebDocument.h" | 127 #include "third_party/WebKit/public/web/WebDocument.h" |
128 #include "third_party/WebKit/public/web/WebFrameWidget.h" | 128 #include "third_party/WebKit/public/web/WebFrameWidget.h" |
129 #include "third_party/WebKit/public/web/WebGlyphCache.h" | 129 #include "third_party/WebKit/public/web/WebGlyphCache.h" |
(...skipping 1862 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1992 return CreatePlugin(frame, info, params_to_use, nullptr /* throttler */); | 1992 return CreatePlugin(frame, info, params_to_use, nullptr /* throttler */); |
1993 #else | 1993 #else |
1994 return NULL; | 1994 return NULL; |
1995 #endif // defined(ENABLE_PLUGINS) | 1995 #endif // defined(ENABLE_PLUGINS) |
1996 } | 1996 } |
1997 | 1997 |
1998 blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer( | 1998 blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer( |
1999 blink::WebLocalFrame* frame, | 1999 blink::WebLocalFrame* frame, |
2000 const blink::WebURL& url, | 2000 const blink::WebURL& url, |
2001 WebMediaPlayerClient* client, | 2001 WebMediaPlayerClient* client, |
2002 WebContentDecryptionModule* initial_cdm) { | |
2003 return createMediaPlayer(frame, url, client, client, initial_cdm); | |
2004 } | |
2005 | |
2006 blink::WebMediaPlayer* RenderFrameImpl::createMediaPlayer( | |
2007 blink::WebLocalFrame* frame, | |
2008 const blink::WebURL& url, | |
2009 WebMediaPlayerClient* client, | |
2010 WebMediaPlayerEncryptedMediaClient* encrypted_client, | 2002 WebMediaPlayerEncryptedMediaClient* encrypted_client, |
2011 WebContentDecryptionModule* initial_cdm) { | 2003 WebContentDecryptionModule* initial_cdm) { |
2012 #if defined(VIDEO_HOLE) | 2004 #if defined(VIDEO_HOLE) |
2013 if (!contains_media_player_) { | 2005 if (!contains_media_player_) { |
2014 render_view_->RegisterVideoHoleFrame(this); | 2006 render_view_->RegisterVideoHoleFrame(this); |
2015 contains_media_player_ = true; | 2007 contains_media_player_ = true; |
2016 } | 2008 } |
2017 #endif // defined(VIDEO_HOLE) | 2009 #endif // defined(VIDEO_HOLE) |
2018 | 2010 |
2019 blink::WebMediaStream web_stream( | 2011 blink::WebMediaStream web_stream( |
(...skipping 3050 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
5070 void RenderFrameImpl::RegisterMojoServices() { | 5062 void RenderFrameImpl::RegisterMojoServices() { |
5071 // Only main frame have ImageDownloader service. | 5063 // Only main frame have ImageDownloader service. |
5072 if (!frame_->parent()) { | 5064 if (!frame_->parent()) { |
5073 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>( | 5065 GetServiceRegistry()->AddService<image_downloader::ImageDownloader>( |
5074 base::Bind(&ImageDownloaderImpl::CreateMojoService, | 5066 base::Bind(&ImageDownloaderImpl::CreateMojoService, |
5075 base::Unretained(this))); | 5067 base::Unretained(this))); |
5076 } | 5068 } |
5077 } | 5069 } |
5078 | 5070 |
5079 } // namespace content | 5071 } // namespace content |
OLD | NEW |