OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 22 matching lines...) Expand all Loading... |
33 #include "media/base/media.h" | 33 #include "media/base/media.h" |
34 #include "media/base/media_switches.h" | 34 #include "media/base/media_switches.h" |
35 #include "native_client/src/shared/imc/nacl_imc.h" | 35 #include "native_client/src/shared/imc/nacl_imc.h" |
36 #include "native_client/src/trusted/plugin/nacl_entry_points.h" | 36 #include "native_client/src/trusted/plugin/nacl_entry_points.h" |
37 #include "skia/ext/platform_canvas.h" | 37 #include "skia/ext/platform_canvas.h" |
38 #include "webkit/plugins/npapi/plugin_instance.h" | 38 #include "webkit/plugins/npapi/plugin_instance.h" |
39 #include "webkit/plugins/npapi/plugin_lib.h" | 39 #include "webkit/plugins/npapi/plugin_lib.h" |
40 #include "webkit/glue/webkit_glue.h" | 40 #include "webkit/glue/webkit_glue.h" |
41 | 41 |
42 #if defined(OS_MACOSX) | 42 #if defined(OS_MACOSX) |
43 #include "base/mac_util.h" | 43 #include "base/mac/mac_util.h" |
44 #elif defined(OS_WIN) | 44 #elif defined(OS_WIN) |
45 #include "app/win/iat_patch_function.h" | 45 #include "app/win/iat_patch_function.h" |
46 #endif | 46 #endif |
47 | 47 |
48 #if defined(OS_LINUX) | 48 #if defined(OS_LINUX) |
49 #include "chrome/renderer/renderer_sandbox_support_linux.h" | 49 #include "chrome/renderer/renderer_sandbox_support_linux.h" |
50 #endif | 50 #endif |
51 | 51 |
52 namespace { | 52 namespace { |
53 | 53 |
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
175 reinterpret_cast<uintptr_t>(LaunchNaClProcessMultiFD); | 175 reinterpret_cast<uintptr_t>(LaunchNaClProcessMultiFD); |
176 RegisterInternalNaClPlugin(funcs); | 176 RegisterInternalNaClPlugin(funcs); |
177 #if defined(OS_LINUX) | 177 #if defined(OS_LINUX) |
178 nacl::SetCreateMemoryObjectFunc( | 178 nacl::SetCreateMemoryObjectFunc( |
179 renderer_sandbox_support::MakeSharedMemorySegmentViaIPC); | 179 renderer_sandbox_support::MakeSharedMemorySegmentViaIPC); |
180 #endif | 180 #endif |
181 } | 181 } |
182 #endif | 182 #endif |
183 | 183 |
184 #if defined(OS_MACOSX) | 184 #if defined(OS_MACOSX) |
185 FilePath bundle_path = mac_util::MainAppBundlePath(); | 185 FilePath bundle_path = base::mac::MainAppBundlePath(); |
186 | 186 |
187 initialized_media_library_ = | 187 initialized_media_library_ = |
188 media::InitializeMediaLibrary(bundle_path.Append("Libraries")); | 188 media::InitializeMediaLibrary(bundle_path.Append("Libraries")); |
189 #else | 189 #else |
190 FilePath module_path; | 190 FilePath module_path; |
191 initialized_media_library_ = | 191 initialized_media_library_ = |
192 PathService::Get(base::DIR_MODULE, &module_path) && | 192 PathService::Get(base::DIR_MODULE, &module_path) && |
193 media::InitializeMediaLibrary(module_path); | 193 media::InitializeMediaLibrary(module_path); |
194 | 194 |
195 // TODO(hclam): Add more checks here. Currently this is not used. | 195 // TODO(hclam): Add more checks here. Currently this is not used. |
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
372 } | 372 } |
373 | 373 |
374 void RenderProcessImpl::ClearTransportDIBCache() { | 374 void RenderProcessImpl::ClearTransportDIBCache() { |
375 for (size_t i = 0; i < arraysize(shared_mem_cache_); ++i) { | 375 for (size_t i = 0; i < arraysize(shared_mem_cache_); ++i) { |
376 if (shared_mem_cache_[i]) { | 376 if (shared_mem_cache_[i]) { |
377 FreeTransportDIB(shared_mem_cache_[i]); | 377 FreeTransportDIB(shared_mem_cache_[i]); |
378 shared_mem_cache_[i] = NULL; | 378 shared_mem_cache_[i] = NULL; |
379 } | 379 } |
380 } | 380 } |
381 } | 381 } |
OLD | NEW |