77385 2012-01-30 16:47:46 -0800 flex-pack:center and flex-item-align:center should do true centering 2012-02-10 15:01:52 -0800 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 62048 1 ojan ojan hyatt tony oldest_to_newest 545602 0 ojan 2012-01-30 16:47:46 -0800 http://dev.w3.org/csswg/css3-flexbox/#flex-align: "If the cross size of the flexbox is less than than that of the flexbox item, it will overflow equally in both directions." http://dev.w3.org/csswg/css3-flexbox/#flex-pack: "If the leftover free-space is negative, the flexbox items will overflow equally in both directions." http://plexode.com/eval3/#ht=%3Cdiv%20style%3D%22display%3A-webkit-flexbox%3B%20-webkit-flex-pack%3Acenter%3B%20border%3A%202px%20solid%20blue%3B%20width%3A%2010px%3B%22%3E%0A%20%20%20%20%3Cdiv%20style%3D%22background-color%3Ared%22%3Efoo%3C%2Fdiv%3E%0A%3C%2Fdiv%3E&ohh=1&ohj=1&jt=&ojh=1&ojj=1&ms=100&oth=0&otj=0&cex=1 554288 1 126552 ojan 2012-02-10 12:21:33 -0800 Created attachment 126552 Patch 554297 2 126552 tony 2012-02-10 12:31:10 -0800 Comment on attachment 126552 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=126552&action=review If you wanted to be thorough, you could add writing mode tests. > Source/WebCore/ChangeLog:9 > + Also, removed passing totalPositiveFlexibility around. We don't > + need to know about positive/negative flex once we run the flexing algorithm. I remember why we had this. It was when you could flex margins. Maybe mention that in the ChangeLog. 554415 3 ojan 2012-02-10 15:01:52 -0800 Committed r107446: <http://trac.webkit.org/changeset/107446> 126552 2012-02-10 12:21:33 -0800 2012-02-10 12:31:10 -0800 Patch bug-77385-20120210122132.patch text/plain 13710 ojan U3VidmVyc2lvbiBSZXZpc2lvbjogMTA3MzQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjVjMGNmZmJlZGI3YzAz YTM3YTY2Y2JkYmIxNGI3ZDExZGEyZjE4Ni4uZWEwNGE3MzQ0YjI0NzQ0YzNkNDUwYWNiOGYwZjYw ZDFkMjcxMTIyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDEyLTAyLTEwICBPamFu IFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgZmxleC1wYWNrOmNlbnRlciBh bmQgZmxleC1pdGVtLWFsaWduOmNlbnRlciBzaG91bGQgZG8gdHJ1ZSBjZW50ZXJpbmcKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc3Mzg1CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWxzbywgcmVtb3ZlZCBw YXNzaW5nIHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0eSBhcm91bmQuIFdlIGRvbid0CisgICAgICAg IG5lZWQgdG8ga25vdyBhYm91dCBwb3NpdGl2ZS9uZWdhdGl2ZSBmbGV4IG9uY2Ugd2UgcnVuIHRo ZSBmbGV4aW5nIGFsZ29yaXRobS4KKworICAgICAgICBUZXN0OiBjc3MzL2ZsZXhib3gvdHJ1ZS1j ZW50ZXJpbmcuaHRtbAorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRGbGV4SXRlbXMp OgorICAgICAgICAoV2ViQ29yZTo6aW5pdGlhbFBhY2tpbmdPZmZzZXQpOgorICAgICAgICAoV2Vi Q29yZTo6cGFja2luZ1NwYWNlQmV0d2VlbkNoaWxkcmVuKToKKyAgICAgICAgKFdlYkNvcmU6OlJl bmRlckZsZXhpYmxlQm94OjpsYXlvdXRBbmRQbGFjZUNoaWxkcmVuKToKKyAgICAgICAgKFdlYkNv cmU6OlJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRDb2x1bW5SZXZlcnNlKToKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaDoKKyAgICAgICAgKFJlbmRlckZsZXhpYmxlQm94 KToKKwogMjAxMi0wMi0wOSAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgog CiAgICAgICAgIFVwZGF0ZSB0aGUgc2Nyb2xsIGxheWVyIHBvc2l0aW9uIG9uIHRoZSBtYWluIHRo cmVhZCB3aGVuIHdlIGhhdmUgc2xvdyByZXBhaW50IG9iamVjdHMKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmluZGV4IDlmYTU2NjA0Yzc3ZTFlN2Yy NzYwNDMwNzJmM2NmMTMwNjVhYzgwMGQuLjM2ZmVmYjM4NWRkMmI3MzI0ZTZmNDdjYTg4YzZiNmUw MmMxZjE5NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4 aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxl Qm94LmNwcApAQCAtNDQxLDcgKzQ0MSw3IEBAIHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91 dEZsZXhJdGVtcyhib29sIHJlbGF5b3V0Q2hpbGRyZW4pCiAgICAgICAgIEFTU0VSVChpbmZsZXhp YmxlSXRlbXMuc2l6ZSgpID4gMCk7CiAgICAgfQogCi0gICAgbGF5b3V0QW5kUGxhY2VDaGlsZHJl bihvcmRlcmVkQ2hpbGRyZW4sIGNoaWxkU2l6ZXMsIGF2YWlsYWJsZUZyZWVTcGFjZSwgdG90YWxQ b3NpdGl2ZUZsZXhpYmlsaXR5KTsKKyAgICBsYXlvdXRBbmRQbGFjZUNoaWxkcmVuKG9yZGVyZWRD aGlsZHJlbiwgY2hpbGRTaXplcywgYXZhaWxhYmxlRnJlZVNwYWNlKTsKIH0KIAogZmxvYXQgUmVu ZGVyRmxleGlibGVCb3g6OnBvc2l0aXZlRmxleEZvckNoaWxkKFJlbmRlckJveCogY2hpbGQpIGNv bnN0CkBAIC01NzEsMjcgKzU3MSwyNSBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94OjpydW5GcmVl U3BhY2VBbGxvY2F0aW9uQWxnb3JpdGhtKGNvbnN0IE9yZGVyZWRGbGV4SXRlbUxpcwogICAgIHJl dHVybiB0cnVlOwogfQogCi1zdGF0aWMgYm9vbCBoYXNQYWNraW5nU3BhY2UoTGF5b3V0VW5pdCBh dmFpbGFibGVGcmVlU3BhY2UsIGZsb2F0IHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0eSkKK3N0YXRp YyBMYXlvdXRVbml0IGluaXRpYWxQYWNraW5nT2Zmc2V0KExheW91dFVuaXQgYXZhaWxhYmxlRnJl ZVNwYWNlLCBFRmxleFBhY2sgZmxleFBhY2ssIHNpemVfdCBudW1iZXJPZkNoaWxkcmVuKQogewot ICAgIHJldHVybiBhdmFpbGFibGVGcmVlU3BhY2UgPiAwICYmICF0b3RhbFBvc2l0aXZlRmxleGli aWxpdHk7Ci19Ci0KLXN0YXRpYyBMYXlvdXRVbml0IGluaXRpYWxQYWNraW5nT2Zmc2V0KExheW91 dFVuaXQgYXZhaWxhYmxlRnJlZVNwYWNlLCBmbG9hdCB0b3RhbFBvc2l0aXZlRmxleGliaWxpdHks IEVGbGV4UGFjayBmbGV4UGFjaywgc2l6ZV90IG51bWJlck9mQ2hpbGRyZW4pCi17Ci0gICAgaWYg KGhhc1BhY2tpbmdTcGFjZShhdmFpbGFibGVGcmVlU3BhY2UsIHRvdGFsUG9zaXRpdmVGbGV4aWJp bGl0eSkpIHsKKyAgICBpZiAoYXZhaWxhYmxlRnJlZVNwYWNlID4gMCkgewogICAgICAgICBpZiAo ZmxleFBhY2sgPT0gUGFja0VuZCkKICAgICAgICAgICAgIHJldHVybiBhdmFpbGFibGVGcmVlU3Bh Y2U7CiAgICAgICAgIGlmIChmbGV4UGFjayA9PSBQYWNrQ2VudGVyKQogICAgICAgICAgICAgcmV0 dXJuIGF2YWlsYWJsZUZyZWVTcGFjZSAvIDI7CiAgICAgICAgIGlmIChmbGV4UGFjayA9PSBQYWNr RGlzdHJpYnV0ZSAmJiBudW1iZXJPZkNoaWxkcmVuKQogICAgICAgICAgICAgcmV0dXJuIGF2YWls YWJsZUZyZWVTcGFjZSAvICgyICogbnVtYmVyT2ZDaGlsZHJlbik7CisgICAgfSBlbHNlIGlmIChh dmFpbGFibGVGcmVlU3BhY2UgPCAwKSB7CisgICAgICAgIGlmIChmbGV4UGFjayA9PSBQYWNrQ2Vu dGVyIHx8IGZsZXhQYWNrID09IFBhY2tEaXN0cmlidXRlKQorICAgICAgICAgICAgcmV0dXJuIGF2 YWlsYWJsZUZyZWVTcGFjZSAvIDI7CiAgICAgfQogICAgIHJldHVybiAwOwogfQogCi1zdGF0aWMg TGF5b3V0VW5pdCBwYWNraW5nU3BhY2VCZXR3ZWVuQ2hpbGRyZW4oTGF5b3V0VW5pdCBhdmFpbGFi bGVGcmVlU3BhY2UsIGZsb2F0IHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0eSwgRUZsZXhQYWNrIGZs ZXhQYWNrLCBzaXplX3QgbnVtYmVyT2ZDaGlsZHJlbikKK3N0YXRpYyBMYXlvdXRVbml0IHBhY2tp bmdTcGFjZUJldHdlZW5DaGlsZHJlbihMYXlvdXRVbml0IGF2YWlsYWJsZUZyZWVTcGFjZSwgRUZs ZXhQYWNrIGZsZXhQYWNrLCBzaXplX3QgbnVtYmVyT2ZDaGlsZHJlbikKIHsKLSAgICBpZiAoaGFz UGFja2luZ1NwYWNlKGF2YWlsYWJsZUZyZWVTcGFjZSwgdG90YWxQb3NpdGl2ZUZsZXhpYmlsaXR5 KSAmJiBudW1iZXJPZkNoaWxkcmVuID4gMSkgeworICAgIGlmIChhdmFpbGFibGVGcmVlU3BhY2Ug PiAwICYmIG51bWJlck9mQ2hpbGRyZW4gPiAxKSB7CiAgICAgICAgIGlmIChmbGV4UGFjayA9PSBQ YWNrSnVzdGlmeSkKICAgICAgICAgICAgIHJldHVybiBhdmFpbGFibGVGcmVlU3BhY2UgLyAobnVt YmVyT2ZDaGlsZHJlbiAtIDEpOwogICAgICAgICBpZiAoZmxleFBhY2sgPT0gUGFja0Rpc3RyaWJ1 dGUpCkBAIC02MzUsMTAgKzYzMywxMCBAQCBzdGF0aWMgRUZsZXhBbGlnbiBmbGV4QWxpZ25Gb3JD aGlsZChSZW5kZXJCb3gqIGNoaWxkKQogICAgIHJldHVybiBhbGlnbjsKIH0KIAotdm9pZCBSZW5k ZXJGbGV4aWJsZUJveDo6bGF5b3V0QW5kUGxhY2VDaGlsZHJlbihjb25zdCBPcmRlcmVkRmxleEl0 ZW1MaXN0JiBjaGlsZHJlbiwgY29uc3QgV1RGOjpWZWN0b3I8TGF5b3V0VW5pdD4mIGNoaWxkU2l6 ZXMsIExheW91dFVuaXQgYXZhaWxhYmxlRnJlZVNwYWNlLCBmbG9hdCB0b3RhbFBvc2l0aXZlRmxl eGliaWxpdHkpCit2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlvdXRBbmRQbGFjZUNoaWxkcmVu KGNvbnN0IE9yZGVyZWRGbGV4SXRlbUxpc3QmIGNoaWxkcmVuLCBjb25zdCBXVEY6OlZlY3RvcjxM YXlvdXRVbml0PiYgY2hpbGRTaXplcywgTGF5b3V0VW5pdCBhdmFpbGFibGVGcmVlU3BhY2UpCiB7 CiAgICAgTGF5b3V0VW5pdCBtYWluQXhpc09mZnNldCA9IGZsb3dBd2FyZUJvcmRlclN0YXJ0KCkg KyBmbG93QXdhcmVQYWRkaW5nU3RhcnQoKTsKLSAgICBtYWluQXhpc09mZnNldCArPSBpbml0aWFs UGFja2luZ09mZnNldChhdmFpbGFibGVGcmVlU3BhY2UsIHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0 eSwgc3R5bGUoKS0+ZmxleFBhY2soKSwgY2hpbGRTaXplcy5zaXplKCkpOworICAgIG1haW5BeGlz T2Zmc2V0ICs9IGluaXRpYWxQYWNraW5nT2Zmc2V0KGF2YWlsYWJsZUZyZWVTcGFjZSwgc3R5bGUo KS0+ZmxleFBhY2soKSwgY2hpbGRTaXplcy5zaXplKCkpOwogICAgIGlmIChzdHlsZSgpLT5mbGV4 RGlyZWN0aW9uKCkgPT0gRmxvd1Jvd1JldmVyc2UpCiAgICAgICAgIG1haW5BeGlzT2Zmc2V0ICs9 IGlzSG9yaXpvbnRhbEZsb3coKSA/IHZlcnRpY2FsU2Nyb2xsYmFyV2lkdGgoKSA6IGhvcml6b250 YWxTY3JvbGxiYXJIZWlnaHQoKTsKIApAQCAtNjUwLDcgKzY0OCw3IEBAIHZvaWQgUmVuZGVyRmxl eGlibGVCb3g6OmxheW91dEFuZFBsYWNlQ2hpbGRyZW4oY29uc3QgT3JkZXJlZEZsZXhJdGVtTGlz dCYgY2hpbGRyCiAgICAgICAgIFJlbmRlckJveCogY2hpbGQgPSBjaGlsZHJlbltpXTsKICAgICAg ICAgaWYgKGNoaWxkLT5pc1Bvc2l0aW9uZWQoKSkgewogICAgICAgICAgICAgcHJlcGFyZUNoaWxk Rm9yUG9zaXRpb25lZExheW91dChjaGlsZCwgbWFpbkF4aXNPZmZzZXQsIGNyb3NzQXhpc09mZnNl dCk7Ci0gICAgICAgICAgICBtYWluQXhpc09mZnNldCArPSBwYWNraW5nU3BhY2VCZXR3ZWVuQ2hp bGRyZW4oYXZhaWxhYmxlRnJlZVNwYWNlLCB0b3RhbFBvc2l0aXZlRmxleGliaWxpdHksIHN0eWxl KCktPmZsZXhQYWNrKCksIGNoaWxkU2l6ZXMuc2l6ZSgpKTsKKyAgICAgICAgICAgIG1haW5BeGlz T2Zmc2V0ICs9IHBhY2tpbmdTcGFjZUJldHdlZW5DaGlsZHJlbihhdmFpbGFibGVGcmVlU3BhY2Us IHN0eWxlKCktPmZsZXhQYWNrKCksIGNoaWxkU2l6ZXMuc2l6ZSgpKTsKICAgICAgICAgICAgIGNv bnRpbnVlOwogICAgICAgICB9CiAgICAgICAgIExheW91dFVuaXQgY2hpbGRQcmVmZXJyZWRTaXpl ID0gY2hpbGRTaXplc1tpXSArIG1haW5BeGlzQm9yZGVyQW5kUGFkZGluZ0V4dGVudEZvckNoaWxk KGNoaWxkKTsKQEAgLTY4MCw3ICs2NzgsNyBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlv dXRBbmRQbGFjZUNoaWxkcmVuKGNvbnN0IE9yZGVyZWRGbGV4SXRlbUxpc3QmIGNoaWxkcgogICAg ICAgICBzZXRGbG93QXdhcmVMb2NhdGlvbkZvckNoaWxkKGNoaWxkLCBjaGlsZExvY2F0aW9uKTsK ICAgICAgICAgbWFpbkF4aXNPZmZzZXQgKz0gY2hpbGRNYWluRXh0ZW50ICsgZmxvd0F3YXJlTWFy Z2luRW5kRm9yQ2hpbGQoY2hpbGQpOwogCi0gICAgICAgIG1haW5BeGlzT2Zmc2V0ICs9IHBhY2tp bmdTcGFjZUJldHdlZW5DaGlsZHJlbihhdmFpbGFibGVGcmVlU3BhY2UsIHRvdGFsUG9zaXRpdmVG bGV4aWJpbGl0eSwgc3R5bGUoKS0+ZmxleFBhY2soKSwgY2hpbGRTaXplcy5zaXplKCkpOworICAg ICAgICBtYWluQXhpc09mZnNldCArPSBwYWNraW5nU3BhY2VCZXR3ZWVuQ2hpbGRyZW4oYXZhaWxh YmxlRnJlZVNwYWNlLCBzdHlsZSgpLT5mbGV4UGFjaygpLCBjaGlsZFNpemVzLnNpemUoKSk7CiAK ICAgICAgICAgaWYgKGlzQ29sdW1uRmxvdygpKQogICAgICAgICAgICAgc2V0TG9naWNhbEhlaWdo dChtYWluQXhpc09mZnNldCArIGZsb3dBd2FyZUJvcmRlckVuZCgpICsgZmxvd0F3YXJlUGFkZGlu Z0VuZCgpICsgc2Nyb2xsYmFyTG9naWNhbEhlaWdodCgpKTsKQEAgLTY5MCwxOSArNjg4LDE5IEBA IHZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dEFuZFBsYWNlQ2hpbGRyZW4oY29uc3QgT3Jk ZXJlZEZsZXhJdGVtTGlzdCYgY2hpbGRyCiAgICAgICAgIC8vIFdlIGhhdmUgdG8gZG8gYW4gZXh0 cmEgcGFzcyBmb3IgY29sdW1uLXJldmVyc2UgdG8gcmVwb3NpdGlvbiB0aGUgZmxleCBpdGVtcyBz aW5jZSB0aGUgc3RhcnQgZGVwZW5kcwogICAgICAgICAvLyBvbiB0aGUgaGVpZ2h0IG9mIHRoZSBm bGV4Ym94LCB3aGljaCB3ZSBvbmx5IGtub3cgYWZ0ZXIgd2UndmUgcG9zaXRpb25lZCBhbGwgdGhl IGZsZXggaXRlbXMuCiAgICAgICAgIGNvbXB1dGVMb2dpY2FsSGVpZ2h0KCk7Ci0gICAgICAgIGxh eW91dENvbHVtblJldmVyc2UoY2hpbGRyZW4sIGNoaWxkU2l6ZXMsIGF2YWlsYWJsZUZyZWVTcGFj ZSwgdG90YWxQb3NpdGl2ZUZsZXhpYmlsaXR5KTsKKyAgICAgICAgbGF5b3V0Q29sdW1uUmV2ZXJz ZShjaGlsZHJlbiwgY2hpbGRTaXplcywgYXZhaWxhYmxlRnJlZVNwYWNlKTsKICAgICB9CiAKICAg ICBhbGlnbkNoaWxkcmVuKGNoaWxkcmVuLCBtYXhBc2NlbnQpOwogfQogCi12b2lkIFJlbmRlckZs ZXhpYmxlQm94OjpsYXlvdXRDb2x1bW5SZXZlcnNlKGNvbnN0IE9yZGVyZWRGbGV4SXRlbUxpc3Qm IGNoaWxkcmVuLCBjb25zdCBXVEY6OlZlY3RvcjxMYXlvdXRVbml0PiYgY2hpbGRTaXplcywgTGF5 b3V0VW5pdCBhdmFpbGFibGVGcmVlU3BhY2UsIGZsb2F0IHRvdGFsUG9zaXRpdmVGbGV4aWJpbGl0 eSkKK3ZvaWQgUmVuZGVyRmxleGlibGVCb3g6OmxheW91dENvbHVtblJldmVyc2UoY29uc3QgT3Jk ZXJlZEZsZXhJdGVtTGlzdCYgY2hpbGRyZW4sIGNvbnN0IFdURjo6VmVjdG9yPExheW91dFVuaXQ+ JiBjaGlsZFNpemVzLCBMYXlvdXRVbml0IGF2YWlsYWJsZUZyZWVTcGFjZSkKIHsKICAgICAvLyBU aGlzIGlzIHNpbWlsYXIgdG8gdGhlIGxvZ2ljIGluIGxheW91dEFuZFBsYWNlQ2hpbGRyZW4sIGV4 Y2VwdCB3ZSBwbGFjZSB0aGUgY2hpbGRyZW4KICAgICAvLyBzdGFydGluZyBmcm9tIHRoZSBlbmQg b2YgdGhlIGZsZXhib3guIFdlIGFsc28gZG9uJ3QgbmVlZCB0byBsYXlvdXQgYW55dGhpbmcgc2lu Y2Ugd2UncmUKICAgICAvLyBqdXN0IG1vdmluZyB0aGUgY2hpbGRyZW4gdG8gYSBuZXcgcG9zaXRp b24uCiAgICAgTGF5b3V0VW5pdCBtYWluQXhpc09mZnNldCA9IGxvZ2ljYWxIZWlnaHQoKSAtIGZs b3dBd2FyZUJvcmRlckVuZCgpIC0gZmxvd0F3YXJlUGFkZGluZ0VuZCgpOwotICAgIG1haW5BeGlz T2Zmc2V0IC09IGluaXRpYWxQYWNraW5nT2Zmc2V0KGF2YWlsYWJsZUZyZWVTcGFjZSwgdG90YWxQ b3NpdGl2ZUZsZXhpYmlsaXR5LCBzdHlsZSgpLT5mbGV4UGFjaygpLCBjaGlsZFNpemVzLnNpemUo KSk7CisgICAgbWFpbkF4aXNPZmZzZXQgLT0gaW5pdGlhbFBhY2tpbmdPZmZzZXQoYXZhaWxhYmxl RnJlZVNwYWNlLCBzdHlsZSgpLT5mbGV4UGFjaygpLCBjaGlsZFNpemVzLnNpemUoKSk7CiAgICAg bWFpbkF4aXNPZmZzZXQgLT0gaXNIb3Jpem9udGFsRmxvdygpID8gdmVydGljYWxTY3JvbGxiYXJX aWR0aCgpIDogaG9yaXpvbnRhbFNjcm9sbGJhckhlaWdodCgpOwogCiAgICAgTGF5b3V0VW5pdCBj cm9zc0F4aXNPZmZzZXQgPSBmbG93QXdhcmVCb3JkZXJCZWZvcmUoKSArIGZsb3dBd2FyZVBhZGRp bmdCZWZvcmUoKTsKQEAgLTcxMCw3ICs3MDgsNyBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94Ojps YXlvdXRDb2x1bW5SZXZlcnNlKGNvbnN0IE9yZGVyZWRGbGV4SXRlbUxpc3QmIGNoaWxkcmVuLAog ICAgICAgICBSZW5kZXJCb3gqIGNoaWxkID0gY2hpbGRyZW5baV07CiAgICAgICAgIGlmIChjaGls ZC0+aXNQb3NpdGlvbmVkKCkpIHsKICAgICAgICAgICAgIGNoaWxkLT5sYXllcigpLT5zZXRTdGF0 aWNCbG9ja1Bvc2l0aW9uKG1haW5BeGlzT2Zmc2V0KTsKLSAgICAgICAgICAgIG1haW5BeGlzT2Zm c2V0IC09IHBhY2tpbmdTcGFjZUJldHdlZW5DaGlsZHJlbihhdmFpbGFibGVGcmVlU3BhY2UsIHRv dGFsUG9zaXRpdmVGbGV4aWJpbGl0eSwgc3R5bGUoKS0+ZmxleFBhY2soKSwgY2hpbGRTaXplcy5z aXplKCkpOworICAgICAgICAgICAgbWFpbkF4aXNPZmZzZXQgLT0gcGFja2luZ1NwYWNlQmV0d2Vl bkNoaWxkcmVuKGF2YWlsYWJsZUZyZWVTcGFjZSwgc3R5bGUoKS0+ZmxleFBhY2soKSwgY2hpbGRT aXplcy5zaXplKCkpOwogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIH0KICAgICAgICAg bWFpbkF4aXNPZmZzZXQgLT0gbWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjaGlsZCkgKyBmbG93QXdh cmVNYXJnaW5FbmRGb3JDaGlsZChjaGlsZCk7CkBAIC03MjEsNyArNzE5LDcgQEAgdm9pZCBSZW5k ZXJGbGV4aWJsZUJveDo6bGF5b3V0Q29sdW1uUmV2ZXJzZShjb25zdCBPcmRlcmVkRmxleEl0ZW1M aXN0JiBjaGlsZHJlbiwKICAgICAgICAgICAgIGNoaWxkLT5yZXBhaW50RHVyaW5nTGF5b3V0SWZN b3ZlZChvbGRSZWN0KTsKIAogICAgICAgICBtYWluQXhpc09mZnNldCAtPSBmbG93QXdhcmVNYXJn aW5TdGFydEZvckNoaWxkKGNoaWxkKTsKLSAgICAgICAgbWFpbkF4aXNPZmZzZXQgLT0gcGFja2lu Z1NwYWNlQmV0d2VlbkNoaWxkcmVuKGF2YWlsYWJsZUZyZWVTcGFjZSwgdG90YWxQb3NpdGl2ZUZs ZXhpYmlsaXR5LCBzdHlsZSgpLT5mbGV4UGFjaygpLCBjaGlsZFNpemVzLnNpemUoKSk7CisgICAg ICAgIG1haW5BeGlzT2Zmc2V0IC09IHBhY2tpbmdTcGFjZUJldHdlZW5DaGlsZHJlbihhdmFpbGFi bGVGcmVlU3BhY2UsIHN0eWxlKCktPmZsZXhQYWNrKCksIGNoaWxkU2l6ZXMuc2l6ZSgpKTsKICAg ICB9CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4 aWJsZUJveC5oIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgK aW5kZXggNDhlOWZiNThjNjZhMjEyMDU4OGUxYmQ1ODVmZDc1N2UxNmUxOWY3My4uMGNhMjU1Yzhi ZTcyZTMxZWNkMzhiYWZiM2E1MTA3MmNhMTc0MGUzOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmgKQEAgLTEwMyw4ICsxMDMsOCBAQCBwcml2YXRlOgog ICAgIGJvb2wgcnVuRnJlZVNwYWNlQWxsb2NhdGlvbkFsZ29yaXRobShjb25zdCBPcmRlcmVkRmxl eEl0ZW1MaXN0JiwgTGF5b3V0VW5pdCYgYXZhaWxhYmxlRnJlZVNwYWNlLCBmbG9hdCYgdG90YWxQ b3NpdGl2ZUZsZXhpYmlsaXR5LCBmbG9hdCYgdG90YWxOZWdhdGl2ZUZsZXhpYmlsaXR5LCBJbmZs ZXhpYmxlRmxleEl0ZW1TaXplJiwgV1RGOjpWZWN0b3I8TGF5b3V0VW5pdD4mIGNoaWxkU2l6ZXMp OwogICAgIHZvaWQgc2V0TG9naWNhbE92ZXJyaWRlU2l6ZShSZW5kZXJCb3gqIGNoaWxkLCBMYXlv dXRVbml0IGNoaWxkUHJlZmVycmVkU2l6ZSk7CiAgICAgdm9pZCBwcmVwYXJlQ2hpbGRGb3JQb3Np dGlvbmVkTGF5b3V0KFJlbmRlckJveCogY2hpbGQsIExheW91dFVuaXQgbWFpbkF4aXNPZmZzZXQs IExheW91dFVuaXQgY3Jvc3NBeGlzT2Zmc2V0KTsKLSAgICB2b2lkIGxheW91dEFuZFBsYWNlQ2hp bGRyZW4oY29uc3QgT3JkZXJlZEZsZXhJdGVtTGlzdCYsIGNvbnN0IFdURjo6VmVjdG9yPExheW91 dFVuaXQ+JiBjaGlsZFNpemVzLCBMYXlvdXRVbml0IGF2YWlsYWJsZUZyZWVTcGFjZSwgZmxvYXQg dG90YWxQb3NpdGl2ZUZsZXhpYmlsaXR5KTsKLSAgICB2b2lkIGxheW91dENvbHVtblJldmVyc2Uo Y29uc3QgT3JkZXJlZEZsZXhJdGVtTGlzdCYsIGNvbnN0IFdURjo6VmVjdG9yPExheW91dFVuaXQ+ JiBjaGlsZFNpemVzLCBMYXlvdXRVbml0IGF2YWlsYWJsZUZyZWVTcGFjZSwgZmxvYXQgdG90YWxQ b3NpdGl2ZUZsZXhpYmlsaXR5KTsKKyAgICB2b2lkIGxheW91dEFuZFBsYWNlQ2hpbGRyZW4oY29u c3QgT3JkZXJlZEZsZXhJdGVtTGlzdCYsIGNvbnN0IFdURjo6VmVjdG9yPExheW91dFVuaXQ+JiBj aGlsZFNpemVzLCBMYXlvdXRVbml0IGF2YWlsYWJsZUZyZWVTcGFjZSk7CisgICAgdm9pZCBsYXlv dXRDb2x1bW5SZXZlcnNlKGNvbnN0IE9yZGVyZWRGbGV4SXRlbUxpc3QmLCBjb25zdCBXVEY6OlZl Y3RvcjxMYXlvdXRVbml0PiYgY2hpbGRTaXplcywgTGF5b3V0VW5pdCBhdmFpbGFibGVGcmVlU3Bh Y2UpOwogICAgIHZvaWQgYWxpZ25DaGlsZHJlbihjb25zdCBPcmRlcmVkRmxleEl0ZW1MaXN0Jiwg TGF5b3V0VW5pdCBtYXhBc2NlbnQpOwogfTsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hh bmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDI5NTllNWViYjJiYTYyYzI5M2U0 NDg2NzBlYWE4YjQ2NzZlZmI5MjUuLjA1OGRlNzFhYTA1OWQ2YThiMGRkZTlkYTFlZTc3ZTllMTFi OGVmNDkgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMi0wMi0xMCAgT2phbiBWYWZhaSAgPG9q YW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIGZsZXgtcGFjazpjZW50ZXIgYW5kIGZsZXgtaXRl bS1hbGlnbjpjZW50ZXIgc2hvdWxkIGRvIHRydWUgY2VudGVyaW5nCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NzM4NQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogY3NzMy9mbGV4Ym94L3RydWUtY2VudGVy aW5nLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogY3NzMy9mbGV4Ym94L3RydWUtY2Vu dGVyaW5nLmh0bWw6IEFkZGVkLgorCiAyMDEyLTAyLTA5ICBKYW1lcyBSb2JpbnNvbiAgPGphbWVz ckBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBVbnJldmlld2VkIGV4cGVjdGF0 aW9uIGZvbGxvd3VwIGZvciByMTA3MzI5CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9jc3MzL2Zs ZXhib3gvdHJ1ZS1jZW50ZXJpbmctZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvY3NzMy9mbGV4 Ym94L3RydWUtY2VudGVyaW5nLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5jYTJjZGQ2OGM5NDBh Njc2MGFhNGY3NzUyYzRlZWFjN2ZhMGIzOWI1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvY3NzMy9mbGV4Ym94L3RydWUtY2VudGVyaW5nLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDcg QEAKK1BBU1MKK1BBU1MKK1BBU1MKK1BBU1MKK1BBU1MKK1BBU1MKK1BBU1MKZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL2NzczMvZmxleGJveC90cnVlLWNlbnRlcmluZy5odG1sIGIvTGF5b3V0VGVz dHMvY3NzMy9mbGV4Ym94L3RydWUtY2VudGVyaW5nLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQK aW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNWMwZDIwODI4 MjhlZDc2NzNkN2M4MWM0ZTlhNmEzMDIwOTQxNzExZAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2NzczMvZmxleGJveC90cnVlLWNlbnRlcmluZy5odG1sCkBAIC0wLDAgKzEsNjkgQEAK KzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8c3R5bGU+CisuZmxleGJveCB7CisgICAgd2lkdGg6 IDEwMHB4OworICAgIGhlaWdodDogMTAwcHg7CisgICAgZGlzcGxheTogLXdlYmtpdC1mbGV4Ym94 OworICAgIGJhY2tncm91bmQtY29sb3I6ICNhYWE7CisgICAgcG9zaXRpb246IHJlbGF0aXZlOwor fQorLmZsZXhib3ggPiBkaXYgeworICAgIGhlaWdodDogMTEwcHg7CisgICAgd2lkdGg6IDYwcHg7 Cit9CisudmVydGljYWwgPiBkaXYgeworICAgIHdpZHRoOiAxMTBweDsKKyAgICBoZWlnaHQ6IDYw cHg7Cit9CisuZmxleGJveCA6bnRoLWNoaWxkKDEpIHsKKyAgICBiYWNrZ3JvdW5kLWNvbG9yOiBi bHVlOworfQorLmZsZXhib3ggOm50aC1jaGlsZCgyKSB7CisgICAgYmFja2dyb3VuZC1jb2xvcjog Z3JlZW47Cit9Cis8L3N0eWxlPgorPHNjcmlwdD4KK2lmICh3aW5kb3cubGF5b3V0VGVzdENvbnRy b2xsZXIpCisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworPC9zY3JpcHQ+ Cis8c2NyaXB0IHNyYz0icmVzb3VyY2VzL2ZsZXhib3guanMiPjwvc2NyaXB0PgorPGJvZHkgb25s b2FkPSJjaGVja0ZsZXhCb3hlbigpIj4KKworPGRpdiBjbGFzcz0iZmxleGJveCIgc3R5bGU9Ii13 ZWJraXQtZmxleC1hbGlnbjogY2VudGVyOyAtd2Via2l0LWZsZXgtcGFjazogY2VudGVyOyI+Cisg ICAgPGRpdiBkYXRhLW9mZnNldC14PSItMTAiIGRhdGEtb2Zmc2V0LXk9Ii01Ij48L2Rpdj4KKyAg ICA8ZGl2IGRhdGEtb2Zmc2V0LXg9IjUwIiBkYXRhLW9mZnNldC15PSItNSI+PC9kaXY+Cis8L2Rp dj4KKworPGRpdiBjbGFzcz0iZmxleGJveCIgc3R5bGU9Ii13ZWJraXQtZmxleC1hbGlnbjogY2Vu dGVyOyAtd2Via2l0LWZsZXgtcGFjazogY2VudGVyOyAtd2Via2l0LWZsZXgtZGlyZWN0aW9uOiBy b3ctcmV2ZXJzZTsiPgorICAgIDxkaXYgZGF0YS1vZmZzZXQteD0iNTAiIGRhdGEtb2Zmc2V0LXk9 Ii01Ij48L2Rpdj4KKyAgICA8ZGl2IGRhdGEtb2Zmc2V0LXg9Ii0xMCIgZGF0YS1vZmZzZXQteT0i LTUiPjwvZGl2PgorPC9kaXY+CisKKzxkaXYgY2xhc3M9ImZsZXhib3ggdmVydGljYWwiIHN0eWxl PSItd2Via2l0LWZsZXgtYWxpZ246IGNlbnRlcjsgLXdlYmtpdC1mbGV4LXBhY2s6IGNlbnRlcjsg LXdlYmtpdC1mbGV4LWRpcmVjdGlvbjogY29sdW1uOyI+CisgICAgPGRpdiBkYXRhLW9mZnNldC14 PSItNSIgZGF0YS1vZmZzZXQteT0iLTEwIj48L2Rpdj4KKyAgICA8ZGl2IGRhdGEtb2Zmc2V0LXg9 Ii01IiBkYXRhLW9mZnNldC15PSI1MCI+PC9kaXY+Cis8L2Rpdj4KKworPGRpdiBjbGFzcz0iZmxl eGJveCB2ZXJ0aWNhbCIgc3R5bGU9Ii13ZWJraXQtZmxleC1hbGlnbjogY2VudGVyOyAtd2Via2l0 LWZsZXgtcGFjazogY2VudGVyOyAtd2Via2l0LWZsZXgtZGlyZWN0aW9uOiBjb2x1bW4tcmV2ZXJz ZTsiPgorICAgIDxkaXYgZGF0YS1vZmZzZXQteD0iLTUiIGRhdGEtb2Zmc2V0LXk9IjUwIj48L2Rp dj4KKyAgICA8ZGl2IGRhdGEtb2Zmc2V0LXg9Ii01IiBkYXRhLW9mZnNldC15PSItMTAiPjwvZGl2 PgorPC9kaXY+CisKKzxkaXYgY2xhc3M9ImZsZXhib3giIHN0eWxlPSItd2Via2l0LWZsZXgtYWxp Z246IGNlbnRlcjsgLXdlYmtpdC1mbGV4LXBhY2s6IGRpc3RyaWJ1dGU7Ij4KKyAgICA8ZGl2IGRh dGEtb2Zmc2V0LXg9Ii0xMCIgZGF0YS1vZmZzZXQteT0iLTUiPjwvZGl2PgorICAgIDxkaXYgZGF0 YS1vZmZzZXQteD0iNTAiIGRhdGEtb2Zmc2V0LXk9Ii01Ij48L2Rpdj4KKzwvZGl2PgorCis8ZGl2 IGNsYXNzPSJmbGV4Ym94IiBzdHlsZT0iLXdlYmtpdC1mbGV4LWFsaWduOiBzdGFydDsgLXdlYmtp dC1mbGV4LXBhY2s6IHN0YXJ0OyI+CisgICAgPGRpdiBkYXRhLW9mZnNldC14PTAgZGF0YS1vZmZz ZXQteT0wPjwvZGl2PgorICAgIDxkaXYgZGF0YS1vZmZzZXQteD02MCBkYXRhLW9mZnNldC15PTA+ PC9kaXY+Cis8L2Rpdj4KKworPGRpdiBjbGFzcz0iZmxleGJveCIgc3R5bGU9Ii13ZWJraXQtZmxl eC1hbGlnbjogc3RhcnQ7IC13ZWJraXQtZmxleC1wYWNrOiBqdXN0aWZ5OyI+CisgICAgPGRpdiBk YXRhLW9mZnNldC14PTAgZGF0YS1vZmZzZXQteT0wPjwvZGl2PgorICAgIDxkaXYgZGF0YS1vZmZz ZXQteD02MCBkYXRhLW9mZnNldC15PTA+PC9kaXY+Cis8L2Rpdj4KKworPC9ib2R5PgorPC9odG1s PgpcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK