Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(246)

Side by Side Diff: chrome/renderer/render_process_impl.cc

Issue 5933004: Add a webkit_glue API for lanching NaCl's sel_ldr. NaCl will call this API v... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/renderer/renderer_glue.cc » ('j') | chrome/renderer/renderer_glue.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
54 // TODO(abarth): Remove this function in favor of webkit_glue::LaunchSelLdr.
54 #if !defined(DISABLE_NACL) 55 #if !defined(DISABLE_NACL)
55 bool LaunchNaClProcessMultiFD(const char* alleged_url, 56 bool LaunchNaClProcessMultiFD(const char* alleged_url,
56 int socket_count, 57 int socket_count,
57 nacl::Handle* imc_handles, 58 nacl::Handle* imc_handles,
58 nacl::Handle* nacl_process_handle, 59 nacl::Handle* nacl_process_handle,
59 int* nacl_process_id) { 60 int* nacl_process_id) {
noelallen_use_chromium 2010/12/17 19:52:22 Ugly that this is an int, however tracing through
60 // TODO(gregoryd): nacl::FileDescriptor will be soon merged with 61 // TODO(gregoryd): nacl::FileDescriptor will be soon merged with
61 // base::FileDescriptor 62 // base::FileDescriptor
62 std::vector<nacl::FileDescriptor> sockets; 63 std::vector<nacl::FileDescriptor> sockets;
63 base::ProcessHandle nacl_process; 64 base::ProcessHandle nacl_process;
64 if (!RenderThread::current()->Send( 65 if (!RenderThread::current()->Send(
65 new ViewHostMsg_LaunchNaCl( 66 new ViewHostMsg_LaunchNaCl(
66 ASCIIToWide(alleged_url), 67 ASCIIToWide(alleged_url),
67 socket_count, 68 socket_count,
68 &sockets, 69 &sockets,
69 &nacl_process, 70 &nacl_process,
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
371 } 372 }
372 373
373 void RenderProcessImpl::ClearTransportDIBCache() { 374 void RenderProcessImpl::ClearTransportDIBCache() {
374 for (size_t i = 0; i < arraysize(shared_mem_cache_); ++i) { 375 for (size_t i = 0; i < arraysize(shared_mem_cache_); ++i) {
375 if (shared_mem_cache_[i]) { 376 if (shared_mem_cache_[i]) {
376 FreeTransportDIB(shared_mem_cache_[i]); 377 FreeTransportDIB(shared_mem_cache_[i]);
377 shared_mem_cache_[i] = NULL; 378 shared_mem_cache_[i] = NULL;
378 } 379 }
379 } 380 }
380 } 381 }
OLDNEW
« no previous file with comments | « no previous file | chrome/renderer/renderer_glue.cc » ('j') | chrome/renderer/renderer_glue.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698