Some fixes to parallel upstream changes in our last merge.
Some fixes to parallel upstream changes in our last merge.

This doesn't seem to make the crashing on large animated images go away but it does make animation work a bit better.
Review URL: http://codereview.chromium.org/10819

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

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