add native draw bitmap with alpha mask

add native draw bitmap with alpha mask

PDFs draw bitmaps with alpha by supplying an
image alpha mask along side the image color data.

The alpha mask may not be the same scale as the
image data. Skia doesn't have a direct mapping
for this draw call, but can come close by using
the internal SkCompositeShader class.

This scales the alpha mask to match the size of
the image data, then puts both in the composite
shader to draw.

There are more things to do:

- Allow Alpha8 or Gray8 to draw scaled to
  a matching device (blit doesn't work today)

Temporary code marked with
a TODO implements this functionality.

- Refactor PDFium to allow SkComposeShader's
  components to take a matrix.

The latter goal will defer drawing so that PDFium
doesn't resize the mask, discarding resolution,
before Skia has a chance to record it.

Additionally fix drawing text with a negative
font size.

R=reed@google.com,dsinclair@chromium.org,herb@chromium.org

Committed: https://pdfium.googlesource.com/pdfium/+/c4f3c0f183c9ce472cd22e831075c3897e14c3af

[caryclark, 2016-07-27 20:46:21]

Description was changed from

==========
wip; add native draw bitmap with alpha mask

working on bitmap w/ alpha mask support

BUG=
==========

to

==========
wip; add native draw bitmap with alpha mask

working on bitmap w/ alpha mask support

PDFs draw bitmaps with alpha by supplying an
image alpha mask along side the image color data.

The alpha mask may not be the same scale as the
image data. Skia doesn't have a direct mapping
for this draw call, but can come close by using
the internal SkCompositeShader class.

This scales the alpha mask to match the size of
the image data, then puts both in the composite
shader to draw.

R=reed@google.com,dsinclair@chromium.org
==========

[caryclark, 2016-07-27 20:59:35]

Description was changed from

==========
wip; add native draw bitmap with alpha mask

working on bitmap w/ alpha mask support

PDFs draw bitmaps with alpha by supplying an
image alpha mask along side the image color data.

The alpha mask may not be the same scale as the
image data. Skia doesn't have a direct mapping
for this draw call, but can come close by using
the internal SkCompositeShader class.

This scales the alpha mask to match the size of
the image data, then puts both in the composite
shader to draw.

R=reed@google.com,dsinclair@chromium.org
==========

to

==========
wip; add native draw bitmap with alpha mask

working on bitmap w/ alpha mask support

PDFs draw bitmaps with alpha by supplying an
image alpha mask along side the image color data.

The alpha mask may not be the same scale as the
image data. Skia doesn't have a direct mapping
for this draw call, but can come close by using
the internal SkCompositeShader class.

This scales the alpha mask to match the size of
the image data, then puts both in the composite
shader to draw.

If this is the right approach, there are several
more things to do:

- Move SkCompositeShader to a public interface
- Allow Alpha8 or Gray8 to draw scaled to
  a matching device (blit doesn't work today)
- And/Or allow SkCompositeShader to take a matrix
  on each shader (maybe it does already...)

R=reed@google.com,dsinclair@chromium.org
==========

[caryclark, 2016-08-11 18:57:44]

Description was changed from

==========
wip; add native draw bitmap with alpha mask

working on bitmap w/ alpha mask support

PDFs draw bitmaps with alpha by supplying an
image alpha mask along side the image color data.

The alpha mask may not be the same scale as the
image data. Skia doesn't have a direct mapping
for this draw call, but can come close by using
the internal SkCompositeShader class.

This scales the alpha mask to match the size of
the image data, then puts both in the composite
shader to draw.

If this is the right approach, there are several
more things to do:

- Move SkCompositeShader to a public interface
- Allow Alpha8 or Gray8 to draw scaled to
  a matching device (blit doesn't work today)
- And/Or allow SkCompositeShader to take a matrix
  on each shader (maybe it does already...)

R=reed@google.com,dsinclair@chromium.org
==========

to

==========
wip; add native draw bitmap with alpha mask

working on bitmap w/ alpha mask support

PDFs draw bitmaps with alpha by supplying an
image alpha mask along side the image color data.

The alpha mask may not be the same scale as the
image data. Skia doesn't have a direct mapping
for this draw call, but can come close by using
the internal SkCompositeShader class.

This scales the alpha mask to match the size of
the image data, then puts both in the composite
shader to draw.

If this is the right approach, there are several
more things to do:

- Move SkCompositeShader to a public interface
- Allow Alpha8 or Gray8 to draw scaled to
  a matching device (blit doesn't work today)
- And/Or allow SkCompositeShader to take a matrix
  on each shader (maybe it does already...)

R=reed@google.com,dsinclair@chromium.org,herb@chromium.org
==========

[caryclark, 2016-08-11 18:57:45]

caryclark@google.com changed reviewers:
+ dsinclair@chromium.org, herb@chromium.org, reed@google.com

[caryclark, 2016-08-11 18:58:24]

(not ready for checking -- publishing so stakeholders can help me eliminate
dependencies)

[caryclark, 2016-08-11 19:01:00]

Description was changed from

==========
wip; add native draw bitmap with alpha mask

working on bitmap w/ alpha mask support

PDFs draw bitmaps with alpha by supplying an
image alpha mask along side the image color data.

The alpha mask may not be the same scale as the
image data. Skia doesn't have a direct mapping
for this draw call, but can come close by using
the internal SkCompositeShader class.

This scales the alpha mask to match the size of
the image data, then puts both in the composite
shader to draw.

If this is the right approach, there are several
more things to do:

- Move SkCompositeShader to a public interface
- Allow Alpha8 or Gray8 to draw scaled to
  a matching device (blit doesn't work today)
- And/Or allow SkCompositeShader to take a matrix
  on each shader (maybe it does already...)

R=reed@google.com,dsinclair@chromium.org,herb@chromium.org
==========

to

==========
wip; add native draw bitmap with alpha mask

working on bitmap w/ alpha mask support

PDFs draw bitmaps with alpha by supplying an
image alpha mask along side the image color data.

The alpha mask may not be the same scale as the
image data. Skia doesn't have a direct mapping
for this draw call, but can come close by using
the internal SkCompositeShader class.

This scales the alpha mask to match the size of
the image data, then puts both in the composite
shader to draw.

If this is the right approach, there are several
more things to do:

- Move SkCompositeShader to a public interface
- Allow Alpha8 or Gray8 to draw scaled to
  a matching device (blit doesn't work today)
- And/Or allow SkCompositeShader to take a matrix
  on each shader (maybe it does already...)

Additionally fix drawing text with a negative
font size.

R=reed@google.com,dsinclair@chromium.org,herb@chromium.org
==========

[reed1, 2016-08-12 11:35:45]

each shader can be built with a local-matrix, so when you build a composeshader,
each component can have a separate scale.

[caryclark, 2016-08-12 18:22:16]

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

[commit-bot: I haz the power, 2016-08-12 18:22:27]

Dry run: CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[caryclark, 2016-08-12 18:25:54]

Description was changed from

==========
wip; add native draw bitmap with alpha mask

working on bitmap w/ alpha mask support

PDFs draw bitmaps with alpha by supplying an
image alpha mask along side the image color data.

The alpha mask may not be the same scale as the
image data. Skia doesn't have a direct mapping
for this draw call, but can come close by using
the internal SkCompositeShader class.

This scales the alpha mask to match the size of
the image data, then puts both in the composite
shader to draw.

If this is the right approach, there are several
more things to do:

- Move SkCompositeShader to a public interface
- Allow Alpha8 or Gray8 to draw scaled to
  a matching device (blit doesn't work today)
- And/Or allow SkCompositeShader to take a matrix
  on each shader (maybe it does already...)

Additionally fix drawing text with a negative
font size.

R=reed@google.com,dsinclair@chromium.org,herb@chromium.org
==========

to

==========
add native draw bitmap with alpha mask

PDFs draw bitmaps with alpha by supplying an
image alpha mask along side the image color data.

The alpha mask may not be the same scale as the
image data. Skia doesn't have a direct mapping
for this draw call, but can come close by using
the internal SkCompositeShader class.

This scales the alpha mask to match the size of
the image data, then puts both in the composite
shader to draw.

If this is the right approach, there are several
more things to do:

- Allow Alpha8 or Gray8 to draw scaled to
  a matching device (blit doesn't work today)

Temporary code marked with
a TODO implements this functionality.

- Refactor PDFium to allow SkComposeShader's
  components to take a matrix.

The latter goal will defer drawing so that PDFium
doesn't resize the mask, discarding resolution,
before Skia has a chance to record it.

Additionally fix drawing text with a negative
font size.

R=reed@google.com,dsinclair@chromium.org,herb@chromium.org
==========

[caryclark, 2016-08-12 18:26:18]

Ready for review

[commit-bot: I haz the power, 2016-08-12 18:37:36]

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

[commit-bot: I haz the power, 2016-08-12 18:37:37]

Dry run: This issue passed the CQ dry run.

[caryclark, 2016-08-12 18:57:59]

Description was changed from

==========
add native draw bitmap with alpha mask

PDFs draw bitmaps with alpha by supplying an
image alpha mask along side the image color data.

The alpha mask may not be the same scale as the
image data. Skia doesn't have a direct mapping
for this draw call, but can come close by using
the internal SkCompositeShader class.

This scales the alpha mask to match the size of
the image data, then puts both in the composite
shader to draw.

If this is the right approach, there are several
more things to do:

- Allow Alpha8 or Gray8 to draw scaled to
  a matching device (blit doesn't work today)

Temporary code marked with
a TODO implements this functionality.

- Refactor PDFium to allow SkComposeShader's
  components to take a matrix.

The latter goal will defer drawing so that PDFium
doesn't resize the mask, discarding resolution,
before Skia has a chance to record it.

Additionally fix drawing text with a negative
font size.

R=reed@google.com,dsinclair@chromium.org,herb@chromium.org
==========

to

==========
add native draw bitmap with alpha mask

PDFs draw bitmaps with alpha by supplying an
image alpha mask along side the image color data.

The alpha mask may not be the same scale as the
image data. Skia doesn't have a direct mapping
for this draw call, but can come close by using
the internal SkCompositeShader class.

This scales the alpha mask to match the size of
the image data, then puts both in the composite
shader to draw.

There are more things to do:

- Allow Alpha8 or Gray8 to draw scaled to
  a matching device (blit doesn't work today)

Temporary code marked with
a TODO implements this functionality.

- Refactor PDFium to allow SkComposeShader's
  components to take a matrix.

The latter goal will defer drawing so that PDFium
doesn't resize the mask, discarding resolution,
before Skia has a chance to record it.

Additionally fix drawing text with a negative
font size.

R=reed@google.com,dsinclair@chromium.org,herb@chromium.org
==========

[dsinclair, 2016-08-15 13:33:30]

code lgtm w/ nits. one of the Skia folks will need to verify the graphics bits.

https://codereview.chromium.org/2182763002/diff/120001/core/fpdfapi/fpdf_rend...
File core/fpdfapi/fpdf_render/fpdf_render_image.cpp (right):

https://codereview.chromium.org/2182763002/diff/120001/core/fpdfapi/fpdf_rend...
core/fpdfapi/fpdf_render/fpdf_render_image.cpp:757: #endif
nit:  #endif  // _SKIA_SUPPORT_

https://codereview.chromium.org/2182763002/diff/120001/core/fxge/skia/fx_skia...
File core/fxge/skia/fx_skia_device.cpp (right):

https://codereview.chromium.org/2182763002/diff/120001/core/fxge/skia/fx_skia...
core/fxge/skia/fx_skia_device.cpp:36: #include
"third_party/skia/include/core/SkShader.h"
nit: sort includes

https://codereview.chromium.org/2182763002/diff/120001/core/fxge/skia/fx_skia...
core/fxge/skia/fx_skia_device.cpp:429: } break;
nit: move break inside the }.

[reed1, 2016-08-15 15:50:34]

lgtm

[caryclark, 2016-08-15 16:55:04]

https://codereview.chromium.org/2182763002/diff/120001/core/fpdfapi/fpdf_rend...
File core/fpdfapi/fpdf_render/fpdf_render_image.cpp (right):

https://codereview.chromium.org/2182763002/diff/120001/core/fpdfapi/fpdf_rend...
core/fpdfapi/fpdf_render/fpdf_render_image.cpp:757: #endif
On 2016/08/15 13:33:30, dsinclair wrote:
> nit:  #endif  // _SKIA_SUPPORT_

Done.

https://codereview.chromium.org/2182763002/diff/120001/core/fxge/skia/fx_skia...
File core/fxge/skia/fx_skia_device.cpp (right):

https://codereview.chromium.org/2182763002/diff/120001/core/fxge/skia/fx_skia...
core/fxge/skia/fx_skia_device.cpp:36: #include
"third_party/skia/include/core/SkShader.h"
On 2016/08/15 13:33:30, dsinclair wrote:
> nit: sort includes

Done.

https://codereview.chromium.org/2182763002/diff/120001/core/fxge/skia/fx_skia...
core/fxge/skia/fx_skia_device.cpp:429: } break;
On 2016/08/15 13:33:30, dsinclair wrote:
> nit: move break inside the }.

Done.

[caryclark, 2016-08-15 16:55:14]

The CQ bit was checked by caryclark@google.com

[caryclark, 2016-08-15 16:55:16]

The patchset sent to the CQ was uploaded after l-g-t-m from
dsinclair@chromium.org, reed@google.com
Link to the patchset: https://codereview.chromium.org/2182763002/#ps140001
(title: "address comments")

[commit-bot: I haz the power, 2016-08-15 16:55:21]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2016-08-15 17:09:51]

Description was changed from

==========
add native draw bitmap with alpha mask

PDFs draw bitmaps with alpha by supplying an
image alpha mask along side the image color data.

The alpha mask may not be the same scale as the
image data. Skia doesn't have a direct mapping
for this draw call, but can come close by using
the internal SkCompositeShader class.

This scales the alpha mask to match the size of
the image data, then puts both in the composite
shader to draw.

There are more things to do:

- Allow Alpha8 or Gray8 to draw scaled to
  a matching device (blit doesn't work today)

Temporary code marked with
a TODO implements this functionality.

- Refactor PDFium to allow SkComposeShader's
  components to take a matrix.

The latter goal will defer drawing so that PDFium
doesn't resize the mask, discarding resolution,
before Skia has a chance to record it.

Additionally fix drawing text with a negative
font size.

R=reed@google.com,dsinclair@chromium.org,herb@chromium.org
==========

to

==========
add native draw bitmap with alpha mask

PDFs draw bitmaps with alpha by supplying an
image alpha mask along side the image color data.

The alpha mask may not be the same scale as the
image data. Skia doesn't have a direct mapping
for this draw call, but can come close by using
the internal SkCompositeShader class.

This scales the alpha mask to match the size of
the image data, then puts both in the composite
shader to draw.

There are more things to do:

- Allow Alpha8 or Gray8 to draw scaled to
  a matching device (blit doesn't work today)

Temporary code marked with
a TODO implements this functionality.

- Refactor PDFium to allow SkComposeShader's
  components to take a matrix.

The latter goal will defer drawing so that PDFium
doesn't resize the mask, discarding resolution,
before Skia has a chance to record it.

Additionally fix drawing text with a negative
font size.

R=reed@google.com,dsinclair@chromium.org,herb@chromium.org

Committed:
https://pdfium.googlesource.com/pdfium/+/c4f3c0f183c9ce472cd22e831075c3897e14...
==========

[commit-bot: I haz the power, 2016-08-15 17:09:53]

Committed patchset #8 (id:140001) as
https://pdfium.googlesource.com/pdfium/+/c4f3c0f183c9ce472cd22e831075c3897e14...