Replace PP_ALLOW_THIS_IN_INITIALIZER_LIST macro

ppapi/c/pp_macros.h

Index: ppapi/c/pp_macros.h
diff --git a/ppapi/c/pp_macros.h b/ppapi/c/pp_macros.h
index e5cd7dd0d5da0ff6f73cd8858ef5271f12ba9ce9..22beebf1298214c87ff5dfe2e9984ba6d5074532 100644
--- a/ppapi/c/pp_macros.h
+++ b/ppapi/c/pp_macros.h
@@ -3,7 +3,7 @@
  * found in the LICENSE file.
  */
 
-/* From pp_macros.idl modified Sat Jul 16 16:50:26 2011. */
+/* From pp_macros.idl modified Thu Dec  8 23:25:05 2011. */
 
 #ifndef PPAPI_C_PP_MACROS_H_
 #define PPAPI_C_PP_MACROS_H_
@@ -93,6 +93,22 @@ PP_COMPILE_ASSERT_SIZE_IN_BYTES_IMPL(NAME, struct NAME, SIZE)
 #define PP_COMPILE_ASSERT_ENUM_SIZE_IN_BYTES(NAME, SIZE) \
 PP_COMPILE_ASSERT_SIZE_IN_BYTES_IMPL(NAME, enum NAME, SIZE)
 
+/* This is roughly copied from base/compiler_specific.h, and makes it possible
+   to pass 'this' in a constructor initializer list, when you really mean it.
+   E.g.:
+   Foo::Foo(MyInstance* instance)
+       : PP_ALLOW_THIS_IN_INITIALIZER_LIST(callback_factory_(this)) {}
+ */
+#if defined(COMPILER_MSVC)
+# define PP_ALLOW_THIS_IN_INITIALIZER_LIST(code) \
+    __pragma(warning(push)) \
+    __pragma(warning(disable:4355)) \
+    code \
+    __pragma(warning(pop))
+#else
+# define PP_ALLOW_THIS_IN_INITIALIZER_LIST(code) code
+#endif
+
 /**
  * @}
  * End of addtogroup PP