[jnordwick]

I think that is an example of synecdoche, using a part (the water) to represent the whole (the glass of water).