96676 2012-09-13 11:44:21 -0700 Refactor duplicate code into RenderFlexibleBox::mainAxisContentExtent 2012-09-13 12:49:16 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tony tony eae eric leviw ojan webkit.review.bot oldest_to_newest 719737 0 tony 2012-09-13 11:44:21 -0700 Refactor duplicate code into RenderFlexibleBox::mainAxisContentExtent 719738 1 163923 tony 2012-09-13 11:46:24 -0700 Created attachment 163923 Patch 719740 2 163923 eric 2012-09-13 11:50:23 -0700 Comment on attachment 163923 Patch Looks reasonable. Unclear why these are different in the first place. Emil, Levi care to comment? 719743 3 163923 ojan 2012-09-13 11:54:17 -0700 Comment on attachment 163923 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=163923&action=review Looks great! > Source/WebCore/rendering/RenderFlexibleBox.cpp:614 > LayoutUnit RenderFlexibleBox::computeAvailableFreeSpace(LayoutUnit preferredMainAxisExtent) This is only called in one place. Inline it? 719760 4 tony 2012-09-13 12:08:23 -0700 (In reply to comment #2) > (From update of attachment 163923 [details]) > Looks reasonable. Unclear why these are different in the first place. Emil, Levi care to comment? Why what is different? The first parameter passed to computeLogicalHeight? It's the size of the content when we're getting the height. When computing free space for flexing, it's based on the flex basis of each flex item. When computing line breaking, we imagine that the content is infinite to see if we have to break for some reason (e.g., if a max-height is set, we would break on that). 719766 5 163930 tony 2012-09-13 12:12:36 -0700 Created attachment 163930 Patch for landing 719809 6 163930 webkit.review.bot 2012-09-13 12:49:13 -0700 Comment on attachment 163930 Patch for landing Clearing flags on attachment: 163930 Committed r128494: <http://trac.webkit.org/changeset/128494> 719810 7 webkit.review.bot 2012-09-13 12:49:16 -0700 All reviewed patches have been landed. Closing bug. 163923 2012-09-13 11:46:24 -0700 2012-09-13 12:12:33 -0700 Patch bug-96676-20120913114557.patch text/plain 6302 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NDg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDUwY2NiNWMyZGM1YTIx MTE2ZWI4ODRhZTZiMWMxM2Y2YzhhMThjZi4uZjA0MmU4MjYzOWQ5NWMyYTM4NDBmOGMxZmI5MWNi YzQyYzdmZTYzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDEyLTA5LTEzICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgUmVmYWN0b3IgZHVwbGljYXRl IGNvZGUgaW50byBSZW5kZXJGbGV4aWJsZUJveDo6bWFpbkF4aXNDb250ZW50RXh0ZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NjY3NgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZXJlIHdhcyBjb21w dXRlQXZhaWxhYmxlRnJlZVNwYWNlKCkgYW5kIGxpbmVCcmVha0xlbmd0aCgpIHNoYXJlZCBzb21l IHZlcnkgc2ltaWxhciBjb2RlLgorICAgICAgICBNZXJnZSB0aGlzIGNvZGUgaW50byBtYWluQXhp c0NvbnRlbnRFeHRlbnQoKS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIHRoaXMgaXMganVzdCBh IHJlZmFjdG9yLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjptYWluQXhpc0NvbnRlbnRFeHRl bnQpOiBUYWtlIGNvbnRlbnRMb2dpY2FsSGVpZ2h0IGFzIGEgcGFyYW1ldGVyLAorICAgICAgICB3 aGljaCBpcyBuZWVkZWQgd2hlbiBkZXRlcm1pbmluZyB0aGUgbG9naWNhbCBoZWlnaHQuCisgICAg ICAgIChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUF2YWlsYWJsZUZyZWVTcGFj ZSk6IFVzZSBtYWluQXhpc0NvbnRlbnRFeHRlbnQoKS4KKyAgICAgICAgKFdlYkNvcmU6OlJlbmRl ckZsZXhpYmxlQm94Ojpjb21wdXRlTmV4dEZsZXhMaW5lKTogVXNlIG1haW5BeGlzQ29udGVudEV4 dGVudCgpLgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oOgorCisyMDEy LTA5LTEzICBUb255IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgRmxleGl0 ZW0gbWFyZ2lucyBzaG91bGQgYmUgYmFzZWQgb24gY29udGVudCB3aWR0aCwgbm90IHdpZHRoCiAg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NjY3NAogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcAppbmRleCA2 OTg5NWYyNTY1ZGE1MzVlOTNmODc5MjI4NDE3MDlhZjc4OGUxM2M2Li5mMWJlZjI3NzA4NWYyNDJm M2RhZGI2NzA1YjhhMmYxMWQ5YjU5YmEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5k ZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKQEAgLTM5MywxMSArMzkzLDExIEBAIExheW91dFVuaXQg UmVuZGVyRmxleGlibGVCb3g6OmNyb3NzQXhpc0NvbnRlbnRFeHRlbnQoKSBjb25zdAogICAgIHJl dHVybiBpc0hvcml6b250YWxGbG93KCkgPyBjb250ZW50SGVpZ2h0KCkgOiBjb250ZW50V2lkdGgo KTsKIH0KIAotTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6bWFpbkF4aXNDb250ZW50RXh0 ZW50KCkKK0xheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6Om1haW5BeGlzQ29udGVudEV4dGVu dChMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsSGVpZ2h0KQogewogICAgIGlmIChpc0NvbHVtbkZs b3coKSkgewogICAgICAgICBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMgY29tcHV0ZWRWYWx1 ZXM7Ci0gICAgICAgIGNvbXB1dGVMb2dpY2FsSGVpZ2h0KGxvZ2ljYWxIZWlnaHQoKSwgbG9naWNh bFRvcCgpLCBjb21wdXRlZFZhbHVlcyk7CisgICAgICAgIGNvbXB1dGVMb2dpY2FsSGVpZ2h0KGNv bnRlbnRMb2dpY2FsSGVpZ2h0LCBsb2dpY2FsVG9wKCksIGNvbXB1dGVkVmFsdWVzKTsKICAgICAg ICAgcmV0dXJuIHN0ZDo6bWF4KExheW91dFVuaXQoMCksIGNvbXB1dGVkVmFsdWVzLm1fZXh0ZW50 IC0gYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKSAtIHNjcm9sbGJhckxvZ2ljYWxIZWln aHQoKSk7CiAgICAgfQogICAgIHJldHVybiBjb250ZW50TG9naWNhbFdpZHRoKCk7CkBAIC02MTMs MTYgKzYxMyw3IEBAIExheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OnByZWZlcnJlZE1haW5B eGlzQ29udGVudEV4dGVudEZvckNoaWxkKFJlbmRlckJveCoKIAogTGF5b3V0VW5pdCBSZW5kZXJG bGV4aWJsZUJveDo6Y29tcHV0ZUF2YWlsYWJsZUZyZWVTcGFjZShMYXlvdXRVbml0IHByZWZlcnJl ZE1haW5BeGlzRXh0ZW50KQogewotICAgIExheW91dFVuaXQgY29udGVudEV4dGVudCA9IDA7Ci0g ICAgaWYgKCFpc0NvbHVtbkZsb3coKSkKLSAgICAgICAgY29udGVudEV4dGVudCA9IG1haW5BeGlz Q29udGVudEV4dGVudCgpOwotICAgIGVsc2UgewotICAgICAgICAvLyBGSVhNRTogUmVmYWN0b3Ig dG8gYXZvaWQgc2ltaWxhciBjb2RlIGluIG1haW5BeGlzQ29udGVudEV4dGVudCgpLgotICAgICAg ICBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMgY29tcHV0ZWRWYWx1ZXM7Ci0gICAgICAgIGNv bXB1dGVMb2dpY2FsSGVpZ2h0KHByZWZlcnJlZE1haW5BeGlzRXh0ZW50LCBsb2dpY2FsVG9wKCks IGNvbXB1dGVkVmFsdWVzKTsKLSAgICAgICAgY29udGVudEV4dGVudCA9IGNvbXB1dGVkVmFsdWVz Lm1fZXh0ZW50IC0gYm9yZGVyQW5kUGFkZGluZ0xvZ2ljYWxIZWlnaHQoKSAtIHNjcm9sbGJhckxv Z2ljYWxIZWlnaHQoKTsKLSAgICB9Ci0KKyAgICBMYXlvdXRVbml0IGNvbnRlbnRFeHRlbnQgPSBt YWluQXhpc0NvbnRlbnRFeHRlbnQocHJlZmVycmVkTWFpbkF4aXNFeHRlbnQpOwogICAgIHJldHVy biBjb250ZW50RXh0ZW50IC0gcHJlZmVycmVkTWFpbkF4aXNFeHRlbnQ7CiB9CiAKQEAgLTc5MCwx NyArNzgxLDYgQEAgdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZU1haW5BeGlzUHJlZmVy cmVkU2l6ZXMoYm9vbCByZWxheW91dENoaWxkcmVuLCBPcmQKICAgICB9CiB9CiAKLUxheW91dFVu aXQgUmVuZGVyRmxleGlibGVCb3g6OmxpbmVCcmVha0xlbmd0aCgpCi17Ci0gICAgaWYgKCFpc0Nv bHVtbkZsb3coKSkKLSAgICAgICAgcmV0dXJuIG1haW5BeGlzQ29udGVudEV4dGVudCgpOwotCi0g ICAgLy8gRklYTUU6IFJlZmFjdG9yIHRvIGF2b2lkIHNpbWlsYXIgY29kZSBpbiBtYWluQXhpc0Nv bnRlbnRFeHRlbnQoKS4KLSAgICBMb2dpY2FsRXh0ZW50Q29tcHV0ZWRWYWx1ZXMgY29tcHV0ZWRW YWx1ZXM7Ci0gICAgY29tcHV0ZUxvZ2ljYWxIZWlnaHQoTUFYX0xBWU9VVF9VTklULCBsb2dpY2Fs VG9wKCksIGNvbXB1dGVkVmFsdWVzKTsKLSAgICByZXR1cm4gY29tcHV0ZWRWYWx1ZXMubV9leHRl bnQgLSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpIC0gc2Nyb2xsYmFyTG9naWNhbEhl aWdodCgpOwotfQotCiBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjphZGp1c3RDaGlsZFNp emVGb3JNaW5BbmRNYXgoUmVuZGVyQm94KiBjaGlsZCwgTGF5b3V0VW5pdCBjaGlsZFNpemUpCiB7 CiAgICAgLy8gRklYTUU6IFN1cHBvcnQgaW50cmluc2ljIG1pbi9tYXggbGVuZ3Rocy4KQEAgLTgz Miw3ICs4MTIsNyBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94Ojpjb21wdXRlTmV4dEZsZXhMaW5l KE9yZGVySXRlcmF0b3ImIGl0ZXJhdG9yLCBPcmRlcmVkRmxleAogICAgIGlmICghaXRlcmF0b3Iu Y3VycmVudENoaWxkKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgIExheW91dFVuaXQg bGluZUJyZWFrID0gbGluZUJyZWFrTGVuZ3RoKCk7CisgICAgTGF5b3V0VW5pdCBsaW5lQnJlYWtM ZW5ndGggPSBtYWluQXhpc0NvbnRlbnRFeHRlbnQoTUFYX0xBWU9VVF9VTklUKTsKIAogICAgIGZv ciAoUmVuZGVyQm94KiBjaGlsZCA9IGl0ZXJhdG9yLmN1cnJlbnRDaGlsZCgpOyBjaGlsZDsgY2hp bGQgPSBpdGVyYXRvci5uZXh0KCkpIHsKICAgICAgICAgaWYgKGNoaWxkLT5pc091dE9mRmxvd1Bv c2l0aW9uZWQoKSkgewpAQCAtODQ0LDcgKzgyNCw3IEBAIGJvb2wgUmVuZGVyRmxleGlibGVCb3g6 OmNvbXB1dGVOZXh0RmxleExpbmUoT3JkZXJJdGVyYXRvciYgaXRlcmF0b3IsIE9yZGVyZWRGbGV4 CiAgICAgICAgIExheW91dFVuaXQgY2hpbGRNYWluQXhpc01hcmdpbkJveEV4dGVudCA9IG1haW5B eGlzQm9yZGVyQW5kUGFkZGluZ0V4dGVudEZvckNoaWxkKGNoaWxkKSArIGNoaWxkTWFpbkF4aXNF eHRlbnQ7CiAgICAgICAgIGNoaWxkTWFpbkF4aXNNYXJnaW5Cb3hFeHRlbnQgKz0gaXNIb3Jpem9u dGFsRmxvdygpID8gY2hpbGQtPm1hcmdpbldpZHRoKCkgOiBjaGlsZC0+bWFyZ2luSGVpZ2h0KCk7 CiAKLSAgICAgICAgaWYgKGlzTXVsdGlsaW5lKCkgJiYgcHJlZmVycmVkTWFpbkF4aXNFeHRlbnQg KyBjaGlsZE1haW5BeGlzTWFyZ2luQm94RXh0ZW50ID4gbGluZUJyZWFrICYmIG9yZGVyZWRDaGls ZHJlbi5zaXplKCkgPiAwKQorICAgICAgICBpZiAoaXNNdWx0aWxpbmUoKSAmJiBwcmVmZXJyZWRN YWluQXhpc0V4dGVudCArIGNoaWxkTWFpbkF4aXNNYXJnaW5Cb3hFeHRlbnQgPiBsaW5lQnJlYWtM ZW5ndGggJiYgb3JkZXJlZENoaWxkcmVuLnNpemUoKSA+IDApCiAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgb3JkZXJlZENoaWxkcmVuLmFwcGVuZChjaGlsZCk7CiAgICAgICAgIHByZWZlcnJl ZE1haW5BeGlzRXh0ZW50ICs9IGNoaWxkTWFpbkF4aXNNYXJnaW5Cb3hFeHRlbnQ7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guaCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCmluZGV4IGM5NTEwNWY2M2Nk ZGE3MmYxNjk3OTk1OGU1MThhMjJlODA0YWYzNjkuLjFjYTIxMGMwNzEwYTZhN2I3OWQ4NWI3NDA0 Mzc3ODhlMGU4NGJiZjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5k ZXJGbGV4aWJsZUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4 aWJsZUJveC5oCkBAIC04NSw3ICs4NSw3IEBAIHByaXZhdGU6CiAgICAgTGF5b3V0VW5pdCBjcm9z c0F4aXNFeHRlbnQoKSBjb25zdDsKICAgICBMYXlvdXRVbml0IG1haW5BeGlzRXh0ZW50KCkgY29u c3Q7CiAgICAgTGF5b3V0VW5pdCBjcm9zc0F4aXNDb250ZW50RXh0ZW50KCkgY29uc3Q7Ci0gICAg TGF5b3V0VW5pdCBtYWluQXhpc0NvbnRlbnRFeHRlbnQoKTsKKyAgICBMYXlvdXRVbml0IG1haW5B eGlzQ29udGVudEV4dGVudChMYXlvdXRVbml0IGNvbnRlbnRMb2dpY2FsSGVpZ2h0KTsKICAgICBM YXlvdXRVbml0IGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxkKFJlbmRlckJveCogY2hpbGQs IFNpemVUeXBlLCBjb25zdCBMZW5ndGgmIHNpemUpOwogICAgIFdyaXRpbmdNb2RlIHRyYW5zZm9y bWVkV3JpdGluZ01vZGUoKSBjb25zdDsKICAgICBMYXlvdXRVbml0IGZsb3dBd2FyZUJvcmRlclN0 YXJ0KCkgY29uc3Q7CkBAIC0xMjIsNyArMTIyLDYgQEAgcHJpdmF0ZToKIAogICAgIExheW91dFVu aXQgY29tcHV0ZUNoaWxkTWFyZ2luVmFsdWUoTGVuZ3RoIG1hcmdpbiwgUmVuZGVyVmlldyopOwog ICAgIHZvaWQgY29tcHV0ZU1haW5BeGlzUHJlZmVycmVkU2l6ZXMoYm9vbCByZWxheW91dENoaWxk cmVuLCBPcmRlckhhc2hTZXQmKTsKLSAgICBMYXlvdXRVbml0IGxpbmVCcmVha0xlbmd0aCgpOwog ICAgIExheW91dFVuaXQgYWRqdXN0Q2hpbGRTaXplRm9yTWluQW5kTWF4KFJlbmRlckJveCosIExh eW91dFVuaXQgY2hpbGRTaXplKTsKICAgICBib29sIGNvbXB1dGVOZXh0RmxleExpbmUoT3JkZXJJ dGVyYXRvciYsIE9yZGVyZWRGbGV4SXRlbUxpc3QmIG9yZGVyZWRDaGlsZHJlbiwgTGF5b3V0VW5p dCYgcHJlZmVycmVkTWFpbkF4aXNFeHRlbnQsIGZsb2F0JiB0b3RhbEZsZXhHcm93LCBmbG9hdCYg dG90YWxXZWlnaHRlZEZsZXhTaHJpbmssIExheW91dFVuaXQmIG1pbk1heEFwcGxpZWRNYWluQXhp c0V4dGVudCk7CiAgICAgTGF5b3V0VW5pdCBjb21wdXRlQXZhaWxhYmxlRnJlZVNwYWNlKExheW91 dFVuaXQgcHJlZmVycmVkTWFpbkF4aXNFeHRlbnQpOwo= 163930 2012-09-13 12:12:36 -0700 2012-09-13 12:49:13 -0700 Patch for landing bug-96676-20120913121208.patch text/plain 7682 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTI4NDg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDUwY2NiNWMyZGM1YTIx MTE2ZWI4ODRhZTZiMWMxM2Y2YzhhMThjZi4uMjA5M2RkYTc3ZTQ3MWE3ZDczYTMwNTMxYThmMzFm MzEyYjQ5N2RhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI0IEBACiAyMDEyLTA5LTEzICBUb255 IENoYW5nICA8dG9ueUBjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgUmVmYWN0b3IgZHVwbGljYXRl IGNvZGUgaW50byBSZW5kZXJGbGV4aWJsZUJveDo6bWFpbkF4aXNDb250ZW50RXh0ZW50CisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05NjY3NgorCisgICAg ICAgIFJldmlld2VkIGJ5IEVyaWMgU2VpZGVsLgorCisgICAgICAgIFRoZXJlIHdhcyBjb21wdXRl QXZhaWxhYmxlRnJlZVNwYWNlKCkgYW5kIGxpbmVCcmVha0xlbmd0aCgpIHNoYXJlZCBzb21lIHZl cnkgc2ltaWxhciBjb2RlLgorICAgICAgICBNZXJnZSB0aGlzIGNvZGUgaW50byBtYWluQXhpc0Nv bnRlbnRFeHRlbnQoKS4KKworICAgICAgICBObyBuZXcgdGVzdHMsIHRoaXMgaXMganVzdCBhIHJl ZmFjdG9yLgorCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjptYWluQXhpc0NvbnRlbnRFeHRlbnQp OiBUYWtlIGNvbnRlbnRMb2dpY2FsSGVpZ2h0IGFzIGEgcGFyYW1ldGVyLAorICAgICAgICB3aGlj aCBpcyBuZWVkZWQgd2hlbiBkZXRlcm1pbmluZyB0aGUgbG9naWNhbCBoZWlnaHQuCisgICAgICAg IChXZWJDb3JlOjpSZW5kZXJGbGV4aWJsZUJveDo6Y29tcHV0ZUF2YWlsYWJsZUZyZWVTcGFjZSk6 IFVzZSBtYWluQXhpc0NvbnRlbnRFeHRlbnQoKSBhbmQgaW5saW5lLgorICAgICAgICAoV2ViQ29y ZTo6UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVOZXh0RmxleExpbmUpOiBVc2UgbWFpbkF4aXND b250ZW50RXh0ZW50KCkuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94Lmg6 CisKKzIwMTItMDktMTMgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKwogICAgICAg ICBGbGV4aXRlbSBtYXJnaW5zIHNob3VsZCBiZSBiYXNlZCBvbiBjb250ZW50IHdpZHRoLCBub3Qg d2lkdGgKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk2 Njc0CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJs ZUJveC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3Bw CmluZGV4IDY5ODk1ZjI1NjVkYTUzNWU5M2Y4NzkyMjg0MTcwOWFmNzg4ZTEzYzYuLjg1YTVmZTIw MWVhNjE1NWMwNGI1ZDNhZjhjMWEyNmVkOWQ1NTA2YWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtMzkzLDExICszOTMsMTEgQEAgTGF5 b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6Y3Jvc3NBeGlzQ29udGVudEV4dGVudCgpIGNvbnN0 CiAgICAgcmV0dXJuIGlzSG9yaXpvbnRhbEZsb3coKSA/IGNvbnRlbnRIZWlnaHQoKSA6IGNvbnRl bnRXaWR0aCgpOwogfQogCi1MYXlvdXRVbml0IFJlbmRlckZsZXhpYmxlQm94OjptYWluQXhpc0Nv bnRlbnRFeHRlbnQoKQorTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6bWFpbkF4aXNDb250 ZW50RXh0ZW50KExheW91dFVuaXQgY29udGVudExvZ2ljYWxIZWlnaHQpCiB7CiAgICAgaWYgKGlz Q29sdW1uRmxvdygpKSB7CiAgICAgICAgIExvZ2ljYWxFeHRlbnRDb21wdXRlZFZhbHVlcyBjb21w dXRlZFZhbHVlczsKLSAgICAgICAgY29tcHV0ZUxvZ2ljYWxIZWlnaHQobG9naWNhbEhlaWdodCgp LCBsb2dpY2FsVG9wKCksIGNvbXB1dGVkVmFsdWVzKTsKKyAgICAgICAgY29tcHV0ZUxvZ2ljYWxI ZWlnaHQoY29udGVudExvZ2ljYWxIZWlnaHQsIGxvZ2ljYWxUb3AoKSwgY29tcHV0ZWRWYWx1ZXMp OwogICAgICAgICByZXR1cm4gc3RkOjptYXgoTGF5b3V0VW5pdCgwKSwgY29tcHV0ZWRWYWx1ZXMu bV9leHRlbnQgLSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpIC0gc2Nyb2xsYmFyTG9n aWNhbEhlaWdodCgpKTsKICAgICB9CiAgICAgcmV0dXJuIGNvbnRlbnRMb2dpY2FsV2lkdGgoKTsK QEAgLTYxMSwyMSArNjExLDYgQEAgTGF5b3V0VW5pdCBSZW5kZXJGbGV4aWJsZUJveDo6cHJlZmVy cmVkTWFpbkF4aXNDb250ZW50RXh0ZW50Rm9yQ2hpbGQoUmVuZGVyQm94KgogICAgIHJldHVybiBz dGQ6Om1heChMYXlvdXRVbml0KDApLCBjb21wdXRlTWFpbkF4aXNFeHRlbnRGb3JDaGlsZChjaGls ZCwgTWFpbk9yUHJlZmVycmVkU2l6ZSwgZmxleEJhc2lzKSk7CiB9CiAKLUxheW91dFVuaXQgUmVu ZGVyRmxleGlibGVCb3g6OmNvbXB1dGVBdmFpbGFibGVGcmVlU3BhY2UoTGF5b3V0VW5pdCBwcmVm ZXJyZWRNYWluQXhpc0V4dGVudCkKLXsKLSAgICBMYXlvdXRVbml0IGNvbnRlbnRFeHRlbnQgPSAw OwotICAgIGlmICghaXNDb2x1bW5GbG93KCkpCi0gICAgICAgIGNvbnRlbnRFeHRlbnQgPSBtYWlu QXhpc0NvbnRlbnRFeHRlbnQoKTsKLSAgICBlbHNlIHsKLSAgICAgICAgLy8gRklYTUU6IFJlZmFj dG9yIHRvIGF2b2lkIHNpbWlsYXIgY29kZSBpbiBtYWluQXhpc0NvbnRlbnRFeHRlbnQoKS4KLSAg ICAgICAgTG9naWNhbEV4dGVudENvbXB1dGVkVmFsdWVzIGNvbXB1dGVkVmFsdWVzOwotICAgICAg ICBjb21wdXRlTG9naWNhbEhlaWdodChwcmVmZXJyZWRNYWluQXhpc0V4dGVudCwgbG9naWNhbFRv cCgpLCBjb21wdXRlZFZhbHVlcyk7Ci0gICAgICAgIGNvbnRlbnRFeHRlbnQgPSBjb21wdXRlZFZh bHVlcy5tX2V4dGVudCAtIGJvcmRlckFuZFBhZGRpbmdMb2dpY2FsSGVpZ2h0KCkgLSBzY3JvbGxi YXJMb2dpY2FsSGVpZ2h0KCk7Ci0gICAgfQotCi0gICAgcmV0dXJuIGNvbnRlbnRFeHRlbnQgLSBw cmVmZXJyZWRNYWluQXhpc0V4dGVudDsKLX0KLQogdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6bGF5 b3V0RmxleEl0ZW1zKE9yZGVySXRlcmF0b3ImIGl0ZXJhdG9yLCBXVEY6OlZlY3RvcjxMaW5lQ29u dGV4dD4mIGxpbmVDb250ZXh0cykKIHsKICAgICBPcmRlcmVkRmxleEl0ZW1MaXN0IG9yZGVyZWRD aGlsZHJlbjsKQEAgLTYzNiw3ICs2MjEsNyBAQCB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjpsYXlv dXRGbGV4SXRlbXMoT3JkZXJJdGVyYXRvciYgaXRlcmF0b3IsIFdURjo6VmVjdG9yPExpbgogCiAg ICAgTGF5b3V0VW5pdCBjcm9zc0F4aXNPZmZzZXQgPSBmbG93QXdhcmVCb3JkZXJCZWZvcmUoKSAr IGZsb3dBd2FyZVBhZGRpbmdCZWZvcmUoKTsKICAgICB3aGlsZSAoY29tcHV0ZU5leHRGbGV4TGlu ZShpdGVyYXRvciwgb3JkZXJlZENoaWxkcmVuLCBwcmVmZXJyZWRNYWluQXhpc0V4dGVudCwgdG90 YWxGbGV4R3JvdywgdG90YWxXZWlnaHRlZEZsZXhTaHJpbmssIG1pbk1heEFwcGxpZWRNYWluQXhp c0V4dGVudCkpIHsKLSAgICAgICAgTGF5b3V0VW5pdCBhdmFpbGFibGVGcmVlU3BhY2UgPSBjb21w dXRlQXZhaWxhYmxlRnJlZVNwYWNlKHByZWZlcnJlZE1haW5BeGlzRXh0ZW50KTsKKyAgICAgICAg TGF5b3V0VW5pdCBhdmFpbGFibGVGcmVlU3BhY2UgPSBtYWluQXhpc0NvbnRlbnRFeHRlbnQocHJl ZmVycmVkTWFpbkF4aXNFeHRlbnQpIC0gcHJlZmVycmVkTWFpbkF4aXNFeHRlbnQ7CiAgICAgICAg IEZsZXhTaWduIGZsZXhTaWduID0gKG1pbk1heEFwcGxpZWRNYWluQXhpc0V4dGVudCA8IHByZWZl cnJlZE1haW5BeGlzRXh0ZW50ICsgYXZhaWxhYmxlRnJlZVNwYWNlKSA/IFBvc2l0aXZlRmxleGli aWxpdHkgOiBOZWdhdGl2ZUZsZXhpYmlsaXR5OwogICAgICAgICBJbmZsZXhpYmxlRmxleEl0ZW1T aXplIGluZmxleGlibGVJdGVtczsKICAgICAgICAgV1RGOjpWZWN0b3I8TGF5b3V0VW5pdD4gY2hp bGRTaXplczsKQEAgLTc5MCwxNyArNzc1LDYgQEAgdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6Y29t cHV0ZU1haW5BeGlzUHJlZmVycmVkU2l6ZXMoYm9vbCByZWxheW91dENoaWxkcmVuLCBPcmQKICAg ICB9CiB9CiAKLUxheW91dFVuaXQgUmVuZGVyRmxleGlibGVCb3g6OmxpbmVCcmVha0xlbmd0aCgp Ci17Ci0gICAgaWYgKCFpc0NvbHVtbkZsb3coKSkKLSAgICAgICAgcmV0dXJuIG1haW5BeGlzQ29u dGVudEV4dGVudCgpOwotCi0gICAgLy8gRklYTUU6IFJlZmFjdG9yIHRvIGF2b2lkIHNpbWlsYXIg Y29kZSBpbiBtYWluQXhpc0NvbnRlbnRFeHRlbnQoKS4KLSAgICBMb2dpY2FsRXh0ZW50Q29tcHV0 ZWRWYWx1ZXMgY29tcHV0ZWRWYWx1ZXM7Ci0gICAgY29tcHV0ZUxvZ2ljYWxIZWlnaHQoTUFYX0xB WU9VVF9VTklULCBsb2dpY2FsVG9wKCksIGNvbXB1dGVkVmFsdWVzKTsKLSAgICByZXR1cm4gY29t cHV0ZWRWYWx1ZXMubV9leHRlbnQgLSBib3JkZXJBbmRQYWRkaW5nTG9naWNhbEhlaWdodCgpIC0g c2Nyb2xsYmFyTG9naWNhbEhlaWdodCgpOwotfQotCiBMYXlvdXRVbml0IFJlbmRlckZsZXhpYmxl Qm94OjphZGp1c3RDaGlsZFNpemVGb3JNaW5BbmRNYXgoUmVuZGVyQm94KiBjaGlsZCwgTGF5b3V0 VW5pdCBjaGlsZFNpemUpCiB7CiAgICAgLy8gRklYTUU6IFN1cHBvcnQgaW50cmluc2ljIG1pbi9t YXggbGVuZ3Rocy4KQEAgLTgzMiw3ICs4MDYsNyBAQCBib29sIFJlbmRlckZsZXhpYmxlQm94Ojpj b21wdXRlTmV4dEZsZXhMaW5lKE9yZGVySXRlcmF0b3ImIGl0ZXJhdG9yLCBPcmRlcmVkRmxleAog ICAgIGlmICghaXRlcmF0b3IuY3VycmVudENoaWxkKCkpCiAgICAgICAgIHJldHVybiBmYWxzZTsK IAotICAgIExheW91dFVuaXQgbGluZUJyZWFrID0gbGluZUJyZWFrTGVuZ3RoKCk7CisgICAgTGF5 b3V0VW5pdCBsaW5lQnJlYWtMZW5ndGggPSBtYWluQXhpc0NvbnRlbnRFeHRlbnQoTUFYX0xBWU9V VF9VTklUKTsKIAogICAgIGZvciAoUmVuZGVyQm94KiBjaGlsZCA9IGl0ZXJhdG9yLmN1cnJlbnRD aGlsZCgpOyBjaGlsZDsgY2hpbGQgPSBpdGVyYXRvci5uZXh0KCkpIHsKICAgICAgICAgaWYgKGNo aWxkLT5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSkgewpAQCAtODQ0LDcgKzgxOCw3IEBAIGJvb2wg UmVuZGVyRmxleGlibGVCb3g6OmNvbXB1dGVOZXh0RmxleExpbmUoT3JkZXJJdGVyYXRvciYgaXRl cmF0b3IsIE9yZGVyZWRGbGV4CiAgICAgICAgIExheW91dFVuaXQgY2hpbGRNYWluQXhpc01hcmdp bkJveEV4dGVudCA9IG1haW5BeGlzQm9yZGVyQW5kUGFkZGluZ0V4dGVudEZvckNoaWxkKGNoaWxk KSArIGNoaWxkTWFpbkF4aXNFeHRlbnQ7CiAgICAgICAgIGNoaWxkTWFpbkF4aXNNYXJnaW5Cb3hF eHRlbnQgKz0gaXNIb3Jpem9udGFsRmxvdygpID8gY2hpbGQtPm1hcmdpbldpZHRoKCkgOiBjaGls ZC0+bWFyZ2luSGVpZ2h0KCk7CiAKLSAgICAgICAgaWYgKGlzTXVsdGlsaW5lKCkgJiYgcHJlZmVy cmVkTWFpbkF4aXNFeHRlbnQgKyBjaGlsZE1haW5BeGlzTWFyZ2luQm94RXh0ZW50ID4gbGluZUJy ZWFrICYmIG9yZGVyZWRDaGlsZHJlbi5zaXplKCkgPiAwKQorICAgICAgICBpZiAoaXNNdWx0aWxp bmUoKSAmJiBwcmVmZXJyZWRNYWluQXhpc0V4dGVudCArIGNoaWxkTWFpbkF4aXNNYXJnaW5Cb3hF eHRlbnQgPiBsaW5lQnJlYWtMZW5ndGggJiYgb3JkZXJlZENoaWxkcmVuLnNpemUoKSA+IDApCiAg ICAgICAgICAgICBicmVhazsKICAgICAgICAgb3JkZXJlZENoaWxkcmVuLmFwcGVuZChjaGlsZCk7 CiAgICAgICAgIHByZWZlcnJlZE1haW5BeGlzRXh0ZW50ICs9IGNoaWxkTWFpbkF4aXNNYXJnaW5C b3hFeHRlbnQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxl eGlibGVCb3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5o CmluZGV4IGM5NTEwNWY2M2NkZGE3MmYxNjk3OTk1OGU1MThhMjJlODA0YWYzNjkuLjc1MzNjNThk MTBmMTZiYzFkODdmZDkyMjg1OWYxNjk4NGQ2MjAyZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5oCkBAIC04NSw3ICs4NSw3IEBAIHByaXZhdGU6CiAg ICAgTGF5b3V0VW5pdCBjcm9zc0F4aXNFeHRlbnQoKSBjb25zdDsKICAgICBMYXlvdXRVbml0IG1h aW5BeGlzRXh0ZW50KCkgY29uc3Q7CiAgICAgTGF5b3V0VW5pdCBjcm9zc0F4aXNDb250ZW50RXh0 ZW50KCkgY29uc3Q7Ci0gICAgTGF5b3V0VW5pdCBtYWluQXhpc0NvbnRlbnRFeHRlbnQoKTsKKyAg ICBMYXlvdXRVbml0IG1haW5BeGlzQ29udGVudEV4dGVudChMYXlvdXRVbml0IGNvbnRlbnRMb2dp Y2FsSGVpZ2h0KTsKICAgICBMYXlvdXRVbml0IGNvbXB1dGVNYWluQXhpc0V4dGVudEZvckNoaWxk KFJlbmRlckJveCogY2hpbGQsIFNpemVUeXBlLCBjb25zdCBMZW5ndGgmIHNpemUpOwogICAgIFdy aXRpbmdNb2RlIHRyYW5zZm9ybWVkV3JpdGluZ01vZGUoKSBjb25zdDsKICAgICBMYXlvdXRVbml0 IGZsb3dBd2FyZUJvcmRlclN0YXJ0KCkgY29uc3Q7CkBAIC0xMjIsMTAgKzEyMiw4IEBAIHByaXZh dGU6CiAKICAgICBMYXlvdXRVbml0IGNvbXB1dGVDaGlsZE1hcmdpblZhbHVlKExlbmd0aCBtYXJn aW4sIFJlbmRlclZpZXcqKTsKICAgICB2b2lkIGNvbXB1dGVNYWluQXhpc1ByZWZlcnJlZFNpemVz KGJvb2wgcmVsYXlvdXRDaGlsZHJlbiwgT3JkZXJIYXNoU2V0Jik7Ci0gICAgTGF5b3V0VW5pdCBs aW5lQnJlYWtMZW5ndGgoKTsKICAgICBMYXlvdXRVbml0IGFkanVzdENoaWxkU2l6ZUZvck1pbkFu ZE1heChSZW5kZXJCb3gqLCBMYXlvdXRVbml0IGNoaWxkU2l6ZSk7CiAgICAgYm9vbCBjb21wdXRl TmV4dEZsZXhMaW5lKE9yZGVySXRlcmF0b3ImLCBPcmRlcmVkRmxleEl0ZW1MaXN0JiBvcmRlcmVk Q2hpbGRyZW4sIExheW91dFVuaXQmIHByZWZlcnJlZE1haW5BeGlzRXh0ZW50LCBmbG9hdCYgdG90 YWxGbGV4R3JvdywgZmxvYXQmIHRvdGFsV2VpZ2h0ZWRGbGV4U2hyaW5rLCBMYXlvdXRVbml0JiBt aW5NYXhBcHBsaWVkTWFpbkF4aXNFeHRlbnQpOwotICAgIExheW91dFVuaXQgY29tcHV0ZUF2YWls YWJsZUZyZWVTcGFjZShMYXlvdXRVbml0IHByZWZlcnJlZE1haW5BeGlzRXh0ZW50KTsKIAogICAg IGJvb2wgcmVzb2x2ZUZsZXhpYmxlTGVuZ3RocyhGbGV4U2lnbiwgY29uc3QgT3JkZXJlZEZsZXhJ dGVtTGlzdCYsIExheW91dFVuaXQmIGF2YWlsYWJsZUZyZWVTcGFjZSwgZmxvYXQmIHRvdGFsRmxl eEdyb3csIGZsb2F0JiB0b3RhbFdlaWdodGVkRmxleFNocmluaywgSW5mbGV4aWJsZUZsZXhJdGVt U2l6ZSYsIFdURjo6VmVjdG9yPExheW91dFVuaXQ+JiBjaGlsZFNpemVzKTsKICAgICB2b2lkIGZy ZWV6ZVZpb2xhdGlvbnMoY29uc3QgV1RGOjpWZWN0b3I8VmlvbGF0aW9uPiYsIExheW91dFVuaXQm IGF2YWlsYWJsZUZyZWVTcGFjZSwgZmxvYXQmIHRvdGFsRmxleEdyb3csIGZsb2F0JiB0b3RhbFdl aWdodGVkRmxleFNocmluaywgSW5mbGV4aWJsZUZsZXhJdGVtU2l6ZSYpOwo=