Re-land the WebKit merge 40722:40785.

TBR=amanda

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9462 0039d316-1c4b-4281-b951-d872f2087c98
9 files changed