Mojo C++ bindings: Generate InterfaceHandle<> instead of InterfacePtr<>.

mojo/public/cpp/bindings/lib/bindings_serialization.h

 // Copyright 2013 The Chromium Authors. All rights reserved.

[viettrungluu, 2016/02/10 01:04:08]

I got to this file (and haven't reviewed it yet).

[vardhan, 2016/02/11 22:47:53]

hi!

 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_SERIALIZATION_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_SERIALIZATION_H_
 
 #include <vector>
 
 #include "mojo/public/cpp/bindings/lib/bindings_internal.h"
 #include "mojo/public/cpp/system/core.h"
 
 namespace mojo {
 
 template <typename I>
-class InterfacePtr;
-
-template <typename I>
 class InterfaceHandle;
 
 namespace internal {
 
 // Please note that this is a different value than |mojo::kInvalidHandleValue|,
 // which is the "decoded" invalid handle.
 const MojoHandle kEncodedInvalidHandleValue = static_cast<MojoHandle>(-1);
 
 size_t Align(size_t size);
 char* AlignPointer(char* ptr);
@@ skipping 41 matching lines @@
 
 // Note: This function doesn't validate the encoded pointer and handle values.
 template <typename T>
 inline void Decode(T* obj, std::vector<Handle>* handles) {
   DecodePointer(&obj->offset, &obj->ptr);
   if (obj->ptr)
     obj->ptr->DecodePointersAndHandles(handles);
 }
 
 template <typename T>
-inline void InterfacePointerToData(InterfacePtr<T> input,
-                                   Interface_Data* output) {
-  InterfaceHandle<T> info = input.PassInterfaceHandle();
-  output->handle = info.PassHandle().release();
-  output->version = info.version();
+inline void InterfaceHandleToData(InterfaceHandle<T> input,
+                                  Interface_Data* output) {
+  output->handle = input.PassHandle().release();
+  output->version = input.version();
 }
 
 template <typename T>
-inline void InterfaceDataToPointer(Interface_Data* input,
-                                   InterfacePtr<T>* output) {
-  output->Bind(InterfaceHandle<T>(
-      MakeScopedHandle(FetchAndReset(&input->handle)), input->version));
+inline void InterfaceDataToHandle(Interface_Data* input,
+                                  InterfaceHandle<T>* output) {
+  *output = InterfaceHandle<T>(MakeScopedHandle(FetchAndReset(&input->handle)),
+                               input->version);
 }
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_BINDINGS_SERIALIZATION_H_