WebKit merge from 47159 to 47189.
WebKit merge from 47159 to 47189.

This one is happening quickly to fix up the Linux breakage.

In another checkin I handle updating test expectations.


BUG=None
TEST=None
TBR=mbelshe@chromium.org

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

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

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