176260 2017-09-01 17:39:42 -0700 REGRESSION (r219145): Toggling layer borders on a static document no longer works immediately 2018-01-08 10:47:32 -0800 1 1 1 Unclassified WebKit CSS WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser webkit-unassigned commit-queue kling koivisto simon.fraser webkit-bug-importer oldest_to_newest 1344696 0 simon.fraser 2017-09-01 17:39:42 -0700 After r219145, toggling compositing layer borders, either via the Debug menu, or via the button in Web Inspector, no longer immediately hides or shows the layer borders. You have to reload the page, or trigger some other style recalc for the change to take effect. 1344698 1 webkit-bug-importer 2017-09-01 17:40:08 -0700 <rdar://problem/34219966> 1386698 2 330696 koivisto 2018-01-08 05:40:02 -0800 Created attachment 330696 patch 1386716 3 330701 koivisto 2018-01-08 06:49:58 -0800 Created attachment 330701 patch 1386739 4 330696 simon.fraser 2018-01-08 08:28:33 -0800 Comment on attachment 330696 patch I don't know if this i the right fix, and why it works. Layer borders are not painted; they are mapped to CA borders. And for layers with no backing store, setNeedsDisplay() is a no-op. 1386740 5 330701 simon.fraser 2018-01-08 08:29:28 -0800 Comment on attachment 330701 patch View in context: https://bugs.webkit.org/attachment.cgi?id=330701&action=review > Source/WebCore/rendering/RenderLayerCompositor.cpp:325 > + m_layerNeedsCompositingUpdate = true; Maybe we only need this part? 1386761 6 koivisto 2018-01-08 09:30:44 -0800 (In reply to Simon Fraser (smfr) from comment #5) > Comment on attachment 330701 [details] > patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=330701&action=review > > > Source/WebCore/rendering/RenderLayerCompositor.cpp:325 > > + m_layerNeedsCompositingUpdate = true; > > Maybe we only need this part? That's what I thought too but it doesn't work in MiniBrowser without also forcing paint. It is not clear to me what is supposed to make us paint. 1386762 7 koivisto 2018-01-08 09:31:51 -0800 Safari and layout test are fine without the forced paint so I can land just that too. 1386770 8 koivisto 2018-01-08 09:43:00 -0800 Actually Safari also needs forced paint to get repaint indicator right. Unlike borders that seems to be painted on top of the layer content. 1386777 9 330710 koivisto 2018-01-08 10:01:05 -0800 Created attachment 330710 patch 1386778 10 koivisto 2018-01-08 10:02:13 -0800 Limited the repaint to the main layer that shows the counter. 1386806 11 330710 commit-queue 2018-01-08 10:47:30 -0800 Comment on attachment 330710 patch Clearing flags on attachment: 330710 Committed r226521: <https://trac.webkit.org/changeset/226521> 1386807 12 commit-queue 2018-01-08 10:47:32 -0800 All reviewed patches have been landed. Closing bug. 330696 2018-01-08 05:40:02 -0800 2018-01-08 06:25:33 -0800 patch debug-borders-paint-3.patch text/plain 1483 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNjUwNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDE4LTAxLTA4ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMjE5MTQ1 KTogVG9nZ2xpbmcgbGF5ZXIgYm9yZGVycyBvbiBhIHN0YXRpYyBkb2N1bWVudCBubyBsb25nZXIg d29ya3MgaW1tZWRpYXRlbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE3NjI2MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzQyMTk5NjY+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gdGVzdCwgaW4g cHJpbmNpcGxlIGl0IGlzIGRvYWJsZSB3aXRoIGludGVybmFscy5zZXR0aW5ncyBidXQgSSBjb3Vs ZG4ndCBtYWtlIG9uZS4KKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNz TGF5ZXJDQS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzZXRMYXllckRlYnVnQm9yZGVyKToKKwor ICAgICAgICBUcmlnZ2VyIGRpc3BsYXkgc28gdGhlIGJvcmRlcnMgZ2V0IHBhaW50ZWQuIFRoaXMg aXMgb25seSBjYWxsZWQgd2hlbiB0aGUgaW5kaWNhdG9ycyBjaGFuZ2UuCisKIDIwMTgtMDEtMDgg IFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPiBhbmQgQ2FybG9zIEdhcmNpYSBD YW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dTdHJlYW1lcl0gdXNlIEZh c3RNYWxsb2MtYmFzZWQgR3N0QWxsb2NhdG9yCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHAJKHJldmlzaW9u IDIyNjIyNykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNz TGF5ZXJDQS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIzMzcsNiArMjMzNyw3IEBAIHN0YXRpYyB2 b2lkIHNldExheWVyRGVidWdCb3JkZXIoUGxhdGZvcm0KIHsKICAgICBsYXllci5zZXRCb3JkZXJD b2xvcihib3JkZXJDb2xvcik7CiAgICAgbGF5ZXIuc2V0Qm9yZGVyV2lkdGgoYm9yZGVyQ29sb3Iu aXNWYWxpZCgpID8gYm9yZGVyV2lkdGggOiAwKTsKKyAgICBsYXllci5zZXROZWVkc0Rpc3BsYXko KTsKIH0KIAogc3RhdGljIGNvbnN0IGZsb2F0IGNvbnRlbnRzTGF5ZXJCb3JkZXJXaWR0aCA9IDQ7 Cg== 330701 2018-01-08 06:49:58 -0800 2018-01-08 10:01:05 -0800 patch debug-borders-paint-4.patch text/plain 4587 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNjUxMCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDE4LTAxLTA4ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMjE5MTQ1 KTogVG9nZ2xpbmcgbGF5ZXIgYm9yZGVycyBvbiBhIHN0YXRpYyBkb2N1bWVudCBubyBsb25nZXIg d29ya3MgaW1tZWRpYXRlbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE3NjI2MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzQyMTk5NjY+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogY29tcG9z aXRpbmcvZGVidWctYm9yZGVycy1keW5hbWljLmh0bWwKKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzZXRMYXll ckRlYnVnQm9yZGVyKToKKworICAgICAgICBUcmlnZ2VyIGRpc3BsYXkgc28gdGhlIGJvcmRlcnMg Z2V0IHBhaW50ZWQuIFRoaXMgaGVscGVyIGlzIG9ubHkgY2FsbGVkIHdoZW4gdGhlIGluZGljYXRv cnMgY2hhbmdlLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9zaXRvci5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNhY2hlQWNjZWxl cmF0ZWRDb21wb3NpdGluZ0ZsYWdzKToKKworICAgICAgICAgICAgRW5zdXJlIHdlIGRvIGNvbXBv c2l0aW5nIHVwZGF0ZSBvbiBkZWJ1ZyBib3JkZXIgY2hhbmdlIGV2ZW4gd2hlbiB0aGVyZSBpcyBu byBsYXlvdXQuCisKIDIwMTgtMDEtMDggIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29t PgogCiAgICAgICAgIG5hdmlnYXRvci5vbkxpbmUgZG9lcyBub3Qgd29yayBpbnNpZGUgc2Vydmlj ZSB3b3JrZXJzCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFw aGljc0xheWVyQ0EuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHAJKHJldmlzaW9uIDIyNjIyNykKKysrIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHAJKHdvcmtp bmcgY29weSkKQEAgLTIzMzcsNiArMjMzNyw3IEBAIHN0YXRpYyB2b2lkIHNldExheWVyRGVidWdC b3JkZXIoUGxhdGZvcm0KIHsKICAgICBsYXllci5zZXRCb3JkZXJDb2xvcihib3JkZXJDb2xvcik7 CiAgICAgbGF5ZXIuc2V0Qm9yZGVyV2lkdGgoYm9yZGVyQ29sb3IuaXNWYWxpZCgpID8gYm9yZGVy V2lkdGggOiAwKTsKKyAgICBsYXllci5zZXROZWVkc0Rpc3BsYXkoKTsKIH0KIAogc3RhdGljIGNv bnN0IGZsb2F0IGNvbnRlbnRzTGF5ZXJCb3JkZXJXaWR0aCA9IDQ7CkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNwcAkocmV2aXNp b24gMjI2MjI3KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9z aXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMyMCw4ICszMjAsMTAgQEAgdm9pZCBSZW5kZXJM YXllckNvbXBvc2l0b3I6OmNhY2hlQWNjZWxlcgogICAgIGlmIChpc01haW5GcmFtZUNvbXBvc2l0 b3IoKSkKICAgICAgICAgZm9yY2VDb21wb3NpdGluZ01vZGUgPSBtX3JlbmRlclZpZXcuc2V0dGlu Z3MoKS5mb3JjZUNvbXBvc2l0aW5nTW9kZSgpICYmIGhhc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmc7 IAogICAgIAotICAgIGlmIChoYXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nICE9IG1faGFzQWNjZWxl cmF0ZWRDb21wb3NpdGluZyB8fCBzaG93RGVidWdCb3JkZXJzICE9IG1fc2hvd0RlYnVnQm9yZGVy cyB8fCBzaG93UmVwYWludENvdW50ZXIgIT0gbV9zaG93UmVwYWludENvdW50ZXIgfHwgZm9yY2VD b21wb3NpdGluZ01vZGUgIT0gbV9mb3JjZUNvbXBvc2l0aW5nTW9kZSkKKyAgICBpZiAoaGFzQWNj ZWxlcmF0ZWRDb21wb3NpdGluZyAhPSBtX2hhc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmcgfHwgc2hv d0RlYnVnQm9yZGVycyAhPSBtX3Nob3dEZWJ1Z0JvcmRlcnMgfHwgc2hvd1JlcGFpbnRDb3VudGVy ICE9IG1fc2hvd1JlcGFpbnRDb3VudGVyIHx8IGZvcmNlQ29tcG9zaXRpbmdNb2RlICE9IG1fZm9y Y2VDb21wb3NpdGluZ01vZGUpIHsKICAgICAgICAgc2V0Q29tcG9zaXRpbmdMYXllcnNOZWVkUmVi dWlsZCgpOworICAgICAgICBtX2xheWVyTmVlZHNDb21wb3NpdGluZ1VwZGF0ZSA9IHRydWU7Cisg ICAgfQogCiAgICAgYm9vbCBkZWJ1Z0JvcmRlcnNDaGFuZ2VkID0gbV9zaG93RGVidWdCb3JkZXJz ICE9IHNob3dEZWJ1Z0JvcmRlcnM7CiAgICAgbV9oYXNBY2NlbGVyYXRlZENvbXBvc2l0aW5nID0g aGFzQWNjZWxlcmF0ZWRDb21wb3NpdGluZzsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNjIyNykKKysr IExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE0IEBACisy MDE4LTAxLTA4ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBS RUdSRVNTSU9OIChyMjE5MTQ1KTogVG9nZ2xpbmcgbGF5ZXIgYm9yZGVycyBvbiBhIHN0YXRpYyBk b2N1bWVudCBubyBsb25nZXIgd29ya3MgaW1tZWRpYXRlbHkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NjI2MAorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vMzQyMTk5NjY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBjb21wb3NpdGluZy9kZWJ1Zy1ib3JkZXJzLWR5bmFtaWMtZXhwZWN0ZWQuaHRtbDog QWRkZWQuCisgICAgICAgICogY29tcG9zaXRpbmcvZGVidWctYm9yZGVycy1keW5hbWljLmh0bWw6 IEFkZGVkLgorCiAyMDE3LTEyLTIxICBSeWFuIEhhZGRhZCAgPHJ5YW5oYWRkYWRAYXBwbGUuY29t PgogCiAgICAgICAgIENvcnJlY3QgYSBUZXN0RXhwZWN0YXRpb25zIGVudHJ5IGFmdGVyIHIyMjYw NzQuCkluZGV4OiBMYXlvdXRUZXN0cy9jb21wb3NpdGluZy9kZWJ1Zy1ib3JkZXJzLWR5bmFtaWMt ZXhwZWN0ZWQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9jb21wb3NpdGluZy9kZWJ1 Zy1ib3JkZXJzLWR5bmFtaWMtZXhwZWN0ZWQuaHRtbAkobm9uZXhpc3RlbnQpCisrKyBMYXlvdXRU ZXN0cy9jb21wb3NpdGluZy9kZWJ1Zy1ib3JkZXJzLWR5bmFtaWMtZXhwZWN0ZWQuaHRtbAkod29y a2luZyBjb3B5KQpAQCAtMCwwICsxLDcgQEAKKzxzY3JpcHQ+CitpZiAod2luZG93LmludGVybmFs cykgeworICAgIGludGVybmFscy5zZXR0aW5ncy5zZXRTaG93UmVwYWludENvdW50ZXIodHJ1ZSk7 CisgICAgaW50ZXJuYWxzLnNldHRpbmdzLnNldFNob3dEZWJ1Z0JvcmRlcnModHJ1ZSk7Cit9Cis8 L3NjcmlwdD4KKzxkaXYgc3R5bGU9ImJvcmRlcjoycHggc29saWQgcmVkOyB3aWR0aDoxMDBweDsg aGVpZ2h0OjEwMHB4OyB3aWxsLWNoYW5nZTp0cmFuc2Zvcm0iPjwvZGl2PgpJbmRleDogTGF5b3V0 VGVzdHMvY29tcG9zaXRpbmcvZGVidWctYm9yZGVycy1keW5hbWljLmh0bWwKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvZGVidWctYm9yZGVycy1keW5hbWljLmh0bWwJKG5v bmV4aXN0ZW50KQorKysgTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvZGVidWctYm9yZGVycy1keW5h bWljLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw4IEBACis8ZGl2IHN0eWxlPSJib3Jk ZXI6MnB4IHNvbGlkIHJlZDsgd2lkdGg6MTAwcHg7IGhlaWdodDoxMDBweDsgd2lsbC1jaGFuZ2U6 dHJhbnNmb3JtIj48L2Rpdj4KKzxzY3JpcHQ+Citkb2N1bWVudC5ib2R5Lm9mZnNldExlZnQ7Citp ZiAod2luZG93LmludGVybmFscykgeworICAgIGludGVybmFscy5zZXR0aW5ncy5zZXRTaG93UmVw YWludENvdW50ZXIodHJ1ZSk7CisgICAgaW50ZXJuYWxzLnNldHRpbmdzLnNldFNob3dEZWJ1Z0Jv cmRlcnModHJ1ZSk7Cit9Cis8L3NjcmlwdD4K 330710 2018-01-08 10:01:05 -0800 2018-01-08 10:47:30 -0800 patch debug-borders-paint-5.patch text/plain 6315 koivisto SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyNjUxNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDE4LTAxLTA4ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMjE5MTQ1 KTogVG9nZ2xpbmcgbGF5ZXIgYm9yZGVycyBvbiBhIHN0YXRpYyBkb2N1bWVudCBubyBsb25nZXIg d29ya3MgaW1tZWRpYXRlbHkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE3NjI2MAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzQyMTk5NjY+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgT3B0aW1pemF0aW9u IHJldmVsZWQgYnVncyBpbiBkZWJ1ZyBpbmRpY2F0b3IgcGFpbnRpbmcuCisKKyAgICAgICAgVGVz dDogY29tcG9zaXRpbmcvZGVidWctYm9yZGVycy1keW5hbWljLmh0bWwKKworICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpHcmFwaGljc0xheWVyQ0E6OmNvbW1pdExheWVyQ2hhbmdlc0JlZm9yZVN1YmxheWVycyk6Cisg ICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ0E6OnVwZGF0ZURlYnVnSW5kaWNhdG9ycyk6 CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0xheWVyQ0E6OnVwZGF0ZURlYnVnQm9yZGVyKTog RGVsZXRlZC4KKworICAgICAgICAtIFJlbmFtZSB0byBpbmRpY2F0ZSB0aGlzIGlzIG5vdCBqdXN0 IGFib3V0IGRlYnVnIGJvcmRlcnMuCisgICAgICAgIC0gVHJpZ2dlciBkaXNwbGF5IHNvIHJlcGFp bnQgY291bnRlcnMgZ2V0IHBhaW50ZWQuIFRoaXMgaGVscGVyIGlzIG9ubHkgY2FsbGVkIHdoZW4g dGhlIGluZGljYXRvcnMgY2hhbmdlLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY2Ev R3JhcGhpY3NMYXllckNBLmg6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQ29tcG9z aXRvci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNhY2hl QWNjZWxlcmF0ZWRDb21wb3NpdGluZ0ZsYWdzKToKKworICAgICAgICBFbnN1cmUgd2UgZG8gY29t cG9zaXRpbmcgdXBkYXRlIG9uIGRlYnVnIGJvcmRlciBjaGFuZ2UgZXZlbiB3aGVuIHRoZXJlIGlz IG5vIGxheW91dC4KKwogMjAxOC0wMS0wOCAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29t PgogCiAgICAgICAgIFtSZW5kZXJUcmVlQnVpbGRlcl0gTW92ZSBSZW5kZXJCbG9jayBhZGRDaGls ZCBsb2dpYyB0byBSZW5kZXJUcmVlQnVpbGRlcgpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmNwcAo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGljc0xheWVyQ0EuY3BwCShyZXZpc2lv biAyMjYyMjcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jYS9HcmFwaGlj c0xheWVyQ0EuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNzkzLDcgKzE3OTMsNyBAQCB2b2lkIEdy YXBoaWNzTGF5ZXJDQTo6Y29tbWl0TGF5ZXJDaGFuZ2VzCiAgICAgICAgIHVwZGF0ZVN1cHBvcnRz U3VicGl4ZWxBbnRpYWxpYXNlZFRleHQoKTsKIAogICAgIGlmIChtX3VuY29tbWl0dGVkQ2hhbmdl cyAmIERlYnVnSW5kaWNhdG9yc0NoYW5nZWQpCi0gICAgICAgIHVwZGF0ZURlYnVnQm9yZGVyKCk7 CisgICAgICAgIHVwZGF0ZURlYnVnSW5kaWNhdG9ycygpOwogCiAgICAgaWYgKG1fdW5jb21taXR0 ZWRDaGFuZ2VzICYgQ3VzdG9tQXBwZWFyYW5jZUNoYW5nZWQpCiAgICAgICAgIHVwZGF0ZUN1c3Rv bUFwcGVhcmFuY2UoKTsKQEAgLTIzNTEsNyArMjM1MSw3IEBAIHN0YXRpYyBDb2xvciBjbG9uZUxh eWVyRGVidWdCb3JkZXJDb2xvcigKICAgICByZXR1cm4gc2hvd2luZ0JvcmRlcnMgPyBDb2xvcigy NTUsIDEyMiwgMjUxKSA6IENvbG9yKCk7CiB9CiAKLXZvaWQgR3JhcGhpY3NMYXllckNBOjp1cGRh dGVEZWJ1Z0JvcmRlcigpCit2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6dXBkYXRlRGVidWdJbmRpY2F0 b3JzKCkKIHsKICAgICBDb2xvciBib3JkZXJDb2xvcjsKICAgICBmbG9hdCB3aWR0aCA9IDA7CkBA IC0yMzYwLDYgKzIzNjAsOSBAQCB2b2lkIEdyYXBoaWNzTGF5ZXJDQTo6dXBkYXRlRGVidWdCb3Jk ZXIoCiAgICAgaWYgKHNob3dEZWJ1Z0JvcmRlcnMpCiAgICAgICAgIGdldERlYnVnQm9yZGVySW5m byhib3JkZXJDb2xvciwgd2lkdGgpOwogCisgICAgLy8gUGFpbnQgcmVwYWludCBjb3VudGVyLgor ICAgIG1fbGF5ZXItPnNldE5lZWRzRGlzcGxheSgpOworCiAgICAgc2V0TGF5ZXJEZWJ1Z0JvcmRl cigqbV9sYXllciwgYm9yZGVyQ29sb3IsIHdpZHRoKTsKICAgICBpZiAobV9jb250ZW50c0xheWVy KQogICAgICAgICBzZXRMYXllckRlYnVnQm9yZGVyKCptX2NvbnRlbnRzTGF5ZXIsIGNvbnRlbnRz TGF5ZXJEZWJ1Z0JvcmRlckNvbG9yKHNob3dEZWJ1Z0JvcmRlcnMpLCBjb250ZW50c0xheWVyQm9y ZGVyV2lkdGgpOwpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2EvR3Jh cGhpY3NMYXllckNBLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvY2EvR3JhcGhpY3NMYXllckNBLmgJKHJldmlzaW9uIDIyNjIyNykKKysrIFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhL0dyYXBoaWNzTGF5ZXJDQS5oCSh3b3JraW5nIGNv cHkpCkBAIC00MTQsNyArNDE0LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHVwZGF0ZUNvbnRlbnRz TmVlZHNEaXNwbGF5KCk7CiAgICAgdm9pZCB1cGRhdGVBY2NlbGVyYXRlc0RyYXdpbmcoKTsKICAg ICB2b2lkIHVwZGF0ZVN1cHBvcnRzU3VicGl4ZWxBbnRpYWxpYXNlZFRleHQoKTsKLSAgICB2b2lk IHVwZGF0ZURlYnVnQm9yZGVyKCk7CisgICAgdm9pZCB1cGRhdGVEZWJ1Z0luZGljYXRvcnMoKTsK ICAgICB2b2lkIHVwZGF0ZVRpbGVzKCk7CiAgICAgdm9pZCB1cGRhdGVDb250ZW50c1NjYWxlKGZs b2F0IHBhZ2VTY2FsZUZhY3Rvcik7CiAgICAgdm9pZCB1cGRhdGVDdXN0b21BcHBlYXJhbmNlKCk7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21wb3NpdG9yLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJDb21w b3NpdG9yLmNwcAkocmV2aXNpb24gMjI2MjI3KQorKysgU291cmNlL1dlYkNvcmUvcmVuZGVyaW5n L1JlbmRlckxheWVyQ29tcG9zaXRvci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMyMCw4ICszMjAs MTAgQEAgdm9pZCBSZW5kZXJMYXllckNvbXBvc2l0b3I6OmNhY2hlQWNjZWxlcgogICAgIGlmIChp c01haW5GcmFtZUNvbXBvc2l0b3IoKSkKICAgICAgICAgZm9yY2VDb21wb3NpdGluZ01vZGUgPSBt X3JlbmRlclZpZXcuc2V0dGluZ3MoKS5mb3JjZUNvbXBvc2l0aW5nTW9kZSgpICYmIGhhc0FjY2Vs ZXJhdGVkQ29tcG9zaXRpbmc7IAogICAgIAotICAgIGlmIChoYXNBY2NlbGVyYXRlZENvbXBvc2l0 aW5nICE9IG1faGFzQWNjZWxlcmF0ZWRDb21wb3NpdGluZyB8fCBzaG93RGVidWdCb3JkZXJzICE9 IG1fc2hvd0RlYnVnQm9yZGVycyB8fCBzaG93UmVwYWludENvdW50ZXIgIT0gbV9zaG93UmVwYWlu dENvdW50ZXIgfHwgZm9yY2VDb21wb3NpdGluZ01vZGUgIT0gbV9mb3JjZUNvbXBvc2l0aW5nTW9k ZSkKKyAgICBpZiAoaGFzQWNjZWxlcmF0ZWRDb21wb3NpdGluZyAhPSBtX2hhc0FjY2VsZXJhdGVk Q29tcG9zaXRpbmcgfHwgc2hvd0RlYnVnQm9yZGVycyAhPSBtX3Nob3dEZWJ1Z0JvcmRlcnMgfHwg c2hvd1JlcGFpbnRDb3VudGVyICE9IG1fc2hvd1JlcGFpbnRDb3VudGVyIHx8IGZvcmNlQ29tcG9z aXRpbmdNb2RlICE9IG1fZm9yY2VDb21wb3NpdGluZ01vZGUpIHsKICAgICAgICAgc2V0Q29tcG9z aXRpbmdMYXllcnNOZWVkUmVidWlsZCgpOworICAgICAgICBtX2xheWVyTmVlZHNDb21wb3NpdGlu Z1VwZGF0ZSA9IHRydWU7CisgICAgfQogCiAgICAgYm9vbCBkZWJ1Z0JvcmRlcnNDaGFuZ2VkID0g bV9zaG93RGVidWdCb3JkZXJzICE9IHNob3dEZWJ1Z0JvcmRlcnM7CiAgICAgbV9oYXNBY2NlbGVy YXRlZENvbXBvc2l0aW5nID0gaGFzQWNjZWxlcmF0ZWRDb21wb3NpdGluZzsKSW5kZXg6IExheW91 dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIyNjIyNykKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDE0IEBACisyMDE4LTAxLTA4ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxl LmNvbT4KKworICAgICAgICBSRUdSRVNTSU9OIChyMjE5MTQ1KTogVG9nZ2xpbmcgbGF5ZXIgYm9y ZGVycyBvbiBhIHN0YXRpYyBkb2N1bWVudCBubyBsb25nZXIgd29ya3MgaW1tZWRpYXRlbHkKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NjI2MAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vMzQyMTk5NjY+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBjb21wb3NpdGluZy9kZWJ1Zy1ib3JkZXJzLWR5bmFt aWMtZXhwZWN0ZWQuaHRtbDogQWRkZWQuCisgICAgICAgICogY29tcG9zaXRpbmcvZGVidWctYm9y ZGVycy1keW5hbWljLmh0bWw6IEFkZGVkLgorCiAyMDE3LTEyLTIxICBSeWFuIEhhZGRhZCAgPHJ5 YW5oYWRkYWRAYXBwbGUuY29tPgogCiAgICAgICAgIENvcnJlY3QgYSBUZXN0RXhwZWN0YXRpb25z IGVudHJ5IGFmdGVyIHIyMjYwNzQuCkluZGV4OiBMYXlvdXRUZXN0cy9jb21wb3NpdGluZy9kZWJ1 Zy1ib3JkZXJzLWR5bmFtaWMtZXhwZWN0ZWQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0 cy9jb21wb3NpdGluZy9kZWJ1Zy1ib3JkZXJzLWR5bmFtaWMtZXhwZWN0ZWQuaHRtbAkobm9uZXhp c3RlbnQpCisrKyBMYXlvdXRUZXN0cy9jb21wb3NpdGluZy9kZWJ1Zy1ib3JkZXJzLWR5bmFtaWMt ZXhwZWN0ZWQuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtMCwwICsxLDcgQEAKKzxzY3JpcHQ+Citp ZiAod2luZG93LmludGVybmFscykgeworICAgIGludGVybmFscy5zZXR0aW5ncy5zZXRTaG93UmVw YWludENvdW50ZXIodHJ1ZSk7CisgICAgaW50ZXJuYWxzLnNldHRpbmdzLnNldFNob3dEZWJ1Z0Jv cmRlcnModHJ1ZSk7Cit9Cis8L3NjcmlwdD4KKzxkaXYgc3R5bGU9ImJvcmRlcjoycHggc29saWQg cmVkOyB3aWR0aDoxMDBweDsgaGVpZ2h0OjEwMHB4OyB3aWxsLWNoYW5nZTp0cmFuc2Zvcm0iPjwv ZGl2PgpJbmRleDogTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvZGVidWctYm9yZGVycy1keW5hbWlj Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcvZGVidWctYm9yZGVy cy1keW5hbWljLmh0bWwJKG5vbmV4aXN0ZW50KQorKysgTGF5b3V0VGVzdHMvY29tcG9zaXRpbmcv ZGVidWctYm9yZGVycy1keW5hbWljLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSw4IEBA Cis8ZGl2IHN0eWxlPSJib3JkZXI6MnB4IHNvbGlkIHJlZDsgd2lkdGg6MTAwcHg7IGhlaWdodDox MDBweDsgd2lsbC1jaGFuZ2U6dHJhbnNmb3JtIj48L2Rpdj4KKzxzY3JpcHQ+Citkb2N1bWVudC5i b2R5Lm9mZnNldExlZnQ7CitpZiAod2luZG93LmludGVybmFscykgeworICAgIGludGVybmFscy5z ZXR0aW5ncy5zZXRTaG93UmVwYWludENvdW50ZXIodHJ1ZSk7CisgICAgaW50ZXJuYWxzLnNldHRp bmdzLnNldFNob3dEZWJ1Z0JvcmRlcnModHJ1ZSk7Cit9Cis8L3NjcmlwdD4K