Merge 282692 "Pepper: Make sure 'out' params are initialized for..."

ppapi/proxy/ppb_image_data_proxy.cc

Index: ppapi/proxy/ppb_image_data_proxy.cc
===================================================================
--- ppapi/proxy/ppb_image_data_proxy.cc	(revision 284553)
+++ ppapi/proxy/ppb_image_data_proxy.cc	(working copy)
@@ -494,9 +494,7 @@
   }
 
   HostResource result;
-  // Initialize desc so we don't send unitialized memory over IPC.
-  // https://crbug.com/391023.
-  PP_ImageDataDesc desc = {};
+  PP_ImageDataDesc desc;
   switch (type) {
     case PPB_ImageData_Shared::SIMPLE: {
       ppapi::proxy::SerializedHandle image_handle_wrapper;
@@ -622,6 +620,9 @@
     HostResource* result,
     PP_ImageDataDesc* desc,
     ImageHandle* result_image_handle) {
+  // Clear |desc| so we don't send unitialized memory to the plugin.
+  // https://crbug.com/391023.
+  *desc = PP_ImageDataDesc();
   IPC::PlatformFileForTransit image_handle;
   uint32_t byte_count;
   PP_Resource resource =
@@ -647,6 +648,9 @@
     HostResource* result,
     PP_ImageDataDesc* desc,
     ppapi::proxy::SerializedHandle* result_image_handle) {
+  // Clear |desc| so we don't send unitialized memory to the plugin.
+  // https://crbug.com/391023.
+  *desc = PP_ImageDataDesc();
   IPC::PlatformFileForTransit image_handle;
   uint32_t byte_count;
   PP_Resource resource =