| 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 367 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 378 | 378 |
| 379 scoped_ptr<media::FilterCollection> collection( | 379 scoped_ptr<media::FilterCollection> collection( |
| 380 new media::FilterCollection()); | 380 new media::FilterCollection()); |
| 381 | 381 |
| 382 return new webkit_media::WebMediaPlayerImpl( | 382 return new webkit_media::WebMediaPlayerImpl( |
| 383 frame, | 383 frame, |
| 384 client, | 384 client, |
| 385 base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), | 385 base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), |
| 386 collection.release(), | 386 collection.release(), |
| 387 NULL, | 387 NULL, |
| 388 NULL, |
| 388 message_loop_factory.release(), | 389 message_loop_factory.release(), |
| 389 media_stream_client, | 390 media_stream_client, |
| 390 new media::MediaLog()); | 391 new media::MediaLog()); |
| 391 #endif | 392 #endif |
| 392 } | 393 } |
| 393 | 394 |
| 394 WebKit::WebMediaPlayer* CreateMediaPlayer( | 395 WebKit::WebMediaPlayer* CreateMediaPlayer( |
| 395 WebFrame* frame, | 396 WebFrame* frame, |
| 396 WebMediaPlayerClient* client) { | 397 WebMediaPlayerClient* client) { |
| 397 return CreateMediaPlayer(frame, client, NULL); | 398 return CreateMediaPlayer(frame, client, NULL); |
| (...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 807 // Logging | 808 // Logging |
| 808 void EnableWebCoreLogChannels(const std::string& channels) { | 809 void EnableWebCoreLogChannels(const std::string& channels) { |
| 809 webkit_glue::EnableWebCoreLogChannels(channels); | 810 webkit_glue::EnableWebCoreLogChannels(channels); |
| 810 } | 811 } |
| 811 | 812 |
| 812 void SetGamepadData(const WebKit::WebGamepads& pads) { | 813 void SetGamepadData(const WebKit::WebGamepads& pads) { |
| 813 test_environment->webkit_platform_support()->setGamepadData(pads); | 814 test_environment->webkit_platform_support()->setGamepadData(pads); |
| 814 } | 815 } |
| 815 | 816 |
| 816 } // namespace webkit_support | 817 } // namespace webkit_support |
| OLD | NEW |