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

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

Issue 1412933005: Revert of Introduce WebMediaSession (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 #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 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 168
169 #if defined(OS_ANDROID) 169 #if defined(OS_ANDROID)
170 #include <cpu-features.h> 170 #include <cpu-features.h>
171 171
172 #include "content/common/gpu/client/context_provider_command_buffer.h" 172 #include "content/common/gpu/client/context_provider_command_buffer.h"
173 #include "content/renderer/android/synchronous_compositor_factory.h" 173 #include "content/renderer/android/synchronous_compositor_factory.h"
174 #include "content/renderer/java/gin_java_bridge_dispatcher.h" 174 #include "content/renderer/java/gin_java_bridge_dispatcher.h"
175 #include "content/renderer/media/android/renderer_media_player_manager.h" 175 #include "content/renderer/media/android/renderer_media_player_manager.h"
176 #include "content/renderer/media/android/stream_texture_factory_impl.h" 176 #include "content/renderer/media/android/stream_texture_factory_impl.h"
177 #include "content/renderer/media/android/webmediaplayer_android.h" 177 #include "content/renderer/media/android/webmediaplayer_android.h"
178 #include "content/renderer/media/android/webmediasession_android.h"
179 #else 178 #else
180 #include "cc/blink/context_provider_web_context.h" 179 #include "cc/blink/context_provider_web_context.h"
181 #include "content/renderer/usb/web_usb_client_impl.h" 180 #include "content/renderer/usb/web_usb_client_impl.h"
182 #include "device/devices_app/public/cpp/constants.h" 181 #include "device/devices_app/public/cpp/constants.h"
183 #endif 182 #endif
184 183
185 #if defined(ENABLE_PEPPER_CDMS) 184 #if defined(ENABLE_PEPPER_CDMS)
186 #include "content/renderer/media/crypto/pepper_cdm_wrapper_impl.h" 185 #include "content/renderer/media/crypto/pepper_cdm_wrapper_impl.h"
187 #elif defined(ENABLE_BROWSER_CDMS) 186 #elif defined(ENABLE_BROWSER_CDMS)
188 #include "content/renderer/media/crypto/renderer_cdm_manager.h" 187 #include "content/renderer/media/crypto/renderer_cdm_manager.h"
(...skipping 24 matching lines...) Expand all
213 using blink::WebElement; 212 using blink::WebElement;
214 using blink::WebExternalPopupMenu; 213 using blink::WebExternalPopupMenu;
215 using blink::WebExternalPopupMenuClient; 214 using blink::WebExternalPopupMenuClient;
216 using blink::WebFrame; 215 using blink::WebFrame;
217 using blink::WebHistoryItem; 216 using blink::WebHistoryItem;
218 using blink::WebHTTPBody; 217 using blink::WebHTTPBody;
219 using blink::WebLocalFrame; 218 using blink::WebLocalFrame;
220 using blink::WebMediaPlayer; 219 using blink::WebMediaPlayer;
221 using blink::WebMediaPlayerClient; 220 using blink::WebMediaPlayerClient;
222 using blink::WebMediaPlayerEncryptedMediaClient; 221 using blink::WebMediaPlayerEncryptedMediaClient;
223 using blink::WebMediaSession;
224 using blink::WebNavigationPolicy; 222 using blink::WebNavigationPolicy;
225 using blink::WebNavigationType; 223 using blink::WebNavigationType;
226 using blink::WebNode; 224 using blink::WebNode;
227 using blink::WebPageSerializer; 225 using blink::WebPageSerializer;
228 using blink::WebPageSerializerClient; 226 using blink::WebPageSerializerClient;
229 using blink::WebPluginParams; 227 using blink::WebPluginParams;
230 using blink::WebPopupMenuInfo; 228 using blink::WebPopupMenuInfo;
231 using blink::WebRange; 229 using blink::WebRange;
232 using blink::WebReferrerPolicy; 230 using blink::WebReferrerPolicy;
233 using blink::WebScriptSource; 231 using blink::WebScriptSource;
(...skipping 1891 matching lines...) Expand 10 before | Expand all | Expand 10 after
2125 *render_thread->GetAudioHardwareConfig())); 2123 *render_thread->GetAudioHardwareConfig()));
2126 } 2124 }
2127 #endif // defined(ENABLE_MOJO_MEDIA) 2125 #endif // defined(ENABLE_MOJO_MEDIA)
2128 2126
2129 return new media::WebMediaPlayerImpl( 2127 return new media::WebMediaPlayerImpl(
2130 frame, client, encrypted_client, weak_factory_.GetWeakPtr(), 2128 frame, client, encrypted_client, weak_factory_.GetWeakPtr(),
2131 media_renderer_factory.Pass(), GetCdmFactory(), params); 2129 media_renderer_factory.Pass(), GetCdmFactory(), params);
2132 #endif // defined(OS_ANDROID) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID) 2130 #endif // defined(OS_ANDROID) && !defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
2133 } 2131 }
2134 2132
2135 blink::WebMediaSession* RenderFrameImpl::createMediaSession() {
2136 #if defined(OS_ANDROID)
2137 return new WebMediaSessionAndroid();
2138 #else
2139 return nullptr;
2140 #endif // defined(OS_ANDROID)
2141 }
2142
2143 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost( 2133 blink::WebApplicationCacheHost* RenderFrameImpl::createApplicationCacheHost(
2144 blink::WebLocalFrame* frame, 2134 blink::WebLocalFrame* frame,
2145 blink::WebApplicationCacheHostClient* client) { 2135 blink::WebApplicationCacheHostClient* client) {
2146 if (!frame || !frame->view()) 2136 if (!frame || !frame->view())
2147 return NULL; 2137 return NULL;
2148 DCHECK(!frame_ || frame_ == frame); 2138 DCHECK(!frame_ || frame_ == frame);
2149 return new RendererWebApplicationCacheHostImpl( 2139 return new RendererWebApplicationCacheHostImpl(
2150 RenderViewImpl::FromWebView(frame->view()), client, 2140 RenderViewImpl::FromWebView(frame->view()), client,
2151 RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy()); 2141 RenderThreadImpl::current()->appcache_dispatcher()->backend_proxy());
2152 } 2142 }
(...skipping 3058 matching lines...) Expand 10 before | Expand all | Expand 10 after
5211 mojo::ServiceProviderPtr service_provider; 5201 mojo::ServiceProviderPtr service_provider;
5212 mojo::URLRequestPtr request(mojo::URLRequest::New()); 5202 mojo::URLRequestPtr request(mojo::URLRequest::New());
5213 request->url = mojo::String::From(url); 5203 request->url = mojo::String::From(url);
5214 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider), 5204 mojo_shell_->ConnectToApplication(request.Pass(), GetProxy(&service_provider),
5215 nullptr, nullptr, 5205 nullptr, nullptr,
5216 base::Bind(&OnGotContentHandlerID)); 5206 base::Bind(&OnGotContentHandlerID));
5217 return service_provider.Pass(); 5207 return service_provider.Pass();
5218 } 5208 }
5219 5209
5220 } // namespace content 5210 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698