94807 2012-08-23 06:53:30 -0700 Flexbox doesn't need to compute logical height for stretched items in row flow 2012-08-23 12:46:32 -0700 1 1 1 Unclassified WebKit Layout and Rendering 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 shezbaig.wk shezbaig.wk eric ojan tony webkit.review.bot oldest_to_newest 702947 0 shezbaig.wk 2012-08-23 06:53:30 -0700 Since we only stretch when child->style()->logicalHeight().isAuto(), there is no need to compute the logical height. We just need to constain by min-max values. See bug 94604, comment 2 for details 703034 1 160173 shezbaig.wk 2012-08-23 08:46:13 -0700 Created attachment 160173 Patch Initial patch for review 703123 2 160173 tony 2012-08-23 10:28:58 -0700 Comment on attachment 160173 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=160173&action=review > Source/WebCore/rendering/RenderBox.cpp:443 > if (maxH == -1) > - maxH = result; > - result = min(maxH, result); > - result = max(minH, result); > - return result; > + maxH = logicalHeight; > + logicalHeight = min(maxH, logicalHeight); Nit: This could just be: if (maxH != -1) logicalHeight = min(maxH, logicalHeight); 703206 3 160205 shezbaig.wk 2012-08-23 11:48:55 -0700 Created attachment 160205 Patch I simplified it further -- the entire maxH block can be skipped if style()->logicalMaxHeight().isUndefined() 703266 4 160205 webkit.review.bot 2012-08-23 12:46:29 -0700 Comment on attachment 160205 Patch Clearing flags on attachment: 160205 Committed r126468: <http://trac.webkit.org/changeset/126468> 703267 5 webkit.review.bot 2012-08-23 12:46:32 -0700 All reviewed patches have been landed. Closing bug. 160173 2012-08-23 08:46:13 -0700 2012-08-23 11:47:19 -0700 Patch bug-94807-20120823114612.patch text/plain 6174 shezbaig.wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmE3MjkyM2JiMGM0NDk5 ZTNlNDUzMTNkOGRkMWZhNDAxOWRkZjU5ZC4uNDY5ZmI3OTNiNWY2MTU5ZjcxZWE2ODNjZjYwMTQ5 ZmUwYmYxOTI1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTA4LTIzICBTaGV6 YW4gQmFpZyAgPHNoZXpiYWlnLndrQGdtYWlsLmNvbT4KKworICAgICAgICBGbGV4Ym94IGRvZXNu J3QgbmVlZCB0byBjb21wdXRlIGxvZ2ljYWwgaGVpZ2h0IGZvciBzdHJldGNoZWQgaXRlbXMgaW4g cm93IGZsb3cKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTk0ODA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Q2hhbmdlIGxvZ2ljYWxIZWlnaHRDb25zdHJhaW5lZEJ5TWluTWF4IHRvCisgICAgICAgIGNvbnN0 cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heC4gVGhlIG5ldyBtZXRob2QgZG9lc24ndCBjb21wdXRl IHRoZQorICAgICAgICBNYWluT3JQcmVmZXJyZWQgbG9naWNhbCBoZWlnaHQgKHRoYXQgY29tcHV0 YXRpb24gaGFzIGJlZW4gbW92ZWQgYmFjayB0bworICAgICAgICBjb21wdXRlTG9naWNhbEhlaWdo dCkuIFJlbmRlckZsZXhpYmxlQm94IG5vdyBqdXN0IGNvbnN0cmFpbnMgdGhlCisgICAgICAgIHN0 cmV0Y2hlZExvZ2ljYWxIZWlnaHQgYnkgbWluL21heC4KKworICAgICAgICBObyBuZXcgdGVzdHMu IFRoaXMgaXMgYSBjbGVhbnVwIG9mIGJ1ZyA5NDIzNy4KKworICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dp Y2FsSGVpZ2h0QnlNaW5NYXgpOiBJbnN0ZWFkIG9mCisgICAgICAgIGNvbXB1dGluZyB0aGUgTWFp bk9yUHJlZmVycmVkIGxvZ2ljYWwgaGVpZ2h0LCBqdXN0IGNvbnN0cmFpbiB0aGUgZ2l2ZW4KKyAg ICAgICAgbG9naWNhbCBoZWlnaHQgYnkgTWluU2l6ZSBhbmQgTWF4U2l6ZS4KKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHQpOiBDb21wdXRlIHRoZSBNYWlu T3JQcmVmZXJyZWQKKyAgICAgICAgbG9naWNhbCBoZWlnaHQgYmVmb3JlIGNvbnN0cmFpbmluZyBi eSBtaW4vbWF4LgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoKKyAgICAgICAgKFJl bmRlckJveCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjphcHBseVN0cmV0Y2hBbGlnbm1lbnRU b0NoaWxkKTogVXNlCisgICAgICAgIGNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heCB0byBj b25zdHJhaW4gdGhlIHN0cmV0Y2hlZExvZ2ljYWxIZWlnaHQuCisKIDIwMTItMDgtMjMgIENhcmxv cyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3 ZWQuIEZpeCBtYWtlIGRpc3RjaGVjay4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5j cHAKaW5kZXggYTAwNTZlMDNiNzczODBmMTJjOGQ5YzJiN2MxYjI1MzAyMWZiMDM2NS4uYWUyM2U0 N2E0MTgxMDYxYjNmYjAwNTJjOTAyMGIxOTNmMDExNTZjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveC5jcHAKQEAgLTQzMywxOSArNDMzLDE2IEBAIHZvaWQgUmVuZGVyQm94Ojp1 cGRhdGVMYXllclRyYW5zZm9ybSgpCiAgICAgICAgIGxheWVyKCktPnVwZGF0ZVRyYW5zZm9ybSgp OwogfQogCi1MYXlvdXRVbml0IFJlbmRlckJveDo6bG9naWNhbEhlaWdodENvbnN0cmFpbmVkQnlN aW5NYXgoTGF5b3V0VW5pdCBhdmFpbGFibGVIZWlnaHQpCitMYXlvdXRVbml0IFJlbmRlckJveDo6 Y29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCkK IHsKICAgICBSZW5kZXJTdHlsZSogc3R5bGVUb1VzZSA9IHN0eWxlKCk7Ci0gICAgTGF5b3V0VW5p dCByZXN1bHQgPSBjb21wdXRlTG9naWNhbEhlaWdodFVzaW5nKE1haW5PclByZWZlcnJlZFNpemUs IHN0eWxlVG9Vc2UtPmxvZ2ljYWxIZWlnaHQoKSk7Ci0gICAgaWYgKHJlc3VsdCA9PSAtMSkKLSAg ICAgICAgcmVzdWx0ID0gYXZhaWxhYmxlSGVpZ2h0OwogICAgIExheW91dFVuaXQgbWluSCA9IGNv bXB1dGVMb2dpY2FsSGVpZ2h0VXNpbmcoTWluU2l6ZSwgc3R5bGVUb1VzZS0+bG9naWNhbE1pbkhl aWdodCgpKTsgLy8gTGVhdmUgYXMgLTEgaWYgdW5zZXQuCi0gICAgTGF5b3V0VW5pdCBtYXhIID0g c3R5bGVUb1VzZS0+bG9naWNhbE1heEhlaWdodCgpLmlzVW5kZWZpbmVkKCkgPyByZXN1bHQgOiBj b21wdXRlTG9naWNhbEhlaWdodFVzaW5nKE1heFNpemUsIHN0eWxlVG9Vc2UtPmxvZ2ljYWxNYXhI ZWlnaHQoKSk7CisgICAgTGF5b3V0VW5pdCBtYXhIID0gc3R5bGVUb1VzZS0+bG9naWNhbE1heEhl aWdodCgpLmlzVW5kZWZpbmVkKCkgPyBsb2dpY2FsSGVpZ2h0IDogY29tcHV0ZUxvZ2ljYWxIZWln aHRVc2luZyhNYXhTaXplLCBzdHlsZVRvVXNlLT5sb2dpY2FsTWF4SGVpZ2h0KCkpOwogICAgIGlm IChtYXhIID09IC0xKQotICAgICAgICBtYXhIID0gcmVzdWx0OwotICAgIHJlc3VsdCA9IG1pbiht YXhILCByZXN1bHQpOwotICAgIHJlc3VsdCA9IG1heChtaW5ILCByZXN1bHQpOwotICAgIHJldHVy biByZXN1bHQ7CisgICAgICAgIG1heEggPSBsb2dpY2FsSGVpZ2h0OworICAgIGxvZ2ljYWxIZWln aHQgPSBtaW4obWF4SCwgbG9naWNhbEhlaWdodCk7CisgICAgbG9naWNhbEhlaWdodCA9IG1heCht aW5ILCBsb2dpY2FsSGVpZ2h0KTsKKyAgICByZXR1cm4gbG9naWNhbEhlaWdodDsKIH0KIAogSW50 UmVjdCBSZW5kZXJCb3g6OmFic29sdXRlQ29udGVudEJveCgpIGNvbnN0CkBAIC0yMDEzLDkgKzIw MTAsMTIgQEAgdm9pZCBSZW5kZXJCb3g6OmNvbXB1dGVMb2dpY2FsSGVpZ2h0KCkKICAgICAgICAg fQogCiAgICAgICAgIExheW91dFVuaXQgaGVpZ2h0UmVzdWx0OwotICAgICAgICBpZiAoY2hlY2tN aW5NYXhIZWlnaHQpCi0gICAgICAgICAgICBoZWlnaHRSZXN1bHQgPSBsb2dpY2FsSGVpZ2h0Q29u c3RyYWluZWRCeU1pbk1heChsb2dpY2FsSGVpZ2h0KCkpOwotICAgICAgICBlbHNlIHsKKyAgICAg ICAgaWYgKGNoZWNrTWluTWF4SGVpZ2h0KSB7CisgICAgICAgICAgICBoZWlnaHRSZXN1bHQgPSBj b21wdXRlTG9naWNhbEhlaWdodFVzaW5nKE1haW5PclByZWZlcnJlZFNpemUsIHN0eWxlKCktPmxv Z2ljYWxIZWlnaHQoKSk7CisgICAgICAgICAgICBpZiAoaGVpZ2h0UmVzdWx0ID09IC0xKQorICAg ICAgICAgICAgICAgIGhlaWdodFJlc3VsdCA9IGxvZ2ljYWxIZWlnaHQoKTsKKyAgICAgICAgICAg IGhlaWdodFJlc3VsdCA9IGNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heChoZWlnaHRSZXN1 bHQpOworICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgLy8gVGhlIG9ubHkgdGltZXMgd2Ug ZG9uJ3QgY2hlY2sgbWluL21heCBoZWlnaHQgYXJlIHdoZW4gYSBmaXhlZCBsZW5ndGggaGFzCiAg ICAgICAgICAgICAvLyBiZWVuIGdpdmVuIGFzIGFuIG92ZXJyaWRlLiAgSnVzdCB1c2UgdGhhdC4g IFRoZSB2YWx1ZSBoYXMgYWxyZWFkeSBiZWVuIGFkanVzdGVkCiAgICAgICAgICAgICAvLyBmb3Ig Ym94LXNpemluZy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJC b3guaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAppbmRleCAwMGIwNWY0 ZTFhZjAxMjZlMmI4NDVkZTk2NWFiOTdkOWZlNzdiN2IwLi5hMmFlZWQwMjFmYzM5YjhjZTViZGIw YTllYTVlYWJiYmVmY2Y0M2E1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyQm94LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCkBA IC03NSw3ICs3NSw3IEBAIHB1YmxpYzoKICAgICBMYXlvdXRVbml0IGxvZ2ljYWxXaWR0aCgpIGNv bnN0IHsgcmV0dXJuIHN0eWxlKCktPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyB3aWR0aCgp IDogaGVpZ2h0KCk7IH0KICAgICBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHQoKSBjb25zdCB7IHJl dHVybiBzdHlsZSgpLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gaGVpZ2h0KCkgOiB3aWR0 aCgpOyB9CiAKLSAgICBMYXlvdXRVbml0IGxvZ2ljYWxIZWlnaHRDb25zdHJhaW5lZEJ5TWluTWF4 KExheW91dFVuaXQpOworICAgIExheW91dFVuaXQgY29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWlu TWF4KExheW91dFVuaXQpOwogCiAgICAgaW50IHBpeGVsU25hcHBlZExvZ2ljYWxIZWlnaHQoKSBj b25zdCB7IHJldHVybiBzdHlsZSgpLT5pc0hvcml6b250YWxXcml0aW5nTW9kZSgpID8gcGl4ZWxT bmFwcGVkSGVpZ2h0KCkgOiBwaXhlbFNuYXBwZWRXaWR0aCgpOyB9CiAgICAgaW50IHBpeGVsU25h cHBlZExvZ2ljYWxXaWR0aCgpIGNvbnN0IHsgcmV0dXJuIHN0eWxlKCktPmlzSG9yaXpvbnRhbFdy aXRpbmdNb2RlKCkgPyBwaXhlbFNuYXBwZWRXaWR0aCgpIDogcGl4ZWxTbmFwcGVkSGVpZ2h0KCk7 IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJv eC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxleGlibGVCb3guY3BwCmlu ZGV4IDQ0OGQ0ZGE2ZGRjZDgyMjJmZGRhOGU2ZGE4OTU5MTI3NDZhZTM5YWYuLmY0MDIwMWZlZTRj NTRjNGY5Nzc2NmNjM2IxMTk4ZmY5OGYwZjM3OGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcApAQCAtMTIzMywxMCArMTIzMywxMCBAQCB2b2lk IFJlbmRlckZsZXhpYmxlQm94OjphbGlnbkNoaWxkcmVuKE9yZGVySXRlcmF0b3ImIGl0ZXJhdG9y LCBjb25zdCBXVEY6OlZlY3Rvcgogdm9pZCBSZW5kZXJGbGV4aWJsZUJveDo6YXBwbHlTdHJldGNo QWxpZ25tZW50VG9DaGlsZChSZW5kZXJCb3gqIGNoaWxkLCBMYXlvdXRVbml0IGxpbmVDcm9zc0F4 aXNFeHRlbnQpCiB7CiAgICAgaWYgKCFpc0NvbHVtbkZsb3coKSAmJiBjaGlsZC0+c3R5bGUoKS0+ bG9naWNhbEhlaWdodCgpLmlzQXV0bygpKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBJZiB0aGUgY2hp bGQgaGFzIG9ydGhvZ29uYWwgZmxvdywgdGhlbiBpdCBhbHJlYWR5IGhhcyBhbiBvdmVycmlkZSBo ZWlnaHQgc2V0LiBIb3cgZG8gd2Ugc3RyZXRjaD8KKyAgICAgICAgLy8gRklYTUU6IElmIHRoZSBj aGlsZCBoYXMgb3J0aG9nb25hbCBmbG93LCB0aGVuIGl0IGFscmVhZHkgaGFzIGFuIG92ZXJyaWRl IGhlaWdodCBzZXQsIHNvIHVzZSBpdC4KICAgICAgICAgaWYgKCFoYXNPcnRob2dvbmFsRmxvdyhj aGlsZCkpIHsKICAgICAgICAgICAgIExheW91dFVuaXQgc3RyZXRjaGVkTG9naWNhbEhlaWdodCA9 IGNoaWxkLT5sb2dpY2FsSGVpZ2h0KCkgKyBhdmFpbGFibGVBbGlnbm1lbnRTcGFjZUZvckNoaWxk KGxpbmVDcm9zc0F4aXNFeHRlbnQsIGNoaWxkKTsKLSAgICAgICAgICAgIExheW91dFVuaXQgZGVz aXJlZExvZ2ljYWxIZWlnaHQgPSBjaGlsZC0+bG9naWNhbEhlaWdodENvbnN0cmFpbmVkQnlNaW5N YXgoc3RyZXRjaGVkTG9naWNhbEhlaWdodCk7CisgICAgICAgICAgICBMYXlvdXRVbml0IGRlc2ly ZWRMb2dpY2FsSGVpZ2h0ID0gY2hpbGQtPmNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heChz dHJldGNoZWRMb2dpY2FsSGVpZ2h0KTsKIAogICAgICAgICAgICAgLy8gRklYTUU6IENhbiBhdm9p ZCBsYXlpbmcgb3V0IGhlcmUgaW4gc29tZSBjYXNlcy4gU2VlIGh0dHBzOi8vd2Via2l0Lm9yZy9i Lzg3OTA1LgogICAgICAgICAgICAgaWYgKGRlc2lyZWRMb2dpY2FsSGVpZ2h0ICE9IGNoaWxkLT5s b2dpY2FsSGVpZ2h0KCkpIHsK 160205 2012-08-23 11:48:55 -0700 2012-08-23 12:46:29 -0700 Patch bug-94807-20120823144800.patch text/plain 6272 shezbaig.wk U3VidmVyc2lvbiBSZXZpc2lvbjogMTI2NDIyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmE3MjkyM2JiMGM0NDk5 ZTNlNDUzMTNkOGRkMWZhNDAxOWRkZjU5ZC4uNDY5ZmI3OTNiNWY2MTU5ZjcxZWE2ODNjZjYwMTQ5 ZmUwYmYxOTI1MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMwIEBACisyMDEyLTA4LTIzICBTaGV6 YW4gQmFpZyAgPHNoZXpiYWlnLndrQGdtYWlsLmNvbT4KKworICAgICAgICBGbGV4Ym94IGRvZXNu J3QgbmVlZCB0byBjb21wdXRlIGxvZ2ljYWwgaGVpZ2h0IGZvciBzdHJldGNoZWQgaXRlbXMgaW4g cm93IGZsb3cKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTk0ODA3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg Q2hhbmdlIGxvZ2ljYWxIZWlnaHRDb25zdHJhaW5lZEJ5TWluTWF4IHRvCisgICAgICAgIGNvbnN0 cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heC4gVGhlIG5ldyBtZXRob2QgZG9lc24ndCBjb21wdXRl IHRoZQorICAgICAgICBNYWluT3JQcmVmZXJyZWQgbG9naWNhbCBoZWlnaHQgKHRoYXQgY29tcHV0 YXRpb24gaGFzIGJlZW4gbW92ZWQgYmFjayB0bworICAgICAgICBjb21wdXRlTG9naWNhbEhlaWdo dCkuIFJlbmRlckZsZXhpYmxlQm94IG5vdyBqdXN0IGNvbnN0cmFpbnMgdGhlCisgICAgICAgIHN0 cmV0Y2hlZExvZ2ljYWxIZWlnaHQgYnkgbWluL21heC4KKworICAgICAgICBObyBuZXcgdGVzdHMu IFRoaXMgaXMgYSBjbGVhbnVwIG9mIGJ1ZyA5NDIzNy4KKworICAgICAgICAqIHJlbmRlcmluZy9S ZW5kZXJCb3guY3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyQm94Ojpjb25zdHJhaW5Mb2dp Y2FsSGVpZ2h0QnlNaW5NYXgpOiBJbnN0ZWFkIG9mCisgICAgICAgIGNvbXB1dGluZyB0aGUgTWFp bk9yUHJlZmVycmVkIGxvZ2ljYWwgaGVpZ2h0LCBqdXN0IGNvbnN0cmFpbiB0aGUgZ2l2ZW4KKyAg ICAgICAgbG9naWNhbCBoZWlnaHQgYnkgTWluU2l6ZSBhbmQgTWF4U2l6ZS4KKyAgICAgICAgKFdl YkNvcmU6OlJlbmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHQpOiBDb21wdXRlIHRoZSBNYWlu T3JQcmVmZXJyZWQKKyAgICAgICAgbG9naWNhbCBoZWlnaHQgYmVmb3JlIGNvbnN0cmFpbmluZyBi eSBtaW4vbWF4LgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJCb3guaDoKKyAgICAgICAgKFJl bmRlckJveCk6CisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlJlbmRlckZsZXhpYmxlQm94OjphcHBseVN0cmV0Y2hBbGlnbm1lbnRU b0NoaWxkKTogVXNlCisgICAgICAgIGNvbnN0cmFpbkxvZ2ljYWxIZWlnaHRCeU1pbk1heCB0byBj b25zdHJhaW4gdGhlIHN0cmV0Y2hlZExvZ2ljYWxIZWlnaHQuCisKIDIwMTItMDgtMjMgIENhcmxv cyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3 ZWQuIEZpeCBtYWtlIGRpc3RjaGVjay4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9SZW5kZXJCb3guY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5j cHAKaW5kZXggYTAwNTZlMDNiNzczODBmMTJjOGQ5YzJiN2MxYjI1MzAyMWZiMDM2NS4uNTE1YWU5 NGRjZWFiMzI3MTFlMWQ0YWNiODkxNWE1ZDVlZmU1MjBhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVy aW5nL1JlbmRlckJveC5jcHAKQEAgLTQzMywxOSArNDMzLDE3IEBAIHZvaWQgUmVuZGVyQm94Ojp1 cGRhdGVMYXllclRyYW5zZm9ybSgpCiAgICAgICAgIGxheWVyKCktPnVwZGF0ZVRyYW5zZm9ybSgp OwogfQogCi1MYXlvdXRVbml0IFJlbmRlckJveDo6bG9naWNhbEhlaWdodENvbnN0cmFpbmVkQnlN aW5NYXgoTGF5b3V0VW5pdCBhdmFpbGFibGVIZWlnaHQpCitMYXlvdXRVbml0IFJlbmRlckJveDo6 Y29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4KExheW91dFVuaXQgbG9naWNhbEhlaWdodCkK IHsKICAgICBSZW5kZXJTdHlsZSogc3R5bGVUb1VzZSA9IHN0eWxlKCk7Ci0gICAgTGF5b3V0VW5p dCByZXN1bHQgPSBjb21wdXRlTG9naWNhbEhlaWdodFVzaW5nKE1haW5PclByZWZlcnJlZFNpemUs IHN0eWxlVG9Vc2UtPmxvZ2ljYWxIZWlnaHQoKSk7Ci0gICAgaWYgKHJlc3VsdCA9PSAtMSkKLSAg ICAgICAgcmVzdWx0ID0gYXZhaWxhYmxlSGVpZ2h0OwotICAgIExheW91dFVuaXQgbWluSCA9IGNv bXB1dGVMb2dpY2FsSGVpZ2h0VXNpbmcoTWluU2l6ZSwgc3R5bGVUb1VzZS0+bG9naWNhbE1pbkhl aWdodCgpKTsgLy8gTGVhdmUgYXMgLTEgaWYgdW5zZXQuCi0gICAgTGF5b3V0VW5pdCBtYXhIID0g c3R5bGVUb1VzZS0+bG9naWNhbE1heEhlaWdodCgpLmlzVW5kZWZpbmVkKCkgPyByZXN1bHQgOiBj b21wdXRlTG9naWNhbEhlaWdodFVzaW5nKE1heFNpemUsIHN0eWxlVG9Vc2UtPmxvZ2ljYWxNYXhI ZWlnaHQoKSk7Ci0gICAgaWYgKG1heEggPT0gLTEpCi0gICAgICAgIG1heEggPSByZXN1bHQ7Ci0g ICAgcmVzdWx0ID0gbWluKG1heEgsIHJlc3VsdCk7Ci0gICAgcmVzdWx0ID0gbWF4KG1pbkgsIHJl c3VsdCk7Ci0gICAgcmV0dXJuIHJlc3VsdDsKKyAgICBpZiAoIXN0eWxlVG9Vc2UtPmxvZ2ljYWxN YXhIZWlnaHQoKS5pc1VuZGVmaW5lZCgpKSB7CisgICAgICAgIC8vIENvbnN0cmFpbiBieSBNYXhT aXplLgorICAgICAgICBMYXlvdXRVbml0IG1heEggPSBjb21wdXRlTG9naWNhbEhlaWdodFVzaW5n KE1heFNpemUsIHN0eWxlVG9Vc2UtPmxvZ2ljYWxNYXhIZWlnaHQoKSk7CisgICAgICAgIGlmICht YXhIICE9IC0xKQorICAgICAgICAgICAgbG9naWNhbEhlaWdodCA9IG1pbihsb2dpY2FsSGVpZ2h0 LCBtYXhIKTsKKyAgICB9CisgICAgLy8gQ29uc3RyYWluIGJ5IE1pblNpemUuCisgICAgcmV0dXJu IG1heChsb2dpY2FsSGVpZ2h0LCBjb21wdXRlTG9naWNhbEhlaWdodFVzaW5nKE1pblNpemUsIHN0 eWxlVG9Vc2UtPmxvZ2ljYWxNaW5IZWlnaHQoKSkpOwogfQogCiBJbnRSZWN0IFJlbmRlckJveDo6 YWJzb2x1dGVDb250ZW50Qm94KCkgY29uc3QKQEAgLTIwMTMsOSArMjAxMSwxMiBAQCB2b2lkIFJl bmRlckJveDo6Y29tcHV0ZUxvZ2ljYWxIZWlnaHQoKQogICAgICAgICB9CiAKICAgICAgICAgTGF5 b3V0VW5pdCBoZWlnaHRSZXN1bHQ7Ci0gICAgICAgIGlmIChjaGVja01pbk1heEhlaWdodCkKLSAg ICAgICAgICAgIGhlaWdodFJlc3VsdCA9IGxvZ2ljYWxIZWlnaHRDb25zdHJhaW5lZEJ5TWluTWF4 KGxvZ2ljYWxIZWlnaHQoKSk7Ci0gICAgICAgIGVsc2UgeworICAgICAgICBpZiAoY2hlY2tNaW5N YXhIZWlnaHQpIHsKKyAgICAgICAgICAgIGhlaWdodFJlc3VsdCA9IGNvbXB1dGVMb2dpY2FsSGVp Z2h0VXNpbmcoTWFpbk9yUHJlZmVycmVkU2l6ZSwgc3R5bGUoKS0+bG9naWNhbEhlaWdodCgpKTsK KyAgICAgICAgICAgIGlmIChoZWlnaHRSZXN1bHQgPT0gLTEpCisgICAgICAgICAgICAgICAgaGVp Z2h0UmVzdWx0ID0gbG9naWNhbEhlaWdodCgpOworICAgICAgICAgICAgaGVpZ2h0UmVzdWx0ID0g Y29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4KGhlaWdodFJlc3VsdCk7CisgICAgICAgIH0g ZWxzZSB7CiAgICAgICAgICAgICAvLyBUaGUgb25seSB0aW1lcyB3ZSBkb24ndCBjaGVjayBtaW4v bWF4IGhlaWdodCBhcmUgd2hlbiBhIGZpeGVkIGxlbmd0aCBoYXMKICAgICAgICAgICAgIC8vIGJl ZW4gZ2l2ZW4gYXMgYW4gb3ZlcnJpZGUuICBKdXN0IHVzZSB0aGF0LiAgVGhlIHZhbHVlIGhhcyBh bHJlYWR5IGJlZW4gYWRqdXN0ZWQKICAgICAgICAgICAgIC8vIGZvciBib3gtc2l6aW5nLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL1JlbmRlckJveC5oCmluZGV4IDAwYjA1ZjRlMWFmMDEyNmUyYjg0NWRl OTY1YWI5N2Q5ZmU3N2I3YjAuLmEyYWVlZDAyMWZjMzliOGNlNWJkYjBhOWVhNWVhYmJiZWZjZjQz YTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJCb3guaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyQm94LmgKQEAgLTc1LDcgKzc1LDcgQEAg cHVibGljOgogICAgIExheW91dFVuaXQgbG9naWNhbFdpZHRoKCkgY29uc3QgeyByZXR1cm4gc3R5 bGUoKS0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IHdpZHRoKCkgOiBoZWlnaHQoKTsgfQog ICAgIExheW91dFVuaXQgbG9naWNhbEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIHN0eWxlKCktPmlz SG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBoZWlnaHQoKSA6IHdpZHRoKCk7IH0KIAotICAgIExh eW91dFVuaXQgbG9naWNhbEhlaWdodENvbnN0cmFpbmVkQnlNaW5NYXgoTGF5b3V0VW5pdCk7Cisg ICAgTGF5b3V0VW5pdCBjb25zdHJhaW5Mb2dpY2FsSGVpZ2h0QnlNaW5NYXgoTGF5b3V0VW5pdCk7 CiAKICAgICBpbnQgcGl4ZWxTbmFwcGVkTG9naWNhbEhlaWdodCgpIGNvbnN0IHsgcmV0dXJuIHN0 eWxlKCktPmlzSG9yaXpvbnRhbFdyaXRpbmdNb2RlKCkgPyBwaXhlbFNuYXBwZWRIZWlnaHQoKSA6 IHBpeGVsU25hcHBlZFdpZHRoKCk7IH0KICAgICBpbnQgcGl4ZWxTbmFwcGVkTG9naWNhbFdpZHRo KCkgY29uc3QgeyByZXR1cm4gc3R5bGUoKS0+aXNIb3Jpem9udGFsV3JpdGluZ01vZGUoKSA/IHBp eGVsU25hcHBlZFdpZHRoKCkgOiBwaXhlbFNuYXBwZWRIZWlnaHQoKTsgfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckZsZXhpYmxlQm94LmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJGbGV4aWJsZUJveC5jcHAKaW5kZXggNDQ4ZDRkYTZkZGNk ODIyMmZkZGE4ZTZkYTg5NTkxMjc0NmFlMzlhZi4uZjQwMjAxZmVlNGM1NGM0Zjk3NzY2Y2MzYjEx OThmZjk4ZjBmMzc4YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl ckZsZXhpYmxlQm94LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyRmxl eGlibGVCb3guY3BwCkBAIC0xMjMzLDEwICsxMjMzLDEwIEBAIHZvaWQgUmVuZGVyRmxleGlibGVC b3g6OmFsaWduQ2hpbGRyZW4oT3JkZXJJdGVyYXRvciYgaXRlcmF0b3IsIGNvbnN0IFdURjo6VmVj dG9yCiB2b2lkIFJlbmRlckZsZXhpYmxlQm94OjphcHBseVN0cmV0Y2hBbGlnbm1lbnRUb0NoaWxk KFJlbmRlckJveCogY2hpbGQsIExheW91dFVuaXQgbGluZUNyb3NzQXhpc0V4dGVudCkKIHsKICAg ICBpZiAoIWlzQ29sdW1uRmxvdygpICYmIGNoaWxkLT5zdHlsZSgpLT5sb2dpY2FsSGVpZ2h0KCku aXNBdXRvKCkpIHsKLSAgICAgICAgLy8gRklYTUU6IElmIHRoZSBjaGlsZCBoYXMgb3J0aG9nb25h bCBmbG93LCB0aGVuIGl0IGFscmVhZHkgaGFzIGFuIG92ZXJyaWRlIGhlaWdodCBzZXQuIEhvdyBk byB3ZSBzdHJldGNoPworICAgICAgICAvLyBGSVhNRTogSWYgdGhlIGNoaWxkIGhhcyBvcnRob2dv bmFsIGZsb3csIHRoZW4gaXQgYWxyZWFkeSBoYXMgYW4gb3ZlcnJpZGUgaGVpZ2h0IHNldCwgc28g dXNlIGl0LgogICAgICAgICBpZiAoIWhhc09ydGhvZ29uYWxGbG93KGNoaWxkKSkgewogICAgICAg ICAgICAgTGF5b3V0VW5pdCBzdHJldGNoZWRMb2dpY2FsSGVpZ2h0ID0gY2hpbGQtPmxvZ2ljYWxI ZWlnaHQoKSArIGF2YWlsYWJsZUFsaWdubWVudFNwYWNlRm9yQ2hpbGQobGluZUNyb3NzQXhpc0V4 dGVudCwgY2hpbGQpOwotICAgICAgICAgICAgTGF5b3V0VW5pdCBkZXNpcmVkTG9naWNhbEhlaWdo dCA9IGNoaWxkLT5sb2dpY2FsSGVpZ2h0Q29uc3RyYWluZWRCeU1pbk1heChzdHJldGNoZWRMb2dp Y2FsSGVpZ2h0KTsKKyAgICAgICAgICAgIExheW91dFVuaXQgZGVzaXJlZExvZ2ljYWxIZWlnaHQg PSBjaGlsZC0+Y29uc3RyYWluTG9naWNhbEhlaWdodEJ5TWluTWF4KHN0cmV0Y2hlZExvZ2ljYWxI ZWlnaHQpOwogCiAgICAgICAgICAgICAvLyBGSVhNRTogQ2FuIGF2b2lkIGxheWluZyBvdXQgaGVy ZSBpbiBzb21lIGNhc2VzLiBTZWUgaHR0cHM6Ly93ZWJraXQub3JnL2IvODc5MDUuCiAgICAgICAg ICAgICBpZiAoZGVzaXJlZExvZ2ljYWxIZWlnaHQgIT0gY2hpbGQtPmxvZ2ljYWxIZWlnaHQoKSkg ewo=