Index: content/common/child_process_sandbox_support_impl_linux.cc |
diff --git a/content/common/child_process_sandbox_support_impl_linux.cc b/content/common/child_process_sandbox_support_impl_linux.cc |
index 4e7b1f0f5d3c1f6843512e7e373d03460657efcd..c61fc5c20a78a8289f2292e98fb9a7524e77854f 100644 |
--- a/content/common/child_process_sandbox_support_impl_linux.cc |
+++ b/content/common/child_process_sandbox_support_impl_linux.cc |
@@ -7,19 +7,14 @@ |
#include <sys/stat.h> |
#include "base/eintr_wrapper.h" |
-#include "base/global_descriptors_posix.h" |
#include "base/memory/scoped_ptr.h" |
#include "base/pickle.h" |
-#include "content/common/chrome_descriptors.h" |
+#include "content/common/child_process_sandbox_support_impl_linux.h" |
jam
2011/12/15 01:08:31
nit: redundant
|
#include "content/common/sandbox_methods_linux.h" |
#include "content/common/unix_domain_socket_posix.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/platform/linux/WebFontFamily.h" |
#include "third_party/WebKit/Source/WebKit/chromium/public/linux/WebFontRenderStyle.h" |
-static int GetSandboxFD() { |
- return kSandboxIPCChannel + base::GlobalDescriptors::kBaseDescriptor; |
-} |
- |
namespace content { |
void GetFontFamilyForCharacters(const uint16_t* utf16, |
@@ -87,21 +82,6 @@ void GetRenderStyleForStrike(const char* family, int sizeAndStyle, |
} |
} |
-int MakeSharedMemorySegmentViaIPC(size_t length, bool executable) { |
- Pickle request; |
- request.WriteInt(LinuxSandbox::METHOD_MAKE_SHARED_MEMORY_SEGMENT); |
- request.WriteUInt32(length); |
- request.WriteBool(executable); |
- uint8_t reply_buf[10]; |
- int result_fd; |
- ssize_t result = UnixDomainSocket::SendRecvMsg(GetSandboxFD(), |
- reply_buf, sizeof(reply_buf), |
- &result_fd, request); |
- if (result == -1) |
- return -1; |
- return result_fd; |
-} |
- |
int MatchFontWithFallback(const std::string& face, bool bold, |
bool italic, int charset) { |
Pickle request; |