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

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

Issue 10537091: add url as additional argument to createMediaPlayer. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: add annotation Created 8 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | webkit/support/webkit_support.h » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_view_impl.h" 5 #include "content/renderer/render_view_impl.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
(...skipping 2344 matching lines...) Expand 10 before | Expand all | Expand 10 after
2355 return NULL; 2355 return NULL;
2356 } else { 2356 } else {
2357 return new WebSharedWorkerProxy(RenderThreadImpl::current(), 2357 return new WebSharedWorkerProxy(RenderThreadImpl::current(),
2358 document_id, 2358 document_id,
2359 exists, 2359 exists,
2360 route_id, 2360 route_id,
2361 routing_id_); 2361 routing_id_);
2362 } 2362 }
2363 } 2363 }
2364 2364
2365 // TODO(wjia): remove the version without url when WebKit change is done.
2366 // http://webk.it/91301.
2367 WebMediaPlayer* RenderViewImpl::createMediaPlayer(
2368 WebFrame* frame, const WebKit::WebURL& url, WebMediaPlayerClient* client) {
2369 return createMediaPlayer(frame, client);
2370 }
2371
2365 WebMediaPlayer* RenderViewImpl::createMediaPlayer( 2372 WebMediaPlayer* RenderViewImpl::createMediaPlayer(
2366 WebFrame* frame, WebMediaPlayerClient* client) { 2373 WebFrame* frame, WebMediaPlayerClient* client) {
2367 FOR_EACH_OBSERVER( 2374 FOR_EACH_OBSERVER(
2368 RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client)); 2375 RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client));
2369 2376
2370 #if defined(OS_ANDROID) 2377 #if defined(OS_ANDROID)
2371 // TODO(qinmin): upstream the implementation of getting WebGraphicsContext3D 2378 // TODO(qinmin): upstream the implementation of getting WebGraphicsContext3D
2372 // and GpuChannelHost here to replace the NULL params. 2379 // and GpuChannelHost here to replace the NULL params.
2373 return new webkit_media::WebMediaPlayerAndroid( 2380 return new webkit_media::WebMediaPlayerAndroid(
2374 frame, client, cookieJar(frame), media_player_manager_.get(), 2381 frame, client, cookieJar(frame), media_player_manager_.get(),
(...skipping 3420 matching lines...) Expand 10 before | Expand all | Expand 10 after
5795 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5802 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
5796 return !!RenderThreadImpl::current()->compositor_thread(); 5803 return !!RenderThreadImpl::current()->compositor_thread();
5797 } 5804 }
5798 5805
5799 void RenderViewImpl::OnJavaBridgeInit() { 5806 void RenderViewImpl::OnJavaBridgeInit() {
5800 DCHECK(!java_bridge_dispatcher_); 5807 DCHECK(!java_bridge_dispatcher_);
5801 #if defined(ENABLE_JAVA_BRIDGE) 5808 #if defined(ENABLE_JAVA_BRIDGE)
5802 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); 5809 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this);
5803 #endif 5810 #endif
5804 } 5811 }
OLDNEW
« no previous file with comments | « content/renderer/render_view_impl.h ('k') | webkit/support/webkit_support.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698