178839 2017-10-25 17:46:35 -0700 messageEvent.source can also be a ServiceWorker 2017-11-15 12:44:49 -0800 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=174541 https://html.spec.whatwg.org/multipage/comms.html#messageeventsource InRadar P2 Normal --- 178794 1 cdumez cdumez achristensen beidson buildbot commit-queue darin dbates esprehn+autocc ggaren kangil.han kondapallykalyan rniwa sam webkit-bug-importer youennf oldest_to_newest 1364606 0 cdumez 2017-10-25 17:46:35 -0700 messageEvent.source can also be a ServiceWorker: - https://html.spec.whatwg.org/multipage/comms.html#messageeventsource 1364615 1 324933 cdumez 2017-10-25 18:13:11 -0700 Created attachment 324933 Patch 1364632 2 324933 beidson 2017-10-25 19:21:57 -0700 Comment on attachment 324933 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=324933&action=review > Source/WebCore/dom/MessageEvent.h:46 > -using MessageEventSource = Variant<RefPtr<DOMWindow>, RefPtr<MessagePort>>; > +using MessageEventSource = Variant<RefPtr<DOMWindow>, RefPtr<MessagePort> > +#if ENABLE(SERVICE_WORKER) > + , RefPtr<ServiceWorker> > +#endif > + >; This is gross. I'd almost prefer a single line duplicating all 3 possibilities for the #if ENABLE() case. > Source/WebCore/dom/MessageEvent.idl:33 > +#if defined(ENABLE_SERVICE_WORKER) && ENABLE_SERVICE_WORKER > +typedef (DOMWindow or MessagePort or ServiceWorker) MessageEventSource; > +#else > +typedef (DOMWindow or MessagePort) MessageEventSource; > +#endif Like this is what I was alluding to up there ^^^ 1364638 3 324944 cdumez 2017-10-25 19:35:39 -0700 Created attachment 324944 Patch 1364644 4 324944 commit-queue 2017-10-25 19:57:11 -0700 Comment on attachment 324944 Patch Clearing flags on attachment: 324944 Committed r224000: <https://trac.webkit.org/changeset/224000> 1364645 5 commit-queue 2017-10-25 19:57:13 -0700 All reviewed patches have been landed. Closing bug. 1364646 6 sam 2017-10-25 20:02:50 -0700 :(. I was getting so close to getting rid of the preprocessor for IDL files. Would an alternative approach, where in non-ENABLE(SERVICE_WORKER) we have a dummy ServiceWorker class work in this case (I am considering this for the non-ENABLE(VIDEO) case). Without a way to get a ServiceWorker from script, the fact that it is included in the union should not be observable. 1372238 7 webkit-bug-importer 2017-11-15 12:44:49 -0800 <rdar://problem/35568076> 324933 2017-10-25 18:13:11 -0700 2017-10-25 19:35:37 -0700 Patch bug-178839-20171025181310.patch text/plain 4915 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzOTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDU5Y2MxZGMwYTRlNTE2 OWVkMDMyMzBmNzI3N2VlODNmOGM3NDExMS4uMGRkNTVkMDg4MDIxMzE5ZjRjM2M5ZTBkZmM5ZmMz M2JlN2ZkZjgwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE3LTEwLTI1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgbWVzc2FnZUV2ZW50LnNvdXJj ZSBjYW4gYWxzbyBiZSBhIFNlcnZpY2VXb3JrZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE3ODgzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIG1lc3NhZ2VFdmVudC5zb3VyY2UgY2FuIGFsc28gYmUgYSBT ZXJ2aWNlV29ya2VyOgorICAgICAgICAtIGh0dHBzOi8vaHRtbC5zcGVjLndoYXR3Zy5vcmcvbXVs dGlwYWdlL2NvbW1zLmh0bWwjbWVzc2FnZWV2ZW50c291cmNlCisKKyAgICAgICAgVGhpcyBlbmFi bGVzIGNhbGxpbmcgcG9zdE1lc3NhZ2UoKSBmcm9tIGEgU2VydmljZVdvcmtlciB2aWEgQnVnIDE3 ODc5NC4KKworICAgICAgICAqIGRvbS9NZXNzYWdlRXZlbnQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6TWVzc2FnZUV2ZW50Ojpzb3VyY2UgY29uc3QpOiBEZWxldGVkLgorICAgICAgICAqIGRvbS9N ZXNzYWdlRXZlbnQuaDoKKyAgICAgICAgKiBkb20vTWVzc2FnZUV2ZW50LmlkbDoKKwogMjAxNy0x MC0yNSAgUnlvc3VrZSBOaXdhICA8cm5pd2FAd2Via2l0Lm9yZz4KIAogICAgICAgICBTdHlsZTo6 U2NvcGU6OmZsdXNoUGVuZGluZ1VwZGF0ZSgpIGNhbiByZXBsYWNlIHRoZSBlbnRpcmUgZG9jdW1l bnQgaW4gWFNMVFByb2Nlc3Nvcjo6Y3JlYXRlRG9jdW1lbnRGcm9tU291cmNlCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9kb20vTWVzc2FnZUV2ZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Rv bS9NZXNzYWdlRXZlbnQuY3BwCmluZGV4IDU0ODU5NmNmMWY4NWU0OWNmOGFiMWEwMTEyYjYzZDRj NmViZjM4ZTQuLmU5ODg5ZTU2Y2ZmMTUzMDNjODBjMjU3Yjc4YjQxMjBhZjFmNDQyOTggMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9NZXNzYWdlRXZlbnQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2RvbS9NZXNzYWdlRXZlbnQuY3BwCkBAIC0xNTAsMTcgKzE1MCw2IEBAIHZvaWQgTWVz c2FnZUV2ZW50Ojppbml0TWVzc2FnZUV2ZW50KEV4ZWNTdGF0ZSYgc3RhdGUsIGNvbnN0IEF0b21p Y1N0cmluZyYgdHlwZSwKICAgICBtX3BvcnRzID0gV1RGTW92ZShwb3J0cyk7CiB9CiAKLUV2ZW50 VGFyZ2V0KiBNZXNzYWdlRXZlbnQ6OnNvdXJjZSgpIGNvbnN0Ci17Ci0gICAgaWYgKCFtX3NvdXJj ZSkKLSAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0KLSAgICByZXR1cm4gV1RGOjpzd2l0Y2hPbiht X3NvdXJjZS52YWx1ZSgpLAotICAgICAgICBbXSAoY29uc3QgUmVmUHRyPERPTVdpbmRvdz4mIHdp bmRvdykgLT4gRXZlbnRUYXJnZXQqIHsgcmV0dXJuIGNvbnN0X2Nhc3Q8RE9NV2luZG93Kj4od2lu ZG93LmdldCgpKTsgfSwKLSAgICAgICAgW10gKGNvbnN0IFJlZlB0cjxNZXNzYWdlUG9ydD4mIG1l c3NhZ2VQb3J0KSAtPiBFdmVudFRhcmdldCogeyByZXR1cm4gY29uc3RfY2FzdDxNZXNzYWdlUG9y dCo+KG1lc3NhZ2VQb3J0LmdldCgpKTsgfQotICAgICk7Ci19Ci0KIFJlZlB0cjxTZXJpYWxpemVk U2NyaXB0VmFsdWU+IE1lc3NhZ2VFdmVudDo6dHJ5U2VyaWFsaXplRGF0YShFeGVjU3RhdGUqIGV4 ZWMpCiB7CiAgICAgQVNTRVJUKCFtX2RhdGFBc1NjcmlwdFZhbHVlLmhhc05vVmFsdWUoKSk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vTWVzc2FnZUV2ZW50LmggYi9Tb3VyY2UvV2Vi Q29yZS9kb20vTWVzc2FnZUV2ZW50LmgKaW5kZXggZWZkNjViM2M0ODE5YjkyYmMwY2Y2ZTNlY2Fk MzYzMjVkYTAzZGI1Zi4uMGE2MWIxNDg3MmU1ZDZiOTA3ZGMzNDJiYzU5YzBmNGUzNmM2OTE2YyAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL01lc3NhZ2VFdmVudC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2RvbS9NZXNzYWdlRXZlbnQuaApAQCAtMzEsNiArMzEsNyBAQAogI2luY2x1ZGUg IkV2ZW50LmgiCiAjaW5jbHVkZSAiTWVzc2FnZVBvcnQuaCIKICNpbmNsdWRlICJTZXJpYWxpemVk U2NyaXB0VmFsdWUuaCIKKyNpbmNsdWRlICJTZXJ2aWNlV29ya2VyLmgiCiAjaW5jbHVkZSA8Ymlu ZGluZ3MvU2NyaXB0VmFsdWUuaD4KICNpbmNsdWRlIDx3dGYvVmFyaWFudC5oPgogCkBAIC0zOCw3 ICszOSwxMSBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIGNsYXNzIEJsb2I7CiAKLXVzaW5nIE1l c3NhZ2VFdmVudFNvdXJjZSA9IFZhcmlhbnQ8UmVmUHRyPERPTVdpbmRvdz4sIFJlZlB0cjxNZXNz YWdlUG9ydD4+OwordXNpbmcgTWVzc2FnZUV2ZW50U291cmNlID0gVmFyaWFudDxSZWZQdHI8RE9N V2luZG93PiwgUmVmUHRyPE1lc3NhZ2VQb3J0PgorI2lmIEVOQUJMRShTRVJWSUNFX1dPUktFUikK KyAgICAsIFJlZlB0cjxTZXJ2aWNlV29ya2VyPgorI2VuZGlmCisgICAgPjsKIAogY2xhc3MgTWVz c2FnZUV2ZW50IGZpbmFsIDogcHVibGljIEV2ZW50IHsKIHB1YmxpYzoKQEAgLTY0LDcgKzY5LDcg QEAgcHVibGljOgogCiAgICAgY29uc3QgU3RyaW5nJiBvcmlnaW4oKSBjb25zdCB7IHJldHVybiBt X29yaWdpbjsgfQogICAgIGNvbnN0IFN0cmluZyYgbGFzdEV2ZW50SWQoKSBjb25zdCB7IHJldHVy biBtX2xhc3RFdmVudElkOyB9Ci0gICAgRXZlbnRUYXJnZXQqIHNvdXJjZSgpIGNvbnN0OworICAg IGNvbnN0IHN0ZDo6b3B0aW9uYWw8TWVzc2FnZUV2ZW50U291cmNlPiYgc291cmNlKCkgY29uc3Qg eyByZXR1cm4gbV9zb3VyY2U7IH0KICAgICBjb25zdCBWZWN0b3I8UmVmUHRyPE1lc3NhZ2VQb3J0 Pj4mIHBvcnRzKCkgY29uc3QgeyByZXR1cm4gbV9wb3J0czsgfQogCiAgICAgLy8gRklYTUU6IFJl bW92ZSB0aGlzIHdoZW4gd2UgaGF2ZSBjdXN0b20gT2JqQyBiaW5kaW5nIHN1cHBvcnQuCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9kb20vTWVzc2FnZUV2ZW50LmlkbCBiL1NvdXJjZS9XZWJD b3JlL2RvbS9NZXNzYWdlRXZlbnQuaWRsCmluZGV4IGNiOTJlMDEyZTllYzcwNGRiM2E2NzU4YjEy MGIzZGZiYmZiM2NjZDQuLjY2NGQwYWJjYmYzMzM2ODYwMDZlNzZhYmU5ZWJiNjAyMzY0NGMzYmUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9NZXNzYWdlRXZlbnQuaWRsCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2RvbS9NZXNzYWdlRXZlbnQuaWRsCkBAIC0yNiw2ICsyNiwxMiBAQAogICoK ICAqLwogCisjaWYgZGVmaW5lZChFTkFCTEVfU0VSVklDRV9XT1JLRVIpICYmIEVOQUJMRV9TRVJW SUNFX1dPUktFUgordHlwZWRlZiAoRE9NV2luZG93IG9yIE1lc3NhZ2VQb3J0IG9yIFNlcnZpY2VX b3JrZXIpIE1lc3NhZ2VFdmVudFNvdXJjZTsKKyNlbHNlCit0eXBlZGVmIChET01XaW5kb3cgb3Ig TWVzc2FnZVBvcnQpIE1lc3NhZ2VFdmVudFNvdXJjZTsKKyNlbmRpZgorCiBbCiAgICAgQ29uc3Ry dWN0b3IoRE9NU3RyaW5nIHR5cGUsIG9wdGlvbmFsIE1lc3NhZ2VFdmVudEluaXQgZXZlbnRJbml0 RGljdCksCiAgICAgQ29uc3RydWN0b3JDYWxsV2l0aD1TY3JpcHRTdGF0ZSwKQEAgLTMzLDEyICsz OSwxMiBAQAogXSBpbnRlcmZhY2UgTWVzc2FnZUV2ZW50IDogRXZlbnQgewogICAgIHJlYWRvbmx5 IGF0dHJpYnV0ZSBVU1ZTdHJpbmcgb3JpZ2luOwogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBET01T dHJpbmcgbGFzdEV2ZW50SWQ7Ci0gICAgcmVhZG9ubHkgYXR0cmlidXRlIEV2ZW50VGFyZ2V0PyBz b3VyY2U7CisgICAgcmVhZG9ubHkgYXR0cmlidXRlIE1lc3NhZ2VFdmVudFNvdXJjZT8gc291cmNl OwogICAgIFtDYWNoZWRBdHRyaWJ1dGUsIEN1c3RvbUdldHRlcl0gcmVhZG9ubHkgYXR0cmlidXRl IGFueSBkYXRhOwogICAgIHJlYWRvbmx5IGF0dHJpYnV0ZSBGcm96ZW5BcnJheTxNZXNzYWdlUG9y dD4gcG9ydHM7CiAKICAgICBbQ2FsbFdpdGg9U2NyaXB0U3RhdGVdIHZvaWQgaW5pdE1lc3NhZ2VF dmVudChET01TdHJpbmcgdHlwZSwgb3B0aW9uYWwgYm9vbGVhbiBidWJibGVzID0gZmFsc2UsIG9w dGlvbmFsIGJvb2xlYW4gY2FuY2VsYWJsZSA9IGZhbHNlLAotICAgICAgICBvcHRpb25hbCBhbnkg ZGF0YSA9IG51bGwsIG9wdGlvbmFsIFVTVlN0cmluZyBvcmlnaW5BcmcgPSAiIiwgb3B0aW9uYWwg RE9NU3RyaW5nIGxhc3RFdmVudElkID0gIiIsIG9wdGlvbmFsIChET01XaW5kb3cgb3IgTWVzc2Fn ZVBvcnQpPyBzb3VyY2UgPSBudWxsLAorICAgICAgICBvcHRpb25hbCBhbnkgZGF0YSA9IG51bGws IG9wdGlvbmFsIFVTVlN0cmluZyBvcmlnaW5BcmcgPSAiIiwgb3B0aW9uYWwgRE9NU3RyaW5nIGxh c3RFdmVudElkID0gIiIsIG9wdGlvbmFsIE1lc3NhZ2VFdmVudFNvdXJjZT8gc291cmNlID0gbnVs bCwKICAgICAgICAgb3B0aW9uYWwgc2VxdWVuY2U8TWVzc2FnZVBvcnQ+IG1lc3NhZ2VQb3J0cyA9 IFtdKTsKIH07CiAKQEAgLTQ2LDYgKzUyLDYgQEAgZGljdGlvbmFyeSBNZXNzYWdlRXZlbnRJbml0 IDogRXZlbnRJbml0IHsKICAgICAgIGFueSBkYXRhID0gbnVsbDsKICAgICAgIFVTVlN0cmluZyBv cmlnaW4gPSAiIjsKICAgICAgIERPTVN0cmluZyBsYXN0RXZlbnRJZCA9ICIiOwotICAgICAgKERP TVdpbmRvdyBvciBNZXNzYWdlUG9ydCk/IHNvdXJjZSA9IG51bGw7CisgICAgICBNZXNzYWdlRXZl bnRTb3VyY2U/IHNvdXJjZSA9IG51bGw7CiAgICAgICBzZXF1ZW5jZTxNZXNzYWdlUG9ydD4gcG9y dHMgPSBbXTsKIH07Cg== 324944 2017-10-25 19:35:39 -0700 2017-10-25 19:57:11 -0700 Patch bug-178839-20171025193538.patch text/plain 4908 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjIzOTk5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDU5Y2MxZGMwYTRlNTE2 OWVkMDMyMzBmNzI3N2VlODNmOGM3NDExMS4uZDE2Y2I1YTQ5N2NhYTgwNmFjOTQwOTYyMGE3N2Yw MTg4NDkwNjkyYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE3LTEwLTI1ICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgbWVzc2FnZUV2ZW50LnNvdXJj ZSBjYW4gYWxzbyBiZSBhIFNlcnZpY2VXb3JrZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE3ODgzOQorCisgICAgICAgIFJldmlld2VkIGJ5IEJyYWR5 IEVpZHNvbi4KKworICAgICAgICBtZXNzYWdlRXZlbnQuc291cmNlIGNhbiBhbHNvIGJlIGEgU2Vy dmljZVdvcmtlcjoKKyAgICAgICAgLSBodHRwczovL2h0bWwuc3BlYy53aGF0d2cub3JnL211bHRp cGFnZS9jb21tcy5odG1sI21lc3NhZ2VldmVudHNvdXJjZQorCisgICAgICAgIFRoaXMgZW5hYmxl cyBjYWxsaW5nIHBvc3RNZXNzYWdlKCkgZnJvbSBhIFNlcnZpY2VXb3JrZXIgdmlhIEJ1ZyAxNzg3 OTQuCisKKyAgICAgICAgKiBkb20vTWVzc2FnZUV2ZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6 Ok1lc3NhZ2VFdmVudDo6c291cmNlIGNvbnN0KTogRGVsZXRlZC4KKyAgICAgICAgKiBkb20vTWVz c2FnZUV2ZW50Lmg6CisgICAgICAgICogZG9tL01lc3NhZ2VFdmVudC5pZGw6CisKIDIwMTctMTAt MjUgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAgICAgU3R5bGU6OlNj b3BlOjpmbHVzaFBlbmRpbmdVcGRhdGUoKSBjYW4gcmVwbGFjZSB0aGUgZW50aXJlIGRvY3VtZW50 IGluIFhTTFRQcm9jZXNzb3I6OmNyZWF0ZURvY3VtZW50RnJvbVNvdXJjZQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvZG9tL01lc3NhZ2VFdmVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20v TWVzc2FnZUV2ZW50LmNwcAppbmRleCA1NDg1OTZjZjFmODVlNDljZjhhYjFhMDExMmI2M2Q0YzZl YmYzOGU0Li5lOTg4OWU1NmNmZjE1MzAzYzgwYzI1N2I3OGI0MTIwYWYxZjQ0Mjk4IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vTWVzc2FnZUV2ZW50LmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9kb20vTWVzc2FnZUV2ZW50LmNwcApAQCAtMTUwLDE3ICsxNTAsNiBAQCB2b2lkIE1lc3Nh Z2VFdmVudDo6aW5pdE1lc3NhZ2VFdmVudChFeGVjU3RhdGUmIHN0YXRlLCBjb25zdCBBdG9taWNT dHJpbmcmIHR5cGUsCiAgICAgbV9wb3J0cyA9IFdURk1vdmUocG9ydHMpOwogfQogCi1FdmVudFRh cmdldCogTWVzc2FnZUV2ZW50Ojpzb3VyY2UoKSBjb25zdAotewotICAgIGlmICghbV9zb3VyY2Up Ci0gICAgICAgIHJldHVybiBudWxscHRyOwotCi0gICAgcmV0dXJuIFdURjo6c3dpdGNoT24obV9z b3VyY2UudmFsdWUoKSwKLSAgICAgICAgW10gKGNvbnN0IFJlZlB0cjxET01XaW5kb3c+JiB3aW5k b3cpIC0+IEV2ZW50VGFyZ2V0KiB7IHJldHVybiBjb25zdF9jYXN0PERPTVdpbmRvdyo+KHdpbmRv dy5nZXQoKSk7IH0sCi0gICAgICAgIFtdIChjb25zdCBSZWZQdHI8TWVzc2FnZVBvcnQ+JiBtZXNz YWdlUG9ydCkgLT4gRXZlbnRUYXJnZXQqIHsgcmV0dXJuIGNvbnN0X2Nhc3Q8TWVzc2FnZVBvcnQq PihtZXNzYWdlUG9ydC5nZXQoKSk7IH0KLSAgICApOwotfQotCiBSZWZQdHI8U2VyaWFsaXplZFNj cmlwdFZhbHVlPiBNZXNzYWdlRXZlbnQ6OnRyeVNlcmlhbGl6ZURhdGEoRXhlY1N0YXRlKiBleGVj KQogewogICAgIEFTU0VSVCghbV9kYXRhQXNTY3JpcHRWYWx1ZS5oYXNOb1ZhbHVlKCkpOwpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL01lc3NhZ2VFdmVudC5oIGIvU291cmNlL1dlYkNv cmUvZG9tL01lc3NhZ2VFdmVudC5oCmluZGV4IGVmZDY1YjNjNDgxOWI5MmJjMGNmNmUzZWNhZDM2 MzI1ZGEwM2RiNWYuLmFkMTEwZjBjNjc3N2Y2ODUwNjJiZGVjYjMxYmQ3MDJmMjc5MjliNzkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2RvbS9NZXNzYWdlRXZlbnQuaAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9kb20vTWVzc2FnZUV2ZW50LmgKQEAgLTMxLDYgKzMxLDcgQEAKICNpbmNsdWRlICJF dmVudC5oIgogI2luY2x1ZGUgIk1lc3NhZ2VQb3J0LmgiCiAjaW5jbHVkZSAiU2VyaWFsaXplZFNj cmlwdFZhbHVlLmgiCisjaW5jbHVkZSAiU2VydmljZVdvcmtlci5oIgogI2luY2x1ZGUgPGJpbmRp bmdzL1NjcmlwdFZhbHVlLmg+CiAjaW5jbHVkZSA8d3RmL1ZhcmlhbnQuaD4KIApAQCAtMzgsNyAr MzksMTEgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiBjbGFzcyBCbG9iOwogCisjaWYgRU5BQkxF KFNFUlZJQ0VfV09SS0VSKQordXNpbmcgTWVzc2FnZUV2ZW50U291cmNlID0gVmFyaWFudDxSZWZQ dHI8RE9NV2luZG93PiwgUmVmUHRyPE1lc3NhZ2VQb3J0PiwgUmVmUHRyPFNlcnZpY2VXb3JrZXI+ PjsKKyNlbHNlCiB1c2luZyBNZXNzYWdlRXZlbnRTb3VyY2UgPSBWYXJpYW50PFJlZlB0cjxET01X aW5kb3c+LCBSZWZQdHI8TWVzc2FnZVBvcnQ+PjsKKyNlbmRpZgogCiBjbGFzcyBNZXNzYWdlRXZl bnQgZmluYWwgOiBwdWJsaWMgRXZlbnQgewogcHVibGljOgpAQCAtNjQsNyArNjksNyBAQCBwdWJs aWM6CiAKICAgICBjb25zdCBTdHJpbmcmIG9yaWdpbigpIGNvbnN0IHsgcmV0dXJuIG1fb3JpZ2lu OyB9CiAgICAgY29uc3QgU3RyaW5nJiBsYXN0RXZlbnRJZCgpIGNvbnN0IHsgcmV0dXJuIG1fbGFz dEV2ZW50SWQ7IH0KLSAgICBFdmVudFRhcmdldCogc291cmNlKCkgY29uc3Q7CisgICAgY29uc3Qg c3RkOjpvcHRpb25hbDxNZXNzYWdlRXZlbnRTb3VyY2U+JiBzb3VyY2UoKSBjb25zdCB7IHJldHVy biBtX3NvdXJjZTsgfQogICAgIGNvbnN0IFZlY3RvcjxSZWZQdHI8TWVzc2FnZVBvcnQ+PiYgcG9y dHMoKSBjb25zdCB7IHJldHVybiBtX3BvcnRzOyB9CiAKICAgICAvLyBGSVhNRTogUmVtb3ZlIHRo aXMgd2hlbiB3ZSBoYXZlIGN1c3RvbSBPYmpDIGJpbmRpbmcgc3VwcG9ydC4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL2RvbS9NZXNzYWdlRXZlbnQuaWRsIGIvU291cmNlL1dlYkNvcmUvZG9t L01lc3NhZ2VFdmVudC5pZGwKaW5kZXggY2I5MmUwMTJlOWVjNzA0ZGIzYTY3NThiMTIwYjNkZmJi ZmIzY2NkNC4uNjY0ZDBhYmNiZjMzMzY4NjAwNmU3NmFiZTllYmI2MDIzNjQ0YzNiZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL01lc3NhZ2VFdmVudC5pZGwKKysrIGIvU291cmNlL1dl YkNvcmUvZG9tL01lc3NhZ2VFdmVudC5pZGwKQEAgLTI2LDYgKzI2LDEyIEBACiAgKgogICovCiAK KyNpZiBkZWZpbmVkKEVOQUJMRV9TRVJWSUNFX1dPUktFUikgJiYgRU5BQkxFX1NFUlZJQ0VfV09S S0VSCit0eXBlZGVmIChET01XaW5kb3cgb3IgTWVzc2FnZVBvcnQgb3IgU2VydmljZVdvcmtlcikg TWVzc2FnZUV2ZW50U291cmNlOworI2Vsc2UKK3R5cGVkZWYgKERPTVdpbmRvdyBvciBNZXNzYWdl UG9ydCkgTWVzc2FnZUV2ZW50U291cmNlOworI2VuZGlmCisKIFsKICAgICBDb25zdHJ1Y3RvcihE T01TdHJpbmcgdHlwZSwgb3B0aW9uYWwgTWVzc2FnZUV2ZW50SW5pdCBldmVudEluaXREaWN0KSwK ICAgICBDb25zdHJ1Y3RvckNhbGxXaXRoPVNjcmlwdFN0YXRlLApAQCAtMzMsMTIgKzM5LDEyIEBA CiBdIGludGVyZmFjZSBNZXNzYWdlRXZlbnQgOiBFdmVudCB7CiAgICAgcmVhZG9ubHkgYXR0cmli dXRlIFVTVlN0cmluZyBvcmlnaW47CiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIERPTVN0cmluZyBs YXN0RXZlbnRJZDsKLSAgICByZWFkb25seSBhdHRyaWJ1dGUgRXZlbnRUYXJnZXQ/IHNvdXJjZTsK KyAgICByZWFkb25seSBhdHRyaWJ1dGUgTWVzc2FnZUV2ZW50U291cmNlPyBzb3VyY2U7CiAgICAg W0NhY2hlZEF0dHJpYnV0ZSwgQ3VzdG9tR2V0dGVyXSByZWFkb25seSBhdHRyaWJ1dGUgYW55IGRh dGE7CiAgICAgcmVhZG9ubHkgYXR0cmlidXRlIEZyb3plbkFycmF5PE1lc3NhZ2VQb3J0PiBwb3J0 czsKIAogICAgIFtDYWxsV2l0aD1TY3JpcHRTdGF0ZV0gdm9pZCBpbml0TWVzc2FnZUV2ZW50KERP TVN0cmluZyB0eXBlLCBvcHRpb25hbCBib29sZWFuIGJ1YmJsZXMgPSBmYWxzZSwgb3B0aW9uYWwg Ym9vbGVhbiBjYW5jZWxhYmxlID0gZmFsc2UsCi0gICAgICAgIG9wdGlvbmFsIGFueSBkYXRhID0g bnVsbCwgb3B0aW9uYWwgVVNWU3RyaW5nIG9yaWdpbkFyZyA9ICIiLCBvcHRpb25hbCBET01TdHJp bmcgbGFzdEV2ZW50SWQgPSAiIiwgb3B0aW9uYWwgKERPTVdpbmRvdyBvciBNZXNzYWdlUG9ydCk/ IHNvdXJjZSA9IG51bGwsCisgICAgICAgIG9wdGlvbmFsIGFueSBkYXRhID0gbnVsbCwgb3B0aW9u YWwgVVNWU3RyaW5nIG9yaWdpbkFyZyA9ICIiLCBvcHRpb25hbCBET01TdHJpbmcgbGFzdEV2ZW50 SWQgPSAiIiwgb3B0aW9uYWwgTWVzc2FnZUV2ZW50U291cmNlPyBzb3VyY2UgPSBudWxsLAogICAg ICAgICBvcHRpb25hbCBzZXF1ZW5jZTxNZXNzYWdlUG9ydD4gbWVzc2FnZVBvcnRzID0gW10pOwog fTsKIApAQCAtNDYsNiArNTIsNiBAQCBkaWN0aW9uYXJ5IE1lc3NhZ2VFdmVudEluaXQgOiBFdmVu dEluaXQgewogICAgICAgYW55IGRhdGEgPSBudWxsOwogICAgICAgVVNWU3RyaW5nIG9yaWdpbiA9 ICIiOwogICAgICAgRE9NU3RyaW5nIGxhc3RFdmVudElkID0gIiI7Ci0gICAgICAoRE9NV2luZG93 IG9yIE1lc3NhZ2VQb3J0KT8gc291cmNlID0gbnVsbDsKKyAgICAgIE1lc3NhZ2VFdmVudFNvdXJj ZT8gc291cmNlID0gbnVsbDsKICAgICAgIHNlcXVlbmNlPE1lc3NhZ2VQb3J0PiBwb3J0cyA9IFtd OwogfTsK