46819 2010-09-29 10:35:55 -0700 Handle getting the user agent in the plug-in process 2010-09-29 10:47:30 -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 286962 0 andersca 2010-09-29 10:35:55 -0700 Handle getting the user agent in the plug-in process 286968 1 69214 andersca 2010-09-29 10:40:27 -0700 Created attachment 69214 Patch 286980 2 andersca 2010-09-29 10:47:30 -0700 Committed r68662: <http://trac.webkit.org/changeset/68662> 69214 2010-09-29 10:40:27 -0700 2010-09-29 10:44:58 -0700 Patch bug-46819-20100929104025.patch text/plain 13779 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg ODlhMzgzMmVhOTVmNTdhM2Y2Y2U4OTIwMDk2ODdlNjg0NWQ3MDliZi4uMWIwYmY3MzU0OGY0ZmEw ZTYzYjE3NTdkMDRiNzRhY2NlZWJjNDY4ZCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSw0NCBAQAogMjAxMC0wOS0yOSAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEhhbmRsZSBnZXR0aW5nIHRoZSB1c2VyIGFnZW50 IGluIHRoZSBwbHVnLWluIHByb2Nlc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTQ2ODE5CisKKyAgICAgICAgKiBQbGF0Zm9ybS9Db3JlSVBDL0hhbmRs ZU1lc3NhZ2UuaDoKKyAgICAgICAgKENvcmVJUEM6OmhhbmRsZU1lc3NhZ2UpOgorICAgICAgICBB ZGQgbmV3IGhhbmRsZU1lc3NhZ2Ugb3ZlcmxvYWQuCisKKyAgICAgICAgKiBQbHVnaW5Qcm9jZXNz L1BsdWdpbkNvbnRyb2xsZXJQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpbkNvbnRy b2xsZXJQcm94eTo6Y3JlYXRlKToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luQ29udHJvbGxlclBy b3h5OjpQbHVnaW5Db250cm9sbGVyUHJveHkpOgorICAgICAgICBQYXNzIHRoZSB1c2VyIGFnZW50 IHRvIHRoZSBwbHVnLWluIGNvbnRyb2xsZXIgcHJveHkuCisKKyAgICAgICAgKFdlYktpdDo6UGx1 Z2luQ29udHJvbGxlclByb3h5Ojp1c2VyQWdlbnQpOgorICAgICAgICBSZXR1cm4gdGhlIHVzZXIg YWdlbnQuCisKKyAgICAgICAgKiBQbHVnaW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9uLmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc0Nvbm5lY3Rpb246OmNyZWF0ZVBsdWdpbik6 CisgICAgICAgIFBhc3MgdGhlIHVzZXIgYWdlbnQgd2hlbiBjcmVhdGluZyB0aGUgcGx1Zy1pbiBj b250cm9sbGVyIHByb3h5LgorCisgICAgICAgICogUGx1Z2luUHJvY2Vzcy9XZWJQcm9jZXNzQ29u bmVjdGlvbi5tZXNzYWdlcy5pbjoKKyAgICAgICAgQWRkIHVzZXJBZ2VudC4KKworICAgICAgICAq IFdlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHA6CisgICAgICAg IChXZWJLaXQ6Ok5ldHNjYXBlUGx1Z2luOjp1c2VyQWdlbnQpOgorICAgICAgICAqIFdlYlByb2Nl c3MvUGx1Z2lucy9QbHVnaW5Db250cm9sbGVyLmg6CisgICAgICAgIFJlbW92ZSB0aGUgVVJMIHBh cmFtZXRlciB0byB1c2VyQWdlbnQuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1BsdWdpbnMvUGx1 Z2luUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm94eTo6aW5pdGlhbGl6ZSk6 CisgICAgICAgIFBhc3MgdGhlIHVzZXIgYWdlbnQgdG8gV2ViUHJvY2Vzc0Nvbm5lY3Rpb246OkNy ZWF0ZVBsdWdpbi4KKworICAgICAgICAqIFdlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNw cDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luVmlldzo6dXNlckFnZW50KToKKyAgICAgICAgUmVt b3ZlIHVybCBwYXJhbWV0ZXIuCisKKzIwMTAtMDktMjkgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVy c2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBSZXZpZXdlZCBieSBTYW0gV2VpbmlnLgogCiAgICAg ICAgIEltcGxlbWVudCBtb3JlIFBsdWdpblByb3h5IG1lbWJlciBmdW5jdGlvbnMKZGlmZiAtLWdp dCBhL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9IYW5kbGVNZXNzYWdlLmggYi9XZWJLaXQyL1Bs YXRmb3JtL0NvcmVJUEMvSGFuZGxlTWVzc2FnZS5oCmluZGV4IDcwZTZjNTdkODBmZTRmZWVkZjQ3 YzZlNzIzMzg5YzQ0ODk3YjRmMTMuLjRjMWNiNGQ0YzZjMDA0YTg0YjAwNmJmYzczNjdhMTQxYmIw NmJiNWMgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9IYW5kbGVNZXNzYWdl LmgKKysrIGIvV2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0hhbmRsZU1lc3NhZ2UuaApAQCAtNzAs NiArNzAsMjYgQEAgdm9pZCBoYW5kbGVNZXNzYWdlKEFyZ3VtZW50RGVjb2RlciogYXJndW1lbnRz LCBBcmd1bWVudEVuY29kZXIqIHJlcGx5LCBDKiBvYmplY3QKICAgICByZXBseS0+ZW5jb2RlKGZp cnN0UmVwbHlBcmd1bWVudCk7CiB9CiAKK3RlbXBsYXRlPHR5cGVuYW1lIFQsIHR5cGVuYW1lIEMs IHR5cGVuYW1lIFAxLCB0eXBlbmFtZSBQMiwgdHlwZW5hbWUgUDMsIHR5cGVuYW1lIFIxPgordm9p ZCBoYW5kbGVNZXNzYWdlKEFyZ3VtZW50RGVjb2RlciogYXJndW1lbnRzLCBBcmd1bWVudEVuY29k ZXIqIHJlcGx5LCBDKiBvYmplY3QsIHZvaWQgKEM6OipmdW5jdGlvbikoUDEsIFAyLCBQMywgUjEm KSkKK3sKKyAgICB0eXBlbmFtZSBSZW1vdmVSZWZlcmVuY2U8dHlwZW5hbWUgVDo6Rmlyc3RBcmd1 bWVudFR5cGU+OjpUeXBlIGZpcnN0QXJndW1lbnQ7CisgICAgaWYgKCFhcmd1bWVudHMtPmRlY29k ZShmaXJzdEFyZ3VtZW50KSkKKyAgICAgICAgcmV0dXJuOworCisgICAgdHlwZW5hbWUgUmVtb3Zl UmVmZXJlbmNlPHR5cGVuYW1lIFQ6OlNlY29uZEFyZ3VtZW50VHlwZT46OlR5cGUgc2Vjb25kQXJn dW1lbnQ7CisgICAgaWYgKCFhcmd1bWVudHMtPmRlY29kZShzZWNvbmRBcmd1bWVudCkpCisgICAg ICAgIHJldHVybjsKKyAgICAKKyAgICB0eXBlbmFtZSBSZW1vdmVSZWZlcmVuY2U8dHlwZW5hbWUg VDo6VGhpcmRBcmd1bWVudFR5cGU+OjpUeXBlIHRoaXJkQXJndW1lbnQ7CisgICAgaWYgKCFhcmd1 bWVudHMtPmRlY29kZSh0aGlyZEFyZ3VtZW50KSkKKyAgICAgICAgcmV0dXJuOworICAgIAorICAg IHR5cGVuYW1lIFJlbW92ZVJlZmVyZW5jZTx0eXBlbmFtZSBUOjpSZXBseTo6Rmlyc3RBcmd1bWVu dFR5cGU+OjpUeXBlIGZpcnN0UmVwbHlBcmd1bWVudDsKKyAgICAob2JqZWN0LT4qZnVuY3Rpb24p KGZpcnN0QXJndW1lbnQsIHNlY29uZEFyZ3VtZW50LCB0aGlyZEFyZ3VtZW50LCBmaXJzdFJlcGx5 QXJndW1lbnQpOworICAgIHJlcGx5LT5lbmNvZGUoZmlyc3RSZXBseUFyZ3VtZW50KTsKK30KKwog dGVtcGxhdGU8dHlwZW5hbWUgVCwgdHlwZW5hbWUgQywgdHlwZW5hbWUgUDEsIHR5cGVuYW1lIFAy LCB0eXBlbmFtZSBSMT4KIHZvaWQgaGFuZGxlTWVzc2FnZShBcmd1bWVudERlY29kZXIqIGFyZ3Vt ZW50cywgQXJndW1lbnRFbmNvZGVyKiByZXBseSwgQyogb2JqZWN0LCB2b2lkIChDOjoqZnVuY3Rp b24pKFAxLCBQMiwgUjEmKSkKIHsKZGlmZiAtLWdpdCBhL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9Q bHVnaW5Db250cm9sbGVyUHJveHkuY3BwIGIvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpbkNv bnRyb2xsZXJQcm94eS5jcHAKaW5kZXggNTYyZDA5YzI5NWMyOTk5ZWRlYzhhNjg2MWExYjBjZDdl YmE1ZGM1ZS4uMGY1Zjg5NDhhYWFlNmE5MGMwMGE1NTY0ZjJiNjRiODdkYzUwNDQzMiAxMDA2NDQK LS0tIGEvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94eS5jcHAKKysr IGIvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94eS5jcHAKQEAgLTQx LDE0ICs0MSwxNSBAQCB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKIAogbmFtZXNwYWNlIFdlYktp dCB7CiAKLVBhc3NPd25QdHI8UGx1Z2luQ29udHJvbGxlclByb3h5PiBQbHVnaW5Db250cm9sbGVy UHJveHk6OmNyZWF0ZShXZWJQcm9jZXNzQ29ubmVjdGlvbiogY29ubmVjdGlvbiwgdWludDY0X3Qg cGx1Z2luSW5zdGFuY2VJRCkKK1Bhc3NPd25QdHI8UGx1Z2luQ29udHJvbGxlclByb3h5PiBQbHVn aW5Db250cm9sbGVyUHJveHk6OmNyZWF0ZShXZWJQcm9jZXNzQ29ubmVjdGlvbiogY29ubmVjdGlv biwgdWludDY0X3QgcGx1Z2luSW5zdGFuY2VJRCwgY29uc3QgU3RyaW5nJiB1c2VyQWdlbnQpCiB7 Ci0gICAgcmV0dXJuIGFkb3B0UHRyKG5ldyBQbHVnaW5Db250cm9sbGVyUHJveHkoY29ubmVjdGlv biwgcGx1Z2luSW5zdGFuY2VJRCkpOworICAgIHJldHVybiBhZG9wdFB0cihuZXcgUGx1Z2luQ29u dHJvbGxlclByb3h5KGNvbm5lY3Rpb24sIHBsdWdpbkluc3RhbmNlSUQsIHVzZXJBZ2VudCkpOwog fQogCi1QbHVnaW5Db250cm9sbGVyUHJveHk6OlBsdWdpbkNvbnRyb2xsZXJQcm94eShXZWJQcm9j ZXNzQ29ubmVjdGlvbiogY29ubmVjdGlvbiwgdWludDY0X3QgcGx1Z2luSW5zdGFuY2VJRCkKK1Bs dWdpbkNvbnRyb2xsZXJQcm94eTo6UGx1Z2luQ29udHJvbGxlclByb3h5KFdlYlByb2Nlc3NDb25u ZWN0aW9uKiBjb25uZWN0aW9uLCB1aW50NjRfdCBwbHVnaW5JbnN0YW5jZUlELCBjb25zdCBTdHJp bmcmIHVzZXJBZ2VudCkKICAgICA6IG1fY29ubmVjdGlvbihjb25uZWN0aW9uKQogICAgICwgbV9w bHVnaW5JbnN0YW5jZUlEKHBsdWdpbkluc3RhbmNlSUQpCisgICAgLCBtX3VzZXJBZ2VudCh1c2Vy QWdlbnQpCiAgICAgLCBtX3BhaW50VGltZXIoUnVuTG9vcDo6bWFpbigpLCB0aGlzLCAmUGx1Z2lu Q29udHJvbGxlclByb3h5OjpwYWludCkKIHsKIH0KQEAgLTEyNCwxMCArMTI1LDkgQEAgdm9pZCBQ bHVnaW5Db250cm9sbGVyUHJveHk6OmludmFsaWRhdGUoY29uc3QgSW50UmVjdCYgcmVjdCkKICAg ICBtX3BhaW50VGltZXIuc3RhcnRPbmVTaG90KDApOwogfQogCi1TdHJpbmcgUGx1Z2luQ29udHJv bGxlclByb3h5Ojp1c2VyQWdlbnQoY29uc3QgV2ViQ29yZTo6S1VSTCYpCitTdHJpbmcgUGx1Z2lu Q29udHJvbGxlclByb3h5Ojp1c2VyQWdlbnQoKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7Ci0g ICAgcmV0dXJuIFN0cmluZygpOworICAgIHJldHVybiBtX3VzZXJBZ2VudDsKIH0KIAogdm9pZCBQ bHVnaW5Db250cm9sbGVyUHJveHk6OmxvYWRVUkwodWludDY0X3QgcmVxdWVzdElELCBjb25zdCBT dHJpbmcmIG1ldGhvZCwgY29uc3QgU3RyaW5nJiB1cmxTdHJpbmcsIGNvbnN0IFN0cmluZyYgdGFy Z2V0LCBjb25zdCBIVFRQSGVhZGVyTWFwJiBoZWFkZXJGaWVsZHMsIGNvbnN0IFZlY3Rvcjx1aW50 OF90PiYgaHR0cEJvZHksIGJvb2wgYWxsb3dQb3B1cHMpCmRpZmYgLS1naXQgYS9XZWJLaXQyL1Bs dWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclByb3h5LmggYi9XZWJLaXQyL1BsdWdpblByb2Nl c3MvUGx1Z2luQ29udHJvbGxlclByb3h5LmgKaW5kZXggNGMxYzhmMWNmMmRkZGJiYjNmMzg3NjQ2 ZDAyZTBmZmNlYjFiZDM1MS4uYmVjNDA0MzlmZmFlMTRhNzgxZWI3OTExZTJiZjVkNjc2YWM2OGY1 YyAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94 eS5oCisrKyBiL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkuaApA QCAtNDQsNyArNDQsNyBAQCBjbGFzcyBQbHVnaW5Db250cm9sbGVyUHJveHkgOiBQbHVnaW5Db250 cm9sbGVyIHsKICAgICBXVEZfTUFLRV9OT05DT1BZQUJMRShQbHVnaW5Db250cm9sbGVyUHJveHkp OwogCiBwdWJsaWM6Ci0gICAgc3RhdGljIFBhc3NPd25QdHI8UGx1Z2luQ29udHJvbGxlclByb3h5 PiBjcmVhdGUoV2ViUHJvY2Vzc0Nvbm5lY3Rpb24qIGNvbm5lY3Rpb24sIHVpbnQ2NF90IHBsdWdp bkluc3RhbmNlSUQpOworICAgIHN0YXRpYyBQYXNzT3duUHRyPFBsdWdpbkNvbnRyb2xsZXJQcm94 eT4gY3JlYXRlKFdlYlByb2Nlc3NDb25uZWN0aW9uKiBjb25uZWN0aW9uLCB1aW50NjRfdCBwbHVn aW5JbnN0YW5jZUlELCBjb25zdCBTdHJpbmcmIHVzZXJBZ2VudCk7CiAgICAgflBsdWdpbkNvbnRy b2xsZXJQcm94eSgpOwogCiAgICAgdWludDY0X3QgcGx1Z2luSW5zdGFuY2VJRCgpIGNvbnN0IHsg cmV0dXJuIG1fcGx1Z2luSW5zdGFuY2VJRDsgfQpAQCAtNTYsMTMgKzU2LDEzIEBAIHB1YmxpYzoK ICAgICBDb3JlSVBDOjpTeW5jUmVwbHlNb2RlIGRpZFJlY2VpdmVTeW5jUGx1Z2luQ29udHJvbGxl clByb3h5TWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiwgQ29yZUlQQzo6TWVzc2FnZUlELCBD b3JlSVBDOjpBcmd1bWVudERlY29kZXIqLCBDb3JlSVBDOjpBcmd1bWVudEVuY29kZXIqKTsKIAog cHJpdmF0ZToKLSAgICBQbHVnaW5Db250cm9sbGVyUHJveHkoV2ViUHJvY2Vzc0Nvbm5lY3Rpb24q IGNvbm5lY3Rpb24sIHVpbnQ2NF90IHBsdWdpbkluc3RhbmNlSUQpOworICAgIFBsdWdpbkNvbnRy b2xsZXJQcm94eShXZWJQcm9jZXNzQ29ubmVjdGlvbiogY29ubmVjdGlvbiwgdWludDY0X3QgcGx1 Z2luSW5zdGFuY2VJRCwgY29uc3QgU3RyaW5nJiB1c2VyQWdlbnQpOwogCiAgICAgdm9pZCBwYWlu dCgpOwogCiAgICAgLy8gUGx1Z2luQ29udHJvbGxlcgogICAgIHZpcnR1YWwgdm9pZCBpbnZhbGlk YXRlKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsKLSAgICB2aXJ0dWFsIFN0cmluZyB1c2VyQWdl bnQoY29uc3QgV2ViQ29yZTo6S1VSTCYpOworICAgIHZpcnR1YWwgU3RyaW5nIHVzZXJBZ2VudCgp OwogICAgIHZpcnR1YWwgdm9pZCBsb2FkVVJMKHVpbnQ2NF90IHJlcXVlc3RJRCwgY29uc3QgU3Ry aW5nJiBtZXRob2QsIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nLCBjb25zdCBTdHJpbmcmIHRhcmdl dCwgY29uc3QgV2ViQ29yZTo6SFRUUEhlYWRlck1hcCYgaGVhZGVyRmllbGRzLCBjb25zdCBWZWN0 b3I8dWludDhfdD4mIGh0dHBCb2R5LCBib29sIGFsbG93UG9wdXBzKTsKICAgICB2aXJ0dWFsIHZv aWQgY2FuY2VsU3RyZWFtTG9hZCh1aW50NjRfdCBzdHJlYW1JRCk7CiAgICAgdmlydHVhbCB2b2lk IGNhbmNlbE1hbnVhbFN0cmVhbUxvYWQoKTsKQEAgLTg5LDYgKzg5LDggQEAgcHJpdmF0ZToKICAg ICBXZWJQcm9jZXNzQ29ubmVjdGlvbiogbV9jb25uZWN0aW9uOwogICAgIHVpbnQ2NF90IG1fcGx1 Z2luSW5zdGFuY2VJRDsKIAorICAgIFN0cmluZyBtX3VzZXJBZ2VudDsKKwogICAgIFJlZlB0cjxQ bHVnaW4+IG1fcGx1Z2luOwogCiAgICAgLy8gVGhlIHBsdWctaW4gcmVjdCBhbmQgY2xpcCByZWN0 IGluIHdpbmRvdyBjb29yZGluYXRlcy4KZGlmZiAtLWdpdCBhL1dlYktpdDIvUGx1Z2luUHJvY2Vz cy9XZWJQcm9jZXNzQ29ubmVjdGlvbi5jcHAgYi9XZWJLaXQyL1BsdWdpblByb2Nlc3MvV2ViUHJv Y2Vzc0Nvbm5lY3Rpb24uY3BwCmluZGV4IGM4ZDJiNTk1ODVjMDk2ZDZiODM0YWU1YjFiOThmMmY5 OTIyMWQyZjYuLjk2OGUwMWJkNzgxMTRlMWQ3YTVjNDhhNDQ2MTAwMzUzOTE3MDYyY2EgMTAwNjQ0 Ci0tLSBhL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9XZWJQcm9jZXNzQ29ubmVjdGlvbi5jcHAKKysr IGIvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9uLmNwcApAQCAtMTMx LDkgKzEzMSw5IEBAIHZvaWQgV2ViUHJvY2Vzc0Nvbm5lY3Rpb246OmRpZFJlY2VpdmVJbnZhbGlk TWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiwgQ29yZUlQCiAgICAgLy8gRklYTUU6IEltcGxl bWVudC4KIH0KIAotdm9pZCBXZWJQcm9jZXNzQ29ubmVjdGlvbjo6Y3JlYXRlUGx1Z2luKHVpbnQ2 NF90IHBsdWdpbkluc3RhbmNlSUQsIGNvbnN0IFBsdWdpbjo6UGFyYW1ldGVycyYgcGFyYW1ldGVy cywgYm9vbCYgcmVzdWx0KQordm9pZCBXZWJQcm9jZXNzQ29ubmVjdGlvbjo6Y3JlYXRlUGx1Z2lu KHVpbnQ2NF90IHBsdWdpbkluc3RhbmNlSUQsIGNvbnN0IFBsdWdpbjo6UGFyYW1ldGVycyYgcGFy YW1ldGVycywgY29uc3QgU3RyaW5nJiB1c2VyQWdlbnQsIGJvb2wmIHJlc3VsdCkKIHsKLSAgICBP d25QdHI8UGx1Z2luQ29udHJvbGxlclByb3h5PiBwbHVnaW5Db250cm9sbGVyUHJveHkgPSBQbHVn aW5Db250cm9sbGVyUHJveHk6OmNyZWF0ZSh0aGlzLCBwbHVnaW5JbnN0YW5jZUlEKTsKKyAgICBP d25QdHI8UGx1Z2luQ29udHJvbGxlclByb3h5PiBwbHVnaW5Db250cm9sbGVyUHJveHkgPSBQbHVn aW5Db250cm9sbGVyUHJveHk6OmNyZWF0ZSh0aGlzLCBwbHVnaW5JbnN0YW5jZUlELCB1c2VyQWdl bnQpOwogCiAgICAgUGx1Z2luQ29udHJvbGxlclByb3h5KiBwbHVnaW5Db250cm9sbGVyUHJveHlQ dHIgPSBwbHVnaW5Db250cm9sbGVyUHJveHkuZ2V0KCk7CiAKZGlmZiAtLWdpdCBhL1dlYktpdDIv UGx1Z2luUHJvY2Vzcy9XZWJQcm9jZXNzQ29ubmVjdGlvbi5oIGIvV2ViS2l0Mi9QbHVnaW5Qcm9j ZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9uLmgKaW5kZXggYzJlNWNkNThiZjc5Mzg1NjYzOGRmOTA3 NWQ0MzQwMjU3YjY0MWVmNC4uMjhjZjk0NDVmMmZiM2RmNWYwNDA4ZDZhMjkxOGU1Zjg4YWY1MmJj MCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9u LmgKKysrIGIvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9uLmgKQEAg LTYxLDcgKzYxLDcgQEAgcHJpdmF0ZToKIAogICAgIC8vIE1lc3NhZ2UgaGFuZGxlcnMuCiAgICAg Q29yZUlQQzo6U3luY1JlcGx5TW9kZSBkaWRSZWNlaXZlU3luY1dlYlByb2Nlc3NDb25uZWN0aW9u TWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiwgQ29yZUlQQzo6TWVzc2FnZUlELCBDb3JlSVBD OjpBcmd1bWVudERlY29kZXIqLCBDb3JlSVBDOjpBcmd1bWVudEVuY29kZXIqKTsKLSAgICB2b2lk IGNyZWF0ZVBsdWdpbih1aW50NjRfdCBwbHVnaW5JbnN0YW5jZUlELCBjb25zdCBQbHVnaW46OlBh cmFtZXRlcnMmLCBib29sJiByZXN1bHQpOworICAgIHZvaWQgY3JlYXRlUGx1Z2luKHVpbnQ2NF90 IHBsdWdpbkluc3RhbmNlSUQsIGNvbnN0IFBsdWdpbjo6UGFyYW1ldGVycyYsIGNvbnN0IFN0cmlu ZyYgdXNlckFnZW50LCBib29sJiByZXN1bHQpOwogICAgIHZvaWQgZGVzdHJveVBsdWdpbih1aW50 NjRfdCBwbHVnaW5JbnN0YW5jZUlEKTsKIAogICAgIFJlZlB0cjxDb3JlSVBDOjpDb25uZWN0aW9u PiBtX2Nvbm5lY3Rpb247CmRpZmYgLS1naXQgYS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvV2ViUHJv Y2Vzc0Nvbm5lY3Rpb24ubWVzc2FnZXMuaW4gYi9XZWJLaXQyL1BsdWdpblByb2Nlc3MvV2ViUHJv Y2Vzc0Nvbm5lY3Rpb24ubWVzc2FnZXMuaW4KaW5kZXggOWM4MjE3YzJkNDNlZmEyNjg1YWUxZjhj ZWVjYWI5MTYyNDcwZDdiZi4uN2Q2YzFjMDkxZmIxMWE3OWZlYjhhMzcyMWI5ZTFmOTEwZTRkZjMy OCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9u Lm1lc3NhZ2VzLmluCisrKyBiL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9XZWJQcm9jZXNzQ29ubmVj dGlvbi5tZXNzYWdlcy5pbgpAQCAtMjQsNyArMjQsNyBAQAogCiBtZXNzYWdlcyAtPiBXZWJQcm9j ZXNzQ29ubmVjdGlvbiB7CiAgICAgIyBDcmVhdGVzIGEgcGx1Zy1pbiBpbnN0YW5jZSB3aXRoIHRo ZSBnaXZlbiBpbnN0YW5jZSBJRC4KLSAgICBDcmVhdGVQbHVnaW4odWludDY0X3QgcGx1Z2luSW5z dGFuY2VJRCwgV2ViS2l0OjpQbHVnaW46OlBhcmFtZXRlcnMgcGFyYW1ldGVycykgLT4gKGJvb2wg cmVzdWx0KQorICAgIENyZWF0ZVBsdWdpbih1aW50NjRfdCBwbHVnaW5JbnN0YW5jZUlELCBXZWJL aXQ6OlBsdWdpbjo6UGFyYW1ldGVycyBwYXJhbWV0ZXJzLCBXVEY6OlN0cmluZyB1c2VyQWdlbnQp IC0+IChib29sIHJlc3VsdCkKIAogICAgICMgRGVzdHJveXMgdGhlIHBsdWctaW4gaW5zdGFuY2Ug d2l0aCB0aGUgZ2l2ZW4gaW5zdGFuY2UgSUQuCiAgICAgRGVzdHJveVBsdWdpbih1aW50NjRfdCBw bHVnaW5JbnN0YW5jZUlEKSAtPiAoKQpkaWZmIC0tZ2l0IGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1Bs dWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwIGIvV2ViS2l0Mi9XZWJQcm9jZXNzL1Bs dWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwCmluZGV4IDQzYjkzYTllY2I1YmZkNmVj MGQ1ODdjYzFlZWFiY2E4ZDFjYjU2ZmEuLmZiN2VhZDcwMDkzZmI3NmZmZGFkZjU5ZDY3YmMxYzE3 NTMzODdkYmIgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBl L05ldHNjYXBlUGx1Z2luLmNwcAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRz Y2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAKQEAgLTEwMSwxMSArMTAxLDkgQEAgdm9pZCBOZXRzY2Fw ZVBsdWdpbjo6aW52YWxpZGF0ZShjb25zdCBOUFJlY3QqIGludmFsaWRSZWN0KQogY29uc3QgY2hh ciogTmV0c2NhcGVQbHVnaW46OnVzZXJBZ2VudCgpCiB7CiAgICAgaWYgKG1fdXNlckFnZW50Lmlz TnVsbCgpKSB7Ci0gICAgICAgIC8vIEZJWE1FOiBQYXNzIHRoZSBzcmMgVVJMLgotICAgICAgICBt X3VzZXJBZ2VudCA9IG1fcGx1Z2luQ29udHJvbGxlci0+dXNlckFnZW50KEtVUkwoKSkudXRmOCgp OworICAgICAgICBtX3VzZXJBZ2VudCA9IG1fcGx1Z2luQ29udHJvbGxlci0+dXNlckFnZW50KCku dXRmOCgpOwogICAgICAgICBBU1NFUlQoIW1fdXNlckFnZW50LmlzTnVsbCgpKTsKICAgICB9Ci0g ICAgCiAgICAgcmV0dXJuIG1fdXNlckFnZW50LmRhdGEoKTsKIH0KIApkaWZmIC0tZ2l0IGEvV2Vi S2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luQ29udHJvbGxlci5oIGIvV2ViS2l0Mi9XZWJQ cm9jZXNzL1BsdWdpbnMvUGx1Z2luQ29udHJvbGxlci5oCmluZGV4IGI0ZTZlNzZiOTU2Y2U2OTZm Mzg3MzQxMmIzYWU5MzRiMDMwNzZmOWQuLjUzYjRlNWU5MzdhZmVlY2NkYWM0Zjk1MDZiZTBjNzAz ZTE1YzUyODcgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkNv bnRyb2xsZXIuaAorKysgYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Db250cm9s bGVyLmgKQEAgLTQ0LDggKzQ0LDggQEAgcHVibGljOgogICAgIC8vIFRlbGxzIHRoZSBjb250cm9s bGVyIHRoYXQgdGhlIHBsdWctaW4gd2FudHMgdGhlIGdpdmVuIHJlY3QgdG8gYmUgcmVwYWludGVk LiBUaGUgcmVjdCBpcyBpbiB0aGUgcGx1Zy1pbidzIGNvb3JkaW5hdGUgc3lzdGVtLgogICAgIHZp cnR1YWwgdm9pZCBpbnZhbGlkYXRlKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKSA9IDA7CiAKLSAg ICAvLyBSZXR1cm5zIHRoZSB1c2VyIGFnZW50IHN0cmluZyBmb3IgdGhlIGdpdmVuIFVSTC4KLSAg ICB2aXJ0dWFsIFN0cmluZyB1c2VyQWdlbnQoY29uc3QgV2ViQ29yZTo6S1VSTCYpID0gMDsKKyAg ICAvLyBSZXR1cm5zIHRoZSB1c2VyIGFnZW50IHN0cmluZy4KKyAgICB2aXJ0dWFsIFN0cmluZyB1 c2VyQWdlbnQoKSA9IDA7CiAKICAgICAvLyBMb2FkcyB0aGUgZ2l2ZW4gVVJMIGFuZCBhc3NvY2lh dGVzIGl0IHdpdGggdGhlIHJlcXVlc3QgSUQuCiAgICAgLy8gCmRpZmYgLS1naXQgYS9XZWJLaXQy L1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm94eS5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9QbHVnaW5Qcm94eS5jcHAKaW5kZXggODJlNWU3YzI0NzBiOGFjNjg3ODQ5MTEyNDEy M2UyODA3NTIyNGE5ZC4uOGJjMzQyZDNlNzU4NGM2ZWRjNDNmYWIxZmFiN2EzZjI0ZjY3M2UyZCAx MDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJveHkuY3BwCisr KyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb3h5LmNwcApAQCAtODEsNyAr ODEsNyBAQCBib29sIFBsdWdpblByb3h5Ojppbml0aWFsaXplKFBsdWdpbkNvbnRyb2xsZXIqIHBs dWdpbkNvbnRyb2xsZXIsIGNvbnN0IFBhcmFtZXRlcgogICAgIC8vIEFzayB0aGUgcGx1Zy1pbiBw cm9jZXNzIHRvIGNyZWF0ZSBhIHBsdWctaW4uCiAgICAgYm9vbCByZXN1bHQgPSBmYWxzZTsKIAot ICAgIGlmICghbV9jb25uZWN0aW9uLT5jb25uZWN0aW9uKCktPnNlbmRTeW5jKE1lc3NhZ2VzOjpX ZWJQcm9jZXNzQ29ubmVjdGlvbjo6Q3JlYXRlUGx1Z2luKG1fcGx1Z2luSW5zdGFuY2VJRCwgcGFy YW1ldGVycyksCisgICAgaWYgKCFtX2Nvbm5lY3Rpb24tPmNvbm5lY3Rpb24oKS0+c2VuZFN5bmMo TWVzc2FnZXM6OldlYlByb2Nlc3NDb25uZWN0aW9uOjpDcmVhdGVQbHVnaW4obV9wbHVnaW5JbnN0 YW5jZUlELCBwYXJhbWV0ZXJzLCBwbHVnaW5Db250cm9sbGVyLT51c2VyQWdlbnQoKSksCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgTWVzc2FnZXM6OldlYlBy b2Nlc3NDb25uZWN0aW9uOjpDcmVhdGVQbHVnaW46OlJlcGx5KHJlc3VsdCksCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgMCwgQ29yZUlQQzo6Q29ubmVjdGlv bjo6Tm9UaW1lb3V0KSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwpkaWZmIC0tZ2l0IGEvV2ViS2l0 Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUGx1Z2luVmlldy5jcHAgYi9XZWJLaXQyL1dlYlByb2Nlc3Mv UGx1Z2lucy9QbHVnaW5WaWV3LmNwcAppbmRleCBjNzljYjFhNmE3ZGQwNDg5ZGU1MWMwODllYWIx NDZhNGZiZmJhMDZjLi40NTk2MGZjN2IzYjY2YjM5ZjExOGYwOWFlNjM1MTg1ZDY1OGMxZGU3IDEw MDY0NAotLS0gYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcAorKysg Yi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmNwcApAQCAtNjk5LDEzICs2 OTksMTMgQEAgdm9pZCBQbHVnaW5WaWV3OjppbnZhbGlkYXRlKGNvbnN0IEludFJlY3QmIGRpcnR5 UmVjdCkKICAgICBpbnZhbGlkYXRlUmVjdChkaXJ0eVJlY3QpOwogfQogCi1TdHJpbmcgUGx1Z2lu Vmlldzo6dXNlckFnZW50KGNvbnN0IEtVUkwmIHVybCkKK1N0cmluZyBQbHVnaW5WaWV3Ojp1c2Vy QWdlbnQoKQogewogICAgIEZyYW1lKiBmcmFtZSA9IG1fcGx1Z2luRWxlbWVudC0+ZG9jdW1lbnQo KS0+ZnJhbWUoKTsKICAgICBpZiAoIWZyYW1lKQogICAgICAgICByZXR1cm4gU3RyaW5nKCk7CiAg ICAgCi0gICAgcmV0dXJuIGZyYW1lLT5sb2FkZXIoKS0+Y2xpZW50KCktPnVzZXJBZ2VudCh1cmwp OworICAgIHJldHVybiBmcmFtZS0+bG9hZGVyKCktPmNsaWVudCgpLT51c2VyQWdlbnQoS1VSTCgp KTsKIH0KIAogdm9pZCBQbHVnaW5WaWV3Ojpsb2FkVVJMKHVpbnQ2NF90IHJlcXVlc3RJRCwgY29u c3QgU3RyaW5nJiBtZXRob2QsIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nLCBjb25zdCBTdHJpbmcm IHRhcmdldCwgCmRpZmYgLS1naXQgYS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5W aWV3LmggYi9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5WaWV3LmgKaW5kZXggMDI1 ZGRiZjI4ZDc0MmQwOTRiOWE4Nzg2MzJiYzBjZTAyMmYyNmI3ZS4uZTkzMjUyOThmODRlNjliNzAx YTUwNmFkMDdkNzhjNzQyYzlkZTNiMCAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9XZWJQcm9jZXNzL1Bs dWdpbnMvUGx1Z2luVmlldy5oCisrKyBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdp blZpZXcuaApAQCAtMTEzLDcgKzExMyw3IEBAIHByaXZhdGU6CiAKICAgICAvLyBQbHVnaW5Db250 cm9sbGVyCiAgICAgdmlydHVhbCB2b2lkIGludmFsaWRhdGUoY29uc3QgV2ViQ29yZTo6SW50UmVj dCYpOwotICAgIHZpcnR1YWwgU3RyaW5nIHVzZXJBZ2VudChjb25zdCBXZWJDb3JlOjpLVVJMJik7 CisgICAgdmlydHVhbCBTdHJpbmcgdXNlckFnZW50KCk7CiAgICAgdmlydHVhbCB2b2lkIGxvYWRV UkwodWludDY0X3QgcmVxdWVzdElELCBjb25zdCBTdHJpbmcmIG1ldGhvZCwgY29uc3QgU3RyaW5n JiB1cmxTdHJpbmcsIGNvbnN0IFN0cmluZyYgdGFyZ2V0LCAKICAgICAgICAgICAgICAgICAgICAg ICAgICBjb25zdCBXZWJDb3JlOjpIVFRQSGVhZGVyTWFwJiBoZWFkZXJGaWVsZHMsIGNvbnN0IFZl Y3Rvcjx1aW50OF90PiYgaHR0cEJvZHksIGJvb2wgYWxsb3dQb3B1cHMpOwogICAgIHZpcnR1YWwg dm9pZCBjYW5jZWxTdHJlYW1Mb2FkKHVpbnQ2NF90IHN0cmVhbUlEKTsK