Chromium side of WebKit merge to 40846

Darin: primary
Brett: FYI
Review URL: http://codereview.chromium.org/21243

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