summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-07 21:16:34 +0000
committerjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-03-07 21:16:34 +0000
commita4d16a729a56cb09a6f0d4fcdeee5d910734375d (patch)
tree3b8849d85f1ae5d59848546afa843d1fb36bc67a
parent1884f066093ba8e722ac34e9a17413f611cfb31b (diff)
downloadchromium_src-a4d16a729a56cb09a6f0d4fcdeee5d910734375d.zip
chromium_src-a4d16a729a56cb09a6f0d4fcdeee5d910734375d.tar.gz
chromium_src-a4d16a729a56cb09a6f0d4fcdeee5d910734375d.tar.bz2
fix win_aura
TBR=akalin Review URL: https://chromiumcodereview.appspot.com/9620018 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125453 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/common/content_message_generator.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/content/common/content_message_generator.cc b/content/common/content_message_generator.cc
index a39b69f..a86fb17 100644
--- a/content/common/content_message_generator.cc
+++ b/content/common/content_message_generator.cc
@@ -27,7 +27,7 @@ struct ParamTraits<gfx::PluginWindowHandle> {
static void Write(Message* m, const param_type& p) {
m->WriteUInt32(reinterpret_cast<uint32>(p));
}
- static bool Read(const Message* m, void** iter, param_type* r) {
+ static bool Read(const Message* m, PickleIterator* iter, param_type* r) {
DCHECK_EQ(sizeof(param_type), sizeof(uint32));
return m->ReadUInt32(iter, reinterpret_cast<uint32*>(r));
}