106766 2013-01-14 01:49:44 -0800 [V8] Call Isolate::GetCurrent() in a callback from WebCore 2013-01-14 02:46:16 -0800 1 1 1 Unclassified WebKit WebCore JavaScript 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 haraken haraken abarth japhet webkit.review.bot oldest_to_newest 806166 0 haraken 2013-01-14 01:49:44 -0800 The objective is to pass an Isolate everywhere. Given that a callback from WebCore is an entry point to V8, we can call Isolate::GetCurrent() at the head of the callback and pass it to other places. (In practice, handleEvent() is the only callback used in the current WebKit.) 806182 1 182531 haraken 2013-01-14 02:12:26 -0800 Created attachment 182531 Patch 806199 2 182531 webkit.review.bot 2013-01-14 02:46:13 -0800 Comment on attachment 182531 Patch Clearing flags on attachment: 182531 Committed r139599: <http://trac.webkit.org/changeset/139599> 806200 3 webkit.review.bot 2013-01-14 02:46:16 -0800 All reviewed patches have been landed. Closing bug. 182531 2013-01-14 02:12:26 -0800 2013-01-14 02:46:13 -0800 Patch bug-106766-20130114110926.patch text/plain 9745 haraken U3VidmVyc2lvbiBSZXZpc2lvbjogMTM5NTg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDA2MjMzYjA3NjBiODI4 NDBiZGVjMDM5YjY0NWI0Y2UzZjdkMzFkZi4uZmE3M2NiNGMyYjhlMjM0OGI3ZTFjMWYyYjRkYjUy MzkwMzFlYmUwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI5IEBACisyMDEzLTAxLTE0ICBLZW50 YXJvIEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KKworICAgICAgICBbVjhdIENhbGwgSXNv bGF0ZTo6R2V0Q3VycmVudCgpIGluIGEgY2FsbGJhY2sgZnJvbSBXZWJDb3JlCisgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDY3NjYKKworICAgICAgICBS ZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgb2JqZWN0aXZlIGlzIHRv IHBhc3MgYW4gSXNvbGF0ZSBldmVyeXdoZXJlLgorICAgICAgICBHaXZlbiB0aGF0IGEgY2FsbGJh Y2sgZnJvbSBXZWJDb3JlIGlzIGFuIGVudHJ5IHBvaW50IHRvIFY4LAorICAgICAgICB3ZSBjYW4g Y2FsbCBJc29sYXRlOjpHZXRDdXJyZW50KCkgYXQgdGhlIGhlYWQgb2YgdGhlIGNhbGxiYWNrCisg ICAgICAgIGFuZCBwYXNzIGl0IHRvIG90aGVyIHBsYWNlcy4gKEluIHByYWN0aWNlLCBoYW5kbGVF dmVudCgpIGlzCisgICAgICAgIHRoZSBvbmx5IGNhbGxiYWNrIHVzZWQgaW4gdGhlIGN1cnJlbnQg V2ViS2l0LikKKworICAgICAgICBObyB0ZXN0cy4gTm8gY2hhbmdlIGluIGJlaGF2aW9yLgorCisg ICAgICAgICogYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG06CisgICAgICAgIChH ZW5lcmF0ZUNhbGxiYWNrSW1wbGVtZW50YXRpb24pOgorICAgICAgICAoTmF0aXZlVG9KU1ZhbHVl KToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0Q2FsbGJhY2suY3Bw OgorICAgICAgICAoV2ViQ29yZTo6VjhUZXN0Q2FsbGJhY2s6OmNhbGxiYWNrV2l0aE5vUGFyYW0p OgorICAgICAgICAoV2ViQ29yZTo6VjhUZXN0Q2FsbGJhY2s6OmNhbGxiYWNrV2l0aENsYXNzMVBh cmFtKToKKyAgICAgICAgKFdlYkNvcmU6OlY4VGVzdENhbGxiYWNrOjpjYWxsYmFja1dpdGhDbGFz czJQYXJhbSk6CisgICAgICAgIChXZWJDb3JlOjpWOFRlc3RDYWxsYmFjazo6Y2FsbGJhY2tXaXRo U3RyaW5nTGlzdCk6CisgICAgICAgIChXZWJDb3JlOjpWOFRlc3RDYWxsYmFjazo6Y2FsbGJhY2tX aXRoQm9vbGVhbik6CisgICAgICAgIChXZWJDb3JlOjpWOFRlc3RDYWxsYmFjazo6Y2FsbGJhY2tS ZXF1aXJlc1RoaXNUb1Bhc3MpOgorCiAyMDEzLTAxLTEzICBMZXZpIFdlaW50cmF1YiAgPGxldml3 QGNocm9taXVtLm9yZz4KIAogICAgICAgICBVbnJldmlld2VkIGdhcmRlbmluZy4gUm9sbGluZyBv dXQgcjEzOTUzNy4gSXQgYnJva2UgcGxhdGZvcm1zIHdpdGhvdXQgc3ViLXBpeGVsIGxheW91dC4K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRv clY4LnBtIGIvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgu cG0KaW5kZXggNjA5YzViNzVmNmRlOWMxZGNlOTVkMGRjZWZmNWRmNzI2ZGI3YWZhNy4uNjc1NGMw NWYxNGI5OTk2OGY0OWFjMDNhNTYwMzAxYThkN2UzMWY1MSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KKysrIGIvU291cmNlL1dl YkNvcmUvYmluZGluZ3Mvc2NyaXB0cy9Db2RlR2VuZXJhdG9yVjgucG0KQEAgLTMzNzksNyArMzM3 OSw3IEBAIEVORAogICAgICAgICAgICAgQGFyZ3MgPSAoKTsKICAgICAgICAgICAgIGZvcmVhY2gg bXkgJHBhcmFtIChAcGFyYW1zKSB7CiAgICAgICAgICAgICAgICAgbXkgJHBhcmFtTmFtZSA9ICRw YXJhbS0+bmFtZTsKLSAgICAgICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICB2ODo6 SGFuZGxlPHY4OjpWYWx1ZT4gJHtwYXJhbU5hbWV9SGFuZGxlID0gIiAuIE5hdGl2ZVRvSlNWYWx1 ZSgkcGFyYW0sICRwYXJhbU5hbWUpIC4gIjtcbiIpOworICAgICAgICAgICAgICAgIHB1c2goQGlt cGxDb250ZW50LCAiICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiAke3BhcmFtTmFtZX1IYW5kbGUg PSAiIC4gTmF0aXZlVG9KU1ZhbHVlKCRwYXJhbSwgJHBhcmFtTmFtZSwgInY4OjpIYW5kbGU8djg6 Ok9iamVjdD4oKSIsICJ2ODo6SXNvbGF0ZTo6R2V0Q3VycmVudCgpIikgLiAiO1xuIik7CiAgICAg ICAgICAgICAgICAgcHVzaChAaW1wbENvbnRlbnQsICIgICAgaWYgKCR7cGFyYW1OYW1lfUhhbmRs ZS5Jc0VtcHR5KCkpIHtcbiIpOwogICAgICAgICAgICAgICAgIHB1c2goQGltcGxDb250ZW50LCAi ICAgICAgICBpZiAoIWlzU2NyaXB0Q29udHJvbGxlclRlcm1pbmF0aW5nKCkpXG4iKTsKICAgICAg ICAgICAgICAgICBwdXNoKEBpbXBsQ29udGVudCwgIiAgICAgICAgICAgIENSQVNIKCk7XG4iKTsK QEAgLTQwMjMsMTQgKzQwMjMsMTMgQEAgc3ViIE5hdGl2ZVRvSlNWYWx1ZQogICAgIG15ICRzaWdu YXR1cmUgPSBzaGlmdDsKICAgICBteSAkdmFsdWUgPSBzaGlmdDsKICAgICBteSAkZ2V0Q3JlYXRp b25Db250ZXh0ID0gc2hpZnQ7Ci0gICAgbXkgJGdldENyZWF0aW9uQ29udGV4dEFyZyA9ICRnZXRD cmVhdGlvbkNvbnRleHQgPyAiLCAkZ2V0Q3JlYXRpb25Db250ZXh0IiA6ICIiOwogICAgIG15ICRn ZXRJc29sYXRlID0gc2hpZnQ7Ci0gICAgbXkgJGdldElzb2xhdGVBcmcgPSAkZ2V0SXNvbGF0ZSA/ ICIsICRnZXRJc29sYXRlIiA6ICIiOwogICAgIG15ICRnZXRIb2xkZXJDb250YWluZXIgPSBzaGlm dDsKICAgICBteSAkZ2V0SG9sZGVyQ29udGFpbmVyQXJnID0gJGdldEhvbGRlckNvbnRhaW5lciA/ ICIsICRnZXRIb2xkZXJDb250YWluZXIiIDogIiI7CiAgICAgbXkgJGdldFNjcmlwdFdyYXBwYWJs ZSA9IHNoaWZ0OwogICAgIG15ICRnZXRTY3JpcHRXcmFwcGFibGVBcmcgPSAkZ2V0U2NyaXB0V3Jh cHBhYmxlID8gIiwgJGdldFNjcmlwdFdyYXBwYWJsZSIgOiAiIjsKICAgICBteSAkcmV0dXJuSGFu ZGxlVHlwZSA9IHNoaWZ0OworICAgIG15ICRyZXR1cm5IYW5kbGVUeXBlQXJnID0gJHJldHVybkhh bmRsZVR5cGUgPyAiLCAkcmV0dXJuSGFuZGxlVHlwZSIgOiAiIjsKIAogICAgIG15ICR0eXBlID0g JHNpZ25hdHVyZS0+dHlwZTsKIApAQCAtNDA0MiwxNiArNDA0MSwxNiBAQCBzdWIgTmF0aXZlVG9K U1ZhbHVlCiAgICAgIyBzaG91bGQgYmUgcmV0dXJuZWQgaW5zdGVhZC4KICAgICBpZiAoJHNpZ25h dHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57IlJlZmxlY3QifSBhbmQgKCR0eXBlIGVxICJ1bnNp Z25lZCBsb25nIiBvciAkdHlwZSBlcSAidW5zaWduZWQgc2hvcnQiKSkgewogICAgICAgICAkdmFs dWUgPX4gcy9nZXRVbnNpZ25lZEludGVncmFsQXR0cmlidXRlL2dldEludGVncmFsQXR0cmlidXRl L2c7Ci0gICAgICAgIHJldHVybiAidjhVbnNpZ25lZEludGVnZXIoc3RkOjptYXgoMCwgIiAuICR2 YWx1ZSAuICIpJGdldElzb2xhdGVBcmcpIjsKKyAgICAgICAgcmV0dXJuICJ2OFVuc2lnbmVkSW50 ZWdlcihzdGQ6Om1heCgwLCAiIC4gJHZhbHVlIC4gIiksICRnZXRJc29sYXRlKSI7CiAgICAgfQog CiAgICAgIyBGb3IgYWxsIHRoZSB0eXBlcyB3aGVyZSB3ZSB1c2UgJ2ludCcgYXMgdGhlIHJlcHJl c2VudGF0aW9uIHR5cGUsCiAgICAgIyB3ZSB1c2UgdjhJbnRlZ2VyKCkgd2hpY2ggaGFzIGEgZmFz dCBzbWFsbCBpbnRlZ2VyIGNvbnZlcnNpb24gY2hlY2suCiAgICAgbXkgJG5hdGl2ZVR5cGUgPSBH ZXROYXRpdmVUeXBlKCR0eXBlKTsKLSAgICByZXR1cm4gInY4SW50ZWdlcigkdmFsdWUkZ2V0SXNv bGF0ZUFyZykiIGlmICRuYXRpdmVUeXBlIGVxICJpbnQiOwotICAgIHJldHVybiAidjhVbnNpZ25l ZEludGVnZXIoJHZhbHVlJGdldElzb2xhdGVBcmcpIiBpZiAkbmF0aXZlVHlwZSBlcSAidW5zaWdu ZWQiOworICAgIHJldHVybiAidjhJbnRlZ2VyKCR2YWx1ZSwgJGdldElzb2xhdGUpIiBpZiAkbmF0 aXZlVHlwZSBlcSAiaW50IjsKKyAgICByZXR1cm4gInY4VW5zaWduZWRJbnRlZ2VyKCR2YWx1ZSwg JGdldElzb2xhdGUpIiBpZiAkbmF0aXZlVHlwZSBlcSAidW5zaWduZWQiOwogCi0gICAgcmV0dXJu ICJ2OERhdGVPck51bGwoJHZhbHVlJGdldElzb2xhdGVBcmcpIiBpZiAkdHlwZSBlcSAiRGF0ZSI7 CisgICAgcmV0dXJuICJ2OERhdGVPck51bGwoJHZhbHVlLCAkZ2V0SXNvbGF0ZSkiIGlmICR0eXBl IGVxICJEYXRlIjsKICAgICAjIGxvbmcgbG9uZyBhbmQgdW5zaWduZWQgbG9uZyBsb25nIGFyZSBu b3QgcmVwcmVzZW50YWJsZSBpbiBFQ01BU2NyaXB0LgogICAgIHJldHVybiAidjg6Ok51bWJlcjo6 TmV3KHN0YXRpY19jYXN0PGRvdWJsZT4oJHZhbHVlKSkiIGlmICR0eXBlIGVxICJsb25nIGxvbmci IG9yICR0eXBlIGVxICJ1bnNpZ25lZCBsb25nIGxvbmciIG9yICR0eXBlIGVxICJET01UaW1lU3Rh bXAiOwogICAgIHJldHVybiAidjg6Ok51bWJlcjo6TmV3KCR2YWx1ZSkiIGlmICRjb2RlR2VuZXJh dG9yLT5Jc1ByaW1pdGl2ZVR5cGUoJHR5cGUpOwpAQCAtNDA2MCwxMiArNDA1OSwxMiBAQCBzdWIg TmF0aXZlVG9KU1ZhbHVlCiAgICAgaWYgKCRjb2RlR2VuZXJhdG9yLT5Jc1N0cmluZ1R5cGUoJHR5 cGUpKSB7CiAgICAgICAgIG15ICRjb252ID0gJHNpZ25hdHVyZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVz LT57IlRyZWF0UmV0dXJuZWROdWxsU3RyaW5nQXMifTsKICAgICAgICAgaWYgKGRlZmluZWQgJGNv bnYpIHsKLSAgICAgICAgICAgIHJldHVybiAidjhTdHJpbmdPck51bGwoJHZhbHVlJGdldElzb2xh dGVBcmcsICRyZXR1cm5IYW5kbGVUeXBlKSIgaWYgJGNvbnYgZXEgIk51bGwiOwotICAgICAgICAg ICAgcmV0dXJuICJ2OFN0cmluZ09yVW5kZWZpbmVkKCR2YWx1ZSRnZXRJc29sYXRlQXJnLCAkcmV0 dXJuSGFuZGxlVHlwZSkiIGlmICRjb252IGVxICJVbmRlZmluZWQiOworICAgICAgICAgICAgcmV0 dXJuICJ2OFN0cmluZ09yTnVsbCgkdmFsdWUsICRnZXRJc29sYXRlJHJldHVybkhhbmRsZVR5cGVB cmcpIiBpZiAkY29udiBlcSAiTnVsbCI7CisgICAgICAgICAgICByZXR1cm4gInY4U3RyaW5nT3JV bmRlZmluZWQoJHZhbHVlLCAkZ2V0SXNvbGF0ZSRyZXR1cm5IYW5kbGVUeXBlQXJnKSIgaWYgJGNv bnYgZXEgIlVuZGVmaW5lZCI7CiAKICAgICAgICAgICAgIGRpZSAiVW5rbm93biB2YWx1ZSBmb3Ig VHJlYXRSZXR1cm5lZE51bGxTdHJpbmdBcyBleHRlbmRlZCBhdHRyaWJ1dGUiOwogICAgICAgICB9 Ci0gICAgICAgIHJldHVybiAkZ2V0SXNvbGF0ZSA/ICJ2OFN0cmluZygkdmFsdWUkZ2V0SXNvbGF0 ZUFyZywgJHJldHVybkhhbmRsZVR5cGUpIiA6ICJkZXByZWNhdGVkVjhTdHJpbmcoJHZhbHVlKSI7 CisgICAgICAgIHJldHVybiAkZ2V0SXNvbGF0ZSA/ICJ2OFN0cmluZygkdmFsdWUsICRnZXRJc29s YXRlJHJldHVybkhhbmRsZVR5cGVBcmcpIiA6ICJkZXByZWNhdGVkVjhTdHJpbmcoJHZhbHVlKSI7 CiAgICAgfQogCiAgICAgbXkgJGFycmF5VHlwZSA9ICRjb2RlR2VuZXJhdG9yLT5HZXRBcnJheVR5 cGUoJHR5cGUpOwpAQCAtNDA4MSw3ICs0MDgwLDcgQEAgc3ViIE5hdGl2ZVRvSlNWYWx1ZQogICAg ICAgICAgICAgQWRkVG9JbXBsSW5jbHVkZXMoR2V0VjhIZWFkZXJOYW1lKCRhcnJheU9yU2VxdWVu Y2VUeXBlKSk7CiAgICAgICAgICAgICBBZGRUb0ltcGxJbmNsdWRlcygiJHthcnJheU9yU2VxdWVu Y2VUeXBlfS5oIik7CiAgICAgICAgIH0KLSAgICAgICAgcmV0dXJuICJ2OEFycmF5KCR7dmFsdWV9 JHtnZXRJc29sYXRlQXJnfSkiOworICAgICAgICByZXR1cm4gInY4QXJyYXkoJHZhbHVlLCAkZ2V0 SXNvbGF0ZSkiOwogICAgIH0KIAogICAgIEFkZEluY2x1ZGVzRm9yVHlwZSgkdHlwZSk7CkBAIC00 MDkwLDcgKzQwODksNyBAQCBzdWIgTmF0aXZlVG9KU1ZhbHVlCiAgICAgICBpZiAoJGdldFNjcmlw dFdyYXBwYWJsZSkgewogICAgICAgICAgIHJldHVybiAidG9WOEZhc3QoJHZhbHVlJGdldEhvbGRl ckNvbnRhaW5lckFyZyRnZXRTY3JpcHRXcmFwcGFibGVBcmcpIjsKICAgICAgIH0KLSAgICAgIHJl dHVybiAidG9WOCgkdmFsdWUkZ2V0Q3JlYXRpb25Db250ZXh0QXJnJGdldElzb2xhdGVBcmcpIjsK KyAgICAgIHJldHVybiAidG9WOCgkdmFsdWUsICRnZXRDcmVhdGlvbkNvbnRleHQsICRnZXRJc29s YXRlKSI7CiAgICAgfQogCiAgICAgaWYgKCR0eXBlIGVxICJFdmVudExpc3RlbmVyIikgewpAQCAt NDExMCw3ICs0MTA5LDcgQEAgc3ViIE5hdGl2ZVRvSlNWYWx1ZQogICAgIGlmICgkZ2V0U2NyaXB0 V3JhcHBhYmxlKSB7CiAgICAgICAgICAgcmV0dXJuICJ0b1Y4RmFzdCgkdmFsdWUkZ2V0SG9sZGVy Q29udGFpbmVyQXJnJGdldFNjcmlwdFdyYXBwYWJsZUFyZykiOwogICAgIH0KLSAgICByZXR1cm4g InRvVjgoJHZhbHVlJGdldENyZWF0aW9uQ29udGV4dEFyZyRnZXRJc29sYXRlQXJnKSI7CisgICAg cmV0dXJuICJ0b1Y4KCR2YWx1ZSwgJGdldENyZWF0aW9uQ29udGV4dCwgJGdldElzb2xhdGUpIjsK IH0KIAogc3ViIFdyaXRlRGF0YQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy90ZXN0L1Y4L1Y4VGVzdENhbGxiYWNrLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2JpbmRp bmdzL3NjcmlwdHMvdGVzdC9WOC9WOFRlc3RDYWxsYmFjay5jcHAKaW5kZXggODI5MThjMmZjMmEw YmRlMGU0Y2I1OWQ2MTAwYWY1MGYzZWFjNjNiNS4uNjMwNTBiNDRlMjNhMTk1NmJjNzk4MGM4MjMw Njc4M2EwY2QwM2VmYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvYmluZGluZ3Mvc2NyaXB0 cy90ZXN0L1Y4L1Y4VGVzdENhbGxiYWNrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9iaW5kaW5n cy9zY3JpcHRzL3Rlc3QvVjgvVjhUZXN0Q2FsbGJhY2suY3BwCkBAIC04NSw3ICs4NSw3IEBAIGJv b2wgVjhUZXN0Q2FsbGJhY2s6OmNhbGxiYWNrV2l0aENsYXNzMVBhcmFtKENsYXNzMSogY2xhc3Mx UGFyYW0pCiAKICAgICB2ODo6Q29udGV4dDo6U2NvcGUgc2NvcGUodjhDb250ZXh0KTsKIAotICAg IHY4OjpIYW5kbGU8djg6OlZhbHVlPiBjbGFzczFQYXJhbUhhbmRsZSA9IHRvVjgoY2xhc3MxUGFy YW0pOworICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBjbGFzczFQYXJhbUhhbmRsZSA9IHRvVjgo Y2xhc3MxUGFyYW0sIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4oKSwgdjg6Oklzb2xhdGU6OkdldEN1 cnJlbnQoKSk7CiAgICAgaWYgKGNsYXNzMVBhcmFtSGFuZGxlLklzRW1wdHkoKSkgewogICAgICAg ICBpZiAoIWlzU2NyaXB0Q29udHJvbGxlclRlcm1pbmF0aW5nKCkpCiAgICAgICAgICAgICBDUkFT SCgpOwpAQCAtMTEzLDEzICsxMTMsMTMgQEAgYm9vbCBWOFRlc3RDYWxsYmFjazo6Y2FsbGJhY2tX aXRoQ2xhc3MyUGFyYW0oQ2xhc3MyKiBjbGFzczJQYXJhbSwgY29uc3QgU3RyaW5nJgogCiAgICAg djg6OkNvbnRleHQ6OlNjb3BlIHNjb3BlKHY4Q29udGV4dCk7CiAKLSAgICB2ODo6SGFuZGxlPHY4 OjpWYWx1ZT4gY2xhc3MyUGFyYW1IYW5kbGUgPSB0b1Y4KGNsYXNzMlBhcmFtKTsKKyAgICB2ODo6 SGFuZGxlPHY4OjpWYWx1ZT4gY2xhc3MyUGFyYW1IYW5kbGUgPSB0b1Y4KGNsYXNzMlBhcmFtLCB2 ODo6SGFuZGxlPHY4OjpPYmplY3Q+KCksIHY4OjpJc29sYXRlOjpHZXRDdXJyZW50KCkpOwogICAg IGlmIChjbGFzczJQYXJhbUhhbmRsZS5Jc0VtcHR5KCkpIHsKICAgICAgICAgaWYgKCFpc1Njcmlw dENvbnRyb2xsZXJUZXJtaW5hdGluZygpKQogICAgICAgICAgICAgQ1JBU0goKTsKICAgICAgICAg cmV0dXJuIHRydWU7CiAgICAgfQotICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBzdHJBcmdIYW5k bGUgPSBkZXByZWNhdGVkVjhTdHJpbmcoc3RyQXJnKTsKKyAgICB2ODo6SGFuZGxlPHY4OjpWYWx1 ZT4gc3RyQXJnSGFuZGxlID0gdjhTdHJpbmcoc3RyQXJnLCB2ODo6SXNvbGF0ZTo6R2V0Q3VycmVu dCgpKTsKICAgICBpZiAoc3RyQXJnSGFuZGxlLklzRW1wdHkoKSkgewogICAgICAgICBpZiAoIWlz U2NyaXB0Q29udHJvbGxlclRlcm1pbmF0aW5nKCkpCiAgICAgICAgICAgICBDUkFTSCgpOwpAQCAt MTQ4LDcgKzE0OCw3IEBAIGJvb2wgVjhUZXN0Q2FsbGJhY2s6OmNhbGxiYWNrV2l0aFN0cmluZ0xp c3QoUmVmUHRyPERPTVN0cmluZ0xpc3Q+IGxpc3RQYXJhbSkKIAogICAgIHY4OjpDb250ZXh0OjpT Y29wZSBzY29wZSh2OENvbnRleHQpOwogCi0gICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IGxpc3RQ YXJhbUhhbmRsZSA9IHRvVjgobGlzdFBhcmFtKTsKKyAgICB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4g bGlzdFBhcmFtSGFuZGxlID0gdG9WOChsaXN0UGFyYW0sIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4o KSwgdjg6Oklzb2xhdGU6OkdldEN1cnJlbnQoKSk7CiAgICAgaWYgKGxpc3RQYXJhbUhhbmRsZS5J c0VtcHR5KCkpIHsKICAgICAgICAgaWYgKCFpc1NjcmlwdENvbnRyb2xsZXJUZXJtaW5hdGluZygp KQogICAgICAgICAgICAgQ1JBU0goKTsKQEAgLTE3Niw3ICsxNzYsNyBAQCBib29sIFY4VGVzdENh bGxiYWNrOjpjYWxsYmFja1dpdGhCb29sZWFuKGJvb2wgYm9vbFBhcmFtKQogCiAgICAgdjg6OkNv bnRleHQ6OlNjb3BlIHNjb3BlKHY4Q29udGV4dCk7CiAKLSAgICB2ODo6SGFuZGxlPHY4OjpWYWx1 ZT4gYm9vbFBhcmFtSGFuZGxlID0gdjhCb29sZWFuKGJvb2xQYXJhbSk7CisgICAgdjg6OkhhbmRs ZTx2ODo6VmFsdWU+IGJvb2xQYXJhbUhhbmRsZSA9IHY4Qm9vbGVhbihib29sUGFyYW0sIHY4OjpJ c29sYXRlOjpHZXRDdXJyZW50KCkpOwogICAgIGlmIChib29sUGFyYW1IYW5kbGUuSXNFbXB0eSgp KSB7CiAgICAgICAgIGlmICghaXNTY3JpcHRDb250cm9sbGVyVGVybWluYXRpbmcoKSkKICAgICAg ICAgICAgIENSQVNIKCk7CkBAIC0yMDYsMTMgKzIwNiwxMyBAQCBib29sIFY4VGVzdENhbGxiYWNr OjpjYWxsYmFja1JlcXVpcmVzVGhpc1RvUGFzcyhDbGFzczgqIGNsYXNzOFBhcmFtLCBUaGlzQ2xh c3MqCiAKICAgICB2ODo6Q29udGV4dDo6U2NvcGUgc2NvcGUodjhDb250ZXh0KTsKIAotICAgIHY4 OjpIYW5kbGU8djg6OlZhbHVlPiBjbGFzczhQYXJhbUhhbmRsZSA9IHRvVjgoY2xhc3M4UGFyYW0p OworICAgIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBjbGFzczhQYXJhbUhhbmRsZSA9IHRvVjgoY2xh c3M4UGFyYW0sIHY4OjpIYW5kbGU8djg6Ok9iamVjdD4oKSwgdjg6Oklzb2xhdGU6OkdldEN1cnJl bnQoKSk7CiAgICAgaWYgKGNsYXNzOFBhcmFtSGFuZGxlLklzRW1wdHkoKSkgewogICAgICAgICBp ZiAoIWlzU2NyaXB0Q29udHJvbGxlclRlcm1pbmF0aW5nKCkpCiAgICAgICAgICAgICBDUkFTSCgp OwogICAgICAgICByZXR1cm4gdHJ1ZTsKICAgICB9Ci0gICAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+ IHRoaXNDbGFzc1BhcmFtSGFuZGxlID0gdG9WOCh0aGlzQ2xhc3NQYXJhbSk7CisgICAgdjg6Okhh bmRsZTx2ODo6VmFsdWU+IHRoaXNDbGFzc1BhcmFtSGFuZGxlID0gdG9WOCh0aGlzQ2xhc3NQYXJh bSwgdjg6OkhhbmRsZTx2ODo6T2JqZWN0PigpLCB2ODo6SXNvbGF0ZTo6R2V0Q3VycmVudCgpKTsK ICAgICBpZiAodGhpc0NsYXNzUGFyYW1IYW5kbGUuSXNFbXB0eSgpKSB7CiAgICAgICAgIGlmICgh aXNTY3JpcHRDb250cm9sbGVyVGVybWluYXRpbmcoKSkKICAgICAgICAgICAgIENSQVNIKCk7Cg==