| OLD | NEW |
| 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 2386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2397 return NULL; | 2397 return NULL; |
| 2398 } else { | 2398 } else { |
| 2399 return new WebSharedWorkerProxy(RenderThreadImpl::current(), | 2399 return new WebSharedWorkerProxy(RenderThreadImpl::current(), |
| 2400 document_id, | 2400 document_id, |
| 2401 exists, | 2401 exists, |
| 2402 route_id, | 2402 route_id, |
| 2403 routing_id_); | 2403 routing_id_); |
| 2404 } | 2404 } |
| 2405 } | 2405 } |
| 2406 | 2406 |
| 2407 // TODO(wjia): remove the version without url when WebKit change is done. | |
| 2408 // http://webk.it/91301. | |
| 2409 WebMediaPlayer* RenderViewImpl::createMediaPlayer( | 2407 WebMediaPlayer* RenderViewImpl::createMediaPlayer( |
| 2410 WebFrame* frame, const WebKit::WebURL& url, WebMediaPlayerClient* client) { | 2408 WebFrame* frame, const WebKit::WebURL& url, WebMediaPlayerClient* client) { |
| 2411 return createMediaPlayer(frame, client); | |
| 2412 } | |
| 2413 | |
| 2414 WebMediaPlayer* RenderViewImpl::createMediaPlayer( | |
| 2415 WebFrame* frame, WebMediaPlayerClient* client) { | |
| 2416 FOR_EACH_OBSERVER( | 2409 FOR_EACH_OBSERVER( |
| 2417 RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client)); | 2410 RenderViewObserver, observers_, WillCreateMediaPlayer(frame, client)); |
| 2418 | 2411 |
| 2419 #if defined(OS_ANDROID) | 2412 #if defined(OS_ANDROID) |
| 2420 // TODO(qinmin): upstream the implementation of getting WebGraphicsContext3D | 2413 // TODO(qinmin): upstream the implementation of getting WebGraphicsContext3D |
| 2421 // and GpuChannelHost here to replace the NULL params. | 2414 // and GpuChannelHost here to replace the NULL params. |
| 2422 return new webkit_media::WebMediaPlayerAndroid( | 2415 return new webkit_media::WebMediaPlayerAndroid( |
| 2423 frame, client, cookieJar(frame), media_player_manager_.get(), | 2416 frame, client, cookieJar(frame), media_player_manager_.get(), |
| 2424 new content::StreamTextureFactoryImpl(NULL, NULL, routing_id_)); | 2417 new content::StreamTextureFactoryImpl(NULL, NULL, routing_id_)); |
| 2425 #endif | 2418 #endif |
| (...skipping 3466 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5892 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { | 5885 bool RenderViewImpl::WebWidgetHandlesCompositorScheduling() const { |
| 5893 return !!RenderThreadImpl::current()->compositor_thread(); | 5886 return !!RenderThreadImpl::current()->compositor_thread(); |
| 5894 } | 5887 } |
| 5895 | 5888 |
| 5896 void RenderViewImpl::OnJavaBridgeInit() { | 5889 void RenderViewImpl::OnJavaBridgeInit() { |
| 5897 DCHECK(!java_bridge_dispatcher_); | 5890 DCHECK(!java_bridge_dispatcher_); |
| 5898 #if defined(ENABLE_JAVA_BRIDGE) | 5891 #if defined(ENABLE_JAVA_BRIDGE) |
| 5899 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); | 5892 java_bridge_dispatcher_ = new JavaBridgeDispatcher(this); |
| 5900 #endif | 5893 #endif |
| 5901 } | 5894 } |
| OLD | NEW |