Merge sub-device annotations in SkPDFDevice::drawDevice()

Merge sub-device annotations in SkPDFDevice::drawDevice()

Previously annotations added between saveLayer/restore were lost.

Merge annotations in SkPDFDevice::drawDevice(). Also modified code to
apply correct transformation and clipping on annotations added between
saveLayer/restore:
- Apply the initial transform only when adding the annotations into the
  doc, otherwise we need to unapply sub-device's initial transform
  before merging the annotations into parent-device.
- Apply only device-local clipping. fClipStack is in global coordinates,
  which is not suitable to clip rects in sub-devices.

BUG=skia:4080
BUG=503515
Committed: https://skia.googlesource.com/skia/+/ef6c50a80f77e6da84e198a34755dd42b1b0cf1e

[Xianzhu, 2015-07-29 21:05:07]

wangxianzhu@chromium.org changed reviewers:
+ halcanary@google.com, tomhudson@google.com

[Xianzhu, 2015-07-29 21:20:34]

The CQ bit was checked by wangxianzhu@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2015-07-29 21:20:44]

Dry run: CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1257533004/20001
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1257533004/20001

[commit-bot: I haz the power, 2015-07-29 21:20:45]

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-07-30 03:20 UTC

[commit-bot: I haz the power, 2015-07-29 21:24:27]

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

[commit-bot: I haz the power, 2015-07-29 21:24:28]

Dry run: Try jobs failed on following builders:
  Build-Win-MSVC-x86_64-Debug-Trybot on client.skia.compile (JOB_FAILED,
http://build.chromium.org/p/client.skia.compile/builders/Build-Win-MSVC-x86_6...)

[Xianzhu, 2015-07-29 21:29:46]

The CQ bit was checked by wangxianzhu@chromium.org to run a CQ dry run

[commit-bot: I haz the power, 2015-07-29 21:30:02]

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

[commit-bot: I haz the power, 2015-07-30 03:20:00]

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

[commit-bot: I haz the power, 2015-07-30 03:20:00]

Dry run: No LGTM from a valid reviewer yet. Please ask for an LGTM from a
full Skia committer from
https://skia.googlesource.com/skia/+/master/CQ_COMMITTERS

[Xianzhu, 2015-07-31 22:09:04]

wangxianzhu@chromium.org changed reviewers:
+ hcm@google.com

[Xianzhu, 2015-08-04 20:47:46]

Reviewers, what do you think about this CL?
Feel free to say no and create your own :)

[hcm, 2015-08-04 21:06:34]

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

[hcm, 2015-08-04 21:07:49]

On 2015/08/04 20:47:46, Xianzhu wrote:
> Reviewers, what do you think about this CL?
> Feel free to say no and create your own :)

Hal is out, and I really need his review here, so there may be some delay. 
Adding reed also.

[tomhudson, 2015-08-10 13:37:28]

I was also out, but Hal's clearly the only person who can review this. More
information about why you made the semantic changes you did would be useful, as
would test cases supporting your unrelated code modifications (which we'd
usually prefer to have in a separate patch).

[Xianzhu, 2015-08-27 22:13:54]

Is Hal back?

On 2015/08/10 13:37:28, tomhudson wrote:
> I was also out, but Hal's clearly the only person who can review this. More
> information about why you made the semantic changes you did would be useful,
as
> would test cases supporting your unrelated code modifications (which we'd
> usually prefer to have in a separate patch).

The other changes are all required to fix the bug. See CL description for
details. The changed test case covers the modifications.

[Xianzhu, 2015-09-08 23:18:06]

ping...

[Xianzhu, 2015-09-14 19:25:20]

On 2015/09/08 23:18:06, Xianzhu wrote:
> ping...

ping...

[hal.canary, 2015-09-16 17:30:46]

Sorry about the delay; I had a hard time wrapping my head around this and kept
procrastinating.  It looks great.  Please make the one little change I commented
on.  You'll have to rebase before you land.

LGTM.

https://codereview.chromium.org/1257533004/diff/40001/src/doc/SkDocument_PDF.cpp
File src/doc/SkDocument_PDF.cpp (right):

https://codereview.chromium.org/1257533004/diff/40001/src/doc/SkDocument_PDF....
src/doc/SkDocument_PDF.cpp:74: pageDevice->appendAnnotations(annotations);
if (annotations->size() > 0) {
    page->insertObject("Annots", annotations.detach());
}

[Xianzhu, 2015-09-17 22:43:00]

The CQ bit was checked by wangxianzhu@chromium.org

[Xianzhu, 2015-09-17 22:43:01]

The patchset sent to the CQ was uploaded after l-g-t-m from halcanary@google.com
Link to the patchset: https://codereview.chromium.org/1257533004/#ps60001
(title: "Rebase and address comment")

[commit-bot: I haz the power, 2015-09-17 22:43:21]

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

[commit-bot: I haz the power, 2015-09-18 03:38:06]

Committed patchset #4 (id:60001) as
https://skia.googlesource.com/skia/+/ef6c50a80f77e6da84e198a34755dd42b1b0cf1e