92775 2012-07-31 11:20:56 -0700 [chromium] REGRESSION(r123644) Compositor HUD crashes immediately with --show-paint-rects 2012-08-01 13:09:50 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 jamesr jamesr cc-bugs danakj enne nduca shawnsingh webkit.review.bot oldest_to_newest 683281 0 jamesr 2012-07-31 11:20:56 -0700 [chromium] REGRESSION(r123644) Compositor HUD crashes immediately with --show-paint-rects 683284 1 155588 jamesr 2012-07-31 11:23:47 -0700 Created attachment 155588 Patch 683359 2 155588 enne 2012-07-31 12:08:01 -0700 Comment on attachment 155588 Patch I mentioned this offline, but I think the bounds should get set every frame rather than in the constructor. While you're touching that code, is it possible to fix the extra commits from the HUD by not adding and removing it every frame? 683421 3 155619 jamesr 2012-07-31 13:24:28 -0700 Created attachment 155619 Patch 683423 4 jamesr 2012-07-31 13:24:38 -0700 PTAL 683481 5 155619 enne 2012-07-31 14:30:19 -0700 Comment on attachment 155619 Patch R=me. Thanks. 683597 6 155619 webkit.review.bot 2012-07-31 16:17:21 -0700 Comment on attachment 155619 Patch Rejecting attachment 155619 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: nes. Auto-merging LayoutTests/ChangeLog CONFLICT (content): Merge conflict in LayoutTests/ChangeLog Failed to merge in the changes. Patch failed at 0001 [Chromium] Rebaselines. When you have resolved this problem run "git rebase --continue". If you would prefer to skip this patch, instead run "git rebase --skip". To restore the original branch and stop rebasing run "git rebase --abort". rebase refs/remotes/origin/master: command returned error: 1 Died at Tools/Scripts/update-webkit line 164. Full output: http://queues.webkit.org/results/13392881 683617 7 jamesr 2012-07-31 16:31:22 -0700 Committed r124269: <http://trac.webkit.org/changeset/124269> 684377 8 shawnsingh 2012-08-01 11:37:30 -0700 Is this actually fixed? I'm still getting crashes with --show-paint-rects and --show-composited-layer-tree. but --show-fps-counter seems to work fine. 684455 9 jamesr 2012-08-01 12:19:57 -0700 (In reply to comment #8) > Is this actually fixed? I'm still getting crashes with --show-paint-rects and --show-composited-layer-tree. but --show-fps-counter seems to work fine. Seems OK for me in debug on linux, at least on poster circle. Can you get a stacktrace and open a new bug? 684502 10 shawnsingh 2012-08-01 13:09:50 -0700 (In reply to comment #9) > (In reply to comment #8) > > Is this actually fixed? I'm still getting crashes with --show-paint-rects and --show-composited-layer-tree. but --show-fps-counter seems to work fine. > > Seems OK for me in debug on linux, at least on poster circle. Can you get a stacktrace and open a new bug? My mistake - this was a false alarm. I thought I was on tip-of-tree, but actually I had not rebased my git branch. 155588 2012-07-31 11:23:47 -0700 2012-07-31 13:24:26 -0700 Patch bug-92775-20120731112330.patch text/plain 5792 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWI1ZWE0M2I2YmQxNTE1 ZTYyNjgyNDgwZTI1ZTdiNGFmODNkZjhjMi4uOGU2ZDFlYjIxNzY4YTM4Nzc1YjliZTI5NmVlMzRm ODE0M2Y3YTYxOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA3LTMxICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBS RUdSRVNTSU9OKHIxMjM2NDQpIENvbXBvc2l0b3IgSFVEIGNyYXNoZXMgaW1tZWRpYXRlbHkgd2l0 aCAtLXNob3ctcGFpbnQtcmVjdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTkyNzc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgSW4gcjEyMzY0NCwgdGhlIGNvbXBvc2l0b3IgSFVEIHdhcyB0dXJuZWQgaW50 byBhIG5vcm1hbCBsYXllci4gV2hlbiB0aGUgSFVEIGlzIHN1cHBvc2VkIHRvIGNvdmVyIHRoZSBl bnRpcmUKKyAgICAgICAgdmlld3BvcnQgLSBmb3IgaW5zdGFuY2UgaWYgdGhlIHNob3dQbGF0Zm9y bUxheWVyVHJlZSBvciBzaG93RGVidWdSZWN0cyBzZXR0aW5ncyBhcmUgdHJ1ZSAtCisgICAgICAg IEhlYWRzVXBEaXNwbGF5TGF5ZXJDaHJvbWl1bSdzIGNvbnN0cnVjdG9yIHRyaWVzIHRvIHNpemUg aXRzZWxmIHRvIGl0cyBsYXllclRyZWVIb3N0KCkncyBkZXZpY2Ugdmlld3BvcnQgc2l6ZS4KKyAg ICAgICAgVW5mb3J0dW5hdGVseSwgaXRzIGxheWVyVHJlZUhvc3QgcG9pbnRlciBpcyBhbHdheXMg bmlsIGluIHRoZSBjb25zdHJ1Y3RvciBzaW5jZSB0aGUgbGF5ZXIgaXMgbm90IHlldCBpbiB0aGUK KyAgICAgICAgdHJlZS4gVG8gZml4IHRoaXMsIHRoaXMgcGFzc2VzIHRoZSBkZXZpY2Ugdmlld3Bv cnQgc2l6ZSBpbnRvIHRoZSBIVUQgbGF5ZXIgY29uc3RydWN0b3IuCisKKyAgICAgICAgVGVzdGVk IG1hbnVhbGx5LCB3ZSBkb24ndCBoYXZlIGFueSBsYXlvdXQgdGVzdHMgZm9yIHRoZSBkZWJ1ZyBI VUQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9IZWFkc1VwRGlzcGxh eUxheWVyQ2hyb21pdW0uY3BwOgorICAgICAgICAoV2ViQ29yZTo6SGVhZHNVcERpc3BsYXlMYXll ckNocm9taXVtOjpjcmVhdGUpOgorICAgICAgICAoV2ViQ29yZTo6SGVhZHNVcERpc3BsYXlMYXll ckNocm9taXVtOjpIZWFkc1VwRGlzcGxheUxheWVyQ2hyb21pdW0pOgorICAgICAgICAqIHBsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0hlYWRzVXBEaXNwbGF5TGF5ZXJDaHJvbWl1bS5oOgorICAg ICAgICAoSGVhZHNVcERpc3BsYXlMYXllckNocm9taXVtKToKKyAgICAgICAgKiBwbGF0Zm9ybS9n cmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6Q0NMYXllclRyZWVIb3N0Ojp3aWxsQ29tbWl0KToKKwogMjAxMi0wNy0zMCAgRG9taW5payBS w7Z0dHNjaGVzICA8ZG9taW5pay5yb3R0c2NoZXNAaW50ZWwuY29tPgogCiAgICAgICAgIEF2b2lk IEFzc2VydGlvbiBGYWlsdXJlIGluIEhhcmZCdXp6UnVuOjpjaGFyYWN0ZXJJbmRleEZvclhQb3Np dGlvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vSGVhZHNVcERpc3BsYXlMYXllckNocm9taXVtLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2Nocm9taXVtL0hlYWRzVXBEaXNwbGF5TGF5ZXJDaHJvbWl1bS5jcHAKaW5k ZXggOWVlNDdkODAwOGI0MzhmYzVkNGQ0NmZhZjNmOTQxMTRjNjY1MTQzZC4uMWY1OTIyNTE3OWVj NzdlMzM2MjQ3OWViNDBiYTUwZDRkOWVhN2Y1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSGVhZHNVcERpc3BsYXlMYXllckNocm9taXVtLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9IZWFkc1Vw RGlzcGxheUxheWVyQ2hyb21pdW0uY3BwCkBAIC0zMywyMCArMzMsMjAgQEAKIAogbmFtZXNwYWNl IFdlYkNvcmUgewogCi1QYXNzUmVmUHRyPEhlYWRzVXBEaXNwbGF5TGF5ZXJDaHJvbWl1bT4gSGVh ZHNVcERpc3BsYXlMYXllckNocm9taXVtOjpjcmVhdGUoY29uc3QgQ0NMYXllclRyZWVTZXR0aW5n cyYgc2V0dGluZ3MsIGludCBtYXhUZXh0dXJlU2l6ZSkKK1Bhc3NSZWZQdHI8SGVhZHNVcERpc3Bs YXlMYXllckNocm9taXVtPiBIZWFkc1VwRGlzcGxheUxheWVyQ2hyb21pdW06OmNyZWF0ZShjb25z dCBDQ0xheWVyVHJlZVNldHRpbmdzJiBzZXR0aW5ncywgaW50IG1heFRleHR1cmVTaXplLCBJbnRT aXplIGRldmljZVZpZXdwb3J0U2l6ZSkKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IEhlYWRz VXBEaXNwbGF5TGF5ZXJDaHJvbWl1bShzZXR0aW5ncywgbWF4VGV4dHVyZVNpemUpKTsKKyAgICBy ZXR1cm4gYWRvcHRSZWYobmV3IEhlYWRzVXBEaXNwbGF5TGF5ZXJDaHJvbWl1bShzZXR0aW5ncywg bWF4VGV4dHVyZVNpemUsIGRldmljZVZpZXdwb3J0U2l6ZSkpOwogfQogCi1IZWFkc1VwRGlzcGxh eUxheWVyQ2hyb21pdW06OkhlYWRzVXBEaXNwbGF5TGF5ZXJDaHJvbWl1bShjb25zdCBDQ0xheWVy VHJlZVNldHRpbmdzJiBzZXR0aW5ncywgaW50IG1heFRleHR1cmVTaXplKQorSGVhZHNVcERpc3Bs YXlMYXllckNocm9taXVtOjpIZWFkc1VwRGlzcGxheUxheWVyQ2hyb21pdW0oY29uc3QgQ0NMYXll clRyZWVTZXR0aW5ncyYgc2V0dGluZ3MsIGludCBtYXhUZXh0dXJlU2l6ZSwgSW50U2l6ZSBkZXZp Y2VWaWV3cG9ydFNpemUpCiAgICAgOiBMYXllckNocm9taXVtKCkKIHsKICAgICBPd25QdHI8Q0NG b250QXRsYXM+IGZvbnRBdGxhczsKIAogICAgIEludFNpemUgYm91bmRzOwogICAgIGlmIChzZXR0 aW5ncy5zaG93UGxhdGZvcm1MYXllclRyZWUgfHwgc2V0dGluZ3Muc2hvd0RlYnVnUmVjdHMoKSkg ewotICAgICAgICBib3VuZHMuc2V0V2lkdGgoc3RkOjptaW4obWF4VGV4dHVyZVNpemUsIGxheWVy VHJlZUhvc3QoKS0+ZGV2aWNlVmlld3BvcnRTaXplKCkud2lkdGgoKSkpOwotICAgICAgICBib3Vu ZHMuc2V0SGVpZ2h0KHN0ZDo6bWluKG1heFRleHR1cmVTaXplLCBsYXllclRyZWVIb3N0KCktPmRl dmljZVZpZXdwb3J0U2l6ZSgpLmhlaWdodCgpKSk7CisgICAgICAgIGJvdW5kcy5zZXRXaWR0aChz dGQ6Om1pbihtYXhUZXh0dXJlU2l6ZSwgZGV2aWNlVmlld3BvcnRTaXplLndpZHRoKCkpKTsKKyAg ICAgICAgYm91bmRzLnNldEhlaWdodChzdGQ6Om1pbihtYXhUZXh0dXJlU2l6ZSwgZGV2aWNlVmll d3BvcnRTaXplLmhlaWdodCgpKSk7CiAgICAgfSBlbHNlIHsKICAgICAgICAgYm91bmRzLnNldFdp ZHRoKDUxMik7CiAgICAgICAgIGJvdW5kcy5zZXRIZWlnaHQoMTI4KTsKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0hlYWRzVXBEaXNwbGF5TGF5 ZXJDaHJvbWl1bS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0v SGVhZHNVcERpc3BsYXlMYXllckNocm9taXVtLmgKaW5kZXggOTdlMzEwZTE4NzA2MDE2MDliNjY2 MjdjMjMzZmMyYWExN2IzYzQyNC4uOTRjOWY5OTIzYTdmMmI2OWI1YzAyYjc2NDNhZWNjMzc4MTI5 MWRkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21p dW0vSGVhZHNVcERpc3BsYXlMYXllckNocm9taXVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSGVhZHNVcERpc3BsYXlMYXllckNocm9taXVtLmgKQEAg LTI3LDYgKzI3LDcgQEAKICNpZm5kZWYgSGVhZHNVcERpc3BsYXlMYXllckNocm9taXVtX2gKICNk ZWZpbmUgSGVhZHNVcERpc3BsYXlMYXllckNocm9taXVtX2gKIAorI2luY2x1ZGUgIkludFNpemUu aCIKICNpbmNsdWRlICJMYXllckNocm9taXVtLmgiCiAjaW5jbHVkZSAiY2MvQ0NGb250QXRsYXMu aCIKIApAQCAtMzYsNyArMzcsNyBAQCBzdHJ1Y3QgQ0NMYXllclRyZWVTZXR0aW5nczsKIAogY2xh c3MgSGVhZHNVcERpc3BsYXlMYXllckNocm9taXVtIDogcHVibGljIExheWVyQ2hyb21pdW0gewog cHVibGljOgotICAgIHN0YXRpYyBQYXNzUmVmUHRyPEhlYWRzVXBEaXNwbGF5TGF5ZXJDaHJvbWl1 bT4gY3JlYXRlKGNvbnN0IENDTGF5ZXJUcmVlU2V0dGluZ3MmLCBpbnQgbWF4VGV4dHVyZVNpemUp OworICAgIHN0YXRpYyBQYXNzUmVmUHRyPEhlYWRzVXBEaXNwbGF5TGF5ZXJDaHJvbWl1bT4gY3Jl YXRlKGNvbnN0IENDTGF5ZXJUcmVlU2V0dGluZ3MmLCBpbnQgbWF4VGV4dHVyZVNpemUsIEludFNp emUgZGV2aWNlVmlld3BvcnRTaXplKTsKICAgICB2aXJ0dWFsIH5IZWFkc1VwRGlzcGxheUxheWVy Q2hyb21pdW0oKTsKIAogICAgIHZpcnR1YWwgYm9vbCBkcmF3c0NvbnRlbnQoKSBjb25zdCBPVkVS UklERSB7IHJldHVybiB0cnVlOyB9CkBAIC00NCw3ICs0NSw3IEBAIHB1YmxpYzoKICAgICB2aXJ0 dWFsIFBhc3NPd25QdHI8Q0NMYXllckltcGw+IGNyZWF0ZUNDTGF5ZXJJbXBsKCkgT1ZFUlJJREU7 CiAKIHByb3RlY3RlZDoKLSAgICBIZWFkc1VwRGlzcGxheUxheWVyQ2hyb21pdW0oY29uc3QgQ0NM YXllclRyZWVTZXR0aW5ncyYsIGludCBtYXhUZXh0dXJlU2l6ZSk7CisgICAgSGVhZHNVcERpc3Bs YXlMYXllckNocm9taXVtKGNvbnN0IENDTGF5ZXJUcmVlU2V0dGluZ3MmLCBpbnQgbWF4VGV4dHVy ZVNpemUsIEludFNpemUgZGV2aWNlVmlld3BvcnRTaXplKTsKIAogcHJpdmF0ZToKICAgICBPd25Q dHI8Q0NGb250QXRsYXM+IG1fZm9udEF0bGFzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5ZXJUcmVlSG9zdC5j cHAKaW5kZXggZmY5N2NmM2M0NmUyYmJiMWI5MjAwNDQzMjZjNTAyN2ZjNjg3MTY1NC4uOTgwNmFi M2Q5YmE2ZWQ3Zjg3ZjFlODJhYWFmNmNlZjBmOGQzN2RlOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcAor KysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9jYy9DQ0xheWVy VHJlZUhvc3QuY3BwCkBAIC0yNTYsNyArMjU2LDcgQEAgdm9pZCBDQ0xheWVyVHJlZUhvc3Q6Ondp bGxDb21taXQoKQogICAgIG1fY2xpZW50LT53aWxsQ29tbWl0KCk7CiAgICAgaWYgKG1fcm9vdExh eWVyICYmIG1fc2V0dGluZ3Muc2hvd0RlYnVnSW5mbygpKSB7CiAgICAgICAgIGlmICghbV9odWRM YXllcikKLSAgICAgICAgICAgIG1faHVkTGF5ZXIgPSBIZWFkc1VwRGlzcGxheUxheWVyQ2hyb21p dW06OmNyZWF0ZShtX3NldHRpbmdzLCBsYXllclJlbmRlcmVyQ2FwYWJpbGl0aWVzKCkubWF4VGV4 dHVyZVNpemUpOworICAgICAgICAgICAgbV9odWRMYXllciA9IEhlYWRzVXBEaXNwbGF5TGF5ZXJD aHJvbWl1bTo6Y3JlYXRlKG1fc2V0dGluZ3MsIGxheWVyUmVuZGVyZXJDYXBhYmlsaXRpZXMoKS5t YXhUZXh0dXJlU2l6ZSwgZGV2aWNlVmlld3BvcnRTaXplKCkpOwogICAgICAgICBtX3Jvb3RMYXll ci0+YWRkQ2hpbGQobV9odWRMYXllcik7CiAgICAgfQogfQo= 155619 2012-07-31 13:24:28 -0700 2012-07-31 16:17:20 -0700 Patch bug-92775-20120731132411.patch text/plain 7121 jamesr U3VidmVyc2lvbiBSZXZpc2lvbjogMTI0MTI4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWI1ZWE0M2I2YmQxNTE1 ZTYyNjgyNDgwZTI1ZTdiNGFmODNkZjhjMi4uMjdhOTU1NWYyMzM0NTk5NGZmMWQxY2U3YzA4MDNk OGZiOTllNzI3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEyLTA3LTMxICBKYW1l cyBSb2JpbnNvbiAgPGphbWVzckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBS RUdSRVNTSU9OKHIxMjM2NDQpIENvbXBvc2l0b3IgSFVEIGNyYXNoZXMgaW1tZWRpYXRlbHkgd2l0 aCAtLXNob3ctcGFpbnQtcmVjdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTkyNzc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgSW4gcjEyMzY0NCwgdGhlIGNvbXBvc2l0b3IgSFVEIHdhcyB0dXJuZWQgaW50 byBhIG5vcm1hbCBsYXllci4gV2hlbiB0aGUgSFVEIGlzIHN1cHBvc2VkIHRvIGNvdmVyIHRoZSBl bnRpcmUKKyAgICAgICAgdmlld3BvcnQgLSBmb3IgaW5zdGFuY2UgaWYgdGhlIHNob3dQbGF0Zm9y bUxheWVyVHJlZSBvciBzaG93RGVidWdSZWN0cyBzZXR0aW5ncyBhcmUgdHJ1ZSAtCisgICAgICAg IEhlYWRzVXBEaXNwbGF5TGF5ZXJDaHJvbWl1bSdzIGNvbnN0cnVjdG9yIHRyaWVzIHRvIHNpemUg aXRzZWxmIHRvIGl0cyBsYXllclRyZWVIb3N0KCkncyBkZXZpY2Ugdmlld3BvcnQgc2l6ZS4KKyAg ICAgICAgVW5mb3J0dW5hdGVseSwgaXRzIGxheWVyVHJlZUhvc3QgcG9pbnRlciBpcyBhbHdheXMg bmlsIGluIHRoZSBjb25zdHJ1Y3RvciBzaW5jZSB0aGUgbGF5ZXIgaXMgbm90IHlldCBpbiB0aGUK KyAgICAgICAgdHJlZS4gQWRkaXRpb25hbGx5LCB0aGlzIGRvZXNuJ3QgaGFuZGxlIHJlc2l6ZSBh dCBhbGwuCisgICAgICAgIAorICAgICAgICBUbyBmaXggdGhpcywgdGhpcyBncmFicyB0aGUgZGV2 aWNlIHZpZXdwb3J0IHNpemUgYW5kIHNldHRpbmdzIGluIGEgTGF5ZXJDaHJvbWl1bTo6dXBkYXRl KCkgT1ZFUlJJREUuIEFsc28KKyAgICAgICAgY2hhbmdlcyBDQ0xheWVyVHJlZUhvc3Q6OndpbGxD b21taXQgdG8gb25seSByZXBhcmVudCB0aGUgSFVEIGxheWVyIGlmIG5lZWRlZCBpbnN0ZWFkIG9m IG9uIGV2ZXJ5IGZyYW1lLgorCisgICAgICAgIFRlc3RlZCBtYW51YWxseSwgd2UgZG9uJ3QgaGF2 ZSBhbnkgbGF5b3V0IHRlc3RzIGZvciB0aGUgZGVidWcgSFVELgorCisgICAgICAgICogcGxhdGZv cm0vZ3JhcGhpY3MvY2hyb21pdW0vSGVhZHNVcERpc3BsYXlMYXllckNocm9taXVtLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OkhlYWRzVXBEaXNwbGF5TGF5ZXJDaHJvbWl1bTo6Y3JlYXRlKToKKyAg ICAgICAgKFdlYkNvcmU6OkhlYWRzVXBEaXNwbGF5TGF5ZXJDaHJvbWl1bTo6SGVhZHNVcERpc3Bs YXlMYXllckNocm9taXVtKToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9I ZWFkc1VwRGlzcGxheUxheWVyQ2hyb21pdW0uaDoKKyAgICAgICAgKEhlYWRzVXBEaXNwbGF5TGF5 ZXJDaHJvbWl1bSk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vY2MvQ0NM YXllclRyZWVIb3N0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNDTGF5ZXJUcmVlSG9zdDo6d2ls bENvbW1pdCk6CisKIDIwMTItMDctMzAgIERvbWluaWsgUsO2dHRzY2hlcyAgPGRvbWluaWsucm90 dHNjaGVzQGludGVsLmNvbT4KIAogICAgICAgICBBdm9pZCBBc3NlcnRpb24gRmFpbHVyZSBpbiBI YXJmQnV6elJ1bjo6Y2hhcmFjdGVySW5kZXhGb3JYUG9zaXRpb24KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0hlYWRzVXBEaXNwbGF5TGF5ZXJD aHJvbWl1bS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1bS9I ZWFkc1VwRGlzcGxheUxheWVyQ2hyb21pdW0uY3BwCmluZGV4IDllZTQ3ZDgwMDhiNDM4ZmM1ZDRk NDZmYWYzZjk0MTE0YzY2NTE0M2QuLmYyNTRhNjRkYmNiMTdkMTM2ODYwMDg4MDkyNzE2M2IyYjA4 OTdlYWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9t aXVtL0hlYWRzVXBEaXNwbGF5TGF5ZXJDaHJvbWl1bS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvY2hyb21pdW0vSGVhZHNVcERpc3BsYXlMYXllckNocm9taXVtLmNw cApAQCAtMzMsMjUgKzMzLDE2IEBACiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAotUGFzc1JlZlB0 cjxIZWFkc1VwRGlzcGxheUxheWVyQ2hyb21pdW0+IEhlYWRzVXBEaXNwbGF5TGF5ZXJDaHJvbWl1 bTo6Y3JlYXRlKGNvbnN0IENDTGF5ZXJUcmVlU2V0dGluZ3MmIHNldHRpbmdzLCBpbnQgbWF4VGV4 dHVyZVNpemUpCitQYXNzUmVmUHRyPEhlYWRzVXBEaXNwbGF5TGF5ZXJDaHJvbWl1bT4gSGVhZHNV cERpc3BsYXlMYXllckNocm9taXVtOjpjcmVhdGUoY29uc3QgQ0NMYXllclRyZWVTZXR0aW5ncyYg c2V0dGluZ3MpCiB7Ci0gICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBIZWFkc1VwRGlzcGxheUxheWVy Q2hyb21pdW0oc2V0dGluZ3MsIG1heFRleHR1cmVTaXplKSk7CisgICAgcmV0dXJuIGFkb3B0UmVm KG5ldyBIZWFkc1VwRGlzcGxheUxheWVyQ2hyb21pdW0oc2V0dGluZ3MpKTsKIH0KIAotSGVhZHNV cERpc3BsYXlMYXllckNocm9taXVtOjpIZWFkc1VwRGlzcGxheUxheWVyQ2hyb21pdW0oY29uc3Qg Q0NMYXllclRyZWVTZXR0aW5ncyYgc2V0dGluZ3MsIGludCBtYXhUZXh0dXJlU2l6ZSkKK0hlYWRz VXBEaXNwbGF5TGF5ZXJDaHJvbWl1bTo6SGVhZHNVcERpc3BsYXlMYXllckNocm9taXVtKGNvbnN0 IENDTGF5ZXJUcmVlU2V0dGluZ3MmIHNldHRpbmdzKQogICAgIDogTGF5ZXJDaHJvbWl1bSgpCiB7 Ci0gICAgT3duUHRyPENDRm9udEF0bGFzPiBmb250QXRsYXM7CiAKLSAgICBJbnRTaXplIGJvdW5k czsKLSAgICBpZiAoc2V0dGluZ3Muc2hvd1BsYXRmb3JtTGF5ZXJUcmVlIHx8IHNldHRpbmdzLnNo b3dEZWJ1Z1JlY3RzKCkpIHsKLSAgICAgICAgYm91bmRzLnNldFdpZHRoKHN0ZDo6bWluKG1heFRl eHR1cmVTaXplLCBsYXllclRyZWVIb3N0KCktPmRldmljZVZpZXdwb3J0U2l6ZSgpLndpZHRoKCkp KTsKLSAgICAgICAgYm91bmRzLnNldEhlaWdodChzdGQ6Om1pbihtYXhUZXh0dXJlU2l6ZSwgbGF5 ZXJUcmVlSG9zdCgpLT5kZXZpY2VWaWV3cG9ydFNpemUoKS5oZWlnaHQoKSkpOwotICAgIH0gZWxz ZSB7Ci0gICAgICAgIGJvdW5kcy5zZXRXaWR0aCg1MTIpOwotICAgICAgICBib3VuZHMuc2V0SGVp Z2h0KDEyOCk7Ci0gICAgfQotICAgIHNldEJvdW5kcyhib3VuZHMpOworICAgIHNldEJvdW5kcyhJ bnRTaXplKDUxMiwgMTI4KSk7CiAKICAgICAvLyBPbmx5IGFsbG9jYXRlIHRoZSBmb250IGF0bGFz IGlmIHdlIGhhdmUgcmVhc29uIHRvIHVzZSB0aGUgaGVhZHMtdXAgZGlzcGxheS4KICAgICBpZiAo c2V0dGluZ3Muc2hvd0ZQU0NvdW50ZXIgfHwgc2V0dGluZ3Muc2hvd1BsYXRmb3JtTGF5ZXJUcmVl KSB7CkBAIC02NSw2ICs1NiwyMyBAQCBIZWFkc1VwRGlzcGxheUxheWVyQ2hyb21pdW06On5IZWFk c1VwRGlzcGxheUxheWVyQ2hyb21pdW0oKQogewogfQogCit2b2lkIEhlYWRzVXBEaXNwbGF5TGF5 ZXJDaHJvbWl1bTo6dXBkYXRlKENDVGV4dHVyZVVwZGF0ZXImLCBjb25zdCBDQ09jY2x1c2lvblRy YWNrZXIqLCBDQ1JlbmRlcmluZ1N0YXRzJikKK3sKKyAgICBjb25zdCBDQ0xheWVyVHJlZVNldHRp bmdzJiBzZXR0aW5ncyA9IGxheWVyVHJlZUhvc3QoKS0+c2V0dGluZ3MoKTsKKyAgICBpbnQgbWF4 VGV4dHVyZVNpemUgPSBsYXllclRyZWVIb3N0KCktPmxheWVyUmVuZGVyZXJDYXBhYmlsaXRpZXMo KS5tYXhUZXh0dXJlU2l6ZTsKKworICAgIEludFNpemUgYm91bmRzOworICAgIGlmIChzZXR0aW5n cy5zaG93UGxhdGZvcm1MYXllclRyZWUgfHwgc2V0dGluZ3Muc2hvd0RlYnVnUmVjdHMoKSkgewor ICAgICAgICBib3VuZHMuc2V0V2lkdGgoc3RkOjptaW4obWF4VGV4dHVyZVNpemUsIGxheWVyVHJl ZUhvc3QoKS0+ZGV2aWNlVmlld3BvcnRTaXplKCkud2lkdGgoKSkpOworICAgICAgICBib3VuZHMu c2V0SGVpZ2h0KHN0ZDo6bWluKG1heFRleHR1cmVTaXplLCBsYXllclRyZWVIb3N0KCktPmRldmlj ZVZpZXdwb3J0U2l6ZSgpLmhlaWdodCgpKSk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgYm91bmRz LnNldFdpZHRoKDUxMik7CisgICAgICAgIGJvdW5kcy5zZXRIZWlnaHQoMTI4KTsKKyAgICB9CisK KyAgICBzZXRCb3VuZHMoYm91bmRzKTsKK30KKwogUGFzc093blB0cjxDQ0xheWVySW1wbD4gSGVh ZHNVcERpc3BsYXlMYXllckNocm9taXVtOjpjcmVhdGVDQ0xheWVySW1wbCgpCiB7CiAgICAgcmV0 dXJuIENDSGVhZHNVcERpc3BsYXlMYXllckltcGw6OmNyZWF0ZShtX2xheWVySWQsIG1fZm9udEF0 bGFzLnJlbGVhc2UoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jaHJvbWl1bS9IZWFkc1VwRGlzcGxheUxheWVyQ2hyb21pdW0uaCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0hlYWRzVXBEaXNwbGF5TGF5ZXJDaHJvbWl1 bS5oCmluZGV4IDk3ZTMxMGUxODcwNjAxNjA5YjY2NjI3YzIzM2ZjMmFhMTdiM2M0MjQuLmZjMTIz MGY3MGEzMjg3N2Q3NTc2ODEwYTEyOTlmODNlM2UzMmE2MmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0hlYWRzVXBEaXNwbGF5TGF5ZXJDaHJv bWl1bS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL0hl YWRzVXBEaXNwbGF5TGF5ZXJDaHJvbWl1bS5oCkBAIC0yNyw2ICsyNyw3IEBACiAjaWZuZGVmIEhl YWRzVXBEaXNwbGF5TGF5ZXJDaHJvbWl1bV9oCiAjZGVmaW5lIEhlYWRzVXBEaXNwbGF5TGF5ZXJD aHJvbWl1bV9oCiAKKyNpbmNsdWRlICJJbnRTaXplLmgiCiAjaW5jbHVkZSAiTGF5ZXJDaHJvbWl1 bS5oIgogI2luY2x1ZGUgImNjL0NDRm9udEF0bGFzLmgiCiAKQEAgLTM2LDE1ICszNywxNiBAQCBz dHJ1Y3QgQ0NMYXllclRyZWVTZXR0aW5nczsKIAogY2xhc3MgSGVhZHNVcERpc3BsYXlMYXllckNo cm9taXVtIDogcHVibGljIExheWVyQ2hyb21pdW0gewogcHVibGljOgotICAgIHN0YXRpYyBQYXNz UmVmUHRyPEhlYWRzVXBEaXNwbGF5TGF5ZXJDaHJvbWl1bT4gY3JlYXRlKGNvbnN0IENDTGF5ZXJU cmVlU2V0dGluZ3MmLCBpbnQgbWF4VGV4dHVyZVNpemUpOworICAgIHN0YXRpYyBQYXNzUmVmUHRy PEhlYWRzVXBEaXNwbGF5TGF5ZXJDaHJvbWl1bT4gY3JlYXRlKGNvbnN0IENDTGF5ZXJUcmVlU2V0 dGluZ3MmKTsKICAgICB2aXJ0dWFsIH5IZWFkc1VwRGlzcGxheUxheWVyQ2hyb21pdW0oKTsKIAor ICAgIHZpcnR1YWwgdm9pZCB1cGRhdGUoQ0NUZXh0dXJlVXBkYXRlciYsIGNvbnN0IENDT2NjbHVz aW9uVHJhY2tlciosIENDUmVuZGVyaW5nU3RhdHMmKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIGJv b2wgZHJhd3NDb250ZW50KCkgY29uc3QgT1ZFUlJJREUgeyByZXR1cm4gdHJ1ZTsgfQogCiAgICAg dmlydHVhbCBQYXNzT3duUHRyPENDTGF5ZXJJbXBsPiBjcmVhdGVDQ0xheWVySW1wbCgpIE9WRVJS SURFOwogCiBwcm90ZWN0ZWQ6Ci0gICAgSGVhZHNVcERpc3BsYXlMYXllckNocm9taXVtKGNvbnN0 IENDTGF5ZXJUcmVlU2V0dGluZ3MmLCBpbnQgbWF4VGV4dHVyZVNpemUpOworICAgIGV4cGxpY2l0 IEhlYWRzVXBEaXNwbGF5TGF5ZXJDaHJvbWl1bShjb25zdCBDQ0xheWVyVHJlZVNldHRpbmdzJik7 CiAKIHByaXZhdGU6CiAgICAgT3duUHRyPENDRm9udEF0bGFzPiBtX2ZvbnRBdGxhczsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2NjL0NDTGF5 ZXJUcmVlSG9zdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jaHJvbWl1 bS9jYy9DQ0xheWVyVHJlZUhvc3QuY3BwCmluZGV4IGZmOTdjZjNjNDZlMmJiYjFiOTIwMDQ0MzI2 YzUwMjdmYzY4NzE2NTQuLjljYjNiMWJiOTc0ZTc5YjM4NWE2ZmE0MmFiMTJjMjE2YTAzODI5Yjgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2Nocm9taXVtL2Nj L0NDTGF5ZXJUcmVlSG9zdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvY2hyb21pdW0vY2MvQ0NMYXllclRyZWVIb3N0LmNwcApAQCAtMjU2LDE1ICsyNTYsMTYgQEAg dm9pZCBDQ0xheWVyVHJlZUhvc3Q6OndpbGxDb21taXQoKQogICAgIG1fY2xpZW50LT53aWxsQ29t bWl0KCk7CiAgICAgaWYgKG1fcm9vdExheWVyICYmIG1fc2V0dGluZ3Muc2hvd0RlYnVnSW5mbygp KSB7CiAgICAgICAgIGlmICghbV9odWRMYXllcikKLSAgICAgICAgICAgIG1faHVkTGF5ZXIgPSBI ZWFkc1VwRGlzcGxheUxheWVyQ2hyb21pdW06OmNyZWF0ZShtX3NldHRpbmdzLCBsYXllclJlbmRl cmVyQ2FwYWJpbGl0aWVzKCkubWF4VGV4dHVyZVNpemUpOwotICAgICAgICBtX3Jvb3RMYXllci0+ YWRkQ2hpbGQobV9odWRMYXllcik7CisgICAgICAgICAgICBtX2h1ZExheWVyID0gSGVhZHNVcERp c3BsYXlMYXllckNocm9taXVtOjpjcmVhdGUobV9zZXR0aW5ncyk7CisgICAgICAgIGlmIChtX2h1 ZExheWVyLT5wYXJlbnQoKSAhPSBtX3Jvb3RMYXllci5nZXQoKSkgeworICAgICAgICAgICAgbV9o dWRMYXllci0+cmVtb3ZlRnJvbVBhcmVudCgpOworICAgICAgICAgICAgbV9yb290TGF5ZXItPmFk ZENoaWxkKG1faHVkTGF5ZXIpOworICAgICAgICB9CiAgICAgfQogfQogCiB2b2lkIENDTGF5ZXJU cmVlSG9zdDo6Y29tbWl0Q29tcGxldGUoKQogewotICAgIGlmIChtX2h1ZExheWVyKQotICAgICAg ICBtX2h1ZExheWVyLT5yZW1vdmVGcm9tUGFyZW50KCk7CiAgICAgbV9kZWxldGVUZXh0dXJlQWZ0 ZXJDb21taXRMaXN0LmNsZWFyKCk7CiAgICAgbV9jbGllbnQtPmRpZENvbW1pdCgpOwogfQo=