46766 2010-09-28 16:35:42 -0700 Begin hooking up painting in the plug-in process 2010-09-28 16:54:14 -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 286620 0 andersca 2010-09-28 16:35:42 -0700 Begin hooking up painting in the plug-in process 286621 1 69130 andersca 2010-09-28 16:39:22 -0700 Created attachment 69130 Patch 286631 2 69130 sam 2010-09-28 16:49:35 -0700 Comment on attachment 69130 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=69130&action=review > WebKit2/WebProcess/Plugins/PluginProxy.h:98 > + // This ist he shared memory backing store that the plug-in paints into. When the plug-in tells us Typo. ist he -> is the. 286633 3 andersca 2010-09-28 16:54:14 -0700 Committed r68610: <http://trac.webkit.org/changeset/68610> 69130 2010-09-28 16:39:22 -0700 2010-09-28 16:49:35 -0700 Patch bug-46766-20100928163921.patch text/plain 21415 andersca ZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZyBiL0phdmFTY3JpcHRDb3JlL0No YW5nZUxvZwppbmRleCBhYmYzNGIyODFjMzMwYWJkN2FjYmZhNzkyMGVmNjNkMzZmNDQ3NmM0Li5l MWQ2MTk0OGQ4NzcxNjJmOTZjMjA5MTRmYjExNjk3Yzg3YzY3ZGE1IDEwMDY0NAotLS0gYS9KYXZh U2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvSmF2YVNjcmlwdENvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMTIgQEAKKzIwMTAtMDktMjggIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxl LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBC ZWdpbiBob29raW5nIHVwIHBhaW50aW5nIGluIHRoZSBwbHVnLWluIHByb2Nlc3MKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQ2NzY2CisKKyAgICAgICAg KiBKYXZhU2NyaXB0Q29yZS5leHA6CisKIDIwMTAtMDktMjggIFBoaWxpcHBlIE5vcm1hbmQgIDxw bm9ybWFuZEBpZ2FsaWEuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcnRpbiBSb2JpbnNv bi4KZGlmZiAtLWdpdCBhL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmV4cCBiL0phdmFT Y3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmV4cAppbmRleCAyOTMzODdkNDlhNGUxMjljYzA2YjRh Mjg0ZTMwNTBmMWYyY2Y3ODEyLi5mZjNkOWIzNzk4YzY1NWU4YmI3N2IzNTg5NTE0MmFhMDc5Y2U3 YWY4IDEwMDY0NAotLS0gYS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5leHAKKysrIGIv SmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZXhwCkBAIC0zODAsNiArMzgwLDcgQEAgX19a TjNXVEYxM3RyeUZhc3RDYWxsb2NFbW0KIF9fWk4zV1RGMTN0cnlGYXN0TWFsbG9jRW0KIF9fWk4z V1RGMTRmYXN0TWFsbG9jU2l6ZUVQS3YKIF9fWk4zV1RGMTRudW1iZXJUb1N0cmluZ0VkUHQKK19f Wk4zV1RGMTR0cnlGYXN0UmVhbGxvY0VQdm0KIF9fWk4zV1RGMTVUaHJlYWRDb25kaXRpb240d2Fp dEVSTlNfNU11dGV4RQogX19aTjNXVEYxNVRocmVhZENvbmRpdGlvbjZzaWduYWxFdgogX19aTjNX VEYxNVRocmVhZENvbmRpdGlvbjlicm9hZGNhc3RFdgpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9DaGFu Z2VMb2cgYi9XZWJLaXQyL0NoYW5nZUxvZwppbmRleCBiNGExZGE3Mzc0NjBhYmQ2ODVlOWZlOWRm NGE3NGQ4OWRhMDI4MzgwLi4yMGQwNDEzOTVlOTZhNThmMzgwMjA1ZDg4YmI3M2IyMzZmODdkOGU2 IDEwMDY0NAotLS0gYS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9XZWJLaXQyL0NoYW5nZUxvZwpA QCAtMSw1ICsxLDQ3IEBACiAyMDEwLTA5LTI4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBh cHBsZS5jb20+CiAKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQmVnaW4gaG9va2luZyB1cCBwYWludGluZyBpbiB0aGUgcGx1Zy1pbiBwcm9jZXNzCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00Njc2NgorCisgICAg ICAgICogRGVyaXZlZFNvdXJjZXMubWFrZToKKyAgICAgICAgQWRkIFBsdWdpbkNvbnRyb2xsZXJQ cm94eS4KKyAgICAKKyAgICAgICAgKiBQbGF0Zm9ybS9Db3JlSVBDL01lc3NhZ2VJRC5oOgorICAg ICAgICBBZGQgYSBNZXNzYWdlQ2xhc3NQbHVnaW5Db250cm9sbGVyUHJveHkgbWVzc2FnZSBjbGFz cy4KKworICAgICAgICAqIFBsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclByb3h5LmNwcDoK KyAgICAgICAgKFdlYktpdDo6UGx1Z2luQ29udHJvbGxlclByb3h5OjpQbHVnaW5Db250cm9sbGVy UHJveHkpOgorICAgICAgICBJbml0aWFsaXplIHRoZSBwYWludCB0aW1lci4KKworICAgICAgICAo V2ViS2l0OjpQbHVnaW5Db250cm9sbGVyUHJveHk6OnBhaW50KToKKyAgICAgICAgQ3JlYXRlIGEg Z3JhcGhpY3MgY29udGV4dCByZWZlcmVuY2luZyBvdXIgYmFja2luZyBzdG9yZSBhbmQgcGFpbnQg aW50byBpdC4KKworICAgICAgICAoV2ViS2l0OjpQbHVnaW5Db250cm9sbGVyUHJveHk6OmludmFs aWRhdGUpOgorICAgICAgICBVcGRhdGUgdGhlIGRpcnR5IHJlY3QgYW5kIHN0YXJ0IHRoZSBwYWlu dCB0aW1lciBpZiBuZWNlc3NhcnkuCisKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luQ29udHJvbGxl clByb3h5OjpnZW9tZXRyeURpZENoYW5nZSk6CisgICAgICAgIElmIHdlJ3JlIHBhc3NlZCBhIG5l dyBiYWNraW5nIHN0b3JlIGhhbmRsZSwgcmVpbml0aWFsaXplIHRoZSBiYWNraW5nIHN0b3JlLgor CisgICAgICAgICogUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkubWVzc2FnZXMu aW46IEFkZGVkLgorICAgICAgICAqIFBsdWdpblByb2Nlc3MvV2ViUHJvY2Vzc0Nvbm5lY3Rpb24u Y3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzQ29ubmVjdGlvbjo6ZGlkUmVjZWl2ZU1l c3NhZ2UpOgorICAgICAgICBJZiB0aGUgbWVzc2FnZSBoYXMgYSBkZXN0aW5hdGlvbiBJRCwgZm9y d2FyZCBpdCB0byB0aGUgcGx1Zy1pbiBjb250cm9sbGVyIHByb3h5LgorCisgICAgICAgICogU2Ny aXB0cy93ZWJraXQyL21lc3NhZ2VzLnB5OgorICAgICAgICBBbHdheXMgaW5jbHVkZSBXZWJDb3Jl QXJndW1lbnRDb2RlcnMuaCBpZiB0aGUgdHlwZSBpcyBpbiB0aGUgV2ViQ29yZSBuYW1lc3BhY2Uu CisKKyAgICAgICAgKiBXZWJLaXQyLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2o6CisgICAgICAg IEFkZCBuZXcgZmlsZXMuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJv eHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm94eTo6Z2VvbWV0cnlEaWRDaGFuZ2Up OgorICAgICAgICBVcGRhdGUgdGhlIHNpemUgb2YgdGhlIGJhY2tpbmcgc3RvcmUuIENyZWF0ZSBh IG5ldyBwbHVnLWluIGJhY2tpbmcgc3RvcmUgaWYgbmVlZGVkIGFuZCBzZW5kCisgICAgICAgIGl0 IG92ZXIgdG8gdGhlIHBsdWctaW4gcHJvY2Vzcy4KKyAgICAgICAgCisyMDEwLTA5LTI4ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgUmV2aWV3ZWQgYnkg U2FtIFdlaW5pZy4KIAogICAgICAgICBBU1NFUlQgd2hlbiBsYXVuY2hpbmcgdGhlIHBsdWdpbiBw cm9jZXNzCmRpZmYgLS1naXQgYS9XZWJLaXQyL0Rlcml2ZWRTb3VyY2VzLm1ha2UgYi9XZWJLaXQy L0Rlcml2ZWRTb3VyY2VzLm1ha2UKaW5kZXggMDM2YWRiMjE5MzU5MWM0MThlMzE1NTliOWQ0MzJi YjhkNmI4NDE1Yy4uZmI2YjJlOTgwM2QyODhiODY0ZWMzNGM2MjhjZDFkMmUzOWU2NzZiNSAxMDA2 NDQKLS0tIGEvV2ViS2l0Mi9EZXJpdmVkU291cmNlcy5tYWtlCisrKyBiL1dlYktpdDIvRGVyaXZl ZFNvdXJjZXMubWFrZQpAQCAtNSw2ICs1LDcgQEAgVlBBVEggPSBcCiAjCiAKIE1FU1NBR0VfUkVD RUlWRVJTID0gXAorICAgIFBsdWdpbkNvbnRyb2xsZXJQcm94eSBcCiAgICAgUGx1Z2luUHJvY2Vz cyBcCiAgICAgUGx1Z2luUHJvY2Vzc1Byb3h5IFwKICAgICBXZWJQYWdlIFwKZGlmZiAtLWdpdCBh L1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9NZXNzYWdlSUQuaCBiL1dlYktpdDIvUGxhdGZvcm0v Q29yZUlQQy9NZXNzYWdlSUQuaAppbmRleCBkZGQ5ODhkY2MwNzY2Yjc5OTI0NGU4YzBlMTA5Yzkz YzliYmVmYjUyLi40YTIyZWNhOThlZDM2Y2Q1ODA4NjQ3YTBhNzQxYzYxZTZiYmUxOWI5IDEwMDY0 NAotLS0gYS9XZWJLaXQyL1BsYXRmb3JtL0NvcmVJUEMvTWVzc2FnZUlELmgKKysrIGIvV2ViS2l0 Mi9QbGF0Zm9ybS9Db3JlSVBDL01lc3NhZ2VJRC5oCkBAIC01NCw2ICs1NCw3IEBAIGVudW0gTWVz c2FnZUNsYXNzIHsKIAogICAgIC8vIE1lc3NhZ2VzIHNlbnQgYnkgdGhlIHdlYiBwcm9jZXNzIHRv IHRoZSBwbHVnLWluIHByb2Nlc3MuCiAgICAgTWVzc2FnZUNsYXNzV2ViUHJvY2Vzc0Nvbm5lY3Rp b24sCisgICAgTWVzc2FnZUNsYXNzUGx1Z2luQ29udHJvbGxlclByb3h5LAogfTsKIAogdGVtcGxh dGU8dHlwZW5hbWU+IHN0cnVjdCBNZXNzYWdlS2luZFRyYWl0cyB7IH07CmRpZmYgLS1naXQgYS9X ZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclByb3h5LmNwcCBiL1dlYktpdDIv UGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkuY3BwCmluZGV4IDZjOTFjYzA2ZjI0 Njk0N2E1MDYwN2QyMGVkMDk0ZjI0MGQ0N2M5MDUuLjBjOTBkMjJiMWJiOTE5NGNlOGJmNzUyNjMz MjViODdkYjk3OTM4YWYgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5D b250cm9sbGVyUHJveHkuY3BwCisrKyBiL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250 cm9sbGVyUHJveHkuY3BwCkBAIC0yNyw5ICsyNywxMSBAQAogCiAjaW5jbHVkZSAiUGx1Z2luQ29u dHJvbGxlclByb3h5LmgiCiAKKyNpbmNsdWRlICJCYWNraW5nU3RvcmUuaCIKICNpbmNsdWRlICJO ZXRzY2FwZVBsdWdpbi5oIgogI2luY2x1ZGUgIk5vdEltcGxlbWVudGVkLmgiCiAjaW5jbHVkZSAi UGx1Z2luUHJvY2Vzcy5oIgorI2luY2x1ZGUgPFdlYkNvcmUvR3JhcGhpY3NDb250ZXh0Lmg+CiAj aW5jbHVkZSA8d3RmL3RleHQvV1RGU3RyaW5nLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3Jl OwpAQCAtNDQsNiArNDYsNyBAQCBQYXNzT3duUHRyPFBsdWdpbkNvbnRyb2xsZXJQcm94eT4gUGx1 Z2luQ29udHJvbGxlclByb3h5OjpjcmVhdGUoV2ViUHJvY2Vzc0Nvbm5lYwogUGx1Z2luQ29udHJv bGxlclByb3h5OjpQbHVnaW5Db250cm9sbGVyUHJveHkoV2ViUHJvY2Vzc0Nvbm5lY3Rpb24qIGNv bm5lY3Rpb24sIHVpbnQ2NF90IHBsdWdpbkluc3RhbmNlSUQpCiAgICAgOiBtX2Nvbm5lY3Rpb24o Y29ubmVjdGlvbikKICAgICAsIG1fcGx1Z2luSW5zdGFuY2VJRChwbHVnaW5JbnN0YW5jZUlEKQor ICAgICwgbV9wYWludFRpbWVyKFJ1bkxvb3A6Om1haW4oKSwgdGhpcywgJlBsdWdpbkNvbnRyb2xs ZXJQcm94eTo6cGFpbnQpCiB7CiB9CiAKQEAgLTczLDkgKzc2LDQ5IEBAIHZvaWQgUGx1Z2luQ29u dHJvbGxlclByb3h5OjpkZXN0cm95KCkKICAgICBtX3BsdWdpbiA9IDA7CiB9CiAKLXZvaWQgUGx1 Z2luQ29udHJvbGxlclByb3h5OjppbnZhbGlkYXRlKGNvbnN0IEludFJlY3QmKQordm9pZCBQbHVn aW5Db250cm9sbGVyUHJveHk6OnBhaW50KCkKIHsKLSAgICBub3RJbXBsZW1lbnRlZCgpOworICAg IEFTU0VSVCghbV9kaXJ0eVJlY3QuaXNFbXB0eSgpKTsKKworICAgIGlmICghbV9iYWNraW5nU3Rv cmUpCisgICAgICAgIHJldHVybjsKKworICAgIEludFJlY3QgZGlydHlSZWN0ID0gbV9kaXJ0eVJl Y3Q7CisgICAgbV9kaXJ0eVJlY3QgPSBJbnRSZWN0KCk7CisKKyAgICAvLyBDcmVhdGUgYSBncmFw aGljcyBjb250ZXh0LgorICAgIE93blB0cjxHcmFwaGljc0NvbnRleHQ+IGdyYXBoaWNzQ29udGV4 dCA9IG1fYmFja2luZ1N0b3JlLT5jcmVhdGVHcmFwaGljc0NvbnRleHQoKTsKKyAgICBncmFwaGlj c0NvbnRleHQtPnRyYW5zbGF0ZSgtbV9mcmFtZVJlY3QueCgpLCAtbV9mcmFtZVJlY3QueSgpKTsK KworICAgIEFTU0VSVChtX3BsdWdpbik7CisgICAgbV9wbHVnaW4tPnBhaW50KGdyYXBoaWNzQ29u dGV4dC5nZXQoKSwgZGlydHlSZWN0KTsKKworICAgIC8vIEZJWE1FOiBMZXQgdGhlIHdlYiBwcm9j ZXNzIGtub3cgdGhhdCB3ZSd2ZSBwYWludGVkLgorfQorCit2b2lkIFBsdWdpbkNvbnRyb2xsZXJQ cm94eTo6aW52YWxpZGF0ZShjb25zdCBJbnRSZWN0JiByZWN0KQoreworICAgIC8vIENvbnZlcnQg dGhlIGRpcnR5IHJlY3QgdG8gd2luZG93IGNvb3JkaW5hdGVzLgorICAgIEludFJlY3QgZGlydHlS ZWN0ID0gcmVjdDsKKyAgICBkaXJ0eVJlY3QubW92ZShtX2ZyYW1lUmVjdC54KCksIG1fZnJhbWVS ZWN0LnkoKSk7CisKKyAgICAvLyBNYWtlIHN1cmUgdGhhdCB0aGUgZGlydHkgcmVjdCBpcyBub3Qg Z3JlYXRlciB0aGFuIHRoZSBwbHVnLWluIGl0c2VsZi4KKyAgICBkaXJ0eVJlY3QuaW50ZXJzZWN0 KG1fZnJhbWVSZWN0KTsKKworICAgIG1fZGlydHlSZWN0LnVuaXRlKGRpcnR5UmVjdCk7CisKKyAg ICAvLyBDaGVjayBpZiB3ZSBzaG91bGQgc3RhcnQgdGhlIHRpbWVyLgorICAgIAorICAgIGlmICht X2RpcnR5UmVjdC5pc0VtcHR5KCkpCisgICAgICAgIHJldHVybjsKKyAgICAKKyAgICAvLyBGSVhN RTogQ2hlY2sgY2xpcCByZWN0LgorICAgIAorICAgIGlmIChtX3BhaW50VGltZXIuaXNBY3RpdmUo KSkKKyAgICAgICAgcmV0dXJuOworCisgICAgLy8gU3RhcnQgdGhlIHRpbWVyLgorICAgIG1fcGFp bnRUaW1lci5zdGFydE9uZVNob3QoMCk7CiB9CiAKIFN0cmluZyBQbHVnaW5Db250cm9sbGVyUHJv eHk6OnVzZXJBZ2VudChjb25zdCBXZWJDb3JlOjpLVVJMJikKQEAgLTEzMyw2ICsxNzYsMjEgQEAg dm9pZCBQbHVnaW5Db250cm9sbGVyUHJveHk6OnBsdWdpblByb2Nlc3NDcmFzaGVkKCkKICAgICBu b3RJbXBsZW1lbnRlZCgpOwogfQogCit2b2lkIFBsdWdpbkNvbnRyb2xsZXJQcm94eTo6Z2VvbWV0 cnlEaWRDaGFuZ2UoY29uc3QgSW50UmVjdCYgZnJhbWVSZWN0LCBjb25zdCBJbnRSZWN0JiBjbGlw UmVjdCwgY29uc3QgU2hhcmVkTWVtb3J5OjpIYW5kbGUmIGJhY2tpbmdTdG9yZUhhbmRsZSkKK3sK KyAgICBtX2ZyYW1lUmVjdCA9IGZyYW1lUmVjdDsKKyAgICBtX2NsaXBSZWN0ID0gY2xpcFJlY3Q7 CisKKyAgICBBU1NFUlQobV9wbHVnaW4pOworCisgICAgaWYgKCFiYWNraW5nU3RvcmVIYW5kbGUu aXNOdWxsKCkpIHsKKyAgICAgICAgLy8gQ3JlYXRlIGEgbmV3IGJhY2tpbmcgc3RvcmUuCisgICAg ICAgIG1fYmFja2luZ1N0b3JlID0gQmFja2luZ1N0b3JlOjpjcmVhdGUoZnJhbWVSZWN0LnNpemUo KSwgYmFja2luZ1N0b3JlSGFuZGxlKTsKKyAgICB9CisKKyAgICBtX3BsdWdpbi0+Z2VvbWV0cnlE aWRDaGFuZ2UoZnJhbWVSZWN0LCBjbGlwUmVjdCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYktp dAogCiAjZW5kaWYgLy8gRU5BQkxFKFBMVUdJTl9QUk9DRVNTKQpkaWZmIC0tZ2l0IGEvV2ViS2l0 Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94eS5oIGIvV2ViS2l0Mi9QbHVnaW5Q cm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94eS5oCmluZGV4IDcwNjYyMDJhNjJmMThhNjNhYjdh YzlkNWEyODlhNGU1ZDIxMzVjM2IuLjc5NDYzODAyMmZmZDkyN2JmNzIyMmUxZjQyNmVhZmJkYjU3 NWZlMDggMTAwNjQ0Ci0tLSBhL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVy UHJveHkuaAorKysgYi9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclByb3h5 LmgKQEAgLTMxLDEwICszMSwxMyBAQAogI2luY2x1ZGUgIkNvbm5lY3Rpb24uaCIKICNpbmNsdWRl ICJQbHVnaW4uaCIKICNpbmNsdWRlICJQbHVnaW5Db250cm9sbGVyLmgiCisjaW5jbHVkZSAiUnVu TG9vcC5oIgorI2luY2x1ZGUgIlNoYXJlZE1lbW9yeS5oIgogI2luY2x1ZGUgPHd0Zi9Ob25jb3B5 YWJsZS5oPgogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorY2xhc3MgQmFja2luZ1N0b3JlOwogY2xh c3MgV2ViUHJvY2Vzc0Nvbm5lY3Rpb247CiAKIGNsYXNzIFBsdWdpbkNvbnRyb2xsZXJQcm94eSA6 IFBsdWdpbkNvbnRyb2xsZXIgewpAQCAtNDksOSArNTIsMTMgQEAgcHVibGljOgogICAgIGJvb2wg aW5pdGlhbGl6ZShjb25zdCBQbHVnaW46OlBhcmFtZXRlcnMmKTsKICAgICB2b2lkIGRlc3Ryb3ko KTsKIAorICAgIHZvaWQgZGlkUmVjZWl2ZVBsdWdpbkNvbnRyb2xsZXJQcm94eU1lc3NhZ2UoQ29y ZUlQQzo6Q29ubmVjdGlvbiosIENvcmVJUEM6Ok1lc3NhZ2VJRCwgQ29yZUlQQzo6QXJndW1lbnRE ZWNvZGVyKik7CisKIHByaXZhdGU6CiAgICAgUGx1Z2luQ29udHJvbGxlclByb3h5KFdlYlByb2Nl c3NDb25uZWN0aW9uKiBjb25uZWN0aW9uLCB1aW50NjRfdCBwbHVnaW5JbnN0YW5jZUlEKTsKIAor ICAgIHZvaWQgcGFpbnQoKTsKKwogICAgIC8vIFBsdWdpbkNvbnRyb2xsZXIKICAgICB2aXJ0dWFs IHZvaWQgaW52YWxpZGF0ZShjb25zdCBXZWJDb3JlOjpJbnRSZWN0Jik7CiAgICAgdmlydHVhbCBT dHJpbmcgdXNlckFnZW50KGNvbnN0IFdlYkNvcmU6OktVUkwmKTsKQEAgLTY1LDEwICs3MiwyNiBA QCBwcml2YXRlOgogICAgIHZpcnR1YWwgYm9vbCBpc0FjY2VsZXJhdGVkQ29tcG9zaXRpbmdFbmFi bGVkKCk7CiAgICAgdmlydHVhbCB2b2lkIHBsdWdpblByb2Nlc3NDcmFzaGVkKCk7CiAKKyAgICAv LyBNZXNzYWdlIGhhbmRsZXJzLgorICAgIHZvaWQgZ2VvbWV0cnlEaWRDaGFuZ2UoY29uc3QgV2Vi Q29yZTo6SW50UmVjdCYgZnJhbWVSZWN0LCBjb25zdCBXZWJDb3JlOjpJbnRSZWN0JiBjbGlwUmVj dCwgY29uc3QgU2hhcmVkTWVtb3J5OjpIYW5kbGUmIGJhY2tpbmdTdG9yZUhhbmRsZSk7CisKICAg ICBXZWJQcm9jZXNzQ29ubmVjdGlvbiogbV9jb25uZWN0aW9uOwogICAgIHVpbnQ2NF90IG1fcGx1 Z2luSW5zdGFuY2VJRDsKIAogICAgIFJlZlB0cjxQbHVnaW4+IG1fcGx1Z2luOworCisgICAgLy8g VGhlIHBsdWctaW4gcmVjdCBhbmQgY2xpcCByZWN0IGluIHdpbmRvdyBjb29yZGluYXRlcy4KKyAg ICBXZWJDb3JlOjpJbnRSZWN0IG1fZnJhbWVSZWN0OworICAgIFdlYkNvcmU6OkludFJlY3QgbV9j bGlwUmVjdDsKKworICAgIC8vIFRoZSBkaXJ0eSByZWN0IGluIHBsdWctaW4gY29vcmRpbmF0ZXMu CisgICAgV2ViQ29yZTo6SW50UmVjdCBtX2RpcnR5UmVjdDsKKworICAgIC8vIFRoZSBwYWludCB0 aW1lciwgdXNlZCBmb3IgY29hbGVzY2luZyBwYWludGluZy4KKyAgICBSdW5Mb29wOjpUaW1lcjxQ bHVnaW5Db250cm9sbGVyUHJveHk+IG1fcGFpbnRUaW1lcjsKKworICAgIC8vIFRoZSBiYWNraW5n IHN0b3JlIHRoYXQgdGhpcyBwbHVnLWluIGRyYXdzIGludG8uCisgICAgUmVmUHRyPEJhY2tpbmdT dG9yZT4gbV9iYWNraW5nU3RvcmU7CiB9OwogCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlmZiAt LWdpdCBhL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkubWVzc2Fn ZXMuaW4gYi9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclByb3h5Lm1lc3Nh Z2VzLmluCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAuLjlmMTFmYjk5MjI2NGI3MDdmYjFlMjE0ZDFhMzAzNjU1NTA2N2Zl MDcKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJv bGxlclByb3h5Lm1lc3NhZ2VzLmluCkBAIC0wLDAgKzEsMzAgQEAKKyMgQ29weXJpZ2h0IChDKSAy MDEwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMKKyMgUmVkaXN0cmlidXRpb24g YW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisjIG1v ZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29u ZGl0aW9ucworIyBhcmUgbWV0OgorIyAxLiAgUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2Rl IG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgIG5vdGljZSwgdGhpcyBsaXN0 IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMgMi4gIFJlZGlz dHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJp Z2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93 aW5nIGRpc2NsYWltZXIgaW4gdGhlCisjICAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBt YXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorIworIyBUSElTIFNPRlRX QVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJ UycnIEFORAorIyBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywg QlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRAorIyBXQVJSQU5USUVTIE9GIE1FUkNIQU5U QUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBVUlBPU0UgQVJFCisjIERJU0NM QUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUyBC RSBMSUFCTEUgRk9SCisjIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFM LCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwKKyMgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQg Tk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IKKyMgU0VS VklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJV UFRJT04pIEhPV0VWRVIKKyMgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwg V0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwKKyMgT1IgVE9SVCAoSU5DTFVE SU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRI RSBVU0UKKyMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJ TElUWSBPRiBTVUNIIERBTUFHRS4KKworI2lmIEVOQUJMRShQTFVHSU5fUFJPQ0VTUykKKworbWVz c2FnZXMgLT4gUGx1Z2luQ29udHJvbGxlclByb3h5IHsKKyAgICAjIENhbGxlZCB3aGVuIHRoZSBw bHVnLWluIGdlb21ldHJ5IGNoYW5nZXMuCisgICAgR2VvbWV0cnlEaWRDaGFuZ2UoV2ViQ29yZTo6 SW50UmVjdCBmcmFtZVJlY3QsIFdlYkNvcmU6OkludFJlY3QgY2xpcFJlY3QsIFdlYktpdDo6U2hh cmVkTWVtb3J5OjpIYW5kbGUgYmFja2luZ1N0b3JlSGFuZGxlKQorfQorCisjZW5kaWYKZGlmZiAt LWdpdCBhL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9XZWJQcm9jZXNzQ29ubmVjdGlvbi5jcHAgYi9X ZWJLaXQyL1BsdWdpblByb2Nlc3MvV2ViUHJvY2Vzc0Nvbm5lY3Rpb24uY3BwCmluZGV4IDA3NmEy YjYyOWFjNzJiODk3NTQ4MjllYmM4MGM1M2Q3N2U4ZTkwNzQuLmZiYmRiNDVjYTU1MmNjNmFlNjNk NzUyNzFiYTM0ZmY2MzQ1YTM1ZWUgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9X ZWJQcm9jZXNzQ29ubmVjdGlvbi5jcHAKKysrIGIvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1dlYlBy b2Nlc3NDb25uZWN0aW9uLmNwcApAQCAtODcsNyArODcsOCBAQCB2b2lkIFdlYlByb2Nlc3NDb25u ZWN0aW9uOjpyZW1vdmVQbHVnaW5Db250cm9sbGVyUHJveHkoUGx1Z2luQ29udHJvbGxlclByb3h5 KiBwbAogCiB2b2lkIFdlYlByb2Nlc3NDb25uZWN0aW9uOjpkaWRSZWNlaXZlTWVzc2FnZShDb3Jl SVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBDb3JlSVBDOjpNZXNzYWdlSUQgbWVzc2FnZUlE LCBDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqIGFyZ3VtZW50cykKIHsKLSAgICAvLyBGSVhNRTog SW1wbGVtZW50LgorICAgIFBsdWdpbkNvbnRyb2xsZXJQcm94eSogcGx1Z2luQ29udHJvbGxlclBy b3h5ID0gbV9wbHVnaW5Db250cm9sbGVycy5nZXQoYXJndW1lbnRzLT5kZXN0aW5hdGlvbklEKCkp OworICAgIHBsdWdpbkNvbnRyb2xsZXJQcm94eS0+ZGlkUmVjZWl2ZVBsdWdpbkNvbnRyb2xsZXJQ cm94eU1lc3NhZ2UoY29ubmVjdGlvbiwgbWVzc2FnZUlELCBhcmd1bWVudHMpOwogfQogCiBDb3Jl SVBDOjpTeW5jUmVwbHlNb2RlIFdlYlByb2Nlc3NDb25uZWN0aW9uOjpkaWRSZWNlaXZlU3luY01l c3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgQ29yZUlQQzo6TWVzc2FnZUlE IG1lc3NhZ2VJRCwgQ29yZUlQQzo6QXJndW1lbnREZWNvZGVyKiBhcmd1bWVudHMsIENvcmVJUEM6 OkFyZ3VtZW50RW5jb2RlciogcmVwbHkpCmRpZmYgLS1naXQgYS9XZWJLaXQyL1NjcmlwdHMvd2Vi a2l0Mi9tZXNzYWdlcy5weSBiL1dlYktpdDIvU2NyaXB0cy93ZWJraXQyL21lc3NhZ2VzLnB5Cmlu ZGV4IDc4MGRjOWI3NTkxZGNlMTc4ZDUwMmFiZjk3MTA2OGMxY2FlYjJjNWQuLjQxNzEzNTJhZDRj ODRkMzFmNDQyOGUyYzNlM2Q4YmRjYTBiNmQwM2UgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvU2NyaXB0 cy93ZWJraXQyL21lc3NhZ2VzLnB5CisrKyBiL1dlYktpdDIvU2NyaXB0cy93ZWJraXQyL21lc3Nh Z2VzLnB5CkBAIC0zMDQsNiArMzA0LDEyIEBAIGRlZiBhcmd1bWVudF9jb2Rlcl9oZWFkZXJzX2Zv cl90eXBlKHR5cGUpOgogICAgIGlmIHR5cGUgaW4gc3BlY2lhbF9jYXNlczoKICAgICAgICAgcmV0 dXJuIFtzcGVjaWFsX2Nhc2VzW3R5cGVdXQogCisgICAgc3BsaXQgPSB0eXBlLnNwbGl0KCc6Oicp CisgICAgaWYgbGVuKHNwbGl0KSA8IDI6CisgICAgICAgIHJldHVybiBbXQorICAgIGlmIHNwbGl0 WzBdID09ICdXZWJDb3JlJzoKKyAgICAgICAgcmV0dXJuIFsnIldlYkNvcmVBcmd1bWVudENvZGVy cy5oIiddCisKICAgICByZXR1cm4gW10KIAogCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYktpdDIu eGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJv amVjdC5wYnhwcm9qCmluZGV4IDc3MGQ5MjM0ZDUxZDYwNGIxNzk1MmIzMjc0NjM2MDcxNGZiYTM1 NDAuLmI5ODQxODRiNTg4YTYwZTczNjkwNWQ3MWE3NWRlYTFiOTk1M2E5YTIgMTAwNjQ0Ci0tLSBh L1dlYktpdDIvV2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1dlYktpdDIv V2ViS2l0Mi54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0xMTAsNiArMTEwLDkgQEAKIAkJ MUE2RkJEMjkxMUU2OUJDMjAwREIxMzcxIC8qIE5ldHNjYXBlUGx1Z2luLmNwcCBpbiBTb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBNkZCRDI3MTFFNjlCQzIwMERC MTM3MSAvKiBOZXRzY2FwZVBsdWdpbi5jcHAgKi87IH07CiAJCTFBOEVGNENCMTI1MjQwMzcwMEY3 MDY3RiAvKiBQbHVnaW5Db250cm9sbGVyUHJveHkuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBOEVGNEM5MTI1MjQwMzcwMEY3MDY3RiAvKiBQbHVnaW5D b250cm9sbGVyUHJveHkuaCAqLzsgfTsKIAkJMUE4RUY0Q0MxMjUyNDAzNzAwRjcwNjdGIC8qIFBs dWdpbkNvbnRyb2xsZXJQcm94eS5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZp bGU7IGZpbGVSZWYgPSAxQThFRjRDQTEyNTI0MDM3MDBGNzA2N0YgLyogUGx1Z2luQ29udHJvbGxl clByb3h5LmNwcCAqLzsgfTsKKwkJMUE4RUY5NDIxMjUyQUU4NDAwRjcwNjdGIC8qIFBsdWdpbkNv bnRyb2xsZXJQcm94eS5tZXNzYWdlcy5pbiBpbiBSZXNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gMUE4RUY5NDExMjUyQUU4NDAwRjcwNjdGIC8qIFBsdWdpbkNvbnRy b2xsZXJQcm94eS5tZXNzYWdlcy5pbiAqLzsgfTsKKwkJMUE4RUY5NkUxMjUyQUY2QjAwRjcwNjdG IC8qIFBsdWdpbkNvbnRyb2xsZXJQcm94eU1lc3NhZ2VSZWNlaXZlci5jcHAgaW4gU291cmNlcyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQThFRjk2QzEyNTJBRjZCMDBGNzA2 N0YgLyogUGx1Z2luQ29udHJvbGxlclByb3h5TWVzc2FnZVJlY2VpdmVyLmNwcCAqLzsgfTsKKwkJ MUE4RUY5NkYxMjUyQUY2QjAwRjcwNjdGIC8qIFBsdWdpbkNvbnRyb2xsZXJQcm94eU1lc3NhZ2Vz LmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAxQThFRjk2 RDEyNTJBRjZCMDBGNzA2N0YgLyogUGx1Z2luQ29udHJvbGxlclByb3h5TWVzc2FnZXMuaCAqLzsg fTsKIAkJMUFBMUNDNUQxMDBGQTFBMTAwNzhERUJDIC8qIFF1YXJ0ekNvcmUuZnJhbWV3b3JrIGlu IEZyYW1ld29ya3MgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMUFBMUNDNUMx MDBGQTFBMTAwNzhERUJDIC8qIFF1YXJ0ekNvcmUuZnJhbWV3b3JrICovOyB9OwogCQkxQUExQ0Qw NzEwMEZBMUJBMDA3OERFQkMgLyogQ2FyYm9uLmZyYW1ld29yayBpbiBGcmFtZXdvcmtzICovID0g e2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDFBQTFDRDA2MTAwRkExQkEwMDc4REVCQyAv KiBDYXJib24uZnJhbWV3b3JrICovOyB9OwogCQkxQUE1NkYyOTExRTkyQkM4MDA2MUI4ODIgLyog UGx1Z2luQ29udHJvbGxlci5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBm aWxlUmVmID0gMUFBNTZGMjgxMUU5MkJDODAwNjFCODgyIC8qIFBsdWdpbkNvbnRyb2xsZXIuaCAq LzsgfTsKQEAgLTU0MSw2ICs1NDQsOSBAQAogCQkxQTZGQkQyNzExRTY5QkMyMDBEQjEzNzEgLyog TmV0c2NhcGVQbHVnaW4uY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0g TmV0c2NhcGVQbHVnaW4uY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkxQThFRjRD OTEyNTI0MDM3MDBGNzA2N0YgLyogUGx1Z2luQ29udHJvbGxlclByb3h5LmggKi8gPSB7aXNhID0g UEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBz b3VyY2Vjb2RlLmMuaDsgcGF0aCA9IFBsdWdpbkNvbnRyb2xsZXJQcm94eS5oOyBzb3VyY2VUcmVl ID0gIjxncm91cD4iOyB9OwogCQkxQThFRjRDQTEyNTI0MDM3MDBGNzA2N0YgLyogUGx1Z2luQ29u dHJvbGxlclByb3h5LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2Rp bmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFBs dWdpbkNvbnRyb2xsZXJQcm94eS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTFB OEVGOTQxMTI1MkFFODQwMEY3MDY3RiAvKiBQbHVnaW5Db250cm9sbGVyUHJveHkubWVzc2FnZXMu aW4gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtu b3duRmlsZVR5cGUgPSB0ZXh0OyBwYXRoID0gUGx1Z2luQ29udHJvbGxlclByb3h5Lm1lc3NhZ2Vz LmluOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OworCQkxQThFRjk2QzEyNTJBRjZCMDBGNzA2 N0YgLyogUGx1Z2luQ29udHJvbGxlclByb3h5TWVzc2FnZVJlY2VpdmVyLmNwcCAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuY3BwLmNwcDsgbmFtZSA9IFBsdWdpbkNvbnRyb2xsZXJQcm94eU1lc3NhZ2VS ZWNlaXZlci5jcHA7IHBhdGggPSAuLi8uLi8uLi9EZWJ1Zy9EZXJpdmVkU291cmNlcy9XZWJLaXQy L1BsdWdpbkNvbnRyb2xsZXJQcm94eU1lc3NhZ2VSZWNlaXZlci5jcHA7IHNvdXJjZVRyZWUgPSAi PGdyb3VwPiI7IH07CisJCTFBOEVGOTZEMTI1MkFGNkIwMEY3MDY3RiAvKiBQbHVnaW5Db250cm9s bGVyUHJveHlNZXNzYWdlcy5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IG5hbWUgPSBQbHVn aW5Db250cm9sbGVyUHJveHlNZXNzYWdlcy5oOyBwYXRoID0gLi4vLi4vLi4vRGVidWcvRGVyaXZl ZFNvdXJjZXMvV2ViS2l0Mi9QbHVnaW5Db250cm9sbGVyUHJveHlNZXNzYWdlcy5oOyBzb3VyY2VU cmVlID0gIjxncm91cD4iOyB9OwogCQkxQUExQzc5QTEwMEU3RkM1MDA3OERFQkMgLyogV2ViQ29y ZS5mcmFtZXdvcmsgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5 cGUgPSB3cmFwcGVyLmZyYW1ld29yazsgcGF0aCA9IFdlYkNvcmUuZnJhbWV3b3JrOyBzb3VyY2VU cmVlID0gQlVJTFRfUFJPRFVDVFNfRElSOyB9OwogCQkxQUExQzdERTEwMEU4NDZFMDA3OERFQkMg LyogSmF2YVNjcmlwdENvcmUuZnJhbWV3b3JrICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7 IGxhc3RLbm93bkZpbGVUeXBlID0gd3JhcHBlci5mcmFtZXdvcms7IHBhdGggPSBKYXZhU2NyaXB0 Q29yZS5mcmFtZXdvcms7IHNvdXJjZVRyZWUgPSBCVUlMVF9QUk9EVUNUU19ESVI7IH07CiAJCTFB QTFDQzVDMTAwRkExQTEwMDc4REVCQyAvKiBRdWFydHpDb3JlLmZyYW1ld29yayAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHdyYXBwZXIuZnJhbWV3b3Jr OyBuYW1lID0gUXVhcnR6Q29yZS5mcmFtZXdvcms7IHBhdGggPSAvU3lzdGVtL0xpYnJhcnkvRnJh bWV3b3Jrcy9RdWFydHpDb3JlLmZyYW1ld29yazsgc291cmNlVHJlZSA9ICI8YWJzb2x1dGU+Ijsg fTsKQEAgLTk2Myw2ICs5NjksNyBAQAogCQkJCTFBMEVDN0ZEMTI0QkQ0MDIwMDdFRjRBNSAvKiBt YWMgKi8sCiAJCQkJMUE4RUY0Q0ExMjUyNDAzNzAwRjcwNjdGIC8qIFBsdWdpbkNvbnRyb2xsZXJQ cm94eS5jcHAgKi8sCiAJCQkJMUE4RUY0QzkxMjUyNDAzNzAwRjcwNjdGIC8qIFBsdWdpbkNvbnRy b2xsZXJQcm94eS5oICovLAorCQkJCTFBOEVGOTQxMTI1MkFFODQwMEY3MDY3RiAvKiBQbHVnaW5D b250cm9sbGVyUHJveHkubWVzc2FnZXMuaW4gKi8sCiAJCQkJMUEwNDM5NzUxMjREMDM0ODAwRkZC RkI1IC8qIFBsdWdpblByb2Nlc3MuY3BwICovLAogCQkJCTFBMDQzOTc0MTI0RDAzNDgwMEZGQkZC NSAvKiBQbHVnaW5Qcm9jZXNzLmggKi8sCiAJCQkJMUEwRUM2QjExMjRCQkQzNjAwN0VGNEE1IC8q IFBsdWdpblByb2Nlc3MubWVzc2FnZXMuaW4gKi8sCkBAIC0xNjU0LDYgKzE2NjEsOCBAQAogCQlD MENFNzI5RDEyNDdFNzFEMDBCQzBFQzQgLyogRGVyaXZlZCBTb3VyY2VzICovID0gewogCQkJaXNh ID0gUEJYR3JvdXA7CiAJCQljaGlsZHJlbiA9ICgKKwkJCQkxQThFRjk2QzEyNTJBRjZCMDBGNzA2 N0YgLyogUGx1Z2luQ29udHJvbGxlclByb3h5TWVzc2FnZVJlY2VpdmVyLmNwcCAqLywKKwkJCQkx QThFRjk2RDEyNTJBRjZCMDBGNzA2N0YgLyogUGx1Z2luQ29udHJvbGxlclByb3h5TWVzc2FnZXMu aCAqLywKIAkJCQkxQTBFQzZCRDEyNEJCRDlCMDA3RUY0QTUgLyogUGx1Z2luUHJvY2Vzc01lc3Nh Z2VSZWNlaXZlci5jcHAgKi8sCiAJCQkJMUEwRUM2QkUxMjRCQkQ5QjAwN0VGNEE1IC8qIFBsdWdp blByb2Nlc3NNZXNzYWdlcy5oICovLAogCQkJCTFBMDQzQjVCMTI0RDVFOUQwMEZGQkZCNSAvKiBQ bHVnaW5Qcm9jZXNzUHJveHlNZXNzYWdlUmVjZWl2ZXIuY3BwICovLApAQCAtMTg4Nyw2ICsxODk2 LDcgQEAKIAkJCQkxQTA0M0Y2QTEyNTE0RDhCMDBGRkJGQjUgLyogV2ViUHJvY2Vzc0Nvbm5lY3Rp b25NZXNzYWdlcy5oIGluIEhlYWRlcnMgKi8sCiAJCQkJMUE4RUY0Q0IxMjUyNDAzNzAwRjcwNjdG IC8qIFBsdWdpbkNvbnRyb2xsZXJQcm94eS5oIGluIEhlYWRlcnMgKi8sCiAJCQkJQzA5QUU1RTkx MjUyNTdDMjAwMjU4MjVEIC8qIFdLTmF0aXZlRXZlbnQuaCBpbiBIZWFkZXJzICovLAorCQkJCTFB OEVGOTZGMTI1MkFGNkIwMEY3MDY3RiAvKiBQbHVnaW5Db250cm9sbGVyUHJveHlNZXNzYWdlcy5o IGluIEhlYWRlcnMgKi8sCiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxveW1lbnRQb3N0cHJvY2Vz c2luZyA9IDA7CiAJCX07CkBAIC0xOTczLDYgKzE5ODMsNyBAQAogCQkJCThEQzJFRjUzMDQ4NkE2 OTQwMDk4QjIxNiAvKiBJbmZvUGxpc3Quc3RyaW5ncyBpbiBSZXNvdXJjZXMgKi8sCiAJCQkJMUEw NDNCNEQxMjRENUUzNjAwRkZCRkI1IC8qIFBsdWdpblByb2Nlc3NQcm94eS5tZXNzYWdlcy5pbiBp biBSZXNvdXJjZXMgKi8sCiAJCQkJMUEwNDNGNUExMjUxNENGMzAwRkZCRkI1IC8qIFdlYlByb2Nl c3NDb25uZWN0aW9uLm1lc3NhZ2VzLmluIGluIFJlc291cmNlcyAqLywKKwkJCQkxQThFRjk0MjEy NTJBRTg0MDBGNzA2N0YgLyogUGx1Z2luQ29udHJvbGxlclByb3h5Lm1lc3NhZ2VzLmluIGluIFJl c291cmNlcyAqLywKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5n ID0gMDsKIAkJfTsKQEAgLTIxNzcsNiArMjE4OCw3IEBACiAJCQkJMUEwNDNGNjkxMjUxNEQ4QjAw RkZCRkI1IC8qIFdlYlByb2Nlc3NDb25uZWN0aW9uTWVzc2FnZVJlY2VpdmVyLmNwcCBpbiBTb3Vy Y2VzICovLAogCQkJCTFBOEVGNENDMTI1MjQwMzcwMEY3MDY3RiAvKiBQbHVnaW5Db250cm9sbGVy UHJveHkuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJQzAyQkZGMUUxMjUxNTAyRTAwOUNDQkVBIC8q IE5hdGl2ZVdlYktleWJvYXJkRXZlbnRNYWMubW0gaW4gU291cmNlcyAqLywKKwkJCQkxQThFRjk2 RTEyNTJBRjZCMDBGNzA2N0YgLyogUGx1Z2luQ29udHJvbGxlclByb3h5TWVzc2FnZVJlY2VpdmVy LmNwcCBpbiBTb3VyY2VzICovLAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBsb3ltZW50UG9zdHBy b2Nlc3NpbmcgPSAwOwogCQl9OwpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdp bnMvUGx1Z2luUHJveHkuY3BwIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJv eHkuY3BwCmluZGV4IDI1NDFlYTdlODUxZGU4MjgwMDlmMjY1MDM3OWRjM2YyY2IzOTI2YTIuLjBj ZDA3MTZjNDM4Yjg3NWVjYTNhZGRjMTI1ZDI2NTc5OTNhYjcyNDAgMTAwNjQ0Ci0tLSBhL1dlYktp dDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb3h5LmNwcAorKysgYi9XZWJLaXQyL1dlYlBy b2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm94eS5jcHAKQEAgLTI3LDkgKzI3LDEyIEBACiAKICNpbmNs dWRlICJQbHVnaW5Qcm94eS5oIgogCisjaW5jbHVkZSAiQmFja2luZ1N0b3JlLmgiCiAjaW5jbHVk ZSAiTm90SW1wbGVtZW50ZWQuaCIKICNpbmNsdWRlICJQbHVnaW5Db250cm9sbGVyLmgiCisjaW5j bHVkZSAiUGx1Z2luQ29udHJvbGxlclByb3h5TWVzc2FnZXMuaCIKICNpbmNsdWRlICJQbHVnaW5Q cm9jZXNzQ29ubmVjdGlvbi5oIgorI2luY2x1ZGUgIldlYkNvcmVBcmd1bWVudENvZGVycy5oIgog I2luY2x1ZGUgIldlYlByb2Nlc3NDb25uZWN0aW9uTWVzc2FnZXMuaCIKIAogdXNpbmcgbmFtZXNw YWNlIFdlYkNvcmU7CkBAIC0xMTcsNyArMTIwLDM4IEBAIFBsYXRmb3JtTGF5ZXIqIFBsdWdpblBy b3h5OjpwbHVnaW5MYXllcigpCiAKIHZvaWQgUGx1Z2luUHJveHk6Omdlb21ldHJ5RGlkQ2hhbmdl KGNvbnN0IEludFJlY3QmIGZyYW1lUmVjdCwgY29uc3QgSW50UmVjdCYgY2xpcFJlY3QpCiB7Ci0g ICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBBU1NFUlQobV9pc1N0YXJ0ZWQpOworCisgICAgbV9m cmFtZVJlY3QgPSBmcmFtZVJlY3Q7CisKKyAgICBib29sIGRpZFVwZGF0ZUJhY2tpbmdTdG9yZSA9 IGZhbHNlOworICAgIGlmICghbV9iYWNraW5nU3RvcmUpIHsKKyAgICAgICAgbV9iYWNraW5nU3Rv cmUgPSBCYWNraW5nU3RvcmU6OmNyZWF0ZShmcmFtZVJlY3Quc2l6ZSgpKTsKKyAgICAgICAgZGlk VXBkYXRlQmFja2luZ1N0b3JlID0gdHJ1ZTsKKyAgICB9IGVsc2UgaWYgKGZyYW1lUmVjdC5zaXpl KCkgIT0gbV9iYWNraW5nU3RvcmUtPnNpemUoKSkgeworICAgICAgICAvLyBUaGUgYmFja2luZyBz dG9yZSBhbHJlYWR5IGV4aXN0cywganVzdCByZXNpemUgaXQuCisgICAgICAgIGlmICghbV9iYWNr aW5nU3RvcmUtPnJlc2l6ZShmcmFtZVJlY3Quc2l6ZSgpKSkKKyAgICAgICAgICAgIHJldHVybjsK KworICAgICAgICBkaWRVcGRhdGVCYWNraW5nU3RvcmUgPSB0cnVlOworICAgIH0KKworICAgIFNo YXJlZE1lbW9yeTo6SGFuZGxlIHBsdWdpbkJhY2tpbmdTdG9yZUhhbmRsZTsKKworICAgIGlmIChk aWRVcGRhdGVCYWNraW5nU3RvcmUpIHsKKyAgICAgICAgLy8gQ3JlYXRlIGEgbmV3IHBsdWctaW4g YmFja2luZyBzdG9yZS4KKyAgICAgICAgbV9wbHVnaW5CYWNraW5nU3RvcmUgPSBCYWNraW5nU3Rv cmU6OmNyZWF0ZVNoYXJhYmxlKGZyYW1lUmVjdC5zaXplKCkpOworICAgICAgICBpZiAoIW1fcGx1 Z2luQmFja2luZ1N0b3JlKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgIC8vIENyZWF0 ZSBhIGhhbmRsZSB0byB0aGUgcGx1Zy1pbiBiYWNraW5nIHN0b3JlIHNvIHdlIGNhbiBzZW5kIGl0 IG92ZXIuCisgICAgICAgIGlmICghbV9wbHVnaW5CYWNraW5nU3RvcmUtPmNyZWF0ZUhhbmRsZShw bHVnaW5CYWNraW5nU3RvcmVIYW5kbGUpKSB7CisgICAgICAgICAgICBtX3BsdWdpbkJhY2tpbmdT dG9yZS5jbGVhcigpOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisgICAgfQorCisg ICAgbV9jb25uZWN0aW9uLT5jb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6OlBsdWdpbkNvbnRy b2xsZXJQcm94eTo6R2VvbWV0cnlEaWRDaGFuZ2UoZnJhbWVSZWN0LCBjbGlwUmVjdCwgcGx1Z2lu QmFja2luZ1N0b3JlSGFuZGxlKSwgbV9wbHVnaW5JbnN0YW5jZUlEKTsKIH0KIAogdm9pZCBQbHVn aW5Qcm94eTo6ZnJhbWVEaWRGaW5pc2hMb2FkaW5nKHVpbnQ2NF90IHJlcXVlc3RJRCkKZGlmZiAt LWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb3h5LmggYi9XZWJLaXQy L1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm94eS5oCmluZGV4IDY0NmY1MTUxYjIxOWIzYTg0 YWFkMzk1OWZjZjY0ZWE3YzIwZDkwYjkuLmNlOGM1ZDlhY2I2YzBjMjY0MWE4OWEzOWE3ZTZhYzdk NzY4NzEzNjkgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblBy b3h5LmgKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJveHkuaApAQCAt MzMsNiArMzMsNyBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorY2xhc3MgQmFja2luZ1N0b3Jl OwogY2xhc3MgUGx1Z2luUHJvY2Vzc0Nvbm5lY3Rpb247CiAKIGNsYXNzIFBsdWdpblByb3h5IDog cHVibGljIFBsdWdpbiwgcHVibGljIENvcmVJUEM6OkNvbm5lY3Rpb246Ok1lc3NhZ2VSZWNlaXZl ciB7CkBAIC04OCw2ICs4OSwxNiBAQCBwcml2YXRlOgogCiAgICAgUGx1Z2luQ29udHJvbGxlciog bV9wbHVnaW5Db250cm9sbGVyOwogCisgICAgLy8gVGhlIHBsdWctaW4gcmVjdCBpbiB3aW5kb3cg Y29vcmRpbmF0ZXMuCisgICAgV2ViQ29yZTo6SW50UmVjdCBtX2ZyYW1lUmVjdDsKKworICAgIC8v IFRoaXMgaXMgdGhlIGJhY2tpbmcgc3RvcmUgdGhhdCB3ZSBwYWludCB3aGVuIHdlJ3JlIHRvbGQg dG8gcGFpbnQuCisgICAgUmVmUHRyPEJhY2tpbmdTdG9yZT4gbV9iYWNraW5nU3RvcmU7CisKKyAg ICAvLyBUaGlzIGlzdCBoZSBzaGFyZWQgbWVtb3J5IGJhY2tpbmcgc3RvcmUgdGhhdCB0aGUgcGx1 Zy1pbiBwYWludHMgaW50by4gV2hlbiB0aGUgcGx1Zy1pbiB0ZWxscyB1cworICAgIC8vIHRoYXQg aXQncyBwYWludGVkIHNvbWV0aGluZyBpbiBpdCwgd2UnbGwgYmxpdCBmcm9tIGl0IHRvIG91ciBv d24gYmFja2luZyBzdG9yZS4KKyAgICBSZWZQdHI8QmFja2luZ1N0b3JlPiBtX3BsdWdpbkJhY2tp bmdTdG9yZTsKKwogICAgIGJvb2wgbV9pc1N0YXJ0ZWQ7CiB9OwogCg==