46737 2010-09-28 10:52:14 -0700 Implement PluginProxy::destroy 2010-09-28 11:12:28 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 286371 0 andersca 2010-09-28 10:52:14 -0700 Implement PluginProxy::destroy 286373 1 69071 andersca 2010-09-28 10:55:36 -0700 Created attachment 69071 Patch 286378 2 69071 aroben 2010-09-28 11:01:52 -0700 Comment on attachment 69071 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=69071&action=review > WebKit2/PluginProcess/WebProcessConnection.messages.in:30 > + # Destroys the plug-in instance with the given instance ID. > + DestroyPlugin(uint64_t pluginInstanceID) -> () I worry that this doesn't make it clear enough that this is a sync message. Maybe we need to make the syntax more explicit. 286379 3 69071 aroben 2010-09-28 11:02:12 -0700 Comment on attachment 69071 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=69071&action=review > WebKit2/ChangeLog:14 > + * PluginProcess/WebProcessConnection.cpp: > + (WebKit::WebProcessConnection::destroyPluginControllerProxy): > + Rename this to avoid conflicts with the destroyPlugin message handler. C++ overloading should make this a non-issue. 286386 4 andersca 2010-09-28 11:12:28 -0700 Committed r68545: <http://trac.webkit.org/changeset/68545> 69071 2010-09-28 10:55:36 -0700 2010-09-28 11:02:12 -0700 Patch bug-46737-20100928105535.patch text/plain 8268 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg OGQxNDc4MzNjMDQxYWNkNjc2NzZkMDhkMmFkNzJlZGY3NTcxZjJkMC4uMGI3OTIwZjQ1Y2Y3YmU1 NWZmMzQ0ZmVlYTYyYmVjMjI4MjMxMmMwYSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw0MCBAQAogMjAxMC0wOS0yOCAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBQbHVnaW5Qcm94eTo6ZGVzdHJv eQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDY3MzcK KworICAgICAgICAqIFBsYXRmb3JtL0NvcmVJUEMvSGFuZGxlTWVzc2FnZS5oOgorICAgICAgICAo Q29yZUlQQzo6aGFuZGxlTWVzc2FnZSk6CisgICAgICAgIEFkZCBvdmVybG9hZCBmb3IgYSBzeW5j IG1lc3NhZ2Ugd2l0aCBvbmUgaW4gcGFyYW1ldGVyIGFuZCBubyBvdXQgcGFyYW1ldGVycy4KKwor ICAgICAgICAqIFBsdWdpblByb2Nlc3MvV2ViUHJvY2Vzc0Nvbm5lY3Rpb24uY3BwOgorICAgICAg ICAoV2ViS2l0OjpXZWJQcm9jZXNzQ29ubmVjdGlvbjo6ZGVzdHJveVBsdWdpbkNvbnRyb2xsZXJQ cm94eSk6CisgICAgICAgIFJlbmFtZSB0aGlzIHRvIGF2b2lkIGNvbmZsaWN0cyB3aXRoIHRoZSBk ZXN0cm95UGx1Z2luIG1lc3NhZ2UgaGFuZGxlci4KKworICAgICAgICAoV2ViS2l0OjpXZWJQcm9j ZXNzQ29ubmVjdGlvbjo6ZGVzdHJveVBsdWdpbik6CisgICAgICAgIENhbGwgZGVzdHJveVBsdWdp bkNvbnRyb2xsZXJQcm94eS4KKworICAgICAgICAqIFBsdWdpblByb2Nlc3MvV2ViUHJvY2Vzc0Nv bm5lY3Rpb24ubWVzc2FnZXMuaW46CisgICAgICAgIEFkZCBEZXN0cm95UGx1Z2luIG1lc3NhZ2Uu CisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb24u Y3BwOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm9jZXNzQ29ubmVjdGlvbjo6ZGlkQ2xvc2Up OgorICAgICAgICAKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJveHkuY3Bw OgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm94eTo6UGx1Z2luUHJveHkpOgorICAgICAgICAo V2ViS2l0OjpQbHVnaW5Qcm94eTo6flBsdWdpblByb3h5KToKKyAgICAgICAgRG9uJ3QgYWRkIGFu ZC90aGUgcGx1Zy1pbiBwcm94eSBmcm9tIHRoZSBtYXAgaW4gdGhlIGNvbnN0cnVjdG9yL2Rlc3Ry dWN0b3IuIEluc3RlYWQsCisgICAgICAgIGRvIGl0IGluIGluaXRpYWxpemUvZGVzdHJveSwgc2lu Y2Ugb3RoZXJ3aXNlIHdlIGNvdWxkIGJlIGNhbGxpbmcgcGx1Z2luUHJvY2Vzc0NyYXNoZWQgb24g YQorICAgICAgICBQbHVnaW5Db250cm9sbGVyIHRoYXQgaGFkIGFscmVhZHkgYmVlbiBmcmVlZC4K KworICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm94eTo6aW5pdGlhbGl6ZSk6CisgICAgICAgIChX ZWJLaXQ6OlBsdWdpblByb3h5OjpkZXN0cm95KToKKyAgICAgICAgc2VuZCB0aGUgRGVzdHJveVBs dWdpbiBtZXNzYWdlLgorCisyMDEwLTA5LTI4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBh cHBsZS5jb20+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBSb2Jlbi4KIAogICAgICAgICBJ bXByb3ZlIHBsdWctaW4gcHJvY2VzcyBsaWZlY3ljbGUgaGFuZGxpbmcKZGlmZiAtLWdpdCBhL1dl YktpdDIvUGxhdGZvcm0vQ29yZUlQQy9IYW5kbGVNZXNzYWdlLmggYi9XZWJLaXQyL1BsYXRmb3Jt L0NvcmVJUEMvSGFuZGxlTWVzc2FnZS5oCmluZGV4IGE1MjFkZjM3OTBlMWRhNzI5MTA5ZjlmNmMy NWJiOGU4OGRhNDA4NzcuLjgyMDlkYmQyNjMxMDgxYWRiNTg2YWFhMDg4ZWZkMDI1MTRlZTE5Y2Eg MTAwNjQ0Ci0tLSBhL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9IYW5kbGVNZXNzYWdlLmgKKysr IGIvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0hhbmRsZU1lc3NhZ2UuaApAQCAtNDgsNiArNDgs MTYgQEAgdm9pZCBoYW5kbGVNZXNzYWdlKEFyZ3VtZW50RGVjb2RlciogYXJndW1lbnRzLCBDKiBv YmplY3QsIHZvaWQgKEM6OipmdW5jdGlvbikoUDEKICAgICAob2JqZWN0LT4qZnVuY3Rpb24pKGZp cnN0QXJndW1lbnQsIHNlY29uZEFyZ3VtZW50LCB0aGlyZEFyZ3VtZW50KTsKIH0KIAordGVtcGxh dGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUgQywgdHlwZW5hbWUgUDE+Cit2b2lkIGhhbmRsZU1lc3Nh Z2UoQXJndW1lbnREZWNvZGVyKiBhcmd1bWVudHMsIEFyZ3VtZW50RW5jb2RlciogcmVwbHksIEMq IG9iamVjdCwgdm9pZCAoQzo6KmZ1bmN0aW9uKShQMSkpCit7CisgICAgdHlwZW5hbWUgUmVtb3Zl UmVmZXJlbmNlPHR5cGVuYW1lIFQ6OkZpcnN0QXJndW1lbnRUeXBlPjo6VHlwZSBmaXJzdEFyZ3Vt ZW50OworICAgIGlmICghYXJndW1lbnRzLT5kZWNvZGUoZmlyc3RBcmd1bWVudCkpCisgICAgICAg IHJldHVybjsKKworICAgIChvYmplY3QtPipmdW5jdGlvbikoZmlyc3RBcmd1bWVudCk7Cit9CisK IHRlbXBsYXRlPHR5cGVuYW1lIFQsIHR5cGVuYW1lIEMsIHR5cGVuYW1lIFAxLCB0eXBlbmFtZSBQ MiwgdHlwZW5hbWUgUjE+CiB2b2lkIGhhbmRsZU1lc3NhZ2UoQXJndW1lbnREZWNvZGVyKiBhcmd1 bWVudHMsIEFyZ3VtZW50RW5jb2RlciogcmVwbHksIEMqIG9iamVjdCwgdm9pZCAoQzo6KmZ1bmN0 aW9uKShQMSwgUDIsIFIxJikpCiB7CmRpZmYgLS1naXQgYS9XZWJLaXQyL1BsdWdpblByb2Nlc3Mv V2ViUHJvY2Vzc0Nvbm5lY3Rpb24uY3BwIGIvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1dlYlByb2Nl c3NDb25uZWN0aW9uLmNwcAppbmRleCAzYmFiMzAzODQ2MDlkYjdkMGY2MWQ3M2E3MWZmZjM2N2Uz ODEwOWI4Li4wNzZhMmI2MjlhYzcyYjg5NzU0ODI5ZWJjODBjNTNkNzdlOGU5MDc0IDEwMDY0NAot LS0gYS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvV2ViUHJvY2Vzc0Nvbm5lY3Rpb24uY3BwCisrKyBi L1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9XZWJQcm9jZXNzQ29ubmVjdGlvbi5jcHAKQEAgLTU3LDcg KzU3LDcgQEAgdm9pZCBXZWJQcm9jZXNzQ29ubmVjdGlvbjo6YWRkUGx1Z2luQ29udHJvbGxlclBy b3h5KFBhc3NPd25QdHI8UGx1Z2luQ29udHJvbGxlclAKICAgICBtX3BsdWdpbkNvbnRyb2xsZXJz LnNldChwbHVnaW5JbnN0YW5jZUlELCBwbHVnaW5Db250cm9sbGVyLmxlYWtQdHIoKSk7CiB9CiAK LXZvaWQgV2ViUHJvY2Vzc0Nvbm5lY3Rpb246OmRlc3Ryb3lQbHVnaW4oUGx1Z2luQ29udHJvbGxl clByb3h5KiBwbHVnaW5Db250cm9sbGVyKQordm9pZCBXZWJQcm9jZXNzQ29ubmVjdGlvbjo6ZGVz dHJveVBsdWdpbkNvbnRyb2xsZXJQcm94eShQbHVnaW5Db250cm9sbGVyUHJveHkqIHBsdWdpbkNv bnRyb2xsZXIpCiB7CiAgICAgcGx1Z2luQ29udHJvbGxlci0+ZGVzdHJveSgpOwogICAgIApAQCAt MTAzLDcgKzEwMywxNSBAQCB2b2lkIFdlYlByb2Nlc3NDb25uZWN0aW9uOjpkaWRDbG9zZShDb3Jl SVBDOjpDb25uZWN0aW9uKikKICAgICBjb3B5VmFsdWVzVG9WZWN0b3IobV9wbHVnaW5Db250cm9s bGVycywgcGx1Z2luQ29udHJvbGxlcnMpOwogCiAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBw bHVnaW5Db250cm9sbGVycy5zaXplKCk7ICsraSkKLSAgICAgICAgZGVzdHJveVBsdWdpbihwbHVn aW5Db250cm9sbGVyc1tpXSk7CisgICAgICAgIGRlc3Ryb3lQbHVnaW5Db250cm9sbGVyUHJveHko cGx1Z2luQ29udHJvbGxlcnNbaV0pOworfQorCit2b2lkIFdlYlByb2Nlc3NDb25uZWN0aW9uOjpk ZXN0cm95UGx1Z2luKHVpbnQ2NF90IHBsdWdpbkluc3RhbmNlSUQpCit7CisgICAgUGx1Z2luQ29u dHJvbGxlclByb3h5KiBwbHVnaW5Db250cm9sbGVyUHJveHkgPSBtX3BsdWdpbkNvbnRyb2xsZXJz LmdldChwbHVnaW5JbnN0YW5jZUlEKTsKKyAgICBBU1NFUlQocGx1Z2luQ29udHJvbGxlclByb3h5 KTsKKworICAgIGRlc3Ryb3lQbHVnaW5Db250cm9sbGVyUHJveHkocGx1Z2luQ29udHJvbGxlclBy b3h5KTsKIH0KIAogdm9pZCBXZWJQcm9jZXNzQ29ubmVjdGlvbjo6ZGlkUmVjZWl2ZUludmFsaWRN ZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qLCBDb3JlSVBDOjpNZXNzYWdlSUQpCmRpZmYgLS1n aXQgYS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvV2ViUHJvY2Vzc0Nvbm5lY3Rpb24uaCBiL1dlYktp dDIvUGx1Z2luUHJvY2Vzcy9XZWJQcm9jZXNzQ29ubmVjdGlvbi5oCmluZGV4IDA1MWQxN2MyMWZk NjE1M2RiODZjNDU0MjAxOTdjODg4ZTQ3OWFhYjAuLmMyZTVjZDU4YmY3OTM4NTY2MzhkZjkwNzVk NDM0MDI1N2I2NDFlZjQgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9XZWJQcm9j ZXNzQ29ubmVjdGlvbi5oCisrKyBiL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9XZWJQcm9jZXNzQ29u bmVjdGlvbi5oCkBAIC01MSw3ICs1MSw3IEBAIHByaXZhdGU6CiAgICAgdm9pZCBhZGRQbHVnaW5D b250cm9sbGVyUHJveHkoUGFzc093blB0cjxQbHVnaW5Db250cm9sbGVyUHJveHk+KTsKICAgICB2 b2lkIHJlbW92ZVBsdWdpbkNvbnRyb2xsZXJQcm94eShQbHVnaW5Db250cm9sbGVyUHJveHkqKTsK IAotICAgIHZvaWQgZGVzdHJveVBsdWdpbihQbHVnaW5Db250cm9sbGVyUHJveHkqKTsKKyAgICB2 b2lkIGRlc3Ryb3lQbHVnaW5Db250cm9sbGVyUHJveHkoUGx1Z2luQ29udHJvbGxlclByb3h5Kik7 CiAKICAgICAvLyBDb3JlSVBDOjpDb25uZWN0aW9uOjpDbGllbnQKICAgICB2aXJ0dWFsIHZvaWQg ZGlkUmVjZWl2ZU1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiosIENvcmVJUEM6Ok1lc3NhZ2VJ RCwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKik7CkBAIC02Miw2ICs2Miw3IEBAIHByaXZhdGU6 CiAgICAgLy8gTWVzc2FnZSBoYW5kbGVycy4KICAgICBDb3JlSVBDOjpTeW5jUmVwbHlNb2RlIGRp ZFJlY2VpdmVTeW5jV2ViUHJvY2Vzc0Nvbm5lY3Rpb25NZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rp b24qLCBDb3JlSVBDOjpNZXNzYWdlSUQsIENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciosIENvcmVJ UEM6OkFyZ3VtZW50RW5jb2RlciopOwogICAgIHZvaWQgY3JlYXRlUGx1Z2luKHVpbnQ2NF90IHBs dWdpbkluc3RhbmNlSUQsIGNvbnN0IFBsdWdpbjo6UGFyYW1ldGVycyYsIGJvb2wmIHJlc3VsdCk7 CisgICAgdm9pZCBkZXN0cm95UGx1Z2luKHVpbnQ2NF90IHBsdWdpbkluc3RhbmNlSUQpOwogCiAg ICAgUmVmUHRyPENvcmVJUEM6OkNvbm5lY3Rpb24+IG1fY29ubmVjdGlvbjsKIApkaWZmIC0tZ2l0 IGEvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9uLm1lc3NhZ2VzLmlu IGIvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9uLm1lc3NhZ2VzLmlu CmluZGV4IDVjNmU1MmJhMWU4ZWY5ZWQwZDE5MzExNzZkM2FhNjkxZjM4MmMwMDQuLjljODIxN2My ZDQzZWZhMjY4NWFlMWY4Y2VlY2FiOTE2MjQ3MGQ3YmYgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvUGx1 Z2luUHJvY2Vzcy9XZWJQcm9jZXNzQ29ubmVjdGlvbi5tZXNzYWdlcy5pbgorKysgYi9XZWJLaXQy L1BsdWdpblByb2Nlc3MvV2ViUHJvY2Vzc0Nvbm5lY3Rpb24ubWVzc2FnZXMuaW4KQEAgLTI1LDYg KzI1LDkgQEAKIG1lc3NhZ2VzIC0+IFdlYlByb2Nlc3NDb25uZWN0aW9uIHsKICAgICAjIENyZWF0 ZXMgYSBwbHVnLWluIGluc3RhbmNlIHdpdGggdGhlIGdpdmVuIGluc3RhbmNlIElELgogICAgIENy ZWF0ZVBsdWdpbih1aW50NjRfdCBwbHVnaW5JbnN0YW5jZUlELCBXZWJLaXQ6OlBsdWdpbjo6UGFy YW1ldGVycyBwYXJhbWV0ZXJzKSAtPiAoYm9vbCByZXN1bHQpCisKKyAgICAjIERlc3Ryb3lzIHRo ZSBwbHVnLWluIGluc3RhbmNlIHdpdGggdGhlIGdpdmVuIGluc3RhbmNlIElELgorICAgIERlc3Ry b3lQbHVnaW4odWludDY0X3QgcGx1Z2luSW5zdGFuY2VJRCkgLT4gKCkKIH0KIAogI2VuZGlmCmRp ZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzQ29ubmVj dGlvbi5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9jZXNzQ29ubmVj dGlvbi5jcHAKaW5kZXggZDkwNWExZTUyNzA2N2ZiMDk3OTFkNmI4ZjYwMTBjYTkwN2ZlNzIyZC4u NWM5ZWMxZWIzNmI5OTk4NTZjNThlZTc0NDA0ODA0OWVhMTVhMjIzMCAxMDA2NDQKLS0tIGEvV2Vi S2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb24uY3BwCisrKyBi L1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NDb25uZWN0aW9uLmNwcApA QCAtNzYsNyArNzYsNyBAQCB2b2lkIFBsdWdpblByb2Nlc3NDb25uZWN0aW9uOjpkaWRSZWNlaXZl TWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLAogdm9pZCBQbHVnaW5Qcm9j ZXNzQ29ubmVjdGlvbjo6ZGlkQ2xvc2UoQ29yZUlQQzo6Q29ubmVjdGlvbiopCiB7CiAgICAgLy8g VGhlIHBsdWctaW4gcHJvY2VzcyBtdXN0IGhhdmUgY3Jhc2hlZC4KLSAgICBmb3IgKEhhc2hNYXA8 dWludDY0X3QsIFBsdWdpblByb3h5Kj46OmNvbnN0X2l0ZXJhdG9yIGl0ID0gbV9wbHVnaW5zLmJl Z2luKCkudmFsdWVzKCksIGVuZCA9IG1fcGx1Z2lucy5lbmQoKS52YWx1ZXMoKTsgaXQgIT0gZW5k OyArK2l0KSB7CisgICAgZm9yIChIYXNoTWFwPHVpbnQ2NF90LCBQbHVnaW5Qcm94eSo+Ojpjb25z dF9pdGVyYXRvcjo6VmFsdWVzIGl0ID0gbV9wbHVnaW5zLmJlZ2luKCkudmFsdWVzKCksIGVuZCA9 IG1fcGx1Z2lucy5lbmQoKS52YWx1ZXMoKTsgaXQgIT0gZW5kOyArK2l0KSB7CiAgICAgICAgIFBs dWdpblByb3h5KiBwbHVnaW5Qcm94eSA9ICgqaXQpOwogCiAgICAgICAgIHBsdWdpblByb3h5LT5w bHVnaW5Qcm9jZXNzQ3Jhc2hlZCgpOwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1Bs dWdpbnMvUGx1Z2luUHJveHkuY3BwIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2lu UHJveHkuY3BwCmluZGV4IGI2MGRkNmNhNzAyMGRkZGI3NTg4MGE1NTMxNTY2YTQ2NjUxMWI5ZTku LjI1NDFlYTdlODUxZGU4MjgwMDlmMjY1MDM3OWRjM2YyY2IzOTI2YTIgMTAwNjQ0Ci0tLSBhL1dl YktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb3h5LmNwcAorKysgYi9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm94eS5jcHAKQEAgLTU0LDEyICs1NCwxMCBAQCBQbHVn aW5Qcm94eTo6UGx1Z2luUHJveHkoUGFzc1JlZlB0cjxQbHVnaW5Qcm9jZXNzQ29ubmVjdGlvbj4g Y29ubmVjdGlvbikKICAgICAsIG1faXNTdGFydGVkKGZhbHNlKQogCiB7Ci0gICAgbV9jb25uZWN0 aW9uLT5hZGRQbHVnaW5Qcm94eSh0aGlzKTsKIH0KIAogUGx1Z2luUHJveHk6On5QbHVnaW5Qcm94 eSgpCiB7Ci0gICAgbV9jb25uZWN0aW9uLT5yZW1vdmVQbHVnaW5Qcm94eSh0aGlzKTsKIH0KIAog dm9pZCBQbHVnaW5Qcm94eTo6cGx1Z2luUHJvY2Vzc0NyYXNoZWQoKQpAQCAtODcsMTQgKzg1LDIx IEBAIGJvb2wgUGx1Z2luUHJveHk6OmluaXRpYWxpemUoUGx1Z2luQ29udHJvbGxlciogcGx1Z2lu Q29udHJvbGxlciwgY29uc3QgUGFyYW1ldGVyCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAg IG1faXNTdGFydGVkID0gdHJ1ZTsKKyAgICBtX2Nvbm5lY3Rpb24tPmFkZFBsdWdpblByb3h5KHRo aXMpOworCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKIHZvaWQgUGx1Z2luUHJveHk6OmRlc3Ryb3ko KQogewotICAgIG1fcGx1Z2luQ29udHJvbGxlciA9IDA7CisgICAgQVNTRVJUKG1faXNTdGFydGVk KTsKIAotICAgIG5vdEltcGxlbWVudGVkKCk7CisgICAgbV9jb25uZWN0aW9uLT5jb25uZWN0aW9u KCktPnNlbmRTeW5jKE1lc3NhZ2VzOjpXZWJQcm9jZXNzQ29ubmVjdGlvbjo6RGVzdHJveVBsdWdp bihtX3BsdWdpbkluc3RhbmNlSUQpLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBNZXNzYWdlczo6V2ViUHJvY2Vzc0Nvbm5lY3Rpb246OkRlc3Ryb3lQbHVnaW46OlJl cGx5KCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDAsIENvcmVJ UEM6OkNvbm5lY3Rpb246Ok5vVGltZW91dCk7CisKKyAgICBtX2lzU3RhcnRlZCA9IGZhbHNlOwor ICAgIG1fY29ubmVjdGlvbi0+cmVtb3ZlUGx1Z2luUHJveHkodGhpcyk7CiB9CiAKIHZvaWQgUGx1 Z2luUHJveHk6OnBhaW50KEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJlY3QmIGRpcnR5UmVj dCkK