WebKit merge 60808:69821
WebKit merge 60808:69821

See http://code.google.com/p/chromium/issues/detail?id=59533.
Try to roll up r69821 and see what happens.

BUG=none
TEST=none
TBR=jamesr

Review URL: http://codereview.chromium.org/3821006

git-svn-id: dd90618784b6a4b323ea0c23a071cb1c9e6f2ac7@62910 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser,wistoch/meego-app-browser