Updated for webkit 2.2.2