185936 2018-05-23 22:00:12 -0700 [LFC] Implement position computation for inflow positioned elements 2018-05-24 09:58:23 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue koivisto sam simon.fraser webkit-bug-importer zalan oldest_to_newest 1426859 0 zalan 2018-05-23 22:00:12 -0700 ssia. 1426862 1 341172 zalan 2018-05-23 22:07:52 -0700 Created attachment 341172 Patch 1426924 2 341188 zalan 2018-05-24 07:39:37 -0700 Created attachment 341188 Patch 1426947 3 341195 zalan 2018-05-24 09:18:44 -0700 Created attachment 341195 Patch 1426958 4 341195 commit-queue 2018-05-24 09:57:29 -0700 Comment on attachment 341195 Patch Clearing flags on attachment: 341195 Committed r232154: <https://trac.webkit.org/changeset/232154> 1426959 5 commit-queue 2018-05-24 09:57:31 -0700 All reviewed patches have been landed. Closing bug. 1426960 6 webkit-bug-importer 2018-05-24 09:58:23 -0700 <rdar://problem/40524640> 341172 2018-05-23 22:07:52 -0700 2018-05-24 07:39:35 -0700 Patch bug-185936-20180523220751.patch text/plain 8211 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGU4MGI4YTVkYzQwMjQy ZDhlZGM0YjVjYWM0MDQ3ZDVmYjE2NDI5Ny4uYmUwZThkYmM4MmZmNThiM2ZhZTQ2OTNiYzdkNDUy ZWE5NTY1MmQxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE4LTA1LTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gSW1wbGVtZW50IHBv c2l0aW9uIGNvbXB1dGF0aW9uIGZvciBpbmZsb3cgcG9zaXRpb25lZCBlbGVtZW50cworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg1OTM2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsYXlvdXQvRm9ybWF0 dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29u dGV4dDo6Y29tcHV0ZUluRmxvd1Bvc2l0aW9uZWRQb3NpdGlvbiBjb25zdCk6CisgICAgICAgICog bGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0 dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUluRmxvd1Bvc2l0aW9uZWRQb3NpdGlv biBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRp bmdDb250ZXh0Lmg6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1h dHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9j a0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5GbG93UG9zaXRpb25lZFBvc2l0aW9uKToK KwogMjAxOC0wNS0yMyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAg IFtMRkNdIE1vdmUgc2l6aW5nL3Bvc2l0aW9uaW5nIGxvZ2ljIHRvIGhlbHBlciBjbGFzc2VzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCAzNWM2MDUw ZjdkMmMxOGI1NDVhNzIyOGNlY2JlMzk0NzNhM2EzYjJkLi43MDNiMDJjODA5N2EwNGJmN2FlMjgz Mzg5NTA4M2MxODUzYzI5ZGE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9y bWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5n Q29udGV4dC5jcHAKQEAgLTUzLDcgKzUzLDcgQEAgdm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6Y29t cHV0ZVN0YXRpY1Bvc2l0aW9uKExheW91dENvbnRleHQmLCBjb25zdCBCb3gmLCBEaXNwbGEKIHsK IH0KIAotdm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUluRmxvd1Bvc2l0aW9uZWRQb3Np dGlvbihjb25zdCBCb3gmLCBEaXNwbGF5OjpCb3gmKSBjb25zdAordm9pZCBGb3JtYXR0aW5nQ29u dGV4dDo6Y29tcHV0ZUluRmxvd1Bvc2l0aW9uZWRQb3NpdGlvbihMYXlvdXRDb250ZXh0JiwgY29u c3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29uc3QKIHsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCBjM2QzYzljOWE3MTZjMmY0Y2RiMTM1MDYwNmJk ZWJhOGNkMjIxZjE4Li5jNjk3N2FjMjZjYjJlNTc4YWRjMzBmYzEyODM2NmZkNWI2YzU0M2NkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaApAQCAtNjcsNyArNjcs NyBAQCBwcm90ZWN0ZWQ6CiAgICAgY29uc3QgQm94JiByb290KCkgY29uc3QgeyByZXR1cm4gKm1f cm9vdDsgfQogCiAgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVTdGF0aWNQb3NpdGlvbihMYXlvdXRD b250ZXh0JiwgY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29uc3Q7Ci0gICAgdmlydHVhbCB2 b2lkIGNvbXB1dGVJbkZsb3dQb3NpdGlvbmVkUG9zaXRpb24oY29uc3QgQm94JiwgRGlzcGxheTo6 Qm94JikgY29uc3Q7CisgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVJbkZsb3dQb3NpdGlvbmVkUG9z aXRpb24oTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0Owog ICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlT3V0T2ZGbG93UG9zaXRpb24oTGF5b3V0Q29udGV4dCYs IGNvbnN0IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0OwogCiAgICAgdmlydHVhbCB2b2lkIGNv bXB1dGVXaWR0aChMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29u c3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Js b2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCBiZGVjNDNkNTgwZDlhYzEw MjNiZTg5NGY3MmNhYjFiZWM0NzE0NjE5Li4wYjhmMWU3ZDVhMzlkNTYxODhhNGM2NzJkNGEyZTkx YmU3ZGRiNDIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0 aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTEzNCw2ICsx MzQsMTIgQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlU3RhdGljUG9zaXRp b24oTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwKICAgICBkaXNwbGF5Qm94LnNldFRvcExl ZnQodG9wTGVmdCk7CiB9CiAKK3ZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUlu Rmxvd1Bvc2l0aW9uZWRQb3NpdGlvbihMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBjb25z dCBCb3gmIGxheW91dEJveCwgRGlzcGxheTo6Qm94JiBkaXNwbGF5Qm94KSBjb25zdAoreworICAg IGF1dG8gdG9wTGVmdCA9IEdlb21ldHJ5OjppbkZsb3dQb3NpdGlvbmVkUG9zaXRpb24obGF5b3V0 Q29udGV4dCwgbGF5b3V0Qm94KTsKKyAgICBkaXNwbGF5Qm94LnNldFRvcExlZnQodG9wTGVmdCk7 Cit9CisKIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUluRmxvd0hlaWdodChM YXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCwgRGlzcGxh eTo6Qm94JiBkaXNwbGF5Qm94KSBjb25zdAogewogICAgIExheW91dFVuaXQgY29tcHV0ZWRIZWln aHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Js b2NrRm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1h dHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IGZlZDFhNjAxYTliZWZjOTVhOWMy ODIyMDJjMjdiOTVhY2I1Njc3YzcuLjM5NzgyOGNkMTMxZThiODZhNGY1MjlhY2MzMWI0YWIxMjJi YzUwODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcv QmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9j a2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC01Miw2ICs1Miw3IEBAIHB1 YmxpYzoKIAogcHJpdmF0ZToKICAgICB2b2lkIGNvbXB1dGVTdGF0aWNQb3NpdGlvbihMYXlvdXRD b250ZXh0JiwgY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29uc3Qgb3ZlcnJpZGU7CisgICAg dm9pZCBjb21wdXRlSW5GbG93UG9zaXRpb25lZFBvc2l0aW9uKExheW91dENvbnRleHQmLCBjb25z dCBCb3gmLCBEaXNwbGF5OjpCb3gmKSBjb25zdCBvdmVycmlkZTsKICAgICB2b2lkIGNvbXB1dGVJ bkZsb3dXaWR0aChMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29u c3Qgb3ZlcnJpZGU7CiAgICAgdm9pZCBjb21wdXRlSW5GbG93SGVpZ2h0KExheW91dENvbnRleHQm LCBjb25zdCBCb3gmLCBEaXNwbGF5OjpCb3gmKSBjb25zdCBvdmVycmlkZTsKIApAQCAtNjUsNiAr NjYsNyBAQCBwcml2YXRlOgogICAgICAgICBzdGF0aWMgTGF5b3V0VW5pdCBpbkZsb3dOb25SZXBs YWNlZFdpZHRoKExheW91dENvbnRleHQmLCBjb25zdCBCb3gmKTsKIAogICAgICAgICBzdGF0aWMg TGF5b3V0UG9pbnQgc3RhdGljUG9zaXRpb24oTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYpOwor ICAgICAgICBzdGF0aWMgTGF5b3V0UG9pbnQgaW5GbG93UG9zaXRpb25lZFBvc2l0aW9uKExheW91 dENvbnRleHQmLCBjb25zdCBCb3gmKTsKICAgICB9OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2Vv bWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zv cm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDZmNGNmZDFkOTRmYzU3NTA0ZmIzYmJl OTRhOTc3YzI0YWU5NjM0YjIuLjUzMmFlOGRjZWI0YmRiYTUwNzY2YTVmZWVmNDZjYWFkMDMzY2Qz ODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxv Y2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKQEAg LTEzNyw2ICsxMzcsNjggQEAgTGF5b3V0UG9pbnQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2Vv bWV0cnk6OnN0YXRpY1Bvc2l0aW9uKExheW91dENvbnRleHQmIGxheW8KICAgICByZXR1cm4gdG9w TGVmdDsKIH0KIAorTGF5b3V0UG9pbnQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6 OmluRmxvd1Bvc2l0aW9uZWRQb3NpdGlvbihMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBj b25zdCBCb3gmIGxheW91dEJveCkKK3sKKyAgICBBU1NFUlQobGF5b3V0Qm94LmlzSW5GbG93UG9z aXRpb25lZCgpKTsKKyAgICAvLyA5LjQuMyBSZWxhdGl2ZSBwb3NpdGlvbmluZworICAgIC8vCisg ICAgLy8gRm9yIHJlbGF0aXZlbHkgcG9zaXRpb25lZCBlbGVtZW50cywgJ2xlZnQnIGFuZCAncmln aHQnIG1vdmUgdGhlIGJveChlcykgaG9yaXpvbnRhbGx5LCB3aXRob3V0IGNoYW5naW5nIHRoZWly IHNpemUuCisgICAgLy8gJ0xlZnQnIG1vdmVzIHRoZSBib3hlcyB0byB0aGUgcmlnaHQsIGFuZCAn cmlnaHQnIG1vdmVzIHRoZW0gdG8gdGhlIGxlZnQuCisgICAgLy8gU2luY2UgYm94ZXMgYXJlIG5v dCBzcGxpdCBvciBzdHJldGNoZWQgYXMgYSByZXN1bHQgb2YgJ2xlZnQnIG9yICdyaWdodCcsIHRo ZSB1c2VkIHZhbHVlcyBhcmUgYWx3YXlzOiBsZWZ0ID0gLXJpZ2h0LgorICAgIC8vCisgICAgLy8g MS4gSWYgYm90aCAnbGVmdCcgYW5kICdyaWdodCcgYXJlICdhdXRvJyAodGhlaXIgaW5pdGlhbCB2 YWx1ZXMpLCB0aGUgdXNlZCB2YWx1ZXMgYXJlICcwJyAoaS5lLiwgdGhlIGJveGVzIHN0YXkgaW4g dGhlaXIgb3JpZ2luYWwgcG9zaXRpb24pLgorICAgIC8vIDIuIElmICdsZWZ0JyBpcyAnYXV0bycs IGl0cyB1c2VkIHZhbHVlIGlzIG1pbnVzIHRoZSB2YWx1ZSBvZiAncmlnaHQnIChpLmUuLCB0aGUg Ym94ZXMgbW92ZSB0byB0aGUgbGVmdCBieSB0aGUgdmFsdWUgb2YgJ3JpZ2h0JykuCisgICAgLy8g My4gSWYgJ3JpZ2h0JyBpcyBzcGVjaWZpZWQgYXMgJ2F1dG8nLCBpdHMgdXNlZCB2YWx1ZSBpcyBt aW51cyB0aGUgdmFsdWUgb2YgJ2xlZnQnLgorICAgIC8vIDQuIElmIG5laXRoZXIgJ2xlZnQnIG5v ciAncmlnaHQnIGlzICdhdXRvJywgdGhlIHBvc2l0aW9uIGlzIG92ZXItY29uc3RyYWluZWQsIGFu ZCBvbmUgb2YgdGhlbSBoYXMgdG8gYmUgaWdub3JlZC4KKyAgICAvLyAgICBJZiB0aGUgJ2RpcmVj dGlvbicgcHJvcGVydHkgb2YgdGhlIGNvbnRhaW5pbmcgYmxvY2sgaXMgJ2x0cicsIHRoZSB2YWx1 ZSBvZiAnbGVmdCcgd2lucyBhbmQgJ3JpZ2h0JyBiZWNvbWVzIC0nbGVmdCcuCisgICAgLy8gICAg SWYgJ2RpcmVjdGlvbicgb2YgdGhlIGNvbnRhaW5pbmcgYmxvY2sgaXMgJ3J0bCcsICdyaWdodCcg d2lucyBhbmQgJ2xlZnQnIGlzIGlnbm9yZWQuCisgICAgLy8KKyAgICAvLyBUaGUgJ3RvcCcgYW5k ICdib3R0b20nIHByb3BlcnRpZXMgbW92ZSByZWxhdGl2ZWx5IHBvc2l0aW9uZWQgZWxlbWVudChz KSB1cCBvciBkb3duIHdpdGhvdXQgY2hhbmdpbmcgdGhlaXIgc2l6ZS4KKyAgICAvLyBUb3AnIG1v dmVzIHRoZSBib3hlcyBkb3duLCBhbmQgJ2JvdHRvbScgbW92ZXMgdGhlbSB1cC4gU2luY2UgYm94 ZXMgYXJlIG5vdCBzcGxpdCBvciBzdHJldGNoZWQgYXMgYSByZXN1bHQgb2YgJ3RvcCcgb3IgJ2Jv dHRvbScsIHRoZSB1c2VkIHZhbHVlcyBhcmUgYWx3YXlzOiB0b3AgPSAtYm90dG9tLgorICAgIC8v CisgICAgLy8gMS4gSWYgYm90aCBhcmUgJ2F1dG8nLCB0aGVpciB1c2VkIHZhbHVlcyBhcmUgYm90 aCAnMCcuCisgICAgLy8gMi4gSWYgb25lIG9mIHRoZW0gaXMgJ2F1dG8nLCBpdCBiZWNvbWVzIHRo ZSBuZWdhdGl2ZSBvZiB0aGUgb3RoZXIuCisgICAgLy8gMy4gSWYgbmVpdGhlciBpcyAnYXV0bycs ICdib3R0b20nIGlzIGlnbm9yZWQgKGkuZS4sIHRoZSB1c2VkIHZhbHVlIG9mICdib3R0b20nIHdp bGwgYmUgbWludXMgdGhlIHZhbHVlIG9mICd0b3AnKS4KKyAgICBhdXRvJiBkaXNwbGF5Qm94ID0g KmxheW91dENvbnRleHQuZGlzcGxheUJveEZvckxheW91dEJveChsYXlvdXRCb3gpOworCisgICAg YXV0byYgc3R5bGUgPSBsYXlvdXRCb3guc3R5bGUoKTsKKyAgICBhdXRvIHRvcCA9IHN0eWxlLmxv Z2ljYWxUb3AoKTsKKyAgICBhdXRvIGJvdHRvbSA9IHN0eWxlLmxvZ2ljYWxCb3R0b20oKTsKKwor ICAgIExheW91dFVuaXQgY29tcHV0ZWRUb3BWYWx1ZTsKKyAgICBpZiAodG9wLmlzQXV0bygpICYm IGJvdHRvbS5pc0F1dG8oKSkgeworICAgICAgICAvLyAjMQorICAgICAgICBjb21wdXRlZFRvcFZh bHVlID0gZGlzcGxheUJveC50b3AoKTsKKyAgICB9IGVsc2UgaWYgKHRvcC5pc0F1dG8oKSkgewor ICAgICAgICAvLyAjMgorICAgICAgICBjb21wdXRlZFRvcFZhbHVlID0gZGlzcGxheUJveC50b3Ao KSAtIGJvdHRvbS52YWx1ZSgpOworICAgIH0gZWxzZSBpZiAoYm90dG9tLmlzQXV0bygpKSB7Cisg ICAgICAgIC8vICMzICM0CisgICAgICAgIGNvbXB1dGVkVG9wVmFsdWUgPSBkaXNwbGF5Qm94LnRv cCgpICsgdG9wLnZhbHVlKCk7CisgICAgfQorCisgICAgYXV0byBsZWZ0ID0gc3R5bGUubG9naWNh bExlZnQoKTsKKyAgICBhdXRvIHJpZ2h0ID0gc3R5bGUubG9naWNhbFJpZ2h0KCk7CisKKyAgICBM YXlvdXRVbml0IGNvbXB1dGVkTGVmdFZhbHVlOworICAgIGlmIChsZWZ0LmlzQXV0bygpICYmIHJp Z2h0LmlzQXV0bygpKSB7CisgICAgICAgIC8vICMxCisgICAgICAgIGNvbXB1dGVkTGVmdFZhbHVl ID0gZGlzcGxheUJveC5sZWZ0KCk7CisgICAgfSBlbHNlIGlmIChsZWZ0LmlzQXV0bygpKSB7Cisg ICAgICAgIC8vICMyCisgICAgICAgIGNvbXB1dGVkTGVmdFZhbHVlID0gZGlzcGxheUJveC5sZWZ0 KCkgLSByaWdodC52YWx1ZSgpOworICAgIH0gZWxzZSBpZiAocmlnaHQuaXNBdXRvKCkpIHsKKyAg ICAgICAgLy8gIzMKKyAgICAgICAgY29tcHV0ZWRMZWZ0VmFsdWUgPSBkaXNwbGF5Qm94LmxlZnQo KSArIGxlZnQudmFsdWUoKTsKKyAgICB9IGVsc2UgeworICAgICAgICAvLyAjNAorICAgICAgICAv LyBGSVhNRTogdGFrZSBkaXJlY3Rpb24gaW50byBhY2NvdW50CisgICAgICAgIGNvbXB1dGVkTGVm dFZhbHVlID0gZGlzcGxheUJveC5sZWZ0KCkgKyBsZWZ0LnZhbHVlKCk7CisgICAgfQorCisgICAg cmV0dXJuIHsgY29tcHV0ZWRMZWZ0VmFsdWUsIGNvbXB1dGVkVG9wVmFsdWV9OworfQorCiB9CiB9 CiAK 341188 2018-05-24 07:39:37 -0700 2018-05-24 09:18:43 -0700 Patch bug-185936-20180524073937.patch text/plain 8036 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMTE0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGU4MGI4YTVkYzQwMjQy ZDhlZGM0YjVjYWM0MDQ3ZDVmYjE2NDI5Ny4uYmUwZThkYmM4MmZmNThiM2ZhZTQ2OTNiYzdkNDUy ZWE5NTY1MmQxMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE4LTA1LTIzICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gSW1wbGVtZW50IHBv c2l0aW9uIGNvbXB1dGF0aW9uIGZvciBpbmZsb3cgcG9zaXRpb25lZCBlbGVtZW50cworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg1OTM2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBsYXlvdXQvRm9ybWF0 dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpGb3JtYXR0aW5nQ29u dGV4dDo6Y29tcHV0ZUluRmxvd1Bvc2l0aW9uZWRQb3NpdGlvbiBjb25zdCk6CisgICAgICAgICog bGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0Lmg6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0 dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91 dDo6QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUluRmxvd1Bvc2l0aW9uZWRQb3NpdGlv biBjb25zdCk6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRp bmdDb250ZXh0Lmg6CisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1h dHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9j a0Zvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6aW5GbG93UG9zaXRpb25lZFBvc2l0aW9uKToK KwogMjAxOC0wNS0yMyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAg IFtMRkNdIE1vdmUgc2l6aW5nL3Bvc2l0aW9uaW5nIGxvZ2ljIHRvIGhlbHBlciBjbGFzc2VzCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIv U291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCAzNWM2MDUw ZjdkMmMxOGI1NDVhNzIyOGNlY2JlMzk0NzNhM2EzYjJkLi43MDNiMDJjODA5N2EwNGJmN2FlMjgz Mzg5NTA4M2MxODUzYzI5ZGE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9y bWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5n Q29udGV4dC5jcHAKQEAgLTUzLDcgKzUzLDcgQEAgdm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6Y29t cHV0ZVN0YXRpY1Bvc2l0aW9uKExheW91dENvbnRleHQmLCBjb25zdCBCb3gmLCBEaXNwbGEKIHsK IH0KIAotdm9pZCBGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUluRmxvd1Bvc2l0aW9uZWRQb3Np dGlvbihjb25zdCBCb3gmLCBEaXNwbGF5OjpCb3gmKSBjb25zdAordm9pZCBGb3JtYXR0aW5nQ29u dGV4dDo6Y29tcHV0ZUluRmxvd1Bvc2l0aW9uZWRQb3NpdGlvbihMYXlvdXRDb250ZXh0JiwgY29u c3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29uc3QKIHsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCBjM2QzYzljOWE3MTZjMmY0Y2RiMTM1MDYwNmJk ZWJhOGNkMjIxZjE4Li5jNjk3N2FjMjZjYjJlNTc4YWRjMzBmYzEyODM2NmZkNWI2YzU0M2NkIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHQuaApAQCAtNjcsNyArNjcs NyBAQCBwcm90ZWN0ZWQ6CiAgICAgY29uc3QgQm94JiByb290KCkgY29uc3QgeyByZXR1cm4gKm1f cm9vdDsgfQogCiAgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVTdGF0aWNQb3NpdGlvbihMYXlvdXRD b250ZXh0JiwgY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29uc3Q7Ci0gICAgdmlydHVhbCB2 b2lkIGNvbXB1dGVJbkZsb3dQb3NpdGlvbmVkUG9zaXRpb24oY29uc3QgQm94JiwgRGlzcGxheTo6 Qm94JikgY29uc3Q7CisgICAgdmlydHVhbCB2b2lkIGNvbXB1dGVJbkZsb3dQb3NpdGlvbmVkUG9z aXRpb24oTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0Owog ICAgIHZpcnR1YWwgdm9pZCBjb21wdXRlT3V0T2ZGbG93UG9zaXRpb24oTGF5b3V0Q29udGV4dCYs IGNvbnN0IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0OwogCiAgICAgdmlydHVhbCB2b2lkIGNv bXB1dGVXaWR0aChMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29u c3Q7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Js b2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAppbmRleCBiZGVjNDNkNTgwZDlhYzEw MjNiZTg5NGY3MmNhYjFiZWM0NzE0NjE5Li4wYjhmMWU3ZDVhMzlkNTYxODhhNGM2NzJkNGEyZTkx YmU3ZGRiNDIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0 aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKQEAgLTEzNCw2ICsx MzQsMTIgQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlU3RhdGljUG9zaXRp b24oTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwKICAgICBkaXNwbGF5Qm94LnNldFRvcExl ZnQodG9wTGVmdCk7CiB9CiAKK3ZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUlu Rmxvd1Bvc2l0aW9uZWRQb3NpdGlvbihMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBjb25z dCBCb3gmIGxheW91dEJveCwgRGlzcGxheTo6Qm94JiBkaXNwbGF5Qm94KSBjb25zdAoreworICAg IGF1dG8gdG9wTGVmdCA9IEdlb21ldHJ5OjppbkZsb3dQb3NpdGlvbmVkUG9zaXRpb24obGF5b3V0 Q29udGV4dCwgbGF5b3V0Qm94KTsKKyAgICBkaXNwbGF5Qm94LnNldFRvcExlZnQodG9wTGVmdCk7 Cit9CisKIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZUluRmxvd0hlaWdodChM YXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCwgRGlzcGxh eTo6Qm94JiBkaXNwbGF5Qm94KSBjb25zdAogewogICAgIExheW91dFVuaXQgY29tcHV0ZWRIZWln aHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Js b2NrRm9ybWF0dGluZ0NvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1h dHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCmluZGV4IGZlZDFhNjAxYTliZWZjOTVhOWMy ODIyMDJjMjdiOTVhY2I1Njc3YzcuLjM5NzgyOGNkMTMxZThiODZhNGY1MjlhY2MzMWI0YWIxMjJi YzUwODUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcv QmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9j a2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC01Miw2ICs1Miw3IEBAIHB1 YmxpYzoKIAogcHJpdmF0ZToKICAgICB2b2lkIGNvbXB1dGVTdGF0aWNQb3NpdGlvbihMYXlvdXRD b250ZXh0JiwgY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29uc3Qgb3ZlcnJpZGU7CisgICAg dm9pZCBjb21wdXRlSW5GbG93UG9zaXRpb25lZFBvc2l0aW9uKExheW91dENvbnRleHQmLCBjb25z dCBCb3gmLCBEaXNwbGF5OjpCb3gmKSBjb25zdCBvdmVycmlkZTsKICAgICB2b2lkIGNvbXB1dGVJ bkZsb3dXaWR0aChMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29u c3Qgb3ZlcnJpZGU7CiAgICAgdm9pZCBjb21wdXRlSW5GbG93SGVpZ2h0KExheW91dENvbnRleHQm LCBjb25zdCBCb3gmLCBEaXNwbGF5OjpCb3gmKSBjb25zdCBvdmVycmlkZTsKIApAQCAtNjUsNiAr NjYsNyBAQCBwcml2YXRlOgogICAgICAgICBzdGF0aWMgTGF5b3V0VW5pdCBpbkZsb3dOb25SZXBs YWNlZFdpZHRoKExheW91dENvbnRleHQmLCBjb25zdCBCb3gmKTsKIAogICAgICAgICBzdGF0aWMg TGF5b3V0UG9pbnQgc3RhdGljUG9zaXRpb24oTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYpOwor ICAgICAgICBzdGF0aWMgTGF5b3V0UG9pbnQgaW5GbG93UG9zaXRpb25lZFBvc2l0aW9uKExheW91 dENvbnRleHQmLCBjb25zdCBCb3gmKTsKICAgICB9OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2Vv bWV0cnkuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zv cm1hdHRpbmdDb250ZXh0R2VvbWV0cnkuY3BwCmluZGV4IDZmNGNmZDFkOTRmYzU3NTA0ZmIzYmJl OTRhOTc3YzI0YWU5NjM0YjIuLmM2NzFjNjZiNDIwMzRkMDVjMDVhNjQ4MzEyOTk3NzE3YTIwYTIz ODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxv Y2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKQEAg LTEzNyw2ICsxMzcsNjggQEAgTGF5b3V0UG9pbnQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2Vv bWV0cnk6OnN0YXRpY1Bvc2l0aW9uKExheW91dENvbnRleHQmIGxheW8KICAgICByZXR1cm4gdG9w TGVmdDsKIH0KIAorTGF5b3V0UG9pbnQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6 OmluRmxvd1Bvc2l0aW9uZWRQb3NpdGlvbihMYXlvdXRDb250ZXh0JiBsYXlvdXRDb250ZXh0LCBj b25zdCBCb3gmIGxheW91dEJveCkKK3sKKyAgICBBU1NFUlQobGF5b3V0Qm94LmlzSW5GbG93UG9z aXRpb25lZCgpKTsKKyAgICAvLyA5LjQuMyBSZWxhdGl2ZSBwb3NpdGlvbmluZworICAgIC8vCisg ICAgLy8gVGhlICd0b3AnIGFuZCAnYm90dG9tJyBwcm9wZXJ0aWVzIG1vdmUgcmVsYXRpdmVseSBw b3NpdGlvbmVkIGVsZW1lbnQocykgdXAgb3IgZG93biB3aXRob3V0IGNoYW5naW5nIHRoZWlyIHNp emUuCisgICAgLy8gVG9wJyBtb3ZlcyB0aGUgYm94ZXMgZG93biwgYW5kICdib3R0b20nIG1vdmVz IHRoZW0gdXAuIFNpbmNlIGJveGVzIGFyZSBub3Qgc3BsaXQgb3Igc3RyZXRjaGVkIGFzIGEgcmVz dWx0IG9mICd0b3AnIG9yICdib3R0b20nLCB0aGUgdXNlZCB2YWx1ZXMgYXJlIGFsd2F5czogdG9w ID0gLWJvdHRvbS4KKyAgICAvLworICAgIC8vIDEuIElmIGJvdGggYXJlICdhdXRvJywgdGhlaXIg dXNlZCB2YWx1ZXMgYXJlIGJvdGggJzAnLgorICAgIC8vIDIuIElmIG9uZSBvZiB0aGVtIGlzICdh dXRvJywgaXQgYmVjb21lcyB0aGUgbmVnYXRpdmUgb2YgdGhlIG90aGVyLgorICAgIC8vIDMuIElm IG5laXRoZXIgaXMgJ2F1dG8nLCAnYm90dG9tJyBpcyBpZ25vcmVkIChpLmUuLCB0aGUgdXNlZCB2 YWx1ZSBvZiAnYm90dG9tJyB3aWxsIGJlIG1pbnVzIHRoZSB2YWx1ZSBvZiAndG9wJykuCisgICAg YXV0byYgZGlzcGxheUJveCA9ICpsYXlvdXRDb250ZXh0LmRpc3BsYXlCb3hGb3JMYXlvdXRCb3go bGF5b3V0Qm94KTsKKyAgICBhdXRvJiBzdHlsZSA9IGxheW91dEJveC5zdHlsZSgpOworCisgICAg YXV0byB0b3AgPSBzdHlsZS5sb2dpY2FsVG9wKCk7CisgICAgYXV0byBib3R0b20gPSBzdHlsZS5s b2dpY2FsQm90dG9tKCk7CisgICAgTGF5b3V0VW5pdCB0b3BEZWx0YTsKKworICAgIGlmICh0b3Au aXNBdXRvKCkgJiYgYm90dG9tLmlzQXV0bygpKSB7CisgICAgICAgIC8vICMxCisgICAgICAgIHRv cERlbHRhID0gMDsKKyAgICB9IGVsc2UgaWYgKHRvcC5pc0F1dG8oKSkgeworICAgICAgICAvLyAj MgorICAgICAgICB0b3BEZWx0YSA9IC1ib3R0b20udmFsdWUoKTsKKyAgICB9IGVsc2UgaWYgKGJv dHRvbS5pc0F1dG8oKSkgeworICAgICAgICAvLyAjMyAjNAorICAgICAgICB0b3BEZWx0YSA9IHRv cC52YWx1ZSgpOworICAgIH0KKworICAgIC8vIEZvciByZWxhdGl2ZWx5IHBvc2l0aW9uZWQgZWxl bWVudHMsICdsZWZ0JyBhbmQgJ3JpZ2h0JyBtb3ZlIHRoZSBib3goZXMpIGhvcml6b250YWxseSwg d2l0aG91dCBjaGFuZ2luZyB0aGVpciBzaXplLgorICAgIC8vICdMZWZ0JyBtb3ZlcyB0aGUgYm94 ZXMgdG8gdGhlIHJpZ2h0LCBhbmQgJ3JpZ2h0JyBtb3ZlcyB0aGVtIHRvIHRoZSBsZWZ0LgorICAg IC8vIFNpbmNlIGJveGVzIGFyZSBub3Qgc3BsaXQgb3Igc3RyZXRjaGVkIGFzIGEgcmVzdWx0IG9m ICdsZWZ0JyBvciAncmlnaHQnLCB0aGUgdXNlZCB2YWx1ZXMgYXJlIGFsd2F5czogbGVmdCA9IC1y aWdodC4KKyAgICAvLworICAgIC8vIDEuIElmIGJvdGggJ2xlZnQnIGFuZCAncmlnaHQnIGFyZSAn YXV0bycgKHRoZWlyIGluaXRpYWwgdmFsdWVzKSwgdGhlIHVzZWQgdmFsdWVzIGFyZSAnMCcgKGku ZS4sIHRoZSBib3hlcyBzdGF5IGluIHRoZWlyIG9yaWdpbmFsIHBvc2l0aW9uKS4KKyAgICAvLyAy LiBJZiAnbGVmdCcgaXMgJ2F1dG8nLCBpdHMgdXNlZCB2YWx1ZSBpcyBtaW51cyB0aGUgdmFsdWUg b2YgJ3JpZ2h0JyAoaS5lLiwgdGhlIGJveGVzIG1vdmUgdG8gdGhlIGxlZnQgYnkgdGhlIHZhbHVl IG9mICdyaWdodCcpLgorICAgIC8vIDMuIElmICdyaWdodCcgaXMgc3BlY2lmaWVkIGFzICdhdXRv JywgaXRzIHVzZWQgdmFsdWUgaXMgbWludXMgdGhlIHZhbHVlIG9mICdsZWZ0Jy4KKyAgICAvLyA0 LiBJZiBuZWl0aGVyICdsZWZ0JyBub3IgJ3JpZ2h0JyBpcyAnYXV0bycsIHRoZSBwb3NpdGlvbiBp cyBvdmVyLWNvbnN0cmFpbmVkLCBhbmQgb25lIG9mIHRoZW0gaGFzIHRvIGJlIGlnbm9yZWQuCisg ICAgLy8gICAgSWYgdGhlICdkaXJlY3Rpb24nIHByb3BlcnR5IG9mIHRoZSBjb250YWluaW5nIGJs b2NrIGlzICdsdHInLCB0aGUgdmFsdWUgb2YgJ2xlZnQnIHdpbnMgYW5kICdyaWdodCcgYmVjb21l cyAtJ2xlZnQnLgorICAgIC8vICAgIElmICdkaXJlY3Rpb24nIG9mIHRoZSBjb250YWluaW5nIGJs b2NrIGlzICdydGwnLCAncmlnaHQnIHdpbnMgYW5kICdsZWZ0JyBpcyBpZ25vcmVkLgorICAgIC8v CisgICAgYXV0byBsZWZ0ID0gc3R5bGUubG9naWNhbExlZnQoKTsKKyAgICBhdXRvIHJpZ2h0ID0g c3R5bGUubG9naWNhbFJpZ2h0KCk7CisgICAgTGF5b3V0VW5pdCBsZWZ0RGVsdGE7CisKKyAgICBp ZiAobGVmdC5pc0F1dG8oKSAmJiByaWdodC5pc0F1dG8oKSkgeworICAgICAgICAvLyAjMQorICAg ICAgICBsZWZ0RGVsdGEgPSAwOworICAgIH0gZWxzZSBpZiAobGVmdC5pc0F1dG8oKSkgeworICAg ICAgICAvLyAjMgorICAgICAgICBsZWZ0RGVsdGEgPSAtcmlnaHQudmFsdWUoKTsKKyAgICB9IGVs c2UgaWYgKHJpZ2h0LmlzQXV0bygpKSB7CisgICAgICAgIC8vICMzCisgICAgICAgIGxlZnREZWx0 YSA9IGxlZnQudmFsdWUoKTsKKyAgICB9IGVsc2UgeworICAgICAgICAvLyAjNAorICAgICAgICAv LyBGSVhNRTogdGFrZSBkaXJlY3Rpb24gaW50byBhY2NvdW50CisgICAgICAgIGxlZnREZWx0YSA9 IGxlZnQudmFsdWUoKTsKKyAgICB9CisKKyAgICByZXR1cm4geyBkaXNwbGF5Qm94LmxlZnQoKSAr IGxlZnREZWx0YSwgZGlzcGxheUJveC50b3AoKSArIHRvcERlbHRhIH07Cit9CisKIH0KIH0KIAo= 341195 2018-05-24 09:18:44 -0700 2018-05-24 09:57:29 -0700 Patch bug-185936-20180524091844.patch text/plain 6450 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMyMTUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDhhZTczMDY3MTAwNGNk ZjFmMTY2ODUxNTYzZjZhY2Q5OWFmNmJjNS4uMjc5MThiYWM1NWNlYzNjMGU5YmQyMjEwN2YzNmVk YmZjN2VkMmZmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE4LTA1LTI0ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gSW1wbGVtZW50IHBv c2l0aW9uIGNvbXB1dGF0aW9uIGZvciBpbmZsb3cgcG9zaXRpb25lZCBlbGVtZW50cworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg1OTM2CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgQW50dGkgS29pdmlzdG8uCisKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tm b3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0Ojpjb21wdXRlSW5GbG93UG9zaXRpb25lZFBv c2l0aW9uIGNvbnN0KToKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9y bWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2Nr Rm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6 OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjppbkZsb3dQb3NpdGlvbmVkUG9zaXRp b24pOgorCiAyMDE4LTA1LTI0ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAg ICAgICAgW0xGQ10gSW1wbGVtZW50IEZvcm1hdHRpbmdDb250ZXh0OjpwbGFjZUluRmxvd1Bvc2l0 aW9uZWRDaGlsZHJlbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5jcHAKaW5kZXggZTFmNjdl NzI2OTJlMzYyNDQxMDRlM2IwMGNkNDcxZDY1YWNiMTY4OC4uMWQ5NzhmZTc0ZTA0ODJiMmEzOTFl ODJiNDdlYTY2MTQxOGU4OTU2ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Js b2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuY3BwCkBA IC0xMzQsNiArMTM0LDEyIEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6Y29tcHV0ZVN0 YXRpY1Bvc2l0aW9uKExheW91dENvbnRleHQmIGxheW91dENvbnRleHQsCiAgICAgZGlzcGxheUJv eC5zZXRUb3BMZWZ0KHRvcExlZnQpOwogfQogCit2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6 OmNvbXB1dGVJbkZsb3dQb3NpdGlvbmVkUG9zaXRpb24oTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29u dGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gsIERpc3BsYXk6OkJveCYgZGlzcGxheUJveCkgY29u c3QKK3sKKyAgICBhdXRvIHRvcExlZnQgPSBHZW9tZXRyeTo6aW5GbG93UG9zaXRpb25lZFBvc2l0 aW9uKGxheW91dENvbnRleHQsIGxheW91dEJveCk7CisgICAgZGlzcGxheUJveC5zZXRUb3BMZWZ0 KHRvcExlZnQpOworfQorCiB2b2lkIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6OmNvbXB1dGVJbkZs b3dIZWlnaHQoTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRC b3gsIERpc3BsYXk6OkJveCYgZGlzcGxheUJveCkgY29uc3QKIHsKICAgICBMYXlvdXRVbml0IGNv bXB1dGVkSGVpZ2h0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv YmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCBmZWQxYTYwMWE5 YmVmYzk1YTljMjgyMjAyYzI3Yjk1YWNiNTY3N2M3Li4zOTc4MjhjZDEzMWU4Yjg2YTRmNTI5YWNj MzFiNGFiMTIyYmM1MDg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tm b3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaApAQCAtNTIsNiAr NTIsNyBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgdm9pZCBjb21wdXRlU3RhdGljUG9zaXRp b24oTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYsIERpc3BsYXk6OkJveCYpIGNvbnN0IG92ZXJy aWRlOworICAgIHZvaWQgY29tcHV0ZUluRmxvd1Bvc2l0aW9uZWRQb3NpdGlvbihMYXlvdXRDb250 ZXh0JiwgY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29uc3Qgb3ZlcnJpZGU7CiAgICAgdm9p ZCBjb21wdXRlSW5GbG93V2lkdGgoTGF5b3V0Q29udGV4dCYsIGNvbnN0IEJveCYsIERpc3BsYXk6 OkJveCYpIGNvbnN0IG92ZXJyaWRlOwogICAgIHZvaWQgY29tcHV0ZUluRmxvd0hlaWdodChMYXlv dXRDb250ZXh0JiwgY29uc3QgQm94JiwgRGlzcGxheTo6Qm94JikgY29uc3Qgb3ZlcnJpZGU7CiAK QEAgLTY1LDYgKzY2LDcgQEAgcHJpdmF0ZToKICAgICAgICAgc3RhdGljIExheW91dFVuaXQgaW5G bG93Tm9uUmVwbGFjZWRXaWR0aChMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94Jik7CiAKICAgICAg ICAgc3RhdGljIExheW91dFBvaW50IHN0YXRpY1Bvc2l0aW9uKExheW91dENvbnRleHQmLCBjb25z dCBCb3gmKTsKKyAgICAgICAgc3RhdGljIExheW91dFBvaW50IGluRmxvd1Bvc2l0aW9uZWRQb3Np dGlvbihMYXlvdXRDb250ZXh0JiwgY29uc3QgQm94Jik7CiAgICAgfTsKIH07CiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5n Q29udGV4dEdlb21ldHJ5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRp bmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAppbmRleCA2ZjRjZmQxZDk0ZmM1 NzUwNGZiM2JiZTk0YTk3N2MyNGFlOTYzNGIyLi5jNjcxYzY2YjQyMDM0ZDA1YzA1YTY0ODMxMjk5 NzcxN2EyMGEyMzg0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3Jt YXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0R2VvbWV0 cnkuY3BwCkBAIC0xMzcsNiArMTM3LDY4IEBAIExheW91dFBvaW50IEJsb2NrRm9ybWF0dGluZ0Nv bnRleHQ6Okdlb21ldHJ5OjpzdGF0aWNQb3NpdGlvbihMYXlvdXRDb250ZXh0JiBsYXlvCiAgICAg cmV0dXJuIHRvcExlZnQ7CiB9CiAKK0xheW91dFBvaW50IEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6 Okdlb21ldHJ5OjppbkZsb3dQb3NpdGlvbmVkUG9zaXRpb24oTGF5b3V0Q29udGV4dCYgbGF5b3V0 Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gpCit7CisgICAgQVNTRVJUKGxheW91dEJveC5p c0luRmxvd1Bvc2l0aW9uZWQoKSk7CisgICAgLy8gOS40LjMgUmVsYXRpdmUgcG9zaXRpb25pbmcK KyAgICAvLworICAgIC8vIFRoZSAndG9wJyBhbmQgJ2JvdHRvbScgcHJvcGVydGllcyBtb3ZlIHJl bGF0aXZlbHkgcG9zaXRpb25lZCBlbGVtZW50KHMpIHVwIG9yIGRvd24gd2l0aG91dCBjaGFuZ2lu ZyB0aGVpciBzaXplLgorICAgIC8vIFRvcCcgbW92ZXMgdGhlIGJveGVzIGRvd24sIGFuZCAnYm90 dG9tJyBtb3ZlcyB0aGVtIHVwLiBTaW5jZSBib3hlcyBhcmUgbm90IHNwbGl0IG9yIHN0cmV0Y2hl ZCBhcyBhIHJlc3VsdCBvZiAndG9wJyBvciAnYm90dG9tJywgdGhlIHVzZWQgdmFsdWVzIGFyZSBh bHdheXM6IHRvcCA9IC1ib3R0b20uCisgICAgLy8KKyAgICAvLyAxLiBJZiBib3RoIGFyZSAnYXV0 bycsIHRoZWlyIHVzZWQgdmFsdWVzIGFyZSBib3RoICcwJy4KKyAgICAvLyAyLiBJZiBvbmUgb2Yg dGhlbSBpcyAnYXV0bycsIGl0IGJlY29tZXMgdGhlIG5lZ2F0aXZlIG9mIHRoZSBvdGhlci4KKyAg ICAvLyAzLiBJZiBuZWl0aGVyIGlzICdhdXRvJywgJ2JvdHRvbScgaXMgaWdub3JlZCAoaS5lLiwg dGhlIHVzZWQgdmFsdWUgb2YgJ2JvdHRvbScgd2lsbCBiZSBtaW51cyB0aGUgdmFsdWUgb2YgJ3Rv cCcpLgorICAgIGF1dG8mIGRpc3BsYXlCb3ggPSAqbGF5b3V0Q29udGV4dC5kaXNwbGF5Qm94Rm9y TGF5b3V0Qm94KGxheW91dEJveCk7CisgICAgYXV0byYgc3R5bGUgPSBsYXlvdXRCb3guc3R5bGUo KTsKKworICAgIGF1dG8gdG9wID0gc3R5bGUubG9naWNhbFRvcCgpOworICAgIGF1dG8gYm90dG9t ID0gc3R5bGUubG9naWNhbEJvdHRvbSgpOworICAgIExheW91dFVuaXQgdG9wRGVsdGE7CisKKyAg ICBpZiAodG9wLmlzQXV0bygpICYmIGJvdHRvbS5pc0F1dG8oKSkgeworICAgICAgICAvLyAjMQor ICAgICAgICB0b3BEZWx0YSA9IDA7CisgICAgfSBlbHNlIGlmICh0b3AuaXNBdXRvKCkpIHsKKyAg ICAgICAgLy8gIzIKKyAgICAgICAgdG9wRGVsdGEgPSAtYm90dG9tLnZhbHVlKCk7CisgICAgfSBl bHNlIGlmIChib3R0b20uaXNBdXRvKCkpIHsKKyAgICAgICAgLy8gIzMgIzQKKyAgICAgICAgdG9w RGVsdGEgPSB0b3AudmFsdWUoKTsKKyAgICB9CisKKyAgICAvLyBGb3IgcmVsYXRpdmVseSBwb3Np dGlvbmVkIGVsZW1lbnRzLCAnbGVmdCcgYW5kICdyaWdodCcgbW92ZSB0aGUgYm94KGVzKSBob3Jp em9udGFsbHksIHdpdGhvdXQgY2hhbmdpbmcgdGhlaXIgc2l6ZS4KKyAgICAvLyAnTGVmdCcgbW92 ZXMgdGhlIGJveGVzIHRvIHRoZSByaWdodCwgYW5kICdyaWdodCcgbW92ZXMgdGhlbSB0byB0aGUg bGVmdC4KKyAgICAvLyBTaW5jZSBib3hlcyBhcmUgbm90IHNwbGl0IG9yIHN0cmV0Y2hlZCBhcyBh IHJlc3VsdCBvZiAnbGVmdCcgb3IgJ3JpZ2h0JywgdGhlIHVzZWQgdmFsdWVzIGFyZSBhbHdheXM6 IGxlZnQgPSAtcmlnaHQuCisgICAgLy8KKyAgICAvLyAxLiBJZiBib3RoICdsZWZ0JyBhbmQgJ3Jp Z2h0JyBhcmUgJ2F1dG8nICh0aGVpciBpbml0aWFsIHZhbHVlcyksIHRoZSB1c2VkIHZhbHVlcyBh cmUgJzAnIChpLmUuLCB0aGUgYm94ZXMgc3RheSBpbiB0aGVpciBvcmlnaW5hbCBwb3NpdGlvbiku CisgICAgLy8gMi4gSWYgJ2xlZnQnIGlzICdhdXRvJywgaXRzIHVzZWQgdmFsdWUgaXMgbWludXMg dGhlIHZhbHVlIG9mICdyaWdodCcgKGkuZS4sIHRoZSBib3hlcyBtb3ZlIHRvIHRoZSBsZWZ0IGJ5 IHRoZSB2YWx1ZSBvZiAncmlnaHQnKS4KKyAgICAvLyAzLiBJZiAncmlnaHQnIGlzIHNwZWNpZmll ZCBhcyAnYXV0bycsIGl0cyB1c2VkIHZhbHVlIGlzIG1pbnVzIHRoZSB2YWx1ZSBvZiAnbGVmdCcu CisgICAgLy8gNC4gSWYgbmVpdGhlciAnbGVmdCcgbm9yICdyaWdodCcgaXMgJ2F1dG8nLCB0aGUg cG9zaXRpb24gaXMgb3Zlci1jb25zdHJhaW5lZCwgYW5kIG9uZSBvZiB0aGVtIGhhcyB0byBiZSBp Z25vcmVkLgorICAgIC8vICAgIElmIHRoZSAnZGlyZWN0aW9uJyBwcm9wZXJ0eSBvZiB0aGUgY29u dGFpbmluZyBibG9jayBpcyAnbHRyJywgdGhlIHZhbHVlIG9mICdsZWZ0JyB3aW5zIGFuZCAncmln aHQnIGJlY29tZXMgLSdsZWZ0Jy4KKyAgICAvLyAgICBJZiAnZGlyZWN0aW9uJyBvZiB0aGUgY29u dGFpbmluZyBibG9jayBpcyAncnRsJywgJ3JpZ2h0JyB3aW5zIGFuZCAnbGVmdCcgaXMgaWdub3Jl ZC4KKyAgICAvLworICAgIGF1dG8gbGVmdCA9IHN0eWxlLmxvZ2ljYWxMZWZ0KCk7CisgICAgYXV0 byByaWdodCA9IHN0eWxlLmxvZ2ljYWxSaWdodCgpOworICAgIExheW91dFVuaXQgbGVmdERlbHRh OworCisgICAgaWYgKGxlZnQuaXNBdXRvKCkgJiYgcmlnaHQuaXNBdXRvKCkpIHsKKyAgICAgICAg Ly8gIzEKKyAgICAgICAgbGVmdERlbHRhID0gMDsKKyAgICB9IGVsc2UgaWYgKGxlZnQuaXNBdXRv KCkpIHsKKyAgICAgICAgLy8gIzIKKyAgICAgICAgbGVmdERlbHRhID0gLXJpZ2h0LnZhbHVlKCk7 CisgICAgfSBlbHNlIGlmIChyaWdodC5pc0F1dG8oKSkgeworICAgICAgICAvLyAjMworICAgICAg ICBsZWZ0RGVsdGEgPSBsZWZ0LnZhbHVlKCk7CisgICAgfSBlbHNlIHsKKyAgICAgICAgLy8gIzQK KyAgICAgICAgLy8gRklYTUU6IHRha2UgZGlyZWN0aW9uIGludG8gYWNjb3VudAorICAgICAgICBs ZWZ0RGVsdGEgPSBsZWZ0LnZhbHVlKCk7CisgICAgfQorCisgICAgcmV0dXJuIHsgZGlzcGxheUJv eC5sZWZ0KCkgKyBsZWZ0RGVsdGEsIGRpc3BsYXlCb3gudG9wKCkgKyB0b3BEZWx0YSB9OworfQor CiB9CiB9CiAK