63499 2011-06-27 17:51:31 -0700 Overlap map for compositing should ignore empty layers 2013-04-08 11:29:09 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 84630 1 enne enne enne jamesr klobag mitz simon.fraser thorton wangxianzhu webkit.review.bot oldest_to_newest 428508 0 enne 2011-06-27 17:51:31 -0700 Overlap map for compositing should ignore empty layers 428525 1 98833 enne 2011-06-27 18:05:40 -0700 Created attachment 98833 Patch 428531 2 enne 2011-06-27 18:07:45 -0700 While I'm looking at overlap issues, I might as well clean this tiny little wart too. As far as I can tell, there's no reason to expand the bounds of empty layers to be 1x1 in the overlap map. It just causes layers to be composited when they don't need to be. These layers should be skipped, as anything overlapping them shouldn't cause compositing. 428541 3 simon.fraser 2011-06-27 18:22:26 -0700 Did you do archaeology on this one? I know I added that for a reason. 428985 4 enne 2011-06-28 10:59:54 -0700 (In reply to comment #3) > Did you do archaeology on this one? I know I added that for a reason. It came from here: https://bugs.webkit.org/show_bug.cgi?id=34065. The test added with that patch continues to pass without any assertions, at least on Chromium Linux and Safari Snow Leopard. I still do not understand that bug fix. If the embed is empty, overlaps shouldn't be composited. If the embed is not empty, then (1,1) is probably the wrong size. 428996 5 simon.fraser 2011-06-28 11:06:55 -0700 (In reply to comment #4) > (In reply to comment #3) > > Did you do archaeology on this one? I know I added that for a reason. > > It came from here: https://bugs.webkit.org/show_bug.cgi?id=34065. The test added with that patch continues to pass without any assertions, at least on Chromium Linux and Safari Snow Leopard. > > I still do not understand that bug fix. If the embed is empty, overlaps shouldn't be composited. If the embed is not empty, then (1,1) is probably the wrong size. Ah, https://bugs.webkit.org/show_bug.cgi?id=34065#c4 tries to explain the issue. I would expect that changing this would cause the assertion to start firing again. 430033 6 enne 2011-06-29 17:41:03 -0700 (In reply to comment #5) > (In reply to comment #4) > > (In reply to comment #3) > > > Did you do archaeology on this one? I know I added that for a reason. > > > > It came from here: https://bugs.webkit.org/show_bug.cgi?id=34065. The test added with that patch continues to pass without any assertions, at least on Chromium Linux and Safari Snow Leopard. > > > > I still do not understand that bug fix. If the embed is empty, overlaps shouldn't be composited. If the embed is not empty, then (1,1) is probably the wrong size. > > Ah, https://bugs.webkit.org/show_bug.cgi?id=34065#c4 tries to explain the issue. I would expect that changing this would cause the assertion to start firing again. It doesn't start firing again with this change. The clip rects and roots for all layers in the second test case from bug 34065 are identical with and without this patch. The clip rects and roots for all layers in empty-embed-rects are also identical with and without this patch. 436733 7 enne 2011-07-13 15:59:01 -0700 smfr: I don't quite follow the explanation in that comment and how that particular fix solves the issue. If you think bug 34065 is still an issue, can you make a test case that fails? The test you submitted with that patch passes with and without the code that went with it right now. 525545 8 98833 simon.fraser 2011-12-21 13:53:33 -0800 Comment on attachment 98833 Patch r-, needs more investigation based on my comments. 525552 9 enne 2011-12-21 14:00:21 -0800 (In reply to comment #8) > (From update of attachment 98833 [details]) > r-, needs more investigation based on my comments. Are you saying that you're going to investigate this, or that I should? I've seen this overlap entry create a lot of extra unneeded layers on Google Maps. 571524 10 130302 enne 2012-03-05 23:12:03 -0800 Created attachment 130302 Rebased 571545 11 enne 2012-03-05 23:37:33 -0800 (In reply to comment #10) > Created an attachment (id=130302) [details] > Rebased smfr: I'd like to get this change landed. It continues to cause extra unnecessary layers to be created on a number of sites due to overlap. I feel like I've done a fair amount of investigation already on this bug. Removing these lines of code does not cause the assert to start triggering again in Chromium or in Safari. As I mentioned earlier, the clip rects and clip roots for both tests attached to bug 34065 are identical with and without this patch. If you believe this code is still useful and shouldn't be removed, can you give me any pointers to write a test case that would fail? It's hard to propose an alternate solution when all of the existing test cases continue to pass without this code. 572080 12 130302 simon.fraser 2012-03-06 12:55:04 -0800 Comment on attachment 130302 Rebased OK, let's land it and see if anything breaks. Keep an eye out for new assertions related to clip rects etc. 572209 13 130302 enne 2012-03-06 15:33:57 -0800 Comment on attachment 130302 Rebased Thanks, Simon. 572294 14 130302 webkit.review.bot 2012-03-06 17:06:09 -0800 Comment on attachment 130302 Rebased Clearing flags on attachment: 130302 Committed r109981: <http://trac.webkit.org/changeset/109981> 572295 15 webkit.review.bot 2012-03-06 17:06:16 -0800 All reviewed patches have been landed. Closing bug. 578783 16 wangxianzhu 2012-03-14 14:32:46 -0700 *** Bug 78943 has been marked as a duplicate of this bug. *** 607989 17 thorton 2012-04-23 13:49:06 -0700 It looks like this caused https://bugs.webkit.org/show_bug.cgi?id=84558; I'm going to roll it out for now. Keep this regression in mind when fixing the patch. 624750 18 enne 2012-05-15 17:07:47 -0700 (In reply to comment #17) > It looks like this caused https://bugs.webkit.org/show_bug.cgi?id=84558; I'm going to roll it out for now. Keep this regression in mind when fixing the patch. My patch changed which render layers became composited that just happened to unearth a repaint issue for one port on one platform. Reverting this patch is just papering over the real problem. smfr, timothy_horton: please make a smaller repro case so that this repainting problem can be fixed. My patch was fixing real issues with too many layers being created on certain sites and I'd like to re-land it and not be blocked by Safari Lion repainting bugs. 679831 19 enne 2012-07-26 15:25:37 -0700 (In reply to comment #18) > (In reply to comment #17) > > It looks like this caused https://bugs.webkit.org/show_bug.cgi?id=84558; I'm going to roll it out for now. Keep this regression in mind when fixing the patch. > > My patch changed which render layers became composited that just happened to unearth a repaint issue for one port on one platform. Reverting this patch is just papering over the real problem. > > smfr, timothy_horton: please make a smaller repro case so that this repainting problem can be fixed. My patch was fixing real issues with too many layers being created on certain sites and I'd like to re-land it and not be blocked by Safari Lion repainting bugs. smfr, thorton: Have you had a chance to investigate this bug and create a smaller repro case? I still believe that this is a repaint problem with Safari's canvas implementation only and would like to re-land this patch. 870969 20 enne 2013-04-08 11:29:09 -0700 smfr, thorton: If you want this patch, please feel free to land it yourself. I am marking this as WONTFIX based on the previous regression that it was rolled out for. 98833 2011-06-27 18:05:40 -0700 2012-03-05 23:11:52 -0800 Patch bug-63499-20110627180539.patch text/plain 5493 enne U3VidmVyc2lvbiBSZXZpc2lvbjogODk4MjcKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCA1MDc4NDFkNGU4MzNmZTNmMzg5N2Fh NmZkZTNlOGRlMGRiYmM5N2ZmLi45ZjQ3MjdhMjM3MmZlM2MzNjJkMWE5NjU0M2E3Mjk3OTg0ODVl MjUzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMDYtMjcgIEFkcmllbm5lIFdhbGtlciAg PGVubmVAZ29vZ2xlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBPdmVybGFwIG1hcCBmb3IgY29tcG9zaXRpbmcgc2hvdWxkIGlnbm9yZSBlbXB0 eSBsYXllcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTYzNDk5CisKKyAgICAgICAgKiBjb21wb3NpdGluZy9sYXllci1jcmVhdGlvbi9vdmVybGFwLWVt cHR5LWxheWVyLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogY29tcG9zaXRpbmcvbGF5 ZXItY3JlYXRpb24vb3ZlcmxhcC1lbXB0eS1sYXllci5odG1sOiBBZGRlZC4KKwogMjAxMS0wNi0y NyAgQWxleGFuZHJ1IENoaWN1bGl0YSAgPGFjaGljdUBhZG9iZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgT2phbiBWYWZhaS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2NvbXBvc2l0aW5n L2xheWVyLWNyZWF0aW9uL292ZXJsYXAtZW1wdHktbGF5ZXItZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvY29tcG9zaXRpbmcvbGF5ZXItY3JlYXRpb24vb3ZlcmxhcC1lbXB0eS1sYXllci1leHBl Y3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMC4uOWI1NDhjMmE3NTQyMGI0YWQ0OTZkY2ZiMzg5NWNlMGZlMzlh NzY0YQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0aW5nL2xheWVyLWNy ZWF0aW9uL292ZXJsYXAtZW1wdHktbGF5ZXItZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMjMgQEAK KyhHcmFwaGljc0xheWVyCisgIChib3VuZHMgODQyLjAwIDYwMC4wMCkKKyAgKGNoaWxkcmVuIDEK KyAgICAoR3JhcGhpY3NMYXllcgorICAgICAgKGJvdW5kcyA4NDIuMDAgNjAwLjAwKQorICAgICAg KGNoaWxkcmVuIDEKKyAgICAgICAgKEdyYXBoaWNzTGF5ZXIKKyAgICAgICAgICAocG9zaXRpb24g OC4wMCA4LjAwKQorICAgICAgICAgIChib3VuZHMgNzg0LjAwIDAuMDApCisgICAgICAgICAgKHRy YW5zZm9ybSBbMS4wMCAwLjAwIDAuMDAgMC4wMF0gWzAuMDAgMS4wMCAwLjAwIDAuMDBdIFswLjAw IDAuMDAgMS4wMCAwLjAwXSBbNTAuMDAgNTAuMDAgMC4wMCAxLjAwXSkKKyAgICAgICAgICAoY2hp bGRyZW4gMQorICAgICAgICAgICAgKEdyYXBoaWNzTGF5ZXIKKyAgICAgICAgICAgICAgKHBvc2l0 aW9uIDIwMC4wMCAyMDAuMDApCisgICAgICAgICAgICAgIChib3VuZHMgODAuMDAgODAuMDApCisg ICAgICAgICAgICAgIChkcmF3c0NvbnRlbnQgMSkKKyAgICAgICAgICAgICkKKyAgICAgICAgICAp CisgICAgICAgICkKKyAgICAgICkKKyAgICApCisgICkKKykKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvY29tcG9zaXRpbmcvbGF5ZXItY3JlYXRpb24vb3ZlcmxhcC1lbXB0eS1sYXllci5odG1s IGIvTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvbGF5ZXItY3JlYXRpb24vb3ZlcmxhcC1lbXB0eS1s YXllci5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjBmZTIwNDJlMWM4MzdhZDI5YjkyMDUyZDU5NWI0MjEzNzZl ODk2YTcKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9sYXllci1j cmVhdGlvbi9vdmVybGFwLWVtcHR5LWxheWVyLmh0bWwKQEAgLTAsMCArMSw1MSBAQAorPGh0bWw+ Cis8aGVhZD4KKzxzdHlsZT4KKyAgICBib2R5IHsKKyAgICAgICAgb3ZlcmZsb3c6IGhpZGRlbjsK KyAgICB9CisKKyAgICAjY29udGFpbmVyIHsKKyAgICAgICAgLXdlYmtpdC10cmFuc2Zvcm06IHRy YW5zbGF0ZSg1MHB4LCA1MHB4KTsKKyAgICB9CisKKyAgICAjY29tcG9zaXRlZCB7CisgICAgICAg IC13ZWJraXQtdHJhbnNmb3JtOnRyYW5zbGF0ZVooMCk7CisgICAgICAgIHBvc2l0aW9uOmFic29s dXRlOworICAgICAgICB0b3A6IDIwMHB4OworICAgICAgICBsZWZ0OiAyMDBweDsKKyAgICAgICAg d2lkdGg6IDgwcHg7CisgICAgICAgIGhlaWdodDogODBweDsKKyAgICAgICAgYmFja2dyb3VuZC1j b2xvcjogYmx1ZTsKKyAgICB9CisKKyAgICAjb3ZlcmxhcCB7CisgICAgICAgIHBvc2l0aW9uOiBh YnNvbHV0ZTsKKyAgICAgICAgdG9wOiAwcHg7CisgICAgICAgIGxlZnQ6IDBweDsKKyAgICAgICAg d2lkdGg6IDEwMHB4OworICAgICAgICBoZWlnaHQ6IDEwMHB4OworICAgICAgICBiYWNrZ3JvdW5k LWNvbG9yOiBibHVlOworICAgIH0KKzwvc3R5bGU+Cis8c2NyaXB0PgorICAgIGlmICh3aW5kb3cu bGF5b3V0VGVzdENvbnRyb2xsZXIpIHsKKyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVt cEFzVGV4dChmYWxzZSk7CisgICAgICAgIHdpbmRvdy5hZGRFdmVudExpc3RlbmVyKCdsb2FkJywg ZnVuY3Rpb24oKSB7CisgICAgICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgibGF5ZXJ0 cmVlIikuaW5uZXJUZXh0ID0gbGF5b3V0VGVzdENvbnRyb2xsZXIubGF5ZXJUcmVlQXNUZXh0KCk7 CisgICAgICAgIH0sIGZhbHNlKTsKKyAgICB9Cis8L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5Pgor ICAgIDxkaXYgaWQ9ImNvbnRhaW5lciI+CisgICAgICAgIDxkaXYgaWQ9ImNvbXBvc2l0ZWQiPjwv ZGl2PgorICAgIDwvZGl2PgorCisgICAgPCEtLSBUaGlzIG92ZXJsYXBzIGFsbCBvZiBjb250YWlu ZXIsIGJ1dCBub3QgdGhlIGNvbXBvc2l0ZWQgY2hpbGQuIC0tPgorICAgIDwhLS0gSXQgc2hvdWxk IG5vdCBnZXQgaXRzIG93biBjb21wb3NpdGVkIGxheWVyLiAtLT4KKyAgICA8ZGl2IGlkPSJvdmVy bGFwIj48L2Rpdj4KKworICAgIDxwcmUgaWQ9ImxheWVydHJlZSI+PC9wcmU+Cis8L2JvZHk+Cis8 L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cKaW5kZXggZTlkZjgyNzg1OWRhMjQzZWM1NjVjNWNiZDQxZTI0MzEyNzQ4 NWY5NS4uZTJiYjVmNjE5ZWFjYTI3MGEyOTNlYWVjMzEyZmM3M2IwMDcyZDQyYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE2IEBACisyMDExLTA2LTI3ICBBZHJpZW5uZSBXYWxrZXIgIDxlbm5lQGdv b2dsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgT3ZlcmxhcCBtYXAgZm9yIGNvbXBvc2l0aW5nIHNob3VsZCBpZ25vcmUgZW1wdHkgbGF5ZXJz CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzQ5OQor CisgICAgICAgIFRlc3Q6IGNvbXBvc2l0aW5nL2xheWVyLWNyZWF0aW9uL292ZXJsYXAtZW1wdHkt bGF5ZXIuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmFkZFRvT3Zlcmxh cE1hcCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNvbXB1dGVD b21wb3NpdGluZ1JlcXVpcmVtZW50cyk6CisKIDIwMTEtMDYtMjcgIEh5b3dvbiBLaW0gIDxodzEw MDgua2ltQHNhbXN1bmcuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcnRpbiBSb2JpbnNv bi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJMYXllckNvbXBv c2l0b3IuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRv ci5jcHAKaW5kZXggNDM5YTc0ZGUwZjMxZGM1ZTk4N2VlMjY4MWMyMDBkM2I0OTdmY2Y1Ny4uYjJh ZTRlMDE4ZjNkNTk5NzRkN2Q2YTc2NDA5M2FmZTM5ODg5ZjU4ZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAKQEAgLTU2MSwxMSAr NTYxLDEyIEBAIHZvaWQgUmVuZGVyTGF5ZXJDb21wb3NpdG9yOjphZGRUb092ZXJsYXBNYXAoT3Zl cmxhcE1hcCYgb3ZlcmxhcE1hcCwgUmVuZGVyTGF5ZXIqCiAgICAgaWYgKCFib3VuZHNDb21wdXRl ZCkgewogICAgICAgICBsYXllckJvdW5kcyA9IGxheWVyLT5yZW5kZXJlcigpLT5sb2NhbFRvQWJz b2x1dGVRdWFkKEZsb2F0UmVjdChsYXllci0+bG9jYWxCb3VuZGluZ0JveCgpKSkuZW5jbG9zaW5n Qm91bmRpbmdCb3goKTsKICAgICAgICAgLy8gRW1wdHkgcmVjdHMgbmV2ZXIgaW50ZXJzZWN0LCBi dXQgd2UgbmVlZCB0aGVtIHRvIGZvciB0aGUgcHVycG9zZXMgb2Ygb3ZlcmxhcCB0ZXN0aW5nLgot ICAgICAgICBpZiAobGF5ZXJCb3VuZHMuaXNFbXB0eSgpKQotICAgICAgICAgICAgbGF5ZXJCb3Vu ZHMuc2V0U2l6ZShJbnRTaXplKDEsIDEpKTsKICAgICAgICAgYm91bmRzQ29tcHV0ZWQgPSB0cnVl OwogICAgIH0KIAorICAgIGlmIChsYXllckJvdW5kcy5pc0VtcHR5KCkpCisgICAgICAgIHJldHVy bjsKKwogICAgIG92ZXJsYXBNYXAuYWRkKGxheWVyLCBsYXllckJvdW5kcyk7CiB9CiAKQEAgLTY0 Niw4ICs2NDcsNiBAQCB2b2lkIFJlbmRlckxheWVyQ29tcG9zaXRvcjo6Y29tcHV0ZUNvbXBvc2l0 aW5nUmVxdWlyZW1lbnRzKFJlbmRlckxheWVyKiBsYXllciwgTwogICAgICAgICAvLyBJZiB3ZSdy ZSB0ZXN0aW5nIGZvciBvdmVybGFwLCB3ZSBvbmx5IG5lZWQgdG8gY29tcG9zaXRlIGlmIHdlIG92 ZXJsYXAgc29tZXRoaW5nIHRoYXQgaXMgYWxyZWFkeSBjb21wb3NpdGVkLgogICAgICAgICBhYnNC b3VuZHMgPSBsYXllci0+cmVuZGVyZXIoKS0+bG9jYWxUb0Fic29sdXRlUXVhZChGbG9hdFJlY3Qo bGF5ZXItPmxvY2FsQm91bmRpbmdCb3goKSkpLmVuY2xvc2luZ0JvdW5kaW5nQm94KCk7CiAgICAg ICAgIC8vIEVtcHR5IHJlY3RzIG5ldmVyIGludGVyc2VjdCwgYnV0IHdlIG5lZWQgdGhlbSB0byBm b3IgdGhlIHB1cnBvc2VzIG9mIG92ZXJsYXAgdGVzdGluZy4KLSAgICAgICAgaWYgKGFic0JvdW5k cy5pc0VtcHR5KCkpCi0gICAgICAgICAgICBhYnNCb3VuZHMuc2V0U2l6ZShJbnRTaXplKDEsIDEp KTsKICAgICAgICAgaGF2ZUNvbXB1dGVkQm91bmRzID0gdHJ1ZTsKICAgICAgICAgbXVzdE92ZXJs YXBDb21wb3NpdGVkTGF5ZXJzID0gb3ZlcmxhcHNDb21wb3NpdGVkTGF5ZXJzKCpvdmVybGFwTWFw LCBhYnNCb3VuZHMpOwogICAgIH0K 130302 2012-03-05 23:12:03 -0800 2012-03-06 17:06:09 -0800 Rebased bug-63499-20120305231202.patch text/plain 5889 enne U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5ODUxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWNhZWU4NzE5ZTNhZmQy YzBlYWFiNmIwZGJiNTIyNDNhMzI4ZjI4ZC4uZmUyM2VlMjQyNzJjNGY4MGIyMTAyNGE5YzRmNzk1 NzBjYTM0YWI4YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE4IEBACiAyMDEyLTAzLTA1ICBBZHJp ZW5uZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CiAKKyAgICAgICAgT3ZlcmxhcCBtYXAgZm9y IGNvbXBvc2l0aW5nIHNob3VsZCBpZ25vcmUgZW1wdHkgbGF5ZXJzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzQ5OQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGNvbXBvc2l0aW5nL2xheWVyLWNy ZWF0aW9uL292ZXJsYXAtZW1wdHktbGF5ZXIuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1Jl bmRlckxheWVyQ29tcG9zaXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNv bXBvc2l0b3I6OmFkZFRvT3ZlcmxhcE1hcCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXll ckNvbXBvc2l0b3I6OmNvbXB1dGVDb21wb3NpdGluZ1JlcXVpcmVtZW50cyk6CisKKzIwMTItMDMt MDUgIEFkcmllbm5lIFdhbGtlciAgPGVubmVAZ29vZ2xlLmNvbT4KKwogICAgICAgICBDb21wb3Np dGluZyBvdmVybGFwIHRlc3RpbmcgY2FuIHRocm93IGxheWVycyBpbnRvIGNvbXBvc2l0aW5nIHdo ZW4gdGhleSBzaG91bGQgbm90IGJlLgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NTAxOTIKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAppbmRleCAwZDNjZjU2MzBhZjVlMzZkYzM1OTZhNTE5 ODIxYjg5MzYyODA5OTFlLi44ZDc3Y2QyOTQ3NjRiYjZiMDVmMWZmMmQ1ZmY1OTZlYTczOTYyMjY4 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3Np dG9yLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3Np dG9yLmNwcApAQCAtNjM4LDEyICs2MzgsMTIgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6 OmFkZFRvT3ZlcmxhcE1hcChPdmVybGFwTWFwJiBvdmVybGFwTWFwLCBSZW5kZXJMYXllcioKIAog ICAgIGlmICghYm91bmRzQ29tcHV0ZWQpIHsKICAgICAgICAgbGF5ZXJCb3VuZHMgPSBsYXllci0+ cmVuZGVyZXIoKS0+bG9jYWxUb0Fic29sdXRlUXVhZChGbG9hdFJlY3QobGF5ZXItPmxvY2FsQm91 bmRpbmdCb3goKSkpLmVuY2xvc2luZ0JvdW5kaW5nQm94KCk7Ci0gICAgICAgIC8vIEVtcHR5IHJl Y3RzIG5ldmVyIGludGVyc2VjdCwgYnV0IHdlIG5lZWQgdGhlbSB0byBmb3IgdGhlIHB1cnBvc2Vz IG9mIG92ZXJsYXAgdGVzdGluZy4KLSAgICAgICAgaWYgKGxheWVyQm91bmRzLmlzRW1wdHkoKSkK LSAgICAgICAgICAgIGxheWVyQm91bmRzLnNldFNpemUoSW50U2l6ZSgxLCAxKSk7CiAgICAgICAg IGJvdW5kc0NvbXB1dGVkID0gdHJ1ZTsKICAgICB9CiAKKyAgICBpZiAobGF5ZXJCb3VuZHMuaXNF bXB0eSgpKQorICAgICAgICByZXR1cm47CisKICAgICBJbnRSZWN0IGNsaXBSZWN0ID0gcGl4ZWxT bmFwcGVkSW50UmVjdChsYXllci0+YmFja2dyb3VuZENsaXBSZWN0KHJvb3RSZW5kZXJMYXllcigp LCAwLCB0cnVlKS5yZWN0KCkpOyAvLyBGSVhNRTogSW5jb3JyZWN0IGZvciBDU1MgcmVnaW9ucy4K ICAgICBjbGlwUmVjdC5zY2FsZShwYWdlU2NhbGVGYWN0b3IoKSk7CiAgICAgY2xpcFJlY3QuaW50 ZXJzZWN0KGxheWVyQm91bmRzKTsKQEAgLTcxNSw4ICs3MTUsNiBAQCB2b2lkIFJlbmRlckxheWVy Q29tcG9zaXRvcjo6Y29tcHV0ZUNvbXBvc2l0aW5nUmVxdWlyZW1lbnRzKFJlbmRlckxheWVyKiBs YXllciwgTwogICAgICAgICAvLyBJZiB3ZSdyZSB0ZXN0aW5nIGZvciBvdmVybGFwLCB3ZSBvbmx5 IG5lZWQgdG8gY29tcG9zaXRlIGlmIHdlIG92ZXJsYXAgc29tZXRoaW5nIHRoYXQgaXMgYWxyZWFk eSBjb21wb3NpdGVkLgogICAgICAgICBhYnNCb3VuZHMgPSBsYXllci0+cmVuZGVyZXIoKS0+bG9j YWxUb0Fic29sdXRlUXVhZChGbG9hdFJlY3QobGF5ZXItPmxvY2FsQm91bmRpbmdCb3goKSkpLmVu Y2xvc2luZ0JvdW5kaW5nQm94KCk7CiAgICAgICAgIC8vIEVtcHR5IHJlY3RzIG5ldmVyIGludGVy c2VjdCwgYnV0IHdlIG5lZWQgdGhlbSB0byBmb3IgdGhlIHB1cnBvc2VzIG9mIG92ZXJsYXAgdGVz dGluZy4KLSAgICAgICAgaWYgKGFic0JvdW5kcy5pc0VtcHR5KCkpCi0gICAgICAgICAgICBhYnNC b3VuZHMuc2V0U2l6ZShJbnRTaXplKDEsIDEpKTsKICAgICAgICAgaGF2ZUNvbXB1dGVkQm91bmRz ID0gdHJ1ZTsKICAgICAgICAgbXVzdE92ZXJsYXBDb21wb3NpdGVkTGF5ZXJzID0gb3ZlcmxhcE1h cC0+b3ZlcmxhcHNMYXllcnMoYWJzQm91bmRzKTsKICAgICB9CmRpZmYgLS1naXQgYS9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggM2M3NTk3ZGIzNjQ0 YmU5NTgzYjY0ZjFkZWFkODM1NjI0NjMyZGQ0Zi4uMjZlYjg4ZjdmMzljYmIwYTAwYjA0M2FhNzc3 YmJhZmM5MzY1YTUzNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xh eW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE1IEBACiAyMDEyLTAzLTA1ICBBZHJpZW5u ZSBXYWxrZXIgIDxlbm5lQGdvb2dsZS5jb20+CiAKKyAgICAgICAgT3ZlcmxhcCBtYXAgZm9yIGNv bXBvc2l0aW5nIHNob3VsZCBpZ25vcmUgZW1wdHkgbGF5ZXJzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02MzQ5OQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogY29tcG9zaXRpbmcvbGF5ZXItY3JlYXRpb24v b3ZlcmxhcC1lbXB0eS1sYXllci1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGNvbXBv c2l0aW5nL2xheWVyLWNyZWF0aW9uL292ZXJsYXAtZW1wdHktbGF5ZXIuaHRtbDogQWRkZWQuCisK KzIwMTItMDMtMDUgIEFkcmllbm5lIFdhbGtlciAgPGVubmVAZ29vZ2xlLmNvbT4KKwogICAgICAg ICBDb21wb3NpdGluZyBvdmVybGFwIHRlc3RpbmcgY2FuIHRocm93IGxheWVycyBpbnRvIGNvbXBv c2l0aW5nIHdoZW4gdGhleSBzaG91bGQgbm90IGJlLgogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTAxOTIKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv Y29tcG9zaXRpbmcvbGF5ZXItY3JlYXRpb24vb3ZlcmxhcC1lbXB0eS1sYXllci1leHBlY3RlZC50 eHQgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9sYXllci1jcmVhdGlvbi9vdmVybGFwLWVtcHR5 LWxheWVyLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi45YjU0OGMyYTc1NDIwYjRhZDQ5NmRjZmIz ODk1Y2UwZmUzOWE3NjRhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvY29tcG9zaXRp bmcvbGF5ZXItY3JlYXRpb24vb3ZlcmxhcC1lbXB0eS1sYXllci1leHBlY3RlZC50eHQKQEAgLTAs MCArMSwyMyBAQAorKEdyYXBoaWNzTGF5ZXIKKyAgKGJvdW5kcyA4NDIuMDAgNjAwLjAwKQorICAo Y2hpbGRyZW4gMQorICAgIChHcmFwaGljc0xheWVyCisgICAgICAoYm91bmRzIDg0Mi4wMCA2MDAu MDApCisgICAgICAoY2hpbGRyZW4gMQorICAgICAgICAoR3JhcGhpY3NMYXllcgorICAgICAgICAg IChwb3NpdGlvbiA4LjAwIDguMDApCisgICAgICAgICAgKGJvdW5kcyA3ODQuMDAgMC4wMCkKKyAg ICAgICAgICAodHJhbnNmb3JtIFsxLjAwIDAuMDAgMC4wMCAwLjAwXSBbMC4wMCAxLjAwIDAuMDAg MC4wMF0gWzAuMDAgMC4wMCAxLjAwIDAuMDBdIFs1MC4wMCA1MC4wMCAwLjAwIDEuMDBdKQorICAg ICAgICAgIChjaGlsZHJlbiAxCisgICAgICAgICAgICAoR3JhcGhpY3NMYXllcgorICAgICAgICAg ICAgICAocG9zaXRpb24gMjAwLjAwIDIwMC4wMCkKKyAgICAgICAgICAgICAgKGJvdW5kcyA4MC4w MCA4MC4wMCkKKyAgICAgICAgICAgICAgKGRyYXdzQ29udGVudCAxKQorICAgICAgICAgICAgKQor ICAgICAgICAgICkKKyAgICAgICAgKQorICAgICAgKQorICAgICkKKyAgKQorKQorCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9sYXllci1jcmVhdGlvbi9vdmVybGFwLWVtcHR5 LWxheWVyLmh0bWwgYi9MYXlvdXRUZXN0cy9jb21wb3NpdGluZy9sYXllci1jcmVhdGlvbi9vdmVy bGFwLWVtcHR5LWxheWVyLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMGZlMjA0MmUxYzgzN2FkMjliOTIwNTJk NTk1YjQyMTM3NmU4OTZhNwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2NvbXBvc2l0 aW5nL2xheWVyLWNyZWF0aW9uL292ZXJsYXAtZW1wdHktbGF5ZXIuaHRtbApAQCAtMCwwICsxLDUx IEBACis8aHRtbD4KKzxoZWFkPgorPHN0eWxlPgorICAgIGJvZHkgeworICAgICAgICBvdmVyZmxv dzogaGlkZGVuOworICAgIH0KKworICAgICNjb250YWluZXIgeworICAgICAgICAtd2Via2l0LXRy YW5zZm9ybTogdHJhbnNsYXRlKDUwcHgsIDUwcHgpOworICAgIH0KKworICAgICNjb21wb3NpdGVk IHsKKyAgICAgICAgLXdlYmtpdC10cmFuc2Zvcm06dHJhbnNsYXRlWigwKTsKKyAgICAgICAgcG9z aXRpb246YWJzb2x1dGU7CisgICAgICAgIHRvcDogMjAwcHg7CisgICAgICAgIGxlZnQ6IDIwMHB4 OworICAgICAgICB3aWR0aDogODBweDsKKyAgICAgICAgaGVpZ2h0OiA4MHB4OworICAgICAgICBi YWNrZ3JvdW5kLWNvbG9yOiBibHVlOworICAgIH0KKworICAgICNvdmVybGFwIHsKKyAgICAgICAg cG9zaXRpb246IGFic29sdXRlOworICAgICAgICB0b3A6IDBweDsKKyAgICAgICAgbGVmdDogMHB4 OworICAgICAgICB3aWR0aDogMTAwcHg7CisgICAgICAgIGhlaWdodDogMTAwcHg7CisgICAgICAg IGJhY2tncm91bmQtY29sb3I6IGJsdWU7CisgICAgfQorPC9zdHlsZT4KKzxzY3JpcHQ+CisgICAg aWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgeworICAgICAgICBsYXlvdXRUZXN0Q29u dHJvbGxlci5kdW1wQXNUZXh0KGZhbHNlKTsKKyAgICAgICAgd2luZG93LmFkZEV2ZW50TGlzdGVu ZXIoJ2xvYWQnLCBmdW5jdGlvbigpIHsKKyAgICAgICAgICAgIGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCJsYXllcnRyZWUiKS5pbm5lclRleHQgPSBsYXlvdXRUZXN0Q29udHJvbGxlci5sYXllclRy ZWVBc1RleHQoKTsKKyAgICAgICAgfSwgZmFsc2UpOworICAgIH0KKzwvc2NyaXB0PgorPC9oZWFk PgorPGJvZHk+CisgICAgPGRpdiBpZD0iY29udGFpbmVyIj4KKyAgICAgICAgPGRpdiBpZD0iY29t cG9zaXRlZCI+PC9kaXY+CisgICAgPC9kaXY+CisKKyAgICA8IS0tIFRoaXMgb3ZlcmxhcHMgYWxs IG9mIGNvbnRhaW5lciwgYnV0IG5vdCB0aGUgY29tcG9zaXRlZCBjaGlsZC4gLS0+CisgICAgPCEt LSBJdCBzaG91bGQgbm90IGdldCBpdHMgb3duIGNvbXBvc2l0ZWQgbGF5ZXIuIC0tPgorICAgIDxk aXYgaWQ9Im92ZXJsYXAiPjwvZGl2PgorCisgICAgPHByZSBpZD0ibGF5ZXJ0cmVlIj48L3ByZT4K KzwvYm9keT4KKzwvaHRtbD4K