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 "chrome/renderer/render_view.h" | 5 #include "chrome/renderer/render_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 2422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2433 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { | 2433 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { |
2434 // Add the chrome specific audio renderer. | 2434 // Add the chrome specific audio renderer. |
2435 factory->AddFactory( | 2435 factory->AddFactory( |
2436 AudioRendererImpl::CreateFactory(audio_message_filter())); | 2436 AudioRendererImpl::CreateFactory(audio_message_filter())); |
2437 } | 2437 } |
2438 | 2438 |
2439 // TODO(hclam): Need to inject Gles2VideoDecodeContext here. Also I need | 2439 // TODO(hclam): Need to inject Gles2VideoDecodeContext here. Also I need |
2440 // to create a factory for FFmpegVideoDecoder here so that it can use | 2440 // to create a factory for FFmpegVideoDecoder here so that it can use |
2441 // the Gles2VideoDecodeContext. | 2441 // the Gles2VideoDecodeContext. |
2442 if (cmd_line->HasSwitch(switches::kEnableAcceleratedDecoding) && | 2442 if (cmd_line->HasSwitch(switches::kEnableAcceleratedDecoding) && |
2443 cmd_line->HasSwitch(switches::kEnableAcceleratedCompositing)) { | 2443 !cmd_line->HasSwitch(switches::kDisableAcceleratedCompositing)) { |
2444 // Add the hardware video decoder factory. | 2444 // Add the hardware video decoder factory. |
2445 factory->AddFactory(IpcVideoDecoder::CreateFactory( | 2445 factory->AddFactory(IpcVideoDecoder::CreateFactory( |
2446 MessageLoop::current(), | 2446 MessageLoop::current(), |
2447 reinterpret_cast<WebGLES2ContextImpl*>( | 2447 reinterpret_cast<WebGLES2ContextImpl*>( |
2448 webview()->gles2Context())->context())); | 2448 webview()->gles2Context())->context())); |
2449 } | 2449 } |
2450 | 2450 |
2451 WebApplicationCacheHostImpl* appcache_host = | 2451 WebApplicationCacheHostImpl* appcache_host = |
2452 WebApplicationCacheHostImpl::FromFrame(frame); | 2452 WebApplicationCacheHostImpl::FromFrame(frame); |
2453 | 2453 |
(...skipping 3227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5681 PendingOpenFileSystem* request = pending_file_system_requests_.Lookup( | 5681 PendingOpenFileSystem* request = pending_file_system_requests_.Lookup( |
5682 request_id); | 5682 request_id); |
5683 DCHECK(request); | 5683 DCHECK(request); |
5684 if (accepted) | 5684 if (accepted) |
5685 request->callbacks->didOpenFileSystem(name, root_path); | 5685 request->callbacks->didOpenFileSystem(name, root_path); |
5686 else | 5686 else |
5687 request->callbacks->didFail(WebKit::WebFileErrorSecurity); | 5687 request->callbacks->didFail(WebKit::WebFileErrorSecurity); |
5688 request->callbacks = NULL; | 5688 request->callbacks = NULL; |
5689 pending_file_system_requests_.Remove(request_id); | 5689 pending_file_system_requests_.Remove(request_id); |
5690 } | 5690 } |
OLD | NEW |