46117 2010-09-20 13:10:52 -0700 Add a way to delay sending replies to sync requests 2010-09-20 16:27:32 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 281771 0 andersca 2010-09-20 13:10:52 -0700 Add a way to delay sending replies to sync requests 281776 1 68129 andersca 2010-09-20 13:19:12 -0700 Created attachment 68129 Patch 281799 2 68129 aroben 2010-09-20 14:02:36 -0700 Comment on attachment 68129 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=68129&action=review > WebKit2/Platform/CoreIPC/Connection.cpp:276 > - OwnPtr<ArgumentEncoder> replyEncoder(new ArgumentEncoder(syncRequestID)); > + ArgumentEncoder* replyEncoder = new ArgumentEncoder(syncRequestID); > > // Hand off both the decoder and encoder to the client.. > - m_client->didReceiveSyncMessage(this, message.messageID(), arguments.get(), replyEncoder.get()); > + SyncReplyMode syncReplyMode = m_client->didReceiveSyncMessage(this, message.messageID(), arguments.get(), replyEncoder); > > // FIXME: If the message was invalid, we should send back a SyncMessageError. > ASSERT(!arguments->isInvalid()); > > - // Send the reply. > - sendMessage(MessageID(CoreIPCMessage::SyncMessageReply), replyEncoder.release()); > + if (syncReplyMode == AutomaticReply) { > + // Send the reply. > + sendSyncReply(replyEncoder); > + } else { > + // The client will take ownership of the reply encoder and send it at some point in the future. > + // We won't do anything here. > + } Another option is to continue to use OwnPtr, and then call leakPtr in the ManualReply case. Yet another option is to use a bare pointer, but wrap the call to new in adoptPtr/leakPtr. 281891 3 andersca 2010-09-20 16:27:32 -0700 Committed r67891: <http://trac.webkit.org/changeset/67891> 68129 2010-09-20 13:19:12 -0700 2010-09-20 14:02:36 -0700 Patch bug-46117-20100920131911.patch text/plain 9028 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg MTk2YTRmNWI1ODVjNzIxYTI4ZTdhYTllNDdmOGFhNTRlZTM3ZjQyYS4uZGNkNmNjNjVmYzAzYmRj ZWEyNjk2NDExOTUzZTA4ZjBhNDQxMDRjMCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzMyBAQAogMjAxMC0wOS0yMCAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBhIHdheSB0byBkZWxheSBzZW5kaW5nIHJl cGxpZXMgdG8gc3luYyByZXF1ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9NDYxMTcKKworICAgICAgICBDaGFuZ2UgdGhlIGRpZFJlY2VpdmVTeW5j TWVzc2FnZSBjbGllbnQgbWVzc2FnZSB0byByZXR1cm4gYSBTeW5jUmVwbHlNb2RlLiBJZiB0aGUg U3luY1JlcGx5TW9kZSBpcyAKKyAgICAgICAgQXV0b21hdGljUmVwbHksIHRoZSByZXBseSB3aWxs IGJlIHNlbnQgd2hlbiB0aGUgZGlkUmVjZWl2ZVN5bmNNZXNzYWdlIGZ1bmN0aW9uIHJldHVybnMu IEhvd2V2ZXIsIGlmIGl0IGlzCisgICAgICAgIE1hbnVhbFJlcGx5LCB0aGVuIHRoZSBjbGllbnQg aXMgaGFuZGVkIG93bmVyc2hpcCBvZiB0aGUgcmVwbHkgQXJndW1lbnRFbmNvZGVyIGFuZCBjYW4g Y2hvb3NlIHRvIHNlbmQgaXQgCisgICAgICAgIGF0IGEgbGF0ZXIgdGltZSB1c2luZyBDb25uZWN0 aW9uOjpzZW5kU3luY1JlcGx5LgorCisgICAgICAgICogUGxhdGZvcm0vQ29yZUlQQy9Db25uZWN0 aW9uLmNwcDoKKyAgICAgICAgKENvcmVJUEM6OkNvbm5lY3Rpb246OnNlbmRTeW5jUmVwbHkpOgor ICAgICAgICBTZW5kIHRoZSBtZXNzYWdlIGFzIGEgc3luYyByZXBseS4KKworICAgICAgICAoQ29y ZUlQQzo6Q29ubmVjdGlvbjo6ZGlzcGF0Y2hNZXNzYWdlcyk6CisgICAgICAgIENoZWNrIHRoZSBy ZXR1cm4gdmFsdWUgb2YgZGlkUmVjZWl2ZVN5bmNNZXNzYWdlLiBJZiBpdCBpcyBBdXRvbWF0aWNS ZXBseSwgaW1tZWRpYXRlbHkgc2VuZCB0aGUgcmVwbHkuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9D b3JlSVBDL0Nvbm5lY3Rpb24uaDoKKyAgICAgICAgKENvcmVJUEM6OkNvbm5lY3Rpb246Ok1lc3Nh Z2VSZWNlaXZlcjo6ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKToKKyAgICAgICAgQ2hhbmdlIHJldHVy biB0eXBlLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHA6CisgICAg ICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94eTo6ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKToKKyAg ICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5Lmg6CisgICAgICAgIFVwZGF0ZSBmb3Ig Y2hhbmdlZCByZXR1cm4gdHlwZS4KKworMjAxMC0wOS0yMCAgQW5kZXJzIENhcmxzc29uICA8YW5k ZXJzY2FAYXBwbGUuY29tPgorCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gUm9iZW4uCiAKICAg ICAgICAgRG9uJ3QgdXNlIGJ1ZmZlcklzTGFyZ2VFbm91Z2hUb0NvbnRhaW4gZm9yIFZlY3RvcnMg d2l0aCB2YXJpYWJsZSBzaXplZCBlbGVtZW50cwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9QbGF0Zm9y bS9Db3JlSVBDL0Nvbm5lY3Rpb24uY3BwIGIvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0Nvbm5l Y3Rpb24uY3BwCmluZGV4IDE4NjZhODU5YzllMjgwM2IzYjZkYTJjZmFkZDVhZTVhYWYyOGE4Y2Iu LmEyMzQ2YzJkNjI1MGI4NzAzNDFhYzYzNTAzMTc1MmVkYjk2MGRkOTQgMTAwNjQ0Ci0tLSBhL1dl YktpdDIvUGxhdGZvcm0vQ29yZUlQQy9Db25uZWN0aW9uLmNwcAorKysgYi9XZWJLaXQyL1BsYXRm b3JtL0NvcmVJUEMvQ29ubmVjdGlvbi5jcHAKQEAgLTkwLDYgKzkwLDExIEBAIGJvb2wgQ29ubmVj dGlvbjo6c2VuZE1lc3NhZ2UoTWVzc2FnZUlEIG1lc3NhZ2VJRCwgUGFzc093blB0cjxBcmd1bWVu dEVuY29kZXI+IGFyCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKK2Jvb2wgQ29ubmVjdGlvbjo6c2Vu ZFN5bmNSZXBseShQYXNzT3duUHRyPEFyZ3VtZW50RW5jb2Rlcj4gYXJndW1lbnRzKQoreworICAg IHJldHVybiBzZW5kTWVzc2FnZShNZXNzYWdlSUQoQ29yZUlQQ01lc3NhZ2U6OlN5bmNNZXNzYWdl UmVwbHkpLCBhcmd1bWVudHMpOworfQorCiBQYXNzT3duUHRyPEFyZ3VtZW50RGVjb2Rlcj4gQ29u bmVjdGlvbjo6d2FpdEZvck1lc3NhZ2UoTWVzc2FnZUlEIG1lc3NhZ2VJRCwgdWludDY0X3QgZGVz dGluYXRpb25JRCwgZG91YmxlIHRpbWVvdXQpCiB7CiAgICAgLy8gRmlyc3QsIGNoZWNrIGlmIHRo aXMgbWVzc2FnZSBpcyBhbHJlYWR5IGluIHRoZSBpbmNvbWluZyBtZXNzYWdlcyBxdWV1ZS4KQEAg LTI1NCwxNiArMjU5LDIxIEBAIHZvaWQgQ29ubmVjdGlvbjo6ZGlzcGF0Y2hNZXNzYWdlcygpCiAg ICAgICAgICAgICB9CiAKICAgICAgICAgICAgIC8vIENyZWF0ZSBvdXIgcmVwbHkgZW5jb2Rlci4K LSAgICAgICAgICAgIE93blB0cjxBcmd1bWVudEVuY29kZXI+IHJlcGx5RW5jb2RlcihuZXcgQXJn dW1lbnRFbmNvZGVyKHN5bmNSZXF1ZXN0SUQpKTsKKyAgICAgICAgICAgIEFyZ3VtZW50RW5jb2Rl ciogcmVwbHlFbmNvZGVyID0gbmV3IEFyZ3VtZW50RW5jb2RlcihzeW5jUmVxdWVzdElEKTsKICAg ICAgICAgICAgIAogICAgICAgICAgICAgLy8gSGFuZCBvZmYgYm90aCB0aGUgZGVjb2RlciBhbmQg ZW5jb2RlciB0byB0aGUgY2xpZW50Li4KLSAgICAgICAgICAgIG1fY2xpZW50LT5kaWRSZWNlaXZl U3luY01lc3NhZ2UodGhpcywgbWVzc2FnZS5tZXNzYWdlSUQoKSwgYXJndW1lbnRzLmdldCgpLCBy ZXBseUVuY29kZXIuZ2V0KCkpOworICAgICAgICAgICAgU3luY1JlcGx5TW9kZSBzeW5jUmVwbHlN b2RlID0gbV9jbGllbnQtPmRpZFJlY2VpdmVTeW5jTWVzc2FnZSh0aGlzLCBtZXNzYWdlLm1lc3Nh Z2VJRCgpLCBhcmd1bWVudHMuZ2V0KCksIHJlcGx5RW5jb2Rlcik7CiAgICAgICAgICAgICAKICAg ICAgICAgICAgIC8vIEZJWE1FOiBJZiB0aGUgbWVzc2FnZSB3YXMgaW52YWxpZCwgd2Ugc2hvdWxk IHNlbmQgYmFjayBhIFN5bmNNZXNzYWdlRXJyb3IuCiAgICAgICAgICAgICBBU1NFUlQoIWFyZ3Vt ZW50cy0+aXNJbnZhbGlkKCkpOwogCi0gICAgICAgICAgICAvLyBTZW5kIHRoZSByZXBseS4KLSAg ICAgICAgICAgIHNlbmRNZXNzYWdlKE1lc3NhZ2VJRChDb3JlSVBDTWVzc2FnZTo6U3luY01lc3Nh Z2VSZXBseSksIHJlcGx5RW5jb2Rlci5yZWxlYXNlKCkpOworICAgICAgICAgICAgaWYgKHN5bmNS ZXBseU1vZGUgPT0gQXV0b21hdGljUmVwbHkpIHsKKyAgICAgICAgICAgICAgICAvLyBTZW5kIHRo ZSByZXBseS4KKyAgICAgICAgICAgICAgICBzZW5kU3luY1JlcGx5KHJlcGx5RW5jb2Rlcik7Cisg ICAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgICAgIC8vIFRoZSBjbGllbnQgd2lsbCB0 YWtlIG93bmVyc2hpcCBvZiB0aGUgcmVwbHkgZW5jb2RlciBhbmQgc2VuZCBpdCBhdCBzb21lIHBv aW50IGluIHRoZSBmdXR1cmUuCisgICAgICAgICAgICAgICAgLy8gV2Ugd29uJ3QgZG8gYW55dGhp bmcgaGVyZS4KKyAgICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlCiAgICAgICAgICAgICBtX2Ns aWVudC0+ZGlkUmVjZWl2ZU1lc3NhZ2UodGhpcywgbWVzc2FnZS5tZXNzYWdlSUQoKSwgYXJndW1l bnRzLmdldCgpKTsKIApkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0Nvbm5l Y3Rpb24uaCBiL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9Db25uZWN0aW9uLmgKaW5kZXggYTdl NWQwZDNlNGM3MWYwZWI1ZjcyNTFmOTBlNTgwNjczMTZjNDE2NS4uMjQwOWYyYWZlM2RhZmRmMWFj ODEzZDY4MDQ1MjE3MmQ2ODYwMWE1YSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9QbGF0Zm9ybS9Db3Jl SVBDL0Nvbm5lY3Rpb24uaAorKysgYi9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvQ29ubmVjdGlv bi5oCkBAIC01Myw2ICs1MywxMSBAQCBuYW1lc3BhY2UgQ29yZUlQQyB7CiAKIGNsYXNzIE1lc3Nh Z2VJRDsKICAgICAKK2VudW0gU3luY1JlcGx5TW9kZSB7CisgICAgQXV0b21hdGljUmVwbHksCisg ICAgTWFudWFsUmVwbHkKK307CisgICAgCiBjbGFzcyBDb25uZWN0aW9uIDogcHVibGljIFRocmVh ZFNhZmVTaGFyZWQ8Q29ubmVjdGlvbj4gewogcHVibGljOgogICAgIGNsYXNzIE1lc3NhZ2VSZWNl aXZlciB7CkBAIC02MSw3ICs2Niw3IEBAIHB1YmxpYzoKIAogICAgIHB1YmxpYzoKICAgICAgICAg dmlydHVhbCB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlKENvbm5lY3Rpb24qLCBNZXNzYWdlSUQsIEFy Z3VtZW50RGVjb2RlciopID0gMDsKLSAgICAgICAgdmlydHVhbCB2b2lkIGRpZFJlY2VpdmVTeW5j TWVzc2FnZShDb25uZWN0aW9uKiwgTWVzc2FnZUlELCBBcmd1bWVudERlY29kZXIqLCBBcmd1bWVu dEVuY29kZXIqKSB7IEFTU0VSVF9OT1RfUkVBQ0hFRCgpOyB9CisgICAgICAgIHZpcnR1YWwgU3lu Y1JlcGx5TW9kZSBkaWRSZWNlaXZlU3luY01lc3NhZ2UoQ29ubmVjdGlvbiosIE1lc3NhZ2VJRCwg QXJndW1lbnREZWNvZGVyKiwgQXJndW1lbnRFbmNvZGVyKikgeyBBU1NFUlRfTk9UX1JFQUNIRUQo KTsgcmV0dXJuIEF1dG9tYXRpY1JlcGx5OyB9CiAgICAgfTsKICAgICAKICAgICBjbGFzcyBDbGll bnQgOiBwdWJsaWMgTWVzc2FnZVJlY2VpdmVyIHsKQEAgLTk4LDYgKzEwMyw4IEBAIHB1YmxpYzoK IAogICAgIGJvb2wgc2VuZE1lc3NhZ2UoTWVzc2FnZUlELCBQYXNzT3duUHRyPEFyZ3VtZW50RW5j b2Rlcj4pOwogCisgICAgYm9vbCBzZW5kU3luY1JlcGx5KFBhc3NPd25QdHI8QXJndW1lbnRFbmNv ZGVyPik7CisKIHByaXZhdGU6CiAgICAgdGVtcGxhdGU8dHlwZW5hbWUgVD4gY2xhc3MgTWVzc2Fn ZSB7CiAgICAgcHVibGljOgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vz c1Byb3h5LmNwcCBiL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKaW5kZXgg MjkyMTA4N2EwYzJjMzc5MzE5YjUzMWE4Mjk5NjdjN2FiMDVhZjdkMS4uYTAyNDI2YzY4ODUzNzI2 ZmVhYmJmZjJhYzAyYTBmN2RkNjI3ZWMzNCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9VSVByb2Nlc3Mv V2ViUHJvY2Vzc1Byb3h5LmNwcAorKysgYi9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJv eHkuY3BwCkBAIC0zMzcsMjEgKzMzNywyMSBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6ZGlkUmVj ZWl2ZU1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgQ29yZUlQQwogICAg IHBhZ2VQcm94eS0+ZGlkUmVjZWl2ZU1lc3NhZ2UoY29ubmVjdGlvbiwgbWVzc2FnZUlELCBhcmd1 bWVudHMpOyAgICAKIH0KIAotdm9pZCBXZWJQcm9jZXNzUHJveHk6OmRpZFJlY2VpdmVTeW5jTWVz c2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBDb3JlSVBDOjpNZXNzYWdlSUQg bWVzc2FnZUlELCBDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqIGFyZ3VtZW50cywgQ29yZUlQQzo6 QXJndW1lbnRFbmNvZGVyKiByZXBseSkKK0NvcmVJUEM6OlN5bmNSZXBseU1vZGUgV2ViUHJvY2Vz c1Byb3h5OjpkaWRSZWNlaXZlU3luY01lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiogY29ubmVj dGlvbiwgQ29yZUlQQzo6TWVzc2FnZUlEIG1lc3NhZ2VJRCwgQ29yZUlQQzo6QXJndW1lbnREZWNv ZGVyKiBhcmd1bWVudHMsIENvcmVJUEM6OkFyZ3VtZW50RW5jb2RlciogcmVwbHkpCiB7CiAgICAg aWYgKG1lc3NhZ2VJRC5pczxDb3JlSVBDOjpNZXNzYWdlQ2xhc3NXZWJQcm9jZXNzUHJveHk+KCkp IHsKICAgICAgICAgc3dpdGNoIChtZXNzYWdlSUQuZ2V0PFdlYlByb2Nlc3NQcm94eU1lc3NhZ2U6 OktpbmQ+KCkpIHsKICAgICAgICAgICAgIGNhc2UgV2ViUHJvY2Vzc1Byb3h5TWVzc2FnZTo6R2V0 UGx1Z2luczogewogICAgICAgICAgICAgICAgIGJvb2wgcmVmcmVzaDsKICAgICAgICAgICAgICAg ICBpZiAoIWFyZ3VtZW50cy0+ZGVjb2RlKHJlZnJlc2gpKQotICAgICAgICAgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBDb3JlSVBDOjpBdXRvbWF0aWNSZXBs eTsKICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAvLyBGSVhNRTogV2Ugc2hvdWxk IG5vdCBkbyB0aGlzIG9uIHRoZSBtYWluIHRocmVhZCEKICAgICAgICAgICAgICAgICBWZWN0b3I8 UGx1Z2luSW5mbz4gcGx1Z2luczsKICAgICAgICAgICAgICAgICBnZXRQbHVnaW5zKHJlZnJlc2gs IHBsdWdpbnMpOwogCiAgICAgICAgICAgICAgICAgcmVwbHktPmVuY29kZShwbHVnaW5zKTsKLSAg ICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgcmV0dXJuIENvcmVJUEM6OkF1 dG9tYXRpY1JlcGx5OwogICAgICAgICAgICAgfQogCiAgICAgICAgICAgICBjYXNlIFdlYlByb2Nl c3NQcm94eU1lc3NhZ2U6OkdldFBsdWdpbkhvc3RDb25uZWN0aW9uOiB7CkBAIC0zNTksMTIgKzM1 OSwxMiBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKENvcmVJ UEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIENvcgogICAgICAgICAgICAgICAgIFN0cmluZyB1 cmxTdHJpbmc7CiAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgaWYgKCFhcmd1bWVu dHMtPmRlY29kZShDb3JlSVBDOjpPdXQobWltZVR5cGUsIHVybFN0cmluZykpKQotICAgICAgICAg ICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBDb3JlSVBDOjpB dXRvbWF0aWNSZXBseTsKICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICBTdHJpbmcg cGx1Z2luUGF0aDsKICAgICAgICAgICAgICAgICBnZXRQbHVnaW5Ib3N0Q29ubmVjdGlvbihtaW1l VHlwZSwgS1VSTChQYXJzZWRVUkxTdHJpbmcsIHVybFN0cmluZyksIHBsdWdpblBhdGgpOwogICAg ICAgICAgICAgICAgIHJlcGx5LT5lbmNvZGUoQ29yZUlQQzo6SW4ocGx1Z2luUGF0aCkpOwotICAg ICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgICAgICAgICByZXR1cm4gQ29yZUlQQzo6QXV0 b21hdGljUmVwbHk7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAgIC8vIFRoZXNlIGFyZSBh c3luY2hyb25vdXMgbWVzc2FnZXMgYW5kIHNob3VsZCBuZXZlciBiZSBoYW5kbGVkIGhlcmUuCkBA IC0zNzYsMjQgKzM3NiwyNSBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6ZGlkUmVjZWl2ZVN5bmNN ZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIENvcgogICAgICAgICAgICAg Y2FzZSBXZWJQcm9jZXNzUHJveHlNZXNzYWdlOjpBZGRWaXNpdGVkTGluazoKICAgICAgICAgICAg IGNhc2UgV2ViUHJvY2Vzc1Byb3h5TWVzc2FnZTo6RGlkRGVzdHJveUZyYW1lOgogICAgICAgICAg ICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwotICAgICAgICAgICAgICAgIHJldHVybjsKKyAg ICAgICAgICAgICAgICByZXR1cm4gQ29yZUlQQzo6QXV0b21hdGljUmVwbHk7CiAgICAgICAgIH0K ICAgICB9CiAKICAgICBpZiAobWVzc2FnZUlELmlzPENvcmVJUEM6Ok1lc3NhZ2VDbGFzc1dlYkNv bnRleHQ+KCkpIHsKICAgICAgICAgbV9jb250ZXh0LT5kaWRSZWNlaXZlU3luY01lc3NhZ2UoY29u bmVjdGlvbiwgbWVzc2FnZUlELCBhcmd1bWVudHMsIHJlcGx5KTsgICAgCi0gICAgICAgIHJldHVy bjsKKyAgICAgICAgcmV0dXJuIENvcmVJUEM6OkF1dG9tYXRpY1JlcGx5OwogICAgIH0KIAogICAg IHVpbnQ2NF90IHBhZ2VJRCA9IGFyZ3VtZW50cy0+ZGVzdGluYXRpb25JRCgpOwogICAgIGlmICgh cGFnZUlEKQotICAgICAgICByZXR1cm47CisgICAgICAgIHJldHVybiBDb3JlSVBDOjpBdXRvbWF0 aWNSZXBseTsKICAgICAKICAgICBXZWJQYWdlUHJveHkqIHBhZ2VQcm94eSA9IHdlYlBhZ2UocGFn ZUlEKTsKICAgICBpZiAoIXBhZ2VQcm94eSkKLSAgICAgICAgcmV0dXJuOworICAgICAgICByZXR1 cm4gQ29yZUlQQzo6QXV0b21hdGljUmVwbHk7CiAgICAgCiAgICAgcGFnZVByb3h5LT5kaWRSZWNl aXZlU3luY01lc3NhZ2UoY29ubmVjdGlvbiwgbWVzc2FnZUlELCBhcmd1bWVudHMsIHJlcGx5KTsK KyAgICByZXR1cm4gQ29yZUlQQzo6QXV0b21hdGljUmVwbHk7CiB9CiAKIHZvaWQgV2ViUHJvY2Vz c1Byb3h5OjpkaWRDbG9zZShDb3JlSVBDOjpDb25uZWN0aW9uKikKZGlmZiAtLWdpdCBhL1dlYktp dDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5oIGIvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJv Y2Vzc1Byb3h5LmgKaW5kZXggM2EwYjE3ODBhYjNkMmIzZTQwMGU5MzhjYTlhOTNkNjMxODIyMTYz My4uNDNlOTY2YTE1NTBkMWM3N2FjNjQzM2U0ZDNmODkyMWE3YzRjZDIxYiAxMDA2NDQKLS0tIGEv V2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmgKKysrIGIvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViUHJvY2Vzc1Byb3h5LmgKQEAgLTExMiw3ICsxMTIsNyBAQCBwcml2YXRlOgogCiAgICAg Ly8gQ29yZUlQQzo6Q29ubmVjdGlvbjo6Q2xpZW50CiAgICAgdm9pZCBkaWRSZWNlaXZlTWVzc2Fn ZShDb3JlSVBDOjpDb25uZWN0aW9uKiwgQ29yZUlQQzo6TWVzc2FnZUlELCBDb3JlSVBDOjpBcmd1 bWVudERlY29kZXIqKTsKLSAgICB2b2lkIGRpZFJlY2VpdmVTeW5jTWVzc2FnZShDb3JlSVBDOjpD b25uZWN0aW9uKiwgQ29yZUlQQzo6TWVzc2FnZUlELCBDb3JlSVBDOjpBcmd1bWVudERlY29kZXIq LCBDb3JlSVBDOjpBcmd1bWVudEVuY29kZXIqKTsKKyAgICBDb3JlSVBDOjpTeW5jUmVwbHlNb2Rl IGRpZFJlY2VpdmVTeW5jTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiwgQ29yZUlQQzo6TWVz c2FnZUlELCBDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqLCBDb3JlSVBDOjpBcmd1bWVudEVuY29k ZXIqKTsKICAgICB2b2lkIGRpZENsb3NlKENvcmVJUEM6OkNvbm5lY3Rpb24qKTsKICAgICB2b2lk IGRpZFJlY2VpdmVJbnZhbGlkTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiwgQ29yZUlQQzo6 TWVzc2FnZUlEKTsKICAgICAgICAgCg==