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 13 matching lines...) Expand all Loading... |
24 #include "base/string_piece.h" | 24 #include "base/string_piece.h" |
25 #include "base/string_util.h" | 25 #include "base/string_util.h" |
26 #include "base/stringprintf.h" | 26 #include "base/stringprintf.h" |
27 #include "base/sys_string_conversions.h" | 27 #include "base/sys_string_conversions.h" |
28 #include "base/time.h" | 28 #include "base/time.h" |
29 #include "base/utf_string_conversions.h" | 29 #include "base/utf_string_conversions.h" |
30 #include "googleurl/src/url_util.h" | 30 #include "googleurl/src/url_util.h" |
31 #include "grit/webkit_chromium_resources.h" | 31 #include "grit/webkit_chromium_resources.h" |
32 #include "media/base/filter_collection.h" | 32 #include "media/base/filter_collection.h" |
33 #include "media/base/media_log.h" | 33 #include "media/base/media_log.h" |
34 #include "media/base/message_loop_factory.h" | |
35 #include "net/base/escape.h" | 34 #include "net/base/escape.h" |
36 #include "net/base/net_errors.h" | 35 #include "net/base/net_errors.h" |
37 #include "net/base/net_util.h" | 36 #include "net/base/net_util.h" |
38 #include "testing/gtest/include/gtest/gtest.h" | 37 #include "testing/gtest/include/gtest/gtest.h" |
39 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError.
h" | 38 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError.
h" |
40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" | 39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebCache.h" |
41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallback
s.h" | 40 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallback
s.h" |
42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" | 41 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" |
43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" | 42 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" |
44 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h
" | 43 #include "third_party/WebKit/Source/WebKit/chromium/public/WebStorageNamespace.h
" |
(...skipping 14 matching lines...) Expand all Loading... |
59 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" | 58 #include "webkit/gpu/webgraphicscontext3d_in_process_command_buffer_impl.h" |
60 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" | 59 #include "webkit/gpu/webgraphicscontext3d_in_process_impl.h" |
61 #if defined(OS_ANDROID) | 60 #if defined(OS_ANDROID) |
62 #include "webkit/media/android/media_player_bridge_manager_impl.h" | 61 #include "webkit/media/android/media_player_bridge_manager_impl.h" |
63 #include "webkit/media/android/webmediaplayer_in_process_android.h" | 62 #include "webkit/media/android/webmediaplayer_in_process_android.h" |
64 #include "webkit/media/android/webmediaplayer_manager_android.h" | 63 #include "webkit/media/android/webmediaplayer_manager_android.h" |
65 #endif | 64 #endif |
66 #include "webkit/media/media_stream_client.h" | 65 #include "webkit/media/media_stream_client.h" |
67 #include "webkit/media/webmediaplayer_impl.h" | 66 #include "webkit/media/webmediaplayer_impl.h" |
68 #include "webkit/media/webmediaplayer_ms.h" | 67 #include "webkit/media/webmediaplayer_ms.h" |
| 68 #include "webkit/media/webmediaplayer_params.h" |
69 #include "webkit/plugins/npapi/plugin_list.h" | 69 #include "webkit/plugins/npapi/plugin_list.h" |
70 #include "webkit/plugins/npapi/webplugin_impl.h" | 70 #include "webkit/plugins/npapi/webplugin_impl.h" |
71 #include "webkit/plugins/npapi/webplugin_page_delegate.h" | 71 #include "webkit/plugins/npapi/webplugin_page_delegate.h" |
72 #include "webkit/plugins/webplugininfo.h" | 72 #include "webkit/plugins/webplugininfo.h" |
73 #include "webkit/support/platform_support.h" | 73 #include "webkit/support/platform_support.h" |
74 #include "webkit/support/simple_database_system.h" | 74 #include "webkit/support/simple_database_system.h" |
75 #include "webkit/support/test_webkit_platform_support.h" | 75 #include "webkit/support/test_webkit_platform_support.h" |
76 #include "webkit/support/test_webplugin_page_delegate.h" | 76 #include "webkit/support/test_webplugin_page_delegate.h" |
77 #include "webkit/tools/test_shell/simple_appcache_system.h" | 77 #include "webkit/tools/test_shell/simple_appcache_system.h" |
78 #include "webkit/tools/test_shell/simple_dom_storage_system.h" | 78 #include "webkit/tools/test_shell/simple_dom_storage_system.h" |
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
413 #if defined(OS_ANDROID) | 413 #if defined(OS_ANDROID) |
414 return new webkit_media::WebMediaPlayerInProcessAndroid( | 414 return new webkit_media::WebMediaPlayerInProcessAndroid( |
415 frame, | 415 frame, |
416 client, | 416 client, |
417 GetWebKitPlatformSupport()->cookieJar(), | 417 GetWebKitPlatformSupport()->cookieJar(), |
418 test_environment->media_player_manager(), | 418 test_environment->media_player_manager(), |
419 test_environment->media_bridge_manager(), | 419 test_environment->media_bridge_manager(), |
420 new webkit_support::TestStreamTextureFactory(), | 420 new webkit_support::TestStreamTextureFactory(), |
421 true); | 421 true); |
422 #else | 422 #else |
423 scoped_ptr<media::MessageLoopFactory> message_loop_factory( | 423 webkit_media::WebMediaPlayerParams params( |
424 new media::MessageLoopFactory()); | 424 NULL, NULL, NULL, NULL, new media::MediaLog()); |
425 | |
426 scoped_ptr<media::FilterCollection> collection( | |
427 new media::FilterCollection()); | |
428 | |
429 return new webkit_media::WebMediaPlayerImpl( | 425 return new webkit_media::WebMediaPlayerImpl( |
430 frame, | 426 frame, |
431 client, | 427 client, |
432 base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), | 428 base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), |
433 collection.release(), | 429 params); |
434 NULL, | |
435 NULL, | |
436 message_loop_factory.release(), | |
437 media_stream_client, | |
438 new media::MediaLog()); | |
439 #endif | 430 #endif |
440 } | 431 } |
441 | 432 |
442 WebKit::WebMediaPlayer* CreateMediaPlayer( | 433 WebKit::WebMediaPlayer* CreateMediaPlayer( |
443 WebFrame* frame, | 434 WebFrame* frame, |
444 const WebURL& url, | 435 const WebURL& url, |
445 WebMediaPlayerClient* client) { | 436 WebMediaPlayerClient* client) { |
446 return CreateMediaPlayer(frame, url, client, NULL); | 437 return CreateMediaPlayer(frame, url, client, NULL); |
447 } | 438 } |
448 | 439 |
(...skipping 423 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
872 // Logging | 863 // Logging |
873 void EnableWebCoreLogChannels(const std::string& channels) { | 864 void EnableWebCoreLogChannels(const std::string& channels) { |
874 webkit_glue::EnableWebCoreLogChannels(channels); | 865 webkit_glue::EnableWebCoreLogChannels(channels); |
875 } | 866 } |
876 | 867 |
877 void SetGamepadData(const WebKit::WebGamepads& pads) { | 868 void SetGamepadData(const WebKit::WebGamepads& pads) { |
878 test_environment->webkit_platform_support()->setGamepadData(pads); | 869 test_environment->webkit_platform_support()->setGamepadData(pads); |
879 } | 870 } |
880 | 871 |
881 } // namespace webkit_support | 872 } // namespace webkit_support |
OLD | NEW |