115654 2013-05-06 09:41:54 -0700 [WK2] Make the WebNetworkInfoManagerProxy a supplement to the WebContext 2013-05-06 11:43:41 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 zan zan kling oldest_to_newest 885068 0 zan 2013-05-06 09:41:54 -0700 [WK2] Make the WebNetworkInfoManagerProxy a supplement to the WebContext 885078 1 200712 zan 2013-05-06 09:49:06 -0700 Created attachment 200712 Patch A copycat of bug #115625. 885097 2 200712 kling 2013-05-06 10:10:21 -0700 Comment on attachment 200712 Patch Woop woop! 885153 3 200712 zan 2013-05-06 11:43:34 -0700 Comment on attachment 200712 Patch Clearing flags on attachment: 200712 Committed r149620: <http://trac.webkit.org/changeset/149620> 885154 4 zan 2013-05-06 11:43:41 -0700 All reviewed patches have been landed. Closing bug. 200712 2013-05-06 09:49:06 -0700 2013-05-06 11:43:34 -0700 Patch bug-115654-20130506184812.patch text/plain 10926 zan U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5NjAwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZWFmZmQzY2U3YWYzZjEx ZWZmMmI2YmY5NzkwZjlkNDIwMDg3MGRmMi4uZDlhZmFjZDEzMDk4ZGFlYWZmODM0ZWQ1MDgyNTQz ZjA2MTdiNWNhNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM4IEBACiAyMDEzLTA1LTA2ICBaYW4g RG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAorICAgICAgICBbV0syXSBNYWtlIHRo ZSBXZWJOZXR3b3JrSW5mb01hbmFnZXJQcm94eSBhIHN1cHBsZW1lbnQgdG8gdGhlIFdlYkNvbnRl eHQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNTY1 NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJhdGhl ciB0aGFuIGhvbGRpbmcgYSBSZWZQdHIgdG8gdGhlIFdlYk5ldHdvcmtJbmZvTWFuYWdlclByb3h5 IG9iamVjdCBpbiBXZWJDb250ZXh0LCBjaGFuZ2UgdGhlIFdlYk5ldHdvcmtJbmZvTWFuYWdlclBy b3h5CisgICAgICAgIHRvIGltcGxlbWVudCB0aGUgV2ViQ29udGV4dFN1cHBsZW1lbnQgaW50ZXJm YWNlIGFuZCBoYW5kbGUgdGhlIG9iamVjdCBhcyBzdWNoIGluIFdlYkNvbnRleHQsIHNpbXBsaWZ5 aW5nIGl0cworICAgICAgICBjb25zdHJ1Y3Rpb24gYW5kIGNsZWFudXAsIHJlbW92aW5nIHRoZSBz cGVjaWZpYyBSZWZQdHIgbWVtYmVyIHZhcmlhYmxlIGFuZCBpdHMgY29ycmVsYXRpbmcgZ2V0dGVy IG1ldGhvZC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS0NvbnRleHQuY3BwOgorICAg ICAgICAoV0tDb250ZXh0R2V0TmV0d29ya0luZm9NYW5hZ2VyKTogUmV0cmlldmUgdGhlIFdlYk5l dHdvcmtJbmZvTWFuYWdlclByb3h5IG9iamVjdCBmcm9tIHRoZSBzdXBwcGxlbWVudHMgb2YgdGhl IFdlYkNvbnRleHQuCisgICAgICAgICogVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwOgorICAgICAg ICAoV2ViS2l0OjpXZWJDb250ZXh0OjpXZWJDb250ZXh0KTogQWRkIHRoZSBXZWJOZXR3b3JrSW5m b01hbmFnZXJQcm94eSBvYmplY3QgYXMgYSBzdXBwbGVtZW50IGluc3RlYWQgb2YgYXNzaWduaW5n IGl0IHRvCisgICAgICAgIHRoZSBub3ctcmVtb3ZlZCBtZW1iZXIgdmFyaWFibGUuCisgICAgICAg IChXZWJLaXQ6OldlYkNvbnRleHQ6On5XZWJDb250ZXh0KTogTm8gbmVlZCBmb3IgdGhlIHNwZWNp ZmljIGNsZWFudXAsIHRoZSBlcXVpdmFsZW50IGlzIGFjaGlldmVkIHdoZW4gaXRlcmF0aW5nIHRo cm91Z2ggdGhlCisgICAgICAgIHN1cHBsZW1lbnRzIHZlY3Rvci4KKyAgICAgICAgKFdlYktpdDo6 V2ViQ29udGV4dDo6ZGlzY29ubmVjdFByb2Nlc3MpOiBEaXR0by4KKyAgICAgICAgKiBVSVByb2Nl c3MvV2ViQ29udGV4dC5oOgorICAgICAgICAoV2ViQ29udGV4dCk6IFJlbW92ZSB0aGUgV2ViTmV0 d29ya0luZm9NYW5hZ2VyUHJveHkgUmVmUHRyIG1lbWJlciB2YXJpYWJsZSBhbmQgaXRzIGdldHRl ciBtZXRob2QuCisgICAgICAgICogVUlQcm9jZXNzL1dlYk5ldHdvcmtJbmZvTWFuYWdlclByb3h5 LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHk6OnN1cHBs ZW1lbnROYW1lKTogU3BlY2lmdCB0aGUgc3VwcGxlbWVudCdzIG5hbWUuCisgICAgICAgIChXZWJL aXQ6OldlYk5ldHdvcmtJbmZvTWFuYWdlclByb3h5OjpXZWJOZXR3b3JrSW5mb01hbmFnZXJQcm94 eSk6IEluaXRpYWxpemUgYXMgYSBXZWJDb250ZXh0U3VwcGxlbWVudC4KKyAgICAgICAgKFdlYktp dDo6V2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHk6OnByb3ZpZGVyRGlkQ2hhbmdlTmV0d29ya0lu Zm9ybWF0aW9uKTogQWRqdXN0IHRvIHVzZSB0aGUgY29udGV4dCgpIG1ldGhvZCBpbnN0ZWFkIG9m CisgICAgICAgIGFjY2Vzc2luZyB0aGUgcHJpdmF0ZSBtX2NvbnRleHQgZGlyZWN0bHkuCisgICAg ICAgIChXZWJLaXQ6OldlYk5ldHdvcmtJbmZvTWFuYWdlclByb3h5Ojpjb250ZXh0RGVzdHJveWVk KTogU3RvcCB1cGRhdGluZyB3aGVuIGludm9rZWQuCisgICAgICAgIChXZWJLaXQ6OldlYk5ldHdv cmtJbmZvTWFuYWdlclByb3h5Ojpwcm9jZXNzRGlkQ2xvc2UpOiBEaXR0by4KKyAgICAgICAgKFdl YktpdDo6V2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHk6OnJlZldlYkNvbnRleHRTdXBwbGVtZW50 KTogQ2FsbCBBUElPYmplY3Q6OnJlZi4KKyAgICAgICAgKFdlYktpdDo6V2ViTmV0d29ya0luZm9N YW5hZ2VyUHJveHk6OmRlcmVmV2ViQ29udGV4dFN1cHBsZW1lbnQpOiBDYWxsIEFQSU9iamVjdDo6 ZGVyZWYuCisgICAgICAgICogVUlQcm9jZXNzL1dlYk5ldHdvcmtJbmZvTWFuYWdlclByb3h5Lmg6 CisgICAgICAgIChXZWJOZXR3b3JrSW5mb01hbmFnZXJQcm94eSk6IEluaGVyaXQgZnJvbSBXZWJD b250ZXh0U3VwcGxlbWVudCwgZGVjbGFyZSB0aGUgbmV3bHktaW5oZXJpdGVkIG1ldGhvZHMuCisK KzIwMTMtMDUtMDYgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgorCiAgICAg ICAgIFtXSzJdIE1ha2UgdGhlIFdlYkJhdHRlcnlNYW5hZ2VyUHJveHkgYSBzdXBwbGVtZW50IHRv IHRoZSBXZWJDb250ZXh0CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xMTU2MjUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9DL1dLQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250 ZXh0LmNwcAppbmRleCBmMDJlZjdlOWZiNjNjZWQyNWRiM2JiMzA5Mjk5ZTdiZjBlMDNlNDU0Li5h MTA4YTFmMDJmMzEyNjYyZTYwNjkxM2U2NDFkM2EwNDg3YzRkNWZkIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tDb250ZXh0LmNwcApAQCAtNDksNiArNDksOSBAQAogI2lm IEVOQUJMRShCQVRURVJZX1NUQVRVUykKICNpbmNsdWRlICJXZWJCYXR0ZXJ5TWFuYWdlclByb3h5 LmgiCiAjZW5kaWYKKyNpZiBFTkFCTEUoTkVUV09SS19JTkZPKQorI2luY2x1ZGUgIldlYk5ldHdv cmtJbmZvTWFuYWdlclByb3h5LmgiCisjZW5kaWYKIAogdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsK IApAQCAtMjMyLDcgKzIzNSw3IEBAIFdLR2VvbG9jYXRpb25NYW5hZ2VyUmVmIFdLQ29udGV4dEdl dEdlb2xvY2F0aW9uTWFuYWdlcihXS0NvbnRleHRSZWYgY29udGV4dFJlZikKIFdLTmV0d29ya0lu Zm9NYW5hZ2VyUmVmIFdLQ29udGV4dEdldE5ldHdvcmtJbmZvTWFuYWdlcihXS0NvbnRleHRSZWYg Y29udGV4dFJlZikKIHsKICNpZiBFTkFCTEUoTkVUV09SS19JTkZPKQotICAgIHJldHVybiB0b0FQ SSh0b0ltcGwoY29udGV4dFJlZiktPm5ldHdvcmtJbmZvTWFuYWdlclByb3h5KCkpOworICAgIHJl dHVybiB0b0FQSSh0b0ltcGwoY29udGV4dFJlZiktPnN1cHBsZW1lbnQ8V2ViTmV0d29ya0luZm9N YW5hZ2VyUHJveHk+KCkpOwogI2Vsc2UKICAgICByZXR1cm4gMDsKICNlbmRpZgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuY3BwCmluZGV4IDVjZTEzNTlhY2RlN2NmNDRkMDY4ZjEy NTBhYzhiYzIzYzIyNmM1MzEuLjliY2U0NDI5OGM0MmI0OTM2Y2UyZjQxNDg1MDk4MTc3YmVjZDNm NDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViQ29udGV4dC5jcHAKQEAgLTE1Niw5ICsx NTYsNiBAQCBXZWJDb250ZXh0OjpXZWJDb250ZXh0KFByb2Nlc3NNb2RlbCBwcm9jZXNzTW9kZWws IGNvbnN0IFN0cmluZyYgaW5qZWN0ZWRCdW5kbGVQYQogCiAgICAgLy8gTk9URTogVGhlc2Ugc3Vi LW9iamVjdHMgbXVzdCBiZSBpbml0aWFsaXplZCBhZnRlciBtX21lc3NhZ2VSZWNlaXZlck1hcC4u CiAgICAgbV9pY29uRGF0YWJhc2UgPSBXZWJJY29uRGF0YWJhc2U6OmNyZWF0ZSh0aGlzKTsKLSNp ZiBFTkFCTEUoTkVUV09SS19JTkZPKQotICAgIG1fbmV0d29ya0luZm9NYW5hZ2VyUHJveHkgPSBX ZWJOZXR3b3JrSW5mb01hbmFnZXJQcm94eTo6Y3JlYXRlKHRoaXMpOwotI2VuZGlmCiAjaWYgRU5B QkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCiAgICAgbV9wbHVnaW5TaXRlRGF0YU1hbmFnZXIgPSBX ZWJQbHVnaW5TaXRlRGF0YU1hbmFnZXI6OmNyZWF0ZSh0aGlzKTsKICNlbmRpZiAvLyBFTkFCTEUo TkVUU0NBUEVfUExVR0lOX0FQSSkKQEAgLTE3OSw2ICsxNzYsOSBAQCBXZWJDb250ZXh0OjpXZWJD b250ZXh0KFByb2Nlc3NNb2RlbCBwcm9jZXNzTW9kZWwsIGNvbnN0IFN0cmluZyYgaW5qZWN0ZWRC dW5kbGVQYQogI2lmIEVOQUJMRShCQVRURVJZX1NUQVRVUykKICAgICBhZGRTdXBwbGVtZW50PFdl YkJhdHRlcnlNYW5hZ2VyUHJveHk+KCk7CiAjZW5kaWYKKyNpZiBFTkFCTEUoTkVUV09SS19JTkZP KQorICAgIGFkZFN1cHBsZW1lbnQ8V2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHk+KCk7CisjZW5k aWYKIAogICAgIGNvbnRleHRzKCkuYXBwZW5kKHRoaXMpOwogCkBAIC0yMjUsMTEgKzIyNSw2IEBA IFdlYkNvbnRleHQ6On5XZWJDb250ZXh0KCkKICAgICBtX2ljb25EYXRhYmFzZS0+aW52YWxpZGF0 ZSgpOwogICAgIG1faWNvbkRhdGFiYXNlLT5jbGVhckNvbnRleHQoKTsKICAgICAKLSNpZiBFTkFC TEUoTkVUV09SS19JTkZPKQotICAgIG1fbmV0d29ya0luZm9NYW5hZ2VyUHJveHktPmludmFsaWRh dGUoKTsKLSAgICBtX25ldHdvcmtJbmZvTWFuYWdlclByb3h5LT5jbGVhckNvbnRleHQoKTsKLSNl bmRpZgotCiAjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9BUEkpCiAgICAgbV9wbHVnaW5TaXRl RGF0YU1hbmFnZXItPmludmFsaWRhdGUoKTsKICAgICBtX3BsdWdpblNpdGVEYXRhTWFuYWdlci0+ Y2xlYXJDb250ZXh0KCk7CkBAIC02NzEsMTAgKzY2Niw2IEBAIHZvaWQgV2ViQ29udGV4dDo6ZGlz Y29ubmVjdFByb2Nlc3MoV2ViUHJvY2Vzc1Byb3h5KiBwcm9jZXNzKQogICAgIGZvciAoOyBpdCAh PSBlbmQ7ICsraXQpCiAgICAgICAgIGl0LT52YWx1ZS0+cHJvY2Vzc0RpZENsb3NlKHByb2Nlc3Mp OwogCi0jaWYgRU5BQkxFKE5FVFdPUktfSU5GTykKLSAgICBtX25ldHdvcmtJbmZvTWFuYWdlclBy b3h5LT5pbnZhbGlkYXRlKCk7Ci0jZW5kaWYKLQogICAgIC8vIFdoZW4gb3V0IG9mIHByb2Nlc3Mg cGx1Zy1pbnMgYXJlIGVuYWJsZWQsIHdlIGRvbid0IHdhbnQgdG8gaW52YWxpZGF0ZSB0aGUgcGx1 Zy1pbiBzaXRlIGRhdGEKICAgICAvLyBtYW5hZ2VyIGp1c3QgYmVjYXVzZSB0aGUgd2ViIHByb2Nl c3MgY3Jhc2hlcyBzaW5jZSBpdCdzIG5vdCBpbnZvbHZlZC4KICNpZiBFTkFCTEUoTkVUU0NBUEVf UExVR0lOX0FQSSkgJiYgIUVOQUJMRShQTFVHSU5fUFJPQ0VTUykKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvV2ViQ29udGV4dC5oCmluZGV4IDdmODczOTA0NTVjZmI2MDI1MTdkMzlhYjBjN2Y3OTIyYzA0 Y2NiZjQuLmYxMjRlODA1M2FkOWJiNjlkZjBiOWFlMjg1Y2FmOTk0YTA2Y2NkMWYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJDb250ZXh0LmgKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYkNvbnRleHQuaApAQCAtMjExLDkgKzIxMSw2IEBAIHB1YmxpYzoK ICAgICBXZWJDb250ZXh0Q2xpZW50JiBjbGllbnQoKSB7IHJldHVybiBtX2NsaWVudDsgfQogCiAg ICAgV2ViSWNvbkRhdGFiYXNlKiBpY29uRGF0YWJhc2UoKSBjb25zdCB7IHJldHVybiBtX2ljb25E YXRhYmFzZS5nZXQoKTsgfQotI2lmIEVOQUJMRShORVRXT1JLX0lORk8pCi0gICAgV2ViTmV0d29y a0luZm9NYW5hZ2VyUHJveHkqIG5ldHdvcmtJbmZvTWFuYWdlclByb3h5KCkgY29uc3QgeyByZXR1 cm4gbV9uZXR3b3JrSW5mb01hbmFnZXJQcm94eS5nZXQoKTsgfQotI2VuZGlmCiAjaWYgRU5BQkxF KE5FVFNDQVBFX1BMVUdJTl9BUEkpCiAgICAgV2ViUGx1Z2luU2l0ZURhdGFNYW5hZ2VyKiBwbHVn aW5TaXRlRGF0YU1hbmFnZXIoKSBjb25zdCB7IHJldHVybiBtX3BsdWdpblNpdGVEYXRhTWFuYWdl ci5nZXQoKTsgfQogI2VuZGlmCkBAIC00MjksOSArNDI2LDYgQEAgcHJpdmF0ZToKICAgICBkb3Vi bGUgbV9tZW1vcnlTYW1wbGVySW50ZXJ2YWw7CiAKICAgICBSZWZQdHI8V2ViSWNvbkRhdGFiYXNl PiBtX2ljb25EYXRhYmFzZTsKLSNpZiBFTkFCTEUoTkVUV09SS19JTkZPKQotICAgIFJlZlB0cjxX ZWJOZXR3b3JrSW5mb01hbmFnZXJQcm94eT4gbV9uZXR3b3JrSW5mb01hbmFnZXJQcm94eTsKLSNl bmRpZgogI2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQogICAgIFJlZlB0cjxXZWJQbHVn aW5TaXRlRGF0YU1hbmFnZXI+IG1fcGx1Z2luU2l0ZURhdGFNYW5hZ2VyOwogI2VuZGlmCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTmV0d29ya0luZm9NYW5hZ2VyUHJv eHkuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYk5ldHdvcmtJbmZvTWFuYWdlclBy b3h5LmNwcAppbmRleCBmNGEyM2Q3ZjMyZmY3NzFkYTBlYTM0YWE0ZGQ3ZWE0YjBiNzBmZDdjLi4w ZTQzOWQyMTkwNzRlYmI4NTUxYjk0MDY4YzE3YmJlNDc4YjBkNzYyIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHkuY3BwCisrKyBi L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJOZXR3b3JrSW5mb01hbmFnZXJQcm94eS5jcHAK QEAgLTM1LDI3ICszNSwyNyBAQAogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIAorY29uc3QgY2hhciog V2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHk6OnN1cHBsZW1lbnROYW1lKCkKK3sKKyAgICByZXR1 cm4gIldlYk5ldHdvcmtJbmZvTWFuYWdlclByb3h5IjsKK30KKwogUGFzc1JlZlB0cjxXZWJOZXR3 b3JrSW5mb01hbmFnZXJQcm94eT4gV2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHk6OmNyZWF0ZShX ZWJDb250ZXh0KiBjb250ZXh0KQogewogICAgIHJldHVybiBhZG9wdFJlZihuZXcgV2ViTmV0d29y a0luZm9NYW5hZ2VyUHJveHkoY29udGV4dCkpOwogfQogCiBXZWJOZXR3b3JrSW5mb01hbmFnZXJQ cm94eTo6V2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHkoV2ViQ29udGV4dCogY29udGV4dCkKLSAg ICA6IG1faXNVcGRhdGluZyhmYWxzZSkKLSAgICAsIG1fY29udGV4dChjb250ZXh0KQorICAgIDog V2ViQ29udGV4dFN1cHBsZW1lbnQoY29udGV4dCkKKyAgICAsIG1faXNVcGRhdGluZyhmYWxzZSkK IHsKLSAgICBtX2NvbnRleHQtPmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViTmV0d29y a0luZm9NYW5hZ2VyUHJveHk6Om1lc3NhZ2VSZWNlaXZlck5hbWUoKSwgdGhpcyk7CisgICAgV2Vi Q29udGV4dFN1cHBsZW1lbnQ6OmNvbnRleHQoKS0+YWRkTWVzc2FnZVJlY2VpdmVyKE1lc3NhZ2Vz OjpXZWJOZXR3b3JrSW5mb01hbmFnZXJQcm94eTo6bWVzc2FnZVJlY2VpdmVyTmFtZSgpLCB0aGlz KTsKIH0KIAogV2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHk6On5XZWJOZXR3b3JrSW5mb01hbmFn ZXJQcm94eSgpCiB7CiB9CiAKLXZvaWQgV2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHk6OmludmFs aWRhdGUoKQotewotICAgIHN0b3BVcGRhdGluZygpOwotfQotCiB2b2lkIFdlYk5ldHdvcmtJbmZv TWFuYWdlclByb3h5Ojppbml0aWFsaXplUHJvdmlkZXIoY29uc3QgV0tOZXR3b3JrSW5mb1Byb3Zp ZGVyKiBwcm92aWRlcikKIHsKICAgICBtX3Byb3ZpZGVyLmluaXRpYWxpemUocHJvdmlkZXIpOwpA QCAtNjMsMTAgKzYzLDMyIEBAIHZvaWQgV2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHk6OmluaXRp YWxpemVQcm92aWRlcihjb25zdCBXS05ldHdvcmtJbmZvUHJvdmlkZXIqCiAKIHZvaWQgV2ViTmV0 d29ya0luZm9NYW5hZ2VyUHJveHk6OnByb3ZpZGVyRGlkQ2hhbmdlTmV0d29ya0luZm9ybWF0aW9u KGNvbnN0IEF0b21pY1N0cmluZyYgZXZlbnRUeXBlLCBXZWJOZXR3b3JrSW5mbyogbmV0d29ya0lu Zm9ybWF0aW9uKQogewotICAgIGlmICghbV9jb250ZXh0KQorICAgIGlmICghY29udGV4dCgpKQog ICAgICAgICByZXR1cm47CiAKLSAgICBtX2NvbnRleHQtPnNlbmRUb0FsbFByb2Nlc3NlcyhNZXNz YWdlczo6V2ViTmV0d29ya0luZm9NYW5hZ2VyOjpEaWRDaGFuZ2VOZXR3b3JrSW5mb3JtYXRpb24o ZXZlbnRUeXBlLCBuZXR3b3JrSW5mb3JtYXRpb24tPmRhdGEoKSkpOworICAgIGNvbnRleHQoKS0+ c2VuZFRvQWxsUHJvY2Vzc2VzKE1lc3NhZ2VzOjpXZWJOZXR3b3JrSW5mb01hbmFnZXI6OkRpZENo YW5nZU5ldHdvcmtJbmZvcm1hdGlvbihldmVudFR5cGUsIG5ldHdvcmtJbmZvcm1hdGlvbi0+ZGF0 YSgpKSk7Cit9CisKKy8vIFdlYkNvbnRleHRTdXBwbGVtZW50CisKK3ZvaWQgV2ViTmV0d29ya0lu Zm9NYW5hZ2VyUHJveHk6OmNvbnRleHREZXN0cm95ZWQoKQoreworICAgIHN0b3BVcGRhdGluZygp OworfQorCit2b2lkIFdlYk5ldHdvcmtJbmZvTWFuYWdlclByb3h5Ojpwcm9jZXNzRGlkQ2xvc2Uo V2ViUHJvY2Vzc1Byb3h5KikKK3sKKyAgICBzdG9wVXBkYXRpbmcoKTsKK30KKwordm9pZCBXZWJO ZXR3b3JrSW5mb01hbmFnZXJQcm94eTo6cmVmV2ViQ29udGV4dFN1cHBsZW1lbnQoKQoreworICAg IEFQSU9iamVjdDo6cmVmKCk7Cit9CisKK3ZvaWQgV2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHk6 OmRlcmVmV2ViQ29udGV4dFN1cHBsZW1lbnQoKQoreworICAgIEFQSU9iamVjdDo6ZGVyZWYoKTsK IH0KIAogdm9pZCBXZWJOZXR3b3JrSW5mb01hbmFnZXJQcm94eTo6c3RhcnRVcGRhdGluZygpCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViTmV0d29ya0luZm9NYW5hZ2Vy UHJveHkuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJOZXR3b3JrSW5mb01hbmFnZXJQ cm94eS5oCmluZGV4IDUyYzY5ZjVmZDMwNTEyMzVmMzUwYzcyY2Y5MzYzZTU3MGEzYzQ1OGEuLmE3 NGEyYjhiYWJjZDU0ZDM3NGQ2MmNhYjVlMzVkMWMxMTc1M2NkZDUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJOZXR3b3JrSW5mb01hbmFnZXJQcm94eS5oCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJOZXR3b3JrSW5mb01hbmFnZXJQcm94eS5oCkBAIC0z MCw2ICszMCw3IEBACiAKICNpbmNsdWRlICJBUElPYmplY3QuaCIKICNpbmNsdWRlICJNZXNzYWdl UmVjZWl2ZXIuaCIKKyNpbmNsdWRlICJXZWJDb250ZXh0U3VwcGxlbWVudC5oIgogI2luY2x1ZGUg IldlYk5ldHdvcmtJbmZvUHJvdmlkZXIuaCIKICNpbmNsdWRlIDx3dGYvRm9yd2FyZC5oPgogCkBA IC0zOCwyMSArMzksMjkgQEAgbmFtZXNwYWNlIFdlYktpdCB7CiBjbGFzcyBXZWJDb250ZXh0Owog Y2xhc3MgV2ViTmV0d29ya0luZm87CiAKLWNsYXNzIFdlYk5ldHdvcmtJbmZvTWFuYWdlclByb3h5 IDogcHVibGljIFR5cGVkQVBJT2JqZWN0PEFQSU9iamVjdDo6VHlwZU5ldHdvcmtJbmZvTWFuYWdl cj4sIHByaXZhdGUgQ29yZUlQQzo6TWVzc2FnZVJlY2VpdmVyIHsKK2NsYXNzIFdlYk5ldHdvcmtJ bmZvTWFuYWdlclByb3h5IDogcHVibGljIFR5cGVkQVBJT2JqZWN0PEFQSU9iamVjdDo6VHlwZU5l dHdvcmtJbmZvTWFuYWdlcj4sIHB1YmxpYyBXZWJDb250ZXh0U3VwcGxlbWVudCwgcHJpdmF0ZSBD b3JlSVBDOjpNZXNzYWdlUmVjZWl2ZXIgewogcHVibGljOgorICAgIHN0YXRpYyBjb25zdCBjaGFy KiBzdXBwbGVtZW50TmFtZSgpOworCiAgICAgc3RhdGljIFBhc3NSZWZQdHI8V2ViTmV0d29ya0lu Zm9NYW5hZ2VyUHJveHk+IGNyZWF0ZShXZWJDb250ZXh0Kik7CiAgICAgdmlydHVhbCB+V2ViTmV0 d29ya0luZm9NYW5hZ2VyUHJveHkoKTsKIAotICAgIHZvaWQgaW52YWxpZGF0ZSgpOwotICAgIHZv aWQgY2xlYXJDb250ZXh0KCkgeyBtX2NvbnRleHQgPSAwOyB9Ci0KICAgICB2b2lkIGluaXRpYWxp emVQcm92aWRlcihjb25zdCBXS05ldHdvcmtJbmZvUHJvdmlkZXIqKTsKIAogICAgIHZvaWQgcHJv dmlkZXJEaWRDaGFuZ2VOZXR3b3JrSW5mb3JtYXRpb24oY29uc3QgV1RGOjpBdG9taWNTdHJpbmcm IGV2ZW50VHlwZSwgV2ViTmV0d29ya0luZm8qKTsKIAorICAgIHVzaW5nIEFQSU9iamVjdDo6cmVm OworICAgIHVzaW5nIEFQSU9iamVjdDo6ZGVyZWY7CisKIHByaXZhdGU6CiAgICAgZXhwbGljaXQg V2ViTmV0d29ya0luZm9NYW5hZ2VyUHJveHkoV2ViQ29udGV4dCopOwogCisgICAgLy8gV2ViQ29u dGV4dFN1cHBsZW1lbnQKKyAgICB2aXJ0dWFsIHZvaWQgY29udGV4dERlc3Ryb3llZCgpIE9WRVJS SURFOworICAgIHZpcnR1YWwgdm9pZCBwcm9jZXNzRGlkQ2xvc2UoV2ViUHJvY2Vzc1Byb3h5Kikg T1ZFUlJJREU7CisgICAgdmlydHVhbCB2b2lkIHJlZldlYkNvbnRleHRTdXBwbGVtZW50KCkgT1ZF UlJJREU7CisgICAgdmlydHVhbCB2b2lkIGRlcmVmV2ViQ29udGV4dFN1cHBsZW1lbnQoKSBPVkVS UklERTsKKwogICAgIC8vIENvcmVJUEM6Ok1lc3NhZ2VSZWNlaXZlcgogICAgIHZpcnR1YWwgdm9p ZCBkaWRSZWNlaXZlTWVzc2FnZShDb3JlSVBDOjpDb25uZWN0aW9uKiwgQ29yZUlQQzo6TWVzc2Fn ZURlY29kZXImKSBPVkVSUklERTsKICAgICB2aXJ0dWFsIHZvaWQgZGlkUmVjZWl2ZVN5bmNNZXNz YWdlKENvcmVJUEM6OkNvbm5lY3Rpb24qLCBDb3JlSVBDOjpNZXNzYWdlRGVjb2RlciYsIE93blB0 cjxDb3JlSVBDOjpNZXNzYWdlRW5jb2Rlcj4mKSBPVkVSUklERTsK