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

Unified Diff: chrome/common/common_param_traits.h

Issue 3834003: On Windows, create a new TransportDIB::Handle struct which includes the file (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: Rebase Created 10 years, 2 months 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 side-by-side diff with in-line comments
Download patch
Index: chrome/common/common_param_traits.h
diff --git a/chrome/common/common_param_traits.h b/chrome/common/common_param_traits.h
index 11c974965e81211a94f0484df9edfa9f9bf9c735..2fed4b3b9da6cf1bdafc8b190077b29504f7e4de 100644
--- a/chrome/common/common_param_traits.h
+++ b/chrome/common/common_param_traits.h
@@ -12,6 +12,10 @@
#define CHROME_COMMON_COMMON_PARAM_TRAITS_H_
#pragma once
+#if defined(OS_WIN)
+#include <windows.h>
+#endif
+
#include "app/surface/transport_dib.h"
#include "base/file_util.h"
#include "base/ref_counted.h"
@@ -236,22 +240,33 @@ struct ParamTraits<webkit_glue::WebApplicationInfo> {
#if defined(OS_WIN)
-template<>
-struct ParamTraits<TransportDIB::Id> {
- typedef TransportDIB::Id param_type;
+template <>
+struct ParamTraits<TransportDIB::Handle> {
+ typedef TransportDIB::Handle param_type;
static void Write(Message* m, const param_type& p) {
- WriteParam(m, p.handle);
- WriteParam(m, p.sequence_num);
+ WriteParam(m, p.section());
+ WriteParam(m, p.owner_id());
+ WriteParam(m, p.should_dup_on_map());
}
static bool Read(const Message* m, void** iter, param_type* r) {
- return (ReadParam(m, iter, &r->handle) &&
- ReadParam(m, iter, &r->sequence_num));
+ HANDLE section;
+ base::ProcessId owner_id;
+ bool should_dup_on_map;
+ bool success = ReadParam(m, iter, &section) &&
+ ReadParam(m, iter, &owner_id) &&
+ ReadParam(m, iter, &should_dup_on_map);
+ if (success) {
+ *r = TransportDIB::Handle(section, owner_id, should_dup_on_map);
+ }
+ return success;
}
static void Log(const param_type& p, std::string* l) {
- l->append("TransportDIB(");
- LogParam(p.handle, l);
+ l->append("TransportDIB::Handle(");
+ LogParam(p.section(), l);
+ l->append(", ");
+ LogParam(p.owner_id(), l);
l->append(", ");
- LogParam(p.sequence_num, l);
+ LogParam(p.should_dup_on_map(), l);
l->append(")");
}
};

Powered by Google App Engine
This is Rietveld 408576698