32324 2009-12-09 08:52:17 -0800 [Chromium] Incorrectly sends WebFrameClient notifications for a detached frame 2009-12-09 13:37:19 -0800 1 1 1 Unclassified WebKit WebKit API 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 fishd fishd beidson eric webkit.review.bot oldest_to_newest 170013 0 fishd 2009-12-09 08:52:17 -0800 [Chromium] Incorrectly sends WebFrameClient notifications for a detached frame This bug manifests itself as a failure to pass http/tests/loading/gmail-assert-on-load.html The fix is to suppress WebFrameClient callbacks when FrameLoaderClient::detachedFromParent3 is called. 170014 1 44541 fishd 2009-12-09 08:58:33 -0800 Created attachment 44541 v1 patch 170035 2 webkit.review.bot 2009-12-09 10:13:48 -0800 style-queue ran check-webkit-style on attachment 44541 without any errors. 170134 3 eric 2009-12-09 13:26:44 -0800 Looks sane to me. 170136 4 44541 eric 2009-12-09 13:27:35 -0800 Comment on attachment 44541 v1 patch This is missing a ChangeLog describing what tests this fixes. Otherwise it looks fine though (assuming this is covered by a test). If it's not changing a test, then that's bad, and I would r- this. 170141 5 fishd 2009-12-09 13:30:55 -0800 oops, not sure why my changelog entry didn't make it into the patch. let me upload again. 170143 6 44559 fishd 2009-12-09 13:33:04 -0800 Created attachment 44559 v2 patch With ChangeLog entry this time. 170146 7 44559 eric 2009-12-09 13:34:28 -0800 Comment on attachment 44559 v2 patch LGTM. 170148 8 fishd 2009-12-09 13:37:19 -0800 Landed as http://trac.webkit.org/changeset/51917 44541 2009-12-09 08:58:33 -0800 2009-12-09 13:33:04 -0800 v1 patch client_1.txt text/plain 4830 fishd SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNwcA0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQ0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2FkZXJDbGllbnRJbXBsLmNw cAkocmV2aXNpb24gNTE5MDApCisrKyBXZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xp ZW50SW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTIxNiw2ICsyMTYsMTAgQEAgdm9pZCBGcmFt ZUxvYWRlckNsaWVudEltcGw6OmRldGFjaGVkRnJvbQogICAgIC8vIGdvIHRvIGEgcGFnZSBhbmQg dGhlbiBuYXZpZ2F0ZSB0byBhIG5ldyBwYWdlIHdpdGhvdXQgZ2V0dGluZyBhbnkgYXNzZXJ0cwog ICAgIC8vIG9yIGNyYXNoZXMuCiAgICAgbV93ZWJGcmFtZS0+ZnJhbWUoKS0+c2NyaXB0KCktPnBy b3h5KCktPmNsZWFyRm9yQ2xvc2UoKTsKKyAgICAKKyAgICAvLyBTdG9wIGNvbW11bmljYXRpbmcg d2l0aCB0aGUgV2ViRnJhbWVDbGllbnQgYXQgdGhpcyBwb2ludCBzaW5jZSB3ZSBhcmUgbm8KKyAg ICAvLyBsb25nZXIgYXNzb2NpYXRlZCB3aXRoIHRoZSBQYWdlLgorICAgIG1fd2ViRnJhbWUtPmRy b3BDbGllbnQoKTsKIH0KIAogLy8gVGhpcyBmdW5jdGlvbiBpcyByZXNwb25zaWJsZSBmb3IgYXNz b2NpYXRpbmcgdGhlIHxpZGVudGlmaWVyfCB3aXRoIGEgZ2l2ZW4KSW5kZXg6IFdlYktpdC9jaHJv bWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9jaHJvbWl1 bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAkocmV2aXNpb24gNTE5MDApCisrKyBXZWJLaXQvY2hyb21p dW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0NjIsMTIgKzE0NjIs MTIgQEAgaW50IFdlYkZyYW1lSW1wbDo6bV9saXZlT2JqZWN0Q291bnQgPSAwOwogCiBQYXNzUmVm UHRyPFdlYkZyYW1lSW1wbD4gV2ViRnJhbWVJbXBsOjpjcmVhdGUoV2ViRnJhbWVDbGllbnQqIGNs aWVudCkKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IFdlYkZyYW1lSW1wbChDbGllbnRIYW5k bGU6OmNyZWF0ZShjbGllbnQpKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBXZWJGcmFtZUlt cGwoY2xpZW50KSk7CiB9CiAKLVdlYkZyYW1lSW1wbDo6V2ViRnJhbWVJbXBsKFBhc3NSZWZQdHI8 Q2xpZW50SGFuZGxlPiBjbGllbnRIYW5kbGUpCitXZWJGcmFtZUltcGw6OldlYkZyYW1lSW1wbChX ZWJGcmFtZUNsaWVudCogY2xpZW50KQogICAgIDogbV9mcmFtZUxvYWRlckNsaWVudCh0aGlzKQot ICAgICwgbV9jbGllbnRIYW5kbGUoY2xpZW50SGFuZGxlKQorICAgICwgbV9jbGllbnQoY2xpZW50 KQogICAgICwgbV9hY3RpdmVNYXRjaEZyYW1lKDApCiAgICAgLCBtX2FjdGl2ZU1hdGNoSW5kZXgo LTEpCiAgICAgLCBtX2xvY2F0aW5nQWN0aXZlUmVjdChmYWxzZSkKQEAgLTE1MDgsNyArMTUwOCw3 IEBAIHZvaWQgV2ViRnJhbWVJbXBsOjppbml0aWFsaXplQXNNYWluRnJhbWUKIFBhc3NSZWZQdHI8 RnJhbWU+IFdlYkZyYW1lSW1wbDo6Y3JlYXRlQ2hpbGRGcmFtZSgKICAgICBjb25zdCBGcmFtZUxv YWRSZXF1ZXN0JiByZXF1ZXN0LCBIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93bmVyRWxlbWVudCkK IHsKLSAgICBSZWZQdHI8V2ViRnJhbWVJbXBsPiB3ZWJmcmFtZShhZG9wdFJlZihuZXcgV2ViRnJh bWVJbXBsKG1fY2xpZW50SGFuZGxlKSkpOworICAgIFJlZlB0cjxXZWJGcmFtZUltcGw+IHdlYmZy YW1lKGFkb3B0UmVmKG5ldyBXZWJGcmFtZUltcGwobV9jbGllbnQpKSk7CiAKICAgICAvLyBBZGQg YW4gZXh0cmEgcmVmIG9uIGJlaGFsZiBvZiB0aGUgRnJhbWUvRnJhbWVMb2FkZXIsIHdoaWNoIHJl ZmVyZW5jZXMgdGhlCiAgICAgLy8gV2ViRnJhbWUgdmlhIHRoZSBGcmFtZUxvYWRlckNsaWVudCBp bnRlcmZhY2UuIFNlZSB0aGUgY29tbWVudCBhdCB0aGUgdG9wCkluZGV4OiBXZWJLaXQvY2hyb21p dW0vc3JjL1dlYkZyYW1lSW1wbC5oDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJGcmFtZUltcGwuaAkocmV2aXNpb24gNTE5MDApCisrKyBXZWJLaXQvY2hyb21pdW0vc3Jj L1dlYkZyYW1lSW1wbC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yMTEsMzAgKzIxMSwxNCBAQCBwdWJs aWM6CiAgICAgLy8gYmUga2VwdCBhcm91bmQgYXMgaXQgaXMgZGVsZXRlZCB3aGVuIHRoZSBwYWdl IGdvZXMgYXdheS4KICAgICBXZWJQYXNzd29yZEF1dG9jb21wbGV0ZUxpc3RlbmVyKiBnZXRQYXNz d29yZExpc3RlbmVyKFdlYkNvcmU6OkhUTUxJbnB1dEVsZW1lbnQqKTsKIAotICAgIFdlYkZyYW1l Q2xpZW50KiBjbGllbnQoKSBjb25zdCB7IHJldHVybiBtX2NsaWVudEhhbmRsZS0+Y2xpZW50KCk7 IH0KLSAgICB2b2lkIGRyb3BDbGllbnQoKSB7IG1fY2xpZW50SGFuZGxlLT5kcm9wQ2xpZW50KCk7 IH0KKyAgICBXZWJGcmFtZUNsaWVudCogY2xpZW50KCkgY29uc3QgeyByZXR1cm4gbV9jbGllbnQ7 IH0KKyAgICB2b2lkIGRyb3BDbGllbnQoKSB7IG1fY2xpZW50ID0gMDsgfQogCiBwcml2YXRlOgog ICAgIGNsYXNzIERlZmVycmVkU2NvcGVTdHJpbmdNYXRjaGVzOwogICAgIGZyaWVuZCBjbGFzcyBE ZWZlcnJlZFNjb3BlU3RyaW5nTWF0Y2hlczsKICAgICBmcmllbmQgY2xhc3MgRnJhbWVMb2FkZXJD bGllbnRJbXBsOwogCi0gICAgLy8gQSB3ZWFrIHJlZmVyZW5jZSB0byB0aGUgV2ViRnJhbWVDbGll bnQuICBFYWNoIFdlYkZyYW1lIGluIHRoZSBoaWVyYXJjaHkKLSAgICAvLyBvd25zIGEgcmVmZXJl bmNlIHRvIGEgQ2xpZW50SGFuZGxlLiAgV2hlbiB0aGUgbWFpbiBmcmFtZSBpcyBkZXN0cm95ZWQs IGl0Ci0gICAgLy8gY2xlYXJzIHRoZSBXZWJGcmFtZUNsaWVudC4KLSAgICBjbGFzcyBDbGllbnRI YW5kbGUgOiBwdWJsaWMgUmVmQ291bnRlZDxDbGllbnRIYW5kbGU+IHsKLSAgICBwdWJsaWM6Ci0g ICAgICAgIHN0YXRpYyBQYXNzUmVmUHRyPENsaWVudEhhbmRsZT4gY3JlYXRlKFdlYkZyYW1lQ2xp ZW50KiBjbGllbnQpCi0gICAgICAgIHsKLSAgICAgICAgICAgIHJldHVybiBhZG9wdFJlZihuZXcg Q2xpZW50SGFuZGxlKGNsaWVudCkpOwotICAgICAgICB9Ci0gICAgICAgIFdlYkZyYW1lQ2xpZW50 KiBjbGllbnQoKSB7IHJldHVybiBtX2NsaWVudDsgfQotICAgICAgICB2b2lkIGRyb3BDbGllbnQo KSB7IG1fY2xpZW50ID0gMDsgfQotICAgIHByaXZhdGU6Ci0gICAgICAgIENsaWVudEhhbmRsZShX ZWJGcmFtZUNsaWVudCogY2xpZW50KSA6IG1fY2xpZW50KGNsaWVudCkge30KLSAgICAgICAgV2Vi RnJhbWVDbGllbnQqIG1fY2xpZW50OwotICAgIH07Ci0KICAgICAvLyBBIGJpdCBtYXNrIHNwZWNp ZnlpbmcgYXJlYSBvZiB0aGUgZnJhbWUgdG8gaW52YWxpZGF0ZS4KICAgICBlbnVtIEFyZWFUb0lu dmFsaWRhdGUgewogICAgICAgSW52YWxpZGF0ZU5vdGhpbmcsCkBAIC0yNDMsNyArMjI3LDcgQEAg cHJpdmF0ZToKICAgICAgIEludmFsaWRhdGVBbGwgICAgICAgICAgLy8gQm90aCBjb250ZW50IGFy ZWEgYW5kIHRoZSBzY3JvbGxiYXIuCiAgICAgfTsKIAotICAgIFdlYkZyYW1lSW1wbChQYXNzUmVm UHRyPENsaWVudEhhbmRsZT4pOworICAgIFdlYkZyYW1lSW1wbChXZWJGcmFtZUNsaWVudCopOwog CiAgICAgLy8gSW5mb3JtcyB0aGUgV2ViRnJhbWUgdGhhdCB0aGUgRnJhbWUgaXMgYmVpbmcgY2xv c2VkLCBjYWxsZWQgYnkgdGhlCiAgICAgLy8gV2ViRnJhbWVMb2FkZXJDbGllbnQKQEAgLTI5Nyw3 ICsyODEsNyBAQCBwcml2YXRlOgogCiAgICAgRnJhbWVMb2FkZXJDbGllbnRJbXBsIG1fZnJhbWVM b2FkZXJDbGllbnQ7CiAKLSAgICBSZWZQdHI8Q2xpZW50SGFuZGxlPiBtX2NsaWVudEhhbmRsZTsK KyAgICBXZWJGcmFtZUNsaWVudCogbV9jbGllbnQ7CiAKICAgICAvLyBUaGlzIGlzIGEgd2VhayBw b2ludGVyIHRvIG91ciBjb3JyZXNwb25kaW5nIFdlYkNvcmUgZnJhbWUuICBBIHJlZmVyZW5jZSB0 bwogICAgIC8vIG91cnNlbHZlcyBpcyBoZWxkIHdoaWxlIGZyYW1lXyBpcyB2YWxpZC4gIFNlZSBv dXIgQ2xvc2luZyBtZXRob2QuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL1dlYlZpZXdJbXBs LmNwcA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQ0KLS0tIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3Bw CShyZXZpc2lvbiA1MTkwMCkKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvV2ViVmlld0ltcGwuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC03ODcsMTEgKzc4Nyw2IEBAIHZvaWQgV2ViVmlld0ltcGw6OmNs b3NlKCkKICAgICBpZiAobV9kZXZUb29sc0FnZW50LmdldCgpKQogICAgICAgICBtX2RldlRvb2xz QWdlbnQuY2xlYXIoKTsKIAotICAgIC8vIFdlIGRyb3AgdGhlIGNsaWVudCBhZnRlciB0aGUgcGFn ZSBoYXMgYmVlbiBkZXN0cm95ZWQgdG8gc3VwcG9ydCB0aGUKLSAgICAvLyBXZWJGcmFtZUNsaWVu dDo6ZGlkRGVzdHJveVNjcmlwdENvbnRleHQgbWV0aG9kLgotICAgIGlmIChtYWluRnJhbWVJbXBs KQotICAgICAgICBtYWluRnJhbWVJbXBsLT5kcm9wQ2xpZW50KCk7Ci0KICAgICAvLyBSZXNldCB0 aGUgZGVsZWdhdGUgdG8gcHJldmVudCBub3RpZmljYXRpb25zIGJlaW5nIHNlbnQgYXMgd2UncmUg YmVpbmcKICAgICAvLyBkZWxldGVkLgogICAgIG1fY2xpZW50ID0gMDsK 44559 2009-12-09 13:33:04 -0800 2009-12-09 13:34:28 -0800 v2 patch client_2.txt text/plain 6083 fishd SW5kZXg6IFdlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZwkocmV2aXNpb24gNTE5MTYpCisrKyBXZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjggQEAKKzIwMDktMTItMDkgIERhcmlu IEZpc2hlciAgPGRhcmluQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MzIzMjQKKyAgICAgICAgW0Nocm9taXVtXSBTdXBwcmVzcyBXZWJGcmFtZUNsaWVudCBj YWxsYmFja3MgZnJvbSBhIGRldGFjaGVkIGZyYW1lLgorCisgICAgICAgIFRoaXMgY2hhbmdlIG1l YW5zIHRoYXQgd2Ugbm8gbG9uZ2VyIG5lZWQgdGhlIENsaWVudEhhbmRsZSBjbGFzcy4KKyAgICAg ICAgRnJhbWVMb2FkZXJDbGllbnQ6OmRldGFjaGVkRnJvbVBhcmVudDMoKSBpcyBjYWxsZWQgb24g ZWFjaCBmcmFtZQorICAgICAgICBpbiB0aGUgZnJhbWUgdHJlZSBmcm9tIHdpdGhpbiBmcmFtZURl dGFjaGVkKCkuCisKKyAgICAgICAgVGVzdDogaHR0cC90ZXN0cy9sb2FkaW5nL2dtYWlsLWFzc2Vy dC1vbi1sb2FkLmh0bWwKKworICAgICAgICAqIHNyYy9GcmFtZUxvYWRlckNsaWVudEltcGwuY3Bw OgorICAgICAgICAoV2ViS2l0OjpGcmFtZUxvYWRlckNsaWVudEltcGw6OmRldGFjaGVkRnJvbVBh cmVudDMpOgorICAgICAgICAqIHNyYy9XZWJGcmFtZUltcGwuY3BwOgorICAgICAgICAoV2ViS2l0 OjpXZWJGcmFtZUltcGw6OmNyZWF0ZSk6CisgICAgICAgIChXZWJLaXQ6OldlYkZyYW1lSW1wbDo6 V2ViRnJhbWVJbXBsKToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVJbXBsOjpjcmVhdGVDaGls ZEZyYW1lKToKKyAgICAgICAgKiBzcmMvV2ViRnJhbWVJbXBsLmg6CisgICAgICAgIChXZWJLaXQ6 OldlYkZyYW1lSW1wbDo6Y2xpZW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViRnJhbWVJbXBsOjpk cm9wQ2xpZW50KToKKyAgICAgICAgKiBzcmMvV2ViVmlld0ltcGwuY3BwOgorICAgICAgICAoV2Vi S2l0OjpXZWJWaWV3SW1wbDo6Y2xvc2UpOgorCiAyMDA5LTEyLTA4ICBTdHVhcnQgTW9yZ2FuICA8 c3R1YXJ0bW9yZ2FuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBG aXNoZXIuCkluZGV4OiBXZWJLaXQvY2hyb21pdW0vc3JjL0ZyYW1lTG9hZGVyQ2xpZW50SW1wbC5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9GcmFtZUxvYWRlckNsaWVudElt cGwuY3BwCShyZXZpc2lvbiA1MTkxNikKKysrIFdlYktpdC9jaHJvbWl1bS9zcmMvRnJhbWVMb2Fk ZXJDbGllbnRJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjE2LDYgKzIxNiwxMCBAQCB2b2lk IEZyYW1lTG9hZGVyQ2xpZW50SW1wbDo6ZGV0YWNoZWRGcm9tCiAgICAgLy8gZ28gdG8gYSBwYWdl IGFuZCB0aGVuIG5hdmlnYXRlIHRvIGEgbmV3IHBhZ2Ugd2l0aG91dCBnZXR0aW5nIGFueSBhc3Nl cnRzCiAgICAgLy8gb3IgY3Jhc2hlcy4KICAgICBtX3dlYkZyYW1lLT5mcmFtZSgpLT5zY3JpcHQo KS0+cHJveHkoKS0+Y2xlYXJGb3JDbG9zZSgpOworICAgIAorICAgIC8vIFN0b3AgY29tbXVuaWNh dGluZyB3aXRoIHRoZSBXZWJGcmFtZUNsaWVudCBhdCB0aGlzIHBvaW50IHNpbmNlIHdlIGFyZSBu bworICAgIC8vIGxvbmdlciBhc3NvY2lhdGVkIHdpdGggdGhlIFBhZ2UuCisgICAgbV93ZWJGcmFt ZS0+ZHJvcENsaWVudCgpOwogfQogCiAvLyBUaGlzIGZ1bmN0aW9uIGlzIHJlc3BvbnNpYmxlIGZv ciBhc3NvY2lhdGluZyB0aGUgfGlkZW50aWZpZXJ8IHdpdGggYSBnaXZlbgpJbmRleDogV2ViS2l0 L2Nocm9taXVtL3NyYy9XZWJGcmFtZUltcGwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJv bWl1bS9zcmMvV2ViRnJhbWVJbXBsLmNwcAkocmV2aXNpb24gNTE5MTYpCisrKyBXZWJLaXQvY2hy b21pdW0vc3JjL1dlYkZyYW1lSW1wbC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE0NjIsMTIgKzE0 NjIsMTIgQEAgaW50IFdlYkZyYW1lSW1wbDo6bV9saXZlT2JqZWN0Q291bnQgPSAwOwogCiBQYXNz UmVmUHRyPFdlYkZyYW1lSW1wbD4gV2ViRnJhbWVJbXBsOjpjcmVhdGUoV2ViRnJhbWVDbGllbnQq IGNsaWVudCkKIHsKLSAgICByZXR1cm4gYWRvcHRSZWYobmV3IFdlYkZyYW1lSW1wbChDbGllbnRI YW5kbGU6OmNyZWF0ZShjbGllbnQpKSk7CisgICAgcmV0dXJuIGFkb3B0UmVmKG5ldyBXZWJGcmFt ZUltcGwoY2xpZW50KSk7CiB9CiAKLVdlYkZyYW1lSW1wbDo6V2ViRnJhbWVJbXBsKFBhc3NSZWZQ dHI8Q2xpZW50SGFuZGxlPiBjbGllbnRIYW5kbGUpCitXZWJGcmFtZUltcGw6OldlYkZyYW1lSW1w bChXZWJGcmFtZUNsaWVudCogY2xpZW50KQogICAgIDogbV9mcmFtZUxvYWRlckNsaWVudCh0aGlz KQotICAgICwgbV9jbGllbnRIYW5kbGUoY2xpZW50SGFuZGxlKQorICAgICwgbV9jbGllbnQoY2xp ZW50KQogICAgICwgbV9hY3RpdmVNYXRjaEZyYW1lKDApCiAgICAgLCBtX2FjdGl2ZU1hdGNoSW5k ZXgoLTEpCiAgICAgLCBtX2xvY2F0aW5nQWN0aXZlUmVjdChmYWxzZSkKQEAgLTE1MDgsNyArMTUw OCw3IEBAIHZvaWQgV2ViRnJhbWVJbXBsOjppbml0aWFsaXplQXNNYWluRnJhbWUKIFBhc3NSZWZQ dHI8RnJhbWU+IFdlYkZyYW1lSW1wbDo6Y3JlYXRlQ2hpbGRGcmFtZSgKICAgICBjb25zdCBGcmFt ZUxvYWRSZXF1ZXN0JiByZXF1ZXN0LCBIVE1MRnJhbWVPd25lckVsZW1lbnQqIG93bmVyRWxlbWVu dCkKIHsKLSAgICBSZWZQdHI8V2ViRnJhbWVJbXBsPiB3ZWJmcmFtZShhZG9wdFJlZihuZXcgV2Vi RnJhbWVJbXBsKG1fY2xpZW50SGFuZGxlKSkpOworICAgIFJlZlB0cjxXZWJGcmFtZUltcGw+IHdl YmZyYW1lKGFkb3B0UmVmKG5ldyBXZWJGcmFtZUltcGwobV9jbGllbnQpKSk7CiAKICAgICAvLyBB ZGQgYW4gZXh0cmEgcmVmIG9uIGJlaGFsZiBvZiB0aGUgRnJhbWUvRnJhbWVMb2FkZXIsIHdoaWNo IHJlZmVyZW5jZXMgdGhlCiAgICAgLy8gV2ViRnJhbWUgdmlhIHRoZSBGcmFtZUxvYWRlckNsaWVu dCBpbnRlcmZhY2UuIFNlZSB0aGUgY29tbWVudCBhdCB0aGUgdG9wCkluZGV4OiBXZWJLaXQvY2hy b21pdW0vc3JjL1dlYkZyYW1lSW1wbC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9jaHJvbWl1bS9z cmMvV2ViRnJhbWVJbXBsLmgJKHJldmlzaW9uIDUxOTE2KQorKysgV2ViS2l0L2Nocm9taXVtL3Ny Yy9XZWJGcmFtZUltcGwuaAkod29ya2luZyBjb3B5KQpAQCAtMjExLDMwICsyMTEsMTQgQEAgcHVi bGljOgogICAgIC8vIGJlIGtlcHQgYXJvdW5kIGFzIGl0IGlzIGRlbGV0ZWQgd2hlbiB0aGUgcGFn ZSBnb2VzIGF3YXkuCiAgICAgV2ViUGFzc3dvcmRBdXRvY29tcGxldGVMaXN0ZW5lciogZ2V0UGFz c3dvcmRMaXN0ZW5lcihXZWJDb3JlOjpIVE1MSW5wdXRFbGVtZW50Kik7CiAKLSAgICBXZWJGcmFt ZUNsaWVudCogY2xpZW50KCkgY29uc3QgeyByZXR1cm4gbV9jbGllbnRIYW5kbGUtPmNsaWVudCgp OyB9Ci0gICAgdm9pZCBkcm9wQ2xpZW50KCkgeyBtX2NsaWVudEhhbmRsZS0+ZHJvcENsaWVudCgp OyB9CisgICAgV2ViRnJhbWVDbGllbnQqIGNsaWVudCgpIGNvbnN0IHsgcmV0dXJuIG1fY2xpZW50 OyB9CisgICAgdm9pZCBkcm9wQ2xpZW50KCkgeyBtX2NsaWVudCA9IDA7IH0KIAogcHJpdmF0ZToK ICAgICBjbGFzcyBEZWZlcnJlZFNjb3BlU3RyaW5nTWF0Y2hlczsKICAgICBmcmllbmQgY2xhc3Mg RGVmZXJyZWRTY29wZVN0cmluZ01hdGNoZXM7CiAgICAgZnJpZW5kIGNsYXNzIEZyYW1lTG9hZGVy Q2xpZW50SW1wbDsKIAotICAgIC8vIEEgd2VhayByZWZlcmVuY2UgdG8gdGhlIFdlYkZyYW1lQ2xp ZW50LiAgRWFjaCBXZWJGcmFtZSBpbiB0aGUgaGllcmFyY2h5Ci0gICAgLy8gb3ducyBhIHJlZmVy ZW5jZSB0byBhIENsaWVudEhhbmRsZS4gIFdoZW4gdGhlIG1haW4gZnJhbWUgaXMgZGVzdHJveWVk LCBpdAotICAgIC8vIGNsZWFycyB0aGUgV2ViRnJhbWVDbGllbnQuCi0gICAgY2xhc3MgQ2xpZW50 SGFuZGxlIDogcHVibGljIFJlZkNvdW50ZWQ8Q2xpZW50SGFuZGxlPiB7Ci0gICAgcHVibGljOgot ICAgICAgICBzdGF0aWMgUGFzc1JlZlB0cjxDbGllbnRIYW5kbGU+IGNyZWF0ZShXZWJGcmFtZUNs aWVudCogY2xpZW50KQotICAgICAgICB7Ci0gICAgICAgICAgICByZXR1cm4gYWRvcHRSZWYobmV3 IENsaWVudEhhbmRsZShjbGllbnQpKTsKLSAgICAgICAgfQotICAgICAgICBXZWJGcmFtZUNsaWVu dCogY2xpZW50KCkgeyByZXR1cm4gbV9jbGllbnQ7IH0KLSAgICAgICAgdm9pZCBkcm9wQ2xpZW50 KCkgeyBtX2NsaWVudCA9IDA7IH0KLSAgICBwcml2YXRlOgotICAgICAgICBDbGllbnRIYW5kbGUo V2ViRnJhbWVDbGllbnQqIGNsaWVudCkgOiBtX2NsaWVudChjbGllbnQpIHt9Ci0gICAgICAgIFdl YkZyYW1lQ2xpZW50KiBtX2NsaWVudDsKLSAgICB9OwotCiAgICAgLy8gQSBiaXQgbWFzayBzcGVj aWZ5aW5nIGFyZWEgb2YgdGhlIGZyYW1lIHRvIGludmFsaWRhdGUuCiAgICAgZW51bSBBcmVhVG9J bnZhbGlkYXRlIHsKICAgICAgIEludmFsaWRhdGVOb3RoaW5nLApAQCAtMjQzLDcgKzIyNyw3IEBA IHByaXZhdGU6CiAgICAgICBJbnZhbGlkYXRlQWxsICAgICAgICAgIC8vIEJvdGggY29udGVudCBh cmVhIGFuZCB0aGUgc2Nyb2xsYmFyLgogICAgIH07CiAKLSAgICBXZWJGcmFtZUltcGwoUGFzc1Jl ZlB0cjxDbGllbnRIYW5kbGU+KTsKKyAgICBXZWJGcmFtZUltcGwoV2ViRnJhbWVDbGllbnQqKTsK IAogICAgIC8vIEluZm9ybXMgdGhlIFdlYkZyYW1lIHRoYXQgdGhlIEZyYW1lIGlzIGJlaW5nIGNs b3NlZCwgY2FsbGVkIGJ5IHRoZQogICAgIC8vIFdlYkZyYW1lTG9hZGVyQ2xpZW50CkBAIC0yOTcs NyArMjgxLDcgQEAgcHJpdmF0ZToKIAogICAgIEZyYW1lTG9hZGVyQ2xpZW50SW1wbCBtX2ZyYW1l TG9hZGVyQ2xpZW50OwogCi0gICAgUmVmUHRyPENsaWVudEhhbmRsZT4gbV9jbGllbnRIYW5kbGU7 CisgICAgV2ViRnJhbWVDbGllbnQqIG1fY2xpZW50OwogCiAgICAgLy8gVGhpcyBpcyBhIHdlYWsg cG9pbnRlciB0byBvdXIgY29ycmVzcG9uZGluZyBXZWJDb3JlIGZyYW1lLiAgQSByZWZlcmVuY2Ug dG8KICAgICAvLyBvdXJzZWx2ZXMgaXMgaGVsZCB3aGlsZSBmcmFtZV8gaXMgdmFsaWQuICBTZWUg b3VyIENsb3NpbmcgbWV0aG9kLgpJbmRleDogV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1w bC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJ KHJldmlzaW9uIDUxOTE2KQorKysgV2ViS2l0L2Nocm9taXVtL3NyYy9XZWJWaWV3SW1wbC5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTc4NywxMSArNzg3LDYgQEAgdm9pZCBXZWJWaWV3SW1wbDo6Y2xv c2UoKQogICAgIGlmIChtX2RldlRvb2xzQWdlbnQuZ2V0KCkpCiAgICAgICAgIG1fZGV2VG9vbHNB Z2VudC5jbGVhcigpOwogCi0gICAgLy8gV2UgZHJvcCB0aGUgY2xpZW50IGFmdGVyIHRoZSBwYWdl IGhhcyBiZWVuIGRlc3Ryb3llZCB0byBzdXBwb3J0IHRoZQotICAgIC8vIFdlYkZyYW1lQ2xpZW50 OjpkaWREZXN0cm95U2NyaXB0Q29udGV4dCBtZXRob2QuCi0gICAgaWYgKG1haW5GcmFtZUltcGwp Ci0gICAgICAgIG1haW5GcmFtZUltcGwtPmRyb3BDbGllbnQoKTsKLQogICAgIC8vIFJlc2V0IHRo ZSBkZWxlZ2F0ZSB0byBwcmV2ZW50IG5vdGlmaWNhdGlvbnMgYmVpbmcgc2VudCBhcyB3ZSdyZSBi ZWluZwogICAgIC8vIGRlbGV0ZWQuCiAgICAgbV9jbGllbnQgPSAwOwo=