46815 2010-09-29 09:58:06 -0700 Implement more PluginProxy member functions 2010-09-29 10:23:47 -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 286935 0 andersca 2010-09-29 09:58:06 -0700 Implement more PluginProxy member functions 286938 1 69207 andersca 2010-09-29 10:01:25 -0700 Created attachment 69207 Patch 286955 2 andersca 2010-09-29 10:23:47 -0700 Committed r68659: <http://trac.webkit.org/changeset/68659> 69207 2010-09-29 10:01:25 -0700 2010-09-29 10:19:34 -0700 Patch bug-46815-20100929100124.patch text/plain 14459 andersca ZGlmZiAtLWdpdCBhL1dlYktpdDIvQ2hhbmdlTG9nIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXgg NzY5MDRhNzQ2NDEyNWQwYTg4NzZlYjA3ZTIxMTYxMDIzZjI4YTBhMy4uZTc4YmQwNGNkOTIxMzRm OTRlODVkOTdiMTU1MzMxNGEzMWM4MDEyYiAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9DaGFuZ2VMb2cK KysrIGIvV2ViS2l0Mi9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0NyBAQAorMjAxMC0wOS0yOSAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcGxlbWVudCBtb3JlIFBsdWdpblByb3h5IG1l bWJlciBmdW5jdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTQ2ODE1CisKKyAgICAgICAgKiBQbGF0Zm9ybS9Db3JlSVBDL0hhbmRsZU1lc3NhZ2Uu aDoKKyAgICAgICAgKENvcmVJUEM6OmhhbmRsZU1lc3NhZ2UpOgorICAgICAgICAqIFBsdWdpblBy b2Nlc3MvUGx1Z2luQ29udHJvbGxlclByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2lu Q29udHJvbGxlclByb3h5OjpoYW5kbGVNb3VzZUV2ZW50KToKKyAgICAgICAgKFdlYktpdDo6UGx1 Z2luQ29udHJvbGxlclByb3h5OjpoYW5kbGVXaGVlbEV2ZW50KToKKyAgICAgICAgKFdlYktpdDo6 UGx1Z2luQ29udHJvbGxlclByb3h5OjpoYW5kbGVNb3VzZUVudGVyRXZlbnQpOgorICAgICAgICAo V2ViS2l0OjpQbHVnaW5Db250cm9sbGVyUHJveHk6OmhhbmRsZU1vdXNlTGVhdmVFdmVudCk6Cisg ICAgICAgIChXZWJLaXQ6OlBsdWdpbkNvbnRyb2xsZXJQcm94eTo6c2V0Rm9jdXMpOgorICAgICAg ICAoV2ViS2l0OjpQbHVnaW5Db250cm9sbGVyUHJveHk6OndpbmRvd0ZvY3VzQ2hhbmdlZCk6Cisg ICAgICAgIChXZWJLaXQ6OlBsdWdpbkNvbnRyb2xsZXJQcm94eTo6d2luZG93RnJhbWVDaGFuZ2Vk KToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luQ29udHJvbGxlclByb3h5Ojp3aW5kb3dWaXNpYmls aXR5Q2hhbmdlZCk6CisgICAgICAgIENhbGwgdGhlIGFwcHJvcHJpYXRlIFBsdWdpbiBtZW1iZXIg ZnVuY3Rpb25zLgorCisgICAgICAgICogUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJv eHkubWVzc2FnZXMuaW46CisgICAgICAgIEFkZCBuZXcgbWVzc2FnZXMuCisKKyAgICAgICAgKiBQ bHVnaW5Qcm9jZXNzL1dlYlByb2Nlc3NDb25uZWN0aW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUHJvY2Vzc0Nvbm5lY3Rpb246OmRpZFJlY2VpdmVNZXNzYWdlKToKKyAgICAgICAgSXQncyBP SyB0byBnZXQgYSBtZXNzYWdlIGZvciBhIHBsdWctaW4gY29udHJvbGxlciBwcm94eSB0aGF0IGhh cyBnb25lIGF3YXkuCisKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc0Nvbm5lY3Rpb246OmRp ZFJlY2VpdmVTeW5jTWVzc2FnZSk6CisgICAgICAgIEZvcndhcmQgdGhlIG1lc3NhZ2UgdG8gdGhl IFBsdWdpbkNvbnRyb2xsZXJQcm94eSBoYW5kbGVyLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9Q bHVnaW5zL1BsdWdpblByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJveHk6Omhh bmRsZU1vdXNlRXZlbnQpOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm94eTo6aGFuZGxlV2hl ZWxFdmVudCk6CisgICAgICAgIChXZWJLaXQ6OlBsdWdpblByb3h5OjpoYW5kbGVNb3VzZUVudGVy RXZlbnQpOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm94eTo6aGFuZGxlTW91c2VMZWF2ZUV2 ZW50KToKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luUHJveHk6OnNldEZvY3VzKToKKyAgICAgICAg KFdlYktpdDo6UGx1Z2luUHJveHk6OndpbmRvd0ZvY3VzQ2hhbmdlZCk6CisgICAgICAgIChXZWJL aXQ6OlBsdWdpblByb3h5Ojp3aW5kb3dGcmFtZUNoYW5nZWQpOgorICAgICAgICAoV2ViS2l0OjpQ bHVnaW5Qcm94eTo6d2luZG93VmlzaWJpbGl0eUNoYW5nZWQpOgorICAgICAgICBTZW5kIG1lc3Nh Z2VzIHRvIHRoZSBwbHVnLWluIHByb2Nlc3MuCisgICAgICAgIAorICAgICAgICAoV2ViS2l0OjpQ bHVnaW5Qcm94eTo6Y29udHJvbGxlcik6CisgICAgICAgIFJldHVybiB0aGUgcGx1Zy1pbiBjb250 cm9sbGVyLgorCiAyMDEwLTA5LTI4ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5j b20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgU2FtIFdlaW5pZy4KZGlmZiAtLWdpdCBhL1dlYktp dDIvUGxhdGZvcm0vQ29yZUlQQy9IYW5kbGVNZXNzYWdlLmggYi9XZWJLaXQyL1BsYXRmb3JtL0Nv cmVJUEMvSGFuZGxlTWVzc2FnZS5oCmluZGV4IDgyMDlkYmQyNjMxMDgxYWRiNTg2YWFhMDg4ZWZk MDI1MTRlZTE5Y2EuLjcwZTZjNTdkODBmZTRmZWVkZjQ3YzZlNzIzMzg5YzQ0ODk3YjRmMTMgMTAw NjQ0Ci0tLSBhL1dlYktpdDIvUGxhdGZvcm0vQ29yZUlQQy9IYW5kbGVNZXNzYWdlLmgKKysrIGIv V2ViS2l0Mi9QbGF0Zm9ybS9Db3JlSVBDL0hhbmRsZU1lc3NhZ2UuaApAQCAtNTgsNiArNTgsMTgg QEAgdm9pZCBoYW5kbGVNZXNzYWdlKEFyZ3VtZW50RGVjb2RlciogYXJndW1lbnRzLCBBcmd1bWVu dEVuY29kZXIqIHJlcGx5LCBDKiBvYmplY3QKICAgICAob2JqZWN0LT4qZnVuY3Rpb24pKGZpcnN0 QXJndW1lbnQpOwogfQogCit0ZW1wbGF0ZTx0eXBlbmFtZSBULCB0eXBlbmFtZSBDLCB0eXBlbmFt ZSBQMSwgdHlwZW5hbWUgUjE+Cit2b2lkIGhhbmRsZU1lc3NhZ2UoQXJndW1lbnREZWNvZGVyKiBh cmd1bWVudHMsIEFyZ3VtZW50RW5jb2RlciogcmVwbHksIEMqIG9iamVjdCwgdm9pZCAoQzo6KmZ1 bmN0aW9uKShQMSwgUjEmKSkKK3sKKyAgICB0eXBlbmFtZSBSZW1vdmVSZWZlcmVuY2U8dHlwZW5h bWUgVDo6Rmlyc3RBcmd1bWVudFR5cGU+OjpUeXBlIGZpcnN0QXJndW1lbnQ7CisgICAgaWYgKCFh cmd1bWVudHMtPmRlY29kZShmaXJzdEFyZ3VtZW50KSkKKyAgICAgICAgcmV0dXJuOworCisgICAg dHlwZW5hbWUgUmVtb3ZlUmVmZXJlbmNlPHR5cGVuYW1lIFQ6OlJlcGx5OjpGaXJzdEFyZ3VtZW50 VHlwZT46OlR5cGUgZmlyc3RSZXBseUFyZ3VtZW50OworICAgIChvYmplY3QtPipmdW5jdGlvbiko Zmlyc3RBcmd1bWVudCwgZmlyc3RSZXBseUFyZ3VtZW50KTsKKyAgICByZXBseS0+ZW5jb2RlKGZp cnN0UmVwbHlBcmd1bWVudCk7Cit9CisKIHRlbXBsYXRlPHR5cGVuYW1lIFQsIHR5cGVuYW1lIEMs IHR5cGVuYW1lIFAxLCB0eXBlbmFtZSBQMiwgdHlwZW5hbWUgUjE+CiB2b2lkIGhhbmRsZU1lc3Nh Z2UoQXJndW1lbnREZWNvZGVyKiBhcmd1bWVudHMsIEFyZ3VtZW50RW5jb2RlciogcmVwbHksIEMq IG9iamVjdCwgdm9pZCAoQzo6KmZ1bmN0aW9uKShQMSwgUDIsIFIxJikpCiB7CmRpZmYgLS1naXQg YS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclByb3h5LmNwcCBiL1dlYktp dDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkuY3BwCmluZGV4IGYxYTEyN2M2 YTk0MTNhM2U3ODgwMWRlY2UyZTkyY2NjNTRlZTU2MTkuLjU2MmQwOWMyOTVjMjk5OWVkZWM4YTY4 NjFhMWIwY2Q3ZWJhNWRjNWUgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVn aW5Db250cm9sbGVyUHJveHkuY3BwCisrKyBiL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5D b250cm9sbGVyUHJveHkuY3BwCkBAIC0xOTQsNiArMTk0LDQ4IEBAIHZvaWQgUGx1Z2luQ29udHJv bGxlclByb3h5OjpnZW9tZXRyeURpZENoYW5nZShjb25zdCBJbnRSZWN0JiBmcmFtZVJlY3QsIGNv bnN0IEluCiAgICAgbV9wbHVnaW4tPmdlb21ldHJ5RGlkQ2hhbmdlKGZyYW1lUmVjdCwgY2xpcFJl Y3QpOwogfQogCit2b2lkIFBsdWdpbkNvbnRyb2xsZXJQcm94eTo6aGFuZGxlTW91c2VFdmVudChj b25zdCBXZWJNb3VzZUV2ZW50JiBtb3VzZUV2ZW50LCBib29sJiBoYW5kbGVkKQoreworICAgIGhh bmRsZWQgPSBtX3BsdWdpbi0+aGFuZGxlTW91c2VFdmVudChtb3VzZUV2ZW50KTsKK30KKwordm9p ZCBQbHVnaW5Db250cm9sbGVyUHJveHk6OmhhbmRsZVdoZWVsRXZlbnQoY29uc3QgV2ViV2hlZWxF dmVudCYgd2hlZWxFdmVudCwgYm9vbCYgaGFuZGxlZCkKK3sKKyAgICBoYW5kbGVkID0gbV9wbHVn aW4tPmhhbmRsZVdoZWVsRXZlbnQod2hlZWxFdmVudCk7Cit9CisKK3ZvaWQgUGx1Z2luQ29udHJv bGxlclByb3h5OjpoYW5kbGVNb3VzZUVudGVyRXZlbnQoY29uc3QgV2ViTW91c2VFdmVudCYgbW91 c2VFbnRlckV2ZW50LCBib29sJiBoYW5kbGVkKQoreworICAgIGhhbmRsZWQgPSBtX3BsdWdpbi0+ aGFuZGxlTW91c2VFbnRlckV2ZW50KG1vdXNlRW50ZXJFdmVudCk7Cit9CisKK3ZvaWQgUGx1Z2lu Q29udHJvbGxlclByb3h5OjpoYW5kbGVNb3VzZUxlYXZlRXZlbnQoY29uc3QgV2ViTW91c2VFdmVu dCYgbW91c2VMZWF2ZUV2ZW50LCBib29sJiBoYW5kbGVkKQoreworICAgIGhhbmRsZWQgPSBtX3Bs dWdpbi0+aGFuZGxlTW91c2VMZWF2ZUV2ZW50KG1vdXNlTGVhdmVFdmVudCk7Cit9CisgICAgCit2 b2lkIFBsdWdpbkNvbnRyb2xsZXJQcm94eTo6c2V0Rm9jdXMoYm9vbCBoYXNGb2N1cykKK3sKKyAg ICBtX3BsdWdpbi0+c2V0Rm9jdXMoaGFzRm9jdXMpOworfQorCisjaWYgUExBVEZPUk0oTUFDKQor dm9pZCBQbHVnaW5Db250cm9sbGVyUHJveHk6OndpbmRvd0ZvY3VzQ2hhbmdlZChib29sIGhhc0Zv Y3VzKQoreworICAgIG1fcGx1Z2luLT53aW5kb3dGb2N1c0NoYW5nZWQoaGFzRm9jdXMpOworfQor Cit2b2lkIFBsdWdpbkNvbnRyb2xsZXJQcm94eTo6d2luZG93RnJhbWVDaGFuZ2VkKGNvbnN0IElu dFJlY3QmIHdpbmRvd0ZyYW1lKQoreworICAgIG1fcGx1Z2luLT53aW5kb3dGcmFtZUNoYW5nZWQo d2luZG93RnJhbWUpOworfQorCit2b2lkIFBsdWdpbkNvbnRyb2xsZXJQcm94eTo6d2luZG93Vmlz aWJpbGl0eUNoYW5nZWQoYm9vbCBpc1Zpc2libGUpCit7CisgICAgbV9wbHVnaW4tPndpbmRvd1Zp c2liaWxpdHlDaGFuZ2VkKGlzVmlzaWJsZSk7Cit9CisjZW5kaWYKKwogfSAvLyBuYW1lc3BhY2Ug V2ViS2l0CiAKICNlbmRpZiAvLyBFTkFCTEUoUExVR0lOX1BST0NFU1MpCmRpZmYgLS1naXQgYS9X ZWJLaXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclByb3h5LmggYi9XZWJLaXQyL1Bs dWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclByb3h5LmgKaW5kZXggNzk0NjM4MDIyZmZkOTI3 YmY3MjIyZTFmNDI2ZWFmYmRiNTc1ZmUwOC4uNGMxYzhmMWNmMmRkZGJiYjNmMzg3NjQ2ZDAyZTBm ZmNlYjFiZDM1MSAxMDA2NDQKLS0tIGEvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1BsdWdpbkNvbnRy b2xsZXJQcm94eS5oCisrKyBiL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVy UHJveHkuaApAQCAtNTMsNiArNTMsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBkZXN0cm95KCk7CiAK ICAgICB2b2lkIGRpZFJlY2VpdmVQbHVnaW5Db250cm9sbGVyUHJveHlNZXNzYWdlKENvcmVJUEM6 OkNvbm5lY3Rpb24qLCBDb3JlSVBDOjpNZXNzYWdlSUQsIENvcmVJUEM6OkFyZ3VtZW50RGVjb2Rl ciopOworICAgIENvcmVJUEM6OlN5bmNSZXBseU1vZGUgZGlkUmVjZWl2ZVN5bmNQbHVnaW5Db250 cm9sbGVyUHJveHlNZXNzYWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qLCBDb3JlSVBDOjpNZXNzYWdl SUQsIENvcmVJUEM6OkFyZ3VtZW50RGVjb2RlciosIENvcmVJUEM6OkFyZ3VtZW50RW5jb2Rlciop OwogCiBwcml2YXRlOgogICAgIFBsdWdpbkNvbnRyb2xsZXJQcm94eShXZWJQcm9jZXNzQ29ubmVj dGlvbiogY29ubmVjdGlvbiwgdWludDY0X3QgcGx1Z2luSW5zdGFuY2VJRCk7CkBAIC03NCw2ICs3 NSwxNiBAQCBwcml2YXRlOgogCiAgICAgLy8gTWVzc2FnZSBoYW5kbGVycy4KICAgICB2b2lkIGdl b21ldHJ5RGlkQ2hhbmdlKGNvbnN0IFdlYkNvcmU6OkludFJlY3QmIGZyYW1lUmVjdCwgY29uc3Qg V2ViQ29yZTo6SW50UmVjdCYgY2xpcFJlY3QsIGNvbnN0IFNoYXJlZE1lbW9yeTo6SGFuZGxlJiBi YWNraW5nU3RvcmVIYW5kbGUpOworICAgIHZvaWQgaGFuZGxlTW91c2VFdmVudChjb25zdCBXZWJN b3VzZUV2ZW50JiwgYm9vbCYgaGFuZGxlZCk7CisgICAgdm9pZCBoYW5kbGVXaGVlbEV2ZW50KGNv bnN0IFdlYldoZWVsRXZlbnQmLCBib29sJiBoYW5kbGVkKTsKKyAgICB2b2lkIGhhbmRsZU1vdXNl RW50ZXJFdmVudChjb25zdCBXZWJNb3VzZUV2ZW50JiwgYm9vbCYgaGFuZGxlZCk7CisgICAgdm9p ZCBoYW5kbGVNb3VzZUxlYXZlRXZlbnQoY29uc3QgV2ViTW91c2VFdmVudCYsIGJvb2wmIGhhbmRs ZWQpOworICAgIHZvaWQgc2V0Rm9jdXMoYm9vbCk7CisjaWYgUExBVEZPUk0oTUFDKQorICAgIHZv aWQgd2luZG93Rm9jdXNDaGFuZ2VkKGJvb2wpOworICAgIHZvaWQgd2luZG93RnJhbWVDaGFuZ2Vk KGNvbnN0IFdlYkNvcmU6OkludFJlY3QmKTsKKyAgICB2b2lkIHdpbmRvd1Zpc2liaWxpdHlDaGFu Z2VkKGJvb2wpOworI2VuZGlmCiAKICAgICBXZWJQcm9jZXNzQ29ubmVjdGlvbiogbV9jb25uZWN0 aW9uOwogICAgIHVpbnQ2NF90IG1fcGx1Z2luSW5zdGFuY2VJRDsKZGlmZiAtLWdpdCBhL1dlYktp dDIvUGx1Z2luUHJvY2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkubWVzc2FnZXMuaW4gYi9XZWJL aXQyL1BsdWdpblByb2Nlc3MvUGx1Z2luQ29udHJvbGxlclByb3h5Lm1lc3NhZ2VzLmluCmluZGV4 IDlmMTFmYjk5MjI2NGI3MDdmYjFlMjE0ZDFhMzAzNjU1NTA2N2ZlMDcuLjMwMzMzZWJiZTBjM2Fi NGJhMjYzOTUyYWI1N2ZkZmM5OWVmNTU2ZjkgMTAwNjQ0Ci0tLSBhL1dlYktpdDIvUGx1Z2luUHJv Y2Vzcy9QbHVnaW5Db250cm9sbGVyUHJveHkubWVzc2FnZXMuaW4KKysrIGIvV2ViS2l0Mi9QbHVn aW5Qcm9jZXNzL1BsdWdpbkNvbnRyb2xsZXJQcm94eS5tZXNzYWdlcy5pbgpAQCAtMjMsOCArMjMs MzQgQEAKICNpZiBFTkFCTEUoUExVR0lOX1BST0NFU1MpCiAKIG1lc3NhZ2VzIC0+IFBsdWdpbkNv bnRyb2xsZXJQcm94eSB7Ci0gICAgIyBDYWxsZWQgd2hlbiB0aGUgcGx1Zy1pbiBnZW9tZXRyeSBj aGFuZ2VzLgorICAgICMgU2VudCB3aGVuIHRoZSBwbHVnLWluIGdlb21ldHJ5IGNoYW5nZXMuCiAg ICAgR2VvbWV0cnlEaWRDaGFuZ2UoV2ViQ29yZTo6SW50UmVjdCBmcmFtZVJlY3QsIFdlYkNvcmU6 OkludFJlY3QgY2xpcFJlY3QsIFdlYktpdDo6U2hhcmVkTWVtb3J5OjpIYW5kbGUgYmFja2luZ1N0 b3JlSGFuZGxlKQorCisgICAgIyBTZW50IHdoZW4gYSBtb3VzZSBldmVudCAodGhhdCBpc24ndCBh IG1vdXNlIGVudGVyL2xlYXZlIGV2ZW50IG9yIGEgd2hlZWwgZXZlbnQpIHNob3VsZCBiZSBwcm9j ZXNzZWQuCisgICAgSGFuZGxlTW91c2VFdmVudChXZWJLaXQ6OldlYk1vdXNlRXZlbnQgbW91c2VF dmVudCkgLT4gKGJvb2wgaGFuZGxlZCkKKyAgICAKKyAgICAjIFNlbnQgd2hlbiBhIG1vdXNlIHdo ZWVsIGV2ZW50IHNob3VsZCBiZSBwcm9jZXNzZWQuCisgICAgSGFuZGxlV2hlZWxFdmVudChXZWJL aXQ6OldlYldoZWVsRXZlbnQgd2hlZWxFdmVudCkgLT4gKGJvb2wgaGFuZGxlZCkKKworICAgICMg U2VudCB3aGVuIGEgbW91c2UgZW50ZXIgZXZlbnQgc2hvdWxkIGJlIHByb2Nlc3NlZC4KKyAgICBI YW5kbGVNb3VzZUVudGVyRXZlbnQoV2ViS2l0OjpXZWJNb3VzZUV2ZW50IG1vdXNlRXZlbnQpIC0+ IChib29sIGhhbmRsZWQpCisgICAgCisgICAgIyBTZW50IHdoZW4gYSBtb3VzZSBsZWF2ZSBldmVu dCBzaG91bGQgYmUgcHJvY2Vzc2VkLgorICAgIEhhbmRsZU1vdXNlTGVhdmVFdmVudChXZWJLaXQ6 OldlYk1vdXNlRXZlbnQgbW91c2VFdmVudCkgLT4gKGJvb2wgaGFuZGxlZCkKKworICAgICMgU2Vu dCB3aGVuIHRoZSBwbHVnLWluIGZvY3VzIGNoYW5nZXMuCisgICAgU2V0Rm9jdXMoYm9vbCBpc0Zv Y3VzZWQpCisKKyNpZiBQTEFURk9STShNQUMpCisgICAgIyBTZW50IHdoZW4gdGhlIGNvbnRhaW5p bmcgTlNXaW5kb3cncyBmb2N1cyBjaGFuZ2VzCisgICAgV2luZG93Rm9jdXNDaGFuZ2VkKGJvb2wg aGFzRm9jdXMpCisKKyAgICAjIFNlbnQgd2hlbiB0aGUgY29udGFpbmluZyBOU1dpbmRvdydzIGZy YW1lIGNoYW5nZXMKKyAgICBXaW5kb3dGcmFtZUNoYW5nZWQoV2ViQ29yZTo6SW50UmVjdCB3aW5k b3dGcmFtZSkKKworICAgICMgU2VudCB3aGVuIHRoZSBjb250YWluaW5nIE5TV2luZG93J3Mgdmlz aWJpbGl0eSBjaGFuZ2VzCisgICAgV2luZG93VmlzaWJpbGl0eUNoYW5nZWQoYm9vbCBpc1Zpc2li bGUpCisjZW5kaWYKIH0KIAogI2VuZGlmCmRpZmYgLS1naXQgYS9XZWJLaXQyL1BsdWdpblByb2Nl c3MvV2ViUHJvY2Vzc0Nvbm5lY3Rpb24uY3BwIGIvV2ViS2l0Mi9QbHVnaW5Qcm9jZXNzL1dlYlBy b2Nlc3NDb25uZWN0aW9uLmNwcAppbmRleCBmYmJkYjQ1Y2E1NTJjYzZhZTYzZDc1MjcxYmEzNGZm NjM0NWEzNWVlLi5jOGQyYjU5NTg1YzA5NmQ2YjgzNGFlNWIxYjk4ZjJmOTkyMjFkMmY2IDEwMDY0 NAotLS0gYS9XZWJLaXQyL1BsdWdpblByb2Nlc3MvV2ViUHJvY2Vzc0Nvbm5lY3Rpb24uY3BwCisr KyBiL1dlYktpdDIvUGx1Z2luUHJvY2Vzcy9XZWJQcm9jZXNzQ29ubmVjdGlvbi5jcHAKQEAgLTg3 LDEzICs4NywyNCBAQCB2b2lkIFdlYlByb2Nlc3NDb25uZWN0aW9uOjpyZW1vdmVQbHVnaW5Db250 cm9sbGVyUHJveHkoUGx1Z2luQ29udHJvbGxlclByb3h5KiBwbAogCiB2b2lkIFdlYlByb2Nlc3ND b25uZWN0aW9uOjpkaWRSZWNlaXZlTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0 aW9uLCBDb3JlSVBDOjpNZXNzYWdlSUQgbWVzc2FnZUlELCBDb3JlSVBDOjpBcmd1bWVudERlY29k ZXIqIGFyZ3VtZW50cykKIHsKLSAgICBQbHVnaW5Db250cm9sbGVyUHJveHkqIHBsdWdpbkNvbnRy b2xsZXJQcm94eSA9IG1fcGx1Z2luQ29udHJvbGxlcnMuZ2V0KGFyZ3VtZW50cy0+ZGVzdGluYXRp b25JRCgpKTsKLSAgICBwbHVnaW5Db250cm9sbGVyUHJveHktPmRpZFJlY2VpdmVQbHVnaW5Db250 cm9sbGVyUHJveHlNZXNzYWdlKGNvbm5lY3Rpb24sIG1lc3NhZ2VJRCwgYXJndW1lbnRzKTsKKyAg ICBpZiAoIWFyZ3VtZW50cy0+ZGVzdGluYXRpb25JRCgpKSB7CisgICAgICAgIEFTU0VSVF9OT1Rf UkVBQ0hFRCgpOworICAgICAgICByZXR1cm47CisgICAgfQorICAgIAorICAgIGlmIChQbHVnaW5D b250cm9sbGVyUHJveHkqIHBsdWdpbkNvbnRyb2xsZXJQcm94eSA9IG1fcGx1Z2luQ29udHJvbGxl cnMuZ2V0KGFyZ3VtZW50cy0+ZGVzdGluYXRpb25JRCgpKSkKKyAgICAgICAgcGx1Z2luQ29udHJv bGxlclByb3h5LT5kaWRSZWNlaXZlUGx1Z2luQ29udHJvbGxlclByb3h5TWVzc2FnZShjb25uZWN0 aW9uLCBtZXNzYWdlSUQsIGFyZ3VtZW50cyk7CiB9CiAKIENvcmVJUEM6OlN5bmNSZXBseU1vZGUg V2ViUHJvY2Vzc0Nvbm5lY3Rpb246OmRpZFJlY2VpdmVTeW5jTWVzc2FnZShDb3JlSVBDOjpDb25u ZWN0aW9uKiBjb25uZWN0aW9uLCBDb3JlSVBDOjpNZXNzYWdlSUQgbWVzc2FnZUlELCBDb3JlSVBD OjpBcmd1bWVudERlY29kZXIqIGFyZ3VtZW50cywgQ29yZUlQQzo6QXJndW1lbnRFbmNvZGVyKiBy ZXBseSkKIHsKLSAgICByZXR1cm4gZGlkUmVjZWl2ZVN5bmNXZWJQcm9jZXNzQ29ubmVjdGlvbk1l c3NhZ2UoY29ubmVjdGlvbiwgbWVzc2FnZUlELCBhcmd1bWVudHMsIHJlcGx5KTsKKyAgICBpZiAo IWFyZ3VtZW50cy0+ZGVzdGluYXRpb25JRCgpKQorICAgICAgICByZXR1cm4gZGlkUmVjZWl2ZVN5 bmNXZWJQcm9jZXNzQ29ubmVjdGlvbk1lc3NhZ2UoY29ubmVjdGlvbiwgbWVzc2FnZUlELCBhcmd1 bWVudHMsIHJlcGx5KTsKKyAgICAKKyAgICBpZiAoUGx1Z2luQ29udHJvbGxlclByb3h5KiBwbHVn aW5Db250cm9sbGVyUHJveHkgPSBtX3BsdWdpbkNvbnRyb2xsZXJzLmdldChhcmd1bWVudHMtPmRl c3RpbmF0aW9uSUQoKSkpCisgICAgICAgIHJldHVybiBwbHVnaW5Db250cm9sbGVyUHJveHktPmRp ZFJlY2VpdmVTeW5jUGx1Z2luQ29udHJvbGxlclByb3h5TWVzc2FnZShjb25uZWN0aW9uLCBtZXNz YWdlSUQsIGFyZ3VtZW50cywgcmVwbHkpOworCisgICAgcmV0dXJuIENvcmVJUEM6OkF1dG9tYXRp Y1JlcGx5OwogfQogCiB2b2lkIFdlYlByb2Nlc3NDb25uZWN0aW9uOjpkaWRDbG9zZShDb3JlSVBD OjpDb25uZWN0aW9uKikKZGlmZiAtLWdpdCBhL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1Bs dWdpblByb3h5LmNwcCBiL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb3h5LmNw cAppbmRleCAwZTllOGEyOWI3ZGNhYTI3NmViMjM0OWViYjJjYTg2MjNkNjE5NzBkLi44MmU1ZTdj MjQ3MGI4YWM2ODc4NDkxMTI0MTIzZTI4MDc1MjI0YTlkIDEwMDY0NAotLS0gYS9XZWJLaXQyL1dl YlByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm94eS5jcHAKKysrIGIvV2ViS2l0Mi9XZWJQcm9jZXNz L1BsdWdpbnMvUGx1Z2luUHJveHkuY3BwCkBAIC0zMyw2ICszMyw3IEBACiAjaW5jbHVkZSAiUGx1 Z2luQ29udHJvbGxlclByb3h5TWVzc2FnZXMuaCIKICNpbmNsdWRlICJQbHVnaW5Qcm9jZXNzQ29u bmVjdGlvbi5oIgogI2luY2x1ZGUgIldlYkNvcmVBcmd1bWVudENvZGVycy5oIgorI2luY2x1ZGUg IldlYkV2ZW50LmgiCiAjaW5jbHVkZSAiV2ViUHJvY2Vzc0Nvbm5lY3Rpb25NZXNzYWdlcy5oIgog I2luY2x1ZGUgPFdlYkNvcmUvR3JhcGhpY3NDb250ZXh0Lmg+CiAKQEAgLTIyMSwzMyArMjIyLDUz IEBAIHZvaWQgUGx1Z2luUHJveHk6Om1hbnVhbFN0cmVhbURpZEZhaWwoYm9vbCB3YXNDYW5jZWxs ZWQpCiAgICAgbm90SW1wbGVtZW50ZWQoKTsKIH0KIAotYm9vbCBQbHVnaW5Qcm94eTo6aGFuZGxl TW91c2VFdmVudChjb25zdCBXZWJNb3VzZUV2ZW50JikKK2Jvb2wgUGx1Z2luUHJveHk6OmhhbmRs ZU1vdXNlRXZlbnQoY29uc3QgV2ViTW91c2VFdmVudCYgbW91c2VFdmVudCkKIHsKLSAgICBub3RJ bXBsZW1lbnRlZCgpOwotICAgIHJldHVybiBmYWxzZTsKKyAgICBib29sIGhhbmRsZWQgPSBmYWxz ZTsKKyAgICBpZiAoIW1fY29ubmVjdGlvbi0+Y29ubmVjdGlvbigpLT5zZW5kU3luYyhNZXNzYWdl czo6UGx1Z2luQ29udHJvbGxlclByb3h5OjpIYW5kbGVNb3VzZUV2ZW50KG1vdXNlRXZlbnQpLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIE1lc3NhZ2VzOjpQ bHVnaW5Db250cm9sbGVyUHJveHk6OkhhbmRsZU1vdXNlRXZlbnQ6OlJlcGx5KGhhbmRsZWQpLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIG1fcGx1Z2luSW5z dGFuY2VJRCwgQ29yZUlQQzo6Q29ubmVjdGlvbjo6Tm9UaW1lb3V0KSkKKyAgICAgICAgcmV0dXJu IGZhbHNlOworCisgICAgcmV0dXJuIGhhbmRsZWQ7CiB9CiAKLWJvb2wgUGx1Z2luUHJveHk6Omhh bmRsZVdoZWVsRXZlbnQoY29uc3QgV2ViV2hlZWxFdmVudCYpCitib29sIFBsdWdpblByb3h5Ojpo YW5kbGVXaGVlbEV2ZW50KGNvbnN0IFdlYldoZWVsRXZlbnQmIHdoZWVsRXZlbnQpCiB7Ci0gICAg bm90SW1wbGVtZW50ZWQoKTsKLSAgICByZXR1cm4gZmFsc2U7CisgICAgYm9vbCBoYW5kbGVkID0g ZmFsc2U7CisgICAgaWYgKCFtX2Nvbm5lY3Rpb24tPmNvbm5lY3Rpb24oKS0+c2VuZFN5bmMoTWVz c2FnZXM6OlBsdWdpbkNvbnRyb2xsZXJQcm94eTo6SGFuZGxlV2hlZWxFdmVudCh3aGVlbEV2ZW50 KSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBNZXNzYWdl czo6UGx1Z2luQ29udHJvbGxlclByb3h5OjpIYW5kbGVXaGVlbEV2ZW50OjpSZXBseShoYW5kbGVk KSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtX3BsdWdp bkluc3RhbmNlSUQsIENvcmVJUEM6OkNvbm5lY3Rpb246Ok5vVGltZW91dCkpCisgICAgICAgIHJl dHVybiBmYWxzZTsKKworICAgIHJldHVybiBoYW5kbGVkOwogfQogCi1ib29sIFBsdWdpblByb3h5 OjpoYW5kbGVNb3VzZUVudGVyRXZlbnQoY29uc3QgV2ViTW91c2VFdmVudCYpCitib29sIFBsdWdp blByb3h5OjpoYW5kbGVNb3VzZUVudGVyRXZlbnQoY29uc3QgV2ViTW91c2VFdmVudCYgbW91c2VF bnRlckV2ZW50KQogewotICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAgcmV0dXJuIGZhbHNlOwor ICAgIGJvb2wgaGFuZGxlZCA9IGZhbHNlOworICAgIGlmICghbV9jb25uZWN0aW9uLT5jb25uZWN0 aW9uKCktPnNlbmRTeW5jKE1lc3NhZ2VzOjpQbHVnaW5Db250cm9sbGVyUHJveHk6OkhhbmRsZU1v dXNlRW50ZXJFdmVudChtb3VzZUVudGVyRXZlbnQpLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIE1lc3NhZ2VzOjpQbHVnaW5Db250cm9sbGVyUHJveHk6Okhh bmRsZU1vdXNlRW50ZXJFdmVudDo6UmVwbHkoaGFuZGxlZCksCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgbV9wbHVnaW5JbnN0YW5jZUlELCBDb3JlSVBDOjpD b25uZWN0aW9uOjpOb1RpbWVvdXQpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgCisgICAg cmV0dXJuIGhhbmRsZWQ7CiB9CiAKLWJvb2wgUGx1Z2luUHJveHk6OmhhbmRsZU1vdXNlTGVhdmVF dmVudChjb25zdCBXZWJNb3VzZUV2ZW50JikKK2Jvb2wgUGx1Z2luUHJveHk6OmhhbmRsZU1vdXNl TGVhdmVFdmVudChjb25zdCBXZWJNb3VzZUV2ZW50JiBtb3VzZUxlYXZlRXZlbnQpCiB7Ci0gICAg bm90SW1wbGVtZW50ZWQoKTsKLSAgICByZXR1cm4gZmFsc2U7CisgICAgYm9vbCBoYW5kbGVkID0g ZmFsc2U7CisgICAgaWYgKCFtX2Nvbm5lY3Rpb24tPmNvbm5lY3Rpb24oKS0+c2VuZFN5bmMoTWVz c2FnZXM6OlBsdWdpbkNvbnRyb2xsZXJQcm94eTo6SGFuZGxlTW91c2VMZWF2ZUV2ZW50KG1vdXNl TGVhdmVFdmVudCksCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgTWVzc2FnZXM6OlBsdWdpbkNvbnRyb2xsZXJQcm94eTo6SGFuZGxlTW91c2VMZWF2ZUV2ZW50 OjpSZXBseShoYW5kbGVkKSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBtX3BsdWdpbkluc3RhbmNlSUQsIENvcmVJUEM6OkNvbm5lY3Rpb246Ok5vVGltZW91 dCkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICAKKyAgICByZXR1cm4gaGFuZGxlZDsKIH0K IAotdm9pZCBQbHVnaW5Qcm94eTo6c2V0Rm9jdXMoYm9vbCkKK3ZvaWQgUGx1Z2luUHJveHk6OnNl dEZvY3VzKGJvb2wgaGFzRm9jdXMpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBtX2Nv bm5lY3Rpb24tPmNvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6UGx1Z2luQ29udHJvbGxlclBy b3h5OjpTZXRGb2N1cyhoYXNGb2N1cyksIG1fcGx1Z2luSW5zdGFuY2VJRCk7CiB9CiAKIE5QT2Jq ZWN0KiBQbHVnaW5Qcm94eTo6cGx1Z2luU2NyaXB0YWJsZU5QT2JqZWN0KCkKQEAgLTI1NywyNyAr Mjc4LDI2IEBAIE5QT2JqZWN0KiBQbHVnaW5Qcm94eTo6cGx1Z2luU2NyaXB0YWJsZU5QT2JqZWN0 KCkKIH0KIAogI2lmIFBMQVRGT1JNKE1BQykKLXZvaWQgUGx1Z2luUHJveHk6OndpbmRvd0ZvY3Vz Q2hhbmdlZChib29sKQordm9pZCBQbHVnaW5Qcm94eTo6d2luZG93Rm9jdXNDaGFuZ2VkKGJvb2wg aGFzRm9jdXMpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQoKTsKKyAgICBtX2Nvbm5lY3Rpb24tPmNv bm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6UGx1Z2luQ29udHJvbGxlclByb3h5OjpXaW5kb3dG b2N1c0NoYW5nZWQoaGFzRm9jdXMpLCBtX3BsdWdpbkluc3RhbmNlSUQpOwogfQogCi12b2lkIFBs dWdpblByb3h5Ojp3aW5kb3dGcmFtZUNoYW5nZWQoY29uc3QgSW50UmVjdCYpCit2b2lkIFBsdWdp blByb3h5Ojp3aW5kb3dGcmFtZUNoYW5nZWQoY29uc3QgSW50UmVjdCYgd2luZG93RnJhbWUpCiB7 CisgICAgbV9jb25uZWN0aW9uLT5jb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6OlBsdWdpbkNv bnRyb2xsZXJQcm94eTo6V2luZG93RnJhbWVDaGFuZ2VkKHdpbmRvd0ZyYW1lKSwgbV9wbHVnaW5J bnN0YW5jZUlEKTsKICAgICBub3RJbXBsZW1lbnRlZCgpOwogfQogCi12b2lkIFBsdWdpblByb3h5 Ojp3aW5kb3dWaXNpYmlsaXR5Q2hhbmdlZChib29sKQordm9pZCBQbHVnaW5Qcm94eTo6d2luZG93 VmlzaWJpbGl0eUNoYW5nZWQoYm9vbCBpc1Zpc2libGUpCiB7Ci0gICAgbm90SW1wbGVtZW50ZWQo KTsKKyAgICBtX2Nvbm5lY3Rpb24tPmNvbm5lY3Rpb24oKS0+c2VuZChNZXNzYWdlczo6UGx1Z2lu Q29udHJvbGxlclByb3h5OjpXaW5kb3dWaXNpYmlsaXR5Q2hhbmdlZChpc1Zpc2libGUpLCBtX3Bs dWdpbkluc3RhbmNlSUQpOwogfQotCiAjZW5kaWYKIAogUGx1Z2luQ29udHJvbGxlciogUGx1Z2lu UHJveHk6OmNvbnRyb2xsZXIoKQogewotICAgIG5vdEltcGxlbWVudGVkKCk7Ci0gICAgcmV0dXJu IDA7CisgICAgcmV0dXJuIG1fcGx1Z2luQ29udHJvbGxlcjsKIH0KIAogdm9pZCBQbHVnaW5Qcm94 eTo6dXBkYXRlKGNvbnN0IEludFJlY3QmIHBhaW50ZWRSZWN0KQo=