124228 2013-11-12 13:22:14 -0800 [CSS Shapes] When the <box> value is set, derive radii from border-radius 2013-11-22 11:32:45 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 124173 1 betravis giles_joplin commit-queue dino esprehn+autocc giles_joplin glenn kondapallykalyan oldest_to_newest 949839 0 betravis 2013-11-12 13:22:14 -0800 The radius used when a box value is set should be the same as corner shaping defined here: http://dev.w3.org/csswg/css-backgrounds-4/#corner-shaping with the additional margin-box value 953601 1 217696 giles_joplin 2013-11-22 09:52:53 -0800 Created attachment 217696 Patch Add support for BoxShape elliptical corners. 953631 2 217696 commit-queue 2013-11-22 11:32:43 -0800 Comment on attachment 217696 Patch Clearing flags on attachment: 217696 Committed r159702: <http://trac.webkit.org/changeset/159702> 953632 3 commit-queue 2013-11-22 11:32:45 -0800 All reviewed patches have been landed. Closing bug. 217696 2013-11-22 09:52:53 -0800 2013-11-22 11:32:43 -0800 Patch tmp.patch text/plain 13783 giles_joplin ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjZjc0MjNlLi5mYjliMmZiIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMTEt MjIgIEhhbnMgTXVsbGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBTaGFw ZXNdIFdoZW4gdGhlIDxib3g+IHZhbHVlIGlzIHNldCwgZGVyaXZlIHJhZGlpIGZyb20gYm9yZGVy LXJhZGl1cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTI0MjI4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBmYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1vdXRzaWRlLXJvdW5kZWQt Ym94ZXMtMDAxLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogZmFzdC9zaGFwZXMvc2hh cGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1yb3VuZGVkLWJveGVzLTAwMS5odG1sOiBB ZGRlZC4KKyAgICAgICAgKiBmYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9zaGFwZS1v dXRzaWRlLXJvdW5kZWQtYm94ZXMtMDAyLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICog ZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1yb3VuZGVkLWJv eGVzLTAwMi5odG1sOiBBZGRlZC4KKwogMjAxMy0xMS0yMSAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KIAogICAgICAgICBJbXBvcnQgbW9yZSBXM0MgdGVzdHMgZm9yIHBhcnNpbmcg dGVtcGxhdGUgZWxlbWVudHMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3No YXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtcm91bmRlZC1ib3hlcy0wMDEtZXhwZWN0 ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hh cGUtb3V0c2lkZS1yb3VuZGVkLWJveGVzLTAwMS1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMC4uZTYwZDFjMAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtcm91bmRl ZC1ib3hlcy0wMDEtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTcgQEAKK1gKK1gKK1gKK1gKK1gK K1gKK1BBU1MgZWxlbWVudFJlY3QoJ2EnKS50b3AgaXMgMAorUEFTUyBlbGVtZW50UmVjdCgnYScp LmxlZnQgaXMgMAorUEFTUyBlbGVtZW50UmVjdCgnYicpLnRvcCBpcyAyMAorUEFTUyBlbGVtZW50 UmVjdCgnYycpLnRvcCBpcyA0MAorUEFTUyBlbGVtZW50UmVjdCgnYycpLmxlZnQgaXMgMTAwCitQ QVNTIGVsZW1lbnRSZWN0KCdkJykudG9wIGlzIDYwCitQQVNTIGVsZW1lbnRSZWN0KCdkJykubGVm dCBpcyAxMDAKK1BBU1MgZWxlbWVudFJlY3QoJ2UnKS50b3AgaXMgODAKK1BBU1MgZWxlbWVudFJl Y3QoJ2YnKS50b3AgaXMgMTAwCitQQVNTIGVsZW1lbnRSZWN0KCdmJykubGVmdCBpcyAwCisKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3No YXBlLW91dHNpZGUtcm91bmRlZC1ib3hlcy0wMDEuaHRtbCBiL0xheW91dFRlc3RzL2Zhc3Qvc2hh cGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtcm91bmRlZC1ib3hlcy0wMDEu aHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi5kODE3MjAwCi0tLSAvZGV2 L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMv c2hhcGUtb3V0c2lkZS1yb3VuZGVkLWJveGVzLTAwMS5odG1sCkBAIC0wLDAgKzEsNzkgQEAKKzxo dG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcHJl LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvc3VicGl4ZWwtdXRpbHMu anMiPjwvc2NyaXB0PgorPHN0eWxlPgorI2NvbnRhaW5lciB7CisgICAgZm9udDogMjBweC8xIEFo ZW0sIHNhbnMtc2VyaWY7CisgICAgd2lkdGg6IDIwMHB4OworICAgIGhlaWdodDogMTIwcHg7Cisg ICAgY29sb3I6IHJnYmEoMCwwLDIwMCwgMC4yNSk7CisgICAgbWFyZ2luOiAyNXB4OworICAgIGJh Y2tncm91bmQtY29sb3I6IGdyZXk7CisgICAgLXdlYmtpdC1mb250LXNtb290aGluZzogYW50aWFs aWFzZWQ7Cit9CisKKyNsZWZ0LWJvcmRlci1ib3ggeworICAgIGZsb2F0OiBsZWZ0OworICAgIGJv cmRlci10b3AtcmlnaHQtcmFkaXVzOiAxMDBweCAzMHB4OworICAgIGJvcmRlci1ib3R0b20tcmln aHQtcmFkaXVzOiAxMDBweCAzMHB4OworICAgIC13ZWJraXQtc2hhcGUtb3V0c2lkZTogYm9yZGVy LWJveDsgIAorICAgIHdpZHRoOiAxMDBweDsKKyAgICBoZWlnaHQ6IDgwcHg7CisgICAgbWFyZ2lu LXRvcDogMjBweDsKKyAgICBtYXJnaW4tYm90dG9tOiAyMHB4OworICAgIGJhY2tncm91bmQtY29s b3I6IGJsdWU7CisgICAgYmFja2dyb3VuZC1jbGlwOiBib3JkZXItYm94OworfQorPC9zdHlsZT4K KzwvaGVhZD4KKzxib2R5PgorICAgIDxkaXYgaWQ9ImNvbnRhaW5lciI+CisgICAgICAgIDxkaXYg aWQ9ImxlZnQtYm9yZGVyLWJveCI+PC9kaXY+CisgICAgICAgIDxzcGFuIGlkPSJhIj5YPC9zcGFu Pjxicj4KKyAgICAgICAgPHNwYW4gaWQ9ImIiPlg8L3NwYW4+PGJyPgorICAgICAgICA8c3BhbiBp ZD0iYyI+WDwvc3Bhbj48YnI+CisgICAgICAgIDxzcGFuIGlkPSJkIj5YPC9zcGFuPjxicj4KKyAg ICAgICAgPHNwYW4gaWQ9ImUiPlg8L3NwYW4+PGJyPgorICAgICAgICA8c3BhbiBpZD0iZiI+WDwv c3Bhbj4KKyAgICA8L2Rpdj4KKyAgICA8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKzwvYm9keT4K KzxzY3JpcHQ+CitmdW5jdGlvbiBlbGVtZW50UmVjdChlbGVtZW50SWQpIAoreworICAgIHZhciBz ID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbnRhaW5lciIpLmdldEJvdW5kaW5nQ2xpZW50 UmVjdCgpOworICAgIHZhciByID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoZWxlbWVudElkKS5n ZXRCb3VuZGluZ0NsaWVudFJlY3QoKTsKKyAgICByZXR1cm4ge2xlZnQ6IHIubGVmdCAtIHMubGVm dCwgdG9wOiByLnRvcCAtIHMudG9wLCB3aWR0aDogci53aWR0aCwgaGVpZ2h0OiByLmhlaWdodH07 Cit9CisKKy8vIFlvdSdsbCBmaW5kIHRoZSBlcXVhdGlvbiBmb3IgdGhlIFggaW50ZXJjZXB0IG9m IGFuIGVsbGlwdGljYWwgYXJjIGhlcmUgKGFtb25nIG90aGVyIHBsYWNlcyk6CisvLyBodHRwOi8v aGFuc211bGxlci13ZWJraXQuYmxvZ3Nwb3QuY29tLzIwMTIvMDcvY29tcHV0aW5nLWhvcml6b25h bC1yb3VuZGVkLXJlY3RhbmdsZS5odG1sCisKK2Z1bmN0aW9uIGNvcm5lckVsbGlwc2VSaWdodFhJ bnRlcmNlcHQoeSwgY3gsIHJ4LCByeSkKK3sKKyAgICB2YXIgZiA9IFN1YlBpeGVsTGF5b3V0LnNu YXBUb0xheW91dFVuaXQoY3ggKyByeCAqIE1hdGguc3FydCgxIC0gTWF0aC5wb3coKHJ5IC0geSkg LyByeSwgMikpKTsKKyAgICByZXR1cm4gU3RyaW5nKCBNYXRoLmZsb29yKGYpICk7Cit9CisKK3Zh ciBxdWlldCA9IHRydWU7IC8vIFBBU1Mgb3V0cHV0IGRlcGVuZHMgb24gU3ViUGl4ZWxMYXlvdXQu aXNFbmFibGVkKCkKKworc2hvdWxkQmUoImVsZW1lbnRSZWN0KCdhJykudG9wIiwgIjAiKTsKK3No b3VsZEJlKCJlbGVtZW50UmVjdCgnYScpLmxlZnQiLCAiMCIpOworCitzaG91bGRCZSgiZWxlbWVu dFJlY3QoJ2InKS50b3AiLCAiMjAiKTsKK3Nob3VsZEJlKCJlbGVtZW50UmVjdCgnYicpLmxlZnQi LCBjb3JuZXJFbGxpcHNlUmlnaHRYSW50ZXJjZXB0KDQwLCAwLCAxMDAsIDMwKSwgcXVpZXQpOwor CitzaG91bGRCZSgiZWxlbWVudFJlY3QoJ2MnKS50b3AiLCAiNDAiKTsKK3Nob3VsZEJlKCJlbGVt ZW50UmVjdCgnYycpLmxlZnQiLCAiMTAwIik7CisKK3Nob3VsZEJlKCJlbGVtZW50UmVjdCgnZCcp LnRvcCIsICI2MCIpOworc2hvdWxkQmUoImVsZW1lbnRSZWN0KCdkJykubGVmdCIsICIxMDAiKTsK Kworc2hvdWxkQmUoImVsZW1lbnRSZWN0KCdlJykudG9wIiwgIjgwIik7CitzaG91bGRCZSgiZWxl bWVudFJlY3QoJ2UnKS5sZWZ0IiwgY29ybmVyRWxsaXBzZVJpZ2h0WEludGVyY2VwdCg0MCwgMCwg MTAwLCAzMCksIHF1aWV0KTsKKworc2hvdWxkQmUoImVsZW1lbnRSZWN0KCdmJykudG9wIiwgIjEw MCIpOworc2hvdWxkQmUoImVsZW1lbnRSZWN0KCdmJykubGVmdCIsICIwIik7Cis8L3NjcmlwdD4K KzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLW91dHNp ZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtcm91bmRlZC1ib3hlcy0wMDItZXhwZWN0ZWQudHh0IGIv TGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lk ZS1yb3VuZGVkLWJveGVzLTAwMi1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMC4uY2RlZDdhYwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3Qv c2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNpZGUtcm91bmRlZC1ib3hlcy0w MDItZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTcgQEAKK1gKK1gKK1gKK1gKK1gKK1gKK1BBU1Mg ZWxlbWVudFJlY3QoJ2EnKS50b3AgaXMgMAorUEFTUyBlbGVtZW50UmVjdCgnYScpLnJpZ2h0IGlz IDIwMAorUEFTUyBlbGVtZW50UmVjdCgnYicpLnRvcCBpcyAyMAorUEFTUyBlbGVtZW50UmVjdCgn YycpLnRvcCBpcyA0MAorUEFTUyBlbGVtZW50UmVjdCgnYycpLnJpZ2h0IGlzIDEwMAorUEFTUyBl bGVtZW50UmVjdCgnZCcpLnRvcCBpcyA2MAorUEFTUyBlbGVtZW50UmVjdCgnZCcpLnJpZ2h0IGlz IDEwMAorUEFTUyBlbGVtZW50UmVjdCgnZScpLnRvcCBpcyA4MAorUEFTUyBlbGVtZW50UmVjdCgn ZicpLnRvcCBpcyAxMDAKK1BBU1MgZWxlbWVudFJlY3QoJ2YnKS5yaWdodCBpcyAyMDAKKwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hh cGUtb3V0c2lkZS1yb3VuZGVkLWJveGVzLTAwMi5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFw ZXMvc2hhcGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1yb3VuZGVkLWJveGVzLTAwMi5o dG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmY2NWFkNmMKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1vdXRzaWRlLWZsb2F0cy9z aGFwZS1vdXRzaWRlLXJvdW5kZWQtYm94ZXMtMDAyLmh0bWwKQEAgLTAsMCArMSw4MSBAQAorPGh0 bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVzdC1wcmUu anMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL3Jlc291cmNlcy9zdWJwaXhlbC11dGlscy5q cyI+PC9zY3JpcHQ+Cis8c3R5bGU+CisjY29udGFpbmVyIHsKKyAgICBmb250OiAyMHB4LzEgQWhl bSwgc2Fucy1zZXJpZjsKKyAgICB0ZXh0LWFsaWduOiByaWdodDsKKyAgICB3aWR0aDogMjAwcHg7 CisgICAgaGVpZ2h0OiAxMjBweDsKKyAgICBjb2xvcjogcmdiYSgwLDAsMjAwLCAwLjI1KTsKKyAg ICBtYXJnaW46IDI1cHg7CisgICAgYmFja2dyb3VuZC1jb2xvcjogZ3JleTsKKyAgICAtd2Via2l0 LWZvbnQtc21vb3RoaW5nOiBhbnRpYWxpYXNlZDsKK30KKworI3JpZ2h0LWJvcmRlci1ib3ggewor ICAgIGZsb2F0OiByaWdodDsKKyAgICBib3JkZXItdG9wLWxlZnQtcmFkaXVzOiAxMDBweCAzMHB4 OworICAgIGJvcmRlci1ib3R0b20tbGVmdC1yYWRpdXM6IDEwMHB4IDMwcHg7CisgICAgLXdlYmtp dC1zaGFwZS1vdXRzaWRlOiBib3JkZXItYm94OyAgCisgICAgd2lkdGg6IDEwMHB4OworICAgIGhl aWdodDogODBweDsKKyAgICBtYXJnaW4tdG9wOiAyMHB4OworICAgIG1hcmdpbi1ib3R0b206IDIw cHg7CisgICAgYmFja2dyb3VuZC1jb2xvcjogYmx1ZTsKKyAgICBiYWNrZ3JvdW5kLWNsaXA6IGJv cmRlci1ib3g7Cit9Cis8L3N0eWxlPgorPC9oZWFkPgorPGJvZHk+CisgICAgPGRpdiBpZD0iY29u dGFpbmVyIj4KKyAgICAgICAgPGRpdiBpZD0icmlnaHQtYm9yZGVyLWJveCI+PC9kaXY+CisgICAg ICAgIDxzcGFuIGlkPSJhIj5YPC9zcGFuPjxicj4KKyAgICAgICAgPHNwYW4gaWQ9ImIiPlg8L3Nw YW4+PGJyPgorICAgICAgICA8c3BhbiBpZD0iYyI+WDwvc3Bhbj48YnI+CisgICAgICAgIDxzcGFu IGlkPSJkIj5YPC9zcGFuPjxicj4KKyAgICAgICAgPHNwYW4gaWQ9ImUiPlg8L3NwYW4+PGJyPgor ICAgICAgICA8c3BhbiBpZD0iZiI+WDwvc3Bhbj4KKyAgICA8L2Rpdj4KKyAgICA8ZGl2IGlkPSJj b25zb2xlIj48L2Rpdj4KKzwvYm9keT4KKzxzY3JpcHQ+CitmdW5jdGlvbiBlbGVtZW50UmVjdChl bGVtZW50SWQpIAoreworICAgIHZhciBzID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbnRh aW5lciIpLmdldEJvdW5kaW5nQ2xpZW50UmVjdCgpOworICAgIHZhciByID0gZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoZWxlbWVudElkKS5nZXRCb3VuZGluZ0NsaWVudFJlY3QoKTsKKyAgICByZXR1 cm4ge3JpZ2h0OiAoci5sZWZ0IC0gcy5sZWZ0KSArIHIud2lkdGgsIHRvcDogci50b3AgLSBzLnRv cCwgd2lkdGg6IHIud2lkdGgsIGhlaWdodDogci5oZWlnaHR9OworfQorCisvLyBZb3UnbGwgZmlu ZCB0aGUgZXF1YXRpb24gZm9yIHRoZSBYIGludGVyY2VwdCBvZiBhbiBlbGxpcHRpY2FsIGFyYyBo ZXJlIChhbW9uZyBvdGhlciBwbGFjZXMpOgorLy8gaHR0cDovL2hhbnNtdWxsZXItd2Via2l0LmJs b2dzcG90LmNvbS8yMDEyLzA3L2NvbXB1dGluZy1ob3Jpem9uYWwtcm91bmRlZC1yZWN0YW5nbGUu aHRtbAorCitmdW5jdGlvbiBjb3JuZXJFbGxpcHNlTGVmdFhJbnRlcmNlcHQoeSwgY3gsIHJ4LCBy eSkKK3sKKyAgICB2YXIgY29udGFpbmVyV2lkdGggPSBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgi Y29udGFpbmVyIikuZ2V0Qm91bmRpbmdDbGllbnRSZWN0KCkud2lkdGg7CisgICAgdmFyIGYgPSBT dWJQaXhlbExheW91dC5zbmFwVG9MYXlvdXRVbml0KGNvbnRhaW5lcldpZHRoIC0gKGN4ICsgcngg KiBNYXRoLnNxcnQoMSAtIE1hdGgucG93KChyeSAtIHkpIC8gcnksIDIpKSkpOworICAgIHJldHVy biBTdHJpbmcoIE1hdGguZmxvb3IoZikgKTsKK30KKwordmFyIHF1aWV0ID0gdHJ1ZTsgLy8gUEFT UyBvdXRwdXQgZGVwZW5kcyBvbiBTdWJQaXhlbExheW91dC5pc0VuYWJsZWQoKQorCitzaG91bGRC ZSgiZWxlbWVudFJlY3QoJ2EnKS50b3AiLCAiMCIpOworc2hvdWxkQmUoImVsZW1lbnRSZWN0KCdh JykucmlnaHQiLCAiMjAwIik7CisKK3Nob3VsZEJlKCJlbGVtZW50UmVjdCgnYicpLnRvcCIsICIy MCIpOworc2hvdWxkQmUoImVsZW1lbnRSZWN0KCdiJykucmlnaHQiLCBjb3JuZXJFbGxpcHNlTGVm dFhJbnRlcmNlcHQoNDAsIDAsIDEwMCwgMzApLCBxdWlldCk7CisKK3Nob3VsZEJlKCJlbGVtZW50 UmVjdCgnYycpLnRvcCIsICI0MCIpOworc2hvdWxkQmUoImVsZW1lbnRSZWN0KCdjJykucmlnaHQi LCAiMTAwIik7CisKK3Nob3VsZEJlKCJlbGVtZW50UmVjdCgnZCcpLnRvcCIsICI2MCIpOworc2hv dWxkQmUoImVsZW1lbnRSZWN0KCdkJykucmlnaHQiLCAiMTAwIik7CisKK3Nob3VsZEJlKCJlbGVt ZW50UmVjdCgnZScpLnRvcCIsICI4MCIpOworc2hvdWxkQmUoImVsZW1lbnRSZWN0KCdlJykucmln aHQiLCBjb3JuZXJFbGxpcHNlTGVmdFhJbnRlcmNlcHQoNDAsIDAsIDEwMCwgMzApLCBxdWlldCk7 CisKK3Nob3VsZEJlKCJlbGVtZW50UmVjdCgnZicpLnRvcCIsICIxMDAiKTsKK3Nob3VsZEJlKCJl bGVtZW50UmVjdCgnZicpLnJpZ2h0IiwgIjIwMCIpOworPC9zY3JpcHQ+Cis8L2h0bWw+CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKaW5kZXggNDQ2MGNhOC4uNWQ1NzM3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisy MDEzLTExLTIyICBIYW5zIE11bGxlciAgPGhtdWxsZXJAYWRvYmUuY29tPgorCisgICAgICAgIFtD U1MgU2hhcGVzXSBXaGVuIHRoZSA8Ym94PiB2YWx1ZSBpcyBzZXQsIGRlcml2ZSByYWRpaSBmcm9t IGJvcmRlci1yYWRpdXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEyNDIyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEFkZCBzdXBwb3J0IGZvciBCb3hTaGFwZSBlbGxpcHRpY2FsIGNvcm5lcnMuCisKKyAg ICAgICAgVGVzdHM6IGZhc3Qvc2hhcGVzL3NoYXBlLW91dHNpZGUtZmxvYXRzL3NoYXBlLW91dHNp ZGUtcm91bmRlZC1ib3hlcy0wMDEuaHRtbAorICAgICAgICAgICAgICAgZmFzdC9zaGFwZXMvc2hh cGUtb3V0c2lkZS1mbG9hdHMvc2hhcGUtb3V0c2lkZS1yb3VuZGVkLWJveGVzLTAwMi5odG1sCisK KyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFJvdW5kZWRSZWN0Lmg6CisgICAgICAg IChXZWJDb3JlOjpGbG9hdFJvdW5kZWRSZWN0Ojpib3R0b21MZWZ0Q29ybmVyKTogQ29ycmVjdGVk IGEgY29weS1hbmQtcGFzdGVPLgorICAgICAgICAqIHJlbmRlcmluZy9zaGFwZXMvQm94U2hhcGUu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Qm94U2hhcGU6OmdldEV4Y2x1ZGVkSW50ZXJ2YWxzKTog UmV0dXJuZWQgaW50ZXJ2YWwgbm93IGRlcGVuZHMgb24gdGhlIHRvcCBhbmQgYm90dG9tIG9mIHRo ZSBsaW5lLgorICAgICAgICAqIHJlbmRlcmluZy9zaGFwZXMvU2hhcGUuY3BwOgorICAgICAgICAo V2ViQ29yZTo6U2hhcGU6OmNyZWF0ZVNoYXBlKTogUm91bmRlZCByZWN0IHBhcmFtZXRlcnMgYXJl IG5vdyBzcGVjaWZpZWQgd2l0aCBhIFJvdW5kZWRSZWN0IHBhcmFtZXRlci4KKyAgICAgICAgKiBy ZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmg6CisgICAgICAgICogcmVuZGVyaW5nL3NoYXBlcy9TaGFw ZUluZm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6Ojpjb21wdXRlZFNoYXBlKTogUGFzcyBzdHls ZSdzIHJvdW5kZWQgYm9yZGVyIHRvIGNyZWF0ZVNoYXBlKCkuCisKIDIwMTMtMTEtMjIgIHBlYXZv QG91dGxvb2suY29tICA8cGVhdm9Ab3V0bG9vay5jb20+CiAKICAgICAgICAgW1dpbkNhaXJvXSBD b21waWxlIGVycm9yIHdoZW4gQUNDRUxFUkFURURfQ09NUE9TSVRJTkcgaXMgbm90IHVzZWQuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFJvdW5kZWRS ZWN0LmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFJvdW5kZWRSZWN0 LmgKaW5kZXggMGEzNzZhMi4uZjY2Y2I5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvRmxvYXRSb3VuZGVkUmVjdC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL2dyYXBoaWNzL0Zsb2F0Um91bmRlZFJlY3QuaApAQCAtOTksNyArOTksNyBAQCBwdWJs aWM6CiAgICAgfQogICAgIEZsb2F0UmVjdCBib3R0b21MZWZ0Q29ybmVyKCkgY29uc3QKICAgICB7 Ci0gICAgICAgIHJldHVybiBGbG9hdFJlY3QobV9yZWN0Lm1heFgoKSAtIG1fcmFkaWkudG9wUmln aHQoKS53aWR0aCgpLCBtX3JlY3QueSgpLCBtX3JhZGlpLnRvcFJpZ2h0KCkud2lkdGgoKSwgbV9y YWRpaS50b3BSaWdodCgpLmhlaWdodCgpKTsKKyAgICAgICAgcmV0dXJuIEZsb2F0UmVjdChtX3Jl Y3QueCgpLCBtX3JlY3QubWF4WSgpIC0gbV9yYWRpaS5ib3R0b21MZWZ0KCkuaGVpZ2h0KCksIG1f cmFkaWkuYm90dG9tTGVmdCgpLndpZHRoKCksIG1fcmFkaWkuYm90dG9tTGVmdCgpLmhlaWdodCgp KTsKICAgICB9CiAgICAgRmxvYXRSZWN0IGJvdHRvbVJpZ2h0Q29ybmVyKCkgY29uc3QKICAgICB7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL0JveFNoYXBlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvQm94U2hhcGUuY3BwCmluZGV4IGU1 NTE1NGYuLmJiZGQxYzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFw ZXMvQm94U2hhcGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvQm94 U2hhcGUuY3BwCkBAIC03Nyw3ICs3Nyw3IEBAIHZvaWQgQm94U2hhcGU6OmdldEV4Y2x1ZGVkSW50 ZXJ2YWxzKExheW91dFVuaXQgbG9naWNhbFRvcCwgTGF5b3V0VW5pdCBsb2dpY2FsSGVpCiAgICAg ICAgIHgyID0gc3RkOjptYXg8ZmxvYXQ+KHgyLCBtYXhYSW50ZXJjZXB0KTsKICAgICB9CiAKLSAg ICBpZiAobV9tYXJnaW5Cb3VuZHMueEludGVyY2VwdHNBdFkoeTEsIG1pblhJbnRlcmNlcHQsIG1h eFhJbnRlcmNlcHQpKSB7CisgICAgaWYgKG1fbWFyZ2luQm91bmRzLnhJbnRlcmNlcHRzQXRZKHky LCBtaW5YSW50ZXJjZXB0LCBtYXhYSW50ZXJjZXB0KSkgewogICAgICAgICB4MSA9IHN0ZDo6bWlu PGZsb2F0Pih4MSwgbWluWEludGVyY2VwdCk7CiAgICAgICAgIHgyID0gc3RkOjptYXg8ZmxvYXQ+ KHgyLCBtYXhYSW50ZXJjZXB0KTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc2hhcGVzL1NoYXBlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFw ZXMvU2hhcGUuY3BwCmluZGV4IGE1MDhhMzYuLmM4ZmJiOGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9zaGFwZXMvU2hhcGUuY3BwCkBAIC0yNTksMTEgKzI1OSwxMCBAQCBQYXNzT3duUHRy PFNoYXBlPiBTaGFwZTo6Y3JlYXRlU2hhcGUoY29uc3QgU3R5bGVJbWFnZSogc3R5bGVJbWFnZSwg ZmxvYXQgdGhyZXNobwogICAgIHJldHVybiByYXN0ZXJTaGFwZS5yZWxlYXNlKCk7CiB9CiAKLVBh c3NPd25QdHI8U2hhcGU+IFNoYXBlOjpjcmVhdGVTaGFwZShjb25zdCBMYXlvdXRTaXplJiBsb2dp Y2FsU2l6ZSwgY29uc3QgTGF5b3V0U2l6ZSYgbG9naWNhbFJhZGlpLCBXcml0aW5nTW9kZSB3cml0 aW5nTW9kZSwgTGVuZ3RoIG1hcmdpbiwgTGVuZ3RoIHBhZGRpbmcpCitQYXNzT3duUHRyPFNoYXBl PiBTaGFwZTo6Y3JlYXRlU2hhcGUoY29uc3QgUm91bmRlZFJlY3QmIHJvdW5kZWRSZWN0LCBXcml0 aW5nTW9kZSB3cml0aW5nTW9kZSwgTGVuZ3RoIG1hcmdpbiwgTGVuZ3RoIHBhZGRpbmcpCiB7Ci0g ICAgRmxvYXRSZWN0IHJlY3QoMCwgMCwgbG9naWNhbFNpemUud2lkdGgoKSwgbG9naWNhbFNpemUu aGVpZ2h0KCkpOwotICAgIEZsb2F0U2l6ZSByYWRpaShsb2dpY2FsUmFkaWkud2lkdGgoKSwgbG9n aWNhbFJhZGlpLmhlaWdodCgpKTsKLSAgICBGbG9hdFJvdW5kZWRSZWN0IGJvdW5kcyhyZWN0LCBy YWRpaSwgcmFkaWksIHJhZGlpLCByYWRpaSk7CisgICAgRmxvYXRSZWN0IHJlY3QoMCwgMCwgcm91 bmRlZFJlY3QucmVjdCgpLndpZHRoKCksIHJvdW5kZWRSZWN0LnJlY3QoKS5oZWlnaHQoKSk7Cisg ICAgRmxvYXRSb3VuZGVkUmVjdCBib3VuZHMocmVjdCwgcm91bmRlZFJlY3QucmFkaWkoKS50b3BM ZWZ0KCksIHJvdW5kZWRSZWN0LnJhZGlpKCkudG9wUmlnaHQoKSwgcm91bmRlZFJlY3QucmFkaWko KS5ib3R0b21MZWZ0KCksIHJvdW5kZWRSZWN0LnJhZGlpKCkuYm90dG9tUmlnaHQoKSk7CiAKICAg ICBPd25QdHI8U2hhcGU+IHNoYXBlID0gY3JlYXRlQm94U2hhcGUoYm91bmRzKTsKICAgICBzaGFw ZS0+bV93cml0aW5nTW9kZSA9IHdyaXRpbmdNb2RlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZS5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3No YXBlcy9TaGFwZS5oCmluZGV4IGQ2Nzk4YzQuLmEzZWU0ZGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvc2hhcGVzL1NoYXBlLmgKQEAgLTMzLDYgKzMzLDcgQEAKICNpbmNsdWRlICJCYXNpY1No YXBlcy5oIgogI2luY2x1ZGUgIkxheW91dFJlY3QuaCIKICNpbmNsdWRlICJQYXRoLmgiCisjaW5j bHVkZSAiUm91bmRlZFJlY3QuaCIKICNpbmNsdWRlICJTdHlsZUltYWdlLmgiCiAjaW5jbHVkZSAi V3JpdGluZ01vZGUuaCIKICNpbmNsdWRlIDx3dGYvUGFzc093blB0ci5oPgpAQCAtNjMsNyArNjQs NyBAQCBjbGFzcyBTaGFwZSB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NPd25QdHI8U2hhcGU+ IGNyZWF0ZVNoYXBlKGNvbnN0IEJhc2ljU2hhcGUqLCBjb25zdCBMYXlvdXRTaXplJiBsb2dpY2Fs Qm94U2l6ZSwgV3JpdGluZ01vZGUsIExlbmd0aCBtYXJnaW4sIExlbmd0aCBwYWRkaW5nKTsKICAg ICBzdGF0aWMgUGFzc093blB0cjxTaGFwZT4gY3JlYXRlU2hhcGUoY29uc3QgU3R5bGVJbWFnZSos IGZsb2F0IHRocmVzaG9sZCwgY29uc3QgTGF5b3V0U2l6ZSYgbG9naWNhbEJveFNpemUsIFdyaXRp bmdNb2RlLCBMZW5ndGggbWFyZ2luLCBMZW5ndGggcGFkZGluZyk7Ci0gICAgc3RhdGljIFBhc3NP d25QdHI8U2hhcGU+IGNyZWF0ZVNoYXBlKGNvbnN0IExheW91dFNpemUmIGxvZ2ljYWxCb3hTaXpl LCBjb25zdCBMYXlvdXRTaXplJiBsb2dpY2FsUmFkaWksIFdyaXRpbmdNb2RlLCBMZW5ndGggbWFy Z2luLCBMZW5ndGggcGFkZGluZyk7CisgICAgc3RhdGljIFBhc3NPd25QdHI8U2hhcGU+IGNyZWF0 ZVNoYXBlKGNvbnN0IFJvdW5kZWRSZWN0JiwgV3JpdGluZ01vZGUsIExlbmd0aCBtYXJnaW4sIExl bmd0aCBwYWRkaW5nKTsKIAogICAgIHZpcnR1YWwgflNoYXBlKCkgeyB9CiAKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVJbmZvLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVJbmZvLmNwcAppbmRleCA2MTJhMWMxLi4yMTg4 OWM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlSW5m by5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZUluZm8uY3Bw CkBAIC03OCw4ICs3OCw4IEBAIGNvbnN0IFNoYXBlKiBTaGFwZUluZm88UmVuZGVyVHlwZT46OmNv bXB1dGVkU2hhcGUoKSBjb25zdAogICAgICAgICBicmVhazsKICAgICBjYXNlIFNoYXBlVmFsdWU6 OkJveDogewogICAgICAgICBBU1NFUlQoc2hhcGVWYWx1ZS0+Ym94KCkpOwotICAgICAgICAvLyBC dWcgMTI0MjI4OiBOZWVkIHRvIGRlcml2ZSBwcm9wZXIgcmFkaWkgZnJvbSBib3JkZXItcmFkaWkK LSAgICAgICAgbV9zaGFwZSA9IFNoYXBlOjpjcmVhdGVTaGFwZShtX3NoYXBlTG9naWNhbFNpemUs IExheW91dFNpemUoKSwgd3JpdGluZ01vZGUsIG1hcmdpbiwgcGFkZGluZyk7CisgICAgICAgIGNv bnN0IFJvdW5kZWRSZWN0JiBzaGFwZVJlY3QgPSBtX3JlbmRlcmVyLT5zdHlsZSgpLmdldFJvdW5k ZWRCb3JkZXJGb3IoTGF5b3V0UmVjdChMYXlvdXRQb2ludCgpLCBtX3NoYXBlTG9naWNhbFNpemUp LCAmKG1fcmVuZGVyZXItPnZpZXcoKSkpOworICAgICAgICBtX3NoYXBlID0gU2hhcGU6OmNyZWF0 ZVNoYXBlKHNoYXBlUmVjdCwgd3JpdGluZ01vZGUsIG1hcmdpbiwgcGFkZGluZyk7CiAgICAgICAg IGJyZWFrOwogICAgIH0KICAgICBjYXNlIFNoYXBlVmFsdWU6Ok91dHNpZGU6Cg==