OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "app/gfx/gl/gl_implementation.h" | 7 #include "app/gfx/gl/gl_implementation.h" |
8 #include "base/at_exit.h" | 8 #include "base/at_exit.h" |
9 #include "base/base64.h" | 9 #include "base/base64.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
285 new webkit_glue::MediaResourceLoaderBridgeFactory( | 285 new webkit_glue::MediaResourceLoaderBridgeFactory( |
286 GURL(), // referrer | 286 GURL(), // referrer |
287 "null", // frame origin | 287 "null", // frame origin |
288 "null", // main_frame_origin | 288 "null", // main_frame_origin |
289 base::GetCurrentProcId(), | 289 base::GetCurrentProcId(), |
290 appcache_host ? appcache_host->host_id() : appcache::kNoHostId, | 290 appcache_host ? appcache_host->host_id() : appcache::kNoHostId, |
291 0); | 291 0); |
292 | 292 |
293 scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer( | 293 scoped_refptr<webkit_glue::VideoRendererImpl> video_renderer( |
294 new webkit_glue::VideoRendererImpl(false)); | 294 new webkit_glue::VideoRendererImpl(false)); |
295 collection->AddFilter(video_renderer); | 295 collection->AddVideoRenderer(video_renderer); |
296 | 296 |
297 return new webkit_glue::WebMediaPlayerImpl( | 297 return new webkit_glue::WebMediaPlayerImpl( |
298 client, collection.release(), bridge_factory_simple, | 298 client, collection.release(), bridge_factory_simple, |
299 bridge_factory_buffered, false, video_renderer); | 299 bridge_factory_buffered, false, video_renderer); |
300 } | 300 } |
301 | 301 |
302 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( | 302 WebKit::WebApplicationCacheHost* CreateApplicationCacheHost( |
303 WebFrame*, WebKit::WebApplicationCacheHostClient* client) { | 303 WebFrame*, WebKit::WebApplicationCacheHostClient* client) { |
304 return SimpleAppCacheSystem::CreateApplicationCacheHost(client); | 304 return SimpleAppCacheSystem::CreateApplicationCacheHost(client); |
305 } | 305 } |
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
550 callbacks->didFail(WebKit::WebFileErrorSecurity); | 550 callbacks->didFail(WebKit::WebFileErrorSecurity); |
551 } else { | 551 } else { |
552 callbacks->didOpenFileSystem( | 552 callbacks->didOpenFileSystem( |
553 "TestShellFileSystem", | 553 "TestShellFileSystem", |
554 webkit_glue::FilePathToWebString( | 554 webkit_glue::FilePathToWebString( |
555 test_environment->webkit_client()->file_system_root())); | 555 test_environment->webkit_client()->file_system_root())); |
556 } | 556 } |
557 } | 557 } |
558 | 558 |
559 } // namespace webkit_support | 559 } // namespace webkit_support |
OLD | NEW |