| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/renderer/render_thread_impl.h" | 5 #include "content/renderer/render_thread_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <limits> | 8 #include <limits> |
| 9 #include <map> | 9 #include <map> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 549 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 560 | 560 |
| 561 WebKit::WebRuntimeFeatures::enableMediaStream(true); | 561 WebKit::WebRuntimeFeatures::enableMediaStream(true); |
| 562 | 562 |
| 563 WebKit::WebRuntimeFeatures::enablePeerConnection( | 563 WebKit::WebRuntimeFeatures::enablePeerConnection( |
| 564 command_line.HasSwitch(switches::kEnablePeerConnection)); | 564 command_line.HasSwitch(switches::kEnablePeerConnection)); |
| 565 | 565 |
| 566 WebKit::WebRuntimeFeatures::enableFullScreenAPI( | 566 WebKit::WebRuntimeFeatures::enableFullScreenAPI( |
| 567 !command_line.HasSwitch(switches::kDisableFullScreen)); | 567 !command_line.HasSwitch(switches::kDisableFullScreen)); |
| 568 | 568 |
| 569 WebKit::WebRuntimeFeatures::enablePointerLock( | 569 WebKit::WebRuntimeFeatures::enablePointerLock( |
| 570 !command_line.HasSwitch(switches::kDisablePointerLock)); | 570 command_line.HasSwitch(switches::kEnablePointerLock)); |
| 571 | 571 |
| 572 WebKit::WebRuntimeFeatures::enableVideoTrack( | 572 WebKit::WebRuntimeFeatures::enableVideoTrack( |
| 573 command_line.HasSwitch(switches::kEnableVideoTrack)); | 573 command_line.HasSwitch(switches::kEnableVideoTrack)); |
| 574 | 574 |
| 575 WebKit::WebRuntimeFeatures::enableEncryptedMedia( | 575 WebKit::WebRuntimeFeatures::enableEncryptedMedia( |
| 576 command_line.HasSwitch(switches::kEnableEncryptedMedia)); | 576 command_line.HasSwitch(switches::kEnableEncryptedMedia)); |
| 577 | 577 |
| 578 WebRuntimeFeatures::enableWebAudio( | 578 WebRuntimeFeatures::enableWebAudio( |
| 579 !command_line.HasSwitch(switches::kDisableWebAudio) && | 579 !command_line.HasSwitch(switches::kDisableWebAudio) && |
| 580 media::IsMediaLibraryInitialized()); | 580 media::IsMediaLibraryInitialized()); |
| (...skipping 444 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1025 | 1025 |
| 1026 scoped_refptr<base::MessageLoopProxy> | 1026 scoped_refptr<base::MessageLoopProxy> |
| 1027 RenderThreadImpl::GetFileThreadMessageLoopProxy() { | 1027 RenderThreadImpl::GetFileThreadMessageLoopProxy() { |
| 1028 DCHECK(message_loop() == MessageLoop::current()); | 1028 DCHECK(message_loop() == MessageLoop::current()); |
| 1029 if (!file_thread_.get()) { | 1029 if (!file_thread_.get()) { |
| 1030 file_thread_.reset(new base::Thread("Renderer::FILE")); | 1030 file_thread_.reset(new base::Thread("Renderer::FILE")); |
| 1031 file_thread_->Start(); | 1031 file_thread_->Start(); |
| 1032 } | 1032 } |
| 1033 return file_thread_->message_loop_proxy(); | 1033 return file_thread_->message_loop_proxy(); |
| 1034 } | 1034 } |
| OLD | NEW |