summaryrefslogtreecommitdiffstats
path: root/ipc
diff options
context:
space:
mode:
authorjcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-14 19:35:10 +0000
committerjcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-14 19:35:10 +0000
commite7f009da9894df2b8e48aa21578aa4e5ecd7a765 (patch)
tree0ca8f38fa2a3531d6f6ef373faac0b1f84eb7369 /ipc
parent286d5d1b43741c2a4b18d4dde38430e5d06097fa (diff)
downloadchromium_src-e7f009da9894df2b8e48aa21578aa4e5ecd7a765.zip
chromium_src-e7f009da9894df2b8e48aa21578aa4e5ecd7a765.tar.gz
chromium_src-e7f009da9894df2b8e48aa21578aa4e5ecd7a765.tar.bz2
Hooking MHTML generation to the browser.
This CL adds a class that can be used to generate MHTML for the current page of a tab. It is not yet surfaced in the UI. BUG=None TEST=Run the browser tests. Review URL: http://codereview.chromium.org/7044095 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89047 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ipc')
-rw-r--r--ipc/ipc.gypi1
-rw-r--r--ipc/ipc_platform_file.cc43
-rw-r--r--ipc/ipc_platform_file.h8
3 files changed, 51 insertions, 1 deletions
diff --git a/ipc/ipc.gypi b/ipc/ipc.gypi
index 4ccf993..1ef4074 100644
--- a/ipc/ipc.gypi
+++ b/ipc/ipc.gypi
@@ -30,6 +30,7 @@
'ipc_message_utils.cc',
'ipc_message_utils.h',
'ipc_param_traits.h',
+ 'ipc_platform_file.cc',
'ipc_platform_file.h',
'ipc_switches.cc',
'ipc_switches.h',
diff --git a/ipc/ipc_platform_file.cc b/ipc/ipc_platform_file.cc
new file mode 100644
index 0000000..2b15ceb
--- /dev/null
+++ b/ipc/ipc_platform_file.cc
@@ -0,0 +1,43 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "ipc/ipc_platform_file.h"
+
+namespace IPC {
+
+PlatformFileForTransit GetFileHandleForProcess(base::PlatformFile handle,
+ base::ProcessHandle process,
+ bool close_source_handle) {
+ IPC::PlatformFileForTransit out_handle;
+#if defined(OS_WIN)
+ DWORD options = DUPLICATE_SAME_ACCESS;
+ if (close_source_handle)
+ options |= DUPLICATE_CLOSE_SOURCE;
+ if (!::DuplicateHandle(::GetCurrentProcess(),
+ handle,
+ process,
+ &out_handle,
+ 0,
+ FALSE,
+ options)) {
+ out_handle = IPC::InvalidPlatformFileForTransit();
+ }
+#elif defined(OS_POSIX)
+ // If asked to close the source, we can simply re-use the source fd instead of
+ // dup()ing and close()ing.
+ // When we're not closing the source, we need to duplicate the handle and take
+ // ownership of that. The reason is that this function is often used to
+ // generate IPC messages, and the handle must remain valid until it's sent to
+ // the other process from the I/O thread. Without the dup, calling code might
+ // close the source handle before the message is sent, creating a race
+ // condition.
+ int fd = close_source_handle ? handle : ::dup(handle);
+ out_handle = base::FileDescriptor(fd, true);
+#else
+ #error Not implemented.
+#endif
+ return out_handle;
+}
+
+} // namespace IPC
diff --git a/ipc/ipc_platform_file.h b/ipc/ipc_platform_file.h
index e08b8a5..a99ed9d 100644
--- a/ipc/ipc_platform_file.h
+++ b/ipc/ipc_platform_file.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
@@ -9,6 +9,7 @@
#include "base/basictypes.h"
#include "base/platform_file.h"
+#include "base/process.h"
#if defined(OS_POSIX)
#include "base/file_descriptor_posix.h"
@@ -39,6 +40,11 @@ inline base::PlatformFile PlatformFileForTransitToPlatformFile(
#endif
}
+// Returns a file handle equivalent to |file| that can be used in |process|.
+PlatformFileForTransit GetFileHandleForProcess(base::PlatformFile file,
+ base::ProcessHandle process,
+ bool close_source_handle);
+
} // namespace IPC
#endif // IPC_IPC_PLATFORM_FILE_H_