Revert "Revert of have DeferredDevice inherit from SkBaseDevice (https://codereview.chromium.org/165393006/)"

removed assert from lockPixels(), since that is called during setDevice()

This reverts commit 20bfc5337fa17cff52fb96b13af674c181e2c5a9.

BUG=skia:

Review URL: https://codereview.chromium.org/167003002

git-svn-id: http://skia.googlecode.com/svn/trunk@13454 2bbb7eff-a529-9590-31e7-b0007b416f81
1 file changed