Updating: improving contrib/HTML5/canvas-2d