Adapt the code the lastest changes in wip-webkit2 branch