204751 2019-12-02 09:11:53 -0800 Remove the confusing Value struct used for calc results 2019-12-02 12:04:20 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser commit-queue esprehn+autocc ews-watchlist glenn gyuyoung.kim koivisto macpherson menard simon.fraser thorton webkit-bug-importer oldest_to_newest 1594625 0 simon.fraser 2019-12-02 09:11:53 -0800 Remove the confusing Value struct used for calc results 1594626 1 384630 simon.fraser 2019-12-02 09:12:44 -0800 Created attachment 384630 Patch 1594730 2 384630 commit-queue 2019-12-02 12:03:16 -0800 Comment on attachment 384630 Patch Clearing flags on attachment: 384630 Committed r253002: <https://trac.webkit.org/changeset/253002> 1594731 3 commit-queue 2019-12-02 12:03:18 -0800 All reviewed patches have been landed. Closing bug. 1594732 4 webkit-bug-importer 2019-12-02 12:04:20 -0800 <rdar://problem/57566092> 384630 2019-12-02 09:12:44 -0800 2019-12-02 12:03:16 -0800 Patch bug-204751-20191202091243.patch text/plain 9728 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjUyOTcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzU0ODcxY2JlZTdjNDZk NWQyZDMwZTljMzMxOTI4ZjRmMmI0Y2Q3MC4uZGE0ODZmNTkwOTc0NmYwNzI5NGE2YWM4ZGM2OTY1 NWJiZGU4ZmJmMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE5LTEyLTAyICBTaW1v biBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgorCisgICAgICAgIFJlbW92ZSB0aGUg Y29uZnVzaW5nIFZhbHVlIHN0cnVjdCB1c2VkIGZvciBjYWxjIHJlc3VsdHMKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDc1MQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlcGxhY2UgdGhlIFZhbHVlKiBh cmd1bWVudCB3aXRoIGEgUmVmUHRyPENTU0NhbGNFeHByZXNzaW9uTm9kZT4mLiBWYWx1ZSBqdXN0 IG1hZGUgdGhpbmdzIG1vcmUKKyAgICAgICAgY29uZnVzaW5nLgorCisgICAgICAgICogY3NzL0NT U0NhbGN1bGF0aW9uVmFsdWUuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q1NTQ2FsY0V4cHJlc3Np b25Ob2RlUGFyc2VyOjpwYXJzZUNhbGMpOgorICAgICAgICAoV2ViQ29yZTo6Q1NTQ2FsY0V4cHJl c3Npb25Ob2RlUGFyc2VyOjpwYXJzZVZhbHVlKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU0NhbGNF eHByZXNzaW9uTm9kZVBhcnNlcjo6cGFyc2VWYWx1ZVRlcm0pOgorICAgICAgICAoV2ViQ29yZTo6 Q1NTQ2FsY0V4cHJlc3Npb25Ob2RlUGFyc2VyOjpwYXJzZVZhbHVlTXVsdGlwbGljYXRpdmVFeHBy ZXNzaW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkNTU0NhbGNFeHByZXNzaW9uTm9kZVBhcnNlcjo6 cGFyc2VBZGRpdGl2ZVZhbHVlRXhwcmVzc2lvbik6CisgICAgICAgIChXZWJDb3JlOjpDU1NDYWxj RXhwcmVzc2lvbk5vZGVQYXJzZXI6OnBhcnNlTWluTWF4RXhwcmVzc2lvbik6CisgICAgICAgIChX ZWJDb3JlOjpDU1NDYWxjRXhwcmVzc2lvbk5vZGVQYXJzZXI6OnBhcnNlVmFsdWVFeHByZXNzaW9u KToKKwogMjAxOS0xMi0wMSAgU2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4K IAogICAgICAgICBEb24ndCBkbyByYW5nZSBjaGVja2luZyBmb3IgY2FsYygpIGF0IHBhcnNlIHRp bWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDYWxjdWxhdGlvblZhbHVlLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2Nzcy9DU1NDYWxjdWxhdGlvblZhbHVlLmNwcAppbmRleCBmOTky ODlkYmZlNjhkMzdkZGM2ZTU2YjRkMjZjOTNkNDY0YjMyOWI5Li5jNmRmNTRkZjllNzRlNzcxYjgx MDRjYTE0OWI3MDBiM2MxMmU3MTZhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3MvQ1NT Q2FsY3VsYXRpb25WYWx1ZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3NzL0NTU0NhbGN1bGF0 aW9uVmFsdWUuY3BwCkBAIC03NTQsMTAgKzc1NCw2IEBAIHB1YmxpYzoKICAgICBSZWZQdHI8Q1NT Q2FsY0V4cHJlc3Npb25Ob2RlPiBwYXJzZUNhbGMoQ1NTUGFyc2VyVG9rZW5SYW5nZSwgQ1NTVmFs dWVJRCBmdW5jdGlvbik7CiAgICAgCiBwcml2YXRlOgotICAgIHN0cnVjdCBWYWx1ZSB7Ci0gICAg ICAgIFJlZlB0cjxDU1NDYWxjRXhwcmVzc2lvbk5vZGU+IHZhbHVlOwotICAgIH07Ci0gICAgCiAg ICAgY2hhciBvcGVyYXRvclZhbHVlKGNvbnN0IENTU1BhcnNlclRva2VuJiB0b2tlbikKICAgICB7 CiAgICAgICAgIGlmICh0b2tlbi50eXBlKCkgPT0gRGVsaW1pdGVyVG9rZW4pCkBAIC03NjUsMTIg Kzc2MSwxMiBAQCBwcml2YXRlOgogICAgICAgICByZXR1cm4gMDsKICAgICB9CiAKLSAgICBib29s IHBhcnNlVmFsdWUoQ1NTUGFyc2VyVG9rZW5SYW5nZSYsIFZhbHVlKiByZXN1bHQpOwotICAgIGJv b2wgcGFyc2VWYWx1ZVRlcm0oQ1NTUGFyc2VyVG9rZW5SYW5nZSYsIGludCBkZXB0aCwgVmFsdWUq IHJlc3VsdCk7Ci0gICAgYm9vbCBwYXJzZVZhbHVlTXVsdGlwbGljYXRpdmVFeHByZXNzaW9uKENT U1BhcnNlclRva2VuUmFuZ2UmLCBpbnQgZGVwdGgsIFZhbHVlKiByZXN1bHQpOwotICAgIGJvb2wg cGFyc2VBZGRpdGl2ZVZhbHVlRXhwcmVzc2lvbihDU1NQYXJzZXJUb2tlblJhbmdlJiwgaW50IGRl cHRoLCBWYWx1ZSogcmVzdWx0KTsKLSAgICBib29sIHBhcnNlTWluTWF4RXhwcmVzc2lvbihDU1NQ YXJzZXJUb2tlblJhbmdlJiwgQ1NTVmFsdWVJRCBtaW5NYXhGdW5jdGlvbiwgaW50IGRlcHRoLCBW YWx1ZSogcmVzdWx0KTsKLSAgICBib29sIHBhcnNlVmFsdWVFeHByZXNzaW9uKENTU1BhcnNlclRv a2VuUmFuZ2UmLCBpbnQgZGVwdGgsIFZhbHVlKiByZXN1bHQpOworICAgIGJvb2wgcGFyc2VWYWx1 ZShDU1NQYXJzZXJUb2tlblJhbmdlJiwgUmVmUHRyPENTU0NhbGNFeHByZXNzaW9uTm9kZT4mKTsK KyAgICBib29sIHBhcnNlVmFsdWVUZXJtKENTU1BhcnNlclRva2VuUmFuZ2UmLCBpbnQgZGVwdGgs IFJlZlB0cjxDU1NDYWxjRXhwcmVzc2lvbk5vZGU+Jik7CisgICAgYm9vbCBwYXJzZVZhbHVlTXVs dGlwbGljYXRpdmVFeHByZXNzaW9uKENTU1BhcnNlclRva2VuUmFuZ2UmLCBpbnQgZGVwdGgsIFJl ZlB0cjxDU1NDYWxjRXhwcmVzc2lvbk5vZGU+Jik7CisgICAgYm9vbCBwYXJzZUFkZGl0aXZlVmFs dWVFeHByZXNzaW9uKENTU1BhcnNlclRva2VuUmFuZ2UmLCBpbnQgZGVwdGgsIFJlZlB0cjxDU1ND YWxjRXhwcmVzc2lvbk5vZGU+Jik7CisgICAgYm9vbCBwYXJzZU1pbk1heEV4cHJlc3Npb24oQ1NT UGFyc2VyVG9rZW5SYW5nZSYsIENTU1ZhbHVlSUQgbWluTWF4RnVuY3Rpb24sIGludCBkZXB0aCwg UmVmUHRyPENTU0NhbGNFeHByZXNzaW9uTm9kZT4mKTsKKyAgICBib29sIHBhcnNlVmFsdWVFeHBy ZXNzaW9uKENTU1BhcnNlclRva2VuUmFuZ2UmLCBpbnQgZGVwdGgsIFJlZlB0cjxDU1NDYWxjRXhw cmVzc2lvbk5vZGU+Jik7CiAKICAgICBDYWxjdWxhdGlvbkNhdGVnb3J5IG1fZGVzdGluYXRpb25D YXRlZ29yeTsKIH07CkBAIC03NzgsMjIgKzc3NCwyNSBAQCBwcml2YXRlOgogCiBSZWZQdHI8Q1NT Q2FsY0V4cHJlc3Npb25Ob2RlPiBDU1NDYWxjRXhwcmVzc2lvbk5vZGVQYXJzZXI6OnBhcnNlQ2Fs YyhDU1NQYXJzZXJUb2tlblJhbmdlIHRva2VucywgQ1NTVmFsdWVJRCBmdW5jdGlvbikKIHsKLSAg ICBWYWx1ZSByZXN1bHQ7CisgICAgUmVmUHRyPENTU0NhbGNFeHByZXNzaW9uTm9kZT4gcmVzdWx0 OwogICAgIHRva2Vucy5jb25zdW1lV2hpdGVzcGFjZSgpOwogICAgIGJvb2wgb2sgPSBmYWxzZTsK ICAgICBpZiAoZnVuY3Rpb24gPT0gQ1NTVmFsdWVDYWxjIHx8IGZ1bmN0aW9uID09IENTU1ZhbHVl V2Via2l0Q2FsYykKLSAgICAgICAgb2sgPSBwYXJzZVZhbHVlRXhwcmVzc2lvbih0b2tlbnMsIDAs ICZyZXN1bHQpOworICAgICAgICBvayA9IHBhcnNlVmFsdWVFeHByZXNzaW9uKHRva2VucywgMCwg cmVzdWx0KTsKICAgICBlbHNlIGlmIChmdW5jdGlvbiA9PSBDU1NWYWx1ZU1pbiB8fCBmdW5jdGlv biA9PSBDU1NWYWx1ZU1heCkKLSAgICAgICAgb2sgPSBwYXJzZU1pbk1heEV4cHJlc3Npb24odG9r ZW5zLCBmdW5jdGlvbiwgMCwgJnJlc3VsdCk7CisgICAgICAgIG9rID0gcGFyc2VNaW5NYXhFeHBy ZXNzaW9uKHRva2VucywgZnVuY3Rpb24sIDAsIHJlc3VsdCk7CiAgICAgaWYgKCFvayB8fCAhdG9r ZW5zLmF0RW5kKCkpCiAgICAgICAgIHJldHVybiBudWxscHRyOwogCi0gICAgTE9HX1dJVEhfU1RS RUFNKENhbGMsIHN0cmVhbSA8PCAiQ1NTQ2FsY0V4cHJlc3Npb25Ob2RlUGFyc2VyOjpwYXJzZUNh bGMgIiA8PCBwcmV0dHlQcmludE5vZGUoKnJlc3VsdC52YWx1ZSkpOworICAgIGlmICghcmVzdWx0 KQorICAgICAgICByZXR1cm4gbnVsbHB0cjsKKworICAgIExPR19XSVRIX1NUUkVBTShDYWxjLCBz dHJlYW0gPDwgIkNTU0NhbGNFeHByZXNzaW9uTm9kZVBhcnNlcjo6cGFyc2VDYWxjICIgPDwgcHJl dHR5UHJpbnROb2RlKCpyZXN1bHQpKTsKIAotICAgIHJldHVybiByZXN1bHQudmFsdWU7CisgICAg cmV0dXJuIHJlc3VsdDsKIH0KIAotYm9vbCBDU1NDYWxjRXhwcmVzc2lvbk5vZGVQYXJzZXI6OnBh cnNlVmFsdWUoQ1NTUGFyc2VyVG9rZW5SYW5nZSYgdG9rZW5zLCBWYWx1ZSogcmVzdWx0KQorYm9v bCBDU1NDYWxjRXhwcmVzc2lvbk5vZGVQYXJzZXI6OnBhcnNlVmFsdWUoQ1NTUGFyc2VyVG9rZW5S YW5nZSYgdG9rZW5zLCBSZWZQdHI8Q1NTQ2FsY0V4cHJlc3Npb25Ob2RlPiYgcmVzdWx0KQogewog ICAgIENTU1BhcnNlclRva2VuIHRva2VuID0gdG9rZW5zLmNvbnN1bWVJbmNsdWRpbmdXaGl0ZXNw YWNlKCk7CiAgICAgaWYgKCEodG9rZW4udHlwZSgpID09IE51bWJlclRva2VuIHx8IHRva2VuLnR5 cGUoKSA9PSBQZXJjZW50YWdlVG9rZW4gfHwgdG9rZW4udHlwZSgpID09IERpbWVuc2lvblRva2Vu KSkKQEAgLTgwMyw4ICs4MDIsNyBAQCBib29sIENTU0NhbGNFeHByZXNzaW9uTm9kZVBhcnNlcjo6 cGFyc2VWYWx1ZShDU1NQYXJzZXJUb2tlblJhbmdlJiB0b2tlbnMsIFZhbHVlKgogICAgIGlmIChj YWxjVW5pdENhdGVnb3J5KHR5cGUpID09IENhbGN1bGF0aW9uQ2F0ZWdvcnk6Ok90aGVyKQogICAg ICAgICByZXR1cm4gZmFsc2U7CiAgICAgCi0gICAgcmVzdWx0LT52YWx1ZSA9IENTU0NhbGNQcmlt aXRpdmVWYWx1ZU5vZGU6OmNyZWF0ZShDU1NQcmltaXRpdmVWYWx1ZTo6Y3JlYXRlKHRva2VuLm51 bWVyaWNWYWx1ZSgpLCB0eXBlKSk7Ci0gICAgCisgICAgcmVzdWx0ID0gQ1NTQ2FsY1ByaW1pdGl2 ZVZhbHVlTm9kZTo6Y3JlYXRlKENTU1ByaW1pdGl2ZVZhbHVlOjpjcmVhdGUodG9rZW4ubnVtZXJp Y1ZhbHVlKCksIHR5cGUpKTsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApAQCAtODI0LDcgKzgyMiw3 IEBAIHN0YXRpYyBQYXJzZVN0YXRlIGNoZWNrRGVwdGhBbmRJbmRleChpbnQqIGRlcHRoLCBDU1NQ YXJzZXJUb2tlblJhbmdlIHRva2VucykKICAgICByZXR1cm4gT0s7CiB9CiAKLWJvb2wgQ1NTQ2Fs Y0V4cHJlc3Npb25Ob2RlUGFyc2VyOjpwYXJzZVZhbHVlVGVybShDU1NQYXJzZXJUb2tlblJhbmdl JiB0b2tlbnMsIGludCBkZXB0aCwgVmFsdWUqIHJlc3VsdCkKK2Jvb2wgQ1NTQ2FsY0V4cHJlc3Np b25Ob2RlUGFyc2VyOjpwYXJzZVZhbHVlVGVybShDU1NQYXJzZXJUb2tlblJhbmdlJiB0b2tlbnMs IGludCBkZXB0aCwgUmVmUHRyPENTU0NhbGNFeHByZXNzaW9uTm9kZT4mIHJlc3VsdCkKIHsKICAg ICBpZiAoY2hlY2tEZXB0aEFuZEluZGV4KCZkZXB0aCwgdG9rZW5zKSAhPSBPSykKICAgICAgICAg cmV0dXJuIGZhbHNlOwpAQCAtODQ4LDcgKzg0Niw3IEBAIGJvb2wgQ1NTQ2FsY0V4cHJlc3Npb25O b2RlUGFyc2VyOjpwYXJzZVZhbHVlVGVybShDU1NQYXJzZXJUb2tlblJhbmdlJiB0b2tlbnMsIGlu CiAgICAgcmV0dXJuIHBhcnNlVmFsdWUodG9rZW5zLCByZXN1bHQpOwogfQogCi1ib29sIENTU0Nh bGNFeHByZXNzaW9uTm9kZVBhcnNlcjo6cGFyc2VWYWx1ZU11bHRpcGxpY2F0aXZlRXhwcmVzc2lv bihDU1NQYXJzZXJUb2tlblJhbmdlJiB0b2tlbnMsIGludCBkZXB0aCwgVmFsdWUqIHJlc3VsdCkK K2Jvb2wgQ1NTQ2FsY0V4cHJlc3Npb25Ob2RlUGFyc2VyOjpwYXJzZVZhbHVlTXVsdGlwbGljYXRp dmVFeHByZXNzaW9uKENTU1BhcnNlclRva2VuUmFuZ2UmIHRva2VucywgaW50IGRlcHRoLCBSZWZQ dHI8Q1NTQ2FsY0V4cHJlc3Npb25Ob2RlPiYgcmVzdWx0KQogewogICAgIGlmIChjaGVja0RlcHRo QW5kSW5kZXgoJmRlcHRoLCB0b2tlbnMpICE9IE9LKQogICAgICAgICByZXR1cm4gZmFsc2U7CkBA IC04NjIsMjAgKzg2MCwyMCBAQCBib29sIENTU0NhbGNFeHByZXNzaW9uTm9kZVBhcnNlcjo6cGFy c2VWYWx1ZU11bHRpcGxpY2F0aXZlRXhwcmVzc2lvbihDU1NQYXJzZXJUbwogICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgIHRva2Vucy5jb25zdW1lSW5jbHVkaW5nV2hpdGVzcGFjZSgpOwogICAg ICAgICAKLSAgICAgICAgVmFsdWUgcmhzOwotICAgICAgICBpZiAoIXBhcnNlVmFsdWVUZXJtKHRv a2VucywgZGVwdGgsICZyaHMpKQorICAgICAgICBSZWZQdHI8Q1NTQ2FsY0V4cHJlc3Npb25Ob2Rl PiByaHM7CisgICAgICAgIGlmICghcGFyc2VWYWx1ZVRlcm0odG9rZW5zLCBkZXB0aCwgcmhzKSkK ICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgCi0gICAgICAgIHJlc3VsdC0+dmFs dWUgPSBDU1NDYWxjT3BlcmF0aW9uTm9kZTo6Y3JlYXRlU2ltcGxpZmllZChzdGF0aWNfY2FzdDxD YWxjT3BlcmF0b3I+KG9wZXJhdG9yQ2hhcmFjdGVyKSwgV1RGTW92ZShyZXN1bHQtPnZhbHVlKSwg V1RGTW92ZShyaHMudmFsdWUpKTsKKyAgICAgICAgcmVzdWx0ID0gQ1NTQ2FsY09wZXJhdGlvbk5v ZGU6OmNyZWF0ZVNpbXBsaWZpZWQoc3RhdGljX2Nhc3Q8Q2FsY09wZXJhdG9yPihvcGVyYXRvckNo YXJhY3RlciksIFdURk1vdmUocmVzdWx0KSwgV1RGTW92ZShyaHMpKTsKIAotICAgICAgICBpZiAo IXJlc3VsdC0+dmFsdWUpCisgICAgICAgIGlmICghcmVzdWx0KQogICAgICAgICAgICAgcmV0dXJu IGZhbHNlOwogICAgIH0KICAgICAKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCBDU1NDYWxj RXhwcmVzc2lvbk5vZGVQYXJzZXI6OnBhcnNlQWRkaXRpdmVWYWx1ZUV4cHJlc3Npb24oQ1NTUGFy c2VyVG9rZW5SYW5nZSYgdG9rZW5zLCBpbnQgZGVwdGgsIFZhbHVlKiByZXN1bHQpCitib29sIENT U0NhbGNFeHByZXNzaW9uTm9kZVBhcnNlcjo6cGFyc2VBZGRpdGl2ZVZhbHVlRXhwcmVzc2lvbihD U1NQYXJzZXJUb2tlblJhbmdlJiB0b2tlbnMsIGludCBkZXB0aCwgUmVmUHRyPENTU0NhbGNFeHBy ZXNzaW9uTm9kZT4mIHJlc3VsdCkKIHsKICAgICBpZiAoY2hlY2tEZXB0aEFuZEluZGV4KCZkZXB0 aCwgdG9rZW5zKSAhPSBPSykKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAtODk0LDMxICs4OTIs MzEgQEAgYm9vbCBDU1NDYWxjRXhwcmVzc2lvbk5vZGVQYXJzZXI6OnBhcnNlQWRkaXRpdmVWYWx1 ZUV4cHJlc3Npb24oQ1NTUGFyc2VyVG9rZW5SYW4KICAgICAgICAgICAgIHJldHVybiBmYWxzZTsg Ly8gY2FsYygxcHggKzJweCkgaXMgaW52YWxpZAogICAgICAgICB0b2tlbnMuY29uc3VtZUluY2x1 ZGluZ1doaXRlc3BhY2UoKTsKICAgICAgICAgCi0gICAgICAgIFZhbHVlIHJoczsKLSAgICAgICAg aWYgKCFwYXJzZVZhbHVlTXVsdGlwbGljYXRpdmVFeHByZXNzaW9uKHRva2VucywgZGVwdGgsICZy aHMpKQorICAgICAgICBSZWZQdHI8Q1NTQ2FsY0V4cHJlc3Npb25Ob2RlPiByaHM7CisgICAgICAg IGlmICghcGFyc2VWYWx1ZU11bHRpcGxpY2F0aXZlRXhwcmVzc2lvbih0b2tlbnMsIGRlcHRoLCBy aHMpKQogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAKLSAgICAgICAgcmVzdWx0 LT52YWx1ZSA9IENTU0NhbGNPcGVyYXRpb25Ob2RlOjpjcmVhdGVTaW1wbGlmaWVkKHN0YXRpY19j YXN0PENhbGNPcGVyYXRvcj4ob3BlcmF0b3JDaGFyYWN0ZXIpLCBXVEZNb3ZlKHJlc3VsdC0+dmFs dWUpLCBXVEZNb3ZlKHJocy52YWx1ZSkpOwotICAgICAgICBpZiAoIXJlc3VsdC0+dmFsdWUpCisg ICAgICAgIHJlc3VsdCA9IENTU0NhbGNPcGVyYXRpb25Ob2RlOjpjcmVhdGVTaW1wbGlmaWVkKHN0 YXRpY19jYXN0PENhbGNPcGVyYXRvcj4ob3BlcmF0b3JDaGFyYWN0ZXIpLCBXVEZNb3ZlKHJlc3Vs dCksIFdURk1vdmUocmhzKSk7CisgICAgICAgIGlmICghcmVzdWx0KQogICAgICAgICAgICAgcmV0 dXJuIGZhbHNlOwogICAgIH0KICAgICAKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotYm9vbCBDU1ND YWxjRXhwcmVzc2lvbk5vZGVQYXJzZXI6OnBhcnNlTWluTWF4RXhwcmVzc2lvbihDU1NQYXJzZXJU b2tlblJhbmdlJiB0b2tlbnMsIENTU1ZhbHVlSUQgbWluTWF4RnVuY3Rpb24sIGludCBkZXB0aCwg VmFsdWUqIHJlc3VsdCkKK2Jvb2wgQ1NTQ2FsY0V4cHJlc3Npb25Ob2RlUGFyc2VyOjpwYXJzZU1p bk1heEV4cHJlc3Npb24oQ1NTUGFyc2VyVG9rZW5SYW5nZSYgdG9rZW5zLCBDU1NWYWx1ZUlEIG1p bk1heEZ1bmN0aW9uLCBpbnQgZGVwdGgsIFJlZlB0cjxDU1NDYWxjRXhwcmVzc2lvbk5vZGU+JiBy ZXN1bHQpCiB7CiAgICAgaWYgKGNoZWNrRGVwdGhBbmRJbmRleCgmZGVwdGgsIHRva2VucykgIT0g T0spCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIENhbGNPcGVyYXRvciBvcCA9IChtaW5N YXhGdW5jdGlvbiA9PSBDU1NWYWx1ZU1pbikgPyBDYWxjT3BlcmF0b3I6Ok1pbiA6IENhbGNPcGVy YXRvcjo6TWF4OwogCi0gICAgVmFsdWUgdmFsdWU7Ci0gICAgaWYgKCFwYXJzZVZhbHVlRXhwcmVz c2lvbih0b2tlbnMsIGRlcHRoLCAmdmFsdWUpKQorICAgIFJlZlB0cjxDU1NDYWxjRXhwcmVzc2lv bk5vZGU+IHZhbHVlOworICAgIGlmICghcGFyc2VWYWx1ZUV4cHJlc3Npb24odG9rZW5zLCBkZXB0 aCwgdmFsdWUpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKICAgICBWZWN0b3I8UmVmPENTU0Nh bGNFeHByZXNzaW9uTm9kZT4+IG5vZGVzOwotICAgIG5vZGVzLmFwcGVuZCh2YWx1ZS52YWx1ZS5y ZWxlYXNlTm9uTnVsbCgpKTsKKyAgICBub2Rlcy5hcHBlbmQodmFsdWUucmVsZWFzZU5vbk51bGwo KSk7CiAKICAgICB3aGlsZSAoIXRva2Vucy5hdEVuZCgpKSB7CiAgICAgICAgIHRva2Vucy5jb25z dW1lV2hpdGVzcGFjZSgpOwpAQCAtOTI2LDE3ICs5MjQsMTcgQEAgYm9vbCBDU1NDYWxjRXhwcmVz c2lvbk5vZGVQYXJzZXI6OnBhcnNlTWluTWF4RXhwcmVzc2lvbihDU1NQYXJzZXJUb2tlblJhbmdl JiB0b2sKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgdG9rZW5zLmNvbnN1bWVX aGl0ZXNwYWNlKCk7CiAKLSAgICAgICAgaWYgKCFwYXJzZVZhbHVlRXhwcmVzc2lvbih0b2tlbnMs IGRlcHRoLCAmdmFsdWUpKQorICAgICAgICBpZiAoIXBhcnNlVmFsdWVFeHByZXNzaW9uKHRva2Vu cywgZGVwdGgsIHZhbHVlKSkKICAgICAgICAgICAgIHJldHVybiBmYWxzZTsKIAotICAgICAgICBu b2Rlcy5hcHBlbmQodmFsdWUudmFsdWUucmVsZWFzZU5vbk51bGwoKSk7CisgICAgICAgIG5vZGVz LmFwcGVuZCh2YWx1ZS5yZWxlYXNlTm9uTnVsbCgpKTsKICAgICB9CiAKLSAgICByZXN1bHQtPnZh bHVlID0gQ1NTQ2FsY09wZXJhdGlvbk5vZGU6OmNyZWF0ZU1pbk9yTWF4KG9wLCBXVEZNb3ZlKG5v ZGVzKSwgbV9kZXN0aW5hdGlvbkNhdGVnb3J5KTsKLSAgICByZXR1cm4gcmVzdWx0LT52YWx1ZTsK KyAgICByZXN1bHQgPSBDU1NDYWxjT3BlcmF0aW9uTm9kZTo6Y3JlYXRlTWluT3JNYXgob3AsIFdU Rk1vdmUobm9kZXMpLCBtX2Rlc3RpbmF0aW9uQ2F0ZWdvcnkpOworICAgIHJldHVybiByZXN1bHQ7 CiB9CiAKLWJvb2wgQ1NTQ2FsY0V4cHJlc3Npb25Ob2RlUGFyc2VyOjpwYXJzZVZhbHVlRXhwcmVz c2lvbihDU1NQYXJzZXJUb2tlblJhbmdlJiB0b2tlbnMsIGludCBkZXB0aCwgVmFsdWUqIHJlc3Vs dCkKK2Jvb2wgQ1NTQ2FsY0V4cHJlc3Npb25Ob2RlUGFyc2VyOjpwYXJzZVZhbHVlRXhwcmVzc2lv bihDU1NQYXJzZXJUb2tlblJhbmdlJiB0b2tlbnMsIGludCBkZXB0aCwgUmVmUHRyPENTU0NhbGNF eHByZXNzaW9uTm9kZT4mIHJlc3VsdCkKIHsKICAgICByZXR1cm4gcGFyc2VBZGRpdGl2ZVZhbHVl RXhwcmVzc2lvbih0b2tlbnMsIGRlcHRoLCByZXN1bHQpOwogfQo=