Merge "Revert "Put canvas on a layer"" into ics-mr1

author John Reck <jreck@google.com>

Tue, 13 Dec 2011 21:16:40 +0000 (13:16 -0800)

committer Android (Google) Code Review <android-gerrit@google.com>

Tue, 13 Dec 2011 21:16:40 +0000 (13:16 -0800)
author John Reck <jreck@google.com>
Tue, 13 Dec 2011 21:16:40 +0000 (13:16 -0800)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 13 Dec 2011 21:16:40 +0000 (13:16 -0800)
diff --cc Source/WebCore/rendering/RenderLayerCompositor.cpp
Simple merge
author	John Reck <jreck@google.com>
	Tue, 13 Dec 2011 21:16:40 +0000 (13:16 -0800)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 13 Dec 2011 21:16:40 +0000 (13:16 -0800)