117663 2013-06-14 16:04:26 -0700 [CSS Shapes] Consider bottom borders when calculating the position of the overflow 2013-06-17 13:25:43 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 89256 1 zoltan zoltan commit-queue esprehn+autocc glenn WebkitBugTracker oldest_to_newest 900691 0 zoltan 2013-06-14 16:04:26 -0700 We need to push the overflow below the content box, not below the border box. The behavior was correct for flow thread cases, but not for simple cases. I refactored the overflow handling to a new helper function. 900710 1 204750 zoltan 2013-06-14 17:14:21 -0700 Created attachment 204750 proposed patch 901134 2 204750 achicu 2013-06-17 11:55:25 -0700 Comment on attachment 204750 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=204750&action=review Looks good. > LayoutTests/ChangeLog:9 > + not below the border box. The behavior was correct for flow thread cases, but not for not flow thread cases. I refactored nit: "The behavior was correct for flow thread cases, but not for not flow thread cases." I'm not sure I follow this phrase :) > Source/WebCore/rendering/RenderBlockLineLayout.cpp:1657 > + if (lineOverFlowsFromShapeInside) nit: Let's keep the Overflow with small caps, just to be consistent with the function name. 901152 3 zoltan 2013-06-17 13:25:43 -0700 (In reply to comment #2) > nit: "The behavior was correct for flow thread cases, but not for not flow thread cases." I'm not sure I follow this phrase :) Fixed. > nit: Let's keep the Overflow with small caps, just to be consistent with the function name. Fixed. Thanks for the review. Landed in: http://trac.webkit.org/changeset/151652 204750 2013-06-14 17:14:21 -0700 2013-06-17 11:55:25 -0700 proposed patch overflow.patch text/plain 20561 zoltan ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA3NDNmMTI5Li41YmI1OTczIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTMtMDYt MTQgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0NTUyBT aGFwZXNdIENvbnNpZGVyIGJvdHRvbSBib3JkZXJzIHdoZW4gY2FsY3VsYXRpbmcgdGhlIHBvc2l0 aW9uIG9mIHRoZSBvdmVyZmxvdworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTE3NjYzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgV2hlbiB5b3UgaGF2ZSBhIHNoYXBlIGFuZCB0aGUgY29udGVudCBvdmVyZmxv d3MgZnJvbSB0aGUgc2hhcGUgd2UgbmVlZCB0byBwdXNoIHRoZSBvdmVyZmxvdyBiZWxvdyB0aGUg Y29udGVudCBib3gsCisgICAgICAgIG5vdCBiZWxvdyB0aGUgYm9yZGVyIGJveC4gVGhlIGJlaGF2 aW9yIHdhcyBjb3JyZWN0IGZvciBmbG93IHRocmVhZCBjYXNlcywgYnV0IG5vdCBmb3Igbm90IGZs b3cgdGhyZWFkIGNhc2VzLiBJIHJlZmFjdG9yZWQKKyAgICAgICAgdGhlIG92ZXJmbG93IGhhbmRs aW5nIHRvIGEgbmV3IGhlbHBlciBmdW5jdGlvbiBjYWxsZWQgcHVzaFNoYXBlQ29udGVudE92ZXJm bG93QmVsb3dUaGVDb250ZW50Qm94LiBOb3cgYm90aCB0aGUgZmxvdyB0aHJlYWQKKyAgICAgICAg YW5kIHRoZSBzaW1wbGUgb3ZlcmZsb3cgdXNlIHRoZSBzYW1lIGZ1bmN0aW9uLiBJIGFkZGVkIGEg bmV3IHRlc3QgYW5kIG1vZGlmaWVkIHRoZSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICAqIGZh c3QvZXhjbHVzaW9ucy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLWVtcHR5LWV4cGVjdGVkLmh0 bWw6CisgICAgICAgICogZmFzdC9leGNsdXNpb25zL3NoYXBlLWluc2lkZS9zaGFwZS1pbnNpZGUt b3ZlcmZsb3ctZml4ZWQtZGltZW5zaW9ucy1ibG9jay1jb250ZW50LWV4cGVjdGVkLmh0bWw6IENv cGllZCBmcm9tIExheW91dFRlc3RzL2Zhc3QvZXhjbHVzaW9ucy9zaGFwZS1pbnNpZGUvc2hhcGUt aW5zaWRlLW92ZXJmbG93LWZpeGVkLWRpbWVuc2lvbnMtZXhwZWN0ZWQuaHRtbC4KKyAgICAgICAg KiBmYXN0L2V4Y2x1c2lvbnMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lkZS1vdmVyZmxvdy1maXhl ZC1kaW1lbnNpb25zLWJsb2NrLWNvbnRlbnQuaHRtbDogQ29waWVkIGZyb20gTGF5b3V0VGVzdHMv ZmFzdC9leGNsdXNpb25zL3NoYXBlLWluc2lkZS9zaGFwZS1pbnNpZGUtb3ZlcmZsb3ctZml4ZWQt ZGltZW5zaW9ucy5odG1sLgorICAgICAgICAqIGZhc3QvZXhjbHVzaW9ucy9zaGFwZS1pbnNpZGUv c2hhcGUtaW5zaWRlLW92ZXJmbG93LWZpeGVkLWRpbWVuc2lvbnMtZXhwZWN0ZWQuaHRtbDoKKyAg ICAgICAgKiBmYXN0L2V4Y2x1c2lvbnMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lkZS1vdmVyZmxv dy1maXhlZC1kaW1lbnNpb25zLmh0bWw6CisgICAgICAgICogZmFzdC9yZWdpb25zL3NoYXBlLWlu c2lkZS9zaGFwZS1pbnNpZGUtb24tcmVnaW9ucy1ibG9jay1jb250ZW50LW92ZXJmbG93LW11bHRp cGxlLXNoYXBlcy1leHBlY3RlZC5odG1sOgorICAgICAgICAqIGZhc3QvcmVnaW9ucy9zaGFwZS1p bnNpZGUvc2hhcGUtaW5zaWRlLW9uLXJlZ2lvbnMtYmxvY2stY29udGVudC1vdmVyZmxvdy1tdWx0 aXBsZS1zaGFwZXMuaHRtbDoKKwogMjAxMy0wNi0xNCAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJs c29uQGFwcGxlLmNvbT4KIAogICAgICAgICBQb3RlbnRpYWwgdXNlLWFmdGVyLWZyZWUgd2l0aCBh biBldmVudCBmaXJlZCBhdCBhIEhUTUxNZWRpYUVsZW1lbnQgd2hpY2ggaXMgY3VycmVudGx5IGJl aW5nIGRlbGV0ZWQKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZXhjbHVzaW9ucy9zaGFw ZS1pbnNpZGUvc2hhcGUtaW5zaWRlLWVtcHR5LWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9m YXN0L2V4Y2x1c2lvbnMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lkZS1lbXB0eS1leHBlY3RlZC5o dG1sCmluZGV4IDBmNjE1ZGEuLmQyZjY2OTEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zhc3Qv ZXhjbHVzaW9ucy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLWVtcHR5LWV4cGVjdGVkLmh0bWwK KysrIGIvTGF5b3V0VGVzdHMvZmFzdC9leGNsdXNpb25zL3NoYXBlLWluc2lkZS9zaGFwZS1pbnNp ZGUtZW1wdHktZXhwZWN0ZWQuaHRtbApAQCAtMTQsNyArMTQsNyBAQAogICAgICAgICBib3JkZXI6 IHNvbGlkIGdyZWVuOwogICAgICAgICBib3gtc2l6aW5nOiBib3JkZXItYm94OwogICAgIH0KLSAg ICAjcmVjdGFuZ2xlcyBwIHsgbWFyZ2luLXRvcDogMzdweDsgfQorICAgICNyZWN0YW5nbGVzIHAg eyBtYXJnaW4tdG9wOiAzNHB4OyB9CiA8L3N0eWxlPgogPC9oZWFkPgogPGJvZHk+CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9mYXN0L2V4Y2x1c2lvbnMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lk ZS1vdmVyZmxvdy1maXhlZC1kaW1lbnNpb25zLWJsb2NrLWNvbnRlbnQtZXhwZWN0ZWQuaHRtbCBi L0xheW91dFRlc3RzL2Zhc3QvZXhjbHVzaW9ucy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLW92 ZXJmbG93LWZpeGVkLWRpbWVuc2lvbnMtYmxvY2stY29udGVudC1leHBlY3RlZC5odG1sCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmE5NjIzMDUKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9mYXN0L2V4Y2x1c2lvbnMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lkZS1v dmVyZmxvdy1maXhlZC1kaW1lbnNpb25zLWJsb2NrLWNvbnRlbnQtZXhwZWN0ZWQuaHRtbApAQCAt MCwwICsxLDQzIEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1sPgorPGhlYWQ+Cis8c3R5bGU+Cisj Y29udGFpbmVyIHsKKyAgICBmb250OiAyMHB4IEFoZW0sIHNhbnMtc2VyaWY7CisgICAgbGluZS1o ZWlnaHQ6IDIwcHg7CisgICAgYm9yZGVyOiAycHggc29saWQgYmx1ZTsKKyAgICBib3JkZXItYm90 dG9tOiAzMHB4IHNvbGlkIHllbGxvdzsKKyAgICBwb3NpdGlvbjogcmVsYXRpdmU7CisgICAgd2lk dGg6IDIwMHB4OworICAgIGhlaWdodDogMjAwcHg7CisgICAgbWFyZ2luLWJvdHRvbTogNjBweDsK K30KKyNib3JkZXIgeworICAgIHBvc2l0aW9uOiBhYnNvbHV0ZTsKKyAgICBtYXJnaW4tdG9wOiAt MnB4OworICAgIGxlZnQ6IDQ4cHg7CisgICAgd2lkdGg6IDEwMHB4OworICAgIGhlaWdodDogNjBw eDsKKyAgICBib3JkZXI6IDJweCBzb2xpZCBncmVlbjsKK30KKy5zcGFjZXIgeworICAgIHdpZHRo OiA1MHB4OworICAgIGhlaWdodDogNDBweDsKK30KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4K KyAgICA8ZGl2IGlkPSJjb250YWluZXIiPgorICAgICAgICA8ZGl2IGlkPSJib3JkZXIiPgorICAg ICAgICAgICAgWCBYIDxwPlggWCBYPC9wPgorICAgICAgICAgICAgPGRpdiBjbGFzcz0ic3BhY2Vy IiBzdHlsZT0iZmxvYXQ6bGVmdCI+PC9kaXY+CisgICAgICAgICAgICA8ZGl2IGNsYXNzPSJzcGFj ZXIiIHN0eWxlPSJmbG9hdDpyaWdodCI+PC9kaXY+CisgICAgICAgIDwvZGl2PgorICAgICAgICA8 ZGl2IHN0eWxlPSJwYWRkaW5nLXRvcDogMjAwcHg7Ij4KKyAgICAgICAgICAgIFggWCBYIFggWCBY IFggWCBYIFgKKyAgICAgICAgPC9kaXY+CisgICAgPC9kaXY+CisgICAgPHA+UmVxdWlyZXMgQWhl bSBmb250LiBUaGUgYmxvY2sgY29udGVudCBzaG91bGQgc3RhcnQgaW5zaWRlIHRoZSBncmVlbiBy ZWN0YW5nbGUgKHNoYXBlLWluc2lkZSkgYW5kIHRoZSBvdmVyZmxvdyBzaG91bGQgYmUgcHVzaGVk IGJlbG93IHRoZSBjb250ZW50IGJveC4gVGhlIG92ZXJmbG93IHNob3VsZCBzdGFydCB3aGVyZSB0 aGUgeWVsbG93IGJvdHRvbSBib3JkZXIgc3RhcnRzLiA8YnIvPgorICAgIDxwPkJ1ZyA8YSBocmVm PSJodHRwOi8vd2Via2l0Lm9yZy9iLzExNDUyNiI+MTE0NTI2PC9hPjogW0NTUyBFeGNsdXNpb25z XSBzaGFwZS1pbnNpZGUgb3ZlcmZsb3cgc2hvdWxkIGJlIHB1c2hlZCB0byB0aGUgb3V0c2lkZSBv ZiB0aGUgY29udGVudCBib3g8L3A+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9mYXN0L2V4Y2x1c2lvbnMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lkZS1vdmVyZmxv dy1maXhlZC1kaW1lbnNpb25zLWJsb2NrLWNvbnRlbnQuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qv ZXhjbHVzaW9ucy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLW92ZXJmbG93LWZpeGVkLWRpbWVu c2lvbnMtYmxvY2stY29udGVudC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAw MDAuLjRmZTZiNWMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2V4Y2x1c2lv bnMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lkZS1vdmVyZmxvdy1maXhlZC1kaW1lbnNpb25zLWJs b2NrLWNvbnRlbnQuaHRtbApAQCAtMCwwICsxLDQ0IEBACis8IURPQ1RZUEUgaHRtbD4KKzxodG1s PgorPGhlYWQ+Cis8c2NyaXB0PgorICAgIGlmICh3aW5kb3cuaW50ZXJuYWxzKQorICAgICAgICB3 aW5kb3cuaW50ZXJuYWxzLnNldHRpbmdzLnNldENTU1NoYXBlc0VuYWJsZWQodHJ1ZSk7Cis8L3Nj cmlwdD4KKzxzdHlsZT4KKyNjb250YWluZXIgeworICAgIGZvbnQ6IDIwcHggQWhlbSwgc2Fucy1z ZXJpZjsKKyAgICBsaW5lLWhlaWdodDogMjBweDsKKyAgICBib3JkZXI6IDJweCBzb2xpZCBibHVl OworICAgIGJvcmRlci1ib3R0b206IDMwcHggc29saWQgeWVsbG93OworICAgIHBvc2l0aW9uOiBy ZWxhdGl2ZTsKKyAgICB3aWR0aDogMjAwcHg7CisgICAgaGVpZ2h0OiAyMDBweDsKKyAgICBtYXJn aW4tYm90dG9tOiA2MHB4OworfQorI3NoYXBlLWluc2lkZSB7CisgICAgd2lkdGg6IDIwMHB4Owor ICAgIGhlaWdodDogMjAwcHg7CisgICAgLXdlYmtpdC1zaGFwZS1pbnNpZGU6IHJlY3RhbmdsZSg1 MHB4LCAwcHgsIDEwMHB4LCA2MHB4KTsKK30KKyNib3JkZXIgeworICAgIHBvc2l0aW9uOiBhYnNv bHV0ZTsKKyAgICBtYXJnaW4tdG9wOiAtMnB4OworICAgIGxlZnQ6IDQ4cHg7CisgICAgd2lkdGg6 IDEwMHB4OworICAgIGhlaWdodDogNjBweDsKKyAgICBib3JkZXI6IDJweCBzb2xpZCBncmVlbjsK K30KKzwvc3R5bGU+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8ZGl2IGlkPSJjb250YWluZXIiPgor ICAgICAgICA8ZGl2IGlkPSJib3JkZXIiPjwvZGl2PgorICAgICAgICA8ZGl2IGlkPSJzaGFwZS1p bnNpZGUiPgorICAgICAgICAgICAgWCBYIDxwPlggWCBYPC9wPiBYIFggWCBYIFggWCBYIFggWCBY CisgICAgICAgIDwvZGl2PgorICAgIDwvZGl2PgorICAgIDxwPlJlcXVpcmVzIEFoZW0gZm9udC4g VGhlIGJsb2NrIGNvbnRlbnQgc2hvdWxkIHN0YXJ0IGluc2lkZSB0aGUgZ3JlZW4gcmVjdGFuZ2xl IChzaGFwZS1pbnNpZGUpIGFuZCB0aGUgb3ZlcmZsb3cgc2hvdWxkIGJlIHB1c2hlZCBiZWxvdyB0 aGUgY29udGVudCBib3guIFRoZSBvdmVyZmxvdyBzaG91bGQgc3RhcnQgd2hlcmUgdGhlIHllbGxv dyBib3R0b20gYm9yZGVyIHN0YXJ0cy4gPGJyLz4KKyAgICA8cD5CdWcgPGEgaHJlZj0iaHR0cDov L3dlYmtpdC5vcmcvYi8xMTQ1MjYiPjExNDUyNjwvYT46IFtDU1MgRXhjbHVzaW9uc10gc2hhcGUt aW5zaWRlIG92ZXJmbG93IHNob3VsZCBiZSBwdXNoZWQgdG8gdGhlIG91dHNpZGUgb2YgdGhlIGNv bnRlbnQgYm94PC9wPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC9leGNsdXNpb25zL3NoYXBlLWluc2lkZS9zaGFwZS1pbnNpZGUtb3ZlcmZsb3ctZml4ZWQt ZGltZW5zaW9ucy1leHBlY3RlZC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9leGNsdXNpb25zL3No YXBlLWluc2lkZS9zaGFwZS1pbnNpZGUtb3ZlcmZsb3ctZml4ZWQtZGltZW5zaW9ucy1leHBlY3Rl ZC5odG1sCmluZGV4IDRiZjlmNjMuLmIyYmQ1ZTIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2Zh c3QvZXhjbHVzaW9ucy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLW92ZXJmbG93LWZpeGVkLWRp bWVuc2lvbnMtZXhwZWN0ZWQuaHRtbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2V4Y2x1c2lvbnMv c2hhcGUtaW5zaWRlL3NoYXBlLWluc2lkZS1vdmVyZmxvdy1maXhlZC1kaW1lbnNpb25zLWV4cGVj dGVkLmh0bWwKQEAgLTYsNiArNiw3IEBACiAgICAgZm9udDogMjBweCBBaGVtLCBzYW5zLXNlcmlm OwogICAgIGxpbmUtaGVpZ2h0OiAyMHB4OwogICAgIGJvcmRlcjogMnB4IHNvbGlkIGJsdWU7Cisg ICAgYm9yZGVyLWJvdHRvbTogMzBweCBzb2xpZCB5ZWxsb3c7CiAgICAgcG9zaXRpb246IHJlbGF0 aXZlOwogICAgIHdpZHRoOiAyMDBweDsKICAgICBoZWlnaHQ6IDIwMHB4OwpAQCAtMTMsNiArMTQs NyBAQAogfQogI2JvcmRlciB7CiAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgIG1hcmdpbi10 b3A6IC0ycHg7CiAgICAgbGVmdDogNDhweDsKICAgICB3aWR0aDogMTAwcHg7CiAgICAgaGVpZ2h0 OiA0MHB4OwpAQCAtMzYsNyArMzgsNyBAQAogICAgICAgICAgICAgWCBYIFggWCBYIFggWCBYIFgg WAogICAgICAgICA8L2Rpdj4KICAgICA8L2Rpdj4KLTxwPlJlcXVpcmVzIEFoZW0gZm9udC4gVGhl IGNvbnRlbnQgc2hvdWxkIHN0YXJ0IGluc2lkZSB0aGUgZ3JlZW4gcmVjdGFuZ2xlIChzaGFwZS1p bnNpZGUpIGFuZCB0aGUgb3ZlcmZsb3cgc2hvdWxkIGJlIHB1c2hlZCBiZWxvdyB0aGUgY29udGVu dCBib3ggKGNvbnRlbnQtYm94J3MgbWFyZ2luIGlzIGJsdWUpLiA8YnIvPgotPHA+QnVnIDxhIGhy ZWY9Imh0dHA6Ly93ZWJraXQub3JnL2IvMTE0NTI2Ij4xMTQ1MjY8L2E+OiBbQ1NTIEV4Y2x1c2lv bnNdIHNoYXBlLWluc2lkZSBvdmVyZmxvdyBzaG91bGQgYmUgcHVzaGVkIHRvIHRoZSBvdXRzaWRl IG9mIHRoZSBjb250ZW50IGJveDwvcD4KKyAgICA8cD5SZXF1aXJlcyBBaGVtIGZvbnQuIFRoZSBp bmxpbmUgY29udGVudCBzaG91bGQgc3RhcnQgaW5zaWRlIHRoZSBncmVlbiByZWN0YW5nbGUgKHNo YXBlLWluc2lkZSkgYW5kIHRoZSBvdmVyZmxvdyBzaG91bGQgYmUgcHVzaGVkIGJlbG93IHRoZSBj b250ZW50IGJveC4gVGhlIG92ZXJmbG93IHNob3VsZCBzdGFydCB3aGVyZSB0aGUgeWVsbG93IGJv dHRvbSBib3JkZXIgc3RhcnRzLiA8YnIvPgorICAgIDxwPkJ1ZyA8YSBocmVmPSJodHRwOi8vd2Vi a2l0Lm9yZy9iLzExNDUyNiI+MTE0NTI2PC9hPjogW0NTUyBFeGNsdXNpb25zXSBzaGFwZS1pbnNp ZGUgb3ZlcmZsb3cgc2hvdWxkIGJlIHB1c2hlZCB0byB0aGUgb3V0c2lkZSBvZiB0aGUgY29udGVu dCBib3g8L3A+CiA8L2JvZHk+CiA8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0 L2V4Y2x1c2lvbnMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lkZS1vdmVyZmxvdy1maXhlZC1kaW1l bnNpb25zLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2V4Y2x1c2lvbnMvc2hhcGUtaW5zaWRlL3No YXBlLWluc2lkZS1vdmVyZmxvdy1maXhlZC1kaW1lbnNpb25zLmh0bWwKaW5kZXggYjYxMzM3ZC4u MmI1ZjU2YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9leGNsdXNpb25zL3NoYXBlLWlu c2lkZS9zaGFwZS1pbnNpZGUtb3ZlcmZsb3ctZml4ZWQtZGltZW5zaW9ucy5odG1sCisrKyBiL0xh eW91dFRlc3RzL2Zhc3QvZXhjbHVzaW9ucy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLW92ZXJm bG93LWZpeGVkLWRpbWVuc2lvbnMuaHRtbApAQCAtMTAsMTkgKzEwLDIxIEBACiAgICAgZm9udDog MjBweCBBaGVtLCBzYW5zLXNlcmlmOwogICAgIGxpbmUtaGVpZ2h0OiAyMHB4OwogICAgIGJvcmRl cjogMnB4IHNvbGlkIGJsdWU7CisgICAgYm9yZGVyLWJvdHRvbTogMzBweCBzb2xpZCB5ZWxsb3c7 CiAgICAgcG9zaXRpb246IHJlbGF0aXZlOwogICAgIHdpZHRoOiAyMDBweDsKICAgICBoZWlnaHQ6 IDIwMHB4OwotICAgIC13ZWJraXQtc2hhcGUtaW5zaWRlOiByZWN0YW5nbGUoNTBweCwgMHB4LCAx MDBweCwgNDVweCk7CiAgICAgbWFyZ2luLWJvdHRvbTogNjBweDsKIH0KICNzaGFwZS1pbnNpZGUg ewogICAgIHdpZHRoOiAyMDBweDsKICAgICBoZWlnaHQ6IDIwMHB4OworICAgIGJvcmRlci1ib3R0 b206IDMwcHggc29saWQgeWVsbG93OwogICAgIC13ZWJraXQtc2hhcGUtaW5zaWRlOiByZWN0YW5n bGUoNTBweCwgMHB4LCAxMDBweCwgNTBweCk7CiB9CiAjYm9yZGVyIHsKICAgICBwb3NpdGlvbjog YWJzb2x1dGU7CisgICAgbWFyZ2luLXRvcDogLTJweDsKICAgICBsZWZ0OiA0OHB4OwogICAgIHdp ZHRoOiAxMDBweDsKICAgICBoZWlnaHQ6IDQwcHg7CkBAIC0zNyw3ICszOSw3IEBACiAgICAgICAg ICAgICBYIFggWCBYIFggWCBYIFggWCBYIFggWCBYIFggWCBYCiAgICAgICAgIDwvZGl2PgogICAg IDwvZGl2PgotICAgIDxwPlJlcXVpcmVzIEFoZW0gZm9udC4gVGhlIGNvbnRlbnQgc2hvdWxkIHN0 YXJ0IGluc2lkZSB0aGUgZ3JlZW4gcmVjdGFuZ2xlIChzaGFwZS1pbnNpZGUpIGFuZCB0aGUgb3Zl cmZsb3cgc2hvdWxkIGJlIHB1c2hlZCBiZWxvdyB0aGUgY29udGVudCBib3ggKGNvbnRlbnQtYm94 J3MgbWFyZ2luIGlzIGJsdWUpLiA8YnIvPgorICAgIDxwPlJlcXVpcmVzIEFoZW0gZm9udC4gVGhl IGlubGluZSBjb250ZW50IHNob3VsZCBzdGFydCBpbnNpZGUgdGhlIGdyZWVuIHJlY3RhbmdsZSAo c2hhcGUtaW5zaWRlKSBhbmQgdGhlIG92ZXJmbG93IHNob3VsZCBiZSBwdXNoZWQgYmVsb3cgdGhl IGNvbnRlbnQgYm94LiBUaGUgb3ZlcmZsb3cgc2hvdWxkIHN0YXJ0IHdoZXJlIHRoZSB5ZWxsb3cg Ym90dG9tIGJvcmRlciBzdGFydHMuIDxici8+CiAgICAgPHA+QnVnIDxhIGhyZWY9Imh0dHA6Ly93 ZWJraXQub3JnL2IvMTE0NTI2Ij4xMTQ1MjY8L2E+OiBbQ1NTIEV4Y2x1c2lvbnNdIHNoYXBlLWlu c2lkZSBvdmVyZmxvdyBzaG91bGQgYmUgcHVzaGVkIHRvIHRoZSBvdXRzaWRlIG9mIHRoZSBjb250 ZW50IGJveDwvcD4KIDwvYm9keT4KIDwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zh c3QvcmVnaW9ucy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLW9uLXJlZ2lvbnMtYmxvY2stY29u dGVudC1vdmVyZmxvdy1tdWx0aXBsZS1zaGFwZXMtZXhwZWN0ZWQuaHRtbCBiL0xheW91dFRlc3Rz L2Zhc3QvcmVnaW9ucy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLW9uLXJlZ2lvbnMtYmxvY2st Y29udGVudC1vdmVyZmxvdy1tdWx0aXBsZS1zaGFwZXMtZXhwZWN0ZWQuaHRtbAppbmRleCAzY2Vm OTBiLi5iMWM5NmU5IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvc2hhcGUt aW5zaWRlL3NoYXBlLWluc2lkZS1vbi1yZWdpb25zLWJsb2NrLWNvbnRlbnQtb3ZlcmZsb3ctbXVs dGlwbGUtc2hhcGVzLWV4cGVjdGVkLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9yZWdpb25z L3NoYXBlLWluc2lkZS9zaGFwZS1pbnNpZGUtb24tcmVnaW9ucy1ibG9jay1jb250ZW50LW92ZXJm bG93LW11bHRpcGxlLXNoYXBlcy1leHBlY3RlZC5odG1sCkBAIC0xMSw3ICsxMSwxMCBAQAogICAg ICAgICAgICAgaGVpZ2h0OiAyMDBweDsKICAgICAgICAgICAgIGJvcmRlcjogMnB4IHNvbGlkIGdy ZWVuOwogICAgICAgICB9Ci0gICAgICAgICNyZWdpb24yIHsgbWFyZ2luLXRvcDogMTBweDsgfQor ICAgICAgICAjcmVnaW9uMiB7CisgICAgICAgICAgICBtYXJnaW4tdG9wOiAxMHB4OworICAgICAg ICAgICAgYm9yZGVyLWJvdHRvbTogMTBweCBzb2xpZCB5ZWxsb3c7CisgICAgICAgIH0KICAgICAg ICAgI2JvcmRlcjEgewogICAgICAgICAgICAgcG9zaXRpb246IGFic29sdXRlOwogICAgICAgICAg ICAgdG9wOiA1OHB4OwpAQCAtMzEsNyArMzQsNyBAQAogICAgICAgICAjb3ZlcmZsb3cgewogICAg ICAgICAgICAgd2lkdGg6IDIwMHB4OwogICAgICAgICAgICAgbWFyZ2luLWxlZnQ6IDJweDsKLSAg ICAgICAgICAgIG1hcmdpbi10b3A6IC0ycHg7CisgICAgICAgICAgICBtYXJnaW4tdG9wOiAtMTBw eDsKICAgICAgICAgfQogICAgIDwvc3R5bGU+CiA8L2hlYWQ+CkBAIC00Myw3ICs0Niw3IEBACiAg ICAgICAgIDxkaXYgaWQ9InJlZ2lvbjIiIGNsYXNzPSJyZWdpb24iPjwvZGl2PgogICAgICAgICA8 ZGl2IGlkPSJvdmVyZmxvdyI+WCBYIFggWCBYIFggWDwvZGl2PgogICAgIDwvZGl2PgotICAgIDxw IHN0eWxlPSJtYXJnaW4tdG9wOiAxMnB4OyI+UmVxdWlyZXMgQWhlbSBmb250LiBUaGVyZSBhcmUg dHdvIHJlZ2lvbnMgd2l0aCB0d28gcmFjdGFuZ2xlIHNoYXBlLWluc2lkZXMsIHRoZSBzaGFwZS1p bnNpZGVzIGFyZSBzbWFsbGVyIGFuZCBoYXZlIHRvcCBhbmQgbGVmdCBvZmZzZXRzIGluc2lkZSB0 aGUgY29udGVudCBib3guIFRoZSByZWN0YW5ndWxhciBzaGFwZXMgYm91bmRhcmllcyBhcmUgcmVw cmVzZW50ZWQgYnkgdGhlIGJsdWUgcmVjdGFuZ2xlcy4gVGhlIGJsb2NrIGNvbnRlbnQgc2hvdWxk IGZsb3cgaW5zaWRlIHRoZSBibHVlIHJhY3RhbmdsZXMsIHRoZSBvdmVyZmxvdyBzaG91bGQgYmUg cHVzaGVkIGRvd24gYmVsb3cgdGhlIGxhc3QgcmVnaW9uJ3MgY29udGVudCBib3guPC9wPgorICAg IDxwIHN0eWxlPSJtYXJnaW4tdG9wOiAyMHB4OyI+UmVxdWlyZXMgQWhlbSBmb250LiBUaGVyZSBh cmUgdHdvIHJlZ2lvbnMgd2l0aCB0d28gcmFjdGFuZ2xlIHNoYXBlLWluc2lkZXMsIHRoZSBzaGFw ZS1pbnNpZGVzIGFyZSBzbWFsbGVyIGFuZCBoYXZlIHRvcCBhbmQgbGVmdCBvZmZzZXRzIGluc2lk ZSB0aGUgY29udGVudCBib3guIFRoZSByZWN0YW5ndWxhciBzaGFwZXMgYm91bmRhcmllcyBhcmUg cmVwcmVzZW50ZWQgYnkgdGhlIGJsdWUgcmVjdGFuZ2xlcy4gVGhlIGJsb2NrIGNvbnRlbnQgc2hv dWxkIGZsb3cgaW5zaWRlIHRoZSBibHVlIHJhY3RhbmdsZXMsIHRoZSBvdmVyZmxvdyBzaG91bGQg YmUgcHVzaGVkIGRvd24gYmVsb3cgdGhlIGxhc3QgcmVnaW9uJ3MgY29udGVudCBib3gsIGl0IHNo b3VsZCBzdGFydCB3aGVyZSB0aGUgeWVsbG93IGJvcmRlciBzdGFydHMuPC9wPgogICAgIDxwPkJ1 ZyA8YSBocmVmPSJodHRwOi8vd2Via2l0Lm9yZy9iLzExNjI1MiI+MTE2MjUyPC9hPiBbQ1NTIFJl Z2lvbnNdW0NTUyBFeGNsdXNpb25zXSBzaGFwZS1pbnNpZGUgb24gcmVnaW9ucyBzaG91bGQgcmVz cGVjdCBwb3NpdGlvbmVkIHNoYXBlcyBhbmQgb3ZlcmZsb3c8L3A+CiA8L2JvZHk+CiA8L2h0bWw+ CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvc2hhcGUtaW5zaWRlL3NoYXBl LWluc2lkZS1vbi1yZWdpb25zLWJsb2NrLWNvbnRlbnQtb3ZlcmZsb3ctbXVsdGlwbGUtc2hhcGVz Lmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3JlZ2lvbnMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lk ZS1vbi1yZWdpb25zLWJsb2NrLWNvbnRlbnQtb3ZlcmZsb3ctbXVsdGlwbGUtc2hhcGVzLmh0bWwK aW5kZXggMTg1YjIzMy4uNzVmYmE5NyAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvZmFzdC9yZWdp b25zL3NoYXBlLWluc2lkZS9zaGFwZS1pbnNpZGUtb24tcmVnaW9ucy1ibG9jay1jb250ZW50LW92 ZXJmbG93LW11bHRpcGxlLXNoYXBlcy5odG1sCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvcmVnaW9u cy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLW9uLXJlZ2lvbnMtYmxvY2stY29udGVudC1vdmVy Zmxvdy1tdWx0aXBsZS1zaGFwZXMuaHRtbApAQCAtMjAsNiArMjAsNyBAQAogICAgICAgICAjcmVn aW9uMSB7IC13ZWJraXQtc2hhcGUtaW5zaWRlOiByZWN0YW5nbGUoNTBweCwgNTBweCwgMTAwcHgs IDEwMHB4KTsgfQogICAgICAgICAjcmVnaW9uMiB7CiAgICAgICAgICAgICBtYXJnaW4tdG9wOiAx MHB4OworICAgICAgICAgICAgYm9yZGVyLWJvdHRvbTogMTBweCBzb2xpZCB5ZWxsb3c7CiAgICAg ICAgICAgICAtd2Via2l0LXNoYXBlLWluc2lkZTogcmVjdGFuZ2xlKDI1cHgsIDUwcHgsIDE1MHB4 LCAxMDBweCk7CiAgICAgICAgIH0KICAgICAgICAgI2JvcmRlcjEgewpAQCAtNTEsNyArNTIsNyBA QAogICAgICAgICA8ZGl2IGlkPSJib3JkZXIyIj48L2Rpdj4KICAgICAgICAgPGRpdiBpZD0icmVn aW9uMiIgY2xhc3M9InJlZ2lvbiI+PC9kaXY+CiAgICAgPC9kaXY+Ci0gICAgPHAgc3R5bGU9Im1h cmdpbi10b3A6IDUwcHg7Ij5SZXF1aXJlcyBBaGVtIGZvbnQuIFRoZXJlIGFyZSB0d28gcmVnaW9u cyB3aXRoIHR3byByYWN0YW5nbGUgc2hhcGUtaW5zaWRlcywgdGhlIHNoYXBlLWluc2lkZXMgYXJl IHNtYWxsZXIgYW5kIGhhdmUgdG9wIGFuZCBsZWZ0IG9mZnNldHMgaW5zaWRlIHRoZSBjb250ZW50 IGJveC4gVGhlIHJlY3Rhbmd1bGFyIHNoYXBlcyBib3VuZGFyaWVzIGFyZSByZXByZXNlbnRlZCBi eSB0aGUgYmx1ZSByZWN0YW5nbGVzLiBUaGUgYmxvY2sgY29udGVudCBzaG91bGQgZmxvdyBpbnNp ZGUgdGhlIGJsdWUgcmFjdGFuZ2xlcywgdGhlIG92ZXJmbG93IHNob3VsZCBiZSBwdXNoZWQgZG93 biBiZWxvdyB0aGUgbGFzdCByZWdpb24ncyBjb250ZW50IGJveC48L3A+CisgICAgPHAgc3R5bGU9 Im1hcmdpbi10b3A6IDUwcHg7Ij5SZXF1aXJlcyBBaGVtIGZvbnQuIFRoZXJlIGFyZSB0d28gcmVn aW9ucyB3aXRoIHR3byByYWN0YW5nbGUgc2hhcGUtaW5zaWRlcywgdGhlIHNoYXBlLWluc2lkZXMg YXJlIHNtYWxsZXIgYW5kIGhhdmUgdG9wIGFuZCBsZWZ0IG9mZnNldHMgaW5zaWRlIHRoZSBjb250 ZW50IGJveC4gVGhlIHJlY3Rhbmd1bGFyIHNoYXBlcyBib3VuZGFyaWVzIGFyZSByZXByZXNlbnRl ZCBieSB0aGUgYmx1ZSByZWN0YW5nbGVzLiBUaGUgYmxvY2sgY29udGVudCBzaG91bGQgZmxvdyBp bnNpZGUgdGhlIGJsdWUgcmFjdGFuZ2xlcywgdGhlIG92ZXJmbG93IHNob3VsZCBiZSBwdXNoZWQg ZG93biBiZWxvdyB0aGUgbGFzdCByZWdpb24ncyBjb250ZW50IGJveCwgaXQgc2hvdWxkIHN0YXJ0 IHdoZXJlIHRoZSB5ZWxsb3cgYm9yZGVyIHN0YXJ0cy48L3A+CiAgICAgPHA+QnVnIDxhIGhyZWY9 Imh0dHA6Ly93ZWJraXQub3JnL2IvMTE2MjUyIj4xMTYyNTI8L2E+IFtDU1MgUmVnaW9uc11bQ1NT IEV4Y2x1c2lvbnNdIHNoYXBlLWluc2lkZSBvbiByZWdpb25zIHNob3VsZCByZXNwZWN0IHBvc2l0 aW9uZWQgc2hhcGVzIGFuZCBvdmVyZmxvdzwvcD4KIDwvYm9keT4KIDwvaHRtbD4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpp bmRleCAxNTAyMTQzLi5lMmRiZTMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMTMt MDYtMTQgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0NT UyBTaGFwZXNdIENvbnNpZGVyIGJvdHRvbSBib3JkZXJzIHdoZW4gY2FsY3VsYXRpbmcgdGhlIHBv c2l0aW9uIG9mIHRoZSBvdmVyZmxvdworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTE3NjYzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgV2hlbiB5b3UgaGF2ZSBhIHNoYXBlIGFuZCB0aGUgY29udGVudCBvdmVy Zmxvd3MgZnJvbSB0aGUgc2hhcGUgd2UgbmVlZCB0byBwdXNoIHRoZSBvdmVyZmxvdyBiZWxvdyB0 aGUgY29udGVudCBib3gsCisgICAgICAgIG5vdCBiZWxvdyB0aGUgYm9yZGVyIGJveC4gVGhlIGJl aGF2aW9yIHdhcyBjb3JyZWN0IGZvciBmbG93IHRocmVhZCBjYXNlcywgYnV0IG5vdCBmb3Igbm90 IGZsb3cgdGhyZWFkIGNhc2VzLiBJIHJlZmFjdG9yZWQKKyAgICAgICAgdGhlIG92ZXJmbG93IGhh bmRsaW5nIHRvIGEgbmV3IGhlbHBlciBmdW5jdGlvbiBjYWxsZWQgcHVzaFNoYXBlQ29udGVudE92 ZXJmbG93QmVsb3dUaGVDb250ZW50Qm94LiBOb3cgYm90aCB0aGUgZmxvdyB0aHJlYWQKKyAgICAg ICAgYW5kIHRoZSBzaW1wbGUgb3ZlcmZsb3cgdXNlIHRoZSBzYW1lIGZ1bmN0aW9uLiBJIGFkZGVk IGEgbmV3IHRlc3QgYW5kIG1vZGlmaWVkIHRoZSBleGlzdGluZyB0ZXN0cy4KKworICAgICAgICBU ZXN0OiBmYXN0L2V4Y2x1c2lvbnMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lkZS1vdmVyZmxvdy1m aXhlZC1kaW1lbnNpb25zLWJsb2NrLWNvbnRlbnQuaHRtbAorICAgICAgICBFeGlzdGluZyBvdmVy ZmxvdyB0ZXN0cyBhbHNvIG1vZGlmaWVkIHRvIHRlc3QgdGhlIGJlaGF2aW9yOgorICAgICAgICAg ICAgICBmYXN0L2V4Y2x1c2lvbnMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lkZS1lbXB0eS1leHBl Y3RlZC5odG1sCisgICAgICAgICAgICAgIGZhc3QvZXhjbHVzaW9ucy9zaGFwZS1pbnNpZGUvc2hh cGUtaW5zaWRlLW92ZXJmbG93LWZpeGVkLWRpbWVuc2lvbnMtYmxvY2stY29udGVudC1leHBlY3Rl ZC5odG1sCisgICAgICAgICAgICAgIGZhc3QvZXhjbHVzaW9ucy9zaGFwZS1pbnNpZGUvc2hhcGUt aW5zaWRlLW92ZXJmbG93LWZpeGVkLWRpbWVuc2lvbnMtYmxvY2stY29udGVudC5odG1sCisgICAg ICAgICAgICAgIGZhc3QvZXhjbHVzaW9ucy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLW92ZXJm bG93LWZpeGVkLWRpbWVuc2lvbnMtZXhwZWN0ZWQuaHRtbAorICAgICAgICAgICAgICBmYXN0L2V4 Y2x1c2lvbnMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lkZS1vdmVyZmxvdy1maXhlZC1kaW1lbnNp b25zLmh0bWwKKyAgICAgICAgICAgICAgZmFzdC9yZWdpb25zL3NoYXBlLWluc2lkZS9zaGFwZS1p bnNpZGUtb24tcmVnaW9ucy1ibG9jay1jb250ZW50LW92ZXJmbG93LW11bHRpcGxlLXNoYXBlcy1l eHBlY3RlZC5odG1sCisgICAgICAgICAgICAgIGZhc3QvcmVnaW9ucy9zaGFwZS1pbnNpZGUvc2hh cGUtaW5zaWRlLW9uLXJlZ2lvbnMtYmxvY2stY29udGVudC1vdmVyZmxvdy1tdWx0aXBsZS1zaGFw ZXMuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpwdXNoU2hhcGVDb250ZW50T3ZlcmZsb3dCZWxvd1RoZUNvbnRl bnRCb3gpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQmxvY2s6OnVwZGF0ZVNoYXBlQW5kU2Vn bWVudHNGb3JDdXJyZW50TGluZSk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6dXBk YXRlU2hhcGVBbmRTZWdtZW50c0ZvckN1cnJlbnRMaW5lSW5GbG93VGhyZWFkKToKKwogMjAxMy0w Ni0xNCAgRXJpYyBDYXJsc29uICA8ZXJpYy5jYXJsc29uQGFwcGxlLmNvbT4KIAogICAgICAgICBQ b3RlbnRpYWwgdXNlLWFmdGVyLWZyZWUgd2l0aCBhbiBldmVudCBmaXJlZCBhdCBhIEhUTUxNZWRp YUVsZW1lbnQgd2hpY2ggaXMgY3VycmVudGx5IGJlaW5nIGRlbGV0ZWQKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCbG9ja0xpbmVMYXlvdXQuY3BwIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJsb2NrTGluZUxheW91dC5jcHAKaW5kZXggODgzNzI4 ZC4uMjViNGM3OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrTGluZUxheW91dC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrTGluZUxheW91dC5jcHAKQEAgLTE2NTIsMjcgKzE2NTIsNDAgQEAgc3RhdGljIGlubGluZSBM YXlvdXRVbml0IGFkanVzdExvZ2ljYWxMaW5lVG9wKFNoYXBlSW5zaWRlSW5mbyogc2hhcGVJbnNp ZGVJbmZvLAogICAgIHJldHVybiBzaGFwZUluc2lkZUluZm8tPnNoYXBlTG9naWNhbEJvdHRvbSgp OwogfQogCi12b2lkIFJlbmRlckJsb2NrOjp1cGRhdGVTaGFwZUFuZFNlZ21lbnRzRm9yQ3VycmVu dExpbmUoU2hhcGVJbnNpZGVJbmZvKiYgc2hhcGVJbnNpZGVJbmZvLCBMYXlvdXRVbml0JiBhYnNv bHV0ZUxvZ2ljYWxUb3AsIExpbmVMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGJvb2wmIGxpbmVP dmVyZmxvd3NGcm9tU2hhcGVJbnNpZGUpCitzdGF0aWMgaW5saW5lIHZvaWQgcHVzaFNoYXBlQ29u dGVudE92ZXJmbG93QmVsb3dUaGVDb250ZW50Qm94KFJlbmRlckJsb2NrKiBibG9jaywgU2hhcGVJ bnNpZGVJbmZvKiBzaGFwZUluc2lkZUluZm8sIExheW91dFVuaXQgbGluZVRvcCwgTGF5b3V0VW5p dCBsaW5lSGVpZ2h0LCBib29sJiBsaW5lT3ZlckZsb3dzRnJvbVNoYXBlSW5zaWRlKQoreworICAg IGlmIChsaW5lT3ZlckZsb3dzRnJvbVNoYXBlSW5zaWRlKQorICAgICAgICByZXR1cm47CisKKyAg ICBMYXlvdXRVbml0IGxvZ2ljYWxMaW5lQm90dG9tID0gbGluZVRvcCArIGxpbmVIZWlnaHQ7Cisg ICAgTGF5b3V0VW5pdCBzaGFwZUNvbnRhaW5pbmdCbG9ja0hlaWdodCA9IHNoYXBlSW5zaWRlSW5m by0+c2hhcGVDb250YWluaW5nQmxvY2tIZWlnaHQoKTsKKyAgICBpZiAobG9naWNhbExpbmVCb3R0 b20gPD0gc2hhcGVJbnNpZGVJbmZvLT5zaGFwZUxvZ2ljYWxCb3R0b20oKSB8fCAhc2hhcGVDb250 YWluaW5nQmxvY2tIZWlnaHQpCisgICAgICAgIHJldHVybjsKKworICAgIExheW91dFVuaXQgbmV3 TG9naWNhbEhlaWdodCA9IGJsb2NrLT5sb2dpY2FsSGVpZ2h0KCkgKyAoc2hhcGVDb250YWluaW5n QmxvY2tIZWlnaHQgLSAobGluZVRvcCArIHNoYXBlSW5zaWRlSW5mby0+b3duZXIoKS0+Ym9yZGVy QW5kUGFkZGluZ0FmdGVyKCkpKTsKKyAgICBibG9jay0+c2V0TG9naWNhbEhlaWdodChuZXdMb2dp Y2FsSGVpZ2h0KTsKKworICAgIGxpbmVPdmVyRmxvd3NGcm9tU2hhcGVJbnNpZGUgPSB0cnVlOwor fQorCit2b2lkIFJlbmRlckJsb2NrOjp1cGRhdGVTaGFwZUFuZFNlZ21lbnRzRm9yQ3VycmVudExp bmUoU2hhcGVJbnNpZGVJbmZvKiYgc2hhcGVJbnNpZGVJbmZvLCBMYXlvdXRVbml0JiBhYnNvbHV0 ZUxvZ2ljYWxUb3AsIExpbmVMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGJvb2wmIGxpbmVPdmVy Rmxvd3NGcm9tU2hhcGVJbnNpZGUpCiB7CiAgICAgaWYgKGxheW91dFN0YXRlLmZsb3dUaHJlYWQo KSkKLSAgICAgICAgcmV0dXJuIHVwZGF0ZVNoYXBlQW5kU2VnbWVudHNGb3JDdXJyZW50TGluZUlu Rmxvd1RocmVhZChzaGFwZUluc2lkZUluZm8sIGxheW91dFN0YXRlLCBsaW5lT3ZlcmZsb3dzRnJv bVNoYXBlSW5zaWRlKTsKKyAgICAgICAgcmV0dXJuIHVwZGF0ZVNoYXBlQW5kU2VnbWVudHNGb3JD dXJyZW50TGluZUluRmxvd1RocmVhZChzaGFwZUluc2lkZUluZm8sIGxheW91dFN0YXRlLCBsaW5l T3ZlckZsb3dzRnJvbVNoYXBlSW5zaWRlKTsKIAotICAgIGlmICghc2hhcGVJbnNpZGVJbmZvKQor ICAgIGlmICghc2hhcGVJbnNpZGVJbmZvIHx8IGxpbmVPdmVyRmxvd3NGcm9tU2hhcGVJbnNpZGUp CiAgICAgICAgIHJldHVybjsKIAogICAgIExheW91dFVuaXQgbGluZVRvcCA9IGxvZ2ljYWxIZWln aHQoKSArIGFic29sdXRlTG9naWNhbFRvcDsKKyAgICBMYXlvdXRVbml0IGxpbmVIZWlnaHQgPSB0 aGlzLT5saW5lSGVpZ2h0KGxheW91dFN0YXRlLmxpbmVJbmZvKCkuaXNGaXJzdExpbmUoKSwgaXNI b3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IEhvcml6b250YWxMaW5lIDogVmVydGljYWxMaW5lLCBQ b3NpdGlvbk9mSW50ZXJpb3JMaW5lQm94ZXMpOworCiAgICAgLy8gRklYTUU6IEJ1ZyA5NTM2MTog SXQgaXMgcG9zc2libGUgZm9yIGEgbGluZSB0byBncm93IGJleW9uZCBsaW5lSGVpZ2h0LCBpbiB3 aGljaCBjYXNlIHRoZXNlIHNlZ21lbnRzIG1heSBiZSBpbmNvcnJlY3QuCi0gICAgc2hhcGVJbnNp ZGVJbmZvLT5jb21wdXRlU2VnbWVudHNGb3JMaW5lKGxpbmVUb3AsIGxpbmVIZWlnaHQobGF5b3V0 U3RhdGUubGluZUluZm8oKS5pc0ZpcnN0TGluZSgpLCBpc0hvcml6b250YWxXcml0aW5nTW9kZSgp ID8gSG9yaXpvbnRhbExpbmUgOiBWZXJ0aWNhbExpbmUsIFBvc2l0aW9uT2ZJbnRlcmlvckxpbmVC b3hlcykpOworICAgIHNoYXBlSW5zaWRlSW5mby0+Y29tcHV0ZVNlZ21lbnRzRm9yTGluZShsaW5l VG9wLCBsaW5lSGVpZ2h0KTsKIAotICAgIC8vIFRoZSBvdmVyZmxvdyBzaG91bGQgYmUgcHVzaGVk IGJlbG93IHRoZSBjb250ZW50IGJveAotICAgIExheW91dFVuaXQgc2hhcGVDb250YWluaW5nQmxv Y2tIZWlnaHQgPSBzaGFwZUluc2lkZUluZm8tPnNoYXBlQ29udGFpbmluZ0Jsb2NrSGVpZ2h0KCk7 Ci0gICAgaWYgKCFzaGFwZUluc2lkZUluZm8tPmxpbmVXaXRoaW5TaGFwZUJvdW5kcygpICYmICFs aW5lT3ZlcmZsb3dzRnJvbVNoYXBlSW5zaWRlICYmIHNoYXBlQ29udGFpbmluZ0Jsb2NrSGVpZ2h0 KSB7Ci0gICAgICAgIGxpbmVPdmVyZmxvd3NGcm9tU2hhcGVJbnNpZGUgPSB0cnVlOwotICAgICAg ICBzZXRMb2dpY2FsSGVpZ2h0KHNoYXBlQ29udGFpbmluZ0Jsb2NrSGVpZ2h0KTsKLSAgICB9Cisg ICAgcHVzaFNoYXBlQ29udGVudE92ZXJmbG93QmVsb3dUaGVDb250ZW50Qm94KHRoaXMsIHNoYXBl SW5zaWRlSW5mbywgbGluZVRvcCwgbGluZUhlaWdodCwgbGluZU92ZXJGbG93c0Zyb21TaGFwZUlu c2lkZSk7CiB9CiAKLXZvaWQgUmVuZGVyQmxvY2s6OnVwZGF0ZVNoYXBlQW5kU2VnbWVudHNGb3JD dXJyZW50TGluZUluRmxvd1RocmVhZChTaGFwZUluc2lkZUluZm8qJiBzaGFwZUluc2lkZUluZm8s IExpbmVMYXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIGJvb2wmIGxpbmVPdmVyZmxvd3NGcm9tU2hh cGVJbnNpZGUpCit2b2lkIFJlbmRlckJsb2NrOjp1cGRhdGVTaGFwZUFuZFNlZ21lbnRzRm9yQ3Vy cmVudExpbmVJbkZsb3dUaHJlYWQoU2hhcGVJbnNpZGVJbmZvKiYgc2hhcGVJbnNpZGVJbmZvLCBM aW5lTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlLCBib29sJiBsaW5lT3ZlckZsb3dzRnJvbVNoYXBl SW5zaWRlKQogewogICAgIEFTU0VSVChsYXlvdXRTdGF0ZS5mbG93VGhyZWFkKCkpOwogCkBAIC0x NzEzLDYgKzE3MjYsNyBAQCB2b2lkIFJlbmRlckJsb2NrOjp1cGRhdGVTaGFwZUFuZFNlZ21lbnRz Rm9yQ3VycmVudExpbmVJbkZsb3dUaHJlYWQoU2hhcGVJbnNpZGVJbgogICAgICAgICBzZXRMb2dp Y2FsSGVpZ2h0KGxvZ2ljYWxIZWlnaHQoKSArIGRlbHRhVG9OZXh0UmVnaW9uKTsKIAogICAgICAg ICBjdXJyZW50UmVnaW9uID0gbmV4dFJlZ2lvbjsKKyAgICAgICAgbGluZU92ZXJGbG93c0Zyb21T aGFwZUluc2lkZSA9IGZhbHNlOwogCiAgICAgICAgIGxvZ2ljYWxMaW5lVG9wSW5GbG93VGhyZWFk ID0gbG9naWNhbEhlaWdodCgpICsgb2Zmc2V0RnJvbUxvZ2ljYWxUb3BPZkZpcnN0UGFnZSgpOwog ICAgICAgICBsb2dpY2FsTGluZUJvdHRvbUluRmxvd1RocmVhZCA9IGxvZ2ljYWxMaW5lVG9wSW5G bG93VGhyZWFkICsgbGluZUhlaWdodDsKQEAgLTE3NDAsMTIgKzE3NTQsOCBAQCB2b2lkIFJlbmRl ckJsb2NrOjp1cGRhdGVTaGFwZUFuZFNlZ21lbnRzRm9yQ3VycmVudExpbmVJbkZsb3dUaHJlYWQo U2hhcGVJbnNpZGVJbgogICAgIExheW91dFVuaXQgbGluZVRvcCA9IGxvZ2ljYWxMaW5lVG9wSW5G bG93VGhyZWFkIC0gY3VycmVudFJlZ2lvbi0+bG9naWNhbFRvcEZvckZsb3dUaHJlYWRDb250ZW50 KCkgKyBjdXJyZW50UmVnaW9uLT5ib3JkZXJBbmRQYWRkaW5nQmVmb3JlKCk7CiAgICAgc2hhcGVJ bnNpZGVJbmZvLT5jb21wdXRlU2VnbWVudHNGb3JMaW5lKGxpbmVUb3AsIGxpbmVIZWlnaHQpOwog Ci0gICAgLy8gT3ZlcmZsb3cgZnJvbSBsYXN0IHNoYXBlIG9uIGxhc3QgcmVnaW9uIHNob3VsZCBi ZSBwdXNoZWQgYmVsb3cgdGhlIGNvbnRlbnQgYm94Ci0gICAgaWYgKGN1cnJlbnRSZWdpb24tPmlz TGFzdFJlZ2lvbigpICYmICFsaW5lT3ZlcmZsb3dzRnJvbVNoYXBlSW5zaWRlICYmIChsaW5lVG9w ICsgbGluZUhlaWdodCkgPiBzaGFwZUluc2lkZUluZm8tPnNoYXBlTG9naWNhbEJvdHRvbSgpKSB7 Ci0gICAgICAgIGxpbmVPdmVyZmxvd3NGcm9tU2hhcGVJbnNpZGUgPSB0cnVlOwotICAgICAgICBM YXlvdXRVbml0IG5ld0xvZ2ljYWxIZWlnaHQgPSB0aGlzLT5sb2dpY2FsSGVpZ2h0KCkgKyAoc2hh cGVJbnNpZGVJbmZvLT5zaGFwZUNvbnRhaW5pbmdCbG9ja0hlaWdodCgpIC0gKGxpbmVUb3AgKyBj dXJyZW50UmVnaW9uLT5ib3JkZXJBbmRQYWRkaW5nQWZ0ZXIoKSkpOwotICAgICAgICBzZXRMb2dp Y2FsSGVpZ2h0KG5ld0xvZ2ljYWxIZWlnaHQpOwotICAgIH0KKyAgICBpZiAoY3VycmVudFJlZ2lv bi0+aXNMYXN0UmVnaW9uKCkpCisgICAgICAgIHB1c2hTaGFwZUNvbnRlbnRPdmVyZmxvd0JlbG93 VGhlQ29udGVudEJveCh0aGlzLCBzaGFwZUluc2lkZUluZm8sIGxpbmVUb3AsIGxpbmVIZWlnaHQs IGxpbmVPdmVyRmxvd3NGcm9tU2hhcGVJbnNpZGUpOwogfQogCiBib29sIFJlbmRlckJsb2NrOjph ZGp1c3RMb2dpY2FsTGluZVRvcEFuZExvZ2ljYWxIZWlnaHRJZk5lZWRlZChTaGFwZUluc2lkZUlu Zm8qIHNoYXBlSW5zaWRlSW5mbywgTGF5b3V0VW5pdCBhYnNvbHV0ZUxvZ2ljYWxUb3AsIExpbmVM YXlvdXRTdGF0ZSYgbGF5b3V0U3RhdGUsIElubGluZUJpZGlSZXNvbHZlciYgcmVzb2x2ZXIsIEZs b2F0aW5nT2JqZWN0KiBsYXN0RmxvYXRGcm9tUHJldmlvdXNMaW5lLCBJbmxpbmVJdGVyYXRvciYg ZW5kLCBXb3JkTWVhc3VyZW1lbnRzJiB3b3JkTWVhc3VyZW1lbnRzKQo=