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" |
11 #include "base/file_path.h" | 11 #include "base/file_path.h" |
12 #include "base/file_util.h" | 12 #include "base/file_util.h" |
13 #include "base/i18n/icu_util.h" | 13 #include "base/i18n/icu_util.h" |
14 #include "base/logging.h" | 14 #include "base/logging.h" |
15 #include "base/memory/ref_counted.h" | 15 #include "base/memory/ref_counted.h" |
16 #include "base/memory/weak_ptr.h" | 16 #include "base/memory/weak_ptr.h" |
17 #include "base/message_loop.h" | 17 #include "base/message_loop.h" |
18 #include "base/path_service.h" | 18 #include "base/path_service.h" |
19 #include "base/process_util.h" | 19 #include "base/process_util.h" |
20 #include "base/scoped_temp_dir.h" | 20 #include "base/scoped_temp_dir.h" |
21 #include "base/string_piece.h" | 21 #include "base/string_piece.h" |
22 #include "base/string_util.h" | 22 #include "base/string_util.h" |
23 #include "base/stringprintf.h" | 23 #include "base/stringprintf.h" |
24 #include "base/sys_string_conversions.h" | 24 #include "base/sys_string_conversions.h" |
25 #include "base/time.h" | 25 #include "base/time.h" |
26 #include "base/utf_string_conversions.h" | 26 #include "base/utf_string_conversions.h" |
27 #include "googleurl/src/url_util.h" | 27 #include "googleurl/src/url_util.h" |
28 #include "grit/webkit_chromium_resources.h" | 28 #include "grit/webkit_chromium_resources.h" |
29 #include "media/base/filter_collection.h" | 29 #include "media/base/filter_collection.h" |
| 30 #include "media/base/media_log.h" |
30 #include "media/base/message_loop_factory_impl.h" | 31 #include "media/base/message_loop_factory_impl.h" |
31 #include "net/base/escape.h" | 32 #include "net/base/escape.h" |
32 #include "net/base/net_errors.h" | 33 #include "net/base/net_errors.h" |
33 #include "net/base/net_util.h" | 34 #include "net/base/net_util.h" |
34 #include "testing/gtest/include/gtest/gtest.h" | 35 #include "testing/gtest/include/gtest/gtest.h" |
35 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallback
s.h" | 36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileSystemCallback
s.h" |
36 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" | 37 #include "third_party/WebKit/Source/WebKit/chromium/public/WebKit.h" |
37 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" | 38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebPluginParams.h" |
38 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h" | 39 #include "third_party/WebKit/Source/WebKit/chromium/public/WebURLError.h" |
39 #include "ui/gfx/gl/gl_context.h" | 40 #include "ui/gfx/gl/gl_context.h" |
(...skipping 262 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
302 new media::FilterCollection()); | 303 new media::FilterCollection()); |
303 | 304 |
304 scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer( | 305 scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer( |
305 new webkit_glue::VideoRendererImpl(false)); | 306 new webkit_glue::VideoRendererImpl(false)); |
306 collection->AddVideoRenderer(video_renderer); | 307 collection->AddVideoRenderer(video_renderer); |
307 | 308 |
308 scoped_ptr<webkit_glue::WebMediaPlayerImpl> result( | 309 scoped_ptr<webkit_glue::WebMediaPlayerImpl> result( |
309 new webkit_glue::WebMediaPlayerImpl(client, | 310 new webkit_glue::WebMediaPlayerImpl(client, |
310 collection.release(), | 311 collection.release(), |
311 message_loop_factory.release(), | 312 message_loop_factory.release(), |
312 NULL)); | 313 NULL, |
| 314 new media::MediaLog())); |
313 if (!result->Initialize(frame, false, video_renderer)) { | 315 if (!result->Initialize(frame, false, video_renderer)) { |
314 return NULL; | 316 return NULL; |
315 } | 317 } |
316 return result.release(); | 318 return result.release(); |
317 } | 319 } |
318 | 320 |
319 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( | 321 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( |
320 WebFrame*, WebKit::WebApplicationCacheHostClient* client) { | 322 WebFrame*, WebKit::WebApplicationCacheHostClient* client) { |
321 return SimpleAppCacheSystem::CreateApplicationCacheHost(client); | 323 return SimpleAppCacheSystem::CreateApplicationCacheHost(client); |
322 } | 324 } |
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
609 test_environment->webkit_client()->fileSystem()); | 611 test_environment->webkit_client()->fileSystem()); |
610 fileSystem->OpenFileSystem(frame, type, size, create, callbacks); | 612 fileSystem->OpenFileSystem(frame, type, size, create, callbacks); |
611 } | 613 } |
612 | 614 |
613 // Timers | 615 // Timers |
614 double GetForegroundTabTimerInterval() { | 616 double GetForegroundTabTimerInterval() { |
615 return webkit_glue::kForegroundTabTimerInterval; | 617 return webkit_glue::kForegroundTabTimerInterval; |
616 } | 618 } |
617 | 619 |
618 } // namespace webkit_support | 620 } // namespace webkit_support |
OLD | NEW |