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