bug 908316 - [WebGL 2.0] Refactor query object's targets - r=jgilbert