Skia merge 317:321
Skia merge 317:321


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

Former-commit-id: 3f6f0e85b40f7970f96153e1ba07a54740accfc9
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