74340 2011-12-12 14:33:48 -0800 Share more code between updateWidget implementations in HTMLEmbedElement and HTMLObjectElement 2012-01-25 15:30:17 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 47550 74360 1 eric eric abarth ap dglazkov simon.fraser webkit.review.bot oldest_to_newest 519480 0 eric 2011-12-12 14:33:48 -0800 Share more code between updateWidget implementations in HTMLEmbedElement and HTMLObjectElement 519483 1 118850 eric 2011-12-12 14:34:49 -0800 Created attachment 118850 Patch 519485 2 eric 2011-12-12 14:36:07 -0800 I'm not sure whether this explicit "guarded" function is better, or use of a non-virtual override. Neither is particularly future-proof. At least this implementation should catch future callers trying to dispatch a beforeload event for one of these objects (at least until the dispatchBeforeLoadEvent signature changes on ContainerNode). 519488 3 118850 abarth 2011-12-12 14:40:40 -0800 Comment on attachment 118850 Patch I'm not sure whether this will actually stop someone from write the wrong code, but I don't think it will cause that much confusion. 519493 4 eric 2011-12-12 14:43:51 -0800 The relevant code was added in bug 47550. Unclear if it's still needed, or if this general recursion protection is needed for all objects which dispatch beforeload events. 519647 5 118850 webkit.review.bot 2011-12-12 16:13:19 -0800 Comment on attachment 118850 Patch Attachment 118850 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10849103 New failing tests: fast/replaced/object-with-embed-url-param.html fast/replaced/object-param-spaces.html 542634 6 124013 eric 2012-01-25 14:32:56 -0800 Created attachment 124013 Patch for landing 542695 7 124013 webkit.review.bot 2012-01-25 15:30:12 -0800 Comment on attachment 124013 Patch for landing Clearing flags on attachment: 124013 Committed r105932: <http://trac.webkit.org/changeset/105932> 542696 8 webkit.review.bot 2012-01-25 15:30:17 -0800 All reviewed patches have been landed. Closing bug. 118850 2011-12-12 14:34:49 -0800 2012-01-25 14:32:50 -0800 Patch bug-74340-20111212143447.patch text/plain 4768 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNjA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWE5NTEzYWU2MWVjZDU0 OTliY2RiZjg2MDdhNGRlMzljNzk5ZWJmYS4uNDk4OTVhOWVmYjFlOTU4NjIyMDYwZmYyMTk1ZDAz M2FmYzgwMTYzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDExLTEyLTEyICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBTaGFyZSBtb3JlIGNvZGUgYmV0 d2VlbiB1cGRhdGVXaWRnZXQgaW1wbGVtZW50YXRpb25zIGluIEhUTUxFbWJlZEVsZW1lbnQgYW5k IEhUTUxPYmplY3RFbGVtZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03NDM0MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEknbSBwcmVwYXJpbmcgdG8gdW5pZnkgdGhlc2UgdHdvIG1ldGhvZHMsIGFuZCBz dGFydGluZyBieSBzaGFyaW5nIG1vcmUgY29kZSBiZXR3ZWVuIHRoZW0uCisKKyAgICAgICAgKiBo dG1sL0hUTUxFbWJlZEVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SFRNTEVtYmVkRWxl bWVudDo6dXBkYXRlV2lkZ2V0KToKKyAgICAgICAgKiBodG1sL0hUTUxPYmplY3RFbGVtZW50LmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxPYmplY3RFbGVtZW50Ojp1cGRhdGVXaWRnZXQpOgor ICAgICAgICAqIGh0bWwvSFRNTFBsdWdJbkVsZW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 SFRNTFBsdWdJbkVsZW1lbnQ6Omd1YXJkZWREaXNwYXRjaEJlZm9yZUxvYWRFdmVudCk6CisgICAg ICAgICogaHRtbC9IVE1MUGx1Z0luRWxlbWVudC5oOgorCiAyMDExLTEyLTEyICBTaW1vbiBGcmFz ZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFNoYXJlIGNvZGUgdGhhdCBj aGVja3MgZm9yIG1hdGNoaW5nIHNldHMgb2YgdHJhbnNmb3JtIG9wZXJhdGlvbnMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVtYmVkRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxFbWJlZEVsZW1lbnQuY3BwCmluZGV4IDI4OWEyMjM0MjUxZDM3MjY1MDY0 MjJiODMzMDE4Mjk0NjYxNjM5MDEuLmZjNmVjNGI5OTMxNjBmODM1NzM3NjMyYWY4ZDIyMTc5ZjJk N2M5NjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEVtYmVkRWxlbWVudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MRW1iZWRFbGVtZW50LmNwcApAQCAtMTY0 LDExICsxNjQsNyBAQCB2b2lkIEhUTUxFbWJlZEVsZW1lbnQ6OnVwZGF0ZVdpZGdldChQbHVnaW5D cmVhdGlvbk9wdGlvbiBwbHVnaW5DcmVhdGlvbk9wdGlvbikKICAgICBWZWN0b3I8U3RyaW5nPiBw YXJhbVZhbHVlczsKICAgICBwYXJhbWV0ZXJzRm9yUGx1Z2luKHBhcmFtTmFtZXMsIHBhcmFtVmFs dWVzKTsKIAotICAgIEFTU0VSVCghbV9pbkJlZm9yZUxvYWRFdmVudEhhbmRsZXIpOwotICAgIG1f aW5CZWZvcmVMb2FkRXZlbnRIYW5kbGVyID0gdHJ1ZTsKLSAgICBib29sIGJlZm9yZUxvYWRBbGxv d2VkTG9hZCA9IGRpc3BhdGNoQmVmb3JlTG9hZEV2ZW50KG1fdXJsKTsKLSAgICBtX2luQmVmb3Jl TG9hZEV2ZW50SGFuZGxlciA9IGZhbHNlOwotCisgICAgYm9vbCBiZWZvcmVMb2FkQWxsb3dlZExv YWQgPSBndWFyZGVkRGlzcGF0Y2hCZWZvcmVMb2FkRXZlbnQobV91cmwpOwogICAgIGlmICghYmVm b3JlTG9hZEFsbG93ZWRMb2FkKSB7CiAgICAgICAgIGlmIChkb2N1bWVudCgpLT5pc1BsdWdpbkRv Y3VtZW50KCkpIHsKICAgICAgICAgICAgIC8vIFBsdWdpbnMgaW5zaWRlIHBsdWdpbiBkb2N1bWVu dHMgbG9hZCBkaWZmZXJlbnRseSB0aGFuIG90aGVyIHBsdWdpbnMuIEJ5IHRoZSB0aW1lCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPYmplY3RFbGVtZW50LmNwcCBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTE9iamVjdEVsZW1lbnQuY3BwCmluZGV4IGU3N2UwMmI0NjI4YWRj MmY4Zjg3MzJiNmE4YTVlYzc5YTI2Nzk2M2UuLjc2OTlmYmY2OTMxZmNmM2NhYTllZjg0Y2NkYThi NWQ1MTIzZDgwOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE9iamVjdEVs ZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTE9iamVjdEVsZW1lbnQuY3Bw CkBAIC0zMTYsMTEgKzMxNiw3IEBAIHZvaWQgSFRNTE9iamVjdEVsZW1lbnQ6OnVwZGF0ZVdpZGdl dChQbHVnaW5DcmVhdGlvbk9wdGlvbiBwbHVnaW5DcmVhdGlvbk9wdGlvbikKICAgICBpZiAocGx1 Z2luQ3JlYXRpb25PcHRpb24gPT0gQ3JlYXRlT25seU5vbk5ldHNjYXBlUGx1Z2lucyAmJiB3b3Vs ZExvYWRBc05ldHNjYXBlUGx1Z2luKHVybCwgc2VydmljZVR5cGUpKQogICAgICAgICByZXR1cm47 CiAKLSAgICBBU1NFUlQoIW1faW5CZWZvcmVMb2FkRXZlbnRIYW5kbGVyKTsKLSAgICBtX2luQmVm b3JlTG9hZEV2ZW50SGFuZGxlciA9IHRydWU7Ci0gICAgYm9vbCBiZWZvcmVMb2FkQWxsb3dlZExv YWQgPSBkaXNwYXRjaEJlZm9yZUxvYWRFdmVudCh1cmwpOwotICAgIG1faW5CZWZvcmVMb2FkRXZl bnRIYW5kbGVyID0gZmFsc2U7Ci0KKyAgICBib29sIGJlZm9yZUxvYWRBbGxvd2VkTG9hZCA9IGd1 YXJkZWREaXNwYXRjaEJlZm9yZUxvYWRFdmVudChtX3VybCk7CiAgICAgLy8gYmVmb3JlbG9hZCBl dmVudHMgY2FuIG1vZGlmeSB0aGUgRE9NLCBwb3RlbnRpYWxseSBjYXVzaW5nCiAgICAgLy8gUmVu ZGVyV2lkZ2V0OjpkZXN0cm95KCkgdG8gYmUgY2FsbGVkLiAgRW5zdXJlIHdlIGhhdmVuJ3QgYmVl bgogICAgIC8vIGRlc3Ryb3llZCBiZWZvcmUgY29udGludWluZy4KZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MUGx1Z0luRWxlbWVudC5jcHAKaW5kZXggY2M2ZjNkZWE2OTdjZGJlNTkwZmQwZWUyNGRk MzBkYjBkMmY4OTQ3Zi4uNjIyOWQyZTAzYWNmOGM3Mjc3MzQzMmVmZTU4NDZjYWQxNWQ5OTEyZiAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luRWxlbWVudC5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luRWxlbWVudC5jcHAKQEAgLTExMCw2ICsx MTAsMTcgQEAgUGFzc1NjcmlwdEluc3RhbmNlIEhUTUxQbHVnSW5FbGVtZW50OjpnZXRJbnN0YW5j ZSgpCiAgICAgcmV0dXJuIG1faW5zdGFuY2U7CiB9CiAKK2Jvb2wgSFRNTFBsdWdJbkVsZW1lbnQ6 Omd1YXJkZWREaXNwYXRjaEJlZm9yZUxvYWRFdmVudChjb25zdCBTdHJpbmcmIHNvdXJjZVVSTCkK K3sKKyAgICBBU1NFUlQoIW1faW5CZWZvcmVMb2FkRXZlbnRIYW5kbGVyKTsKKyAgICBtX2luQmVm b3JlTG9hZEV2ZW50SGFuZGxlciA9IHRydWU7CisgICAgLy8gc3RhdGljX2Nhc3QgaXMgdXNlZCB0 byBhdm9pZCBhIGNvbXBpbGUgZXJyb3Igc2luY2UgZGlzcGF0Y2hCZWZvcmVMb2FkRXZlbnQKKyAg ICAvLyBpcyBpbnRlbnRpb25hbGx5IHVuZGVmaW5lZCBvbiB0aGlzIGNsYXNzLgorICAgIGJvb2wg YmVmb3JlTG9hZEFsbG93ZWRMb2FkID0gc3RhdGljX2Nhc3Q8SFRNTEZyYW1lT3duZXJFbGVtZW50 Kj4odGhpcyktPmRpc3BhdGNoQmVmb3JlTG9hZEV2ZW50KHNvdXJjZVVSTCk7CisgICAgbV9pbkJl Zm9yZUxvYWRFdmVudEhhbmRsZXIgPSBmYWxzZTsKKyAgICByZXR1cm4gYmVmb3JlTG9hZEFsbG93 ZWRMb2FkOworfQorCiBXaWRnZXQqIEhUTUxQbHVnSW5FbGVtZW50OjpwbHVnaW5XaWRnZXQoKQog ewogICAgIGlmIChtX2luQmVmb3JlTG9hZEV2ZW50SGFuZGxlcikgewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luRWxlbWVudC5oIGIvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MUGx1Z0luRWxlbWVudC5oCmluZGV4IDJlMzNjNjY3MjU5MThlNmJkYTEzMzM3NmQ2MDMw NWVhNWIyODY2NDIuLjI5YjRhNjI5MTk2OWU5Y2Q2YWZmOGEyMmFkNGYwYWVjMDYzOGM3MWUgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTFBsdWdJbkVsZW1lbnQuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5FbGVtZW50LmgKQEAgLTYyLDggKzYyLDEyIEBA IHByb3RlY3RlZDoKICAgICB2aXJ0dWFsIHZvaWQgcGFyc2VNYXBwZWRBdHRyaWJ1dGUoQXR0cmli dXRlKik7CiAKICAgICBib29sIG1faW5CZWZvcmVMb2FkRXZlbnRIYW5kbGVyOworICAgIC8vIFN1 YmNsYXNzZXMgc2hvdWxkIHVzZSBndWFyZGVkRGlzcGF0Y2hCZWZvcmVMb2FkRXZlbnQgaW5zdGVh ZCBvZiBjYWxsaW5nIGRpc3BhdGNoQmVmb3JlTG9hZEV2ZW50IGRpcmVjdGx5LgorICAgIGJvb2wg Z3VhcmRlZERpc3BhdGNoQmVmb3JlTG9hZEV2ZW50KGNvbnN0IFN0cmluZyYgc291cmNlVVJMKTsK IAogcHJpdmF0ZToKKyAgICBib29sIGRpc3BhdGNoQmVmb3JlTG9hZEV2ZW50KGNvbnN0IFN0cmlu ZyYgc291cmNlVVJMKTsgLy8gTm90IGltcGxlbWVudGVkLCBnZW5lcmF0ZXMgYSBjb21waWxlIGVy cm9yIGlmIHN1YmNsYXNzZXMgY2FsbCB0aGlzIGJ5IG1pc3Rha2UuCisKICAgICB2aXJ0dWFsIHZv aWQgZGVmYXVsdEV2ZW50SGFuZGxlcihFdmVudCopOwogCiAgICAgdmlydHVhbCBSZW5kZXJXaWRn ZXQqIHJlbmRlcldpZGdldEZvckpTQmluZGluZ3MoKSA9IDA7Cg== 124013 2012-01-25 14:32:56 -0800 2012-01-25 15:30:12 -0800 Patch for landing bug-74340-20120125143254.patch text/plain 4752 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTA1OTI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjEzNGZjZTk2NTMzZjZi YWE0YWE1NzAyNWJmODEyMmFlMzIyZjFhNC4uZDE0NTBmNzBmNjU2NjkxNTZmNGZhOTM3NTI2ODI2 MTRjY2Y4MGRhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDEyLTAxLTI1ICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBTaGFyZSBtb3JlIGNvZGUgYmV0 d2VlbiB1cGRhdGVXaWRnZXQgaW1wbGVtZW50YXRpb25zIGluIEhUTUxFbWJlZEVsZW1lbnQgYW5k IEhUTUxPYmplY3RFbGVtZW50CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD03NDM0MAorCisgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCisKKyAg ICAgICAgSSdtIHByZXBhcmluZyB0byB1bmlmeSB0aGVzZSB0d28gbWV0aG9kcywgYW5kIHN0YXJ0 aW5nIGJ5IHNoYXJpbmcgbW9yZSBjb2RlIGJldHdlZW4gdGhlbS4KKworICAgICAgICAqIGh0bWwv SFRNTEVtYmVkRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRW1iZWRFbGVtZW50 Ojp1cGRhdGVXaWRnZXQpOgorICAgICAgICAqIGh0bWwvSFRNTE9iamVjdEVsZW1lbnQuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6SFRNTE9iamVjdEVsZW1lbnQ6OnVwZGF0ZVdpZGdldCk6CisgICAg ICAgICogaHRtbC9IVE1MUGx1Z0luRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1M UGx1Z0luRWxlbWVudDo6Z3VhcmRlZERpc3BhdGNoQmVmb3JlTG9hZEV2ZW50KToKKyAgICAgICAg KiBodG1sL0hUTUxQbHVnSW5FbGVtZW50Lmg6CisKIDIwMTItMDEtMjUgIE5vJ2FtIFJvc2VudGhh bCAgPG5vYW0ucm9zZW50aGFsQG5va2lhLmNvbT4KIAogICAgICAgICBbVGV4bWFwXSBEaXZpZGUg VGV4dHVyZU1hcHBlck5vZGUuY3BwIHRvIDMgZmlsZXMuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxFbWJlZEVsZW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M RW1iZWRFbGVtZW50LmNwcAppbmRleCBlODk5MWExNDZhNWEzNjgxOWJhMTVjMmVmMTZlZmU5ZWQw MTIwZTFlLi42Yjk1YWI2MWM4MTMwMGM4ZmUyYmQwYThkNGExOGY4NWZiNzU3YmY3IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxFbWJlZEVsZW1lbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTEVtYmVkRWxlbWVudC5jcHAKQEAgLTE1NCwxMSArMTU0LDcgQEAg dm9pZCBIVE1MRW1iZWRFbGVtZW50Ojp1cGRhdGVXaWRnZXQoUGx1Z2luQ3JlYXRpb25PcHRpb24g cGx1Z2luQ3JlYXRpb25PcHRpb24pCiAgICAgVmVjdG9yPFN0cmluZz4gcGFyYW1WYWx1ZXM7CiAg ICAgcGFyYW1ldGVyc0ZvclBsdWdpbihwYXJhbU5hbWVzLCBwYXJhbVZhbHVlcyk7CiAKLSAgICBB U1NFUlQoIW1faW5CZWZvcmVMb2FkRXZlbnRIYW5kbGVyKTsKLSAgICBtX2luQmVmb3JlTG9hZEV2 ZW50SGFuZGxlciA9IHRydWU7Ci0gICAgYm9vbCBiZWZvcmVMb2FkQWxsb3dlZExvYWQgPSBkaXNw YXRjaEJlZm9yZUxvYWRFdmVudChtX3VybCk7Ci0gICAgbV9pbkJlZm9yZUxvYWRFdmVudEhhbmRs ZXIgPSBmYWxzZTsKLQorICAgIGJvb2wgYmVmb3JlTG9hZEFsbG93ZWRMb2FkID0gZ3VhcmRlZERp c3BhdGNoQmVmb3JlTG9hZEV2ZW50KG1fdXJsKTsKICAgICBpZiAoIWJlZm9yZUxvYWRBbGxvd2Vk TG9hZCkgewogICAgICAgICBpZiAoZG9jdW1lbnQoKS0+aXNQbHVnaW5Eb2N1bWVudCgpKSB7CiAg ICAgICAgICAgICAvLyBQbHVnaW5zIGluc2lkZSBwbHVnaW4gZG9jdW1lbnRzIGxvYWQgZGlmZmVy ZW50bHkgdGhhbiBvdGhlciBwbHVnaW5zLiBCeSB0aGUgdGltZQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MT2JqZWN0RWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxPYmplY3RFbGVtZW50LmNwcAppbmRleCAzMzZjYTY3MzVkYTlmYmUzNGI5M2RiNmE5ZjM1 ZjU4ZDY5OWY3ZGRmLi4zMzQ0NzYxMGUyZDgwMWRiODA5NDYyYWFhNjczMzA5MmQ5YWM4ODY3IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPYmplY3RFbGVtZW50LmNwcAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxPYmplY3RFbGVtZW50LmNwcApAQCAtMjg5LDExICsy ODksNyBAQCB2b2lkIEhUTUxPYmplY3RFbGVtZW50Ojp1cGRhdGVXaWRnZXQoUGx1Z2luQ3JlYXRp b25PcHRpb24gcGx1Z2luQ3JlYXRpb25PcHRpb24pCiAgICAgaWYgKHBsdWdpbkNyZWF0aW9uT3B0 aW9uID09IENyZWF0ZU9ubHlOb25OZXRzY2FwZVBsdWdpbnMgJiYgd291bGRMb2FkQXNOZXRzY2Fw ZVBsdWdpbih1cmwsIHNlcnZpY2VUeXBlKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgQVNTRVJU KCFtX2luQmVmb3JlTG9hZEV2ZW50SGFuZGxlcik7Ci0gICAgbV9pbkJlZm9yZUxvYWRFdmVudEhh bmRsZXIgPSB0cnVlOwotICAgIGJvb2wgYmVmb3JlTG9hZEFsbG93ZWRMb2FkID0gZGlzcGF0Y2hC ZWZvcmVMb2FkRXZlbnQodXJsKTsKLSAgICBtX2luQmVmb3JlTG9hZEV2ZW50SGFuZGxlciA9IGZh bHNlOwotCisgICAgYm9vbCBiZWZvcmVMb2FkQWxsb3dlZExvYWQgPSBndWFyZGVkRGlzcGF0Y2hC ZWZvcmVMb2FkRXZlbnQodXJsKTsKICAgICAvLyBiZWZvcmVsb2FkIGV2ZW50cyBjYW4gbW9kaWZ5 IHRoZSBET00sIHBvdGVudGlhbGx5IGNhdXNpbmcKICAgICAvLyBSZW5kZXJXaWRnZXQ6OmRlc3Ry b3koKSB0byBiZSBjYWxsZWQuICBFbnN1cmUgd2UgaGF2ZW4ndCBiZWVuCiAgICAgLy8gZGVzdHJv eWVkIGJlZm9yZSBjb250aW51aW5nLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MUGx1Z0luRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5FbGVt ZW50LmNwcAppbmRleCBjYzZmM2RlYTY5N2NkYmU1OTBmZDBlZTI0ZGQzMGRiMGQyZjg5NDdmLi42 MjI5ZDJlMDNhY2Y4YzcyNzczNDMyZWZlNTg0NmNhZDE1ZDk5MTJmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5FbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxQbHVnSW5FbGVtZW50LmNwcApAQCAtMTEwLDYgKzExMCwxNyBAQCBQYXNzU2Ny aXB0SW5zdGFuY2UgSFRNTFBsdWdJbkVsZW1lbnQ6OmdldEluc3RhbmNlKCkKICAgICByZXR1cm4g bV9pbnN0YW5jZTsKIH0KIAorYm9vbCBIVE1MUGx1Z0luRWxlbWVudDo6Z3VhcmRlZERpc3BhdGNo QmVmb3JlTG9hZEV2ZW50KGNvbnN0IFN0cmluZyYgc291cmNlVVJMKQoreworICAgIEFTU0VSVCgh bV9pbkJlZm9yZUxvYWRFdmVudEhhbmRsZXIpOworICAgIG1faW5CZWZvcmVMb2FkRXZlbnRIYW5k bGVyID0gdHJ1ZTsKKyAgICAvLyBzdGF0aWNfY2FzdCBpcyB1c2VkIHRvIGF2b2lkIGEgY29tcGls ZSBlcnJvciBzaW5jZSBkaXNwYXRjaEJlZm9yZUxvYWRFdmVudAorICAgIC8vIGlzIGludGVudGlv bmFsbHkgdW5kZWZpbmVkIG9uIHRoaXMgY2xhc3MuCisgICAgYm9vbCBiZWZvcmVMb2FkQWxsb3dl ZExvYWQgPSBzdGF0aWNfY2FzdDxIVE1MRnJhbWVPd25lckVsZW1lbnQqPih0aGlzKS0+ZGlzcGF0 Y2hCZWZvcmVMb2FkRXZlbnQoc291cmNlVVJMKTsKKyAgICBtX2luQmVmb3JlTG9hZEV2ZW50SGFu ZGxlciA9IGZhbHNlOworICAgIHJldHVybiBiZWZvcmVMb2FkQWxsb3dlZExvYWQ7Cit9CisKIFdp ZGdldCogSFRNTFBsdWdJbkVsZW1lbnQ6OnBsdWdpbldpZGdldCgpCiB7CiAgICAgaWYgKG1faW5C ZWZvcmVMb2FkRXZlbnRIYW5kbGVyKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1s L0hUTUxQbHVnSW5FbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxQbHVnSW5FbGVt ZW50LmgKaW5kZXggN2RhZGZkYTlmNGQwZjEyMDRjMTRkMDM4ODE4YTA4NzMxMDg0ZTgwNC4uYTEw YWY2MTQxYjZiMGJlNjc2Mjk2MDk2ZWIzZWRkOWFlYWYyZDVhZSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MUGx1Z0luRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTFBsdWdJbkVsZW1lbnQuaApAQCAtNjIsOCArNjIsMTIgQEAgcHJvdGVjdGVkOgogICAg IHZpcnR1YWwgdm9pZCBwYXJzZU1hcHBlZEF0dHJpYnV0ZShBdHRyaWJ1dGUqKTsKIAogICAgIGJv b2wgbV9pbkJlZm9yZUxvYWRFdmVudEhhbmRsZXI7CisgICAgLy8gU3ViY2xhc3NlcyBzaG91bGQg dXNlIGd1YXJkZWREaXNwYXRjaEJlZm9yZUxvYWRFdmVudCBpbnN0ZWFkIG9mIGNhbGxpbmcgZGlz cGF0Y2hCZWZvcmVMb2FkRXZlbnQgZGlyZWN0bHkuCisgICAgYm9vbCBndWFyZGVkRGlzcGF0Y2hC ZWZvcmVMb2FkRXZlbnQoY29uc3QgU3RyaW5nJiBzb3VyY2VVUkwpOwogCiBwcml2YXRlOgorICAg IGJvb2wgZGlzcGF0Y2hCZWZvcmVMb2FkRXZlbnQoY29uc3QgU3RyaW5nJiBzb3VyY2VVUkwpOyAv LyBOb3QgaW1wbGVtZW50ZWQsIGdlbmVyYXRlcyBhIGNvbXBpbGUgZXJyb3IgaWYgc3ViY2xhc3Nl cyBjYWxsIHRoaXMgYnkgbWlzdGFrZS4KKwogICAgIHZpcnR1YWwgdm9pZCBkZWZhdWx0RXZlbnRI YW5kbGVyKEV2ZW50Kik7CiAKICAgICB2aXJ0dWFsIFJlbmRlcldpZGdldCogcmVuZGVyV2lkZ2V0 Rm9ySlNCaW5kaW5ncygpID0gMDsK