82523 2012-03-28 13:58:10 -0700 [Qt][WK2] Disable the content-scaling and visible contents rect when the layer's transform is not affine 2012-04-09 13:01:47 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 75780 1 noam noam hausmann jturcotte kenneth webkit.review.bot oldest_to_newest 590394 0 noam 2012-03-28 13:58:10 -0700 [Qt][WK2] Disable the content-scaling and visible contents rect when the layer's transform is not affine 590485 1 134410 noam 2012-03-28 15:06:41 -0700 Created attachment 134410 Patch 591062 2 134410 jturcotte 2012-03-29 05:07:06 -0700 Comment on attachment 134410 Patch LGTM 591070 3 134410 kenneth 2012-03-29 05:14:13 -0700 Comment on attachment 134410 Patch Can this be tested? 591128 4 noam 2012-03-29 06:47:38 -0700 (In reply to comment #3) > (From update of attachment 134410 [details]) > Can this be tested? It's already tested. The compositing tests with huge transformed layers test this. 594457 5 134410 kenneth 2012-04-03 07:13:19 -0700 Comment on attachment 134410 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134410&action=review > Source/WebKit2/ChangeLog:8 > + Always use contentsScale of 1 and a full visibleContentsRect when I hate the name for visibleContentsRect when it is more than that, especially if people use it differently 594461 6 noam 2012-04-03 07:23:22 -0700 (In reply to comment #5) > (From update of attachment 134410 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=134410&action=review > > > Source/WebKit2/ChangeLog:8 > > + Always use contentsScale of 1 and a full visibleContentsRect when > > I hate the name for visibleContentsRect when it is more than that, especially if people use it differently It should probably be "visibleRectInContentsCoordinates". Though that's an issue for another patch... 598343 7 noam 2012-04-09 09:39:08 -0700 Any other issues with this patch? 598379 8 136254 noam 2012-04-09 10:13:28 -0700 Created attachment 136254 Patch for landing 598543 9 136254 webkit.review.bot 2012-04-09 13:01:42 -0700 Comment on attachment 136254 Patch for landing Clearing flags on attachment: 136254 Committed r113608: <http://trac.webkit.org/changeset/113608> 598544 10 webkit.review.bot 2012-04-09 13:01:47 -0700 All reviewed patches have been landed. Closing bug. 134410 2012-03-28 15:06:41 -0700 2012-04-09 10:13:21 -0700 Patch bug-82523-20120328150633.patch text/plain 5803 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNDA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYTVlZGNlN2IzOGIxOTVk ODE2OTg0YTc4MWVmYzU1YzI3NmI2YzkwNC4uYWUyNzk0ZmMzYzM5OTlhNWFmYzQ0ZjdjODdhOGI5 YWRjOGE4ZTg4OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTAzLTI4ICBObydh bSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XVtX SzJdIERpc2FibGUgdGhlIGNvbnRlbnQtc2NhbGluZyBhbmQgdmlzaWJsZSBjb250ZW50cyByZWN0 IHdoZW4gdGhlIGxheWVyJ3MgdHJhbnNmb3JtIGlzIG5vdCBhZmZpbmUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyNTIzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWx3YXlzIHVzZSBjb250ZW50c1NjYWxl IG9mIDEgYW5kIGEgZnVsbCB2aXNpYmxlQ29udGVudHNSZWN0IHdoZW4KKyAgICAgICAgdGhlIGxh eWVyJ3MgdHJhbnNmb3JtIGlzIG5vdCBhZmZpbmUuIFRoYXQncyBiZWNhdXNlIGxheWVyJ3Mgd2l0 aAorICAgICAgICBjb21wbGV4IHRyYW5zZm9ybSB3b3VsZCBub3QgZ2FpbiBmcm9tIHRoZSBiZW5l Zml0IG9mIGNvbnRlbnRzIHNjYWxpbmcsCisgICAgICAgIGFuZCBtaWdodCBhbHNvIGNyZWF0ZSB1 bmV4cGVjdGVkIGxheWVyIGNvbnRlbnQgc2l6ZXMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dl YkNvcmVTdXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V2Vi R3JhcGhpY3NMYXllcjo6Y3JlYXRlQmFja2luZ1N0b3JlKToKKyAgICAgICAgKFdlYkNvcmUpOgor ICAgICAgICAoV2ViQ29yZTo6V2ViR3JhcGhpY3NMYXllcjo6dGlsZWRCYWNraW5nU3RvcmVQYWlu dCk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHcmFwaGljc0xheWVyOjp0aWxlZEJhY2tpbmdTdG9y ZVBhaW50RW5kKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5ZXI6OnRpbGVkQmFj a2luZ1N0b3JlVmlzaWJsZVJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR3JhcGhpY3NMYXll cjo6dXBkYXRlVGlsZSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHcmFwaGljc0xheWVyOjpyZW1v dmVUaWxlKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5ZXI6OnVwZGF0ZUNvbnRl bnRCdWZmZXJzKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkdyYXBo aWNzTGF5ZXIuaDoKKyAgICAgICAgKFdlYkdyYXBoaWNzTGF5ZXIpOgorCiAyMDEyLTAzLTI4ICBC YWxhenMgS2VsZW1lbiAgPGtiYWxhenNAd2Via2l0Lm9yZz4KIAogICAgICAgICBbUXRdIEZpeCBR V0FSTiBpbiB0ZXN0X2xvYWRJZ25vcmVFbXB0eVVybCBBUEkgdGVzdC4KZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViR3JhcGhpY3NMYXllci5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkdyYXBoaWNz TGF5ZXIuY3BwCmluZGV4IDM0YThkY2U3MjY3OWNkMTlkODVkYWM3NTY5MmJhNmNlNTJiNWRhNWUu LjJjMjdjMjQzMGNjMWU3MGUwMWFlOWE2YTdjMjU0Yjk3MzJmYzczOGQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViR3JhcGhpY3NMYXllci5j cHAKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJHcmFw aGljc0xheWVyLmNwcApAQCAtNDk2LDggKzQ5NiwyMCBAQCB2b2lkIFdlYkdyYXBoaWNzTGF5ZXI6 OnNldFZpc2libGVDb250ZW50UmVjdFRyYWplY3RvcnlWZWN0b3IoY29uc3QgRmxvYXRQb2ludCYg dAogdm9pZCBXZWJHcmFwaGljc0xheWVyOjpzZXRDb250ZW50c1NjYWxlKGZsb2F0IHNjYWxlKQog ewogICAgIG1fY29udGVudHNTY2FsZSA9IHNjYWxlOworICAgIGFkanVzdENvbnRlbnRzU2NhbGUo KTsKK30KKworZmxvYXQgV2ViR3JhcGhpY3NMYXllcjo6ZWZmZWN0aXZlQ29udGVudHNTY2FsZSgp Cit7CisgICAgcmV0dXJuIHNob3VsZFVzZVRpbGVkQmFja2luZ1N0b3JlKCkgPyBtX2NvbnRlbnRz U2NhbGUgOiAxOworfQorCit2b2lkIFdlYkdyYXBoaWNzTGF5ZXI6OmFkanVzdENvbnRlbnRzU2Nh bGUoKQoreworICAgIGlmICghZHJhd3NDb250ZW50KCkpCisgICAgICAgIHJldHVybjsKIAotICAg IGlmICghbV9tYWluQmFja2luZ1N0b3JlIHx8IG1fbWFpbkJhY2tpbmdTdG9yZS0+Y29udGVudHNT Y2FsZSgpID09IHNjYWxlKQorICAgIGlmICghbV9tYWluQmFja2luZ1N0b3JlIHx8IG1fbWFpbkJh Y2tpbmdTdG9yZS0+Y29udGVudHNTY2FsZSgpID09IGVmZmVjdGl2ZUNvbnRlbnRzU2NhbGUoKSkK ICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gQmV0d2VlbiBjcmVhdGluZyB0aGUgbmV3IGJhY2tp bmcgc3RvcmUgYW5kIHBhaW50aW5nIHRoZSBjb250ZW50LApAQCAtNTE2LDcgKzUyOCw3IEBAIHZv aWQgV2ViR3JhcGhpY3NMYXllcjo6Y3JlYXRlQmFja2luZ1N0b3JlKCkKIHsKICAgICBtX21haW5C YWNraW5nU3RvcmUgPSBhZG9wdFB0cihuZXcgVGlsZWRCYWNraW5nU3RvcmUodGhpcywgVGlsZWRC YWNraW5nU3RvcmVSZW1vdGVUaWxlQmFja2VuZDo6Y3JlYXRlKHRoaXMpKSk7CiAgICAgbV9tYWlu QmFja2luZ1N0b3JlLT5zZXRTdXBwb3J0c0FscGhhKCFjb250ZW50c09wYXF1ZSgpKTsKLSAgICBt X21haW5CYWNraW5nU3RvcmUtPnNldENvbnRlbnRzU2NhbGUobV9jb250ZW50c1NjYWxlKTsKKyAg ICBtX21haW5CYWNraW5nU3RvcmUtPnNldENvbnRlbnRzU2NhbGUoZWZmZWN0aXZlQ29udGVudHNT Y2FsZSgpKTsKIH0KIAogdm9pZCBXZWJHcmFwaGljc0xheWVyOjp0aWxlZEJhY2tpbmdTdG9yZVBh aW50KEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3QgSW50UmVjdCYgcmVjdCkKQEAgLTU0 MiwxMSArNTU0LDE2IEBAIEludFJlY3QgV2ViR3JhcGhpY3NMYXllcjo6dGlsZWRCYWNraW5nU3Rv cmVDb250ZW50c1JlY3QoKQogICAgIHJldHVybiBJbnRSZWN0KDAsIDAsIHNpemUoKS53aWR0aCgp LCBzaXplKCkuaGVpZ2h0KCkpOwogfQogCitib29sIFdlYkdyYXBoaWNzTGF5ZXI6OnNob3VsZFVz ZVRpbGVkQmFja2luZ1N0b3JlKCkKK3sKKyAgICByZXR1cm4gIXNlbGZPckFuY2VzdG9ySGF2ZU5v bkFmZmluZVRyYW5zZm9ybXMoKTsKK30KKwogSW50UmVjdCBXZWJHcmFwaGljc0xheWVyOjp0aWxl ZEJhY2tpbmdTdG9yZVZpc2libGVSZWN0KCkKIHsKICAgICAvLyBJZiB0aGlzIGxheWVyIGlzIHBh cnQgb2YgYW4gYWN0aXZlIHRyYW5zZm9ybSBhbmltYXRpb24sIHRoZSB2aXNpYmxlIHJlY3QgbWln aHQgY2hhbmdlLAogICAgIC8vIHNvIHdlIHJhdGhlciByZW5kZXIgdGhlIHdob2xlIGxheWVyIHVu dGlsIHNvbWUgYmV0dGVyIG9wdGltaXphdGlvbiBpcyBhdmFpbGFibGUuCi0gICAgaWYgKHNlbGZP ckFuY2VzdG9ySGFzQWN0aXZlVHJhbnNmb3JtQW5pbWF0aW9ucygpKQorICAgIGlmICghc2hvdWxk VXNlVGlsZWRCYWNraW5nU3RvcmUoKSkKICAgICAgICAgcmV0dXJuIHRpbGVkQmFja2luZ1N0b3Jl Q29udGVudHNSZWN0KCk7CiAKICAgICAvLyBOb24taW52ZXJ0aWJsZSBsYXllcnMgYXJlIG5vdCB2 aXNpYmxlLgpAQCAtNTYyLDggKzU3OSw4IEBAIEludFJlY3QgV2ViR3JhcGhpY3NMYXllcjo6dGls ZWRCYWNraW5nU3RvcmVWaXNpYmxlUmVjdCgpCiBDb2xvciBXZWJHcmFwaGljc0xheWVyOjp0aWxl ZEJhY2tpbmdTdG9yZUJhY2tncm91bmRDb2xvcigpIGNvbnN0CiB7CiAgICAgcmV0dXJuIGNvbnRl bnRzT3BhcXVlKCkgPyBDb2xvcjo6d2hpdGUgOiBDb2xvcjo6dHJhbnNwYXJlbnQ7Ci0KIH0KKwog dm9pZCBXZWJHcmFwaGljc0xheWVyOjpjcmVhdGVUaWxlKGludCB0aWxlSUQsIGNvbnN0IFVwZGF0 ZUluZm8mIHVwZGF0ZUluZm8pCiB7CiAgICAgbV93ZWJHcmFwaGljc0xheWVyQ2xpZW50LT5jcmVh dGVUaWxlKGlkKCksIHRpbGVJRCwgdXBkYXRlSW5mbyk7CkBAIC02NTYsNiArNjczLDcgQEAgdm9p ZCBXZWJHcmFwaGljc0xheWVyOjpjb21wdXRlVHJhbnNmb3JtZWRWaXNpYmxlUmVjdCgpCiAKICAg ICAvLyBUaGUgY29tYmluZWQgdHJhbnNmb3JtIHdpbGwgYmUgdXNlZCBpbiB0aWxlZEJhY2tpbmdT dG9yZVZpc2libGVSZWN0LgogICAgIGFkanVzdFZpc2libGVSZWN0KCk7CisgICAgYWRqdXN0Q29u dGVudHNTY2FsZSgpOwogfQogI2VuZGlmCiAKQEAgLTY2OSwxMyArNjg3LDEzIEBAIHZvaWQgV2Vi R3JhcGhpY3NMYXllcjo6aW5pdEZhY3RvcnkoKQogICAgIEdyYXBoaWNzTGF5ZXI6OnNldEdyYXBo aWNzTGF5ZXJGYWN0b3J5KGNyZWF0ZVdlYkdyYXBoaWNzTGF5ZXIpOwogfQogCi1ib29sIFdlYkdy YXBoaWNzTGF5ZXI6OnNlbGZPckFuY2VzdG9ySGFzQWN0aXZlVHJhbnNmb3JtQW5pbWF0aW9ucygp IGNvbnN0Citib29sIFdlYkdyYXBoaWNzTGF5ZXI6OnNlbGZPckFuY2VzdG9ySGF2ZU5vbkFmZmlu ZVRyYW5zZm9ybXMoKQogewogICAgIGlmICghbV90cmFuc2Zvcm1BbmltYXRpb25zLmlzRW1wdHko KSkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKLSAgICBpZiAocGFyZW50KCkpCi0gICAgICAgIHJl dHVybiB0b1dlYkdyYXBoaWNzTGF5ZXIocGFyZW50KCkpLT5zZWxmT3JBbmNlc3Rvckhhc0FjdGl2 ZVRyYW5zZm9ybUFuaW1hdGlvbnMoKTsKKyAgICBpZiAoIW1fbGF5ZXJUcmFuc2Zvcm0uY29tYmlu ZWQoKS5pc0FmZmluZSgpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIHJldHVybiBmYWxz ZTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBv cnQvV2ViR3JhcGhpY3NMYXllci5oIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJHcmFwaGljc0xheWVyLmgKaW5kZXggMGNhNWFhNTRhZjJmZTViZjBlZDQwMjBk ZmUzMGJhODUxOWExMmExNy4uZmQ5YzE3NjEzMmQyOGQ3ODE3MjM0OGUwNmU3NjRiODA0MDgxNWM2 OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9X ZWJHcmFwaGljc0xheWVyLmgKKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3Jl U3VwcG9ydC9XZWJHcmFwaGljc0xheWVyLmgKQEAgLTE1OCwxMCArMTU4LDEyIEBAIHByaXZhdGU6 CiAgICAgdm9pZCBjcmVhdGVCYWNraW5nU3RvcmUoKTsKICAgICBIYXNoU2V0PFN0cmluZz4gbV90 cmFuc2Zvcm1BbmltYXRpb25zOwogCi0gICAgYm9vbCBzZWxmT3JBbmNlc3Rvckhhc0FjdGl2ZVRy YW5zZm9ybUFuaW1hdGlvbnMoKSBjb25zdDsKLQogI2lmIFVTRShUSUxFRF9CQUNLSU5HX1NUT1JF KQorICAgIGJvb2wgc2VsZk9yQW5jZXN0b3JIYXZlTm9uQWZmaW5lVHJhbnNmb3JtcygpOworICAg IGJvb2wgc2hvdWxkVXNlVGlsZWRCYWNraW5nU3RvcmUoKTsKKyAgICB2b2lkIGFkanVzdENvbnRl bnRzU2NhbGUoKTsKICAgICB2b2lkIGNvbXB1dGVUcmFuc2Zvcm1lZFZpc2libGVSZWN0KCk7Cisg ICAgZmxvYXQgZWZmZWN0aXZlQ29udGVudHNTY2FsZSgpOwogCiAgICAgV2ViS2l0OjpXZWJHcmFw aGljc0xheWVyQ2xpZW50KiBtX3dlYkdyYXBoaWNzTGF5ZXJDbGllbnQ7CiAgICAgT3duUHRyPFdl YkNvcmU6OlRpbGVkQmFja2luZ1N0b3JlPiBtX21haW5CYWNraW5nU3RvcmU7Cg== 136254 2012-04-09 10:13:28 -0700 2012-04-09 13:01:42 -0700 Patch for landing bug-82523-20120409101326.patch text/plain 5805 noam U3VidmVyc2lvbiBSZXZpc2lvbjogMTEzNTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjc0YTMzMGVhNmE3MWVh NzdkNTdjMGI3ZGVlMDkyZDYyZTFlNGM1Yi4uMzI5NTlkMTdhYzQ2OGY2YWU0NDQ3NmU1YmU2N2Ex MTdmOWUyNGRiOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTAzLTI4ICBObydh bSBSb3NlbnRoYWwgIDxub2FtLnJvc2VudGhhbEBub2tpYS5jb20+CisKKyAgICAgICAgW1F0XVtX SzJdIERpc2FibGUgdGhlIGNvbnRlbnQtc2NhbGluZyBhbmQgdmlzaWJsZSBjb250ZW50cyByZWN0 IHdoZW4gdGhlIGxheWVyJ3MgdHJhbnNmb3JtIGlzIG5vdCBhZmZpbmUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyNTIzCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgS2VubmV0aCBSb2hkZSBDaHJpc3RpYW5zZW4uCisKKyAgICAgICAgQWx3YXlzIHVzZSBj b250ZW50c1NjYWxlIG9mIDEgYW5kIGEgZnVsbCB2aXNpYmxlQ29udGVudHNSZWN0IHdoZW4KKyAg ICAgICAgdGhlIGxheWVyJ3MgdHJhbnNmb3JtIGlzIG5vdCBhZmZpbmUuIFRoYXQncyBiZWNhdXNl IGxheWVyJ3Mgd2l0aAorICAgICAgICBjb21wbGV4IHRyYW5zZm9ybSB3b3VsZCBub3QgZ2FpbiBm cm9tIHRoZSBiZW5lZml0IG9mIGNvbnRlbnRzIHNjYWxpbmcsCisgICAgICAgIGFuZCBtaWdodCBh bHNvIGNyZWF0ZSB1bmV4cGVjdGVkIGxheWVyIGNvbnRlbnQgc2l6ZXMuCisKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6V2ViR3JhcGhpY3NMYXllcjo6Y3JlYXRlQmFja2luZ1N0b3JlKToKKyAgICAgICAg KFdlYkNvcmUpOgorICAgICAgICAoV2ViQ29yZTo6V2ViR3JhcGhpY3NMYXllcjo6dGlsZWRCYWNr aW5nU3RvcmVQYWludCk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHcmFwaGljc0xheWVyOjp0aWxl ZEJhY2tpbmdTdG9yZVBhaW50RW5kKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5 ZXI6OnRpbGVkQmFja2luZ1N0b3JlVmlzaWJsZVJlY3QpOgorICAgICAgICAoV2ViQ29yZTo6V2Vi R3JhcGhpY3NMYXllcjo6dXBkYXRlVGlsZSk6CisgICAgICAgIChXZWJDb3JlOjpXZWJHcmFwaGlj c0xheWVyOjpyZW1vdmVUaWxlKToKKyAgICAgICAgKFdlYkNvcmU6OldlYkdyYXBoaWNzTGF5ZXI6 OnVwZGF0ZUNvbnRlbnRCdWZmZXJzKToKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBw b3J0L1dlYkdyYXBoaWNzTGF5ZXIuaDoKKyAgICAgICAgKFdlYkdyYXBoaWNzTGF5ZXIpOgorCiAy MDEyLTA0LTA3ICBQYXRyaWNrIEdhbnN0ZXJlciAgPHBhcm9nYUB3ZWJraXQub3JnPgogCiAgICAg ICAgIFtDTWFrZV0gQ2xlYW51cCBXVEYgaW5jbHVkZSBkaXJlY3RvcmllcwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJHcmFwaGljc0xheWVy LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViR3JhcGhp Y3NMYXllci5jcHAKaW5kZXggMGY2ZjgxM2Q4OTA5YjQwNmYwZGM5ZjhiODUxY2YzZDZhYzEyYWYw YS4uYjQzNjgxMzZjZDg5N2E0OTEwNWNhNjM0MDk0YmRiZTU4MTgzZDM0YSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJHcmFwaGljc0xheWVy LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkdy YXBoaWNzTGF5ZXIuY3BwCkBAIC00OTYsOCArNDk2LDIwIEBAIHZvaWQgV2ViR3JhcGhpY3NMYXll cjo6c2V0VmlzaWJsZUNvbnRlbnRSZWN0VHJhamVjdG9yeVZlY3Rvcihjb25zdCBGbG9hdFBvaW50 JiB0CiB2b2lkIFdlYkdyYXBoaWNzTGF5ZXI6OnNldENvbnRlbnRzU2NhbGUoZmxvYXQgc2NhbGUp CiB7CiAgICAgbV9jb250ZW50c1NjYWxlID0gc2NhbGU7CisgICAgYWRqdXN0Q29udGVudHNTY2Fs ZSgpOworfQorCitmbG9hdCBXZWJHcmFwaGljc0xheWVyOjplZmZlY3RpdmVDb250ZW50c1NjYWxl KCkKK3sKKyAgICByZXR1cm4gc2hvdWxkVXNlVGlsZWRCYWNraW5nU3RvcmUoKSA/IG1fY29udGVu dHNTY2FsZSA6IDE7Cit9CisKK3ZvaWQgV2ViR3JhcGhpY3NMYXllcjo6YWRqdXN0Q29udGVudHNT Y2FsZSgpCit7CisgICAgaWYgKCFkcmF3c0NvbnRlbnQoKSkKKyAgICAgICAgcmV0dXJuOwogCi0g ICAgaWYgKCFtX21haW5CYWNraW5nU3RvcmUgfHwgbV9tYWluQmFja2luZ1N0b3JlLT5jb250ZW50 c1NjYWxlKCkgPT0gc2NhbGUpCisgICAgaWYgKCFtX21haW5CYWNraW5nU3RvcmUgfHwgbV9tYWlu QmFja2luZ1N0b3JlLT5jb250ZW50c1NjYWxlKCkgPT0gZWZmZWN0aXZlQ29udGVudHNTY2FsZSgp KQogICAgICAgICByZXR1cm47CiAKICAgICAvLyBCZXR3ZWVuIGNyZWF0aW5nIHRoZSBuZXcgYmFj a2luZyBzdG9yZSBhbmQgcGFpbnRpbmcgdGhlIGNvbnRlbnQsCkBAIC01MTYsNyArNTI4LDcgQEAg dm9pZCBXZWJHcmFwaGljc0xheWVyOjpjcmVhdGVCYWNraW5nU3RvcmUoKQogewogICAgIG1fbWFp bkJhY2tpbmdTdG9yZSA9IGFkb3B0UHRyKG5ldyBUaWxlZEJhY2tpbmdTdG9yZSh0aGlzLCBUaWxl ZEJhY2tpbmdTdG9yZVJlbW90ZVRpbGVCYWNrZW5kOjpjcmVhdGUodGhpcykpKTsKICAgICBtX21h aW5CYWNraW5nU3RvcmUtPnNldFN1cHBvcnRzQWxwaGEoIWNvbnRlbnRzT3BhcXVlKCkpOwotICAg IG1fbWFpbkJhY2tpbmdTdG9yZS0+c2V0Q29udGVudHNTY2FsZShtX2NvbnRlbnRzU2NhbGUpOwor ICAgIG1fbWFpbkJhY2tpbmdTdG9yZS0+c2V0Q29udGVudHNTY2FsZShlZmZlY3RpdmVDb250ZW50 c1NjYWxlKCkpOwogfQogCiB2b2lkIFdlYkdyYXBoaWNzTGF5ZXI6OnRpbGVkQmFja2luZ1N0b3Jl UGFpbnQoR3JhcGhpY3NDb250ZXh0KiBjb250ZXh0LCBjb25zdCBJbnRSZWN0JiByZWN0KQpAQCAt NTQyLDExICs1NTQsMTYgQEAgSW50UmVjdCBXZWJHcmFwaGljc0xheWVyOjp0aWxlZEJhY2tpbmdT dG9yZUNvbnRlbnRzUmVjdCgpCiAgICAgcmV0dXJuIEludFJlY3QoMCwgMCwgc2l6ZSgpLndpZHRo KCksIHNpemUoKS5oZWlnaHQoKSk7CiB9CiAKK2Jvb2wgV2ViR3JhcGhpY3NMYXllcjo6c2hvdWxk VXNlVGlsZWRCYWNraW5nU3RvcmUoKQoreworICAgIHJldHVybiAhc2VsZk9yQW5jZXN0b3JIYXZl Tm9uQWZmaW5lVHJhbnNmb3JtcygpOworfQorCiBJbnRSZWN0IFdlYkdyYXBoaWNzTGF5ZXI6OnRp bGVkQmFja2luZ1N0b3JlVmlzaWJsZVJlY3QoKQogewogICAgIC8vIElmIHRoaXMgbGF5ZXIgaXMg cGFydCBvZiBhbiBhY3RpdmUgdHJhbnNmb3JtIGFuaW1hdGlvbiwgdGhlIHZpc2libGUgcmVjdCBt aWdodCBjaGFuZ2UsCiAgICAgLy8gc28gd2UgcmF0aGVyIHJlbmRlciB0aGUgd2hvbGUgbGF5ZXIg dW50aWwgc29tZSBiZXR0ZXIgb3B0aW1pemF0aW9uIGlzIGF2YWlsYWJsZS4KLSAgICBpZiAoc2Vs Zk9yQW5jZXN0b3JIYXNBY3RpdmVUcmFuc2Zvcm1BbmltYXRpb25zKCkpCisgICAgaWYgKCFzaG91 bGRVc2VUaWxlZEJhY2tpbmdTdG9yZSgpKQogICAgICAgICByZXR1cm4gdGlsZWRCYWNraW5nU3Rv cmVDb250ZW50c1JlY3QoKTsKIAogICAgIC8vIE5vbi1pbnZlcnRpYmxlIGxheWVycyBhcmUgbm90 IHZpc2libGUuCkBAIC01NjIsOCArNTc5LDggQEAgSW50UmVjdCBXZWJHcmFwaGljc0xheWVyOjp0 aWxlZEJhY2tpbmdTdG9yZVZpc2libGVSZWN0KCkKIENvbG9yIFdlYkdyYXBoaWNzTGF5ZXI6OnRp bGVkQmFja2luZ1N0b3JlQmFja2dyb3VuZENvbG9yKCkgY29uc3QKIHsKICAgICByZXR1cm4gY29u dGVudHNPcGFxdWUoKSA/IENvbG9yOjp3aGl0ZSA6IENvbG9yOjp0cmFuc3BhcmVudDsKLQogfQor CiB2b2lkIFdlYkdyYXBoaWNzTGF5ZXI6OmNyZWF0ZVRpbGUoaW50IHRpbGVJRCwgY29uc3QgVXBk YXRlSW5mbyYgdXBkYXRlSW5mbykKIHsKICAgICBtX3dlYkdyYXBoaWNzTGF5ZXJDbGllbnQtPmNy ZWF0ZVRpbGUoaWQoKSwgdGlsZUlELCB1cGRhdGVJbmZvKTsKQEAgLTY1Niw2ICs2NzMsNyBAQCB2 b2lkIFdlYkdyYXBoaWNzTGF5ZXI6OmNvbXB1dGVUcmFuc2Zvcm1lZFZpc2libGVSZWN0KCkKIAog ICAgIC8vIFRoZSBjb21iaW5lZCB0cmFuc2Zvcm0gd2lsbCBiZSB1c2VkIGluIHRpbGVkQmFja2lu Z1N0b3JlVmlzaWJsZVJlY3QuCiAgICAgYWRqdXN0VmlzaWJsZVJlY3QoKTsKKyAgICBhZGp1c3RD b250ZW50c1NjYWxlKCk7CiB9CiAjZW5kaWYKIApAQCAtNjY5LDEzICs2ODcsMTMgQEAgdm9pZCBX ZWJHcmFwaGljc0xheWVyOjppbml0RmFjdG9yeSgpCiAgICAgR3JhcGhpY3NMYXllcjo6c2V0R3Jh cGhpY3NMYXllckZhY3RvcnkoY3JlYXRlV2ViR3JhcGhpY3NMYXllcik7CiB9CiAKLWJvb2wgV2Vi R3JhcGhpY3NMYXllcjo6c2VsZk9yQW5jZXN0b3JIYXNBY3RpdmVUcmFuc2Zvcm1BbmltYXRpb25z KCkgY29uc3QKK2Jvb2wgV2ViR3JhcGhpY3NMYXllcjo6c2VsZk9yQW5jZXN0b3JIYXZlTm9uQWZm aW5lVHJhbnNmb3JtcygpCiB7CiAgICAgaWYgKCFtX3RyYW5zZm9ybUFuaW1hdGlvbnMuaXNFbXB0 eSgpKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAgIGlmIChwYXJlbnQoKSkKLSAgICAgICAg cmV0dXJuIHRvV2ViR3JhcGhpY3NMYXllcihwYXJlbnQoKSktPnNlbGZPckFuY2VzdG9ySGFzQWN0 aXZlVHJhbnNmb3JtQW5pbWF0aW9ucygpOworICAgIGlmICghbV9sYXllclRyYW5zZm9ybS5jb21i aW5lZCgpLmlzQWZmaW5lKCkpCisgICAgICAgIHJldHVybiB0cnVlOwogCiAgICAgcmV0dXJuIGZh bHNlOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJDb3JlU3Vw cG9ydC9XZWJHcmFwaGljc0xheWVyLmggYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNv cmVTdXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuaAppbmRleCA1NDNjNDY1MGNhODk5YWQwNzY2ZmJh YWJkOWE2NzhjODdhNTE5MTJlLi5lY2RmMzcxOWRlZWZlMTQzNWFiYWIyZjM1MzkxOWM3MjMwNGUx NjliIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0 L1dlYkdyYXBoaWNzTGF5ZXIuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYkNv cmVTdXBwb3J0L1dlYkdyYXBoaWNzTGF5ZXIuaApAQCAtMTU5LDEwICsxNTksMTIgQEAgcHJpdmF0 ZToKICAgICB2b2lkIGNyZWF0ZUJhY2tpbmdTdG9yZSgpOwogICAgIEhhc2hTZXQ8U3RyaW5nPiBt X3RyYW5zZm9ybUFuaW1hdGlvbnM7CiAKLSAgICBib29sIHNlbGZPckFuY2VzdG9ySGFzQWN0aXZl VHJhbnNmb3JtQW5pbWF0aW9ucygpIGNvbnN0OwotCiAjaWYgVVNFKFRJTEVEX0JBQ0tJTkdfU1RP UkUpCisgICAgYm9vbCBzZWxmT3JBbmNlc3RvckhhdmVOb25BZmZpbmVUcmFuc2Zvcm1zKCk7Cisg ICAgYm9vbCBzaG91bGRVc2VUaWxlZEJhY2tpbmdTdG9yZSgpOworICAgIHZvaWQgYWRqdXN0Q29u dGVudHNTY2FsZSgpOwogICAgIHZvaWQgY29tcHV0ZVRyYW5zZm9ybWVkVmlzaWJsZVJlY3QoKTsK KyAgICBmbG9hdCBlZmZlY3RpdmVDb250ZW50c1NjYWxlKCk7CiAKICAgICBXZWJLaXQ6OldlYkdy YXBoaWNzTGF5ZXJDbGllbnQqIG1fd2ViR3JhcGhpY3NMYXllckNsaWVudDsKICAgICBPd25QdHI8 V2ViQ29yZTo6VGlsZWRCYWNraW5nU3RvcmU+IG1fbWFpbkJhY2tpbmdTdG9yZTsK