187202 2018-06-29 16:21:47 -0700 [LFC] Do not add the containing block's offset while computing the out-of-flow static position. 2018-06-30 11:08:21 -0700 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1437967 0 zalan 2018-06-29 16:21:47 -0700 we only need to offset for the containing block's content box offset. 1438096 1 343993 zalan 2018-06-29 20:41:06 -0700 Created attachment 343993 Patch 1438173 2 344015 zalan 2018-06-30 08:54:04 -0700 Created attachment 344015 Patch 1438180 3 zalan 2018-06-30 11:07:52 -0700 Committed r233399: <https://trac.webkit.org/changeset/233399> 1438181 4 webkit-bug-importer 2018-06-30 11:08:21 -0700 <rdar://problem/41679768> 343993 2018-06-29 20:41:06 -0700 2018-06-29 22:19:15 -0700 Patch bug-187202-20180629204105.patch text/plain 8915 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMzU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGQ4ZjQxMzkwNDdlMWI2 OGFjMjNlZDYyNGE3YzVlYWI3YmZiZDE0MC4uNjk5NzRmY2QyZGYxZmVmNzUxYzljMWNhNzNkY2Fj YmQxN2Q5NDZhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE4LTA2LTI5ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gRG8gbm90IGFkZCB0 aGUgY29udGFpbmluZyBibG9jaydzIG9mZnNldCB3aGlsZSBjb21wdXRpbmcgdGhlIG91dC1vZi1m bG93IHN0YXRpYyBwb3NpdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE4NzIwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoZSBzdGF0aWMgcG9zaXRpb24gZm9yIGFuIG91dC1vZi1mbG93IGVsZW1l bnRzIGlzIAorICAgICAgICAxLiB0aGUgZGlzdGFuY2UgZnJvbSB0aGUgcGFyZW50J3MgYm9yZGVy IGJveC4KKyAgICAgICAgMi4gY2xpbWJpbmcgdXAgb24gdGhlIGNvbnRhaW5pbmcgYmxvY2sgY2hh aW4gYW5kIG9mZnNldCB0aGUgY29udGFpbmVycy4KKworICAgICAgICAqIGxheW91dC9Gb3JtYXR0 aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6c3RhdGlj VmVydGljYWxQb3NpdGlvbkZvck91dE9mRmxvd1Bvc2l0aW9uZWQpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpzdGF0aWNIb3Jpem9udGFsUG9zaXRpb25Gb3JPdXRPZkZsb3dQb3NpdGlvbmVk KToKKwogMjAxOC0wNi0yOSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFtMRkNdIFdoZW4gdGhlIGZvcm1hdHRpbmcgcm9vdCBpcyBhbHNvIGEgY29udGFpbmluZyBi bG9jayBmb3Igb3V0LW9mLWZsb3cgZWxlbWVudHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKaW5kZXggNWRmMjY2NDM3YWRiYTg2 MTQzMzdlNGZhNzk1ZWUyOWM3NDY3NDFiMy4uYWNmZTQ2ZDkyNWQ3ZmI1MjA2OTdjZDA4N2JiOWUy ZTNhMDVlMzY5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdD b250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5n Q29udGV4dEdlb21ldHJ5LmNwcApAQCAtNzUsNDAgKzc1LDU1IEBAIHN0ZDo6b3B0aW9uYWw8TGF5 b3V0VW5pdD4gRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5Ojpjb21wdXRlZFZhbHVlSWZOb3RB dXRvKGNvCiAgICAgcmV0dXJuIHZhbHVlRm9yTGVuZ3RoKGdlb21ldHJ5UHJvcGVydHksIGNvbnRh aW5pbmdCbG9ja1dpZHRoKTsKIH0KIAotc3RhdGljIExheW91dFVuaXQgc3RhdGljVmVydGljYWxQ b3NpdGlvbkZvck91dE9mRmxvd1Bvc2l0aW9uZWQoY29uc3QgTGF5b3V0Q29udGV4dCYgbGF5b3V0 Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gpCitzdGF0aWMgTGF5b3V0VW5pdCBzdGF0aWNW ZXJ0aWNhbFBvc2l0aW9uRm9yT3V0T2ZGbG93UG9zaXRpb25lZChjb25zdCBMYXlvdXRDb250ZXh0 JiBsYXlvdXRDb250ZXh0LCBjb25zdCBCb3gmIGxheW91dEJveCwgTGF5b3V0VW5pdCB2ZXJ0aWNh bE1hcmdpbikKIHsKICAgICBBU1NFUlQobGF5b3V0Qm94LmlzT3V0T2ZGbG93UG9zaXRpb25lZCgp KTsKIAorICAgIC8vIEZvciB0aGUgcHVycG9zZXMgb2YgdGhpcyBzZWN0aW9uIGFuZCB0aGUgbmV4 dCwgdGhlIHRlcm0gInN0YXRpYyBwb3NpdGlvbiIgKG9mIGFuIGVsZW1lbnQpIHJlZmVycywgcm91 Z2hseSwgdG8gdGhlIHBvc2l0aW9uIGFuIGVsZW1lbnQgd291bGQgaGF2ZQorICAgIC8vIGhhZCBp biB0aGUgbm9ybWFsIGZsb3cuIE1vcmUgcHJlY2lzZWx5LCB0aGUgc3RhdGljIHBvc2l0aW9uIGZv ciAndG9wJyBpcyB0aGUgZGlzdGFuY2UgZnJvbSB0aGUgdG9wIGVkZ2Ugb2YgdGhlIGNvbnRhaW5p bmcgYmxvY2sgdG8gdGhlIHRvcCBtYXJnaW4KKyAgICAvLyBlZGdlIG9mIGEgaHlwb3RoZXRpY2Fs IGJveCB0aGF0IHdvdWxkIGhhdmUgYmVlbiB0aGUgZmlyc3QgYm94IG9mIHRoZSBlbGVtZW50IGlm IGl0cyBzcGVjaWZpZWQgJ3Bvc2l0aW9uJyB2YWx1ZSBoYWQgYmVlbiAnc3RhdGljJyBhbmQgaXRz IHNwZWNpZmllZAorICAgIC8vICdmbG9hdCcgaGFkIGJlZW4gJ25vbmUnIGFuZCBpdHMgc3BlY2lm aWVkICdjbGVhcicgaGFkIGJlZW4gJ25vbmUnLiAoTm90ZSB0aGF0IGR1ZSB0byB0aGUgcnVsZXMg aW4gc2VjdGlvbiA5LjcgdGhpcyBtaWdodCByZXF1aXJlIGFsc28gYXNzdW1pbmcgYSBkaWZmZXJl bnQKKyAgICAvLyBjb21wdXRlZCB2YWx1ZSBmb3IgJ2Rpc3BsYXknLikgVGhlIHZhbHVlIGlzIG5l Z2F0aXZlIGlmIHRoZSBoeXBvdGhldGljYWwgYm94IGlzIGFib3ZlIHRoZSBjb250YWluaW5nIGJs b2NrLgorCisgICAgLy8gU3RhcnQgd2l0aCB0aGlzIGJveCdzIGJvcmRlciBib3ggb2Zmc2V0IGZy b20gdGhlIHBhcmVudCdzIGJvcmRlciBib3guCiAgICAgTGF5b3V0VW5pdCB0b3A7CiAgICAgLy8g QWRkIHNpYmxpbmcgb2Zmc2V0CiAgICAgaWYgKGF1dG8qIHByZXZpb3VzSW5GbG93U2libGluZyA9 IGxheW91dEJveC5wcmV2aW91c0luRmxvd1NpYmxpbmcoKSkgewogICAgICAgICBhdXRvJiBwcmV2 aW91c0luRmxvd0Rpc3BsYXlCb3ggPSAqbGF5b3V0Q29udGV4dC5kaXNwbGF5Qm94Rm9yTGF5b3V0 Qm94KCpwcmV2aW91c0luRmxvd1NpYmxpbmcpOwogICAgICAgICB0b3AgKz0gcHJldmlvdXNJbkZs b3dEaXNwbGF5Qm94LmJvdHRvbSgpICsgcHJldmlvdXNJbkZsb3dEaXNwbGF5Qm94Lm5vbkNvbGxh cHNlZE1hcmdpbkJvdHRvbSgpOworICAgIH0gZWxzZSB7CisgICAgICAgIEFTU0VSVChsYXlvdXRC b3gucGFyZW50KCkpOworICAgICAgICB0b3AgPSBsYXlvdXRDb250ZXh0LmRpc3BsYXlCb3hGb3JM YXlvdXRCb3goKmxheW91dEJveC5wYXJlbnQoKSktPmNvbnRlbnRCb3hUb3AoKTsKICAgICB9Cisg ICAgdG9wICs9IHZlcnRpY2FsTWFyZ2luOworCiAgICAgLy8gUmVzb2x2ZSB0b3AgYWxsIHRoZSB3 YXkgdXAgdG8gdGhlIGNvbnRhaW5pbmcgYmxvY2suCiAgICAgYXV0byogY29udGFpbmluZ0Jsb2Nr ID0gbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpOwotICAgIGZvciAoYXV0byogcGFyZW50ID0g bGF5b3V0Qm94LnBhcmVudCgpOyBwYXJlbnQ7IHBhcmVudCA9IHBhcmVudC0+cGFyZW50KCkpIHsK LSAgICAgICAgYXV0byYgZGlzcGxheUJveCA9ICpsYXlvdXRDb250ZXh0LmRpc3BsYXlCb3hGb3JM YXlvdXRCb3goKnBhcmVudCk7Ci0gICAgICAgIHRvcCArPSAoZGlzcGxheUJveC50b3AoKSArIGRp c3BsYXlCb3guY29udGVudEJveFRvcCgpKTsKLSAgICAgICAgaWYgKHBhcmVudCA9PSBjb250YWlu aW5nQmxvY2spCi0gICAgICAgICAgICBicmVhazsKKyAgICBmb3IgKGF1dG8qIGNvbnRhaW5lciA9 IGxheW91dEJveC5wYXJlbnQoKTsgY29udGFpbmVyICE9IGNvbnRhaW5pbmdCbG9jazsgY29udGFp bmVyID0gY29udGFpbmVyLT5jb250YWluaW5nQmxvY2soKSkgeworICAgICAgICBhdXRvJiBkaXNw bGF5Qm94ID0gKmxheW91dENvbnRleHQuZGlzcGxheUJveEZvckxheW91dEJveCgqY29udGFpbmVy KTsKKyAgICAgICAgLy8gRGlzcGxheTo6Qm94Ojp0b3AgaXMgdGhlIGJvcmRlciBib3ggdG9wIHBv c2l0aW9uIGluIGl0cyBjb250YWluaW5nIGJsb2NrJ3MgY29vcmRpbmF0ZSBzeXN0ZW0uCisgICAg ICAgIHRvcCArPSBkaXNwbGF5Qm94LnRvcCgpOworICAgICAgICBBU1NFUlQoIWNvbnRhaW5lci0+ aXNQb3NpdGlvbmVkKCkpOwogICAgIH0KICAgICAvLyBGSVhNRTogZmxvYXRpbmdzIG5lZWQgdG8g YmUgdGFrZW4gaW50byBhY2NvdW50LgogICAgIHJldHVybiB0b3A7CiB9CiAKLXN0YXRpYyBMYXlv dXRVbml0IHN0YXRpY0hvcml6b250YWxQb3NpdGlvbkZvck91dE9mRmxvd1Bvc2l0aW9uZWQoY29u c3QgTGF5b3V0Q29udGV4dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gpCitz dGF0aWMgTGF5b3V0VW5pdCBzdGF0aWNIb3Jpem9udGFsUG9zaXRpb25Gb3JPdXRPZkZsb3dQb3Np dGlvbmVkKGNvbnN0IExheW91dENvbnRleHQmIGxheW91dENvbnRleHQsIGNvbnN0IEJveCYgbGF5 b3V0Qm94LCBMYXlvdXRVbml0IGhvcml6b250YWxNYXJnaW4pCiB7CiAgICAgQVNTRVJUKGxheW91 dEJveC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSk7CisgICAgLy8gU2VlIHN0YXRpY1ZlcnRpY2Fs UG9zaXRpb25Gb3JPdXRPZkZsb3dQb3NpdGlvbmVkIGZvciB0aGUgZGVmaW5pdGlvbiBvZiB0aGUg c3RhdGljIHBvc2l0aW9uLgogCi0gICAgTGF5b3V0VW5pdCBsZWZ0OworICAgIC8vIFN0YXJ0IHdp dGggdGhpcyBib3gncyBib3JkZXIgYm94IG9mZnNldCBmcm9tIHRoZSBwYXJlbnQncyBib3JkZXIg Ym94LgorICAgIEFTU0VSVChsYXlvdXRCb3gucGFyZW50KCkpOworICAgIGF1dG8gbGVmdCA9IGxh eW91dENvbnRleHQuZGlzcGxheUJveEZvckxheW91dEJveCgqbGF5b3V0Qm94LnBhcmVudCgpKS0+ Y29udGVudEJveExlZnQoKSArIGhvcml6b250YWxNYXJnaW47CiAgICAgLy8gUmVzb2x2ZSBsZWZ0 IGFsbCB0aGUgd2F5IHVwIHRvIHRoZSBjb250YWluaW5nIGJsb2NrLgogICAgIGF1dG8qIGNvbnRh aW5pbmdCbG9jayA9IGxheW91dEJveC5jb250YWluaW5nQmxvY2soKTsKLSAgICBmb3IgKGF1dG8q IHBhcmVudCA9IGxheW91dEJveC5wYXJlbnQoKTsgcGFyZW50OyBwYXJlbnQgPSBwYXJlbnQtPnBh cmVudCgpKSB7Ci0gICAgICAgIGF1dG8mIGRpc3BsYXlCb3ggPSAqbGF5b3V0Q29udGV4dC5kaXNw bGF5Qm94Rm9yTGF5b3V0Qm94KCpwYXJlbnQpOwotICAgICAgICBsZWZ0ICs9IChkaXNwbGF5Qm94 LmxlZnQoKSArIGRpc3BsYXlCb3guY29udGVudEJveExlZnQoKSk7Ci0gICAgICAgIGlmIChwYXJl bnQgPT0gY29udGFpbmluZ0Jsb2NrKQotICAgICAgICAgICAgYnJlYWs7CisgICAgZm9yIChhdXRv KiBjb250YWluZXIgPSBsYXlvdXRCb3gucGFyZW50KCk7IGNvbnRhaW5lciAhPSBjb250YWluaW5n QmxvY2s7IGNvbnRhaW5lciA9IGNvbnRhaW5lci0+Y29udGFpbmluZ0Jsb2NrKCkpIHsKKyAgICAg ICAgYXV0byYgZGlzcGxheUJveCA9ICpsYXlvdXRDb250ZXh0LmRpc3BsYXlCb3hGb3JMYXlvdXRC b3goKmNvbnRhaW5lcik7CisgICAgICAgIC8vIERpc3BsYXk6OkJveDo6bGVmdCBpcyB0aGUgYm9y ZGVyIGJveCBsZWZ0IHBvc2l0aW9uIGluIGl0cyBjb250YWluaW5nIGJsb2NrJ3MgY29vcmRpbmF0 ZSBzeXN0ZW0uCisgICAgICAgIGxlZnQgKz0gZGlzcGxheUJveC5sZWZ0KCk7CisgICAgICAgIEFT U0VSVCghY29udGFpbmVyLT5pc1Bvc2l0aW9uZWQoKSk7CiAgICAgfQogICAgIC8vIEZJWE1FOiBm bG9hdGluZ3MgbmVlZCB0byBiZSB0YWtlbiBpbnRvIGFjY291bnQuCiAgICAgcmV0dXJuIGxlZnQ7 CkBAIC0xNTksNyArMTc0LDcgQEAgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpWZXJ0aWNh bEdlb21ldHJ5IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0T2YKICAgICBhdXRvIGJv cmRlckJvdHRvbSA9IGRpc3BsYXlCb3guYm9yZGVyQm90dG9tKCk7CiAKICAgICBpZiAoIXRvcCAm JiAhaGVpZ2h0ICYmICFib3R0b20pCi0gICAgICAgIHRvcCA9IHN0YXRpY1ZlcnRpY2FsUG9zaXRp b25Gb3JPdXRPZkZsb3dQb3NpdGlvbmVkKGxheW91dENvbnRleHQsIGxheW91dEJveCk7CisgICAg ICAgIHRvcCA9IHN0YXRpY1ZlcnRpY2FsUG9zaXRpb25Gb3JPdXRPZkZsb3dQb3NpdGlvbmVkKGxh eW91dENvbnRleHQsIGxheW91dEJveCwgbWFyZ2luVG9wLnZhbHVlX29yKDApKTsKIAogICAgIGlm ICh0b3AgJiYgaGVpZ2h0ICYmIGJvdHRvbSkgewogICAgICAgICBpZiAoIW1hcmdpblRvcCAmJiAh bWFyZ2luQm90dG9tKSB7CkBAIC0xODUsNyArMjAwLDcgQEAgRm9ybWF0dGluZ0NvbnRleHQ6Okdl b21ldHJ5OjpWZXJ0aWNhbEdlb21ldHJ5IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6b3V0 T2YKIAogICAgIGlmICghdG9wICYmICFib3R0b20gJiYgaGVpZ2h0KSB7CiAgICAgICAgIC8vICMy Ci0gICAgICAgIHRvcCA9IHN0YXRpY1ZlcnRpY2FsUG9zaXRpb25Gb3JPdXRPZkZsb3dQb3NpdGlv bmVkKGxheW91dENvbnRleHQsIGxheW91dEJveCk7CisgICAgICAgIHRvcCA9IHN0YXRpY1ZlcnRp Y2FsUG9zaXRpb25Gb3JPdXRPZkZsb3dQb3NpdGlvbmVkKGxheW91dENvbnRleHQsIGxheW91dEJv eCwgbWFyZ2luVG9wLnZhbHVlX29yKDApKTsKICAgICAgICAgbWFyZ2luVG9wID0gbWFyZ2luVG9w LnZhbHVlX29yKDApOwogICAgICAgICBtYXJnaW5Cb3R0b20gPSBtYXJnaW5Cb3R0b20udmFsdWVf b3IoMCk7CiAgICAgICAgIGJvdHRvbSA9IGNvbnRhaW5pbmdCbG9ja0hlaWdodCAtICgqdG9wICsg Km1hcmdpblRvcCArIGJvcmRlclRvcCArIHBhZGRpbmdUb3AgKyAqaGVpZ2h0ICsgcGFkZGluZ0Jv dHRvbSArIGJvcmRlckJvdHRvbSArICptYXJnaW5Cb3R0b20pOyAKQEAgLTI4Myw3ICsyOTgsNyBA QCBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Okhvcml6b250YWxHZW9tZXRyeSBGb3JtYXR0 aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dAogICAgICAgICBtYXJnaW5MZWZ0ID0gbWFyZ2luTGVm dC52YWx1ZV9vcigwKTsKICAgICAgICAgbWFyZ2luUmlnaHQgPSBtYXJnaW5SaWdodC52YWx1ZV9v cigwKTsKIAotICAgICAgICBhdXRvIHN0YXRpY0hvcml6b250YWxQb3NpdGlvbiA9IHN0YXRpY0hv cml6b250YWxQb3NpdGlvbkZvck91dE9mRmxvd1Bvc2l0aW9uZWQobGF5b3V0Q29udGV4dCwgbGF5 b3V0Qm94KTsKKyAgICAgICAgYXV0byBzdGF0aWNIb3Jpem9udGFsUG9zaXRpb24gPSBzdGF0aWNI b3Jpem9udGFsUG9zaXRpb25Gb3JPdXRPZkZsb3dQb3NpdGlvbmVkKGxheW91dENvbnRleHQsIGxh eW91dEJveCwgbWFyZ2luTGVmdC52YWx1ZV9vcigwKSk7CiAgICAgICAgIGlmIChpc0xlZnRUb1Jp Z2h0RGlyZWN0aW9uKQogICAgICAgICAgICAgbGVmdCA9IHN0YXRpY0hvcml6b250YWxQb3NpdGlv bjsKICAgICAgICAgZWxzZQpAQCAtMzQxLDcgKzM1Niw3IEBAIEZvcm1hdHRpbmdDb250ZXh0OjpH ZW9tZXRyeTo6SG9yaXpvbnRhbEdlb21ldHJ5IEZvcm1hdHRpbmdDb250ZXh0OjpHZW9tZXRyeTo6 b3V0CiAgICAgICAgIGxlZnQgPSBjb250YWluaW5nQmxvY2tXaWR0aCAtICgqbWFyZ2luTGVmdCAr IGJvcmRlckxlZnQgKyBwYWRkaW5nTGVmdCArICp3aWR0aCArIHBhZGRpbmdSaWdodCAgKyBib3Jk ZXJSaWdodCArICptYXJnaW5SaWdodCArICpyaWdodCk7CiAgICAgfSBlbHNlIGlmICghbGVmdCAm JiAhcmlnaHQgJiYgd2lkdGgpIHsKICAgICAgICAgLy8gIzIKLSAgICAgICAgYXV0byBzdGF0aWNI b3Jpem9udGFsUG9zaXRpb24gPSBzdGF0aWNIb3Jpem9udGFsUG9zaXRpb25Gb3JPdXRPZkZsb3dQ b3NpdGlvbmVkKGxheW91dENvbnRleHQsIGxheW91dEJveCk7CisgICAgICAgIGF1dG8gc3RhdGlj SG9yaXpvbnRhbFBvc2l0aW9uID0gc3RhdGljSG9yaXpvbnRhbFBvc2l0aW9uRm9yT3V0T2ZGbG93 UG9zaXRpb25lZChsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gsIG1hcmdpbkxlZnQudmFsdWVfb3Io MCkpOwogICAgICAgICBpZiAoaXNMZWZ0VG9SaWdodERpcmVjdGlvbikgewogICAgICAgICAgICAg bGVmdCA9IHN0YXRpY0hvcml6b250YWxQb3NpdGlvbjsKICAgICAgICAgICAgIHJpZ2h0ID0gY29u dGFpbmluZ0Jsb2NrV2lkdGggLSAoKmxlZnQgKyAqbWFyZ2luTGVmdCArIGJvcmRlckxlZnQgKyBw YWRkaW5nTGVmdCArICp3aWR0aCArIHBhZGRpbmdSaWdodCArIGJvcmRlclJpZ2h0ICsgKm1hcmdp blJpZ2h0KTsKQEAgLTQwNiw3ICs0MjEsNyBAQCBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6 OlZlcnRpY2FsR2VvbWV0cnkgRm9ybWF0dGluZ0NvbnRleHQ6Okdlb21ldHJ5OjpvdXRPZgogCiAg ICAgaWYgKCF0b3AgJiYgIWJvdHRvbSkgewogICAgICAgICAvLyAjMQotICAgICAgICB0b3AgPSBz dGF0aWNWZXJ0aWNhbFBvc2l0aW9uRm9yT3V0T2ZGbG93UG9zaXRpb25lZChsYXlvdXRDb250ZXh0 LCBsYXlvdXRCb3gpOworICAgICAgICB0b3AgPSBzdGF0aWNWZXJ0aWNhbFBvc2l0aW9uRm9yT3V0 T2ZGbG93UG9zaXRpb25lZChsYXlvdXRDb250ZXh0LCBsYXlvdXRCb3gsIG1hcmdpblRvcC52YWx1 ZV9vcigwKSk7CiAgICAgfQogCiAgICAgaWYgKCFib3R0b20pIHsKQEAgLTQ3OSw3ICs0OTQsNyBA QCBGb3JtYXR0aW5nQ29udGV4dDo6R2VvbWV0cnk6Okhvcml6b250YWxHZW9tZXRyeSBGb3JtYXR0 aW5nQ29udGV4dDo6R2VvbWV0cnk6Om91dAogCiAgICAgaWYgKCFsZWZ0ICYmICFyaWdodCkgewog ICAgICAgICAvLyAjMQotICAgICAgICBhdXRvIHN0YXRpY0hvcml6b250YWxQb3NpdGlvbiA9IHN0 YXRpY0hvcml6b250YWxQb3NpdGlvbkZvck91dE9mRmxvd1Bvc2l0aW9uZWQobGF5b3V0Q29udGV4 dCwgbGF5b3V0Qm94KTsKKyAgICAgICAgYXV0byBzdGF0aWNIb3Jpem9udGFsUG9zaXRpb24gPSBz dGF0aWNIb3Jpem9udGFsUG9zaXRpb25Gb3JPdXRPZkZsb3dQb3NpdGlvbmVkKGxheW91dENvbnRl eHQsIGxheW91dEJveCwgbWFyZ2luTGVmdC52YWx1ZV9vcigwKSk7CiAgICAgICAgIGlmIChpc0xl ZnRUb1JpZ2h0RGlyZWN0aW9uKQogICAgICAgICAgICAgbGVmdCA9IHN0YXRpY0hvcml6b250YWxQ b3NpdGlvbjsKICAgICAgICAgZWxzZQo= 344015 2018-06-30 08:54:04 -0700 2018-06-30 10:23:16 -0700 Patch bug-187202-20180630085403.patch text/plain 5288 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMzU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNGQ4ZjQxMzkwNDdlMWI2 OGFjMjNlZDYyNGE3YzVlYWI3YmZiZDE0MC4uZmE4YzViZTQ1MmViMzJjNGM1NTY4YzQzNDI1Yjgx M2MwZGJiMmYwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE4LTA2LTMwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ10gRG8gbm90IGFkZCB0 aGUgY29udGFpbmluZyBibG9jaydzIG9mZnNldCB3aGlsZSBjb21wdXRpbmcgdGhlIG91dC1vZi1m bG93IHN0YXRpYyBwb3NpdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTE4NzIwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoZSBzdGF0aWMgcG9zaXRpb24gZm9yIGFuIG91dC1vZi1mbG93IGVsZW1l bnRzIGlzCisgICAgICAgIDEuIHRoZSBkaXN0YW5jZSBmcm9tIHRoZSBwYXJlbnQncyBib3JkZXIg Ym94LgorICAgICAgICAyLiBjbGltYmluZyB1cCBvbiB0aGUgY29udGFpbmluZyBibG9jayBjaGFp biBhbmQgb2Zmc2V0IHRoZSBjb250YWluZXJzIHVudGlsIHdlIHJlYWNoIHRoZSBvdXQtb2YtZmxv dyBlbGVtZW50J3MgY29udGFpbmluZyBibG9jay4KKworICAgICAgICAqIGxheW91dC9Gb3JtYXR0 aW5nQ29udGV4dEdlb21ldHJ5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6c3RhdGlj VmVydGljYWxQb3NpdGlvbkZvck91dE9mRmxvd1Bvc2l0aW9uZWQpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0OjpzdGF0aWNIb3Jpem9udGFsUG9zaXRpb25Gb3JPdXRPZkZsb3dQb3NpdGlvbmVk KToKKwogMjAxOC0wNi0yOSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFtMRkNdIFdoZW4gdGhlIGZvcm1hdHRpbmcgcm9vdCBpcyBhbHNvIGEgY29udGFpbmluZyBi bG9jayBmb3Igb3V0LW9mLWZsb3cgZWxlbWVudHMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9sYXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9s YXlvdXQvRm9ybWF0dGluZ0NvbnRleHRHZW9tZXRyeS5jcHAKaW5kZXggNWRmMjY2NDM3YWRiYTg2 MTQzMzdlNGZhNzk1ZWUyOWM3NDY3NDFiMy4uOGFkY2RhM2UwMzJmOTVhMjE0NmRkYjg2YzNlMjNl NjE1M2Q3MzBiMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L0Zvcm1hdHRpbmdD b250ZXh0R2VvbWV0cnkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9Gb3JtYXR0aW5n Q29udGV4dEdlb21ldHJ5LmNwcApAQCAtNzksMTkgKzc5LDMwIEBAIHN0YXRpYyBMYXlvdXRVbml0 IHN0YXRpY1ZlcnRpY2FsUG9zaXRpb25Gb3JPdXRPZkZsb3dQb3NpdGlvbmVkKGNvbnN0IExheW91 dENvbnRlCiB7CiAgICAgQVNTRVJUKGxheW91dEJveC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSk7 CiAKKyAgICAvLyBGb3IgdGhlIHB1cnBvc2VzIG9mIHRoaXMgc2VjdGlvbiBhbmQgdGhlIG5leHQs IHRoZSB0ZXJtICJzdGF0aWMgcG9zaXRpb24iIChvZiBhbiBlbGVtZW50KSByZWZlcnMsIHJvdWdo bHksIHRvIHRoZSBwb3NpdGlvbiBhbiBlbGVtZW50IHdvdWxkIGhhdmUKKyAgICAvLyBoYWQgaW4g dGhlIG5vcm1hbCBmbG93LiBNb3JlIHByZWNpc2VseSwgdGhlIHN0YXRpYyBwb3NpdGlvbiBmb3Ig J3RvcCcgaXMgdGhlIGRpc3RhbmNlIGZyb20gdGhlIHRvcCBlZGdlIG9mIHRoZSBjb250YWluaW5n IGJsb2NrIHRvIHRoZSB0b3AgbWFyZ2luCisgICAgLy8gZWRnZSBvZiBhIGh5cG90aGV0aWNhbCBi b3ggdGhhdCB3b3VsZCBoYXZlIGJlZW4gdGhlIGZpcnN0IGJveCBvZiB0aGUgZWxlbWVudCBpZiBp dHMgc3BlY2lmaWVkICdwb3NpdGlvbicgdmFsdWUgaGFkIGJlZW4gJ3N0YXRpYycgYW5kIGl0cyBz cGVjaWZpZWQKKyAgICAvLyAnZmxvYXQnIGhhZCBiZWVuICdub25lJyBhbmQgaXRzIHNwZWNpZmll ZCAnY2xlYXInIGhhZCBiZWVuICdub25lJy4gKE5vdGUgdGhhdCBkdWUgdG8gdGhlIHJ1bGVzIGlu IHNlY3Rpb24gOS43IHRoaXMgbWlnaHQgcmVxdWlyZSBhbHNvIGFzc3VtaW5nIGEgZGlmZmVyZW50 CisgICAgLy8gY29tcHV0ZWQgdmFsdWUgZm9yICdkaXNwbGF5Jy4pIFRoZSB2YWx1ZSBpcyBuZWdh dGl2ZSBpZiB0aGUgaHlwb3RoZXRpY2FsIGJveCBpcyBhYm92ZSB0aGUgY29udGFpbmluZyBibG9j ay4KKworICAgIC8vIFN0YXJ0IHdpdGggdGhpcyBib3gncyBib3JkZXIgYm94IG9mZnNldCBmcm9t IHRoZSBwYXJlbnQncyBib3JkZXIgYm94LgogICAgIExheW91dFVuaXQgdG9wOwotICAgIC8vIEFk ZCBzaWJsaW5nIG9mZnNldAogICAgIGlmIChhdXRvKiBwcmV2aW91c0luRmxvd1NpYmxpbmcgPSBs YXlvdXRCb3gucHJldmlvdXNJbkZsb3dTaWJsaW5nKCkpIHsKKyAgICAgICAgLy8gQWRkIHNpYmxp bmcgb2Zmc2V0CiAgICAgICAgIGF1dG8mIHByZXZpb3VzSW5GbG93RGlzcGxheUJveCA9ICpsYXlv dXRDb250ZXh0LmRpc3BsYXlCb3hGb3JMYXlvdXRCb3goKnByZXZpb3VzSW5GbG93U2libGluZyk7 CiAgICAgICAgIHRvcCArPSBwcmV2aW91c0luRmxvd0Rpc3BsYXlCb3guYm90dG9tKCkgKyBwcmV2 aW91c0luRmxvd0Rpc3BsYXlCb3gubm9uQ29sbGFwc2VkTWFyZ2luQm90dG9tKCk7CisgICAgfSBl bHNlIHsKKyAgICAgICAgQVNTRVJUKGxheW91dEJveC5wYXJlbnQoKSk7CisgICAgICAgIHRvcCA9 IGxheW91dENvbnRleHQuZGlzcGxheUJveEZvckxheW91dEJveCgqbGF5b3V0Qm94LnBhcmVudCgp KS0+Y29udGVudEJveFRvcCgpOwogICAgIH0KKwogICAgIC8vIFJlc29sdmUgdG9wIGFsbCB0aGUg d2F5IHVwIHRvIHRoZSBjb250YWluaW5nIGJsb2NrLgogICAgIGF1dG8qIGNvbnRhaW5pbmdCbG9j ayA9IGxheW91dEJveC5jb250YWluaW5nQmxvY2soKTsKLSAgICBmb3IgKGF1dG8qIHBhcmVudCA9 IGxheW91dEJveC5wYXJlbnQoKTsgcGFyZW50OyBwYXJlbnQgPSBwYXJlbnQtPnBhcmVudCgpKSB7 Ci0gICAgICAgIGF1dG8mIGRpc3BsYXlCb3ggPSAqbGF5b3V0Q29udGV4dC5kaXNwbGF5Qm94Rm9y TGF5b3V0Qm94KCpwYXJlbnQpOwotICAgICAgICB0b3AgKz0gKGRpc3BsYXlCb3gudG9wKCkgKyBk aXNwbGF5Qm94LmNvbnRlbnRCb3hUb3AoKSk7Ci0gICAgICAgIGlmIChwYXJlbnQgPT0gY29udGFp bmluZ0Jsb2NrKQotICAgICAgICAgICAgYnJlYWs7CisgICAgZm9yIChhdXRvKiBjb250YWluZXIg PSBsYXlvdXRCb3gucGFyZW50KCk7IGNvbnRhaW5lciAhPSBjb250YWluaW5nQmxvY2s7IGNvbnRh aW5lciA9IGNvbnRhaW5lci0+Y29udGFpbmluZ0Jsb2NrKCkpIHsKKyAgICAgICAgYXV0byYgZGlz cGxheUJveCA9ICpsYXlvdXRDb250ZXh0LmRpc3BsYXlCb3hGb3JMYXlvdXRCb3goKmNvbnRhaW5l cik7CisgICAgICAgIC8vIERpc3BsYXk6OkJveDo6dG9wIGlzIHRoZSBib3JkZXIgYm94IHRvcCBw b3NpdGlvbiBpbiBpdHMgY29udGFpbmluZyBibG9jaydzIGNvb3JkaW5hdGUgc3lzdGVtLgorICAg ICAgICB0b3AgKz0gZGlzcGxheUJveC50b3AoKTsKKyAgICAgICAgQVNTRVJUKCFjb250YWluZXIt PmlzUG9zaXRpb25lZCgpKTsKICAgICB9CiAgICAgLy8gRklYTUU6IGZsb2F0aW5ncyBuZWVkIHRv IGJlIHRha2VuIGludG8gYWNjb3VudC4KICAgICByZXR1cm4gdG9wOwpAQCAtMTAwLDE1ICsxMTEs MTkgQEAgc3RhdGljIExheW91dFVuaXQgc3RhdGljVmVydGljYWxQb3NpdGlvbkZvck91dE9mRmxv d1Bvc2l0aW9uZWQoY29uc3QgTGF5b3V0Q29udGUKIHN0YXRpYyBMYXlvdXRVbml0IHN0YXRpY0hv cml6b250YWxQb3NpdGlvbkZvck91dE9mRmxvd1Bvc2l0aW9uZWQoY29uc3QgTGF5b3V0Q29udGV4 dCYgbGF5b3V0Q29udGV4dCwgY29uc3QgQm94JiBsYXlvdXRCb3gpCiB7CiAgICAgQVNTRVJUKGxh eW91dEJveC5pc091dE9mRmxvd1Bvc2l0aW9uZWQoKSk7CisgICAgLy8gU2VlIHN0YXRpY1ZlcnRp Y2FsUG9zaXRpb25Gb3JPdXRPZkZsb3dQb3NpdGlvbmVkIGZvciB0aGUgZGVmaW5pdGlvbiBvZiB0 aGUgc3RhdGljIHBvc2l0aW9uLgorCisgICAgLy8gU3RhcnQgd2l0aCB0aGlzIGJveCdzIGJvcmRl ciBib3ggb2Zmc2V0IGZyb20gdGhlIHBhcmVudCdzIGJvcmRlciBib3guCisgICAgQVNTRVJUKGxh eW91dEJveC5wYXJlbnQoKSk7CisgICAgYXV0byBsZWZ0ID0gbGF5b3V0Q29udGV4dC5kaXNwbGF5 Qm94Rm9yTGF5b3V0Qm94KCpsYXlvdXRCb3gucGFyZW50KCkpLT5jb250ZW50Qm94TGVmdCgpOwog Ci0gICAgTGF5b3V0VW5pdCBsZWZ0OwogICAgIC8vIFJlc29sdmUgbGVmdCBhbGwgdGhlIHdheSB1 cCB0byB0aGUgY29udGFpbmluZyBibG9jay4KICAgICBhdXRvKiBjb250YWluaW5nQmxvY2sgPSBs YXlvdXRCb3guY29udGFpbmluZ0Jsb2NrKCk7Ci0gICAgZm9yIChhdXRvKiBwYXJlbnQgPSBsYXlv dXRCb3gucGFyZW50KCk7IHBhcmVudDsgcGFyZW50ID0gcGFyZW50LT5wYXJlbnQoKSkgewotICAg ICAgICBhdXRvJiBkaXNwbGF5Qm94ID0gKmxheW91dENvbnRleHQuZGlzcGxheUJveEZvckxheW91 dEJveCgqcGFyZW50KTsKLSAgICAgICAgbGVmdCArPSAoZGlzcGxheUJveC5sZWZ0KCkgKyBkaXNw bGF5Qm94LmNvbnRlbnRCb3hMZWZ0KCkpOwotICAgICAgICBpZiAocGFyZW50ID09IGNvbnRhaW5p bmdCbG9jaykKLSAgICAgICAgICAgIGJyZWFrOworICAgIGZvciAoYXV0byogY29udGFpbmVyID0g bGF5b3V0Qm94LnBhcmVudCgpOyBjb250YWluZXIgIT0gY29udGFpbmluZ0Jsb2NrOyBjb250YWlu ZXIgPSBjb250YWluZXItPmNvbnRhaW5pbmdCbG9jaygpKSB7CisgICAgICAgIGF1dG8mIGRpc3Bs YXlCb3ggPSAqbGF5b3V0Q29udGV4dC5kaXNwbGF5Qm94Rm9yTGF5b3V0Qm94KCpjb250YWluZXIp OworICAgICAgICAvLyBEaXNwbGF5OjpCb3g6OmxlZnQgaXMgdGhlIGJvcmRlciBib3ggbGVmdCBw b3NpdGlvbiBpbiBpdHMgY29udGFpbmluZyBibG9jaydzIGNvb3JkaW5hdGUgc3lzdGVtLgorICAg ICAgICBsZWZ0ICs9IGRpc3BsYXlCb3gubGVmdCgpOworICAgICAgICBBU1NFUlQoIWNvbnRhaW5l ci0+aXNQb3NpdGlvbmVkKCkpOwogICAgIH0KICAgICAvLyBGSVhNRTogZmxvYXRpbmdzIG5lZWQg dG8gYmUgdGFrZW4gaW50byBhY2NvdW50LgogICAgIHJldHVybiBsZWZ0Owo=