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 "webkit/support/webkit_support.h" | 5 #include "webkit/support/webkit_support.h" |
6 | 6 |
7 #include "base/at_exit.h" | 7 #include "base/at_exit.h" |
8 #include "base/base64.h" | 8 #include "base/base64.h" |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 #include "webkit/glue/webkit_glue.h" | 54 #include "webkit/glue/webkit_glue.h" |
55 #include "webkit/glue/webkitplatformsupport_impl.h" | 55 #include "webkit/glue/webkitplatformsupport_impl.h" |
56 #include "webkit/glue/weburlrequest_extradata_impl.h" | 56 #include "webkit/glue/weburlrequest_extradata_impl.h" |
57 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" | 57 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" |
58 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" | 58 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" |
59 #if defined(OS_ANDROID) | 59 #if defined(OS_ANDROID) |
60 #include "webkit/media/android/media_player_bridge_manager_impl.h" | 60 #include "webkit/media/android/media_player_bridge_manager_impl.h" |
61 #include "webkit/media/android/webmediaplayer_in_process_android.h" | 61 #include "webkit/media/android/webmediaplayer_in_process_android.h" |
62 #include "webkit/media/android/webmediaplayer_manager_android.h" | 62 #include "webkit/media/android/webmediaplayer_manager_android.h" |
63 #endif | 63 #endif |
| 64 #include "webkit/media/media_stream_client.h" |
64 #include "webkit/media/webmediaplayer_impl.h" | 65 #include "webkit/media/webmediaplayer_impl.h" |
| 66 #include "webkit/media/webmediaplayer_ms.h" |
65 #include "webkit/plugins/npapi/plugin_list.h" | 67 #include "webkit/plugins/npapi/plugin_list.h" |
66 #include "webkit/plugins/npapi/webplugin_impl.h" | 68 #include "webkit/plugins/npapi/webplugin_impl.h" |
67 #include "webkit/plugins/npapi/webplugin_page_delegate.h" | 69 #include "webkit/plugins/npapi/webplugin_page_delegate.h" |
68 #include "webkit/plugins/webplugininfo.h" | 70 #include "webkit/plugins/webplugininfo.h" |
69 #include "webkit/support/platform_support.h" | 71 #include "webkit/support/platform_support.h" |
70 #include "webkit/support/simple_database_system.h" | 72 #include "webkit/support/simple_database_system.h" |
71 #include "webkit/support/test_webkit_platform_support.h" | 73 #include "webkit/support/test_webkit_platform_support.h" |
72 #include "webkit/support/test_webplugin_page_delegate.h" | 74 #include "webkit/support/test_webplugin_page_delegate.h" |
73 #include "webkit/tools/test_shell/simple_appcache_system.h" | 75 #include "webkit/tools/test_shell/simple_appcache_system.h" |
74 #include "webkit/tools/test_shell/simple_dom_storage_system.h" | 76 #include "webkit/tools/test_shell/simple_dom_storage_system.h" |
(...skipping 331 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
406 test_environment->media_bridge_manager(), | 408 test_environment->media_bridge_manager(), |
407 new webkit_support::TestStreamTextureFactory(), | 409 new webkit_support::TestStreamTextureFactory(), |
408 true); | 410 true); |
409 #else | 411 #else |
410 scoped_ptr<media::MessageLoopFactory> message_loop_factory( | 412 scoped_ptr<media::MessageLoopFactory> message_loop_factory( |
411 new media::MessageLoopFactory()); | 413 new media::MessageLoopFactory()); |
412 | 414 |
413 scoped_ptr<media::FilterCollection> collection( | 415 scoped_ptr<media::FilterCollection> collection( |
414 new media::FilterCollection()); | 416 new media::FilterCollection()); |
415 | 417 |
| 418 if (media_stream_client && media_stream_client->IsMediaStream(url)) { |
| 419 return new webkit_media::WebMediaPlayerMS( |
| 420 frame, |
| 421 client, |
| 422 base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), |
| 423 media_stream_client, |
| 424 new media::MediaLog()); |
| 425 } |
| 426 |
416 return new webkit_media::WebMediaPlayerImpl( | 427 return new webkit_media::WebMediaPlayerImpl( |
417 frame, | 428 frame, |
418 client, | 429 client, |
419 base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), | 430 base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), |
420 collection.release(), | 431 collection.release(), |
421 NULL, | 432 NULL, |
422 NULL, | 433 NULL, |
423 message_loop_factory.release(), | 434 message_loop_factory.release(), |
424 media_stream_client, | 435 media_stream_client, |
425 new media::MediaLog()); | 436 new media::MediaLog()); |
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
854 // Logging | 865 // Logging |
855 void EnableWebCoreLogChannels(const std::string& channels) { | 866 void EnableWebCoreLogChannels(const std::string& channels) { |
856 webkit_glue::EnableWebCoreLogChannels(channels); | 867 webkit_glue::EnableWebCoreLogChannels(channels); |
857 } | 868 } |
858 | 869 |
859 void SetGamepadData(const WebKit::WebGamepads& pads) { | 870 void SetGamepadData(const WebKit::WebGamepads& pads) { |
860 test_environment->webkit_platform_support()->setGamepadData(pads); | 871 test_environment->webkit_platform_support()->setGamepadData(pads); |
861 } | 872 } |
862 | 873 |
863 } // namespace webkit_support | 874 } // namespace webkit_support |
OLD | NEW |