GitLab

The original patch introduced a crash (GetCompositor() can return NULL), but
reverting the whole thing is not possible without a lot of other reverts, and
the proper fix is fairly involve (likely not reasonable to patch to the branch).

This only reverts the problematic part, and a follow up will do a proper fix.

BUG=141756


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=151153

Review URL: https://chromiumcodereview.appspot.com/10828262

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