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

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: Created 8 years, 6 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
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 2306 matching lines...) Expand 10 before | Expand all | Expand 10 after
2317 return NULL; 2317 return NULL;
2318 } else { 2318 } else {
2319 return new WebSharedWorkerProxy(RenderThreadImpl::current(), 2319 return new WebSharedWorkerProxy(RenderThreadImpl::current(),
2320 document_id, 2320 document_id,
2321 exists, 2321 exists,
2322 route_id, 2322 route_id,
2323 routing_id_); 2323 routing_id_);
2324 } 2324 }
2325 } 2325 }
2326 2326
2327 // TODO(wjia): remove the version without url when WebKit change is done.
2328 WebMediaPlayer* RenderViewImpl::createMediaPlayer(
2329 WebFrame* frame, WebMediaPlayerClient* client, const WebKit::WebURL& url) {
2330 return createMediaPlayer(frame, client);
2331 }
2332
2327 WebMediaPlayer* RenderViewImpl::createMediaPlayer( 2333 WebMediaPlayer* RenderViewImpl::createMediaPlayer(
2328 WebFrame* frame, WebMediaPlayerClient* client) { 2334 WebFrame* frame, WebMediaPlayerClient* client) {
2329 FOR_EACH_OBSERVER( 2335 FOR_EACH_OBSERVER(
2330 RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client)); 2336 RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client));
2331 2337
2332 #if defined(OS_ANDROID) 2338 #if defined(OS_ANDROID)
2333 // TODO(qinmin): upstream the implementation of StreamTextureFactoryImpl 2339 // TODO(qinmin): upstream the implementation of StreamTextureFactoryImpl
2334 // to replace the NULL param here. 2340 // to replace the NULL param here.
2335 return new webkit_media::WebMediaPlayerAndroid( 2341 return new webkit_media::WebMediaPlayerAndroid(
2336 frame, client, cookieJar(frame), media_player_manager_.get(), NULL); 2342 frame, client, cookieJar(frame), media_player_manager_.get(), NULL);
(...skipping 3270 matching lines...) Expand 10 before | Expand all | Expand 10 after
5607 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { 5613 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const {
5608 return !!RenderThreadImpl::current()->compositor_thread(); 5614 return !!RenderThreadImpl::current()->compositor_thread();
5609 } 5615 }
5610 5616
5611 void RenderViewImpl::OnJavaBridgeInit() { 5617 void RenderViewImpl::OnJavaBridgeInit() {
5612 DCHECK(!java_bridge_dispatcher_); 5618 DCHECK(!java_bridge_dispatcher_);
5613 #if defined(ENABLE_JAVA_BRIDGE) 5619 #if defined(ENABLE_JAVA_BRIDGE)
5614 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); 5620 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this);
5615 #endif 5621 #endif
5616 } 5622 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698