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/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/debug/debugger.h" | 10 #include "base/debug/debugger.h" |
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
316 new media::MessageLoopFactoryImpl()); | 316 new media::MessageLoopFactoryImpl()); |
317 | 317 |
318 scoped_ptr<media::FilterCollection> collection( | 318 scoped_ptr<media::FilterCollection> collection( |
319 new media::FilterCollection()); | 319 new media::FilterCollection()); |
320 | 320 |
321 scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer( | 321 scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer( |
322 new webkit_glue::VideoRendererImpl(false)); | 322 new webkit_glue::VideoRendererImpl(false)); |
323 collection->AddVideoRenderer(video_renderer); | 323 collection->AddVideoRenderer(video_renderer); |
324 | 324 |
325 scoped_ptr<webkit_glue::WebMediaPlayerImpl> result( | 325 scoped_ptr<webkit_glue::WebMediaPlayerImpl> result( |
326 new webkit_glue::WebMediaPlayerImpl(client, | 326 new webkit_glue::WebMediaPlayerImpl( |
327 NULL, | 327 client, |
328 collection.release(), | 328 base::WeakPtr<webkit_glue::WebMediaPlayerDelegate>(), |
329 message_loop_factory.release(), | 329 collection.release(), |
330 NULL, | 330 message_loop_factory.release(), |
331 new media::MediaLog())); | 331 NULL, |
| 332 new media::MediaLog())); |
332 if (!result->Initialize(frame, false, video_renderer)) { | 333 if (!result->Initialize(frame, false, video_renderer)) { |
333 return NULL; | 334 return NULL; |
334 } | 335 } |
335 return result.release(); | 336 return result.release(); |
336 } | 337 } |
337 | 338 |
338 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( | 339 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( |
339 WebFrame*, WebKit::WebApplicationCacheHostClient* client) { | 340 WebFrame*, WebKit::WebApplicationCacheHostClient* client) { |
340 return SimpleAppCacheSystem::CreateApplicationCacheHost(client); | 341 return SimpleAppCacheSystem::CreateApplicationCacheHost(client); |
341 } | 342 } |
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
638 return ui::GdkNativeKeyCodeForWindowsKeyCode(code, shift); | 639 return ui::GdkNativeKeyCodeForWindowsKeyCode(code, shift); |
639 } | 640 } |
640 #endif | 641 #endif |
641 | 642 |
642 // Timers | 643 // Timers |
643 double GetForegroundTabTimerInterval() { | 644 double GetForegroundTabTimerInterval() { |
644 return webkit_glue::kForegroundTabTimerInterval; | 645 return webkit_glue::kForegroundTabTimerInterval; |
645 } | 646 } |
646 | 647 |
647 } // namespace webkit_support | 648 } // namespace webkit_support |
OLD | NEW |