In high-velocity chute flows, free-surface aeration is often observed. The phenomenon is called self-aeration or white waters. When the turbulent shear stresses next to the free-surface are large enough, air bubbles are entrained throughout the entire air-water column. A rapidly-varied flow region is observed immediately downstream of the inception point of free-surface aeration. An analytical solution of the air diffusion equation is proposed and the results compare well with new experimental data. Both experiments and theory indicate that the flow bulking spans over approximately 3 to 4 step cavities downstream of the inception point of free-surface aeration on a stepped chute. Further downstream the void fraction distributions follow closely earlier solutions of the air diffusion equation. The application of the diffusion equation solution to prototype and laboratory data shows air bubble diffusivities typically larger than the momentum transfer coefficient. The result highlights however a marked decrease in the ratio of air bubble diffusivity to eddy viscosity with increasing Reynolds number. The finding might indicate some limitation of laboratory investigations of air bubble diffusion process in self-aerated flows and of their extrapolation to full-scale prototype applications.