185418 2018-05-08 03:48:37 -0700 [Win][MiniBrowser] Move WK1 related code into MiniBrowser 2018-05-11 10:38:52 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 185460 184770 1 fujii fujii achristensen bfulgham commit-queue don.olmstead lforschler pvollan webkit-bug-importer oldest_to_newest 1421678 0 fujii 2018-05-08 03:48:37 -0700 [Win][MiniBrowser] Move WK1 related code into MiniBrowser This is a sub task of Bug 184770. All WK1 related code should be moved into MiniBrowser. 1423011 1 340163 fujii 2018-05-10 20:38:36 -0700 Created attachment 340163 Patch 1423172 2 340163 commit-queue 2018-05-11 10:37:09 -0700 Comment on attachment 340163 Patch Clearing flags on attachment: 340163 Committed r231707: <https://trac.webkit.org/changeset/231707> 1423173 3 commit-queue 2018-05-11 10:37:11 -0700 All reviewed patches have been landed. Closing bug. 1423174 4 webkit-bug-importer 2018-05-11 10:38:52 -0700 <rdar://problem/40167072> 340163 2018-05-10 20:38:36 -0700 2018-05-11 10:37:09 -0700 Patch bug-185418-20180511123835.patch text/plain 11161 fujii U3VidmVyc2lvbiBSZXZpc2lvbjogMjMxNjg0CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTE2OGZlYzc5YjRhYWIxZGZjZDAzN2QxZWVlMWU4ZTBk MmUwYzIyMi4uNDYyZTk1ZTg5Njg0NDY2OTZiZjUyOGYyM2I2NGVkMGUxZmRmZGE4NiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4 IEBACisyMDE4LTA1LTEwICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29t PgorCisgICAgICAgIFtXaW5dW01pbmlCcm93c2VyXSBNb3ZlIFdLMSByZWxhdGVkIGNvZGUgaW50 byBNaW5pQnJvd3NlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTg1NDE4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQWxsIFdLMSByZWxhdGVkIGNvZGUgc2hvdWxkIGJlIG1vdmVkIGludG8gTWluaUJyb3dz ZXIgZm9yIHRoZSBwcmVwYXJhdGlvbgorICAgICAgICBvZiBCdWcgMTg0NzcwLgorCisgICAgICAg IFRoaXMgY2hhbmdlIG1vdmVzIHRoZSBpbml0aWxpemF0aW9uIGNvZGUgb2YgTWluaUJyb3dzZSBp bnRvIE1pbmlCcm93c2VyOjppbml0KCkuCisKKyAgICAgICAgKiBNaW5pQnJvd3Nlci93aW4vQ29t bW9uLmNwcDoKKyAgICAgICAgKGdldEFwcERhdGFGb2xkZXIpOiBSZW1vdmVkIGBzdGF0aWNgIGtl eXdvcmQgdG8gYmUgY2FsbGVkIGZyb20gTWluaUJyb3dzZXIuY3BwLgorICAgICAgICAoc2V0Q2Fj aGVGb2xkZXIpOiBUaGlzIGlzIG9ubHkgZm9yIFdLMS4gTW92ZWQgaW50byBNaW5pQnJvd3Nlci5j cHAuCisgICAgICAgICogTWluaUJyb3dzZXIvd2luL0NvbW1vbi5oOiBBZGRlZC4KKyAgICAgICAg KiBNaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXIuY3BwOgorICAgICAgICAoTWluaUJyb3dzZXI6 OmluaXQpOiBNb3ZlZCB0aGUgaW5pdGlsaXphdGlvbiBjb2RlIGZyb20gd1dpbk1haW4uCisgICAg ICAgIChNaW5pQnJvd3Nlcjo6c2V0Q2FjaGVGb2xkZXIpOiBNb3ZlZCBmcm9tIENvbW1vbi5jcHAg YW5kIG1hZGUgaXQgYSBtZXRob2QuCisgICAgICAgICogTWluaUJyb3dzZXIvd2luL01pbmlCcm93 c2VyLmg6CisgICAgICAgIChNaW5pQnJvd3Nlcjo6c2V0Q2FjaGVGb2xkZXIpOiBDaGFuZ2VkIHRv IGEgcHJpdmF0ZSBtZXRob2QuCisgICAgICAgIChNaW5pQnJvd3Nlcjo6c3ViY2xhc3NGb3JMYXll cmVkV2luZG93KTogQ2hhbmdlZCB0byBhIHByaXZhdGUgbWV0aG9kLgorICAgICAgICAqIE1pbmlC cm93c2VyL3dpbi9XaW5NYWluLmNwcDoKKyAgICAgICAgKHdXaW5NYWluKTogTW92ZWQgTWluaUJy b3dzZSBpbml0aWxpemF0aW9uIGNvZGUgaW50byBNaW5pQnJvd3Nlci5jcHAuCisKIDIwMTgtMDUt MTAgIEpvbmF0aGFuIEJlZGFyZCAgPGpiZWRhcmRAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JF U1NJT04gKHIyMzA5OTgpOiBDYW5ub3Qgc3RyZWFtIEFQSSB0ZXN0IG91dHB1dApkaWZmIC0tZ2l0 IGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL0NvbW1vbi5jcHAgYi9Ub29scy9NaW5pQnJvd3Nlci93 aW4vQ29tbW9uLmNwcAppbmRleCA0YmM0MWI5NmJiMDBhMDYzNWFiOGY3M2M2YTE4ZWMzNDBkMmI1 OWY1Li42N2YyMzgzOTBlODYwMjU0ODllYTcwOWNjZmEwYjJjM2NmMzBmODJlIDEwMDY0NAotLS0g YS9Ub29scy9NaW5pQnJvd3Nlci93aW4vQ29tbW9uLmNwcAorKysgYi9Ub29scy9NaW5pQnJvd3Nl ci93aW4vQ29tbW9uLmNwcApAQCAtMjYsMTEgKzI2LDcgQEAKICAqIE9GIFRISVMgU09GVFdBUkUs IEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuIAogICov CiAKLSNpbmNsdWRlICJBY2Nlc3NpYmlsaXR5RGVsZWdhdGUuaCIKICNpbmNsdWRlICJET01EZWZh dWx0SW1wbC5oIgotI2luY2x1ZGUgIlByaW50V2ViVUlEZWxlZ2F0ZS5oIgotI2luY2x1ZGUgIlJl c291cmNlTG9hZERlbGVnYXRlLmgiCi0jaW5jbHVkZSAiV2ViRG93bmxvYWREZWxlZ2F0ZS5oIgog I2luY2x1ZGUgIk1pbmlCcm93c2VyLmgiCiAjaW5jbHVkZSAiTWluaUJyb3dzZXJSZXBsYWNlLmgi CiAjaW5jbHVkZSA8V2ViS2l0TGVnYWN5L1dlYktpdENPTUFQSS5oPgpAQCAtMTU0LDcgKzE1MCw3 IEBAIEJPT0wgV0lOQVBJIERsbE1haW4oSElOU1RBTkNFIGRsbEluc3RhbmNlLCBEV09SRCByZWFz b24sIExQVk9JRCkKICAgICByZXR1cm4gVFJVRTsKIH0KIAotc3RhdGljIGJvb2wgZ2V0QXBwRGF0 YUZvbGRlcihfYnN0cl90JiBkaXJlY3RvcnkpCitib29sIGdldEFwcERhdGFGb2xkZXIoX2JzdHJf dCYgZGlyZWN0b3J5KQogewogICAgIHdjaGFyX3QgYXBwRGF0YURpcmVjdG9yeVtNQVhfUEFUSF07 CiAgICAgaWYgKEZBSUxFRChTSEdldEZvbGRlclBhdGhXKDAsIENTSURMX0xPQ0FMX0FQUERBVEEg fCBDU0lETF9GTEFHX0NSRUFURSwgMCwgMCwgYXBwRGF0YURpcmVjdG9yeSkpKQpAQCAtMTcxLDIy ICsxNjcsNiBAQCBzdGF0aWMgYm9vbCBnZXRBcHBEYXRhRm9sZGVyKF9ic3RyX3QmIGRpcmVjdG9y eSkKICAgICByZXR1cm4gdHJ1ZTsKIH0KIAotc3RhdGljIGJvb2wgc2V0Q2FjaGVGb2xkZXIoKQot ewotICAgIElXZWJDYWNoZVB0ciB3ZWJDYWNoZSA9IGdNaW5pQnJvd3Nlci0+d2ViQ2FjaGUoKTsK LSAgICBpZiAoIXdlYkNhY2hlKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBfYnN0cl90 IGFwcERhdGFGb2xkZXI7Ci0gICAgaWYgKCFnZXRBcHBEYXRhRm9sZGVyKGFwcERhdGFGb2xkZXIp KQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KLSAgICBhcHBEYXRhRm9sZGVyICs9IEwiXFxjYWNo ZSI7Ci0gICAgd2ViQ2FjaGUtPnNldENhY2hlRm9sZGVyKGFwcERhdGFGb2xkZXIpOwotCi0gICAg cmV0dXJuIHRydWU7Ci19Ci0KIHZvaWQgY3JlYXRlQ3Jhc2hSZXBvcnQoRVhDRVBUSU9OX1BPSU5U RVJTKiBleGNlcHRpb25Qb2ludGVycykKIHsKICAgICBfYnN0cl90IGRpcmVjdG9yeTsKZGlmZiAt LWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9Db21tb24uaCBiL1Rvb2xzL01pbmlCcm93c2Vy L3dpbi9Db21tb24uaApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi42MWE5MzU3MjEyOTA0MjRjODFjZGViNTllZWYyZjhm M2RiODg5NTE5Ci0tLSAvZGV2L251bGwKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL0NvbW1v bi5oCkBAIC0wLDAgKzEsMzEgQEAKKy8qCisgKiBDb3B5cmlnaHQgKEMpIDIwMTggU29ueSBJbnRl cmFjdGl2ZSBFbnRlcnRhaW5tZW50IEluYy4KKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNl IGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNh dGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9u cworICogYXJlIG1ldDoKKyAqIDEuIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0 IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBj b25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAyLiBSZWRpc3RyaWJ1 dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAor ICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBk aXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJp YWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJF IElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gYGBBUyBJUycnIEFORCBBTlkKKyAqIEVYUFJFU1Mg T1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhF CisgKiBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZP UiBBIFBBUlRJQ1VMQVIKKyAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuICBJTiBOTyBFVkVOVCBT SEFMTCBBUFBMRSBJTkMuIE9SCisgKiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElS RUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwKKyAqIEVYRU1QTEFSWSwgT1IgQ09O U0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKKyAqIFBS T0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBE QVRBLCBPUgorICogUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENB VVNFRCBBTkQgT04gQU5ZIFRIRU9SWQorICogT0YgTElBQklMSVRZLCBXSEVUSEVSIElOIENPTlRS QUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCisgKiAoSU5DTFVESU5HIE5FR0xJR0VOQ0Ug T1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyAqIE9GIFRI SVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBE QU1BR0UuCisgKi8KKworI3ByYWdtYSBvbmNlCisKK2Jvb2wgZ2V0QXBwRGF0YUZvbGRlcihfYnN0 cl90JiBkaXJlY3RvcnkpOworCitleHRlcm4gUE9JTlQgc193aW5kb3dQb3NpdGlvbjsKK2V4dGVy biBTSVpFIHNfd2luZG93U2l6ZTsKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9N aW5pQnJvd3Nlci5jcHAgYi9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXIuY3BwCmlu ZGV4IDM1ZGYyZDhiYjMzMzk5YTA5NDNkZWM1NDIzZWJmOWRmYzYyNTUwY2EuLjc0OWJmMDQ0YTVh Yzc1NDE5MzgyNjFlNWU5ZDU3MDBhOTcyNWRiMDYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93 c2VyL3dpbi9NaW5pQnJvd3Nlci5jcHAKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvd2luL01pbmlC cm93c2VyLmNwcApAQCAtMjksOSArMjksMTUgQEAKICNpbmNsdWRlICJzdGRhZnguaCIKICNpbmNs dWRlICJNaW5pQnJvd3Nlci5oIgogCisjaW5jbHVkZSAiQWNjZXNzaWJpbGl0eURlbGVnYXRlLmgi CisjaW5jbHVkZSAiQ29tbW9uLmgiCiAjaW5jbHVkZSAiRE9NRGVmYXVsdEltcGwuaCIKICNpbmNs dWRlICJNaW5pQnJvd3NlckxpYlJlc291cmNlLmgiCiAjaW5jbHVkZSAiTWluaUJyb3dzZXJSZXBs YWNlLmgiCisjaW5jbHVkZSAiTWluaUJyb3dzZXJXZWJIb3N0LmgiCisjaW5jbHVkZSAiUHJpbnRX ZWJVSURlbGVnYXRlLmgiCisjaW5jbHVkZSAiUmVzb3VyY2VMb2FkRGVsZWdhdGUuaCIKKyNpbmNs dWRlICJXZWJEb3dubG9hZERlbGVnYXRlLmgiCiAjaW5jbHVkZSA8V2ViS2l0TGVnYWN5L1dlYktp dENPTUFQSS5oPgogI2luY2x1ZGUgPHd0Zi9FeHBvcnRNYWNyb3MuaD4KICNpbmNsdWRlIDx3dGYv UGxhdGZvcm0uaD4KQEAgLTYzLDcgKzY5LDcgQEAgTWluaUJyb3dzZXI6Ok1pbmlCcm93c2VyKEhX TkQgbWFpblduZCwgSFdORCB1cmxCYXJXbmQsIGJvb2wgdXNlTGF5ZXJlZFdlYlZpZXcsIGIKIHsK IH0KIAotSFJFU1VMVCBNaW5pQnJvd3Nlcjo6aW5pdCgpCitIUkVTVUxUIE1pbmlCcm93c2VyOjpp bml0KF9ic3RyX3QmIHJlcXVlc3RlZFVSTCkKIHsKICAgICB1cGRhdGVEZXZpY2VTY2FsZUZhY3Rv cigpOwogCkBAIC04NCwxMCArOTAsNzMgQEAgSFJFU1VMVCBNaW5pQnJvd3Nlcjo6aW5pdCgpCiAg ICAgICAgIHJldHVybiBocjsKIAogICAgIGhyID0gV2ViS2l0Q3JlYXRlSW5zdGFuY2UoQ0xTSURf V2ViQ2FjaGUsIDAsIF9fdXVpZG9mKG1fd2ViQ2FjaGUpLCByZWludGVycHJldF9jYXN0PHZvaWQq Kj4oJm1fd2ViQ2FjaGUuR2V0SW50ZXJmYWNlUHRyKCkpKTsKKyAgICBpZiAoRkFJTEVEKGhyKSkK KyAgICAgICAgcmV0dXJuIGhyOworCisgICAgaWYgKCFzZWVkSW5pdGlhbERlZmF1bHRQcmVmZXJl bmNlcygpKQorICAgICAgICByZXR1cm4gRV9GQUlMOworCisgICAgaWYgKCFzZXRUb0RlZmF1bHRQ cmVmZXJlbmNlcygpKQorICAgICAgICByZXR1cm4gRV9GQUlMOworCisgICAgaWYgKCFzZXRDYWNo ZUZvbGRlcigpKQorICAgICAgICByZXR1cm4gRV9GQUlMOworCisgICAgYXV0byB3ZWJIb3N0ID0g bmV3IE1pbmlCcm93c2VyV2ViSG9zdCh0aGlzLCBtX2hVUkxCYXJXbmQpOworCisgICAgaHIgPSBz ZXRGcmFtZUxvYWREZWxlZ2F0ZSh3ZWJIb3N0KTsKKyAgICBpZiAoRkFJTEVEKGhyKSkKKyAgICAg ICAgcmV0dXJuIGhyOworCisgICAgaHIgPSBzZXRGcmFtZUxvYWREZWxlZ2F0ZVByaXZhdGUod2Vi SG9zdCk7CisgICAgaWYgKEZBSUxFRChocikpCisgICAgICAgIHJldHVybiBocjsKKworICAgIGhy ID0gc2V0VUlEZWxlZ2F0ZShuZXcgUHJpbnRXZWJVSURlbGVnYXRlKCkpOworICAgIGlmIChGQUlM RUQgKGhyKSkKKyAgICAgICAgcmV0dXJuIGhyOworCisgICAgaHIgPSBzZXRBY2Nlc3NpYmlsaXR5 RGVsZWdhdGUobmV3IEFjY2Vzc2liaWxpdHlEZWxlZ2F0ZSgpKTsKKyAgICBpZiAoRkFJTEVEICho cikpCisgICAgICAgIHJldHVybiBocjsKKworICAgIGhyID0gc2V0UmVzb3VyY2VMb2FkRGVsZWdh dGUobmV3IFJlc291cmNlTG9hZERlbGVnYXRlKHRoaXMpKTsKKyAgICBpZiAoRkFJTEVEKGhyKSkK KyAgICAgICAgcmV0dXJuIGhyOworCisgICAgSVdlYkRvd25sb2FkRGVsZWdhdGVQdHIgZG93bmxv YWREZWxlZ2F0ZTsKKyAgICBkb3dubG9hZERlbGVnYXRlLkF0dGFjaChuZXcgV2ViRG93bmxvYWRE ZWxlZ2F0ZSgpKTsKKyAgICBociA9IHNldERvd25sb2FkRGVsZWdhdGUoZG93bmxvYWREZWxlZ2F0 ZSk7CisgICAgaWYgKEZBSUxFRChocikpCisgICAgICAgIHJldHVybiBocjsKKworICAgIFJFQ1Qg Y2xpZW50UmVjdDsKKyAgICA6OkdldENsaWVudFJlY3QobV9oTWFpblduZCwgJmNsaWVudFJlY3Qp OworICAgIGlmICh1c2VzTGF5ZXJlZFdlYlZpZXcoKSkKKyAgICAgICAgY2xpZW50UmVjdCA9IHsg c193aW5kb3dQb3NpdGlvbi54LCBzX3dpbmRvd1Bvc2l0aW9uLnksIHNfd2luZG93UG9zaXRpb24u eCArIHNfd2luZG93U2l6ZS5jeCwgc193aW5kb3dQb3NpdGlvbi55ICsgc193aW5kb3dTaXplLmN5 IH07CisKKyAgICBociA9IHByZXBhcmVWaWV3cyhtX2hNYWluV25kLCBjbGllbnRSZWN0LCByZXF1 ZXN0ZWRVUkwuR2V0QlNUUigpKTsKKyAgICBpZiAoRkFJTEVEKGhyKSkKKyAgICAgICAgcmV0dXJu IGhyOworCisgICAgaWYgKHVzZXNMYXllcmVkV2ViVmlldygpKQorICAgICAgICBzdWJjbGFzc0Zv ckxheWVyZWRXaW5kb3coKTsKIAogICAgIHJldHVybiBocjsKIH0KIAorYm9vbCBNaW5pQnJvd3Nl cjo6c2V0Q2FjaGVGb2xkZXIoKQoreworICAgIF9ic3RyX3QgYXBwRGF0YUZvbGRlcjsKKyAgICBp ZiAoIWdldEFwcERhdGFGb2xkZXIoYXBwRGF0YUZvbGRlcikpCisgICAgICAgIHJldHVybiBmYWxz ZTsKKworICAgIGFwcERhdGFGb2xkZXIgKz0gTCJcXGNhY2hlIjsKKyAgICB3ZWJDYWNoZSgpLT5z ZXRDYWNoZUZvbGRlcihhcHBEYXRhRm9sZGVyKTsKKworICAgIHJldHVybiB0cnVlOworfQorCiBI UkVTVUxUIE1pbmlCcm93c2VyOjpwcmVwYXJlVmlld3MoSFdORCBtYWluV25kLCBjb25zdCBSRUNU JiBjbGllbnRSZWN0LCBjb25zdCBCU1RSJiByZXF1ZXN0ZWRVUkwpCiB7CiAgICAgaWYgKCFtX3dl YlZpZXcpCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vTWluaUJyb3dzZXIuaCBi L1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3Nlci5oCmluZGV4IDQ1MGM4NjZjOTJlYjYz YzMzNzY4MWE2NDRlMmNmNGFlNDQwNWFkYTMuLjRlYjU4YzJiNDFkZDJlZjhjMWY1MTc3NGFlNWVi ODg2NDU1ZTc4YzYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3Nl ci5oCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL3dpbi9NaW5pQnJvd3Nlci5oCkBAIC00OSw3ICs0 OSw3IEBAIGNsYXNzIE1pbmlCcm93c2VyIHsKIHB1YmxpYzoKICAgICBNaW5pQnJvd3NlcihIV05E IG1haW5XbmQsIEhXTkQgdXJsQmFyV25kLCBib29sIHVzZUxheWVyZWRXZWJWaWV3ID0gZmFsc2Us IGJvb2wgcGFnZUxvYWRUZXN0aW5nID0gZmFsc2UpOwogCi0gICAgSFJFU1VMVCBpbml0KCk7Cisg ICAgSFJFU1VMVCBpbml0KF9ic3RyX3QmIHJlcXVlc3RlZFVSTCk7CiAgICAgSFJFU1VMVCBwcmVw YXJlVmlld3MoSFdORCBtYWluV25kLCBjb25zdCBSRUNUJiBjbGllbnRSZWN0LCBjb25zdCBCU1RS JiByZXF1ZXN0ZWRVUkwpOwogCiAgICAgSFJFU1VMVCBsb2FkVVJMKGNvbnN0IEJTVFImIHBhc3Nl ZFVSTCk7CkBAIC05OCwxMCArOTgsMTEgQEAgcHVibGljOgogCiAgICAgSEdESU9CSiB1cmxCYXJG b250KCkgeyByZXR1cm4gbV9oVVJMQmFyRm9udDsgfQogICAgIEhXTkQgaHduZCgpIHsgcmV0dXJu IG1fdmlld1duZDsgfQotICAgIHZvaWQgc3ViY2xhc3NGb3JMYXllcmVkV2luZG93KCk7CiAKIHBy aXZhdGU6CisgICAgdm9pZCBzdWJjbGFzc0ZvckxheWVyZWRXaW5kb3coKTsKICAgICB2b2lkIGdl bmVyYXRlRm9udEZvclNjYWxlRmFjdG9yKGZsb2F0KTsKKyAgICBib29sIHNldENhY2hlRm9sZGVy KCk7CiAKICAgICBzdGQ6OnZlY3RvcjxJV2ViSGlzdG9yeUl0ZW1QdHI+IG1faGlzdG9yeUl0ZW1z OwogCmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci93aW4vV2luTWFpbi5jcHAgYi9Ub29s cy9NaW5pQnJvd3Nlci93aW4vV2luTWFpbi5jcHAKaW5kZXggOGI4M2ExNzc3Y2Y1Y2E2ZWYzNTg0 ZjNjNjAxNWY2NTk3NmNjODRkYS4uMGM5YjlhMjUyNjhkMDg4MTVlMjBkZDdjZDcwZDU3MTU0ZThl YjdiMSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvd2luL1dpbk1haW4uY3BwCisrKyBi L1Rvb2xzL01pbmlCcm93c2VyL3dpbi9XaW5NYWluLmNwcApAQCAtMzAsNyArMzAsNiBAQAogCiAj aW5jbHVkZSAic3RkYWZ4LmgiCiAjaW5jbHVkZSAiTWluaUJyb3dzZXJMaWJSZXNvdXJjZS5oIgot I2luY2x1ZGUgIk1pbmlCcm93c2VyV2ViSG9zdC5oIgogI2luY2x1ZGUgIkNvbW1vbi5jcHAiCiAK IG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTEwMyw2OCArMTAyLDE1IEBAIGludCBXSU5BUEkgd1dp bk1haW4oX0luXyBISU5TVEFOQ0UgaEluc3RhbmNlLCBfSW5fb3B0XyBISU5TVEFOQ0UgaFByZXZJ bnN0YW5jZSwKIAogICAgIFNldEZvY3VzKGhVUkxCYXJXbmQpOwogCi0gICAgUkVDVCBjbGllbnRS ZWN0OwotICAgIDo6R2V0Q2xpZW50UmVjdChoTWFpblduZCwgJmNsaWVudFJlY3QpOwotCi0gICAg aWYgKHVzZXNMYXllcmVkV2ViVmlldykKLSAgICAgICAgY2xpZW50UmVjdCA9IHsgc193aW5kb3dQ b3NpdGlvbi54LCBzX3dpbmRvd1Bvc2l0aW9uLnksIHNfd2luZG93UG9zaXRpb24ueCArIHNfd2lu ZG93U2l6ZS5jeCwgc193aW5kb3dQb3NpdGlvbi55ICsgc193aW5kb3dTaXplLmN5IH07Ci0KLSAg ICBNaW5pQnJvd3NlcldlYkhvc3QqIHdlYkhvc3QgPSBudWxscHRyOwotCi0gICAgSVdlYkRvd25s b2FkRGVsZWdhdGVQdHIgZG93bmxvYWREZWxlZ2F0ZTsKLSAgICBkb3dubG9hZERlbGVnYXRlLkF0 dGFjaChuZXcgV2ViRG93bmxvYWREZWxlZ2F0ZSgpKTsKLQogICAgIGdNaW5pQnJvd3NlciA9IG5l dyBNaW5pQnJvd3NlcihoTWFpblduZCwgaFVSTEJhclduZCwgdXNlc0xheWVyZWRXZWJWaWV3LCBw YWdlTG9hZFRlc3RpbmcpOwogICAgIGlmICghZ01pbmlCcm93c2VyKQogICAgICAgICBnb3RvIGV4 aXQ7Ci0KLSAgICBpZiAoIWdNaW5pQnJvd3Nlci0+c2VlZEluaXRpYWxEZWZhdWx0UHJlZmVyZW5j ZXMoKSkKLSAgICAgICAgZ290byBleGl0OwotCi0gICAgaWYgKCFnTWluaUJyb3dzZXItPnNldFRv RGVmYXVsdFByZWZlcmVuY2VzKCkpCi0gICAgICAgIGdvdG8gZXhpdDsKLQotICAgIEhSRVNVTFQg aHIgPSBnTWluaUJyb3dzZXItPmluaXQoKTsKLSAgICBpZiAoRkFJTEVEKGhyKSkKLSAgICAgICAg Z290byBleGl0OwotCi0gICAgaWYgKCFzZXRDYWNoZUZvbGRlcigpKQotICAgICAgICBnb3RvIGV4 aXQ7Ci0KLSAgICB3ZWJIb3N0ID0gbmV3IE1pbmlCcm93c2VyV2ViSG9zdChnTWluaUJyb3dzZXIs IGhVUkxCYXJXbmQpOwotCi0gICAgaHIgPSBnTWluaUJyb3dzZXItPnNldEZyYW1lTG9hZERlbGVn YXRlKHdlYkhvc3QpOworICAgIEhSRVNVTFQgaHIgPSBnTWluaUJyb3dzZXItPmluaXQocmVxdWVz dGVkVVJMKTsKICAgICBpZiAoRkFJTEVEKGhyKSkKICAgICAgICAgZ290byBleGl0OwogCi0gICAg aHIgPSBnTWluaUJyb3dzZXItPnNldEZyYW1lTG9hZERlbGVnYXRlUHJpdmF0ZSh3ZWJIb3N0KTsK LSAgICBpZiAoRkFJTEVEKGhyKSkKLSAgICAgICAgZ290byBleGl0OwotCi0gICAgaHIgPSBnTWlu aUJyb3dzZXItPnNldFVJRGVsZWdhdGUobmV3IFByaW50V2ViVUlEZWxlZ2F0ZSgpKTsKLSAgICBp ZiAoRkFJTEVEIChocikpCi0gICAgICAgIGdvdG8gZXhpdDsKLQotICAgIGhyID0gZ01pbmlCcm93 c2VyLT5zZXRBY2Nlc3NpYmlsaXR5RGVsZWdhdGUobmV3IEFjY2Vzc2liaWxpdHlEZWxlZ2F0ZSgp KTsKLSAgICBpZiAoRkFJTEVEIChocikpCi0gICAgICAgIGdvdG8gZXhpdDsKLQotICAgIGhyID0g Z01pbmlCcm93c2VyLT5zZXRSZXNvdXJjZUxvYWREZWxlZ2F0ZShuZXcgUmVzb3VyY2VMb2FkRGVs ZWdhdGUoZ01pbmlCcm93c2VyKSk7Ci0gICAgaWYgKEZBSUxFRChocikpCi0gICAgICAgIGdvdG8g ZXhpdDsKLQotICAgIGhyID0gZ01pbmlCcm93c2VyLT5zZXREb3dubG9hZERlbGVnYXRlKGRvd25s b2FkRGVsZWdhdGUpOwotICAgIGlmIChGQUlMRUQoaHIpKQotICAgICAgICBnb3RvIGV4aXQ7Ci0K LSAgICBociA9IGdNaW5pQnJvd3Nlci0+cHJlcGFyZVZpZXdzKGhNYWluV25kLCBjbGllbnRSZWN0 LCByZXF1ZXN0ZWRVUkwuR2V0QlNUUigpKTsKLSAgICBpZiAoRkFJTEVEKGhyKSkKLSAgICAgICAg Z290byBleGl0OwogICAgIGdWaWV3V2luZG93ID0gZ01pbmlCcm93c2VyLT5od25kKCk7CiAKLSAg ICBpZiAoZ01pbmlCcm93c2VyLT51c2VzTGF5ZXJlZFdlYlZpZXcoKSkKLSAgICAgICAgZ01pbmlC cm93c2VyLT5zdWJjbGFzc0ZvckxheWVyZWRXaW5kb3coKTsKLQogICAgIHJlc2l6ZVN1YlZpZXdz KCk7CiAKICAgICBTaG93V2luZG93KGdWaWV3V2luZG93LCBuQ21kU2hvdyk7Cg==