| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 312 new media::MessageLoopFactoryImpl()); | 312 new media::MessageLoopFactoryImpl()); |
| 313 | 313 |
| 314 scoped_ptr<media::FilterCollection> collection( | 314 scoped_ptr<media::FilterCollection> collection( |
| 315 new media::FilterCollection()); | 315 new media::FilterCollection()); |
| 316 | 316 |
| 317 scoped_ptr<webkit_media::WebMediaPlayerImpl> result( | 317 scoped_ptr<webkit_media::WebMediaPlayerImpl> result( |
| 318 new webkit_media::WebMediaPlayerImpl( | 318 new webkit_media::WebMediaPlayerImpl( |
| 319 client, | 319 client, |
| 320 base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), | 320 base::WeakPtr<webkit_media::WebMediaPlayerDelegate>(), |
| 321 collection.release(), | 321 collection.release(), |
| 322 NULL, |
| 322 message_loop_factory.release(), | 323 message_loop_factory.release(), |
| 323 NULL, | 324 NULL, |
| 324 new media::MediaLog())); | 325 new media::MediaLog())); |
| 325 if (!result->Initialize(frame, false)) { | 326 if (!result->Initialize(frame, false)) { |
| 326 return NULL; | 327 return NULL; |
| 327 } | 328 } |
| 328 return result.release(); | 329 return result.release(); |
| 329 #endif | 330 #endif |
| 330 } | 331 } |
| 331 | 332 |
| (...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 641 // Logging | 642 // Logging |
| 642 void EnableWebCoreLogChannels(const std::string& channels) { | 643 void EnableWebCoreLogChannels(const std::string& channels) { |
| 643 webkit_glue::EnableWebCoreLogChannels(channels); | 644 webkit_glue::EnableWebCoreLogChannels(channels); |
| 644 } | 645 } |
| 645 | 646 |
| 646 void SetGamepadData(const WebKit::WebGamepads& pads) { | 647 void SetGamepadData(const WebKit::WebGamepads& pads) { |
| 647 test_environment->webkit_platform_support()->setGamepadData(pads); | 648 test_environment->webkit_platform_support()->setGamepadData(pads); |
| 648 } | 649 } |
| 649 | 650 |
| 650 } // namespace webkit_support | 651 } // namespace webkit_support |
| OLD | NEW |