Added versioning for PPB_Core::MemAlloc and MemFree

ppapi/c/ppb_core.h

 /* 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.
  */
 #ifndef PPAPI_C_PPB_CORE_H_
 #define PPAPI_C_PPB_CORE_H_
 
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/pp_time.h"
 
 struct PP_CompletionCallback;
 
 #define PPB_CORE_INTERFACE_0_5 "PPB_Core;0.5"
+#define PPB_CORE_INTERFACE_0_6 "PPB_Core;0.6"
+#ifdef PPAPI_INSTANCE_REMOVE_MEMALLOC

[dmichael (off chromium), 2011/07/12 19:10:27]

With Brett's change, we don't need the conditional compilation. Just make the
new one the default.

Also, go ahead and bump it to 1.0, or we'll have to do that in another CL.

[Matt Ball, 2011/07/12 23:15:26]

Done.

+#define PPB_CORE_INTERFACE PPB_CORE_INTERFACE_0_6
+#else
 #define PPB_CORE_INTERFACE PPB_CORE_INTERFACE_0_5
+#endif
+
 
 /**
  * @file
  * This file defines the <code>PPB_Core</code> interface defined by the browser
  * and containing pointers to functions related to memory management, time, and
  * threads.
  */
 
 /**
  * @addtogroup Interfaces
  * @{
  */
 
 /**
  * The <code>PPB_Core</code> interface contains pointers to functions related
  * to memory management, time, and threads on the browser.
  *
  */
+
+#ifdef PPAPI_INSTANCE_REMOVE_MEMALLOC
 struct PPB_Core {
+#else
+struct PPB_Core_0_6 {
+#endif
   /**
    *
    * AddRefResource() adds a reference to a resource.
    *
    * @param[in] config A <code>PP_Resource</code> containing the resource.
    */
   void (*AddRefResource)(PP_Resource resource);
 
   /**
    * ReleaseResource() removes a reference from a resource.
@@ skipping 11 matching lines @@
    * allocation fails.
    */
   void* (*MemAlloc)(uint32_t num_bytes);
 
   /**
    * <code>MemFree()</code> deallocates memory.
    *
    * @param[in] ptr A pointer to the memory to deallocate. It is safe to
    * pass <code>NULL</code> to this function.
    */
   void (*MemFree)(void* ptr);

[dmichael (off chromium), 2011/07/12 19:10:27]

Of course you'll want to remove these here.

[Matt Ball, 2011/07/12 23:15:26]

Done.

 
   /**
    * GetTime() returns the "wall clock time" according to the
    * browser.
    *
    * @return A <code>PP_Time</code> containing the "wall clock time" according
    * to the browser.
    */
   PP_Time (*GetTime)();
 
@@ skipping 46 matching lines @@
    * thread.
    *
    * This function is useful for implementing sanity checks, and deciding if
    * dispatching using CallOnMainThread() is required.
    *
    * @return A <code>PP_Bool</code> containing <code>PP_TRUE</code> if the
    * current thread is the main pepper thread, otherwise <code>PP_FALSE</code>.
    */
   PP_Bool (*IsMainThread)();
 };
+
+#ifdef PPAPI_INSTANCE_REMOVE_MEMALLOC
+struct PPB_Core_0_5 {
+#else
+struct PPB_Core {
+#endif
+  void (*AddRefResource)(PP_Resource resource);
+  void (*ReleaseResource)(PP_Resource resource);
+  void* (*MemAlloc)(uint32_t num_bytes);
+  void (*MemFree)(void* ptr);
+  PP_Time (*GetTime)();
+  PP_TimeTicks (*GetTimeTicks)();
+  void (*CallOnMainThread)(int32_t delay_in_milliseconds,
+                           struct PP_CompletionCallback callback,
+                           int32_t result);
+  PP_Bool (*IsMainThread)();
+};
+
+#ifdef PPAPI_INSTANCE_REMOVE_MEMALLOC
+typedef struct PPB_Core PPB_Core_0_6;
+#else
+typedef struct PPB_Core PPB_Core_0_5;
+#endif
+
+
 /**
  * @}
  */
 
 
 #endif  /* PPAPI_C_PPB_CORE_H_ */