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 403 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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 webkit_media::WebMediaPlayerParams params( | 423 webkit_media::WebMediaPlayerParams params( |
424 NULL, NULL, NULL, NULL, new media::MediaLog()); | 424 NULL, NULL, NULL, new media::MediaLog()); |
425 return new webkit_media::WebMediaPlayerImpl( | 425 return new webkit_media::WebMediaPlayerImpl( |
426 frame, | 426 frame, |
427 client, | 427 client, |
428 base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), | 428 base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), |
429 params); | 429 params); |
430 #endif | 430 #endif |
431 } | 431 } |
432 | 432 |
433 WebKit::WebMediaPlayer* CreateMediaPlayer( | 433 WebKit::WebMediaPlayer* CreateMediaPlayer( |
434 WebFrame* frame, | 434 WebFrame* frame, |
(...skipping 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
863 // Logging | 863 // Logging |
864 void EnableWebCoreLogChannels(const std::string& channels) { | 864 void EnableWebCoreLogChannels(const std::string& channels) { |
865 webkit_glue::EnableWebCoreLogChannels(channels); | 865 webkit_glue::EnableWebCoreLogChannels(channels); |
866 } | 866 } |
867 | 867 |
868 void SetGamepadData(const WebKit::WebGamepads& pads) { | 868 void SetGamepadData(const WebKit::WebGamepads& pads) { |
869 test_environment->webkit_platform_support()->setGamepadData(pads); | 869 test_environment->webkit_platform_support()->setGamepadData(pads); |
870 } | 870 } |
871 | 871 |
872 } // namespace webkit_support | 872 } // namespace webkit_support |
OLD | NEW |