121864 2013-09-24 14:07:54 -0700 [CSS Shapes] Modify updateSegmentsForShapes function to use logical coordinates 2013-09-24 15:23:31 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 121615 1 zoltan zoltan commit-queue esprehn+autocc glenn kondapallykalyan oldest_to_newest 932708 0 zoltan 2013-09-24 14:07:54 -0700 When I landed updateSegmentsForShapes in r156022, I didn't use logical coordinates. This change modifies the code to use coordinates for positioning the float and the content around the float in a shape-inside. 932718 1 212502 zoltan 2013-09-24 14:21:56 -0700 Created attachment 212502 proposed patch 932735 2 212502 hyatt 2013-09-24 14:59:14 -0700 Comment on attachment 212502 proposed patch r=me 932749 3 212502 commit-queue 2013-09-24 15:23:30 -0700 Comment on attachment 212502 proposed patch Clearing flags on attachment: 212502 Committed r156364: <http://trac.webkit.org/changeset/156364> 932750 4 commit-queue 2013-09-24 15:23:31 -0700 All reviewed patches have been landed. Closing bug. 212502 2013-09-24 14:21:56 -0700 2013-09-24 15:23:29 -0700 proposed patch logicalsept23.patch text/plain 11640 zoltan ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0ZmYxMzY5Li4xMDUxODZkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTMtMDkt MjQgIFpvbHRhbiBIb3J2YXRoICA8em9sdGFuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0NTUyBT aGFwZXNdIE1vZGlmeSB1cGRhdGVTZWdtZW50c0ZvclNoYXBlcyBmdW5jdGlvbiB0byB1c2UgbG9n aWNhbCBjb29yZGluYXRlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTIxODY0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgV2hlbiBJIGxhbmRlZCB1cGRhdGVTZWdtZW50c0ZvclNoYXBlcyBpbiByMTU2MDIy LCBJIGRpZG4ndCB1c2UgbG9naWNhbCBjb29yZGluYXRlcy4gVGhpcyBjaGFuZ2UgbW9kaWZpZXMg dGhlCisgICAgICAgIGNvZGUgdG8gdXNlIGNvb3JkaW5hdGVzIGZvciBwb3NpdGlvbmluZyB0aGUg ZmxvYXQgYW5kIHRoZSBjb250ZW50IGFyb3VuZCB0aGUgZmxvYXQgaW4gYSBzaGFwZS1pbnNpZGUu IE5vdyBJCisgICAgICAgIGFkZGVkIG9ubHkgb25lIHdyaXRpbmcgbW9kZSB0ZXN0cywgYnV0IEkg d2lsbCBhZGQgbW9yZSBsYXRlciBpbiBidWcgIzEyMTg2Ni4KKworICAgICAgICAqIGZhc3Qvc2hh cGVzL3NoYXBlLWluc2lkZS9zaGFwZS1pbnNpZGUtbGVmdC1mbG9hdC1pbi11cHBlci1sZWZ0LXRy aWFuZ2xlLXZlcnRpY2FsLWxyLWlubGluZS1jb250ZW50LWV4cGVjdGVkLmh0bWw6IEFkZGVkLgor ICAgICAgICAqIGZhc3Qvc2hhcGVzL3NoYXBlLWluc2lkZS9zaGFwZS1pbnNpZGUtbGVmdC1mbG9h dC1pbi11cHBlci1sZWZ0LXRyaWFuZ2xlLXZlcnRpY2FsLWxyLWlubGluZS1jb250ZW50Lmh0bWw6 IEFkZGVkLgorCiAyMDEzLTA5LTI0ICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAog ICAgICAgICBVc2UgbWFwcGVkIG5hbWUgaW4gYXR0cmlidXRlIGxvY2F0aW9uIGJpbmRpbmcKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLWluc2lkZS9zaGFwZS1pbnNp ZGUtbGVmdC1mbG9hdC1pbi11cHBlci1sZWZ0LXRyaWFuZ2xlLXZlcnRpY2FsLWxyLWlubGluZS1j b250ZW50LWV4cGVjdGVkLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L3NoYXBlcy9zaGFwZS1pbnNp ZGUvc2hhcGUtaW5zaWRlLWxlZnQtZmxvYXQtaW4tdXBwZXItbGVmdC10cmlhbmdsZS12ZXJ0aWNh bC1sci1pbmxpbmUtY29udGVudC1leHBlY3RlZC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0Cmlu ZGV4IDAwMDAwMDAuLjQyYjY1NTAKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0 L3NoYXBlcy9zaGFwZS1pbnNpZGUvc2hhcGUtaW5zaWRlLWxlZnQtZmxvYXQtaW4tdXBwZXItbGVm dC10cmlhbmdsZS12ZXJ0aWNhbC1sci1pbmxpbmUtY29udGVudC1leHBlY3RlZC5odG1sCkBAIC0w LDAgKzEsNjAgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVhZD4KKzxzdHlsZT4KKyAg ICAjcG9seWdvbi1zdmctc2hhcGUgeworICAgICAgICBwb3NpdGlvbjogYWJzb2x1dGU7CisgICAg ICAgIGxlZnQ6IDBweDsKKyAgICAgICAgdG9wOiAwcHg7CisgICAgICAgIHdpZHRoOiAyMDBweDsK KyAgICAgICAgaGVpZ2h0OiAyMDBweDsKKyAgICB9CisgICAgI3NoYXBlLWluc2lkZSB7CisgICAg ICAgIC13ZWJraXQtd3JpdGluZy1tb2RlOiB2ZXJ0aWNhbC1scjsKKyAgICAgICAgZm9udDogMjBw eCBBaGVtLCBzYW5zLXNlcmlmOworICAgICAgICBsaW5lLWhlaWdodDogMjBweDsKKyAgICAgICAg cG9zaXRpb246IGFic29sdXRlOworICAgICAgICBsZWZ0OiAwcHg7CisgICAgICAgIHRvcDogMHB4 OworICAgIH0KKyAgICAjZmxvYXQgeworICAgICAgICB3aWR0aDogNTBweDsKKyAgICAgICAgaGVp Z2h0OiA1MHB4OworICAgICAgICBmbG9hdDogbGVmdDsKKyAgICAgICAgYmFja2dyb3VuZC1jb2xv cjogeWVsbG93OworICAgIH0KKyAgICAjb3ZlcmZsb3cgeworICAgICAgICBoZWlnaHQ6IDIwMHB4 OworICAgICAgICBtYXJnaW4tbGVmdDogMjBweDsKKyAgICB9Cis8L3N0eWxlPgorPC9oZWFkPgor PGJvZHk+CisgICAgPHN2ZyBpZD0icG9seWdvbi1zdmctc2hhcGUiIHhtbG5zPSJodHRwOi8vd3d3 LnczLm9yZy8yMDAwL3N2ZyI+CisgICAgICAgIDxwb2x5Z29uIHBvaW50cz0iMCwwIDIwMCwwIDAs MjAwIiBmaWxsPSIjNjM2MzYzIj48L3BvbHlnb24+CisgICAgPC9zdmc+CisgICAgPGRpdiBpZD0i c2hhcGUtaW5zaWRlIj4KKyAgICAgICAgPGRpdiBpZD0iZmxvYXQiPjwvZGl2PgorICAgICAgICA8 c3BhbiBzdHlsZT0iY29sb3I6IHJlZDsiPlg8L3NwYW4+CisgICAgICAgIDxzcGFuIHN0eWxlPSJj b2xvcjogd2hpdGU7Ij5YPC9zcGFuPgorICAgICAgICA8c3BhbiBzdHlsZT0iY29sb3I6IGdyZWVu OyI+WDwvc3Bhbj48YnIvPgorICAgICAgICBYIFggWDxici8+CisgICAgICAgIFggWDxici8+Cisg ICAgICAgIFggWCBYPGJyLz4KKyAgICAgICAgWCBYIFg8YnIvPgorICAgICAgICBYIFg8YnIvPgor ICAgICAgICBYIFg8YnIvPgorICAgICAgICBYPGJyLz4KKyAgICAgICAgWDxici8+CisgICAgICAg IDxkaXYgaWQ9Im92ZXJmbG93Ij5YIFggWCBYIFggWDwvZGl2PgorICAgIDwvZGl2PgorCisgICAg PHAgc3R5bGU9Im1hcmdpbi10b3A6IDI1MHB4OyI+CisgICAgVGhlcmUgaXMgYSB0cmlhbmdsZSBz aGFwZS1pbnNpZGUgKHJlcHJlc2VudGVkIGJ5IHRoZSBtYXRjaGluZyBmaWxsZWQgU1ZHIHBvbHln b24pLCB0aGUgc2hhcGUtaW5zaWRlIGNvbnRhaW5zIGEgNTB4NTBweCB5ZWxsb3cgZmxvYXQgbGVm dCwKKyAgICB0aGUgZmxvYXQgc2hvdWxkIGJlIGF0IHRoZSB2ZXJ5IGxlZnQgYW5kIHRvcCBwb3Np dGlvbiBpbnNpZGUgdGhlIHRyaWFuZ2xlIHNoYXBlIHdoZXJlIGl0IGZpdHMgZmlyc3QuCisgICAg VGhlIHdyaXRpbmcgbW9kZSBpcyB2ZXJ0aWNhbC1sciwgdGhlIGZpcnN0IGNvbHVtbiB1bmRlciB0 aGUgeWVsbG93IGZsb2F0IHNob3VsZCBjb250YWluIGEgcmVkLCB3aGl0ZSBhbmQgZ3JlZW4gYm94 IGluIHRoaXMgb3JkZXIuCisgICAgVGhlIG92ZXJmbG93IHNob3VsZCBiZSBwdXNoZWQgb24gdGhl IHJpZ2h0IHNpZGUgb2YgdHJpYW5nbGUgc2hhcGUtaW5zaWRlLgorICAgIDwvcD4KKyAgICA8cD5C dWcgPGEgaHJlZj0iaHR0cDovL3dlYmtpdC5vcmcvYi8xMDI4NDYiPjEwMjg0NjwvYT46IFtDU1Mg U2hhcGVzXSBVc2UgdGhlIGZsb2F0IGhlaWdodCB0byBkZXRlcm1pbmUgcG9zaXRpb24gaW4gc2hh cGUtaW5zaWRlPC9wPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv ZmFzdC9zaGFwZXMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lkZS1sZWZ0LWZsb2F0LWluLXVwcGVy LWxlZnQtdHJpYW5nbGUtdmVydGljYWwtbHItaW5saW5lLWNvbnRlbnQuaHRtbCBiL0xheW91dFRl c3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLWluc2lkZS9zaGFwZS1pbnNpZGUtbGVmdC1mbG9hdC1pbi11 cHBlci1sZWZ0LXRyaWFuZ2xlLXZlcnRpY2FsLWxyLWlubGluZS1jb250ZW50Lmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uNTJkY2IxZgotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3Qvc2hhcGVzL3NoYXBlLWluc2lkZS9zaGFwZS1pbnNpZGUtbGVmdC1m bG9hdC1pbi11cHBlci1sZWZ0LXRyaWFuZ2xlLXZlcnRpY2FsLWxyLWlubGluZS1jb250ZW50Lmh0 bWwKQEAgLTAsMCArMSw0NyBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHN0 eWxlPgorICAgICNwb2x5Z29uLXN2Zy1zaGFwZSB7CisgICAgICAgIHBvc2l0aW9uOiBhYnNvbHV0 ZTsKKyAgICAgICAgbGVmdDogMHB4OworICAgICAgICB0b3A6IDBweDsKKyAgICB9CisgICAgI3No YXBlLWluc2lkZSB7CisgICAgICAgIGZvbnQ6IDIwcHggQWhlbSwgc2Fucy1zZXJpZjsKKyAgICAg ICAgbGluZS1oZWlnaHQ6IDIwcHg7CisgICAgICAgIHdpZHRoOiAyMDBweDsKKyAgICAgICAgaGVp Z2h0OiAyMDBweDsKKyAgICAgICAgcG9zaXRpb246IGFic29sdXRlOworICAgICAgICBsZWZ0OiAw cHg7CisgICAgICAgIHRvcDogMHB4OworICAgICAgICAtd2Via2l0LXNoYXBlLWluc2lkZTogcG9s eWdvbigwcHggMHB4LCAyMDBweCAwcHgsIDBweCAyMDBweCk7CisgICAgICAgIC13ZWJraXQtd3Jp dGluZy1tb2RlOiB2ZXJ0aWNhbC1scjsKKyAgICB9CisgICAgI2Zsb2F0IHsKKyAgICAgICAgd2lk dGg6IDUwcHg7CisgICAgICAgIGhlaWdodDogNTBweDsKKyAgICAgICAgZmxvYXQ6IGxlZnQ7Cisg ICAgICAgIGJhY2tncm91bmQtY29sb3I6IHllbGxvdzsKKyAgICB9Cis8L3N0eWxlPgorPC9oZWFk PgorPGJvZHk+CisgICAgPHN2ZyBpZD0icG9seWdvbi1zdmctc2hhcGUiIHhtbG5zPSJodHRwOi8v d3d3LnczLm9yZy8yMDAwL3N2ZyI+CisgICAgICAgIDxwb2x5Z29uIHBvaW50cz0iMCwwIDIwMCww IDAsMjAwIiBmaWxsPSIjNjM2MzYzIj48L3BvbHlnb24+CisgICAgPC9zdmc+CisgICAgPGRpdiBp ZD0ic2hhcGUtaW5zaWRlIj4KKyAgICAgICAgPHNwYW4gc3R5bGU9ImNvbG9yOiByZWQ7Ij5BPC9z cGFuPgorICAgICAgICA8ZGl2IGlkPSJmbG9hdCI+PC9kaXY+CisgICAgICAgIDxzcGFuIHN0eWxl PSJjb2xvcjogd2hpdGU7Ij5YPC9zcGFuPgorICAgICAgICA8c3BhbiBzdHlsZT0iY29sb3I6IGdy ZWVuOyI+WDwvc3Bhbj4gWCBYIFggWCBYIFggWCBYIFggWCBYIFggWCBYIFggWCBYIFggWCBYIFgg WCBYCisgICAgPC9kaXY+CisgICAgPHAgc3R5bGU9Im1hcmdpbi10b3A6IDI1MHB4OyI+CisgICAg ICBUaGVyZSBpcyBhIHRyaWFuZ2xlIHNoYXBlLWluc2lkZSAocmVwcmVzZW50ZWQgYnkgdGhlIG1h dGNoaW5nIGZpbGxlZCBTVkcgcG9seWdvbiksIHRoZSBzaGFwZS1pbnNpZGUgY29udGFpbnMgYSA1 MHg1MHB4IHllbGxvdyBmbG9hdCBsZWZ0LAorICAgICAgdGhlIGZsb2F0IHNob3VsZCBiZSBhdCB0 aGUgdmVyeSBsZWZ0IGFuZCB0b3AgcG9zaXRpb24gaW5zaWRlIHRoZSB0cmlhbmdsZSBzaGFwZSB3 aGVyZSBpdCBmaXRzIGZpcnN0LgorICAgICAgVGhlIHdyaXRpbmcgbW9kZSBpcyB2ZXJ0aWNhbC1s ciwgdGhlIGZpcnN0IGNvbHVtbiB1bmRlciB0aGUgeWVsbG93IGZsb2F0IHNob3VsZCBjb250YWlu IGEgcmVkLCB3aGl0ZSBhbmQgZ3JlZW4gYm94IGluIHRoaXMgb3JkZXIuCisgICAgICBUaGUgb3Zl cmZsb3cgc2hvdWxkIGJlIHB1c2hlZCBvbiB0aGUgcmlnaHQgc2lkZSBvZiB0cmlhbmdsZSBzaGFw ZS1pbnNpZGUuCisgICAgPC9wPgorICAgIDxwPkJ1ZyA8YSBocmVmPSJodHRwOi8vd2Via2l0Lm9y Zy9iLzEwMjg0NiI+MTAyODQ2PC9hPjogW0NTUyBTaGFwZXNdIFVzZSB0aGUgZmxvYXQgaGVpZ2h0 IHRvIGRldGVybWluZSBwb3NpdGlvbiBpbiBzaGFwZS1pbnNpZGU8L3A+Cis8L2JvZHk+Cis8L2h0 bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKaW5kZXggZjNlNjMzZC4uNThiN2MwMCAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsx LDIzIEBACisyMDEzLTA5LTI0ICBab2x0YW4gSG9ydmF0aCAgPHpvbHRhbkB3ZWJraXQub3JnPgor CisgICAgICAgIFtDU1MgU2hhcGVzXSBNb2RpZnkgdXBkYXRlU2VnbWVudHNGb3JTaGFwZXMgZnVu Y3Rpb24gdG8gdXNlIGxvZ2ljYWwgY29vcmRpbmF0ZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyMTg2NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFdoZW4gSSBsYW5kZWQgdXBkYXRlU2VnbWVudHNGb3JT aGFwZXMgaW4gcjE1NjAyMiwgSSBkaWRuJ3QgdXNlIGxvZ2ljYWwgY29vcmRpbmF0ZXMuIFRoaXMg Y2hhbmdlIG1vZGlmaWVzIHRoZQorICAgICAgICBjb2RlIHRvIHVzZSBjb29yZGluYXRlcyBmb3Ig cG9zaXRpb25pbmcgdGhlIGZsb2F0IGFuZCB0aGUgY29udGVudCBhcm91bmQgdGhlIGZsb2F0IGlu IGEgc2hhcGUtaW5zaWRlLiBOb3cgSQorICAgICAgICBhZGRlZCBvbmx5IG9uZSB3cml0aW5nIG1v ZGUgdGVzdHMsIGJ1dCBJIHdpbGwgYWRkIG1vcmUgbGF0ZXIgaW4gYnVnICMxMjE4NjYuCisKKyAg ICAgICAgVGVzdDogZmFzdC9zaGFwZXMvc2hhcGUtaW5zaWRlL3NoYXBlLWluc2lkZS1sZWZ0LWZs b2F0LWluLXVwcGVyLWxlZnQtdHJpYW5nbGUtdmVydGljYWwtbHItaW5saW5lLWNvbnRlbnQuaHRt bAorCisgICAgICAgICogcmVuZGVyaW5nL0Zsb2F0aW5nT2JqZWN0cy5oOgorICAgICAgICAoV2Vi Q29yZTo6RmxvYXRpbmdPYmplY3Q6OmxvZ2ljYWxIZWlnaHQpOgorICAgICAgICAqIHJlbmRlcmlu Zy9SZW5kZXJCbG9jay5jcHA6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJCbG9jazo6Y29tcHV0 ZUxvZ2ljYWxMb2NhdGlvbkZvckZsb2F0KToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyQmxv Y2tMaW5lTGF5b3V0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OnVwZGF0ZVNlZ21lbnRzRm9yU2hh cGVzKToKKwogMjAxMy0wOS0yNCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAK ICAgICAgICAgVGlnaHRlbiB0YWJsZSByZW5kZXJpbmcgY29kZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL0Zsb2F0aW5nT2JqZWN0cy5oIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL0Zsb2F0aW5nT2JqZWN0cy5oCmluZGV4IGNkYTVhM2MuLmZhMTIwODUgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9GbG9hdGluZ09iamVjdHMuaAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvRmxvYXRpbmdPYmplY3RzLmgKQEAgLTkxLDYgKzkxLDcgQEAg cHVibGljOgogICAgIExheW91dFVuaXQgbG9naWNhbExlZnQoYm9vbCBpc0hvcml6b250YWxXcml0 aW5nTW9kZSkgY29uc3QgeyByZXR1cm4gaXNIb3Jpem9udGFsV3JpdGluZ01vZGUgPyB4KCkgOiB5 KCk7IH0KICAgICBMYXlvdXRVbml0IGxvZ2ljYWxSaWdodChib29sIGlzSG9yaXpvbnRhbFdyaXRp bmdNb2RlKSBjb25zdCB7IHJldHVybiBpc0hvcml6b250YWxXcml0aW5nTW9kZSA/IG1heFgoKSA6 IG1heFkoKTsgfQogICAgIExheW91dFVuaXQgbG9naWNhbFdpZHRoKGJvb2wgaXNIb3Jpem9udGFs V3JpdGluZ01vZGUpIGNvbnN0IHsgcmV0dXJuIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlID8gd2lk dGgoKSA6IGhlaWdodCgpOyB9CisgICAgTGF5b3V0VW5pdCBsb2dpY2FsSGVpZ2h0KGJvb2wgaXNI b3Jpem9udGFsV3JpdGluZ01vZGUpIGNvbnN0IHsgcmV0dXJuIGlzSG9yaXpvbnRhbFdyaXRpbmdN b2RlID8gaGVpZ2h0KCkgOiB3aWR0aCgpOyB9CiAKICAgICBpbnQgcGl4ZWxTbmFwcGVkTG9naWNh bFRvcChib29sIGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKSBjb25zdCB7IHJldHVybiBpc0hvcml6 b250YWxXcml0aW5nTW9kZSA/IGZyYW1lUmVjdCgpLnBpeGVsU25hcHBlZFkoKSA6IGZyYW1lUmVj dCgpLnBpeGVsU25hcHBlZFgoKTsgfQogICAgIGludCBwaXhlbFNuYXBwZWRMb2dpY2FsQm90dG9t KGJvb2wgaXNIb3Jpem9udGFsV3JpdGluZ01vZGUpIGNvbnN0IHsgcmV0dXJuIGlzSG9yaXpvbnRh bFdyaXRpbmdNb2RlID8gZnJhbWVSZWN0KCkucGl4ZWxTbmFwcGVkTWF4WSgpIDogZnJhbWVSZWN0 KCkucGl4ZWxTbmFwcGVkTWF4WCgpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyQmxvY2suY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrLmNwcAppbmRleCA1YTYyY2NkLi4wOGQ5MmFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2suY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJCbG9jay5jcHAKQEAgLTMzNTcsOCArMzM1Nyw5IEBAIExheW91dFBvaW50IFJlbmRl ckJsb2NrOjpjb21wdXRlTG9naWNhbExvY2F0aW9uRm9yRmxvYXQoY29uc3QgRmxvYXRpbmdPYmpl Y3QqIGZsCiAgICAgU2hhcGVJbnNpZGVJbmZvKiBzaGFwZUluc2lkZUluZm8gPSB0aGlzLT5zaGFw ZUluc2lkZUluZm8oKTsKICAgICAvLyBGSVhNRTogSW1wbGVtZW50IGJlaGF2aW9yIGZvciByaWdo dCBmbG9hdHMuCiAgICAgaWYgKHNoYXBlSW5zaWRlSW5mbykgeworICAgICAgICBMYXlvdXRTaXpl IGZsb2F0TG9naWNhbFNpemUgPSBMYXlvdXRTaXplKGZsb2F0aW5nT2JqZWN0LT5sb2dpY2FsV2lk dGgoaXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSksIGZsb2F0aW5nT2JqZWN0LT5sb2dpY2FsSGVp Z2h0KGlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkpKTsKICAgICAgICAgLy8gRklYTUU6IElmIHRo ZSBmbG9hdCBkb2Vzbid0IGZpdCBpbiB0aGUgc2hhcGUgd2Ugc2hvdWxkIHB1c2ggaXQgdW5kZXIg dGhlIGNvbnRlbnQgYm94Ci0gICAgICAgIGxvZ2ljYWxUb3BPZmZzZXQgPSBzaGFwZUluc2lkZUlu Zm8tPmNvbXB1dGVGaXJzdEZpdFBvc2l0aW9uRm9yRmxvYXQoTGF5b3V0U2l6ZShmbG9hdGluZ09i amVjdC0+d2lkdGgoKSwgZmxvYXRpbmdPYmplY3QtPmhlaWdodCgpKSk7CisgICAgICAgIGxvZ2lj YWxUb3BPZmZzZXQgPSBzaGFwZUluc2lkZUluZm8tPmNvbXB1dGVGaXJzdEZpdFBvc2l0aW9uRm9y RmxvYXQoZmxvYXRMb2dpY2FsU2l6ZSk7CiAgICAgICAgIGlmIChsb2dpY2FsSGVpZ2h0KCkgPiBs b2dpY2FsVG9wT2Zmc2V0KQogICAgICAgICAgICAgbG9naWNhbFRvcE9mZnNldCA9IGxvZ2ljYWxI ZWlnaHQoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJs b2NrTGluZUxheW91dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tM aW5lTGF5b3V0LmNwcAppbmRleCBmYWU5MjQ0Li5kMjNmYjdjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQmxvY2tMaW5lTGF5b3V0LmNwcApAQCAtMjYzMSwyMSAr MjYzMSwzMSBAQCBzdGF0aWMgdm9pZCB1cGRhdGVTZWdtZW50c0ZvclNoYXBlcyhSZW5kZXJCbG9j ayogYmxvY2ssIGNvbnN0IEZsb2F0aW5nT2JqZWN0KiBsYQogICAgIEFTU0VSVChsYXN0RmxvYXRG cm9tUHJldmlvdXNMaW5lKTsKIAogICAgIFNoYXBlSW5zaWRlSW5mbyogc2hhcGVJbnNpZGVJbmZv ID0gYmxvY2stPmxheW91dFNoYXBlSW5zaWRlSW5mbygpOwotICAgIExheW91dFVuaXQgbGluZUxv Z2ljYWxIZWlnaHQgPSBibG9jay0+bGluZUhlaWdodChpc0ZpcnN0TGluZSwgYmxvY2stPmlzSG9y aXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBIb3Jpem9udGFsTGluZSA6IFZlcnRpY2FsTGluZSwgUG9z aXRpb25PZkludGVyaW9yTGluZUJveGVzKTsKLSAgICBMYXlvdXRVbml0IGxpbmVMb2dpY2FsQm90 dG9tID0gYmxvY2stPmxvZ2ljYWxIZWlnaHQoKSArIGxpbmVMb2dpY2FsSGVpZ2h0OwotICAgIGJv b2wgbGluZU92ZXJsYXBzV2l0aEZsb2F0ID0gKGxhc3RGbG9hdEZyb21QcmV2aW91c0xpbmUtPnko KSA8IGxpbmVMb2dpY2FsQm90dG9tKSAmJiAoYmxvY2stPmxvZ2ljYWxIZWlnaHQoKSA8IGxhc3RG bG9hdEZyb21QcmV2aW91c0xpbmUtPm1heFkoKSk7CisgICAgaWYgKCFzaGFwZUluc2lkZUluZm8p CisgICAgICAgIHJldHVybjsKKworICAgIGJvb2wgaXNIb3Jpem9udGFsV3JpdGluZ01vZGUgPSBi bG9jay0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKTsKIAotICAgIGlmICghc2hhcGVJbnNpZGVJ bmZvIHx8ICFsaW5lT3ZlcmxhcHNXaXRoRmxvYXQpCisgICAgTGF5b3V0VW5pdCBsaW5lTG9naWNh bFRvcCA9IGJsb2NrLT5sb2dpY2FsSGVpZ2h0KCk7CisgICAgTGF5b3V0VW5pdCBsaW5lTG9naWNh bEhlaWdodCA9IGJsb2NrLT5saW5lSGVpZ2h0KGlzRmlyc3RMaW5lLCBpc0hvcml6b250YWxXcml0 aW5nTW9kZSA/IEhvcml6b250YWxMaW5lIDogVmVydGljYWxMaW5lLCBQb3NpdGlvbk9mSW50ZXJp b3JMaW5lQm94ZXMpOworICAgIExheW91dFVuaXQgbGluZUxvZ2ljYWxCb3R0b20gPSBsaW5lTG9n aWNhbFRvcCArIGxpbmVMb2dpY2FsSGVpZ2h0OworCisgICAgTGF5b3V0VW5pdCBmbG9hdExvZ2lj YWxUb3AgPSBsYXN0RmxvYXRGcm9tUHJldmlvdXNMaW5lLT5sb2dpY2FsVG9wKGlzSG9yaXpvbnRh bFdyaXRpbmdNb2RlKTsKKyAgICBMYXlvdXRVbml0IGZsb2F0TG9naWNhbEJvdHRvbSA9IGxhc3RG bG9hdEZyb21QcmV2aW91c0xpbmUtPmxvZ2ljYWxCb3R0b20oaXNIb3Jpem9udGFsV3JpdGluZ01v ZGUpOworCisgICAgYm9vbCBsaW5lT3ZlcmxhcHNXaXRoRmxvYXQgPSAoZmxvYXRMb2dpY2FsVG9w IDwgbGluZUxvZ2ljYWxCb3R0b20pICYmIChsaW5lTG9naWNhbFRvcCA8IGZsb2F0TG9naWNhbEJv dHRvbSk7CisgICAgaWYgKCFsaW5lT3ZlcmxhcHNXaXRoRmxvYXQpCiAgICAgICAgIHJldHVybjsK IAotICAgIGZsb2F0IG1pbldpZHRoID0gZmlyc3RQb3NpdGl2ZVdpZHRoKHdvcmRNZWFzdXJlbWVu dHMpOworICAgIGZsb2F0IG1pblNlZ21lbnRXaWR0aCA9IGZpcnN0UG9zaXRpdmVXaWR0aCh3b3Jk TWVhc3VyZW1lbnRzKTsKIAotICAgIExheW91dFVuaXQgYXZhaWxhYmxlV2lkdGggPSBibG9jay0+ d2lkdGgoKSAtIGxhc3RGbG9hdEZyb21QcmV2aW91c0xpbmUtPm1heFgoKTsKLSAgICBpZiAoYXZh aWxhYmxlV2lkdGggPCBtaW5XaWR0aCkKLSAgICAgICAgYmxvY2stPnNldExvZ2ljYWxIZWlnaHQo bGFzdEZsb2F0RnJvbVByZXZpb3VzTGluZS0+bWF4WSgpKTsKKyAgICBMYXlvdXRVbml0IGZsb2F0 TG9naWNhbFdpZHRoID0gbGFzdEZsb2F0RnJvbVByZXZpb3VzTGluZS0+bG9naWNhbFdpZHRoKGlz SG9yaXpvbnRhbFdyaXRpbmdNb2RlKTsKKyAgICBMYXlvdXRVbml0IGF2YWlsYWJsZUxvZ2ljYWxX aWR0aCA9IGJsb2NrLT5sb2dpY2FsV2lkdGgoKSAtIGxhc3RGbG9hdEZyb21QcmV2aW91c0xpbmUt PmxvZ2ljYWxSaWdodChpc0hvcml6b250YWxXcml0aW5nTW9kZSk7CisgICAgaWYgKGF2YWlsYWJs ZUxvZ2ljYWxXaWR0aCA8IG1pblNlZ21lbnRXaWR0aCkKKyAgICAgICAgYmxvY2stPnNldExvZ2lj YWxIZWlnaHQoZmxvYXRMb2dpY2FsQm90dG9tKTsKIAotICAgIGlmIChibG9jay0+bG9naWNhbEhl aWdodCgpIDwgbGFzdEZsb2F0RnJvbVByZXZpb3VzTGluZS0+eSgpKSB7Ci0gICAgICAgIHNoYXBl SW5zaWRlSW5mby0+YWRqdXN0TG9naWNhbExpbmVUb3AobWluV2lkdGggKyBsYXN0RmxvYXRGcm9t UHJldmlvdXNMaW5lLT53aWR0aCgpKTsKKyAgICBpZiAoYmxvY2stPmxvZ2ljYWxIZWlnaHQoKSA8 IGZsb2F0TG9naWNhbFRvcCkgeworICAgICAgICBzaGFwZUluc2lkZUluZm8tPmFkanVzdExvZ2lj YWxMaW5lVG9wKG1pblNlZ21lbnRXaWR0aCArIGZsb2F0TG9naWNhbFdpZHRoKTsKICAgICAgICAg YmxvY2stPnNldExvZ2ljYWxIZWlnaHQoc2hhcGVJbnNpZGVJbmZvLT5sb2dpY2FsTGluZVRvcCgp KTsKICAgICB9CiAK