125266 2013-12-04 16:57:45 -0800 [Cocoa] Make WKConnection work with WKObject wrapping 2013-12-04 17:40:55 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam mitz oldest_to_newest 956701 0 sam 2013-12-04 16:57:45 -0800 [Cocoa] Make WKConnection work with WKObject wrapping 956702 1 218471 sam 2013-12-04 16:58:02 -0800 Created attachment 218471 Patch 956706 2 218471 mitz 2013-12-04 17:02:08 -0800 Comment on attachment 218471 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=218471&action=review > Source/WebKit2/UIProcess/API/Cocoa/WKConnection.mm:111 > + _remoteObjectRegistry = adoptNS([[WKRemoteObjectRegistry alloc] _initWithConnectionRef:toAPI(_connection.get())]); We should change the internal WKRemoteObjectRegistry initializer to take a WebConnection&. 956718 3 sam 2013-12-04 17:40:55 -0800 Committed r160148: <http://trac.webkit.org/changeset/160148> 218471 2013-12-04 16:58:02 -0800 2013-12-04 17:02:08 -0800 Patch bug-125266-20131204165814.patch text/plain 9638 sam SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2MDE0NSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI5IEBACisyMDEzLTEyLTA0ICBTYW0gV2Vp bmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAgICAgICAgW0NvY29hXSBNYWtlIFdLQ29ubmVjdGlv biB3b3JrIHdpdGggV0tPYmplY3Qgd3JhcHBpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNTI2NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Nvbm5lY3Rpb24u bW06CisgICAgICAgICgtW1dLQ29ubmVjdGlvbiBkZWFsbG9jXSk6CisgICAgICAgIChkaWRSZWNl aXZlTWVzc2FnZSk6CisgICAgICAgIChkaWRDbG9zZSk6CisgICAgICAgIChzZXRVcENsaWVudCk6 CisgICAgICAgICgtW1dLQ29ubmVjdGlvbiBkZWxlZ2F0ZV0pOgorICAgICAgICAoLVtXS0Nvbm5l Y3Rpb24gc2V0RGVsZWdhdGU6XSk6CisgICAgICAgICgtW1dLQ29ubmVjdGlvbiBzZW5kTWVzc2Fn ZVdpdGhOYW1lOmJvZHk6XSk6CisgICAgICAgICgtW1dLQ29ubmVjdGlvbiByZW1vdGVPYmplY3RS ZWdpc3RyeV0pOgorICAgICAgICAoLVtXS0Nvbm5lY3Rpb24gQVBJOjpdKToKKyAgICAgICAgKiBV SVByb2Nlc3MvQVBJL0NvY29hL1dLQ29ubmVjdGlvbkludGVybmFsLmg6CisgICAgICAgIChXZWJL aXQ6OndyYXBwZXIpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQcm9jZXNzR3Jv dXAubW06CisgICAgICAgIChkaWRDcmVhdGVDb25uZWN0aW9uKToKKyAgICAgICAgKiBXZWJQcm9j ZXNzL0luamVjdGVkQnVuZGxlL0FQSS9tYWMvV0tXZWJQcm9jZXNzUGx1Z0luLm1tOgorICAgICAg ICAoLVtXS1dlYlByb2Nlc3NQbHVnSW5Db250cm9sbGVyIF9pbml0V2l0aFByaW5jaXBhbENsYXNz SW5zdGFuY2U6YnVuZGxlUmVmOl0pOgorICAgICAgICAoLVtXS1dlYlByb2Nlc3NQbHVnSW5Db250 cm9sbGVyIGNvbm5lY3Rpb25dKToKKyAgICAgICAgKC1bV0tXZWJQcm9jZXNzUGx1Z0luQ29udHJv bGxlciBfYnVuZGxlUmVmXSk6CisKIDIwMTMtMTItMDQgIFJ5dWFuIENob2kgIDxyeXVhbi5jaG9p QHNhbXN1bmcuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgRUZMIGJ1aWxkIGZpeCBhZnRlciBy MTYwMTM1CkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLQ29ubmVj dGlvbi5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29h L1dLQ29ubmVjdGlvbi5tbQkocmV2aXNpb24gMTYwMTMxKQorKysgU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS0Nvbm5lY3Rpb24ubW0JKHdvcmtpbmcgY29weSkKQEAgLTI5LDU2 ICsyOSwzOCBAQAogI2lmIFdLX0FQSV9FTkFCTEVECiAKICNpbXBvcnQgIk9iakNPYmplY3RHcmFw aC5oIgotI2ltcG9ydCAiV0tDb25uZWN0aW9uUmVmLmgiCi0jaW1wb3J0ICJXS0RhdGEuaCIKKyNp bXBvcnQgIldLUmVtb3RlT2JqZWN0UmVnaXN0cnlJbnRlcm5hbC5oIgogI2ltcG9ydCAiV0tSZXRh aW5QdHIuaCIKKyNpbXBvcnQgIldLU2hhcmVkQVBJQ2FzdC5oIgogI2ltcG9ydCAiV0tTdHJpbmdD Ri5oIgotI2ltcG9ydCAiV0tSZW1vdGVPYmplY3RSZWdpc3RyeUludGVybmFsLmgiCiAjaW1wb3J0 IDx3dGYvUmV0YWluUHRyLmg+CisjaW1wb3J0IDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogdXNp bmcgbmFtZXNwYWNlIFdlYktpdDsKIAogQGltcGxlbWVudGF0aW9uIFdLQ29ubmVjdGlvbiB7Ci0g ICAgLy8gVW5kZXJseWluZyBjb25uZWN0aW9uIG9iamVjdC4KLSAgICBXS1JldGFpblB0cjxXS0Nv bm5lY3Rpb25SZWY+IF9jb25uZWN0aW9uUmVmOwotCisgICAgQVBJOjpPYmplY3RTdG9yYWdlPFdl YkNvbm5lY3Rpb24+IF9jb25uZWN0aW9uOwogICAgIFJldGFpblB0cjxXS1JlbW90ZU9iamVjdFJl Z2lzdHJ5PiBfcmVtb3RlT2JqZWN0UmVnaXN0cnk7CiB9CiAKK0BzeW50aGVzaXplIGRlbGVnYXRl ID0gX2RlbGVnYXRlOworCiAtICh2b2lkKWRlYWxsb2MKIHsKLSAgICBXS0Nvbm5lY3Rpb25TZXRD b25uZWN0aW9uQ2xpZW50KF9jb25uZWN0aW9uUmVmLmdldCgpLCAwKTsKKyAgICBfY29ubmVjdGlv bi0+fldlYkNvbm5lY3Rpb24oKTsKIAogICAgIFtzdXBlciBkZWFsbG9jXTsKIH0KIAotLSAodm9p ZClzZW5kTWVzc2FnZVdpdGhOYW1lOihOU1N0cmluZyAqKW1lc3NhZ2VOYW1lIGJvZHk6KGlkKW1l c3NhZ2VCb2R5Ci17Ci0gICAgV0tSZXRhaW5QdHI8V0tTdHJpbmdSZWY+IHdrTWVzc2FnZU5hbWUg PSBhZG9wdFdLKFdLU3RyaW5nQ3JlYXRlV2l0aENGU3RyaW5nKChDRlN0cmluZ1JlZiltZXNzYWdl TmFtZSkpOwotICAgIFJlZlB0cjxPYmpDT2JqZWN0R3JhcGg+IHdrTWVzc2FnZUJvZHkgPSBPYmpD T2JqZWN0R3JhcGg6OmNyZWF0ZShtZXNzYWdlQm9keSk7Ci0KLSAgICBXS0Nvbm5lY3Rpb25Qb3N0 TWVzc2FnZShfY29ubmVjdGlvblJlZi5nZXQoKSwgd2tNZXNzYWdlTmFtZS5nZXQoKSwgKFdLVHlw ZVJlZil3a01lc3NhZ2VCb2R5LmdldCgpKTsKLX0KLQotLSAoV0tSZW1vdGVPYmplY3RSZWdpc3Ry eSAqKXJlbW90ZU9iamVjdFJlZ2lzdHJ5Ci17Ci0gICAgaWYgKCFfcmVtb3RlT2JqZWN0UmVnaXN0 cnkpCi0gICAgICAgIF9yZW1vdGVPYmplY3RSZWdpc3RyeSA9IGFkb3B0TlMoW1tXS1JlbW90ZU9i amVjdFJlZ2lzdHJ5IGFsbG9jXSBfaW5pdFdpdGhDb25uZWN0aW9uUmVmOl9jb25uZWN0aW9uUmVm LmdldCgpXSk7Ci0KLSAgICByZXR1cm4gX3JlbW90ZU9iamVjdFJlZ2lzdHJ5LmdldCgpOwotfQot CiBzdGF0aWMgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShXS0Nvbm5lY3Rpb25SZWYsIFdLU3RyaW5n UmVmIG1lc3NhZ2VOYW1lLCBXS1R5cGVSZWYgbWVzc2FnZUJvZHksIGNvbnN0IHZvaWQqIGNsaWVu dEluZm8pCiB7CiAgICAgV0tDb25uZWN0aW9uICpjb25uZWN0aW9uID0gKFdLQ29ubmVjdGlvbiAq KWNsaWVudEluZm87Ci0KICAgICBpZiAoW2Nvbm5lY3Rpb24tPl9yZW1vdGVPYmplY3RSZWdpc3Ry eSBfaGFuZGxlTWVzc2FnZVdpdGhOYW1lOm1lc3NhZ2VOYW1lIGJvZHk6bWVzc2FnZUJvZHldKQog ICAgICAgICByZXR1cm47CiAKICAgICBpZiAoW2Nvbm5lY3Rpb24uZGVsZWdhdGUgcmVzcG9uZHNU b1NlbGVjdG9yOkBzZWxlY3Rvcihjb25uZWN0aW9uOmRpZFJlY2VpdmVNZXNzYWdlV2l0aE5hbWU6 Ym9keTopXSkgewogICAgICAgICBSZXRhaW5QdHI8Q0ZTdHJpbmdSZWY+IG5zTWVzc2FnZU5hbWUg PSBhZG9wdENGKFdLU3RyaW5nQ29weUNGU3RyaW5nKGtDRkFsbG9jYXRvckRlZmF1bHQsIG1lc3Nh Z2VOYW1lKSk7CiAgICAgICAgIFJldGFpblB0cjxpZD4gbnNNZXNzYWdlQm9keSA9ICgoT2JqQ09i amVjdEdyYXBoKiltZXNzYWdlQm9keSktPnJvb3RPYmplY3QoKTsKLQogICAgICAgICBbY29ubmVj dGlvbi5kZWxlZ2F0ZSBjb25uZWN0aW9uOmNvbm5lY3Rpb24gZGlkUmVjZWl2ZU1lc3NhZ2VXaXRo TmFtZTooTlNTdHJpbmcgKiluc01lc3NhZ2VOYW1lLmdldCgpIGJvZHk6bnNNZXNzYWdlQm9keS5n ZXQoKV07CiAgICAgfQogfQpAQCAtODYsMzUgKzY4LDU2IEBAIHN0YXRpYyB2b2lkIGRpZFJlY2Vp dmVNZXNzYWdlKFdLQ29ubmVjdGkKIHN0YXRpYyB2b2lkIGRpZENsb3NlKFdLQ29ubmVjdGlvblJl ZiwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKIHsKICAgICBXS0Nvbm5lY3Rpb24gKmNvbm5lY3Rp b24gPSAoV0tDb25uZWN0aW9uICopY2xpZW50SW5mbzsKLSAgICBpZiAoW2Nvbm5lY3Rpb24uZGVs ZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3Rvcihjb25uZWN0aW9uRGlkQ2xvc2U6KV0p IHsKKyAgICBpZiAoW2Nvbm5lY3Rpb24uZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxl Y3Rvcihjb25uZWN0aW9uRGlkQ2xvc2U6KV0pCiAgICAgICAgIFtjb25uZWN0aW9uLmRlbGVnYXRl IGNvbm5lY3Rpb25EaWRDbG9zZTpjb25uZWN0aW9uXTsKLSAgICB9CiB9CiAKLXN0YXRpYyB2b2lk IHNldFVwQ2xpZW50KFdLQ29ubmVjdGlvbiAqY29ubmVjdGlvbiwgV0tDb25uZWN0aW9uUmVmIGNv bm5lY3Rpb25SZWYpCitzdGF0aWMgdm9pZCBzZXRVcENsaWVudChXS0Nvbm5lY3Rpb24gKndyYXBw ZXIsIFdlYkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24pCiB7CiAgICAgV0tDb25uZWN0aW9uQ2xpZW50 VjAgY2xpZW50OwogICAgIG1lbXNldCgmY2xpZW50LCAwLCBzaXplb2YoY2xpZW50KSk7CiAKICAg ICBjbGllbnQuYmFzZS52ZXJzaW9uID0gMDsKLSAgICBjbGllbnQuYmFzZS5jbGllbnRJbmZvID0g Y29ubmVjdGlvbjsKKyAgICBjbGllbnQuYmFzZS5jbGllbnRJbmZvID0gd3JhcHBlcjsKICAgICBj bGllbnQuZGlkUmVjZWl2ZU1lc3NhZ2UgPSBkaWRSZWNlaXZlTWVzc2FnZTsKICAgICBjbGllbnQu ZGlkQ2xvc2UgPSBkaWRDbG9zZTsKIAotICAgIFdLQ29ubmVjdGlvblNldENvbm5lY3Rpb25DbGll bnQoY29ubmVjdGlvblJlZiwgJmNsaWVudC5iYXNlKTsKKyAgICBjb25uZWN0aW9uLmluaXRpYWxp emVDb25uZWN0aW9uQ2xpZW50KCZjbGllbnQuYmFzZSk7Cit9CisKKy0gKGlkIDxXS0Nvbm5lY3Rp b25EZWxlZ2F0ZT4pZGVsZWdhdGUKK3sKKyAgICByZXR1cm4gX2RlbGVnYXRlOworfQorCistICh2 b2lkKXNldERlbGVnYXRlOihpZCA8V0tDb25uZWN0aW9uRGVsZWdhdGU+KWRlbGVnYXRlCit7Cisg ICAgX2RlbGVnYXRlID0gZGVsZWdhdGU7CisgICAgaWYgKF9kZWxlZ2F0ZSkKKyAgICAgICAgc2V0 VXBDbGllbnQoc2VsZiwgKl9jb25uZWN0aW9uKTsKKyAgICBlbHNlCisgICAgICAgIF9jb25uZWN0 aW9uLT5pbml0aWFsaXplQ29ubmVjdGlvbkNsaWVudChudWxscHRyKTsKK30KKworLSAodm9pZClz ZW5kTWVzc2FnZVdpdGhOYW1lOihOU1N0cmluZyAqKW1lc3NhZ2VOYW1lIGJvZHk6KGlkKW1lc3Nh Z2VCb2R5Cit7CisgICAgUmVmUHRyPE9iakNPYmplY3RHcmFwaD4gd2tNZXNzYWdlQm9keSA9IE9i akNPYmplY3RHcmFwaDo6Y3JlYXRlKG1lc3NhZ2VCb2R5KTsKKyAgICBfY29ubmVjdGlvbi0+cG9z dE1lc3NhZ2UobWVzc2FnZU5hbWUsIHdrTWVzc2FnZUJvZHkuZ2V0KCkpOwogfQogCi0tIChpZClf aW5pdFdpdGhDb25uZWN0aW9uUmVmOihXS0Nvbm5lY3Rpb25SZWYpY29ubmVjdGlvblJlZgorLSAo V0tSZW1vdGVPYmplY3RSZWdpc3RyeSAqKXJlbW90ZU9iamVjdFJlZ2lzdHJ5CiB7Ci0gICAgc2Vs ZiA9IFtzdXBlciBpbml0XTsKLSAgICBpZiAoIXNlbGYpCi0gICAgICAgIHJldHVybiBuaWw7Cisg ICAgaWYgKCFfcmVtb3RlT2JqZWN0UmVnaXN0cnkpCisgICAgICAgIF9yZW1vdGVPYmplY3RSZWdp c3RyeSA9IGFkb3B0TlMoW1tXS1JlbW90ZU9iamVjdFJlZ2lzdHJ5IGFsbG9jXSBfaW5pdFdpdGhD b25uZWN0aW9uUmVmOnRvQVBJKF9jb25uZWN0aW9uLmdldCgpKV0pOwogCi0gICAgX2Nvbm5lY3Rp b25SZWYgPSBjb25uZWN0aW9uUmVmOworICAgIHJldHVybiBfcmVtb3RlT2JqZWN0UmVnaXN0cnku Z2V0KCk7Cit9CiAKLSAgICBzZXRVcENsaWVudChzZWxmLCBfY29ubmVjdGlvblJlZi5nZXQoKSk7 CisjcHJhZ21hIG1hcmsgV0tPYmplY3QgcHJvdG9jb2wgaW1wbGVtZW50YXRpb24KIAotICAgIHJl dHVybiBzZWxmOworLSAoQVBJOjpPYmplY3QmKV9hcGlPYmplY3QKK3sKKyAgICByZXR1cm4gKl9j b25uZWN0aW9uOwogfQogCiBAZW5kCkluZGV4OiBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJ L0NvY29hL1dLQ29ubmVjdGlvbkludGVybmFsLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Nvbm5lY3Rpb25JbnRlcm5hbC5oCShyZXZpc2lvbiAx NjAxMzEpCisrKyBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLQ29ubmVjdGlv bkludGVybmFsLmgJKHdvcmtpbmcgY29weSkKQEAgLTI3LDEyICsyNywyMCBAQAogCiAjaWYgV0tf QVBJX0VOQUJMRUQKIAotI2ltcG9ydCA8V2ViS2l0Mi9XS0Jhc2UuaD4KKyNpbXBvcnQgIldLT2Jq ZWN0LmgiCisjaW1wb3J0ICJXZWJDb25uZWN0aW9uLmgiCiAKLUBpbnRlcmZhY2UgV0tDb25uZWN0 aW9uICgpCituYW1lc3BhY2UgV2ViS2l0IHsKIAotLSAoaWQpX2luaXRXaXRoQ29ubmVjdGlvblJl ZjooV0tDb25uZWN0aW9uUmVmKWNvbm5lY3Rpb25SZWY7CitpbmxpbmUgV0tDb25uZWN0aW9uICp3 cmFwcGVyKFdlYkNvbm5lY3Rpb24mIGNvbm5lY3Rpb24pCit7CisgICAgQVNTRVJUKFtjb25uZWN0 aW9uLndyYXBwZXIoKSBpc0tpbmRPZkNsYXNzOltXS0Nvbm5lY3Rpb24gY2xhc3NdXSk7CisgICAg cmV0dXJuIChXS0Nvbm5lY3Rpb24gKiljb25uZWN0aW9uLndyYXBwZXIoKTsKK30KIAorfQorCitA aW50ZXJmYWNlIFdLQ29ubmVjdGlvbiAoKSA8V0tPYmplY3Q+CiBAZW5kCiAKICNlbmRpZiAvLyBX S19BUElfRU5BQkxFRApJbmRleDogU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1Byb2Nlc3NHcm91cC5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLUHJvY2Vzc0dyb3VwLm1tCShyZXZpc2lvbiAxNjAxMzEpCisrKyBTb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJvY2Vzc0dyb3VwLm1tCSh3b3JraW5nIGNv cHkpCkBAIC02OSwxMCArNjksOCBAQCAtICh2b2lkKWRlYWxsb2MKIHN0YXRpYyB2b2lkIGRpZENy ZWF0ZUNvbm5lY3Rpb24oV0tDb250ZXh0UmVmLCBXS0Nvbm5lY3Rpb25SZWYgY29ubmVjdGlvblJl ZiwgY29uc3Qgdm9pZCogY2xpZW50SW5mbykKIHsKICAgICBXS1Byb2Nlc3NHcm91cCAqcHJvY2Vz c0dyb3VwID0gKFdLUHJvY2Vzc0dyb3VwICopY2xpZW50SW5mbzsKLSAgICBpZiAoW3Byb2Nlc3NH cm91cC5kZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKHByb2Nlc3NHcm91cDpk aWRDcmVhdGVDb25uZWN0aW9uVG9XZWJQcm9jZXNzUGx1Z0luOildKSB7Ci0gICAgICAgIFJldGFp blB0cjxXS0Nvbm5lY3Rpb24+IGNvbm5lY3Rpb24gPSBhZG9wdE5TKFtbV0tDb25uZWN0aW9uIGFs bG9jXSBfaW5pdFdpdGhDb25uZWN0aW9uUmVmOmNvbm5lY3Rpb25SZWZdKTsKLSAgICAgICAgW3By b2Nlc3NHcm91cC5kZWxlZ2F0ZSBwcm9jZXNzR3JvdXA6cHJvY2Vzc0dyb3VwIGRpZENyZWF0ZUNv bm5lY3Rpb25Ub1dlYlByb2Nlc3NQbHVnSW46Y29ubmVjdGlvbi5nZXQoKV07Ci0gICAgfQorICAg IGlmIChbcHJvY2Vzc0dyb3VwLmRlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Io cHJvY2Vzc0dyb3VwOmRpZENyZWF0ZUNvbm5lY3Rpb25Ub1dlYlByb2Nlc3NQbHVnSW46KV0pCisg ICAgICAgIFtwcm9jZXNzR3JvdXAuZGVsZWdhdGUgcHJvY2Vzc0dyb3VwOnByb2Nlc3NHcm91cCBk aWRDcmVhdGVDb25uZWN0aW9uVG9XZWJQcm9jZXNzUGx1Z0luOndyYXBwZXIoKnRvSW1wbChjb25u ZWN0aW9uUmVmKSldOwogfQogCiBzdGF0aWMgdm9pZCBzZXRVcENvbm5lY3Rpb25DbGllbnQoV0tQ cm9jZXNzR3JvdXAgKnByb2Nlc3NHcm91cCwgV0tDb250ZXh0UmVmIGNvbnRleHRSZWYpCkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL0luamVjdGVkQnVuZGxlL0FQSS9tYWMvV0tXZWJQ cm9jZXNzUGx1Z0luLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3Mv SW5qZWN0ZWRCdW5kbGUvQVBJL21hYy9XS1dlYlByb2Nlc3NQbHVnSW4ubW0JKHJldmlzaW9uIDE2 MDEzMSkKKysrIFNvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvSW5qZWN0ZWRCdW5kbGUvQVBJL21h Yy9XS1dlYlByb2Nlc3NQbHVnSW4ubW0JKHdvcmtpbmcgY29weSkKQEAgLTM2LDExICszNiwxMyBA QAogI2ltcG9ydCAiV0tXZWJQcm9jZXNzUGx1Z0luQnJvd3NlckNvbnRleHRDb250cm9sbGVySW50 ZXJuYWwuaCIKICNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KIAordXNpbmcgbmFtZXNwYWNlIFdl YktpdDsKKwogdHlwZWRlZiBIYXNoTWFwPFdLQnVuZGxlUGFnZVJlZiwgUmV0YWluUHRyPFdLV2Vi UHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHJvbGxlciAqPj4gQnVuZGxlUGFnZVdyYXBw ZXJDYWNoZTsKIAogQGludGVyZmFjZSBXS1dlYlByb2Nlc3NQbHVnSW5Db250cm9sbGVyICgpIHsK LSAgICBSZXRhaW5QdHI8aWQgPFdLV2ViUHJvY2Vzc1BsdWdJbj4gPiBfcHJpbmNpcGFsQ2xhc3NJ bnN0YW5jZTsKLSAgICBXS1JldGFpblB0cjxXS0J1bmRsZVJlZj4gX2J1bmRsZVJlZjsKKyAgICBS ZXRhaW5QdHI8aWQgPFdLV2ViUHJvY2Vzc1BsdWdJbj4+IF9wcmluY2lwYWxDbGFzc0luc3RhbmNl OworICAgIFJlZlB0cjxJbmplY3RlZEJ1bmRsZT4gX2J1bmRsZTsKICAgICBCdW5kbGVQYWdlV3Jh cHBlckNhY2hlIF9idW5kbGVQYWdlV3JhcHBlckNhY2hlOwogICAgIFJldGFpblB0cjxXS0Nvbm5l Y3Rpb24gKj4gX2Nvbm5lY3Rpb25XcmFwcGVyOwogfQpAQCAtMTEwLDggKzExMiw3IEBAIC0gKGlk KV9pbml0V2l0aFByaW5jaXBhbENsYXNzSW5zdGFuY2U6KGkKICAgICAgICAgcmV0dXJuIG5pbDsK IAogICAgIF9wcmluY2lwYWxDbGFzc0luc3RhbmNlID0gcHJpbmNpcGFsQ2xhc3NJbnN0YW5jZTsK LSAgICBfYnVuZGxlUmVmID0gYnVuZGxlUmVmOwotICAgIF9jb25uZWN0aW9uV3JhcHBlciA9IGFk b3B0TlMoW1tXS0Nvbm5lY3Rpb24gYWxsb2NdIF9pbml0V2l0aENvbm5lY3Rpb25SZWY6V0tCdW5k bGVHZXRBcHBsaWNhdGlvbkNvbm5lY3Rpb24oX2J1bmRsZVJlZi5nZXQoKSldKTsKKyAgICBfYnVu ZGxlID0gdG9JbXBsKGJ1bmRsZVJlZik7CiAKICAgICBBU1NFUlRfV0lUSF9NRVNTQUdFKCFzaGFy ZWRJbnN0YW5jZSwgIldLV2ViUHJvY2Vzc1BsdWdJbkNvbnRyb2xsZXIgaW5pdGlhbGl6ZWQgbXVs dGlwbGUgdGltZXMuIik7CiAgICAgc2hhcmVkSW5zdGFuY2UgPSBzZWxmOwpAQCAtMTI5LDcgKzEz MCw3IEBAIC0gKFdLV2ViUHJvY2Vzc1BsdWdJbkJyb3dzZXJDb250ZXh0Q29udHIKIAogLSAoV0tD b25uZWN0aW9uICopY29ubmVjdGlvbgogewotICAgIHJldHVybiBfY29ubmVjdGlvbldyYXBwZXIu Z2V0KCk7CisgICAgcmV0dXJuIHdyYXBwZXIoKl9idW5kbGUtPndlYkNvbm5lY3Rpb25Ub1VJUHJv Y2VzcygpKTsKIH0KIAogQGVuZApAQCAtMTM4LDcgKzEzOSw3IEBAIC0gKFdLQ29ubmVjdGlvbiAq KWNvbm5lY3Rpb24KIAogLSAoV0tCdW5kbGVSZWYpX2J1bmRsZVJlZgogewotICAgIHJldHVybiBf YnVuZGxlUmVmLmdldCgpOworICAgIHJldHVybiB0b0FQSShfYnVuZGxlLmdldCgpKTsKIH0KIAog QGVuZAo=