OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 468 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
479 | 479 |
480 WebKit::WebRuntimeFeatures::enableMediaSource( | 480 WebKit::WebRuntimeFeatures::enableMediaSource( |
481 command_line.HasSwitch(switches::kEnableMediaSource)); | 481 command_line.HasSwitch(switches::kEnableMediaSource)); |
482 | 482 |
483 WebKit::WebRuntimeFeatures::enableMediaStream( | 483 WebKit::WebRuntimeFeatures::enableMediaStream( |
484 command_line.HasSwitch(switches::kEnableMediaStream)); | 484 command_line.HasSwitch(switches::kEnableMediaStream)); |
485 | 485 |
486 WebKit::WebRuntimeFeatures::enableFullScreenAPI( | 486 WebKit::WebRuntimeFeatures::enableFullScreenAPI( |
487 !command_line.HasSwitch(switches::kDisableFullScreen)); | 487 !command_line.HasSwitch(switches::kDisableFullScreen)); |
488 | 488 |
| 489 WebKit::WebRuntimeFeatures::enablePointerLock( |
| 490 command_line.HasSwitch(switches::kEnablePointerLock)); |
| 491 |
489 WebKit::WebRuntimeFeatures::enableVideoTrack( | 492 WebKit::WebRuntimeFeatures::enableVideoTrack( |
490 command_line.HasSwitch(switches::kEnableVideoTrack)); | 493 command_line.HasSwitch(switches::kEnableVideoTrack)); |
491 | 494 |
492 #if defined(OS_CHROMEOS) | 495 #if defined(OS_CHROMEOS) |
493 // TODO(crogers): enable once Web Audio has been tested and optimized. | 496 // TODO(crogers): enable once Web Audio has been tested and optimized. |
494 WebRuntimeFeatures::enableWebAudio(false); | 497 WebRuntimeFeatures::enableWebAudio(false); |
495 #else | 498 #else |
496 WebRuntimeFeatures::enableWebAudio( | 499 WebRuntimeFeatures::enableWebAudio( |
497 !command_line.HasSwitch(switches::kDisableWebAudio)); | 500 !command_line.HasSwitch(switches::kDisableWebAudio)); |
498 #endif | 501 #endif |
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
789 | 792 |
790 scoped_refptr<base::MessageLoopProxy> | 793 scoped_refptr<base::MessageLoopProxy> |
791 RenderThreadImpl::GetFileThreadMessageLoopProxy() { | 794 RenderThreadImpl::GetFileThreadMessageLoopProxy() { |
792 DCHECK(message_loop() == MessageLoop::current()); | 795 DCHECK(message_loop() == MessageLoop::current()); |
793 if (!file_thread_.get()) { | 796 if (!file_thread_.get()) { |
794 file_thread_.reset(new base::Thread("Renderer::FILE")); | 797 file_thread_.reset(new base::Thread("Renderer::FILE")); |
795 file_thread_->Start(); | 798 file_thread_->Start(); |
796 } | 799 } |
797 return file_thread_->message_loop_proxy(); | 800 return file_thread_->message_loop_proxy(); |
798 } | 801 } |
OLD | NEW |