Revert "Add gpu::MailboxHolder to hold state for a gpu::Mailbox"

This reverts commit 9ee2343406a6fae9c8aacc7303f7b1e5a04aab9e.

This patch is the source of the top crash in canary. See the bug
for more details.

TBR=sheu
NOTREECHECKS=true
BUG=336040

Review URL: https://codereview.chromium.org/129873005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245959 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 1 insertions, 30 deletions

diff --git a/gpu/ipc/gpu_command_buffer_traits.cc b/gpu/ipc/gpu_command_buffer_traits.cc
index db482a9..d9fc17d 100644
--- a/gpu/ipc/gpu_command_buffer_traits.cc
+++ b/gpu/ipc/gpu_command_buffer_traits.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "gpu/ipc/gpu_command_buffer_traits.h"
-#include "gpu/command_buffer/common/mailbox_holder.h"
+#include "gpu/command_buffer/common/mailbox.h"
 
 namespace IPC {
 
@@ -59,25 +59,5 @@ void ParamTraits<gpu::Mailbox>::Log(const param_type& p, std::string* l) {
     *l += base::StringPrintf("%02x", p.name[i]);
 }
 
-void ParamTraits<gpu::MailboxHolder>::Write(Message* m, const param_type& p) {
-  WriteParam(m, p.mailbox);
-  WriteParam(m, p.texture_target);
-  WriteParam(m, p.sync_point);
-}
-
-bool ParamTraits<gpu::MailboxHolder>::Read(const Message* m,
-                                           PickleIterator* iter,
-                                           param_type* p) {
-  if (!ReadParam(m, iter, &p->mailbox) ||
-      !ReadParam(m, iter, &p->texture_target) ||
-      !ReadParam(m, iter, &p->sync_point))
-    return false;
-  return true;
-}
-
-void ParamTraits<gpu::MailboxHolder>::Log(const param_type& p, std::string* l) {
-  ParamTraits<gpu::Mailbox>::Log(p.mailbox, l);
-  *l += base::StringPrintf(":%04x@%d", p.texture_target, p.sync_point);
-}
 
 }  // namespace IPC
diff --git a/gpu/ipc/gpu_command_buffer_traits.h b/gpu/ipc/gpu_command_buffer_traits.h
index ce854d2..6b2531f 100644
--- a/gpu/ipc/gpu_command_buffer_traits.h
+++ b/gpu/ipc/gpu_command_buffer_traits.h
@@ -11,7 +11,6 @@
 
 namespace gpu {
 struct Mailbox;
-struct MailboxHolder;
 }
 
 namespace IPC {
@@ -32,14 +31,6 @@ struct GPU_EXPORT ParamTraits<gpu::Mailbox> {
   static void Log(const param_type& p, std::string* l);
 };
 
-template <>
-struct GPU_EXPORT ParamTraits<gpu::MailboxHolder> {
-  typedef gpu::MailboxHolder param_type;
-  static void Write(Message* m, const param_type& p);
-  static bool Read(const Message* m, PickleIterator* iter, param_type* p);
-  static void Log(const param_type& p, std::string* l);
-};
-
 }  // namespace IPC
 
 #endif  // GPU_IPC_GPU_PARAM_TRAITS_H_