| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "build/build_config.h" | 5 #include "build/build_config.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #include <objidl.h> | 9 #include <objidl.h> |
| 10 #include <mlang.h> | 10 #include <mlang.h> |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 75 } | 75 } |
| 76 | 76 |
| 77 if (command_line.HasSwitch(switches::kEnableWatchdog)) { | 77 if (command_line.HasSwitch(switches::kEnableWatchdog)) { |
| 78 // TODO(JAR): Need to implement renderer IO msgloop watchdog. | 78 // TODO(JAR): Need to implement renderer IO msgloop watchdog. |
| 79 } | 79 } |
| 80 | 80 |
| 81 if (command_line.HasSwitch(switches::kDumpHistogramsOnExit)) { | 81 if (command_line.HasSwitch(switches::kDumpHistogramsOnExit)) { |
| 82 StatisticsRecorder::set_dump_on_exit(true); | 82 StatisticsRecorder::set_dump_on_exit(true); |
| 83 } | 83 } |
| 84 | 84 |
| 85 #ifndef DISABLE_NACL |
| 85 if (command_line.HasSwitch(switches::kInternalNaCl)) | 86 if (command_line.HasSwitch(switches::kInternalNaCl)) |
| 86 RegisterInternalNaClPlugin(RenderProcess::LaunchNaClProcess); | 87 RegisterInternalNaClPlugin(RenderProcess::LaunchNaClProcess); |
| 88 #endif |
| 87 | 89 |
| 88 if (command_line.HasSwitch(switches::kEnableByteRangeSupport)) { | 90 if (command_line.HasSwitch(switches::kEnableByteRangeSupport)) { |
| 89 webkit_glue::SetMediaCacheEnabled(true); | 91 webkit_glue::SetMediaCacheEnabled(true); |
| 90 } | 92 } |
| 91 | 93 |
| 92 FilePath module_path; | 94 FilePath module_path; |
| 93 initialized_media_library_ = | 95 initialized_media_library_ = |
| 94 PathService::Get(base::DIR_MODULE, &module_path) && | 96 PathService::Get(base::DIR_MODULE, &module_path) && |
| 95 media::InitializeMediaLibrary(module_path); | 97 media::InitializeMediaLibrary(module_path); |
| 96 } | 98 } |
| (...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 261 } | 263 } |
| 262 | 264 |
| 263 void RenderProcess::ClearTransportDIBCache() { | 265 void RenderProcess::ClearTransportDIBCache() { |
| 264 for (size_t i = 0; i < arraysize(shared_mem_cache_); ++i) { | 266 for (size_t i = 0; i < arraysize(shared_mem_cache_); ++i) { |
| 265 if (shared_mem_cache_[i]) { | 267 if (shared_mem_cache_[i]) { |
| 266 FreeTransportDIB(shared_mem_cache_[i]); | 268 FreeTransportDIB(shared_mem_cache_[i]); |
| 267 shared_mem_cache_[i] = NULL; | 269 shared_mem_cache_[i] = NULL; |
| 268 } | 270 } |
| 269 } | 271 } |
| 270 } | 272 } |
| OLD | NEW |