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 424 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
435 return new webkit_media::WebMediaPlayerInProcessAndroid( | 435 return new webkit_media::WebMediaPlayerInProcessAndroid( |
436 frame, | 436 frame, |
437 client, | 437 client, |
438 GetWebKitPlatformSupport()->cookieJar(), | 438 GetWebKitPlatformSupport()->cookieJar(), |
439 test_environment->media_player_manager(), | 439 test_environment->media_player_manager(), |
440 test_environment->media_bridge_manager(), | 440 test_environment->media_bridge_manager(), |
441 new webkit_support::TestStreamTextureFactory(), | 441 new webkit_support::TestStreamTextureFactory(), |
442 true); | 442 true); |
443 #else | 443 #else |
444 webkit_media::WebMediaPlayerParams params( | 444 webkit_media::WebMediaPlayerParams params( |
445 NULL, NULL, NULL, new media::MediaLog()); | 445 NULL, NULL, new media::MediaLog()); |
446 return new webkit_media::WebMediaPlayerImpl( | 446 return new webkit_media::WebMediaPlayerImpl( |
447 frame, | 447 frame, |
448 client, | 448 client, |
449 base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), | 449 base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), |
450 params); | 450 params); |
451 #endif | 451 #endif |
452 } | 452 } |
453 | 453 |
454 WebKit::WebMediaPlayer* CreateMediaPlayer( | 454 WebKit::WebMediaPlayer* CreateMediaPlayer( |
455 WebFrame* frame, | 455 WebFrame* frame, |
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
916 // Logging | 916 // Logging |
917 void EnableWebCoreLogChannels(const std::string& channels) { | 917 void EnableWebCoreLogChannels(const std::string& channels) { |
918 webkit_glue::EnableWebCoreLogChannels(channels); | 918 webkit_glue::EnableWebCoreLogChannels(channels); |
919 } | 919 } |
920 | 920 |
921 void SetGamepadData(const WebKit::WebGamepads& pads) { | 921 void SetGamepadData(const WebKit::WebGamepads& pads) { |
922 test_environment->webkit_platform_support()->setGamepadData(pads); | 922 test_environment->webkit_platform_support()->setGamepadData(pads); |
923 } | 923 } |
924 | 924 |
925 } // namespace webkit_support | 925 } // namespace webkit_support |
OLD | NEW |