124605 2013-11-19 14:25:33 -0800 [CSS Shapes] Add support for the computing the included intervals for a BoxShape 2013-12-16 09:52:27 -0800 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 124368 124173 1 giles_joplin giles_joplin commit-queue esprehn+autocc glenn kling kondapallykalyan oldest_to_newest 952236 0 giles_joplin 2013-11-19 14:25:33 -0800 BoxShape::getIncludedIntervals() is currently a stub. 956212 1 218363 giles_joplin 2013-12-03 16:46:40 -0800 Created attachment 218363 Patch Changed FloatRoundedRect::xInterceptsAtY() to include the bottom edge of the rectangle and to check for the special cases where any or all of the corner radii are empty. 960078 2 218363 kling 2013-12-16 08:48:30 -0800 Comment on attachment 218363 Patch r=me 960094 3 218363 commit-queue 2013-12-16 09:52:24 -0800 Comment on attachment 218363 Patch Clearing flags on attachment: 218363 Committed r160644: <http://trac.webkit.org/changeset/160644> 960095 4 commit-queue 2013-12-16 09:52:27 -0800 All reviewed patches have been landed. Closing bug. 218363 2013-12-03 16:46:40 -0800 2013-12-16 09:52:24 -0800 Patch tmp.patch text/plain 9413 giles_joplin ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0YjExZThjLi5jYjYxYWUyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTMtMTIt MDMgIEhhbnMgTXVsbGVyICA8aG11bGxlckBhZG9iZS5jb20+CisKKyAgICAgICAgW0NTUyBTaGFw ZXNdIEFkZCBzdXBwb3J0IGZvciB0aGUgY29tcHV0aW5nIHRoZSBpbmNsdWRlZCBpbnRlcnZhbHMg Zm9yIGEgQm94U2hhcGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTEyNDYwNQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIENoZWNrIHRoYXQgc2hhcGUtaW5zaWRlOmNvbnRlbnQtYm94IHdvcmtzIHdpdGggYW5k IHdpdGhvdXQgYm9yZGVyIHJhZGlpLgorCisgICAgICAgICogZmFzdC9zaGFwZXMvc2hhcGUtaW5z aWRlL3NoYXBlLWluc2lkZS1jb250ZW50LWJveC1leHBlY3RlZC5odG1sOiBBZGRlZC4KKyAgICAg ICAgKiBmYXN0L3NoYXBlcy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLWNvbnRlbnQtYm94Lmh0 bWw6IEFkZGVkLgorCiAyMDEzLTEyLTAzICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAYXBwbGUu Y29tPgogCiAgICAgICAgIExheW91dCBUZXN0IHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L3Nl YXJjaC1wcmVkaWNhdGUtZWxlbWVudC1jb3VudC5odG1sIGlzIGZsYWt5CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLWNvbnRlbnQt Ym94LWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1pbnNpZGUv c2hhcGUtaW5zaWRlLWNvbnRlbnQtYm94LWV4cGVjdGVkLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMC4uMTI1NGYwOAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3Rz L2Zhc3Qvc2hhcGVzL3NoYXBlLWluc2lkZS9zaGFwZS1pbnNpZGUtY29udGVudC1ib3gtZXhwZWN0 ZWQuaHRtbApAQCAtMCwwICsxLDMwIEBACis8aHRtbD4KKzxoZWFkPgorPHN0eWxlPgorLnNoYXBl IHsKKyAgICBmb250OiAzMHB4LzEgQWhlbSwgc2Fucy1zZXJpZjsKKyAgICAtd2Via2l0LWZvbnQt c21vb3RoaW5nOiBhbnRpYWxpYXNlZDsKKyAgICBjb2xvcjogZ3JlZW47CisgICAgbWFyZ2luOiAy MHB4OworfQorLmNvbnRlbnQtYm94IHsKKyAgICBiYWNrZ3JvdW5kLWNsaXA6IGNvbnRlbnQtYm94 OworICAgIGJhY2tncm91bmQtY29sb3I6IHJlZDsKKyAgICB3aWR0aDogOTBweDsKKyAgICBoZWln aHQ6IDkwcHg7Cit9Cisucm91bmRlZC1jb250ZW50LWJveCB7CisgICAgYmFja2dyb3VuZC1jbGlw OiBjb250ZW50LWJveDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmV5OworICAgIHdpZHRoOiA5 MHB4OworICAgIGhlaWdodDogOTBweDsKKyAgICBib3JkZXItcmFkaXVzOiAzMHB4OworfQorPC9z dHlsZT4KKzwvaGVhZD4KKzxib2R5PgorICA8cD5DaGVjayB0aGF0IHNoYXBlLWluc2lkZTpjb250 ZW50LWJveCB3b3JrcyBjb3JyZWN0bHkuPC9wPgorICA8ZGl2IGNsYXNzPSdzaGFwZSBjb250ZW50 LWJveCc+WFhYIFhYWCBYWFg8L2Rpdj4KKyAgPGRpdiBjbGFzcz0nc2hhcGUgcm91bmRlZC1jb250 ZW50LWJveCc+Jm5ic3A7WDxicj5YWFg8YnI+Jm5ic3A7WDwvZGl2PgorPC9ib2R5PgorPC9odG1s PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUtaW5zaWRlL3NoYXBl LWluc2lkZS1jb250ZW50LWJveC5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9zaGFwZXMvc2hhcGUt aW5zaWRlL3NoYXBlLWluc2lkZS1jb250ZW50LWJveC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0 CmluZGV4IDAwMDAwMDAuLjUwNTQ5NjYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9m YXN0L3NoYXBlcy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLWNvbnRlbnQtYm94Lmh0bWwKQEAg LTAsMCArMSwzMiBAQAorPGh0bWw+Cis8aGVhZD4KKzxzdHlsZT4KKy5zaGFwZSB7CisgICAgZm9u dDogMzBweC8xIEFoZW0sIHNhbnMtc2VyaWY7CisgICAgLXdlYmtpdC1mb250LXNtb290aGluZzog YW50aWFsaWFzZWQ7CisgICAgY29sb3I6IGdyZWVuOworICAgIG1hcmdpbjogMjBweDsKK30KKy5j b250ZW50LWJveCB7CisgICAgLXdlYmtpdC1zaGFwZS1pbnNpZGU6IGNvbnRlbnQtYm94OworICAg IGJhY2tncm91bmQtY2xpcDogY29udGVudC1ib3g7CisgICAgYmFja2dyb3VuZC1jb2xvcjogcmVk OworICAgIHdpZHRoOiA5MHB4OworICAgIGhlaWdodDogOTBweDsKK30KKy5yb3VuZGVkLWNvbnRl bnQtYm94IHsKKyAgICAtd2Via2l0LXNoYXBlLWluc2lkZTogY29udGVudC1ib3g7CisgICAgYmFj a2dyb3VuZC1jbGlwOiBjb250ZW50LWJveDsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBncmV5Owor ICAgIHdpZHRoOiA5MHB4OworICAgIGhlaWdodDogOTBweDsKKyAgICBib3JkZXItcmFkaXVzOiAz MHB4OworfQorPC9zdHlsZT4KKzwvaGVhZD4KKzxib2R5PgorICA8cD5DaGVjayB0aGF0IHNoYXBl LWluc2lkZTpjb250ZW50LWJveCB3b3JrcyBjb3JyZWN0bHkuPC9wPgorICA8ZGl2IGNsYXNzPSdz aGFwZSBjb250ZW50LWJveCc+WFhYIFhYWCBYWFg8L2Rpdj4KKyAgPGRpdiBjbGFzcz0nc2hhcGUg cm91bmRlZC1jb250ZW50LWJveCc+WCBYWFggWDwvZGl2PgorPC9ib2R5PgorPC9odG1sPgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCmluZGV4IDlkNTQ4MTQuLmQxZjE2OWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyNyBAQAor MjAxMy0xMi0wMyAgSGFucyBNdWxsZXIgIDxobXVsbGVyQGFkb2JlLmNvbT4KKworICAgICAgICBb Q1NTIFNoYXBlc10gQWRkIHN1cHBvcnQgZm9yIHRoZSBjb21wdXRpbmcgdGhlIGluY2x1ZGVkIGlu dGVydmFscyBmb3IgYSBCb3hTaGFwZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTI0NjA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgU2V0dGluZyBzaGFwZS1pbnNpZGUgdG8gY29udGVudC1ib3ggbm93IHdv cmtzLgorCisgICAgICAgIENoYW5nZWQgRmxvYXRSb3VuZGVkUmVjdDo6eEludGVyY2VwdHNBdFko KSB0byBpbmNsdWRlIHRoZSBib3R0b20gZWRnZSBvZgorICAgICAgICB0aGUgcmVjdGFuZ2xlIGFu ZCB0byBjaGVjayBmb3IgdGhlIHNwZWNpYWwgY2FzZXMgd2hlcmUgYW55IG9yIGFsbCBvZiB0aGUK KyAgICAgICAgY29ybmVyIHJhZGlpIGFyZSBlbXB0eS4KKworICAgICAgICBUZXN0OiBmYXN0L3No YXBlcy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLWNvbnRlbnQtYm94Lmh0bWwKKworICAgICAg ICAqIHBsYXRmb3JtL2dyYXBoaWNzL0Zsb2F0Um91bmRlZFJlY3QuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6RmxvYXRSb3VuZGVkUmVjdDo6eEludGVyY2VwdHNBdFkpOgorICAgICAgICAqIHJlbmRl cmluZy9zaGFwZXMvQm94U2hhcGUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Qm94U2hhcGU6Omdl dEluY2x1ZGVkSW50ZXJ2YWxzKTogUmVwbGFjZWQgdGhlIHN0dWIgaW1wbGVtZW50YXRpb24gd2l0 aCBsb2dpYyB0aGF0J3Mgc2ltaWxhciB0byBnZXRFeGNsdWRlZEludGVydmFscygpLgorICAgICAg ICAqIHJlbmRlcmluZy9zaGFwZXMvU2hhcGVJbmZvLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Ojo6 Y29tcHV0ZWRTaGFwZSk6IFJlbW92ZWQgYSBtZWFuaW5nbGVzcyBhc3NlcnQuCisgICAgICAgICog cmVuZGVyaW5nL3NoYXBlcy9TaGFwZUluc2lkZUluZm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 U2hhcGVJbnNpZGVJbmZvOjppc0VuYWJsZWRGb3IpOgorCiAyMDEzLTEyLTAzICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92ZSBzb21lIGlPUy1y ZWxhdGVkIGRvY3VtZW50U2NhbGUgY29kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvRmxvYXRSb3VuZGVkUmVjdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9GbG9hdFJvdW5kZWRSZWN0LmNwcAppbmRleCBiZDJjYjZjLi4xOWFjOTMx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFJvdW5k ZWRSZWN0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9GbG9hdFJv dW5kZWRSZWN0LmNwcApAQCAtMTA1LDE1ICsxMDUsMjEgQEAgc3RhdGljIGlubGluZSBmbG9hdCBj b3JuZXJSZWN0SW50ZXJjZXB0KGZsb2F0IHksIGNvbnN0IEZsb2F0UmVjdCYgY29ybmVyUmVjdCkK IAogYm9vbCBGbG9hdFJvdW5kZWRSZWN0Ojp4SW50ZXJjZXB0c0F0WShmbG9hdCB5LCBmbG9hdCYg bWluWEludGVyY2VwdCwgZmxvYXQmIG1heFhJbnRlcmNlcHQpIGNvbnN0CiB7Ci0gICAgaWYgKHkg PCByZWN0KCkueSgpIHx8IHkgPj0gIHJlY3QoKS5tYXhZKCkpCisgICAgaWYgKHkgPCByZWN0KCku eSgpIHx8IHkgPiAgcmVjdCgpLm1heFkoKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAg aWYgKCFpc1JvdW5kZWQoKSkgeworICAgICAgICBtaW5YSW50ZXJjZXB0ID0gcmVjdCgpLngoKTsK KyAgICAgICAgbWF4WEludGVyY2VwdCA9IHJlY3QoKS5tYXhYKCk7CisgICAgICAgIHJldHVybiB0 cnVlOworICAgIH0KKwogICAgIGNvbnN0IEZsb2F0UmVjdCYgdG9wTGVmdFJlY3QgPSB0b3BMZWZ0 Q29ybmVyKCk7CiAgICAgY29uc3QgRmxvYXRSZWN0JiBib3R0b21MZWZ0UmVjdCA9IGJvdHRvbUxl ZnRDb3JuZXIoKTsKIAotICAgIGlmICh5ID49IHRvcExlZnRSZWN0LnkoKSAmJiB5IDwgdG9wTGVm dFJlY3QubWF4WSgpKQorICAgIGlmICghdG9wTGVmdFJlY3QuaXNFbXB0eSgpICYmIHkgPj0gdG9w TGVmdFJlY3QueSgpICYmIHkgPCB0b3BMZWZ0UmVjdC5tYXhZKCkpCiAgICAgICAgIG1pblhJbnRl cmNlcHQgPSB0b3BMZWZ0UmVjdC5tYXhYKCkgLSBjb3JuZXJSZWN0SW50ZXJjZXB0KHRvcExlZnRS ZWN0Lm1heFkoKSAtIHksIHRvcExlZnRSZWN0KTsKLSAgICBlbHNlIGlmICh5ID49IGJvdHRvbUxl ZnRSZWN0LnkoKSAmJiB5IDwgYm90dG9tTGVmdFJlY3QubWF4WSgpKQorICAgIGVsc2UgaWYgKCFi b3R0b21MZWZ0UmVjdC5pc0VtcHR5KCkgJiYgeSA+PSBib3R0b21MZWZ0UmVjdC55KCkgJiYgeSA8 PSBib3R0b21MZWZ0UmVjdC5tYXhZKCkpCiAgICAgICAgIG1pblhJbnRlcmNlcHQgPSAgYm90dG9t TGVmdFJlY3QubWF4WCgpIC0gY29ybmVyUmVjdEludGVyY2VwdCh5IC0gYm90dG9tTGVmdFJlY3Qu eSgpLCBib3R0b21MZWZ0UmVjdCk7CiAgICAgZWxzZQogICAgICAgICBtaW5YSW50ZXJjZXB0ID0g bV9yZWN0LngoKTsKQEAgLTEyMSw5ICsxMjcsOSBAQCBib29sIEZsb2F0Um91bmRlZFJlY3Q6OnhJ bnRlcmNlcHRzQXRZKGZsb2F0IHksIGZsb2F0JiBtaW5YSW50ZXJjZXB0LCBmbG9hdCYgbWF4WAog ICAgIGNvbnN0IEZsb2F0UmVjdCYgdG9wUmlnaHRSZWN0ID0gdG9wUmlnaHRDb3JuZXIoKTsKICAg ICBjb25zdCBGbG9hdFJlY3QmIGJvdHRvbVJpZ2h0UmVjdCA9IGJvdHRvbVJpZ2h0Q29ybmVyKCk7 CiAKLSAgICBpZiAoeSA+PSB0b3BSaWdodFJlY3QueSgpICYmIHkgPCB0b3BSaWdodFJlY3QubWF4 WSgpKQorICAgIGlmICghdG9wUmlnaHRSZWN0LmlzRW1wdHkoKSAmJiB5ID49IHRvcFJpZ2h0UmVj dC55KCkgJiYgeSA8PSB0b3BSaWdodFJlY3QubWF4WSgpKQogICAgICAgICBtYXhYSW50ZXJjZXB0 ID0gdG9wUmlnaHRSZWN0LngoKSArIGNvcm5lclJlY3RJbnRlcmNlcHQodG9wUmlnaHRSZWN0Lm1h eFkoKSAtIHksIHRvcFJpZ2h0UmVjdCk7Ci0gICAgZWxzZSBpZiAoeSA+PSBib3R0b21SaWdodFJl Y3QueSgpICYmIHkgPCBib3R0b21SaWdodFJlY3QubWF4WSgpKQorICAgIGVsc2UgaWYgKCFib3R0 b21SaWdodFJlY3QuaXNFbXB0eSgpICYmIHkgPj0gYm90dG9tUmlnaHRSZWN0LnkoKSAmJiB5IDw9 IGJvdHRvbVJpZ2h0UmVjdC5tYXhZKCkpCiAgICAgICAgIG1heFhJbnRlcmNlcHQgPSBib3R0b21S aWdodFJlY3QueCgpICsgY29ybmVyUmVjdEludGVyY2VwdCh5IC0gYm90dG9tUmlnaHRSZWN0Lnko KSwgYm90dG9tUmlnaHRSZWN0KTsKICAgICBlbHNlCiAgICAgICAgIG1heFhJbnRlcmNlcHQgPSBt X3JlY3QubWF4WCgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBl cy9Cb3hTaGFwZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL0JveFNoYXBl LmNwcAppbmRleCAwMTFjY2M5Li43MzE4MzBlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvc2hhcGVzL0JveFNoYXBlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJp bmcvc2hhcGVzL0JveFNoYXBlLmNwcApAQCAtOTEsMTMgKzkxLDM0IEBAIHZvaWQgQm94U2hhcGU6 OmdldEluY2x1ZGVkSW50ZXJ2YWxzKExheW91dFVuaXQgbG9naWNhbFRvcCwgTGF5b3V0VW5pdCBs b2dpY2FsSGVpCiAgICAgaWYgKG1fcGFkZGluZ0JvdW5kcy5pc0VtcHR5KCkpCiAgICAgICAgIHJl dHVybjsKIAorICAgIGZsb2F0IHkxID0gbG9naWNhbFRvcDsKKyAgICBmbG9hdCB5MiA9IGxvZ2lj YWxUb3AgKyBsb2dpY2FsSGVpZ2h0OwogICAgIGNvbnN0IEZsb2F0UmVjdCYgcmVjdCA9IG1fcGFk ZGluZ0JvdW5kcy5yZWN0KCk7Ci0gICAgaWYgKGxvZ2ljYWxUb3AgPCByZWN0LnkoKSB8fCBsb2dp Y2FsVG9wICsgbG9naWNhbEhlaWdodCA+IHJlY3QubWF4WSgpKQorCisgICAgaWYgKHkxIDwgcmVj dC55KCkgfHwgeTIgPiByZWN0Lm1heFkoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgLy8gRklY TUU6IHRoaXMgbWV0aG9kIGlzIG9ubHkgYSBzdHViLCBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTI0NjA1LgorICAgIGlmICghbV9wYWRkaW5nQm91bmRzLmlzUm91bmRl ZCgpKSB7CisgICAgICAgIHJlc3VsdC5hcHBlbmQoTGluZVNlZ21lbnQobV9wYWRkaW5nQm91bmRz LnJlY3QoKS54KCksIG1fcGFkZGluZ0JvdW5kcy5yZWN0KCkubWF4WCgpKSk7CisgICAgICAgIHJl dHVybjsKKyAgICB9CiAKLSAgICByZXN1bHQuYXBwZW5kKExpbmVTZWdtZW50KHJlY3QueCgpLCBy ZWN0Lm1heFgoKSkpOworICAgIGZsb2F0IHgxID0gcmVjdC54KCk7CisgICAgZmxvYXQgeDIgPSBy ZWN0Lm1heFgoKTsKKyAgICBmbG9hdCBtaW5YSW50ZXJjZXB0OworICAgIGZsb2F0IG1heFhJbnRl cmNlcHQ7CisKKyAgICBpZiAobV9wYWRkaW5nQm91bmRzLnhJbnRlcmNlcHRzQXRZKHkxLCBtaW5Y SW50ZXJjZXB0LCBtYXhYSW50ZXJjZXB0KSkgeworICAgICAgICB4MSA9IHN0ZDo6bWF4PGZsb2F0 Pih4MSwgbWluWEludGVyY2VwdCk7CisgICAgICAgIHgyID0gc3RkOjptaW48ZmxvYXQ+KHgyLCBt YXhYSW50ZXJjZXB0KTsKKyAgICB9CisKKyAgICBpZiAobV9wYWRkaW5nQm91bmRzLnhJbnRlcmNl cHRzQXRZKHkyLCBtaW5YSW50ZXJjZXB0LCBtYXhYSW50ZXJjZXB0KSkgeworICAgICAgICB4MSA9 IHN0ZDo6bWF4PGZsb2F0Pih4MSwgbWluWEludGVyY2VwdCk7CisgICAgICAgIHgyID0gc3RkOjpt aW48ZmxvYXQ+KHgyLCBtYXhYSW50ZXJjZXB0KTsKKyAgICB9CisKKyAgICByZXN1bHQuYXBwZW5k KExpbmVTZWdtZW50KHgxLCB4MikpOwogfQogCiBib29sIEJveFNoYXBlOjpmaXJzdEluY2x1ZGVk SW50ZXJ2YWxMb2dpY2FsVG9wKExheW91dFVuaXQgbWluTG9naWNhbEludGVydmFsVG9wLCBjb25z dCBMYXlvdXRTaXplJiwgTGF5b3V0VW5pdCYgcmVzdWx0KSBjb25zdApkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZUluZm8uY3BwIGIvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL3NoYXBlcy9TaGFwZUluZm8uY3BwCmluZGV4IDNmYTRjZTEuLjVjN2YwODgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVJbmZvLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlSW5mby5jcHAKQEAg LTc3LDcgKzc3LDYgQEAgY29uc3QgU2hhcGUmIFNoYXBlSW5mbzxSZW5kZXJUeXBlPjo6Y29tcHV0 ZWRTaGFwZSgpIGNvbnN0CiAgICAgICAgIG1fc2hhcGUgPSBTaGFwZTo6Y3JlYXRlU2hhcGUoc2hh cGVWYWx1ZS0+aW1hZ2UoKSwgc2hhcGVJbWFnZVRocmVzaG9sZCwgbV9zaGFwZUxvZ2ljYWxTaXpl LCB3cml0aW5nTW9kZSwgbWFyZ2luLCBwYWRkaW5nKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2Fz ZSBTaGFwZVZhbHVlOjpCb3g6IHsKLSAgICAgICAgQVNTRVJUKHNoYXBlVmFsdWUtPmJveCgpKTsK ICAgICAgICAgY29uc3QgUm91bmRlZFJlY3QmIHNoYXBlUmVjdCA9IG1fcmVuZGVyZXIuc3R5bGUo KS5nZXRSb3VuZGVkQm9yZGVyRm9yKExheW91dFJlY3QoTGF5b3V0UG9pbnQoKSwgbV9zaGFwZUxv Z2ljYWxTaXplKSwgJihtX3JlbmRlcmVyLnZpZXcoKSkpOwogICAgICAgICBtX3NoYXBlID0gU2hh cGU6OmNyZWF0ZVNoYXBlKHNoYXBlUmVjdCwgd3JpdGluZ01vZGUsIG1hcmdpbiwgcGFkZGluZyk7 CiAgICAgICAgIGJyZWFrOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3No YXBlcy9TaGFwZUluc2lkZUluZm8uY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3NoYXBl cy9TaGFwZUluc2lkZUluZm8uY3BwCmluZGV4IGMxY2U5ZjcuLmU0YTU2MDEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9zaGFwZXMvU2hhcGVJbnNpZGVJbmZvLmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvc2hhcGVzL1NoYXBlSW5zaWRlSW5mby5jcHAKQEAg LTU1LDcgKzU1LDcgQEAgYm9vbCBTaGFwZUluc2lkZUluZm86OmlzRW5hYmxlZEZvcihjb25zdCBS ZW5kZXJCbG9jayYgcmVuZGVyZXIpCiAgICAgY2FzZSBTaGFwZVZhbHVlOjpJbWFnZToKICAgICAg ICAgcmV0dXJuIHNoYXBlVmFsdWUtPmlzSW1hZ2VWYWxpZCgpICYmIGNoZWNrU2hhcGVJbWFnZU9y aWdpbihyZW5kZXJlci5kb2N1bWVudCgpLCAqKHNoYXBlVmFsdWUtPmltYWdlKCktPmNhY2hlZElt YWdlKCkpKTsKICAgICBjYXNlIFNoYXBlVmFsdWU6OkJveDoKLSAgICAgICAgcmV0dXJuIGZhbHNl OworICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICBjYXNlIFNoYXBlVmFsdWU6Ok91dHNpZGU6CiAg ICAgICAgIC8vIE91dHNpZGUgdmFsdWUgbXVzdCBhbHJlYWR5IGJlIHJlc29sdmVkCiAgICAgICAg IGJyZWFrOwo=