182306 2018-01-30 13:42:06 -0800 [RenderTreeBuilder] Move RenderRubyRun::rubyBaseSafe to RenderTreeBuilder::Ruby 2018-02-01 13:48:42 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue darin koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1394714 0 zalan 2018-01-30 13:42:06 -0800 only RenderTreeBuilder::Ruby calls it. 1394718 1 webkit-bug-importer 2018-01-30 13:44:02 -0800 <rdar://problem/37041440> 1394720 2 332698 zalan 2018-01-30 13:48:54 -0800 Created attachment 332698 Patch 1394779 3 332698 commit-queue 2018-01-30 14:41:01 -0800 Comment on attachment 332698 Patch Clearing flags on attachment: 332698 Committed r227856: <https://trac.webkit.org/changeset/227856> 1394780 4 commit-queue 2018-01-30 14:41:03 -0800 All reviewed patches have been landed. Closing bug. 1395501 5 332698 darin 2018-02-01 09:18:24 -0800 Comment on attachment 332698 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=332698&action=review > Source/WebCore/rendering/updating/RenderTreeBuilderRuby.cpp:359 > +RenderRubyBase* RenderTreeBuilder::Ruby::rubyBaseSafe(RenderRubyRun& rubyRun) Since the whole point is that this never returns null, I would change the return value to be a reference instead of a pointer. 1395547 6 zalan 2018-02-01 10:31:32 -0800 (In reply to Darin Adler from comment #5) > Comment on attachment 332698 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=332698&action=review > > > Source/WebCore/rendering/updating/RenderTreeBuilderRuby.cpp:359 > > +RenderRubyBase* RenderTreeBuilder::Ruby::rubyBaseSafe(RenderRubyRun& rubyRun) > > Since the whole point is that this never returns null, I would change the > return value to be a reference instead of a pointer. Good point! I'll do that. 1395606 7 zalan 2018-02-01 13:13:03 -0800 Reopening to attach new patch. 1395607 8 332903 zalan 2018-02-01 13:13:04 -0800 Created attachment 332903 Patch 1395619 9 332903 commit-queue 2018-02-01 13:48:40 -0800 Comment on attachment 332903 Patch Clearing flags on attachment: 332903 Committed r227980: <https://trac.webkit.org/changeset/227980> 1395620 10 commit-queue 2018-02-01 13:48:42 -0800 All reviewed patches have been landed. Closing bug. 332698 2018-01-30 13:48:54 -0800 2018-02-01 13:13:01 -0800 Patch bug-182306-20180130134853.patch text/plain 7217 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI3Nzk2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGUyN2Q4ODczN2ZkYzRi ZDAzMmZiODk2MjE2NDcwYWQ0ZDM3Y2QzYi4uODIwNzIxMDRhNGI4ZjY4NWM2NjIyMzc4ZGYxOTIy OTlmYzE0YjBiNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDE4LTAxLTMwICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVy XSBNb3ZlIFJlbmRlclJ1YnlSdW46OnJ1YnlCYXNlU2FmZSB0byBSZW5kZXJUcmVlQnVpbGRlcjo6 UnVieQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgy MzA2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNzA0MTQ0MD4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXaXRoIGFsbCB0aGUgcnVieSBtdXRhdGlv biBjb2RlIG1vdmluZywgb25seSBSZW5kZXJUcmVlQnVpbGRlciBjYWxscyBSZW5kZXJSdWJ5UnVu OjpydWJ5QmFzZVNhZmUuCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxpdHkuCisK KyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyUnVieVJ1bi5jcHA6CisgICAgICAgIChXZWJDb3Jl OjpSZW5kZXJSdWJ5UnVuOjpydWJ5VGV4dCBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5k ZXJSdWJ5UnVuOjpydWJ5QmFzZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJSdWJ5 UnVuOjpmaXJzdExpbmVCbG9jayBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJSdWJ5 UnVuOjp0YWtlQ2hpbGQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyUnVieVJ1bjo6cnVieUJh c2VTYWZlKTogRGVsZXRlZC4KKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyUnVieVJ1bi5oOgor ICAgICAgICAqIHJlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlclJ1YnkuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVHJlZUJ1aWxkZXI6OlJ1Ynk6Omluc2VydENoaWxkKToK KyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRyZWVCdWlsZGVyOjpSdWJ5OjpydWJ5QmFzZVNhZmUp OgorICAgICAgICAqIHJlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlclJ1YnkuaDoK KwogMjAxOC0wMS0zMCAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAg IFNlcnZpY2Ugd29ya2VyIHJlZ2lzdHJhdGlvbiBzb2Z0IHVwZGF0ZXMgaGFwcGVuIHRvbyBmcmVx dWVudGx5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUnVieVJ1 bi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyUnVieVJ1bi5jcHAKaW5kZXgg YThjZjcxNmJkZGI0MjQxMDQzMjJkYzQ1ZWJiODA1YjU3MmJjMmI3Yy4uODc4ODdiODlmNjJmMTcw YzE5MTBjMmFkMTEwMGE3YTU5MTFlNjhmNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlclJ1YnlSdW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9S ZW5kZXJSdWJ5UnVuLmNwcApAQCAtNzgsMjkgKzc4LDE4IEBAIFJlbmRlclJ1YnlUZXh0KiBSZW5k ZXJSdWJ5UnVuOjpydWJ5VGV4dCgpIGNvbnN0CiAgICAgLy8gSWYgaW4gZnV0dXJlIGl0IGJlY29t ZXMgbmVjZXNzYXJ5IHRvIHN1cHBvcnQgZmxvYXRpbmcgb3IgcG9zaXRpb25lZCBydWJ5IHRleHQs CiAgICAgLy8gbGF5b3V0IHdpbGwgaGF2ZSB0byBiZSBjaGFuZ2VkIHRvIGhhbmRsZSB0aGVtIHBy b3Blcmx5LgogICAgIEFTU0VSVCghY2hpbGQgfHwgIWNoaWxkLT5pc1J1YnlUZXh0KCkgfHwgIWNo aWxkLT5pc0Zsb2F0aW5nT3JPdXRPZkZsb3dQb3NpdGlvbmVkKCkpOwotICAgIHJldHVybiBjaGls ZCAmJiBjaGlsZC0+aXNSdWJ5VGV4dCgpID8gc3RhdGljX2Nhc3Q8UmVuZGVyUnVieVRleHQqPihj aGlsZCkgOiAwOworICAgIHJldHVybiBjaGlsZCAmJiBjaGlsZC0+aXNSdWJ5VGV4dCgpID8gc3Rh dGljX2Nhc3Q8UmVuZGVyUnVieVRleHQqPihjaGlsZCkgOiBudWxscHRyOwogfQogCiBSZW5kZXJS dWJ5QmFzZSogUmVuZGVyUnVieVJ1bjo6cnVieUJhc2UoKSBjb25zdAogewogICAgIFJlbmRlck9i amVjdCogY2hpbGQgPSBsYXN0Q2hpbGQoKTsKLSAgICByZXR1cm4gY2hpbGQgJiYgY2hpbGQtPmlz UnVieUJhc2UoKSA/IHN0YXRpY19jYXN0PFJlbmRlclJ1YnlCYXNlKj4oY2hpbGQpIDogMDsKLX0K LQotUmVuZGVyUnVieUJhc2UqIFJlbmRlclJ1YnlSdW46OnJ1YnlCYXNlU2FmZSgpCi17Ci0gICAg UmVuZGVyUnVieUJhc2UqIGJhc2UgPSBydWJ5QmFzZSgpOwotICAgIGlmICghYmFzZSkgewotICAg ICAgICBhdXRvIG5ld0Jhc2UgPSBjcmVhdGVSdWJ5QmFzZSgpOwotICAgICAgICBiYXNlID0gbmV3 QmFzZS5nZXQoKTsKLSAgICAgICAgUmVuZGVyVHJlZUJ1aWxkZXI6OmN1cnJlbnQoKS0+aW5zZXJ0 Q2hpbGRUb1JlbmRlckJsb2NrRmxvdygqdGhpcywgV1RGTW92ZShuZXdCYXNlKSk7Ci0gICAgfQot ICAgIHJldHVybiBiYXNlOworICAgIHJldHVybiBjaGlsZCAmJiBjaGlsZC0+aXNSdWJ5QmFzZSgp ID8gc3RhdGljX2Nhc3Q8UmVuZGVyUnVieUJhc2UqPihjaGlsZCkgOiBudWxscHRyOwogfQogCiBS ZW5kZXJCbG9jayogUmVuZGVyUnVieVJ1bjo6Zmlyc3RMaW5lQmxvY2soKSBjb25zdAogewotICAg IHJldHVybiAwOworICAgIHJldHVybiBudWxscHRyOwogfQogCiBib29sIFJlbmRlclJ1YnlSdW46 OmlzQ2hpbGRBbGxvd2VkKGNvbnN0IFJlbmRlck9iamVjdCYgY2hpbGQsIGNvbnN0IFJlbmRlclN0 eWxlJikgY29uc3QKQEAgLTExOSw3ICsxMDgsNyBAQCBSZW5kZXJQdHI8UmVuZGVyT2JqZWN0PiBS ZW5kZXJSdWJ5UnVuOjp0YWtlQ2hpbGQoUmVuZGVyT2JqZWN0JiBjaGlsZCkKICAgICAgICAgICAg IC8vIFJ1YnkgcnVuIHdpdGhvdXQgYSBiYXNlIGNhbiBoYXBwZW4gb25seSBhdCB0aGUgZmlyc3Qg cnVuLgogICAgICAgICAgICAgUmVuZGVyUnVieVJ1biYgcmlnaHRSdW4gPSBkb3duY2FzdDxSZW5k ZXJSdWJ5UnVuPigqcmlnaHROZWlnaGJvdXIpOwogICAgICAgICAgICAgaWYgKHJpZ2h0UnVuLmhh c1J1YnlCYXNlKCkpIHsKLSAgICAgICAgICAgICAgICBSZW5kZXJSdWJ5QmFzZSogcmlnaHRCYXNl ID0gcmlnaHRSdW4ucnVieUJhc2VTYWZlKCk7CisgICAgICAgICAgICAgICAgUmVuZGVyUnVieUJh c2UqIHJpZ2h0QmFzZSA9IHJpZ2h0UnVuLnJ1YnlCYXNlKCk7CiAgICAgICAgICAgICAgICAgLy8g Q29sbGVjdCBhbGwgY2hpbGRyZW4gaW4gYSBzaW5nbGUgYmFzZSwgdGhlbiBzd2FwIHRoZSBiYXNl cy4KICAgICAgICAgICAgICAgICBSZW5kZXJUcmVlQnVpbGRlcjo6Y3VycmVudCgpLT5tb3ZlUnVi eUNoaWxkcmVuKCpyaWdodEJhc2UsICpiYXNlKTsKICAgICAgICAgICAgICAgICBtb3ZlQ2hpbGRU bygmcmlnaHRSdW4sIGJhc2UsIFJlbmRlckJveE1vZGVsT2JqZWN0OjpOb3JtYWxpemVBZnRlcklu c2VydGlvbjo6Tm8pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRl clJ1YnlSdW4uaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJSdWJ5UnVuLmgKaW5k ZXggZTI2ZjE0Yjk0NmU3MjMwMzBlMWZmYmUxMzRkMDc2ZmZiNzY1NThiMS4uZmQ0OGUzMzU1Y2E5 MTM2ZmViN2UwOWEwNDkyZDY1MWMxMzZiNzY0OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlclJ1YnlSdW4uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyUnVieVJ1bi5oCkBAIC01MCw3ICs1MCw2IEBAIHB1YmxpYzoKICAgICBib29sIGhhc1J1 YnlCYXNlKCkgY29uc3Q7CiAgICAgUmVuZGVyUnVieVRleHQqIHJ1YnlUZXh0KCkgY29uc3Q7CiAg ICAgUmVuZGVyUnVieUJhc2UqIHJ1YnlCYXNlKCkgY29uc3Q7Ci0gICAgUmVuZGVyUnVieUJhc2Uq IHJ1YnlCYXNlU2FmZSgpOyAvLyBjcmVhdGVzIHRoZSBiYXNlIGlmIGl0IGRvZXNuJ3QgYWxyZWFk eSBleGlzdAogCiAgICAgdm9pZCBsYXlvdXRFeGNsdWRlZENoaWxkcmVuKGJvb2wgcmVsYXlvdXRD aGlsZHJlbikgb3ZlcnJpZGU7CiAgICAgdm9pZCBsYXlvdXQoKSBvdmVycmlkZTsKQEAgLTczLDcg KzcyLDYgQEAgcHVibGljOgogICAgIH0KICAgICBib29sIGNhbkJyZWFrQmVmb3JlKGNvbnN0IExh enlMaW5lQnJlYWtJdGVyYXRvciYpIGNvbnN0OwogICAgIAotcHJvdGVjdGVkOgogICAgIFJlbmRl clB0cjxSZW5kZXJSdWJ5QmFzZT4gY3JlYXRlUnVieUJhc2UoKSBjb25zdDsKIAogcHJpdmF0ZToK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVl QnVpbGRlclJ1YnkuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRl clRyZWVCdWlsZGVyUnVieS5jcHAKaW5kZXggZmYxY2E3YzYxY2MyY2NjOWNjOWFjYTNkYTc4NjVj YWE3NzI2ZmIxZC4uMmFiNzVjNWY3Y2Q5Nzg0Y2UwZDg2NzM4ODhmZDFmNzI4MDNhYmYxMyAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWls ZGVyUnVieS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRl clRyZWVCdWlsZGVyUnVieS5jcHAKQEAgLTIyMSw3ICsyMjEsNyBAQCB2b2lkIFJlbmRlclRyZWVC dWlsZGVyOjpSdWJ5OjppbnNlcnRDaGlsZChSZW5kZXJSdWJ5UnVuJiBwYXJlbnQsIFJlbmRlclB0 cjxSZW5kZQogICAgICAgICAgICAgYXV0byYgcnVuID0gKm5ld1J1bjsKICAgICAgICAgICAgIG1f YnVpbGRlci5pbnNlcnRDaGlsZCgqcnVieSwgV1RGTW92ZShuZXdSdW4pLCAmcGFyZW50KTsKICAg ICAgICAgICAgIG1fYnVpbGRlci5pbnNlcnRDaGlsZChydW4sIFdURk1vdmUoY2hpbGQpKTsKLSAg ICAgICAgICAgIG1vdmVDaGlsZHJlbkludGVybmFsKCpwYXJlbnQucnVieUJhc2VTYWZlKCksICpy dW4ucnVieUJhc2VTYWZlKCksIGJlZm9yZUNoaWxkKTsKKyAgICAgICAgICAgIG1vdmVDaGlsZHJl bkludGVybmFsKCpydWJ5QmFzZVNhZmUocGFyZW50KSwgKnJ1YnlCYXNlU2FmZShydW4pLCBiZWZv cmVDaGlsZCk7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuOwogICAgIH0KQEAgLTIyOSw3ICsy MjksNyBAQCB2b2lkIFJlbmRlclRyZWVCdWlsZGVyOjpSdWJ5OjppbnNlcnRDaGlsZChSZW5kZXJS dWJ5UnVuJiBwYXJlbnQsIFJlbmRlclB0cjxSZW5kZQogICAgIC8vIChhcHBlbmQgaXQgaW5zdGVh ZCBpZiBiZWZvcmVDaGlsZCBpcyB0aGUgcnVieSB0ZXh0KQogICAgIGlmIChiZWZvcmVDaGlsZCAm JiBiZWZvcmVDaGlsZC0+aXNSdWJ5VGV4dCgpKQogICAgICAgICBiZWZvcmVDaGlsZCA9IG51bGxw dHI7Ci0gICAgbV9idWlsZGVyLmluc2VydENoaWxkKCpwYXJlbnQucnVieUJhc2VTYWZlKCksIFdU Rk1vdmUoY2hpbGQpLCBiZWZvcmVDaGlsZCk7CisgICAgbV9idWlsZGVyLmluc2VydENoaWxkKCpy dWJ5QmFzZVNhZmUocGFyZW50KSwgV1RGTW92ZShjaGlsZCksIGJlZm9yZUNoaWxkKTsKIH0KIAog UmVuZGVyRWxlbWVudCYgUmVuZGVyVHJlZUJ1aWxkZXI6OlJ1Ynk6OmZpbmRPckNyZWF0ZVBhcmVu dEZvckNoaWxkKFJlbmRlclJ1YnlBc0Jsb2NrJiBwYXJlbnQsIGNvbnN0IFJlbmRlck9iamVjdCYg Y2hpbGQsIFJlbmRlck9iamVjdComIGJlZm9yZUNoaWxkKQpAQCAtMzU2LDQgKzM1NiwxNSBAQCBS ZW5kZXJFbGVtZW50JiBSZW5kZXJUcmVlQnVpbGRlcjo6UnVieTo6ZmluZE9yQ3JlYXRlUGFyZW50 Rm9yQ2hpbGQoUmVuZGVyUnVieUFzSQogICAgIHJldHVybiAqbGFzdFJ1bjsKIH0KIAorUmVuZGVy UnVieUJhc2UqIFJlbmRlclRyZWVCdWlsZGVyOjpSdWJ5OjpydWJ5QmFzZVNhZmUoUmVuZGVyUnVi eVJ1biYgcnVieVJ1bikKK3sKKyAgICBhdXRvKiBiYXNlID0gcnVieVJ1bi5ydWJ5QmFzZSgpOwor ICAgIGlmICghYmFzZSkgeworICAgICAgICBhdXRvIG5ld0Jhc2UgPSBydWJ5UnVuLmNyZWF0ZVJ1 YnlCYXNlKCk7CisgICAgICAgIGJhc2UgPSBuZXdCYXNlLmdldCgpOworICAgICAgICBtX2J1aWxk ZXIuaW5zZXJ0Q2hpbGRUb1JlbmRlckJsb2NrRmxvdyhydWJ5UnVuLCBXVEZNb3ZlKG5ld0Jhc2Up KTsKKyAgICB9CisgICAgcmV0dXJuIGJhc2U7Cit9CisKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlclJ1YnkuaCBiL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlclJ1YnkuaAppbmRl eCAzNTMxNTc5MzhiNTcxYjdjMTIzMjg3MGUyYWJmZGQyMGRjZDgyMDM0Li5mZDNmMTg3ODA3YWUz NWVhNGZjZDkwMGUwMzViZTM2MzYyMGJmYmE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJSdWJ5LmgKKysrIGIvU291cmNlL1dl YkNvcmUvcmVuZGVyaW5nL3VwZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyUnVieS5oCkBAIC0zMyw2 ICszMyw3IEBAIGNsYXNzIFJlbmRlckVsZW1lbnQ7CiBjbGFzcyBSZW5kZXJPYmplY3Q7CiBjbGFz cyBSZW5kZXJSdWJ5QXNCbG9jazsKIGNsYXNzIFJlbmRlclJ1YnlBc0lubGluZTsKK2NsYXNzIFJl bmRlclJ1YnlCYXNlOwogY2xhc3MgUmVuZGVyUnVieVJ1bjsKIGNsYXNzIFJlbmRlclRyZWVCdWls ZGVyOwogCkBAIC01MCw2ICs1MSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBtb3ZlSW5saW5lQ2hp bGRyZW4oUmVuZGVyUnVieUJhc2UmIGZyb20sIFJlbmRlclJ1YnlCYXNlJiB0bywgUmVuZGVyT2Jq ZWN0KiBiZWZvcmVDaGlsZCk7CiAgICAgdm9pZCBtb3ZlQmxvY2tDaGlsZHJlbihSZW5kZXJSdWJ5 QmFzZSYgZnJvbSwgUmVuZGVyUnVieUJhc2UmIHRvLCBSZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxk KTsKICAgICB2b2lkIG1vdmVDaGlsZHJlbkludGVybmFsKFJlbmRlclJ1YnlCYXNlJiBmcm9tLCBS ZW5kZXJSdWJ5QmFzZSYgdG8sIFJlbmRlck9iamVjdCogYmVmb3JlQ2hpbGQgPSBudWxscHRyKTsK KyAgICBSZW5kZXJSdWJ5QmFzZSogcnVieUJhc2VTYWZlKFJlbmRlclJ1YnlSdW4mKTsKIAogICAg IFJlbmRlclRyZWVCdWlsZGVyJiBtX2J1aWxkZXI7CiB9Owo= 332903 2018-02-01 13:13:04 -0800 2018-02-01 13:48:40 -0800 Patch bug-182306-20180201131303.patch text/plain 3758 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjI3OTc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggY2VlOWUxZWEwNTcyMTYx ZDNmODU2MWQ4MWM1NGUxZDA1YTBhMDczMy4uODI4NDM4ZDZjZThmNzcxMGIyZTkxM2IwODY3N2I1 MjdiZTA3MWI5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE4LTAyLTAxICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW1JlbmRlclRyZWVCdWlsZGVy XSBNb3ZlIFJlbmRlclJ1YnlSdW46OnJ1YnlCYXNlU2FmZSB0byBSZW5kZXJUcmVlQnVpbGRlcjo6 UnVieQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgy MzA2CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNzA0MTQ0MD4KKworICAgICAgICBSZXZpZXdl ZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBBZGRyZXNzaW5nIHBvc3QtcmV2aWV3IGNvbW1l bnQuCisKKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJSdWJ5 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRyZWVCdWlsZGVyOjpSdWJ5OjppbnNlcnRD aGlsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUcmVlQnVpbGRlcjo6UnVieTo6cnVieUJh c2VTYWZlKToKKyAgICAgICAgKiByZW5kZXJpbmcvdXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJS dWJ5Lmg6CisKIDIwMTgtMDItMDEgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFwcGxlLmNvbT4KIAog ICAgICAgICBbUmVuZGVyVHJlZUJ1aWxkZXJdIEludHJvZHVjZSBSZW5kZXJUcmVlQnVpbGRlciB0 byB0YWtlQ2hpbGQoKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3VwZGF0 aW5nL1JlbmRlclRyZWVCdWlsZGVyUnVieS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv dXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJSdWJ5LmNwcAppbmRleCBkNTk5NjdiNjg5MmVmYTli M2Q4OWU2ZDNmNzg1OWIzYWIzOTU4MjkwLi5mNzBhMzIxYmIyZmY4NTI5NGI1ZGFlMjZkZjUxYzJj YTlhNDU3NWZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcv UmVuZGVyVHJlZUJ1aWxkZXJSdWJ5LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv dXBkYXRpbmcvUmVuZGVyVHJlZUJ1aWxkZXJSdWJ5LmNwcApAQCAtMjIxLDcgKzIyMSw3IEBAIHZv aWQgUmVuZGVyVHJlZUJ1aWxkZXI6OlJ1Ynk6Omluc2VydENoaWxkKFJlbmRlclJ1YnlSdW4mIHBh cmVudCwgUmVuZGVyUHRyPFJlbmRlCiAgICAgICAgICAgICBhdXRvJiBydW4gPSAqbmV3UnVuOwog ICAgICAgICAgICAgbV9idWlsZGVyLmluc2VydENoaWxkKCpydWJ5LCBXVEZNb3ZlKG5ld1J1biks ICZwYXJlbnQpOwogICAgICAgICAgICAgbV9idWlsZGVyLmluc2VydENoaWxkKHJ1biwgV1RGTW92 ZShjaGlsZCkpOwotICAgICAgICAgICAgbW92ZUNoaWxkcmVuSW50ZXJuYWwoKnJ1YnlCYXNlU2Fm ZShwYXJlbnQpLCAqcnVieUJhc2VTYWZlKHJ1biksIGJlZm9yZUNoaWxkKTsKKyAgICAgICAgICAg IG1vdmVDaGlsZHJlbkludGVybmFsKHJ1YnlCYXNlU2FmZShwYXJlbnQpLCBydWJ5QmFzZVNhZmUo cnVuKSwgYmVmb3JlQ2hpbGQpOwogICAgICAgICB9CiAgICAgICAgIHJldHVybjsKICAgICB9CkBA IC0yMjksNyArMjI5LDcgQEAgdm9pZCBSZW5kZXJUcmVlQnVpbGRlcjo6UnVieTo6aW5zZXJ0Q2hp bGQoUmVuZGVyUnVieVJ1biYgcGFyZW50LCBSZW5kZXJQdHI8UmVuZGUKICAgICAvLyAoYXBwZW5k IGl0IGluc3RlYWQgaWYgYmVmb3JlQ2hpbGQgaXMgdGhlIHJ1YnkgdGV4dCkKICAgICBpZiAoYmVm b3JlQ2hpbGQgJiYgYmVmb3JlQ2hpbGQtPmlzUnVieVRleHQoKSkKICAgICAgICAgYmVmb3JlQ2hp bGQgPSBudWxscHRyOwotICAgIG1fYnVpbGRlci5pbnNlcnRDaGlsZCgqcnVieUJhc2VTYWZlKHBh cmVudCksIFdURk1vdmUoY2hpbGQpLCBiZWZvcmVDaGlsZCk7CisgICAgbV9idWlsZGVyLmluc2Vy dENoaWxkKHJ1YnlCYXNlU2FmZShwYXJlbnQpLCBXVEZNb3ZlKGNoaWxkKSwgYmVmb3JlQ2hpbGQp OwogfQogCiBSZW5kZXJFbGVtZW50JiBSZW5kZXJUcmVlQnVpbGRlcjo6UnVieTo6ZmluZE9yQ3Jl YXRlUGFyZW50Rm9yQ2hpbGQoUmVuZGVyUnVieUFzQmxvY2smIHBhcmVudCwgY29uc3QgUmVuZGVy T2JqZWN0JiBjaGlsZCwgUmVuZGVyT2JqZWN0KiYgYmVmb3JlQ2hpbGQpCkBAIC0zNTYsNyArMzU2 LDcgQEAgUmVuZGVyRWxlbWVudCYgUmVuZGVyVHJlZUJ1aWxkZXI6OlJ1Ynk6OmZpbmRPckNyZWF0 ZVBhcmVudEZvckNoaWxkKFJlbmRlclJ1YnlBc0kKICAgICByZXR1cm4gKmxhc3RSdW47CiB9CiAK LVJlbmRlclJ1YnlCYXNlKiBSZW5kZXJUcmVlQnVpbGRlcjo6UnVieTo6cnVieUJhc2VTYWZlKFJl bmRlclJ1YnlSdW4mIHJ1YnlSdW4pCitSZW5kZXJSdWJ5QmFzZSYgUmVuZGVyVHJlZUJ1aWxkZXI6 OlJ1Ynk6OnJ1YnlCYXNlU2FmZShSZW5kZXJSdWJ5UnVuJiBydWJ5UnVuKQogewogICAgIGF1dG8q IGJhc2UgPSBydWJ5UnVuLnJ1YnlCYXNlKCk7CiAgICAgaWYgKCFiYXNlKSB7CkBAIC0zNjQsNyAr MzY0LDcgQEAgUmVuZGVyUnVieUJhc2UqIFJlbmRlclRyZWVCdWlsZGVyOjpSdWJ5OjpydWJ5QmFz ZVNhZmUoUmVuZGVyUnVieVJ1biYgcnVieVJ1bikKICAgICAgICAgYmFzZSA9IG5ld0Jhc2UuZ2V0 KCk7CiAgICAgICAgIG1fYnVpbGRlci5pbnNlcnRDaGlsZFRvUmVuZGVyQmxvY2tGbG93KHJ1YnlS dW4sIFdURk1vdmUobmV3QmFzZSkpOwogICAgIH0KLSAgICByZXR1cm4gYmFzZTsKKyAgICByZXR1 cm4gKmJhc2U7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy91 cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlclJ1YnkuaCBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy91cGRhdGluZy9SZW5kZXJUcmVlQnVpbGRlclJ1YnkuaAppbmRleCBmZDNmMTg3ODA3YWUzNWVh NGZjZDkwMGUwMzViZTM2MzYyMGJmYmE3Li4wZjRiZTRlMjM3NTdiZjA1ZGVhZWE4NzZlMmJhYTUz MGY5OWZhMGE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvdXBkYXRpbmcv UmVuZGVyVHJlZUJ1aWxkZXJSdWJ5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL3Vw ZGF0aW5nL1JlbmRlclRyZWVCdWlsZGVyUnVieS5oCkBAIC01MSw3ICs1MSw3IEBAIHByaXZhdGU6 CiAgICAgdm9pZCBtb3ZlSW5saW5lQ2hpbGRyZW4oUmVuZGVyUnVieUJhc2UmIGZyb20sIFJlbmRl clJ1YnlCYXNlJiB0bywgUmVuZGVyT2JqZWN0KiBiZWZvcmVDaGlsZCk7CiAgICAgdm9pZCBtb3Zl QmxvY2tDaGlsZHJlbihSZW5kZXJSdWJ5QmFzZSYgZnJvbSwgUmVuZGVyUnVieUJhc2UmIHRvLCBS ZW5kZXJPYmplY3QqIGJlZm9yZUNoaWxkKTsKICAgICB2b2lkIG1vdmVDaGlsZHJlbkludGVybmFs KFJlbmRlclJ1YnlCYXNlJiBmcm9tLCBSZW5kZXJSdWJ5QmFzZSYgdG8sIFJlbmRlck9iamVjdCog YmVmb3JlQ2hpbGQgPSBudWxscHRyKTsKLSAgICBSZW5kZXJSdWJ5QmFzZSogcnVieUJhc2VTYWZl KFJlbmRlclJ1YnlSdW4mKTsKKyAgICBSZW5kZXJSdWJ5QmFzZSYgcnVieUJhc2VTYWZlKFJlbmRl clJ1YnlSdW4mKTsKIAogICAgIFJlbmRlclRyZWVCdWlsZGVyJiBtX2J1aWxkZXI7CiB9Owo=