90781 2012-07-09 05:36:40 -0700 [WK2] Add missing Network Information API integration to WebContext and WebPage 2012-07-12 13:45:13 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 90762 1 cdumez cdumez andersca kenneth sam webkit.review.bot oldest_to_newest 664822 0 cdumez 2012-07-09 05:36:40 -0700 Some code is needed in WebContext and WebPage in order for the Network Information test cases to pass with WebKitTestRunner: - We need to call WebCore::provideNetworkInfoTo() in WebPage - We need to add the WebNetworkInfoManagerProxy to WebContext and properly direct messages to it 664826 1 151237 cdumez 2012-07-09 05:40:51 -0700 Created attachment 151237 Patch 668165 2 151237 webkit.review.bot 2012-07-12 13:45:03 -0700 Comment on attachment 151237 Patch Clearing flags on attachment: 151237 Committed r122500: <http://trac.webkit.org/changeset/122500> 668167 3 webkit.review.bot 2012-07-12 13:45:13 -0700 All reviewed patches have been landed. Closing bug. 151237 2012-07-09 05:40:51 -0700 2012-07-12 13:45:02 -0700 Patch 90781_networkinfo_context.patch text/plain 10558 cdumez ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCA2YWNhYzcxLi42NzlmNTE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzYg QEAKKzIwMTItMDctMDkgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVs LmNvbT4KKworICAgICAgICBbV0syXSBBZGQgbWlzc2luZyBOZXR3b3JrIEluZm9ybWF0aW9uIEFQ SSBpbnRlZ3JhdGlvbiB0byBXZWJDb250ZXh0IGFuZCBXZWJQYWdlCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05MDc4MQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEludGVncmF0ZSBOZXR3b3JrIEluZm9ybWF0 aW9uIEFQSSB0byBXZWJQYWdlLCBXZWJDb250ZXh0IGFuZAorICAgICAgICBwcm9wZXJseSByb3V0 ZSBtZXNzYWdlcyB0byB0aGUgV2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHkuCisgICAgICAgIFdp dGhvdXQgdGhpcywgdGhlIE5ldHdvcmsgSW5mb3JtYXRpb24gdGVzdHMgYXJlIGNyYXNoaW5nIGZv cgorICAgICAgICBXZWJLaXQyLgorCisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvbnRleHQuY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJDb250ZXh0OjpXZWJDb250ZXh0KToKKyAgICAgICAgKFdl YktpdDo6V2ViQ29udGV4dDo6fldlYkNvbnRleHQpOgorICAgICAgICAoV2ViS2l0OjpXZWJDb250 ZXh0OjpkaXNjb25uZWN0UHJvY2Vzcyk6CisgICAgICAgIChXZWJLaXQ6OldlYkNvbnRleHQ6OmRp ZFJlY2VpdmVNZXNzYWdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViQ29udGV4dDo6ZGlkUmVjZWl2 ZVN5bmNNZXNzYWdlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViQ29udGV4dC5oOgorICAgICAg ICAoV2ViS2l0KToKKyAgICAgICAgKFdlYkNvbnRleHQpOgorICAgICAgICAoV2ViS2l0OjpXZWJD b250ZXh0OjpuZXR3b3JrSW5mb01hbmFnZXJQcm94eSk6CisgICAgICAgICogVUlQcm9jZXNzL1dl Yk5ldHdvcmtJbmZvTWFuYWdlclByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViTmV0d29y a0luZm9NYW5hZ2VyUHJveHk6OmRpZFJlY2VpdmVTeW5jTWVzc2FnZSk6CisgICAgICAgIChXZWJL aXQpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJOZXR3b3JrSW5mb01hbmFnZXJQcm94eS5oOgor ICAgICAgICAoV2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHkpOgorICAgICAgICAqIFVJUHJvY2Vz cy9XZWJQcm9jZXNzUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6 OmRpZFJlY2VpdmVNZXNzYWdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5Ojpk aWRSZWNlaXZlU3luY01lc3NhZ2UpOgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6V2ViUGFnZSk6CisKIDIwMTItMDct MDkgIERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBGaXggdGhlIE1h YyBidWlsZCB3aGVuIGNvZGVzaWduX2FsbG9jYXRlIGlzIG5vdCBpbnN0YWxsZWQgYXQgL3Vzci9i aW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAKaW5kZXggNWE3MTRlOC4u NWFmNDNhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQu Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcApAQCAtNjYs NiArNjYsMTAgQEAKICNpbmNsdWRlICJCdWlsdEluUERGVmlldy5oIgogI2VuZGlmCiAKKyNpZiBF TkFCTEUoTkVUV09SS19JTkZPKQorI2luY2x1ZGUgIldlYk5ldHdvcmtJbmZvTWFuYWdlclByb3h5 LmgiCisjZW5kaWYKKwogI2lmIFVTRShTT1VQKQogI2luY2x1ZGUgIldlYlNvdXBSZXF1ZXN0TWFu YWdlclByb3h5LmgiCiAjZW5kaWYKQEAgLTEzNiw2ICsxNDAsOSBAQCBXZWJDb250ZXh0OjpXZWJD b250ZXh0KFByb2Nlc3NNb2RlbCBwcm9jZXNzTW9kZWwsIGNvbnN0IFN0cmluZyYgaW5qZWN0ZWRC dW5kbGVQYQogICAgICwgbV9pY29uRGF0YWJhc2UoV2ViSWNvbkRhdGFiYXNlOjpjcmVhdGUodGhp cykpCiAgICAgLCBtX2tleVZhbHVlU3RvcmFnZU1hbmFnZXJQcm94eShXZWJLZXlWYWx1ZVN0b3Jh Z2VNYW5hZ2VyUHJveHk6OmNyZWF0ZSh0aGlzKSkKICAgICAsIG1fbWVkaWFDYWNoZU1hbmFnZXJQ cm94eShXZWJNZWRpYUNhY2hlTWFuYWdlclByb3h5OjpjcmVhdGUodGhpcykpCisjaWYgRU5BQkxF KE5FVFdPUktfSU5GTykKKyAgICAsIG1fbmV0d29ya0luZm9NYW5hZ2VyUHJveHkoV2ViTmV0d29y a0luZm9NYW5hZ2VyUHJveHk6OmNyZWF0ZSh0aGlzKSkKKyNlbmRpZgogICAgICwgbV9ub3RpZmlj YXRpb25NYW5hZ2VyUHJveHkoV2ViTm90aWZpY2F0aW9uTWFuYWdlclByb3h5OjpjcmVhdGUodGhp cykpCiAgICAgLCBtX3BsdWdpblNpdGVEYXRhTWFuYWdlcihXZWJQbHVnaW5TaXRlRGF0YU1hbmFn ZXI6OmNyZWF0ZSh0aGlzKSkKICAgICAsIG1fcmVzb3VyY2VDYWNoZU1hbmFnZXJQcm94eShXZWJS ZXNvdXJjZUNhY2hlTWFuYWdlclByb3h5OjpjcmVhdGUodGhpcykpCkBAIC0xOTgsNiArMjA1LDEx IEBAIFdlYkNvbnRleHQ6On5XZWJDb250ZXh0KCkKIAogICAgIG1fbWVkaWFDYWNoZU1hbmFnZXJQ cm94eS0+aW52YWxpZGF0ZSgpOwogICAgIG1fbWVkaWFDYWNoZU1hbmFnZXJQcm94eS0+Y2xlYXJD b250ZXh0KCk7CisKKyNpZiBFTkFCTEUoTkVUV09SS19JTkZPKQorICAgIG1fbmV0d29ya0luZm9N YW5hZ2VyUHJveHktPmludmFsaWRhdGUoKTsKKyAgICBtX25ldHdvcmtJbmZvTWFuYWdlclByb3h5 LT5jbGVhckNvbnRleHQoKTsKKyNlbmRpZgogICAgIAogICAgIG1fbm90aWZpY2F0aW9uTWFuYWdl clByb3h5LT5pbnZhbGlkYXRlKCk7CiAgICAgbV9ub3RpZmljYXRpb25NYW5hZ2VyUHJveHktPmNs ZWFyQ29udGV4dCgpOwpAQCAtNDAzLDYgKzQxNSw5IEBAIHZvaWQgV2ViQ29udGV4dDo6ZGlzY29u bmVjdFByb2Nlc3MoV2ViUHJvY2Vzc1Byb3h5KiBwcm9jZXNzKQogICAgIG1fZ2VvbG9jYXRpb25N YW5hZ2VyUHJveHktPmludmFsaWRhdGUoKTsKICAgICBtX2tleVZhbHVlU3RvcmFnZU1hbmFnZXJQ cm94eS0+aW52YWxpZGF0ZSgpOwogICAgIG1fbWVkaWFDYWNoZU1hbmFnZXJQcm94eS0+aW52YWxp ZGF0ZSgpOworI2lmIEVOQUJMRShORVRXT1JLX0lORk8pCisgICAgbV9uZXR3b3JrSW5mb01hbmFn ZXJQcm94eS0+aW52YWxpZGF0ZSgpOworI2VuZGlmCiAgICAgbV9ub3RpZmljYXRpb25NYW5hZ2Vy UHJveHktPmludmFsaWRhdGUoKTsKICAgICBtX3Jlc291cmNlQ2FjaGVNYW5hZ2VyUHJveHktPmlu dmFsaWRhdGUoKTsKICNpZiBVU0UoU09VUCkKQEAgLTc2MCw2ICs3NzUsMTMgQEAgdm9pZCBXZWJD b250ZXh0OjpkaWRSZWNlaXZlTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9u LCBDb3JlSVBDOjpNZXMKICAgICAgICAgbV9tZWRpYUNhY2hlTWFuYWdlclByb3h5LT5kaWRSZWNl aXZlTWVzc2FnZShjb25uZWN0aW9uLCBtZXNzYWdlSUQsIGFyZ3VtZW50cyk7CiAgICAgICAgIHJl dHVybjsKICAgICB9CisKKyNpZiBFTkFCTEUoTkVUV09SS19JTkZPKQorICAgIGlmIChtZXNzYWdl SUQuaXM8Q29yZUlQQzo6TWVzc2FnZUNsYXNzV2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHk+KCkp IHsKKyAgICAgICAgbV9uZXR3b3JrSW5mb01hbmFnZXJQcm94eS0+ZGlkUmVjZWl2ZU1lc3NhZ2Uo Y29ubmVjdGlvbiwgbWVzc2FnZUlELCBhcmd1bWVudHMpOworICAgICAgICByZXR1cm47CisgICAg fQorI2VuZGlmCiAgICAgCiAgICAgaWYgKG1lc3NhZ2VJRC5pczxDb3JlSVBDOjpNZXNzYWdlQ2xh c3NXZWJOb3RpZmljYXRpb25NYW5hZ2VyUHJveHk+KCkpIHsKICAgICAgICAgbV9ub3RpZmljYXRp b25NYW5hZ2VyUHJveHktPmRpZFJlY2VpdmVNZXNzYWdlKGNvbm5lY3Rpb24sIG1lc3NhZ2VJRCwg YXJndW1lbnRzKTsKQEAgLTgxMyw2ICs4MzUsMTMgQEAgdm9pZCBXZWJDb250ZXh0OjpkaWRSZWNl aXZlU3luY01lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlvbiwgQ29yZUlQQzoK ICAgICAgICAgbV9pY29uRGF0YWJhc2UtPmRpZFJlY2VpdmVTeW5jTWVzc2FnZShjb25uZWN0aW9u LCBtZXNzYWdlSUQsIGFyZ3VtZW50cywgcmVwbHkpOwogICAgICAgICByZXR1cm47CiAgICAgfQor CisjaWYgRU5BQkxFKE5FVFdPUktfSU5GTykKKyAgICBpZiAobWVzc2FnZUlELmlzPENvcmVJUEM6 Ok1lc3NhZ2VDbGFzc1dlYk5ldHdvcmtJbmZvTWFuYWdlclByb3h5PigpKSB7CisgICAgICAgIG1f bmV0d29ya0luZm9NYW5hZ2VyUHJveHktPmRpZFJlY2VpdmVTeW5jTWVzc2FnZShjb25uZWN0aW9u LCBtZXNzYWdlSUQsIGFyZ3VtZW50cywgcmVwbHkpOworICAgICAgICByZXR1cm47CisgICAgfQor I2VuZGlmCiAgICAgCiAgICAgc3dpdGNoIChtZXNzYWdlSUQuZ2V0PFdlYkNvbnRleHRMZWdhY3lN ZXNzYWdlOjpLaW5kPigpKSB7CiAgICAgICAgIGNhc2UgV2ViQ29udGV4dExlZ2FjeU1lc3NhZ2U6 OlBvc3RTeW5jaHJvbm91c01lc3NhZ2U6IHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJDb250ZXh0LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4 dC5oCmluZGV4IDQxNmU0N2QuLjc0NTRlOGQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNv bnRleHQuaApAQCAtNTQsNiArNTQsOSBAQCBjbGFzcyBXZWJHZW9sb2NhdGlvbk1hbmFnZXJQcm94 eTsKIGNsYXNzIFdlYkljb25EYXRhYmFzZTsKIGNsYXNzIFdlYktleVZhbHVlU3RvcmFnZU1hbmFn ZXJQcm94eTsKIGNsYXNzIFdlYk1lZGlhQ2FjaGVNYW5hZ2VyUHJveHk7CisjaWYgRU5BQkxFKE5F VFdPUktfSU5GTykKK2NsYXNzIFdlYk5ldHdvcmtJbmZvTWFuYWdlclByb3h5OworI2VuZGlmCiBj bGFzcyBXZWJOb3RpZmljYXRpb25NYW5hZ2VyUHJveHk7CiBjbGFzcyBXZWJQYWdlR3JvdXA7CiBj bGFzcyBXZWJQYWdlUHJveHk7CkBAIC0xNjAsNiArMTYzLDkgQEAgcHVibGljOgogICAgIFdlYklj b25EYXRhYmFzZSogaWNvbkRhdGFiYXNlKCkgY29uc3QgeyByZXR1cm4gbV9pY29uRGF0YWJhc2Uu Z2V0KCk7IH0KICAgICBXZWJLZXlWYWx1ZVN0b3JhZ2VNYW5hZ2VyUHJveHkqIGtleVZhbHVlU3Rv cmFnZU1hbmFnZXJQcm94eSgpIGNvbnN0IHsgcmV0dXJuIG1fa2V5VmFsdWVTdG9yYWdlTWFuYWdl clByb3h5LmdldCgpOyB9CiAgICAgV2ViTWVkaWFDYWNoZU1hbmFnZXJQcm94eSogbWVkaWFDYWNo ZU1hbmFnZXJQcm94eSgpIGNvbnN0IHsgcmV0dXJuIG1fbWVkaWFDYWNoZU1hbmFnZXJQcm94eS5n ZXQoKTsgfQorI2lmIEVOQUJMRShORVRXT1JLX0lORk8pCisgICAgV2ViTmV0d29ya0luZm9NYW5h Z2VyUHJveHkqIG5ldHdvcmtJbmZvTWFuYWdlclByb3h5KCkgY29uc3QgeyByZXR1cm4gbV9uZXR3 b3JrSW5mb01hbmFnZXJQcm94eS5nZXQoKTsgfQorI2VuZGlmCiAgICAgV2ViTm90aWZpY2F0aW9u TWFuYWdlclByb3h5KiBub3RpZmljYXRpb25NYW5hZ2VyUHJveHkoKSBjb25zdCB7IHJldHVybiBt X25vdGlmaWNhdGlvbk1hbmFnZXJQcm94eS5nZXQoKTsgfQogICAgIFdlYlBsdWdpblNpdGVEYXRh TWFuYWdlciogcGx1Z2luU2l0ZURhdGFNYW5hZ2VyKCkgY29uc3QgeyByZXR1cm4gbV9wbHVnaW5T aXRlRGF0YU1hbmFnZXIuZ2V0KCk7IH0KICAgICBXZWJSZXNvdXJjZUNhY2hlTWFuYWdlclByb3h5 KiByZXNvdXJjZUNhY2hlTWFuYWdlclByb3h5KCkgY29uc3QgeyByZXR1cm4gbV9yZXNvdXJjZUNh Y2hlTWFuYWdlclByb3h5LmdldCgpOyB9CkBAIC0zMDUsNiArMzExLDkgQEAgcHJpdmF0ZToKICAg ICBSZWZQdHI8V2ViSWNvbkRhdGFiYXNlPiBtX2ljb25EYXRhYmFzZTsKICAgICBSZWZQdHI8V2Vi S2V5VmFsdWVTdG9yYWdlTWFuYWdlclByb3h5PiBtX2tleVZhbHVlU3RvcmFnZU1hbmFnZXJQcm94 eTsKICAgICBSZWZQdHI8V2ViTWVkaWFDYWNoZU1hbmFnZXJQcm94eT4gbV9tZWRpYUNhY2hlTWFu YWdlclByb3h5OworI2lmIEVOQUJMRShORVRXT1JLX0lORk8pCisgICAgUmVmUHRyPFdlYk5ldHdv cmtJbmZvTWFuYWdlclByb3h5PiBtX25ldHdvcmtJbmZvTWFuYWdlclByb3h5OworI2VuZGlmCiAg ICAgUmVmUHRyPFdlYk5vdGlmaWNhdGlvbk1hbmFnZXJQcm94eT4gbV9ub3RpZmljYXRpb25NYW5h Z2VyUHJveHk7CiAgICAgUmVmUHRyPFdlYlBsdWdpblNpdGVEYXRhTWFuYWdlcj4gbV9wbHVnaW5T aXRlRGF0YU1hbmFnZXI7CiAgICAgUmVmUHRyPFdlYlJlc291cmNlQ2FjaGVNYW5hZ2VyUHJveHk+ IG1fcmVzb3VyY2VDYWNoZU1hbmFnZXJQcm94eTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9XZWJOZXR3b3JrSW5mb01hbmFnZXJQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHkuY3BwCmluZGV4IDRhYmUyZDYu LjliYWNjZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJOZXR3b3Jr SW5mb01hbmFnZXJQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYk5l dHdvcmtJbmZvTWFuYWdlclByb3h5LmNwcApAQCAtNzIsNiArNzIsMTEgQEAgdm9pZCBXZWJOZXR3 b3JrSW5mb01hbmFnZXJQcm94eTo6ZGlkUmVjZWl2ZU1lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlv biogY29ubmVjdGkKICAgICBkaWRSZWNlaXZlV2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHlNZXNz YWdlKGNvbm5lY3Rpb24sIG1lc3NhZ2VJRCwgYXJndW1lbnRzKTsKIH0KIAordm9pZCBXZWJOZXR3 b3JrSW5mb01hbmFnZXJQcm94eTo6ZGlkUmVjZWl2ZVN5bmNNZXNzYWdlKENvcmVJUEM6OkNvbm5l Y3Rpb24qIGNvbm5lY3Rpb24sIENvcmVJUEM6Ok1lc3NhZ2VJRCBtZXNzYWdlSUQsIENvcmVJUEM6 OkFyZ3VtZW50RGVjb2RlciogYXJndW1lbnRzLCBXVEY6Ok93blB0cjxDb3JlSVBDOjpBcmd1bWVu dEVuY29kZXI+JiByZXBseSkKK3sKKyAgICBkaWRSZWNlaXZlU3luY1dlYk5ldHdvcmtJbmZvTWFu YWdlclByb3h5TWVzc2FnZShjb25uZWN0aW9uLCBtZXNzYWdlSUQsIGFyZ3VtZW50cywgcmVwbHkp OworfQorCiB2b2lkIFdlYk5ldHdvcmtJbmZvTWFuYWdlclByb3h5OjpzdGFydFVwZGF0aW5nKCkK IHsKICAgICBpZiAobV9pc1VwZGF0aW5nKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL1dlYk5ldHdvcmtJbmZvTWFuYWdlclByb3h5LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvV2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHkuaAppbmRleCA2NjBjYmE5Li5iNzI5ODU1 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTmV0d29ya0luZm9NYW5h Z2VyUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTmV0d29ya0luZm9N YW5hZ2VyUHJveHkuaApAQCAtNTksNiArNTksNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBwcm92aWRl ckRpZENoYW5nZU5ldHdvcmtJbmZvcm1hdGlvbihjb25zdCBXVEY6OkF0b21pY1N0cmluZyYgZXZl bnRUeXBlLCBXZWJOZXR3b3JrSW5mbyopOwogCiAgICAgdm9pZCBkaWRSZWNlaXZlTWVzc2FnZShD b3JlSVBDOjpDb25uZWN0aW9uKiwgQ29yZUlQQzo6TWVzc2FnZUlELCBDb3JlSVBDOjpBcmd1bWVu dERlY29kZXIqKTsKKyAgICB2b2lkIGRpZFJlY2VpdmVTeW5jTWVzc2FnZShDb3JlSVBDOjpDb25u ZWN0aW9uKiwgQ29yZUlQQzo6TWVzc2FnZUlELCBDb3JlSVBDOjpBcmd1bWVudERlY29kZXIqLCBX VEY6Ok93blB0cjxDb3JlSVBDOjpBcmd1bWVudEVuY29kZXI+Jik7CiAKIHByaXZhdGU6CiAgICAg ZXhwbGljaXQgV2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHkoV2ViQ29udGV4dCopOwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAppbmRleCA0NTVkZjRkLi45 OGZiN2JiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1By b3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNw cApAQCAtMzEzLDYgKzMxMyw5IEBAIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpkaWRSZWNlaXZlTWVz c2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiBjb25uZWN0aW9uLCBDb3JlSVBDCiAgICAgICAgIHx8 IG1lc3NhZ2VJRC5pczxDb3JlSVBDOjpNZXNzYWdlQ2xhc3NXZWJJY29uRGF0YWJhc2U+KCkKICAg ICAgICAgfHwgbWVzc2FnZUlELmlzPENvcmVJUEM6Ok1lc3NhZ2VDbGFzc1dlYktleVZhbHVlU3Rv cmFnZU1hbmFnZXJQcm94eT4oKQogICAgICAgICB8fCBtZXNzYWdlSUQuaXM8Q29yZUlQQzo6TWVz c2FnZUNsYXNzV2ViTWVkaWFDYWNoZU1hbmFnZXJQcm94eT4oKQorI2lmIEVOQUJMRShORVRXT1JL X0lORk8pCisgICAgICAgIHx8IG1lc3NhZ2VJRC5pczxDb3JlSVBDOjpNZXNzYWdlQ2xhc3NXZWJO ZXR3b3JrSW5mb01hbmFnZXJQcm94eT4oKQorI2VuZGlmCiAgICAgICAgIHx8IG1lc3NhZ2VJRC5p czxDb3JlSVBDOjpNZXNzYWdlQ2xhc3NXZWJOb3RpZmljYXRpb25NYW5hZ2VyUHJveHk+KCkKICNp ZiBVU0UoU09VUCkKICAgICAgICAgfHwgbWVzc2FnZUlELmlzPENvcmVJUEM6Ok1lc3NhZ2VDbGFz c1dlYlNvdXBSZXF1ZXN0TWFuYWdlclByb3h5PigpCkBAIC0zNDAsNyArMzQzLDEwIEBAIHZvaWQg V2ViUHJvY2Vzc1Byb3h5OjpkaWRSZWNlaXZlU3luY01lc3NhZ2UoQ29yZUlQQzo6Q29ubmVjdGlv biogY29ubmVjdGlvbiwgQ29yCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAobWVz c2FnZUlELmlzPENvcmVJUEM6Ok1lc3NhZ2VDbGFzc1dlYkNvbnRleHQ+KCkgfHwgbWVzc2FnZUlE LmlzPENvcmVJUEM6Ok1lc3NhZ2VDbGFzc1dlYkNvbnRleHRMZWdhY3k+KCkgCisgICAgaWYgKG1l c3NhZ2VJRC5pczxDb3JlSVBDOjpNZXNzYWdlQ2xhc3NXZWJDb250ZXh0PigpIHx8IG1lc3NhZ2VJ RC5pczxDb3JlSVBDOjpNZXNzYWdlQ2xhc3NXZWJDb250ZXh0TGVnYWN5PigpCisjaWYgRU5BQkxF KE5FVFdPUktfSU5GTykKKyAgICAgICAgfHwgbWVzc2FnZUlELmlzPENvcmVJUEM6Ok1lc3NhZ2VD bGFzc1dlYk5ldHdvcmtJbmZvTWFuYWdlclByb3h5PigpCisjZW5kaWYKICAgICAgICAgfHwgbWVz c2FnZUlELmlzPENvcmVJUEM6Ok1lc3NhZ2VDbGFzc0Rvd25sb2FkUHJveHk+KCkgfHwgbWVzc2Fn ZUlELmlzPENvcmVJUEM6Ok1lc3NhZ2VDbGFzc1dlYkljb25EYXRhYmFzZT4oKSkgewogICAgICAg ICBtX2NvbnRleHQtPmRpZFJlY2VpdmVTeW5jTWVzc2FnZShjb25uZWN0aW9uLCBtZXNzYWdlSUQs IGFyZ3VtZW50cywgcmVwbHkpOwogICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggMjY2NzQ2ZS4uN2EzMzNiMiAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtMTI2 LDYgKzEyNiwxMCBAQAogI2VuZGlmCiAjZW5kaWYKIAorI2lmIEVOQUJMRShORVRXT1JLX0lORk8p CisjaW5jbHVkZSAiV2ViTmV0d29ya0luZm9DbGllbnQuaCIKKyNlbmRpZgorCiAjaWYgRU5BQkxF KFdFQl9JTlRFTlRTKQogI2luY2x1ZGUgIkludGVudERhdGEuaCIKICNlbmRpZgpAQCAtMjY5LDYg KzI3Myw5IEBAIFdlYlBhZ2U6OldlYlBhZ2UodWludDY0X3QgcGFnZUlELCBjb25zdCBXZWJQYWdl Q3JlYXRpb25QYXJhbWV0ZXJzJiBwYXJhbWV0ZXJzKQogICAgIFdlYkNvcmU6OnByb3ZpZGVEZXZp Y2VNb3Rpb25UbyhtX3BhZ2UuZ2V0KCksIG5ldyBEZXZpY2VNb3Rpb25DbGllbnRRdCk7CiAgICAg V2ViQ29yZTo6cHJvdmlkZURldmljZU9yaWVudGF0aW9uVG8obV9wYWdlLmdldCgpLCBuZXcgRGV2 aWNlT3JpZW50YXRpb25DbGllbnRRdCk7CiAjZW5kaWYKKyNpZiBFTkFCTEUoTkVUV09SS19JTkZP KQorICAgIFdlYkNvcmU6OnByb3ZpZGVOZXR3b3JrSW5mb1RvKG1fcGFnZS5nZXQoKSwgbmV3IFdl Yk5ldHdvcmtJbmZvQ2xpZW50KHRoaXMpKTsKKyNlbmRpZgogI2lmIEVOQUJMRShOT1RJRklDQVRJ T05TKSB8fCBFTkFCTEUoTEVHQUNZX05PVElGSUNBVElPTlMpCiAgICAgV2ViQ29yZTo6cHJvdmlk ZU5vdGlmaWNhdGlvbihtX3BhZ2UuZ2V0KCksIG5ldyBXZWJOb3RpZmljYXRpb25DbGllbnQodGhp cykpOwogI2VuZGlmCg==