60599 2011-05-10 17:45:12 -0700 CorrectionPanel sometimes hangs in dismissSoon(). 2011-05-11 16:16:23 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Mac (Intel) OS X 10.6 RESOLVED FIXED InRadar P2 Normal --- 1 jiapu.mail jiapu.mail ap commit-queue oldest_to_newest 401673 0 jiapu.mail 2011-05-10 17:45:12 -0700 It's likely due to CorrectionPanel::handleAcceptedReplacement() returns before dismissSoon() acquires lock, and m_resultForSynchronousDismissal is set to nil for some reason. In this case, dismissSoon() will indefinitely waiting on the condition. <rdar://problem/9313628> 402051 1 93134 jiapu.mail 2011-05-11 09:44:28 -0700 Created attachment 93134 Patch (v1) 402392 2 93134 commit-queue 2011-05-11 16:16:20 -0700 Comment on attachment 93134 Patch (v1) Clearing flags on attachment: 93134 Committed r86281: <http://trac.webkit.org/changeset/86281> 402393 3 commit-queue 2011-05-11 16:16:23 -0700 All reviewed patches have been landed. Closing bug. 93134 2011-05-11 09:44:28 -0700 2011-05-11 16:16:20 -0700 Patch (v1) bug-60599-20110511094427.patch text/plain 9284 jiapu.mail U3VidmVyc2lvbiBSZXZpc2lvbjogODYyMzQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFj L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZwppbmRleCAwMmExZTY4Y2Q5 ZTg1ZWM3MjEzYWExZTExMjA4Yjc4N2U3NmZjNjAzLi4wMzRhZTQwODQyYjA1ODE3ZWIzYjlhNWU5 NWQxMjhiY2VhYmU3ODFjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMTEt MDUtMTEgIEppYSBQdSAgPGpwdUBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgQ29ycmVjdGlvblBhbmVsIHNvbWV0aW1lcyBoYW5ncyBp biBkaXNtaXNzU29vbigpLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9NjA1OTkKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzkzMTM2Mjg+CisKKyAgICAg ICAgTWFrZSBzdXJlIGRpc21pc3NTb29uKCkgd29uJ3Qgd2FpdCBpbmRlZmluaXRlbHkgaWYgaGFu ZGxlQWNjZXB0ZWRSZXBsYWNlbWVudCgpIHNldHMgbV9yZXN1bHRGb3JTeW5jaHJvbm91c0Rpc21p c3NhbAorICAgICAgICB0byBuaWwuIEFkZGVkIGEgZGVzaWduYXRlZCB2YXJpYWJsZSBtX2lzRGlz bWlzc2luZywgaW5zdGVhZCBvZiBwaWdneS1iYWNraW5nIG1fcmVzdWx0Rm9yU3luY2hyb25vdXNE aXNtaXNzYWwsCisgICAgICAgIGZvciBjb25kaXRpb24gY2hlY2tpbmcuCisKKyAgICAgICAgKiBX ZWJDb3JlU3VwcG9ydC9Db3JyZWN0aW9uUGFuZWwuaDoKKyAgICAgICAgKiBXZWJDb3JlU3VwcG9y dC9Db3JyZWN0aW9uUGFuZWwubW06CisgICAgICAgIChDb3JyZWN0aW9uUGFuZWw6OkNvcnJlY3Rp b25QYW5lbCk6CisgICAgICAgIChDb3JyZWN0aW9uUGFuZWw6OnNob3cpOgorICAgICAgICAoQ29y cmVjdGlvblBhbmVsOjpkaXNtaXNzU29vbik6CisgICAgICAgIChDb3JyZWN0aW9uUGFuZWw6OmRp c21pc3NJbnRlcm5hbCk6CisgICAgICAgIChDb3JyZWN0aW9uUGFuZWw6OmhhbmRsZUFjY2VwdGVk UmVwbGFjZW1lbnQpOgorCiAyMDExLTA1LTEwICBBbnRvbiBEJ0F1cmlhICA8YWRhdXJpYUBhcHBs ZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgRGF2aWQgTGV2aW4uCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9Db3JyZWN0aW9uUGFuZWwuaCBiL1NvdXJj ZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBwb3J0L0NvcnJlY3Rpb25QYW5lbC5oCmluZGV4IGJhMWY3 Yzk0NDEyN2E1NGY1MDc5ZGYwNmE4ZjNlMTJkZDgwNzg1YzEuLjcxZTIwNzIxODU3OWQ3NTM0M2E0 MzMyZmFmNWFmZGZhMDI5M2MxNzggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNv cmVTdXBwb3J0L0NvcnJlY3Rpb25QYW5lbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNv cmVTdXBwb3J0L0NvcnJlY3Rpb25QYW5lbC5oCkBAIC01Myw2ICs1Myw3IEBAIHByaXZhdGU6CiAg ICAgUmV0YWluUHRyPFdlYlZpZXc+IG1fdmlldzsKICAgICBSZXRhaW5QdHI8TlNTdHJpbmc+IG1f cmVzdWx0Rm9yU3luY2hyb25vdXNEaXNtaXNzYWw7CiAgICAgUmV0YWluUHRyPE5TQ29uZGl0aW9u PiBtX3Jlc3VsdENvbmRpdGlvbjsKKyAgICBib29sIG1faXNEaXNtaXNzaW5nOwogfTsKIAogI2Vu ZGlmIC8vICFkZWZpbmVkKEJVSUxESU5HX09OX0xFT1BBUkQpICYmICFkZWZpbmVkKEJVSUxESU5H X09OX1NOT1dfTEVPUEFSRCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVT dXBwb3J0L0NvcnJlY3Rpb25QYW5lbC5tbSBiL1NvdXJjZS9XZWJLaXQvbWFjL1dlYkNvcmVTdXBw b3J0L0NvcnJlY3Rpb25QYW5lbC5tbQppbmRleCBiNjRiMWEwMjNlMzE0M2FhNzI0NGRiMjRmN2I0 MmNhMjNhMmE5OTEzLi4zNDgzMDNjZDE4NTgxNGFjZDNjMmYwOTE2OTYyNDk0ZDJlNTJiNWJiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L21hYy9XZWJDb3JlU3VwcG9ydC9Db3JyZWN0aW9uUGFu ZWwubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvV2ViQ29yZVN1cHBvcnQvQ29ycmVjdGlvblBh bmVsLm1tCkBAIC00Nyw2ICs0Nyw3IEBAIENvcnJlY3Rpb25QYW5lbDo6Q29ycmVjdGlvblBhbmVs KCkKICAgICA6IG1fd2FzRGlzbWlzc2VkRXh0ZXJuYWxseShmYWxzZSkKICAgICAsIG1fcmVhc29u Rm9yRGlzbWlzc2luZyhSZWFzb25Gb3JEaXNtaXNzaW5nQ29ycmVjdGlvblBhbmVsSWdub3JlZCkK ICAgICAsIG1fcmVzdWx0Q29uZGl0aW9uKEFkb3B0TlMsIFtbTlNDb25kaXRpb24gYWxsb2NdIGlu aXRdKQorICAgICwgbV9pc0Rpc21pc3NpbmcoZmFsc2UpCiB7CiB9CiAKQEAgLTc4LDYgKzc5LDcg QEAgdm9pZCBDb3JyZWN0aW9uUGFuZWw6OnNob3coV2ViVmlldyogdmlldywgQ29ycmVjdGlvblBh bmVsSW5mbzo6UGFuZWxUeXBlIHR5cGUsIGMKICAgICBbW05TU3BlbGxDaGVja2VyIHNoYXJlZFNw ZWxsQ2hlY2tlcl0gc2hvd0NvcnJlY3Rpb25JbmRpY2F0b3JPZlR5cGU6aW5kaWNhdG9yVHlwZSBw cmltYXJ5U3RyaW5nOnJlcGxhY2VtZW50U3RyaW5nQXNOU1N0cmluZyBhbHRlcm5hdGl2ZVN0cmlu Z3M6YWx0ZXJuYXRpdmVTdHJpbmdzIGZvclN0cmluZ0luUmVjdDpbdmlldyBjb252ZXJ0UmVjdDpi b3VuZGluZ0JveE9mUmVwbGFjZWRTdHJpbmcgZnJvbVZpZXc6bmlsXSB2aWV3Om1fdmlldy5nZXQo KSBjb21wbGV0aW9uSGFuZGxlcjpeKE5TU3RyaW5nKiBhY2NlcHRlZFN0cmluZykgewogICAgICAg ICBoYW5kbGVBY2NlcHRlZFJlcGxhY2VtZW50KGFjY2VwdGVkU3RyaW5nLCByZXBsYWNlZFN0cmlu Z0FzTlNTdHJpbmcsIHJlcGxhY2VtZW50U3RyaW5nQXNOU1N0cmluZywgaW5kaWNhdG9yVHlwZSk7 CiAgICAgfV07CisgICAgbV9pc0Rpc21pc3NpbmcgPSBmYWxzZTsKIH0KIAogdm9pZCBDb3JyZWN0 aW9uUGFuZWw6OmRpc21pc3MoUmVhc29uRm9yRGlzbWlzc2luZ0NvcnJlY3Rpb25QYW5lbCByZWFz b24pCkBAIC04NywxMiArODksOSBAQCB2b2lkIENvcnJlY3Rpb25QYW5lbDo6ZGlzbWlzcyhSZWFz b25Gb3JEaXNtaXNzaW5nQ29ycmVjdGlvblBhbmVsIHJlYXNvbikKIAogU3RyaW5nIENvcnJlY3Rp b25QYW5lbDo6ZGlzbWlzc1Nvb24oUmVhc29uRm9yRGlzbWlzc2luZ0NvcnJlY3Rpb25QYW5lbCBy ZWFzb24pCiB7Ci0gICAgaWYgKCFpc1Nob3dpbmcoKSkKLSAgICAgICAgcmV0dXJuIFN0cmluZygp OwotCiAgICAgZGlzbWlzc0ludGVybmFsKHJlYXNvbiwgdHJ1ZSk7CiAgICAgW21fcmVzdWx0Q29u ZGl0aW9uLmdldCgpIGxvY2tdOwotICAgIHdoaWxlICghbV9yZXN1bHRGb3JTeW5jaHJvbm91c0Rp c21pc3NhbCkKKyAgICB3aGlsZSAobV9pc0Rpc21pc3NpbmcpCiAgICAgICAgIFttX3Jlc3VsdENv bmRpdGlvbi5nZXQoKSB3YWl0XTsKICAgICBbbV9yZXN1bHRDb25kaXRpb24uZ2V0KCkgdW5sb2Nr XTsKICAgICByZXR1cm4gbV9yZXN1bHRGb3JTeW5jaHJvbm91c0Rpc21pc3NhbC5nZXQoKTsKQEAg LTEwMCwxMCArOTksMTEgQEAgU3RyaW5nIENvcnJlY3Rpb25QYW5lbDo6ZGlzbWlzc1Nvb24oUmVh c29uRm9yRGlzbWlzc2luZ0NvcnJlY3Rpb25QYW5lbCByZWFzb24pCiAKIHZvaWQgQ29ycmVjdGlv blBhbmVsOjpkaXNtaXNzSW50ZXJuYWwoUmVhc29uRm9yRGlzbWlzc2luZ0NvcnJlY3Rpb25QYW5l bCByZWFzb24sIGJvb2wgZGlzbWlzc2luZ0V4dGVybmFsbHkpCiB7Ci0gICAgbV93YXNEaXNtaXNz ZWRFeHRlcm5hbGx5ID0gZGlzbWlzc2luZ0V4dGVybmFsbHk7CiAgICAgaWYgKCFpc1Nob3dpbmco KSkKICAgICAgICAgcmV0dXJuOwotICAgIAorICAgICAgICAKKyAgICBtX2lzRGlzbWlzc2luZyA9 IHRydWU7CisgICAgbV93YXNEaXNtaXNzZWRFeHRlcm5hbGx5ID0gZGlzbWlzc2luZ0V4dGVybmFs bHk7CiAgICAgbV9yZWFzb25Gb3JEaXNtaXNzaW5nID0gcmVhc29uOwogICAgIG1fcmVzdWx0Rm9y U3luY2hyb25vdXNEaXNtaXNzYWwuY2xlYXIoKTsKICAgICBbW05TU3BlbGxDaGVja2VyIHNoYXJl ZFNwZWxsQ2hlY2tlcl0gZGlzbWlzc0NvcnJlY3Rpb25JbmRpY2F0b3JGb3JWaWV3Om1fdmlldy5n ZXQoKV07CkBAIC0xNDEsMTQgKzE0MSwxMyBAQCB2b2lkIENvcnJlY3Rpb25QYW5lbDo6aGFuZGxl QWNjZXB0ZWRSZXBsYWNlbWVudChOU1N0cmluZyogYWNjZXB0ZWRSZXBsYWNlbWVudCwgTgogICAg ICAgICBicmVhazsKICAgICB9CiAgICAgCi0gICAgaWYgKCFtX3dhc0Rpc21pc3NlZEV4dGVybmFs bHkpIHsKKyAgICBpZiAoIW1fd2FzRGlzbWlzc2VkRXh0ZXJuYWxseSkKICAgICAgICAgW21fdmll dy5nZXQoKSBoYW5kbGVDb3JyZWN0aW9uUGFuZWxSZXN1bHQ6YWNjZXB0ZWRSZXBsYWNlbWVudF07 Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0gICAgCi0gICAgW21fcmVzdWx0Q29uZGl0aW9uLmdl dCgpIGxvY2tdOwogICAgIGlmIChhY2NlcHRlZFJlcGxhY2VtZW50KQogICAgICAgICBtX3Jlc3Vs dEZvclN5bmNocm9ub3VzRGlzbWlzc2FsLmFkb3B0TlMoW2FjY2VwdGVkUmVwbGFjZW1lbnQgY29w eV0pOworICAgIAorICAgIFttX3Jlc3VsdENvbmRpdGlvbi5nZXQoKSBsb2NrXTsKKyAgICBtX2lz RGlzbWlzc2luZyA9IGZhbHNlOwogICAgIFttX3Jlc3VsdENvbmRpdGlvbi5nZXQoKSBzaWduYWxd OwogICAgIFttX3Jlc3VsdENvbmRpdGlvbi5nZXQoKSB1bmxvY2tdOwogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4 IDgyM2IzYTAwNmNiY2Y0NTE0NmU1NWNhZDBkMzkxMTU4ZGQ0MmVmYmQuLjcyMmJlY2QyNzg0Nzhl ZDQ0NGM4OTg1OWQ1MmZlNWMxYWJkYTkxZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMyBAQAor MjAxMS0wNS0xMSAgSmlhIFB1ICA8anB1QGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb3JyZWN0aW9uUGFuZWwgc29tZXRpbWVzIGhh bmdzIGluIGRpc21pc3NTb29uKCkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02MDU5OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vOTMxMzYyOD4KKwor ICAgICAgICBNYWtlIHN1cmUgZGlzbWlzc1Nvb24oKSB3b24ndCB3YWl0IGluZGVmaW5pdGVseSBp ZiBoYW5kbGVBY2NlcHRlZFJlcGxhY2VtZW50KCkgc2V0cyBtX3Jlc3VsdEZvclN5bmNocm9ub3Vz RGlzbWlzc2FsCisgICAgICAgIHRvIG5pbC4gQWRkZWQgYSBkZXNpZ25hdGVkIHZhcmlhYmxlIG1f aXNEaXNtaXNzaW5nLCBpbnN0ZWFkIG9mIHBpZ2d5LWJhY2tpbmcgbV9yZXN1bHRGb3JTeW5jaHJv bm91c0Rpc21pc3NhbCwKKyAgICAgICAgZm9yIGNvbmRpdGlvbiBjaGVja2luZy4KKworICAgICAg ICAqIFVJUHJvY2Vzcy9tYWMvQ29ycmVjdGlvblBhbmVsLmg6CisgICAgICAgICogVUlQcm9jZXNz L21hYy9Db3JyZWN0aW9uUGFuZWwubW06CisgICAgICAgIChXZWJLaXQ6OkNvcnJlY3Rpb25QYW5l bDo6Q29ycmVjdGlvblBhbmVsKToKKyAgICAgICAgKFdlYktpdDo6Q29ycmVjdGlvblBhbmVsOjpz aG93KToKKyAgICAgICAgKFdlYktpdDo6Q29ycmVjdGlvblBhbmVsOjpkaXNtaXNzU29vbik6Cisg ICAgICAgIChXZWJLaXQ6OkNvcnJlY3Rpb25QYW5lbDo6ZGlzbWlzc0ludGVybmFsKToKKyAgICAg ICAgKFdlYktpdDo6Q29ycmVjdGlvblBhbmVsOjpoYW5kbGVBY2NlcHRlZFJlcGxhY2VtZW50KToK KwogMjAxMS0wNS0xMSAgSmVzc2llIEJlcmxpbiAgPGpiZXJsaW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL21hYy9Db3JyZWN0aW9uUGFuZWwuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9tYWMvQ29ycmVjdGlvblBhbmVsLmgKaW5kZXggODVhOThlZmNjNWI1ZGQ5YmYyZTY4MjZhNjlm MjA2Y2E0OGVkOWU5MC4uYWQ3N2UyMGU2ZDJhNGUwMjZiMGUyYjFmNGQ4NDRlZmIxNzkzMzgzZSAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9Db3JyZWN0aW9uUGFuZWwu aAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL0NvcnJlY3Rpb25QYW5lbC5oCkBA IC01NCw2ICs1NCw3IEBAIHByaXZhdGU6CiAgICAgUmV0YWluUHRyPFdLVmlldz4gbV92aWV3Owog ICAgIFJldGFpblB0cjxOU1N0cmluZz4gbV9yZXN1bHRGb3JTeW5jaHJvbm91c0Rpc21pc3NhbDsK ICAgICBSZXRhaW5QdHI8TlNDb25kaXRpb24+IG1fcmVzdWx0Q29uZGl0aW9uOworICAgIGJvb2wg bV9pc0Rpc21pc3Npbmc7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvQ29ycmVjdGlvblBhbmVsLm1tIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL21hYy9Db3JyZWN0aW9uUGFuZWwubW0KaW5kZXggMGZjNTIwYmE4 MGM3NDMzZjMyYjM0YWIzZWY2MGZjMWNkNDUzM2Q2Zi4uNzIyNjJlMWMzZTQxZTU0YzgwNTgxZmNi ZWUxMmE5M2I5MzI1ZTQ2MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21h Yy9Db3JyZWN0aW9uUGFuZWwubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9D b3JyZWN0aW9uUGFuZWwubW0KQEAgLTUzLDYgKzUzLDcgQEAgQ29ycmVjdGlvblBhbmVsOjpDb3Jy ZWN0aW9uUGFuZWwoKQogICAgIDogbV93YXNEaXNtaXNzZWRFeHRlcm5hbGx5KGZhbHNlKQogICAg ICwgbV9yZWFzb25Gb3JEaXNtaXNzaW5nKFJlYXNvbkZvckRpc21pc3NpbmdDb3JyZWN0aW9uUGFu ZWxJZ25vcmVkKQogICAgICwgbV9yZXN1bHRDb25kaXRpb24oQWRvcHROUywgW1tOU0NvbmRpdGlv biBhbGxvY10gaW5pdF0pCisgICAgLCBtX2lzRGlzbWlzc2luZyhmYWxzZSkKIHsKIH0KIApAQCAt ODUsNiArODYsNyBAQCB2b2lkIENvcnJlY3Rpb25QYW5lbDo6c2hvdyhXS1ZpZXcqIHZpZXcsIENv cnJlY3Rpb25QYW5lbEluZm86OlBhbmVsVHlwZSB0eXBlLCBjbwogICAgIFtzcGVsbENoZWNrZXIg c2hvd0NvcnJlY3Rpb25JbmRpY2F0b3JPZlR5cGU6aW5kaWNhdG9yVHlwZSBwcmltYXJ5U3RyaW5n OnJlcGxhY2VtZW50U3RyaW5nQXNOU1N0cmluZyBhbHRlcm5hdGl2ZVN0cmluZ3M6YWx0ZXJuYXRp dmVTdHJpbmdzIGZvclN0cmluZ0luUmVjdDpib3VuZGluZ0JveE9mUmVwbGFjZWRTdHJpbmcgdmll dzptX3ZpZXcuZ2V0KCkgY29tcGxldGlvbkhhbmRsZXI6XihOU1N0cmluZyogYWNjZXB0ZWRTdHJp bmcpIHsKICAgICAgICAgaGFuZGxlQWNjZXB0ZWRSZXBsYWNlbWVudChhY2NlcHRlZFN0cmluZywg cmVwbGFjZWRTdHJpbmdBc05TU3RyaW5nLCByZXBsYWNlbWVudFN0cmluZ0FzTlNTdHJpbmcsIGlu ZGljYXRvclR5cGUpOwogICAgIH1dOworICAgIG1faXNEaXNtaXNzaW5nID0gZmFsc2U7CiB9CiAK IHZvaWQgQ29ycmVjdGlvblBhbmVsOjpkaXNtaXNzKFJlYXNvbkZvckRpc21pc3NpbmdDb3JyZWN0 aW9uUGFuZWwgcmVhc29uKQpAQCAtOTQsMTIgKzk2LDkgQEAgdm9pZCBDb3JyZWN0aW9uUGFuZWw6 OmRpc21pc3MoUmVhc29uRm9yRGlzbWlzc2luZ0NvcnJlY3Rpb25QYW5lbCByZWFzb24pCiAKIFN0 cmluZyBDb3JyZWN0aW9uUGFuZWw6OmRpc21pc3NTb29uKFJlYXNvbkZvckRpc21pc3NpbmdDb3Jy ZWN0aW9uUGFuZWwgcmVhc29uKQogewotICAgIGlmICghaXNTaG93aW5nKCkpCi0gICAgICAgIHJl dHVybiBTdHJpbmcoKTsKLQogICAgIGRpc21pc3NJbnRlcm5hbChyZWFzb24sIHRydWUpOwogICAg IFttX3Jlc3VsdENvbmRpdGlvbi5nZXQoKSBsb2NrXTsKLSAgICB3aGlsZSAoIW1fcmVzdWx0Rm9y U3luY2hyb25vdXNEaXNtaXNzYWwpCisgICAgd2hpbGUgKG1faXNEaXNtaXNzaW5nKQogICAgICAg ICBbbV9yZXN1bHRDb25kaXRpb24uZ2V0KCkgd2FpdF07CiAgICAgW21fcmVzdWx0Q29uZGl0aW9u LmdldCgpIHVubG9ja107CiAgICAgcmV0dXJuIG1fcmVzdWx0Rm9yU3luY2hyb25vdXNEaXNtaXNz YWwuZ2V0KCk7CkBAIC0xMDcsMTAgKzEwNiwxMSBAQCBTdHJpbmcgQ29ycmVjdGlvblBhbmVsOjpk aXNtaXNzU29vbihSZWFzb25Gb3JEaXNtaXNzaW5nQ29ycmVjdGlvblBhbmVsIHJlYXNvbikKIAog dm9pZCBDb3JyZWN0aW9uUGFuZWw6OmRpc21pc3NJbnRlcm5hbChSZWFzb25Gb3JEaXNtaXNzaW5n Q29ycmVjdGlvblBhbmVsIHJlYXNvbiwgYm9vbCBkaXNtaXNzaW5nRXh0ZXJuYWxseSkKIHsKLSAg ICBtX3dhc0Rpc21pc3NlZEV4dGVybmFsbHkgPSBkaXNtaXNzaW5nRXh0ZXJuYWxseTsKICAgICBp ZiAoIWlzU2hvd2luZygpKQogICAgICAgICByZXR1cm47Ci0gICAgCisKKyAgICBtX2lzRGlzbWlz c2luZyA9IHRydWU7CisgICAgbV93YXNEaXNtaXNzZWRFeHRlcm5hbGx5ID0gZGlzbWlzc2luZ0V4 dGVybmFsbHk7CiAgICAgbV9yZWFzb25Gb3JEaXNtaXNzaW5nID0gcmVhc29uOwogICAgIG1fcmVz dWx0Rm9yU3luY2hyb25vdXNEaXNtaXNzYWwuY2xlYXIoKTsKICAgICBbW05TU3BlbGxDaGVja2Vy IHNoYXJlZFNwZWxsQ2hlY2tlcl0gZGlzbWlzc0NvcnJlY3Rpb25JbmRpY2F0b3JGb3JWaWV3Om1f dmlldy5nZXQoKV07CkBAIC0xNDgsMTQgKzE0OCwxMyBAQCB2b2lkIENvcnJlY3Rpb25QYW5lbDo6 aGFuZGxlQWNjZXB0ZWRSZXBsYWNlbWVudChOU1N0cmluZyogYWNjZXB0ZWRSZXBsYWNlbWVudCwg TgogICAgICAgICBicmVhazsKICAgICB9CiAgICAgCi0gICAgaWYgKCFtX3dhc0Rpc21pc3NlZEV4 dGVybmFsbHkpIHsKKyAgICBpZiAoIW1fd2FzRGlzbWlzc2VkRXh0ZXJuYWxseSkKICAgICAgICAg W21fdmlldy5nZXQoKSBoYW5kbGVDb3JyZWN0aW9uUGFuZWxSZXN1bHQ6YWNjZXB0ZWRSZXBsYWNl bWVudF07Ci0gICAgICAgIHJldHVybjsKLSAgICB9Ci0gICAgCi0gICAgW21fcmVzdWx0Q29uZGl0 aW9uLmdldCgpIGxvY2tdOwogICAgIGlmIChhY2NlcHRlZFJlcGxhY2VtZW50KQogICAgICAgICBt X3Jlc3VsdEZvclN5bmNocm9ub3VzRGlzbWlzc2FsLmFkb3B0TlMoW2FjY2VwdGVkUmVwbGFjZW1l bnQgY29weV0pOworICAgIAorICAgIFttX3Jlc3VsdENvbmRpdGlvbi5nZXQoKSBsb2NrXTsKKyAg ICBtX2lzRGlzbWlzc2luZyA9IGZhbHNlOwogICAgIFttX3Jlc3VsdENvbmRpdGlvbi5nZXQoKSBz aWduYWxdOwogICAgIFttX3Jlc3VsdENvbmRpdGlvbi5nZXQoKSB1bmxvY2tdOwogfQo=