| 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 512 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 523 | 523 |
| 524 WebKit::WebRuntimeFeatures::enableFullScreenAPI( | 524 WebKit::WebRuntimeFeatures::enableFullScreenAPI( |
| 525 !command_line.HasSwitch(switches::kDisableFullScreen)); | 525 !command_line.HasSwitch(switches::kDisableFullScreen)); |
| 526 | 526 |
| 527 WebKit::WebRuntimeFeatures::enablePointerLock( | 527 WebKit::WebRuntimeFeatures::enablePointerLock( |
| 528 command_line.HasSwitch(switches::kEnablePointerLock)); | 528 command_line.HasSwitch(switches::kEnablePointerLock)); |
| 529 | 529 |
| 530 WebKit::WebRuntimeFeatures::enableVideoTrack( | 530 WebKit::WebRuntimeFeatures::enableVideoTrack( |
| 531 command_line.HasSwitch(switches::kEnableVideoTrack)); | 531 command_line.HasSwitch(switches::kEnableVideoTrack)); |
| 532 | 532 |
| 533 WebKit::WebRuntimeFeatures::enableMediaEncrypted( |
| 534 command_line.HasSwitch(switches::kEnableMediaEncrypted)); |
| 535 |
| 533 #if defined(OS_CHROMEOS) | 536 #if defined(OS_CHROMEOS) |
| 534 // TODO(crogers): enable once Web Audio has been tested and optimized. | 537 // TODO(crogers): enable once Web Audio has been tested and optimized. |
| 535 WebRuntimeFeatures::enableWebAudio(false); | 538 WebRuntimeFeatures::enableWebAudio(false); |
| 536 #else | 539 #else |
| 537 WebRuntimeFeatures::enableWebAudio( | 540 WebRuntimeFeatures::enableWebAudio( |
| 538 !command_line.HasSwitch(switches::kDisableWebAudio)); | 541 !command_line.HasSwitch(switches::kDisableWebAudio)); |
| 539 #endif | 542 #endif |
| 540 | 543 |
| 541 WebRuntimeFeatures::enablePushState(true); | 544 WebRuntimeFeatures::enablePushState(true); |
| 542 | 545 |
| (...skipping 379 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 922 | 925 |
| 923 scoped_refptr<base::MessageLoopProxy> | 926 scoped_refptr<base::MessageLoopProxy> |
| 924 RenderThreadImpl::GetFileThreadMessageLoopProxy() { | 927 RenderThreadImpl::GetFileThreadMessageLoopProxy() { |
| 925 DCHECK(message_loop() == MessageLoop::current()); | 928 DCHECK(message_loop() == MessageLoop::current()); |
| 926 if (!file_thread_.get()) { | 929 if (!file_thread_.get()) { |
| 927 file_thread_.reset(new base::Thread("Renderer::FILE")); | 930 file_thread_.reset(new base::Thread("Renderer::FILE")); |
| 928 file_thread_->Start(); | 931 file_thread_->Start(); |
| 929 } | 932 } |
| 930 return file_thread_->message_loop_proxy(); | 933 return file_thread_->message_loop_proxy(); |
| 931 } | 934 } |
| OLD | NEW |