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 <cmath> | 8 #include <cmath> |
9 #include <string> | 9 #include <string> |
10 #include <vector> | 10 #include <vector> |
(...skipping 2530 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2541 new media::FilterFactoryCollection(); | 2541 new media::FilterFactoryCollection(); |
2542 // Add in any custom filter factories first. | 2542 // Add in any custom filter factories first. |
2543 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); | 2543 const CommandLine* cmd_line = CommandLine::ForCurrentProcess(); |
2544 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { | 2544 if (!cmd_line->HasSwitch(switches::kDisableAudio)) { |
2545 // Add the chrome specific audio renderer. | 2545 // Add the chrome specific audio renderer. |
2546 factory->AddFactory( | 2546 factory->AddFactory( |
2547 AudioRendererImpl::CreateFactory(audio_message_filter())); | 2547 AudioRendererImpl::CreateFactory(audio_message_filter())); |
2548 } | 2548 } |
2549 | 2549 |
2550 if (cmd_line->HasSwitch(switches::kEnableAcceleratedDecoding) && | 2550 if (cmd_line->HasSwitch(switches::kEnableAcceleratedDecoding) && |
2551 cmd_line->HasSwitch(switches::kEnableAcceleratedCompositing)) { | 2551 !cmd_line->HasSwitch(switches::kDisableAcceleratedCompositing)) { |
2552 // Add the hardware video decoder factory. | 2552 // Add the hardware video decoder factory. |
2553 // TODO(hclam): This assumes that ggl::Context is set to current | 2553 // TODO(hclam): This assumes that ggl::Context is set to current |
2554 // internally. I need to make it more explicit to get the context. | 2554 // internally. I need to make it more explicit to get the context. |
2555 bool ret = frame->view()->graphicsContext3D()->makeContextCurrent(); | 2555 bool ret = frame->view()->graphicsContext3D()->makeContextCurrent(); |
2556 CHECK(ret) << "Failed to switch context"; | 2556 CHECK(ret) << "Failed to switch context"; |
2557 | 2557 |
2558 factory->AddFactory(IpcVideoDecoder::CreateFactory( | 2558 factory->AddFactory(IpcVideoDecoder::CreateFactory( |
2559 MessageLoop::current(), ggl::GetCurrentContext())); | 2559 MessageLoop::current(), ggl::GetCurrentContext())); |
2560 } | 2560 } |
2561 | 2561 |
(...skipping 2765 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
5327 } | 5327 } |
5328 | 5328 |
5329 void RenderView::OnAsyncFileOpened(base::PlatformFileError error_code, | 5329 void RenderView::OnAsyncFileOpened(base::PlatformFileError error_code, |
5330 IPC::PlatformFileForTransit file_for_transit, | 5330 IPC::PlatformFileForTransit file_for_transit, |
5331 int message_id) { | 5331 int message_id) { |
5332 pepper_delegate_.OnAsyncFileOpened( | 5332 pepper_delegate_.OnAsyncFileOpened( |
5333 error_code, | 5333 error_code, |
5334 IPC::PlatformFileForTransitToPlatformFile(file_for_transit), | 5334 IPC::PlatformFileForTransitToPlatformFile(file_for_transit), |
5335 message_id); | 5335 message_id); |
5336 } | 5336 } |
OLD | NEW |