Skia merge 310:313
Skia merge 310:313


git-svn-id: http://src.chromium.org/svn/trunk/src@23049 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

Former-commit-id: db6d3544874426c2583c3723653ba8333a71d057
meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser,meego-tablet-ux/meego-app-browser