Revert[2] SkDraw and all Blitters to use pixmap instead of bitmapi

Revert[2] SkDraw and all Blitters to use pixmap instead of bitmapi

This reverts commit b3f0ec9f9967da2f80f0d842cb7fd53617b48de3.

BUG=skia:

Committed: https://skia.googlesource.com/skia/+/41e010cb901c0da9066c4df562030808c9ccd7f8

[reed1, 2015-06-09 15:29:25]

reed@google.com changed reviewers:
+ robertphillips@google.com

[reed1, 2015-06-09 15:29:25]

compatibility fix for WebGL -- I think they hold onto the bitmap behind the
device, and snif its genID after we draw

[reed1, 2015-06-09 15:29:32]

The CQ bit was checked by reed@google.com to run a CQ dry run

[commit-bot: I haz the power, 2015-06-09 15:29:52]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1168303006/40001

[commit-bot: I haz the power, 2015-06-09 15:35:22]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-06-09 15:35:23]

Dry run: This issue passed the CQ dry run.

[robertphillips, 2015-06-09 18:17:38]

https://codereview.chromium.org/1168303006/diff/40001/include/core/SkDraw.h
File include/core/SkDraw.h (right):

https://codereview.chromium.org/1168303006/diff/40001/include/core/SkDraw.h#n...
include/core/SkDraw.h:142: public:
Can we remove the fBitmap line ?

https://codereview.chromium.org/1168303006/diff/40001/src/core/SkBlitMask_D32...
File src/core/SkBlitMask_D32.cpp (right):

https://codereview.chromium.org/1168303006/diff/40001/src/core/SkBlitMask_D32...
src/core/SkBlitMask_D32.cpp:155: int y = clip.fTop;
Shouldn't this be writableAddr32 ?

https://codereview.chromium.org/1168303006/diff/40001/src/core/SkBlitter_A8.cpp
File src/core/SkBlitter_A8.cpp (right):

https://codereview.chromium.org/1168303006/diff/40001/src/core/SkBlitter_A8.c...
src/core/SkBlitter_A8.cpp:34: 
writableAddr8 ?

https://codereview.chromium.org/1168303006/diff/40001/src/core/SkDeviceLooper...
File src/core/SkDeviceLooper.cpp (right):

https://codereview.chromium.org/1168303006/diff/40001/src/core/SkDeviceLooper...
src/core/SkDeviceLooper.cpp:104: // first time for simple
!fCurrDst ?

https://codereview.chromium.org/1168303006/diff/40001/src/core/SkDeviceLooper.h
File src/core/SkDeviceLooper.h (right):

https://codereview.chromium.org/1168303006/diff/40001/src/core/SkDeviceLooper...
src/core/SkDeviceLooper.h:62: private:
Do you really want/need this to be a reference?

https://codereview.chromium.org/1168303006/diff/40001/src/core/SkDraw.cpp
File src/core/SkDraw.cpp (right):

https://codereview.chromium.org/1168303006/diff/40001/src/core/SkDraw.cpp#new...
src/core/SkDraw.cpp:2222: SkDraw draw;
This can't be part of SkDraw's ctor (the reset that is) ?

https://codereview.chromium.org/1168303006/diff/40001/src/gpu/SkGpuDevice.cpp
File src/gpu/SkGpuDevice.cpp (right):

https://codereview.chromium.org/1168303006/diff/40001/src/gpu/SkGpuDevice.cpp...
src/gpu/SkGpuDevice.cpp:284: // genID. When we can hide/remove that fact, we can
eliminate this call to notify.
erg

https://codereview.chromium.org/1168303006/diff/40001/tests/SurfaceTest.cpp
File tests/SurfaceTest.cpp (right):

https://codereview.chromium.org/1168303006/diff/40001/tests/SurfaceTest.cpp#n...
tests/SurfaceTest.cpp:352: 
Move this #include up ?

[reed1, 2015-06-09 18:34:10]

https://codereview.chromium.org/1168303006/diff/40001/include/core/SkDraw.h
File include/core/SkDraw.h (right):

https://codereview.chromium.org/1168303006/diff/40001/include/core/SkDraw.h#n...
include/core/SkDraw.h:142: public:
On 2015/06/09 18:17:37, robertphillips wrote:
> Can we remove the fBitmap line ?

Done.

https://codereview.chromium.org/1168303006/diff/40001/src/core/SkBlitMask_D32...
File src/core/SkBlitMask_D32.cpp (right):

https://codereview.chromium.org/1168303006/diff/40001/src/core/SkBlitMask_D32...
src/core/SkBlitMask_D32.cpp:155: int y = clip.fTop;
On 2015/06/09 18:17:37, robertphillips wrote:
> Shouldn't this be writableAddr32 ?

foo
writable_foo

This is a somewhat common pattern, specifically for writable variants of foo
(see SkData, SkString, SkCachedData, SkRegion)

https://codereview.chromium.org/1168303006/diff/40001/src/core/SkBlitter_A8.cpp
File src/core/SkBlitter_A8.cpp (right):

https://codereview.chromium.org/1168303006/diff/40001/src/core/SkBlitter_A8.c...
src/core/SkBlitter_A8.cpp:34: 
On 2015/06/09 18:17:37, robertphillips wrote:
> writableAddr8 ?

