Skia merge 308:309
Skia merge 308:309

BUG=18333


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

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