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 640 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
651 | 651 |
652 WebRuntimeFeatures::enableMediaPlayer( | 652 WebRuntimeFeatures::enableMediaPlayer( |
653 media::IsMediaLibraryInitialized()); | 653 media::IsMediaLibraryInitialized()); |
654 | 654 |
655 WebKit::WebRuntimeFeatures::enableMediaStream(true); | 655 WebKit::WebRuntimeFeatures::enableMediaStream(true); |
656 WebKit::WebRuntimeFeatures::enablePeerConnection(true); | 656 WebKit::WebRuntimeFeatures::enablePeerConnection(true); |
657 | 657 |
658 WebKit::WebRuntimeFeatures::enableFullScreenAPI( | 658 WebKit::WebRuntimeFeatures::enableFullScreenAPI( |
659 !command_line.HasSwitch(switches::kDisableFullScreen)); | 659 !command_line.HasSwitch(switches::kDisableFullScreen)); |
660 | 660 |
661 WebKit::WebRuntimeFeatures::enablePointerLock( | 661 WebKit::WebRuntimeFeatures::enablePointerLock(true); |
jamesr
2012/09/17 19:27:00
is there a corresponding WebKit bug to remove this
| |
662 !command_line.HasSwitch(switches::kDisablePointerLock)); | |
663 | 662 |
664 WebKit::WebRuntimeFeatures::enableEncryptedMedia( | 663 WebKit::WebRuntimeFeatures::enableEncryptedMedia( |
665 command_line.HasSwitch(switches::kEnableEncryptedMedia)); | 664 command_line.HasSwitch(switches::kEnableEncryptedMedia)); |
666 | 665 |
667 #if defined(OS_ANDROID) | 666 #if defined(OS_ANDROID) |
668 WebRuntimeFeatures::enableWebAudio( | 667 WebRuntimeFeatures::enableWebAudio( |
669 command_line.HasSwitch(switches::kEnableWebAudio) && | 668 command_line.HasSwitch(switches::kEnableWebAudio) && |
670 media::IsMediaLibraryInitialized()); | 669 media::IsMediaLibraryInitialized()); |
671 #else | 670 #else |
672 WebRuntimeFeatures::enableWebAudio( | 671 WebRuntimeFeatures::enableWebAudio( |
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1147 | 1146 |
1148 scoped_refptr<base::MessageLoopProxy> | 1147 scoped_refptr<base::MessageLoopProxy> |
1149 RenderThreadImpl::GetFileThreadMessageLoopProxy() { | 1148 RenderThreadImpl::GetFileThreadMessageLoopProxy() { |
1150 DCHECK(message_loop() == MessageLoop::current()); | 1149 DCHECK(message_loop() == MessageLoop::current()); |
1151 if (!file_thread_.get()) { | 1150 if (!file_thread_.get()) { |
1152 file_thread_.reset(new base::Thread("Renderer::FILE")); | 1151 file_thread_.reset(new base::Thread("Renderer::FILE")); |
1153 file_thread_->Start(); | 1152 file_thread_->Start(); |
1154 } | 1153 } |
1155 return file_thread_->message_loop_proxy(); | 1154 return file_thread_->message_loop_proxy(); |
1156 } | 1155 } |
OLD | NEW |