ibid

https://codereview.chromium.org/1168303006/diff/40001/src/core/SkDeviceLooper...
File src/core/SkDeviceLooper.cpp (right):

https://codereview.chromium.org/1168303006/diff/40001/src/core/SkDeviceLooper...
src/core/SkDeviceLooper.cpp:104: // first time for simple
On 2015/06/09 18:17:37, robertphillips wrote:
> !fCurrDst ?

/skia/trunk> find. cpp "NULL == " | grep if | wc
     907    5804   62512

https://codereview.chromium.org/1168303006/diff/40001/src/core/SkDeviceLooper.h
File src/core/SkDeviceLooper.h (right):

https://codereview.chromium.org/1168303006/diff/40001/src/core/SkDeviceLooper...
src/core/SkDeviceLooper.h:62: private:
On 2015/06/09 18:17:37, robertphillips wrote:
> Do you really want/need this to be a reference?

Hard to know the value/cost of the tradeoff (copying -vs- indirection). The old
version used refs for both bitmap and clip, so I kept that pattern.

https://codereview.chromium.org/1168303006/diff/40001/src/core/SkDraw.cpp
File src/core/SkDraw.cpp (right):

https://codereview.chromium.org/1168303006/diff/40001/src/core/SkDraw.cpp#new...
src/core/SkDraw.cpp:2222: SkDraw draw;
On 2015/06/09 18:17:37, robertphillips wrote:
> This can't be part of SkDraw's ctor (the reset that is) ?

constructor can't fail :(

https://codereview.chromium.org/1168303006/diff/40001/src/gpu/SkGpuDevice.cpp
File src/gpu/SkGpuDevice.cpp (right):

https://codereview.chromium.org/1168303006/diff/40001/src/gpu/SkGpuDevice.cpp...
src/gpu/SkGpuDevice.cpp:284: // genID. When we can hide/remove that fact, we can
eliminate this call to notify.
On 2015/06/09 18:17:37, robertphillips wrote:
> erg

Done.

https://codereview.chromium.org/1168303006/diff/40001/tests/SurfaceTest.cpp
File tests/SurfaceTest.cpp (right):

https://codereview.chromium.org/1168303006/diff/40001/tests/SurfaceTest.cpp#n...
tests/SurfaceTest.cpp:352: 
On 2015/06/09 18:17:38, robertphillips wrote:
> Move this #include up ?

Done.

[reed1, 2015-06-09 18:34:17]

The CQ bit was checked by reed@google.com

[commit-bot: I haz the power, 2015-06-09 18:34:32]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1168303006/60001

[commit-bot: I haz the power, 2015-06-09 18:34:33]

Note for Reviewers:
The CQ is waiting for an approval.
If you believe that the CL is not ready yet, or if you would like to L-G-T-M
with comments then please uncheck the CQ checkbox.

Waiting for LGTM from valid reviewer(s) till 2015-06-10 00:34 UTC

[robertphillips, 2015-06-09 19:02:44]

https://codereview.chromium.org/1168303006/diff/60001/tests/SurfaceTest.cpp
File tests/SurfaceTest.cpp (right):

https://codereview.chromium.org/1168303006/diff/60001/tests/SurfaceTest.cpp#n...
tests/SurfaceTest.cpp:360: SurfaceType fType;
fPeekShouldSucceed doesn't seem to be used ?

[robertphillips, 2015-06-09 19:06:16]

lgtm

https://codereview.chromium.org/1168303006/diff/60001/tests/SurfaceTest.cpp
File tests/SurfaceTest.cpp (right):

https://codereview.chromium.org/1168303006/diff/60001/tests/SurfaceTest.cpp#n...
tests/SurfaceTest.cpp:401: canvas->drawColor(SK_ColorBLUE);
// Thus draw call causes a call to ...
?

[reed1, 2015-06-09 19:06:59]

The CQ bit was unchecked by reed@google.com

[reed1, 2015-06-09 19:11:12]

https://codereview.chromium.org/1168303006/diff/60001/tests/SurfaceTest.cpp
File tests/SurfaceTest.cpp (right):

https://codereview.chromium.org/1168303006/diff/60001/tests/SurfaceTest.cpp#n...
tests/SurfaceTest.cpp:401: canvas->drawColor(SK_ColorBLUE);
On 2015/06/09 19:06:15, robertphillips wrote:
> // Thus draw call causes a call to ...
> ?

Done.

[reed1, 2015-06-09 19:11:16]

The CQ bit was checked by reed@google.com

[reed1, 2015-06-09 19:11:17]

The patchset sent to the CQ was uploaded after l-g-t-m from
robertphillips@google.com
Link to the patchset: https://codereview.chromium.org/1168303006/#ps80001
(title: "add dox to new test")

[commit-bot: I haz the power, 2015-06-09 19:11:29]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1168303006/80001

[commit-bot: I haz the power, 2015-06-09 19:16:56]

Committed patchset #5 (id:80001) as
https://skia.googlesource.com/skia/+/41e010cb901c0da9066c4df562030808c9ccd7f8