164006 2016-10-25 23:47:21 -0700 [DOMJIT][CSSJIT] Share code with DOMJIT 2016-10-27 13:03:31 -0700 1 1 1 Unclassified WebKit JavaScriptCore WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 164004 1 ysuzuki ysuzuki fpizlo ggaren saam sam oldest_to_newest 1244647 0 ysuzuki 2016-10-25 23:47:21 -0700 This should be nice! 1244649 1 ysuzuki 2016-10-25 23:48:45 -0700 For example, CSS JIT selector compiler has getDocument function. This is super useful for Node.ownerDocument implementation in DOMJIT. In the mean time, in Node.ownerDocument side, we just reimplement it. But eventually, we should change CSSJIT's Assembler use to CCallHelpers and share the helper functions with DOMJIT. 1244743 2 ysuzuki 2016-10-26 02:43:48 -0700 CCallHelper is tightly coupled with JS JIT. So using MacroAssembler for CSSJIT is ok. We will extract some methods into DOMJIT namespace to share it with CSSJIT. I think putting to DOMJIT is ok since these helper methods are related to DOM. 1245201 3 293042 ysuzuki 2016-10-27 12:29:05 -0700 Created attachment 293042 Patch 1245207 4 293042 mark.lam 2016-10-27 12:48:14 -0700 Comment on attachment 293042 Patch r=me 1245216 5 ysuzuki 2016-10-27 13:03:31 -0700 Committed r207999: <http://trac.webkit.org/changeset/207999> 293042 2016-10-27 12:29:05 -0700 2016-10-27 12:48:14 -0700 Patch bug-164006-20161027122516.patch text/plain 8372 ysuzuki U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3OTk1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMWQ4N2I0N2NhNjU5ZjM5 NTY4NTcwMjQ4MzhhMDcxM2RlZTJkNjA5MC4uNDRmMzQwMDFmZjFhYmU3M2RhMjVkOTQ3NTVkMmRh M2NjMzA5YThhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDE2LTEwLTI3ICBZdXN1 a2UgU3V6dWtpICA8dXRhdGFuZS50ZWFAZ21haWwuY29tPgorCisgICAgICAgIFtET01KSVRdW0NT U0pJVF0gU2hhcmUgY29kZSB3aXRoIERPTUpJVAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY0MDA2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgTW92ZSBDU1NKSVQncyBnZXREb2N1bWVudCBmdW5jdGlvbiB0 byBET01KSVQgYW5kIHNoYXJlIGl0IHdpdGggRE9NSklULgorICAgICAgICBBbmQgcmVuYW1lIGl0 IHRvICJsb2FkRG9jdW1lbnQiLCBpdCBpcyBjbG9zZXIgbmFtZSB0byB0aGUgSlNDJ3MgY29udmVu dGlvbi4KKworICAgICAgICBObyBiZWhhdmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBjc3NqaXQv U2VsZWN0b3JDb21waWxlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3RvckNvbXBpbGVy OjpTZWxlY3RvckNvZGVHZW5lcmF0b3I6OmdlbmVyYXRlU3BlY2lhbEZhaWx1cmVJblF1aXJrc01v ZGVGb3JBY3RpdmVBbmRIb3ZlcklmTmVlZGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdG9y Q29tcGlsZXI6OlNlbGVjdG9yQ29kZUdlbmVyYXRvcjo6Z2VuZXJhdGVFbGVtZW50QXR0cmlidXRl VmFsdWVFeGFjdE1hdGNoaW5nKToKKyAgICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yQ29tcGlsZXI6 OlNlbGVjdG9yQ29kZUdlbmVyYXRvcjo6Z2VuZXJhdGVFbGVtZW50SGFzVGFnTmFtZSk6CisgICAg ICAgIChXZWJDb3JlOjpTZWxlY3RvckNvbXBpbGVyOjpTZWxlY3RvckNvZGVHZW5lcmF0b3I6Omdl bmVyYXRlRWxlbWVudElzUm9vdCk6CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3RvckNvbXBpbGVy OjpTZWxlY3RvckNvZGVHZW5lcmF0b3I6OmdlbmVyYXRlRWxlbWVudElzU2NvcGVSb290KToKKyAg ICAgICAgKFdlYkNvcmU6OlNlbGVjdG9yQ29tcGlsZXI6OlNlbGVjdG9yQ29kZUdlbmVyYXRvcjo6 Z2VuZXJhdGVFbGVtZW50SXNUYXJnZXQpOgorICAgICAgICAoV2ViQ29yZTo6U2VsZWN0b3JDb21w aWxlcjo6Z2V0RG9jdW1lbnQpOiBEZWxldGVkLgorICAgICAgICAqIGRvbWppdC9ET01KSVRIZWxw ZXJzLmg6CisgICAgICAgIChXZWJDb3JlOjpET01KSVQ6OmxvYWREb2N1bWVudCk6CisgICAgICAg ICogZG9taml0L0pTTm9kZURPTUpJVC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpOb2RlT3duZXJE b2N1bWVudERPTUpJVDo6Y2FsbERPTSk6CisKIDIwMTYtMTAtMjcgIFlvdWVubiBGYWJsZXQgIDx5 b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjIwNzc1My0yMDc3NTUpOiBB U1NFUlRJT04gRkFJTEVEOiBtX3BhcnNlZFN0eWxlU2hlZXRDYWNoZS0+aXNJbk1lbW9yeUNhY2hl KCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2Nzc2ppdC9TZWxlY3RvckNvbXBpbGVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL2Nzc2ppdC9TZWxlY3RvckNvbXBpbGVyLmNwcAppbmRleCBjNzg2 ZWY5N2EzMDVkMmI0ZjQxNmMxMjg0YWE3YWE3NDJjNjA4NTk2Li45YjMxZDUzOTExOWY1MzU2M2Ew MDQ2NjY4Nzg5MTNhZjYwZDRlNjFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9jc3NqaXQv U2VsZWN0b3JDb21waWxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvY3Nzaml0L1NlbGVjdG9y Q29tcGlsZXIuY3BwCkBAIC0zMSw2ICszMSw3IEBACiAKICNpbmNsdWRlICJDU1NTZWxlY3Rvci5o IgogI2luY2x1ZGUgIkNTU1NlbGVjdG9yTGlzdC5oIgorI2luY2x1ZGUgIkRPTUpJVEhlbHBlcnMu aCIKICNpbmNsdWRlICJFbGVtZW50LmgiCiAjaW5jbHVkZSAiRWxlbWVudERhdGEuaCIKICNpbmNs dWRlICJFbGVtZW50UmFyZURhdGEuaCIKQEAgLTIzMTEsMTIgKzIzMTIsNiBAQCBBc3NlbWJsZXI6 Okp1bXAgU2VsZWN0b3JDb2RlR2VuZXJhdG9yOjpqdW1wSWZOb3RSZXNvbHZpbmdTdHlsZShBc3Nl bWJsZXI6OlJlZ2lzdAogICAgIHJldHVybiBicmFuY2hPblJlc29sdmluZ01vZGUoQXNzZW1ibGVy OjpOb3RFcXVhbCwgU2VsZWN0b3JDaGVja2VyOjpNb2RlOjpSZXNvbHZpbmdTdHlsZSwgY2hlY2tp bmdDb250ZXh0KTsKIH0KIAotc3RhdGljIHZvaWQgZ2V0RG9jdW1lbnQoQXNzZW1ibGVyJiBhc3Nl bWJsZXIsIEFzc2VtYmxlcjo6UmVnaXN0ZXJJRCBlbGVtZW50LCBBc3NlbWJsZXI6OlJlZ2lzdGVy SUQgb3V0cHV0KQotewotICAgIGFzc2VtYmxlci5sb2FkUHRyKEFzc2VtYmxlcjo6QWRkcmVzcyhl bGVtZW50LCBOb2RlOjp0cmVlU2NvcGVNZW1vcnlPZmZzZXQoKSksIG91dHB1dCk7Ci0gICAgYXNz ZW1ibGVyLmxvYWRQdHIoQXNzZW1ibGVyOjpBZGRyZXNzKG91dHB1dCwgVHJlZVNjb3BlOjpkb2N1 bWVudFNjb3BlTWVtb3J5T2Zmc2V0KCkpLCBvdXRwdXQpOwotfQotCiB2b2lkIFNlbGVjdG9yQ29k ZUdlbmVyYXRvcjo6Z2VuZXJhdGVTcGVjaWFsRmFpbHVyZUluUXVpcmtzTW9kZUZvckFjdGl2ZUFu ZEhvdmVySWZOZWVkZWQoQXNzZW1ibGVyOjpKdW1wTGlzdCYgZmFpbHVyZUNhc2VzLCBjb25zdCBT ZWxlY3RvckZyYWdtZW50JiBmcmFnbWVudCkKIHsKICAgICBpZiAoZnJhZ21lbnQub25seU1hdGNo ZXNMaW5rc0luUXVpcmtzTW9kZSkgewpAQCAtMjMyNiw3ICsyMzIxLDcgQEAgdm9pZCBTZWxlY3Rv ckNvZGVHZW5lcmF0b3I6OmdlbmVyYXRlU3BlY2lhbEZhaWx1cmVJblF1aXJrc01vZGVGb3JBY3Rp dmVBbmRIb3ZlckkKICAgICAgICAgLy8gT25seSBxdWlya3MgbW9kZSByZXN0cmljdCA6aG92ZXIg YW5kIDphY3RpdmUuCiAgICAgICAgIHN0YXRpY19hc3NlcnQoc2l6ZW9mKERvY3VtZW50Q29tcGF0 aWJpbGl0eU1vZGUpID09IDEsICJXZSBnZW5lcmF0ZSBhIGJ5dGUgbG9hZC90ZXN0IGZvciB0aGUg Y29tcGF0aWJpbGl0eSBtb2RlLiIpOwogICAgICAgICBMb2NhbFJlZ2lzdGVyIGRvY3VtZW50QWRk cmVzcyhtX3JlZ2lzdGVyQWxsb2NhdG9yKTsKLSAgICAgICAgZ2V0RG9jdW1lbnQobV9hc3NlbWJs ZXIsIGVsZW1lbnRBZGRyZXNzUmVnaXN0ZXIsIGRvY3VtZW50QWRkcmVzcyk7CisgICAgICAgIERP TUpJVDo6bG9hZERvY3VtZW50KG1fYXNzZW1ibGVyLCBlbGVtZW50QWRkcmVzc1JlZ2lzdGVyLCBk b2N1bWVudEFkZHJlc3MpOwogICAgICAgICBmYWlsdXJlQ2FzZXMuYXBwZW5kKG1fYXNzZW1ibGVy LmJyYW5jaFRlc3Q4KEFzc2VtYmxlcjo6Tm9uWmVybywgQXNzZW1ibGVyOjpBZGRyZXNzKGRvY3Vt ZW50QWRkcmVzcywgRG9jdW1lbnQ6OmNvbXBhdGliaWxpdHlNb2RlTWVtb3J5T2Zmc2V0KCkpLCBB c3NlbWJsZXI6OlRydXN0ZWRJbW0zMihzdGF0aWNfY2FzdDxzdGQ6OnVuZGVybHlpbmdfdHlwZTxE b2N1bWVudENvbXBhdGliaWxpdHlNb2RlPjo6dHlwZT4oRG9jdW1lbnRDb21wYXRpYmlsaXR5TW9k ZTo6UXVpcmtzTW9kZSkpKSk7CiAKICAgICAgICAgaXNMaW5rLmxpbmsoJm1fYXNzZW1ibGVyKTsK QEAgLTI5OTIsNyArMjk4Nyw3IEBAIHZvaWQgU2VsZWN0b3JDb2RlR2VuZXJhdG9yOjpnZW5lcmF0 ZUVsZW1lbnRBdHRyaWJ1dGVWYWx1ZUV4YWN0TWF0Y2hpbmcoQXNzZW1ibGVyCiAKICAgICAgICAg ewogICAgICAgICAgICAgTG9jYWxSZWdpc3RlciBkb2N1bWVudChtX3JlZ2lzdGVyQWxsb2NhdG9y KTsKLSAgICAgICAgICAgIGdldERvY3VtZW50KG1fYXNzZW1ibGVyLCBlbGVtZW50QWRkcmVzc1Jl Z2lzdGVyLCBkb2N1bWVudCk7CisgICAgICAgICAgICBET01KSVQ6OmxvYWREb2N1bWVudChtX2Fz c2VtYmxlciwgZWxlbWVudEFkZHJlc3NSZWdpc3RlciwgZG9jdW1lbnQpOwogICAgICAgICAgICAg ZmFpbHVyZUNhc2VzLmFwcGVuZCh0ZXN0SXNIVE1MQ2xhc3NPbkRvY3VtZW50KEFzc2VtYmxlcjo6 WmVybywgbV9hc3NlbWJsZXIsIGRvY3VtZW50KSk7CiAgICAgICAgIH0KIApAQCAtMzQyMiw3ICsz NDE3LDcgQEAgaW5saW5lIHZvaWQgU2VsZWN0b3JDb2RlR2VuZXJhdG9yOjpnZW5lcmF0ZUVsZW1l bnRIYXNUYWdOYW1lKEFzc2VtYmxlcjo6SnVtcExpc3QKICAgICAgICAgICAgIGNhc2VTZW5zaXRp dmVDYXNlcy5hcHBlbmQodGVzdElzSFRNTEZsYWdPbk5vZGUoQXNzZW1ibGVyOjpaZXJvLCBtX2Fz c2VtYmxlciwgZWxlbWVudEFkZHJlc3NSZWdpc3RlcikpOwogICAgICAgICAgICAgewogICAgICAg ICAgICAgICAgIExvY2FsUmVnaXN0ZXIgZG9jdW1lbnQobV9yZWdpc3RlckFsbG9jYXRvcik7Ci0g ICAgICAgICAgICAgICAgZ2V0RG9jdW1lbnQobV9hc3NlbWJsZXIsIGVsZW1lbnRBZGRyZXNzUmVn aXN0ZXIsIGRvY3VtZW50KTsKKyAgICAgICAgICAgICAgICBET01KSVQ6OmxvYWREb2N1bWVudCht X2Fzc2VtYmxlciwgZWxlbWVudEFkZHJlc3NSZWdpc3RlciwgZG9jdW1lbnQpOwogICAgICAgICAg ICAgICAgIGNhc2VTZW5zaXRpdmVDYXNlcy5hcHBlbmQodGVzdElzSFRNTENsYXNzT25Eb2N1bWVu dChBc3NlbWJsZXI6Olplcm8sIG1fYXNzZW1ibGVyLCBkb2N1bWVudCkpOwogICAgICAgICAgICAg fQogCkBAIC0zNzgwLDcgKzM3NzUsNyBAQCB2b2lkIFNlbGVjdG9yQ29kZUdlbmVyYXRvcjo6Z2Vu ZXJhdGVSZXF1ZXN0ZWRQc2V1ZG9FbGVtZW50RXF1YWxzVG9TZWxlY3RvclBzZXVkbwogdm9pZCBT ZWxlY3RvckNvZGVHZW5lcmF0b3I6OmdlbmVyYXRlRWxlbWVudElzUm9vdChBc3NlbWJsZXI6Okp1 bXBMaXN0JiBmYWlsdXJlQ2FzZXMpCiB7CiAgICAgTG9jYWxSZWdpc3RlciBkb2N1bWVudChtX3Jl Z2lzdGVyQWxsb2NhdG9yKTsKLSAgICBnZXREb2N1bWVudChtX2Fzc2VtYmxlciwgZWxlbWVudEFk ZHJlc3NSZWdpc3RlciwgZG9jdW1lbnQpOworICAgIERPTUpJVDo6bG9hZERvY3VtZW50KG1fYXNz ZW1ibGVyLCBlbGVtZW50QWRkcmVzc1JlZ2lzdGVyLCBkb2N1bWVudCk7CiAgICAgZmFpbHVyZUNh c2VzLmFwcGVuZChtX2Fzc2VtYmxlci5icmFuY2hQdHIoQXNzZW1ibGVyOjpOb3RFcXVhbCwgQXNz ZW1ibGVyOjpBZGRyZXNzKGRvY3VtZW50LCBEb2N1bWVudDo6ZG9jdW1lbnRFbGVtZW50TWVtb3J5 T2Zmc2V0KCkpLCBlbGVtZW50QWRkcmVzc1JlZ2lzdGVyKSk7CiB9CiAKQEAgLTM3OTQsNyArMzc4 OSw3IEBAIHZvaWQgU2VsZWN0b3JDb2RlR2VuZXJhdG9yOjpnZW5lcmF0ZUVsZW1lbnRJc1Njb3Bl Um9vdChBc3NlbWJsZXI6Okp1bXBMaXN0JiBmYWlsCiAKICAgICBBc3NlbWJsZXI6Okp1bXAgc2Nv cGVJc05vdE51bGwgPSBtX2Fzc2VtYmxlci5icmFuY2hUZXN0UHRyKEFzc2VtYmxlcjo6Tm9uWmVy bywgc2NvcGUpOwogCi0gICAgZ2V0RG9jdW1lbnQobV9hc3NlbWJsZXIsIGVsZW1lbnRBZGRyZXNz UmVnaXN0ZXIsIHNjb3BlKTsKKyAgICBET01KSVQ6OmxvYWREb2N1bWVudChtX2Fzc2VtYmxlciwg ZWxlbWVudEFkZHJlc3NSZWdpc3Rlciwgc2NvcGUpOwogICAgIG1fYXNzZW1ibGVyLmxvYWRQdHIo QXNzZW1ibGVyOjpBZGRyZXNzKHNjb3BlLCBEb2N1bWVudDo6ZG9jdW1lbnRFbGVtZW50TWVtb3J5 T2Zmc2V0KCkpLCBzY29wZSk7CiAKICAgICBzY29wZUlzTm90TnVsbC5saW5rKCZtX2Fzc2VtYmxl cik7CkBAIC0zODA0LDcgKzM3OTksNyBAQCB2b2lkIFNlbGVjdG9yQ29kZUdlbmVyYXRvcjo6Z2Vu ZXJhdGVFbGVtZW50SXNTY29wZVJvb3QoQXNzZW1ibGVyOjpKdW1wTGlzdCYgZmFpbAogdm9pZCBT ZWxlY3RvckNvZGVHZW5lcmF0b3I6OmdlbmVyYXRlRWxlbWVudElzVGFyZ2V0KEFzc2VtYmxlcjo6 SnVtcExpc3QmIGZhaWx1cmVDYXNlcykKIHsKICAgICBMb2NhbFJlZ2lzdGVyIGRvY3VtZW50KG1f cmVnaXN0ZXJBbGxvY2F0b3IpOwotICAgIGdldERvY3VtZW50KG1fYXNzZW1ibGVyLCBlbGVtZW50 QWRkcmVzc1JlZ2lzdGVyLCBkb2N1bWVudCk7CisgICAgRE9NSklUOjpsb2FkRG9jdW1lbnQobV9h c3NlbWJsZXIsIGVsZW1lbnRBZGRyZXNzUmVnaXN0ZXIsIGRvY3VtZW50KTsKICAgICBmYWlsdXJl Q2FzZXMuYXBwZW5kKG1fYXNzZW1ibGVyLmJyYW5jaFB0cihBc3NlbWJsZXI6Ok5vdEVxdWFsLCBB c3NlbWJsZXI6OkFkZHJlc3MoZG9jdW1lbnQsIERvY3VtZW50Ojpjc3NUYXJnZXRNZW1vcnlPZmZz ZXQoKSksIGVsZW1lbnRBZGRyZXNzUmVnaXN0ZXIpKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvZG9taml0L0RPTUpJVEhlbHBlcnMuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbWppdC9E T01KSVRIZWxwZXJzLmgKaW5kZXggYTg1YmNkY2FiNTgxZWIwMWJlMGMzMGY5NmYzNWVjZDk0ZDRk MTZkMi4uMmI0YjAwM2RmNjJkNmM2MGY0NzJiNzMzZTE2YWVhYTUzYTZlMDE4OCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvZG9taml0L0RPTUpJVEhlbHBlcnMuaAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9kb21qaXQvRE9NSklUSGVscGVycy5oCkBAIC0zNyw2ICszNyw5IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsgbmFtZXNwYWNlIERPTUpJVCB7CiB1c2luZyBKU0M6OkNDYWxsSGVscGVyczsKIHVz aW5nIEpTQzo6R1BSUmVnOwogdXNpbmcgSlNDOjpKU1ZhbHVlUmVnczsKK3VzaW5nIEpTQzo6TWFj cm9Bc3NlbWJsZXI7CisKK3N0YXRpY19hc3NlcnQoc3RkOjppc19zYW1lPEdQUlJlZywgTWFjcm9B c3NlbWJsZXI6OlJlZ2lzdGVySUQ+Ojp2YWx1ZSwgIkdQUlJlZyBpcyB0aGUgYWxpYXMgdG8gdGhl IE1hY3JvQXNzZW1ibGVyOjpSZWdpc3RlcklEIik7CiAKIGlubGluZSBDQ2FsbEhlbHBlcnM6Okp1 bXAgYnJhbmNoSWZOb3RXb3JsZElzTm9ybWFsKENDYWxsSGVscGVycyYgaml0LCBHUFJSZWcgZ2xv YmFsT2JqZWN0KQogewpAQCAtMTM3LDYgKzE0MCwxMiBAQCBpbmxpbmUgQ0NhbGxIZWxwZXJzOjpK dW1wIGJyYW5jaElmTm90RG9jdW1lbnRXcmFwcGVyKENDYWxsSGVscGVycyYgaml0LCBHUFJSZWcg dAogICAgIHJldHVybiBqaXQuYnJhbmNoSWZOb3RUeXBlKHRhcmdldCwgSlNDOjpKU1R5cGUoSlNE b2N1bWVudFdyYXBwZXJUeXBlKSk7CiB9CiAKK2lubGluZSB2b2lkIGxvYWREb2N1bWVudChNYWNy b0Fzc2VtYmxlciYgaml0LCBHUFJSZWcgbm9kZSwgR1BSUmVnIG91dHB1dCkKK3sKKyAgICBqaXQu bG9hZFB0cihDQ2FsbEhlbHBlcnM6OkFkZHJlc3Mobm9kZSwgTm9kZTo6dHJlZVNjb3BlTWVtb3J5 T2Zmc2V0KCkpLCBvdXRwdXQpOworICAgIGppdC5sb2FkUHRyKENDYWxsSGVscGVyczo6QWRkcmVz cyhvdXRwdXQsIFRyZWVTY29wZTo6ZG9jdW1lbnRTY29wZU1lbW9yeU9mZnNldCgpKSwgb3V0cHV0 KTsKK30KKwogfSB9CiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9taml0 L0pTTm9kZURPTUpJVC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb21qaXQvSlNOb2RlRE9NSklULmNw cAppbmRleCA0NmVjOTViYmFjOTA1NWU3MjIzYWZkOTc5ZDQyYWUxMzQxYzYwNjBlLi45MjgxNmJj ZjFjNGQ5YTY3N2RkMjJjMWRiODgyMWQ3NzJjYjIwZjUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9kb21qaXQvSlNOb2RlRE9NSklULmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb21qaXQv SlNOb2RlRE9NSklULmNwcApAQCAtMjA2LDkgKzIwNiw3IEBAIFJlZjxKU0M6OkRPTUpJVDo6Q2Fs bERPTVBhdGNocG9pbnQ+IE5vZGVPd25lckRvY3VtZW50RE9NSklUOjpjYWxsRE9NKCkKIAogICAg ICAgICBub3REb2N1bWVudC5saW5rKCZqaXQpOwogICAgICAgICBqaXQubG9hZFB0cihDQ2FsbEhl bHBlcnM6OkFkZHJlc3Mobm9kZSwgSlNOb2RlOjpvZmZzZXRPZldyYXBwZWQoKSksIHNjcmF0Y2gp OwotICAgICAgICBqaXQubG9hZFB0cihDQ2FsbEhlbHBlcnM6OkFkZHJlc3Moc2NyYXRjaCwgTm9k ZTo6dHJlZVNjb3BlTWVtb3J5T2Zmc2V0KCkpLCBzY3JhdGNoKTsKLSAgICAgICAgaml0LmxvYWRQ dHIoQ0NhbGxIZWxwZXJzOjpBZGRyZXNzKHNjcmF0Y2gsIFRyZWVTY29wZTo6ZG9jdW1lbnRTY29w ZU1lbW9yeU9mZnNldCgpKSwgc2NyYXRjaCk7Ci0KKyAgICAgICAgRE9NSklUOjpsb2FkRG9jdW1l bnQoaml0LCBzY3JhdGNoLCBzY3JhdGNoKTsKICAgICAgICAgRE9NSklUOjp0b1dyYXBwZXI8RG9j dW1lbnQ+KGppdCwgcGFyYW1zLCBzY3JhdGNoLCBnbG9iYWxPYmplY3QsIHJlc3VsdCwgdG9XcmFw cGVyU2xvdzxEb2N1bWVudD4sIGdsb2JhbE9iamVjdFZhbHVlKTsKICAgICAgICAgZG9uZS5saW5r KCZqaXQpOwogICAgICAgICByZXR1cm4gQ0NhbGxIZWxwZXJzOjpKdW1wTGlzdCgpOwo=