129453 2014-02-27 14:50:12 -0800 Simplify WebProcessProxy state accessors 2014-02-27 15:11:07 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 985360 0 andersca 2014-02-27 14:50:12 -0800 Simplify WebProcessProxy state accessors 985364 1 225416 andersca 2014-02-27 14:57:51 -0800 Created attachment 225416 Patch 985370 2 andersca 2014-02-27 15:11:07 -0800 Committed r164832: <http://trac.webkit.org/changeset/164832> 225416 2014-02-27 14:57:51 -0800 2014-02-27 15:08:46 -0800 Patch bug-129453-20140227145751.patch text/plain 14707 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTY0ODIwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggMTFiNTlhYTUxNGUyZDJk MzU4OTIwNGNmNzI0ZDAyYjM0MmVmOTcyYS4uYTI2ZjczMWIxNTNlMGY5MzA5MGM5MzhmMDRkNzI2 YmU2MmFjNTY1MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQ2IEBACiAyMDE0LTAyLTI3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgU2ltcGxpZnkgV2Vi UHJvY2Vzc1Byb3h5IHN0YXRlIGFjY2Vzc29ycworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI5NDUzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgUmVwbGFjZSBXZWJQcm9jZXNzUHJveHk6OmlzTGF1bmNoaW5n KCkgYW5kIFdlYlByb2Nlc3NQcm94eTo6aXNWYWxpZCgpIHdpdGggYSBzaW5nbGUKKyAgICAgICAg V2ViUHJvY2Vzc1Byb3h5OjpzdGF0ZSgpIHRoYXQgcmV0dXJuIG9uZSBvZiB0aHJlZSB2YWx1ZXM6 IExhdW5jaGluZywgUnVubmluZyBvciBUZXJtaW5hdGVkLgorCisgICAgICAgICogU2hhcmVkL0No aWxkUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6Q2hpbGRQcm9jZXNzUHJveHk6 OnN0YXRlKToKKyAgICAgICAgKFdlYktpdDo6Q2hpbGRQcm9jZXNzUHJveHk6OnNlbmRNZXNzYWdl KToKKyAgICAgICAgKFdlYktpdDo6Q2hpbGRQcm9jZXNzUHJveHk6OmFib3J0UHJvY2Vzc0xhdW5j aElmTmVlZGVkKToKKyAgICAgICAgKiBTaGFyZWQvQ2hpbGRQcm9jZXNzUHJveHkuaDoKKyAgICAg ICAgKFdlYktpdDo6Q2hpbGRQcm9jZXNzUHJveHk6OmNhblNlbmRNZXNzYWdlKToKKyAgICAgICAg KiBVSVByb2Nlc3MvRGF0YWJhc2VzL0RhdGFiYXNlUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAg KFdlYktpdDo6RGF0YWJhc2VQcm9jZXNzUHJveHk6OmdldERhdGFiYXNlUHJvY2Vzc0Nvbm5lY3Rp b24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuY3Bw OgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzc1Byb3h5OjpnZXROZXR3b3JrUHJvY2Vz c0Nvbm5lY3Rpb24pOgorICAgICAgICAqIFVJUHJvY2Vzcy9OZXR3b3JrL21hYy9OZXR3b3JrUHJv Y2Vzc1Byb3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzc1Byb3h5Ojpz ZXRQcm9jZXNzU3VwcHJlc3Npb25FbmFibGVkKToKKyAgICAgICAgKiBVSVByb2Nlc3MvUGx1Z2lu cy9QbHVnaW5Qcm9jZXNzUHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpQbHVnaW5Qcm9jZXNz UHJveHk6OmdldFBsdWdpblByb2Nlc3NDb25uZWN0aW9uKToKKyAgICAgICAgKFdlYktpdDo6UGx1 Z2luUHJvY2Vzc1Byb3h5OjpnZXRTaXRlc1dpdGhEYXRhKToKKyAgICAgICAgKFdlYktpdDo6UGx1 Z2luUHJvY2Vzc1Byb3h5OjpjbGVhclNpdGVEYXRhKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi UGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpXZWJQYWdlUHJv eHkpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlYXR0YWNoVG9XZWJQcm9jZXNz KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojp3YWl0Rm9yRGlkVXBkYXRlVmlld1N0 YXRlKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAg KFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjpyZXF1ZXN0VGVybWluYXRpb24pOgorICAgICAgICAo V2ViS2l0OjpXZWJQcm9jZXNzUHJveHk6OmVuYWJsZVN1ZGRlblRlcm1pbmF0aW9uKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUHJvY2Vzc1Byb3h5OjpkaXNhYmxlU3VkZGVuVGVybWluYXRpb24pOgor ICAgICAgICAqIFVJUHJvY2Vzcy9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94 eS5tbToKKyAgICAgICAgKFdlYktpdDo6VGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94 eTo6d2FpdEZvclBvc3NpYmxlR2VvbWV0cnlVcGRhdGUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9t YWMvV2ViUGFnZVByb3h5TWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnNo b3VsZERlbGF5V2luZG93T3JkZXJpbmdGb3JFdmVudCk6CisgICAgICAgICogVUlQcm9jZXNzL21h Yy9XZWJQcm9jZXNzUHJveHlNYWMubW06CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQcm94 eTo6dXBkYXRlUHJvY2Vzc1N1cHByZXNzaW9uU3RhdGUpOgorCisyMDE0LTAyLTI3ICBBbmRlcnMg Q2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKICAgICAgICAgTWFrZSBXZWJQcm9jZXNz UHJveHk6OnBhZ2VzKCkgcmV0dXJuIGFuIEl0ZXJhdG9yUmFuZ2UKICAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTQ0MAogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9TaGFyZWQvQ2hpbGRQcm9jZXNzUHJveHkuY3BwIGIvU291cmNlL1dlYktpdDIv U2hhcmVkL0NoaWxkUHJvY2Vzc1Byb3h5LmNwcAppbmRleCAyNjRkMTBiMjQ1NzhlNGEzMTJhYTQ2 ZTRlMWExZmI1ZGIxOGJjOTY4Li4zYTc3NjczMDM3YWFlOTJmNzBiOTAxYjY3ZjlhMTYwYjFhYzIz YWM0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQ2hpbGRQcm9jZXNzUHJveHku Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9DaGlsZFByb2Nlc3NQcm94eS5jcHAKQEAg LTY5LDE5ICs2OSwzMSBAQCB2b2lkIENoaWxkUHJvY2Vzc1Byb3h5Ojp0ZXJtaW5hdGUoKQogICAg ICAgICBtX3Byb2Nlc3NMYXVuY2hlci0+dGVybWluYXRlUHJvY2VzcygpOwogfQogCitDaGlsZFBy b2Nlc3NQcm94eTo6U3RhdGUgQ2hpbGRQcm9jZXNzUHJveHk6OnN0YXRlKCkgY29uc3QKK3sKKyAg ICBpZiAobV9wcm9jZXNzTGF1bmNoZXIgJiYgbV9wcm9jZXNzTGF1bmNoZXItPmlzTGF1bmNoaW5n KCkpCisgICAgICAgIHJldHVybiBDaGlsZFByb2Nlc3NQcm94eTo6U3RhdGU6OkxhdW5jaGluZzsK KworICAgIGlmICghbV9jb25uZWN0aW9uKQorICAgICAgICByZXR1cm4gQ2hpbGRQcm9jZXNzUHJv eHk6OlN0YXRlOjpUZXJtaW5hdGVkOworCisgICAgcmV0dXJuIENoaWxkUHJvY2Vzc1Byb3h5OjpT dGF0ZTo6UnVubmluZzsKK30KKwogYm9vbCBDaGlsZFByb2Nlc3NQcm94eTo6c2VuZE1lc3NhZ2Uo c3RkOjp1bmlxdWVfcHRyPElQQzo6TWVzc2FnZUVuY29kZXI+IGVuY29kZXIsIHVuc2lnbmVkIG1l c3NhZ2VTZW5kRmxhZ3MpCiB7Ci0gICAgLy8gSWYgd2UncmUgd2FpdGluZyBmb3IgdGhlIGNoaWxk IHByb2Nlc3MgdG8gbGF1bmNoLCB3ZSBuZWVkIHRvIHN0YXNoIGF3YXkgdGhlIG1lc3NhZ2VzIHNv IHdlIGNhbiBzZW5kIHRoZW0gb25jZSB3ZSBoYXZlIGEgY29ubmVjdGlvbi4KLSAgICBpZiAoaXNM YXVuY2hpbmcoKSkgeworICAgIHN3aXRjaCAoc3RhdGUoKSkgeworICAgIGNhc2UgU3RhdGU6Okxh dW5jaGluZzoKKyAgICAgICAgLy8gSWYgd2UncmUgd2FpdGluZyBmb3IgdGhlIGNoaWxkIHByb2Nl c3MgdG8gbGF1bmNoLCB3ZSBuZWVkIHRvIHN0YXNoIGF3YXkgdGhlIG1lc3NhZ2VzIHNvIHdlIGNh biBzZW5kIHRoZW0gb25jZSB3ZSBoYXZlIGEgY29ubmVjdGlvbi4KICAgICAgICAgbV9wZW5kaW5n TWVzc2FnZXMuYXBwZW5kKHN0ZDo6bWFrZV9wYWlyKHN0ZDo6bW92ZShlbmNvZGVyKSwgbWVzc2Fn ZVNlbmRGbGFncykpOwogICAgICAgICByZXR1cm4gdHJ1ZTsKLSAgICB9CiAKLSAgICAvLyBJZiB0 aGUgd2ViIHByb2Nlc3MgaGFzIGV4aXRlZCwgY29ubmVjdGlvbiB3aWxsIGJlIG51bGwgaGVyZS4K LSAgICBpZiAoIW1fY29ubmVjdGlvbikKLSAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGNhc2Ug U3RhdGU6OlJ1bm5pbmc6CisgICAgICAgIHJldHVybiBjb25uZWN0aW9uKCktPnNlbmRNZXNzYWdl KHN0ZDo6bW92ZShlbmNvZGVyKSwgbWVzc2FnZVNlbmRGbGFncyk7CiAKLSAgICByZXR1cm4gY29u bmVjdGlvbigpLT5zZW5kTWVzc2FnZShzdGQ6Om1vdmUoZW5jb2RlciksIG1lc3NhZ2VTZW5kRmxh Z3MpOworICAgIGNhc2UgU3RhdGU6OlRlcm1pbmF0ZWQ6CisgICAgICAgIHJldHVybiBmYWxzZTsK KyAgICB9CiB9CiAKIHZvaWQgQ2hpbGRQcm9jZXNzUHJveHk6OmFkZE1lc3NhZ2VSZWNlaXZlcihJ UEM6OlN0cmluZ1JlZmVyZW5jZSBtZXNzYWdlUmVjZWl2ZXJOYW1lLCBJUEM6Ok1lc3NhZ2VSZWNl aXZlciYgbWVzc2FnZVJlY2VpdmVyKQpAQCAtMTA5LDE0ICsxMjEsNiBAQCBib29sIENoaWxkUHJv Y2Vzc1Byb3h5OjpkaXNwYXRjaFN5bmNNZXNzYWdlKElQQzo6Q29ubmVjdGlvbiogY29ubmVjdGlv biwgSVBDOjpNZQogICAgIHJldHVybiBtX21lc3NhZ2VSZWNlaXZlck1hcC5kaXNwYXRjaFN5bmNN ZXNzYWdlKGNvbm5lY3Rpb24sIGRlY29kZXIsIHJlcGx5RW5jb2Rlcik7CiB9CiAKLWJvb2wgQ2hp bGRQcm9jZXNzUHJveHk6OmlzTGF1bmNoaW5nKCkgY29uc3QKLXsKLSAgICBpZiAobV9wcm9jZXNz TGF1bmNoZXIpCi0gICAgICAgIHJldHVybiBtX3Byb2Nlc3NMYXVuY2hlci0+aXNMYXVuY2hpbmco KTsKLQotICAgIHJldHVybiBmYWxzZTsKLX0KLQogdm9pZCBDaGlsZFByb2Nlc3NQcm94eTo6ZGlk RmluaXNoTGF1bmNoaW5nKFByb2Nlc3NMYXVuY2hlciosIElQQzo6Q29ubmVjdGlvbjo6SWRlbnRp ZmllciBjb25uZWN0aW9uSWRlbnRpZmllcikKIHsKICAgICBBU1NFUlQoIW1fY29ubmVjdGlvbik7 CkBAIC0xNDAsMTEgKzE0NCwxMSBAQCB2b2lkIENoaWxkUHJvY2Vzc1Byb3h5OjpkaWRGaW5pc2hM YXVuY2hpbmcoUHJvY2Vzc0xhdW5jaGVyKiwgSVBDOjpDb25uZWN0aW9uOjpJZAogCiB2b2lkIENo aWxkUHJvY2Vzc1Byb3h5OjphYm9ydFByb2Nlc3NMYXVuY2hJZk5lZWRlZCgpCiB7Ci0gICAgaWYg KCFpc0xhdW5jaGluZygpKQorICAgIGlmIChzdGF0ZSgpICE9IFN0YXRlOjpMYXVuY2hpbmcpCiAg ICAgICAgIHJldHVybjsKIAogICAgIG1fcHJvY2Vzc0xhdW5jaGVyLT5pbnZhbGlkYXRlKCk7Ci0g ICAgbV9wcm9jZXNzTGF1bmNoZXIgPSAwOworICAgIG1fcHJvY2Vzc0xhdW5jaGVyID0gbnVsbHB0 cjsKIH0KIAogdm9pZCBDaGlsZFByb2Nlc3NQcm94eTo6Y2xlYXJDb25uZWN0aW9uKCkKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1NoYXJlZC9DaGlsZFByb2Nlc3NQcm94eS5oIGIvU291cmNl L1dlYktpdDIvU2hhcmVkL0NoaWxkUHJvY2Vzc1Byb3h5LmgKaW5kZXggZjUzYjk4YTUyNmRiYTIy ZWI2NGQ5Y2U4NDE1OGVlYTIyYzg2MmY3YS4uYjYxYjE5YjQxMTRiNGViMDUyYTcxZWQ5NTJhN2Ew YzIwZTAyZTNmMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0NoaWxkUHJvY2Vz c1Byb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL0NoaWxkUHJvY2Vzc1Byb3h5LmgK QEAgLTYwLDkgKzYwLDE1IEBAIHB1YmxpYzoKICAgICB2b2lkIGFkZE1lc3NhZ2VSZWNlaXZlcihJ UEM6OlN0cmluZ1JlZmVyZW5jZSBtZXNzYWdlUmVjZWl2ZXJOYW1lLCB1aW50NjRfdCBkZXN0aW5h dGlvbklELCBJUEM6Ok1lc3NhZ2VSZWNlaXZlciYpOwogICAgIHZvaWQgcmVtb3ZlTWVzc2FnZVJl Y2VpdmVyKElQQzo6U3RyaW5nUmVmZXJlbmNlIG1lc3NhZ2VSZWNlaXZlck5hbWUsIHVpbnQ2NF90 IGRlc3RpbmF0aW9uSUQpOwogCi0gICAgYm9vbCBpc1ZhbGlkKCkgY29uc3QgeyByZXR1cm4gbV9j b25uZWN0aW9uOyB9Ci0gICAgYm9vbCBpc0xhdW5jaGluZygpIGNvbnN0OwotICAgIGJvb2wgY2Fu U2VuZE1lc3NhZ2UoKSBjb25zdCB7IHJldHVybiBpc1ZhbGlkKCkgfHwgaXNMYXVuY2hpbmcoKTsg fQorICAgIGVudW0gY2xhc3MgU3RhdGUgeworICAgICAgICBMYXVuY2hpbmcsCisgICAgICAgIFJ1 bm5pbmcsCisgICAgICAgIFRlcm1pbmF0ZWQsCisgICAgfTsKKyAgICBTdGF0ZSBzdGF0ZSgpIGNv bnN0OworCisvLyAgICBib29sIGlzVmFsaWQoKSBjb25zdCB7IHJldHVybiBtX2Nvbm5lY3Rpb247 IH0KKyAgICBib29sIGNhblNlbmRNZXNzYWdlKCkgY29uc3QgeyByZXR1cm4gc3RhdGUoKSAhPSBT dGF0ZTo6VGVybWluYXRlZDt9CiAKICAgICBQbGF0Zm9ybVByb2Nlc3NJZGVudGlmaWVyIHByb2Nl c3NJZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9wcm9jZXNzTGF1bmNoZXItPnByb2Nlc3NJ ZGVudGlmaWVyKCk7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Rh dGFiYXNlcy9EYXRhYmFzZVByb2Nlc3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvRGF0YWJhc2VzL0RhdGFiYXNlUHJvY2Vzc1Byb3h5LmNwcAppbmRleCA4NDFhNzk4Y2JjZDQ2 ZDhlZTJhNjMxZGVhYWY4MTk5NDcxMGQ4NTJlLi5iYjlkNTM0MmZhYWY2NjU1ZWQxYzM4ZTY2ODEy M2Q5NjZiMjhlZTYxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRGF0YWJh c2VzL0RhdGFiYXNlUHJvY2Vzc1Byb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvRGF0YWJhc2VzL0RhdGFiYXNlUHJvY2Vzc1Byb3h5LmNwcApAQCAtNzAsNyArNzAsNyBAQCB2 b2lkIERhdGFiYXNlUHJvY2Vzc1Byb3h5OjpnZXREYXRhYmFzZVByb2Nlc3NDb25uZWN0aW9uKFBh c3NSZWZQdHI8TWVzc2FnZXM6OldlYgogewogICAgIG1fcGVuZGluZ0Nvbm5lY3Rpb25SZXBsaWVz LmFwcGVuZChyZXBseSk7CiAKLSAgICBpZiAoaXNMYXVuY2hpbmcoKSkgeworICAgIGlmIChzdGF0 ZSgpID09IFN0YXRlOjpMYXVuY2hpbmcpIHsKICAgICAgICAgbV9udW1QZW5kaW5nQ29ubmVjdGlv blJlcXVlc3RzKys7CiAgICAgICAgIHJldHVybjsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuY3BwCmluZGV4 IDhkODZiZjE0MDQ4OWIwMmFiZjY2ODVjOTQ4NWJlZjNhZjk4YzQyOWQuLjA2N2UzMGVmMzNjMmZh Y2I5ZjliZmEzYzNiMzJjZjkxZTVlM2EwZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuY3BwCkBAIC04Nyw3ICs4 Nyw3IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3NQcm94eTo6Z2V0TmV0d29ya1Byb2Nlc3NDb25uZWN0 aW9uKFBhc3NSZWZQdHI8TWVzc2FnZXM6OldlYlByCiB7CiAgICAgbV9wZW5kaW5nQ29ubmVjdGlv blJlcGxpZXMuYXBwZW5kKHJlcGx5KTsKIAotICAgIGlmIChpc0xhdW5jaGluZygpKSB7CisgICAg aWYgKHN0YXRlKCkgPT0gU3RhdGU6OkxhdW5jaGluZykgewogICAgICAgICBtX251bVBlbmRpbmdD b25uZWN0aW9uUmVxdWVzdHMrKzsKICAgICAgICAgcmV0dXJuOwogICAgIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9OZXR3b3JrL21hYy9OZXR3b3JrUHJvY2Vzc1Byb3h5 TWFjLm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvbWFjL05ldHdvcmtQcm9j ZXNzUHJveHlNYWMubW0KaW5kZXggZjA2M2VhODM5ZGVmNjVkNmRmMzk1OTQ4ZWRiZGM0ODEzOTRj ZGQ3NC4uZmZiNWQzYTI5YjcyMzQ2M2E0ZDc0MTg3MjU5NDBhMWMxNjg5MWU5OSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvbWFjL05ldHdvcmtQcm9jZXNzUHJv eHlNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL05ldHdvcmsvbWFjL05ldHdv cmtQcm9jZXNzUHJveHlNYWMubW0KQEAgLTM2LDcgKzM2LDcgQEAgbmFtZXNwYWNlIFdlYktpdCB7 CiAKIHZvaWQgTmV0d29ya1Byb2Nlc3NQcm94eTo6c2V0UHJvY2Vzc1N1cHByZXNzaW9uRW5hYmxl ZChib29sIHByb2Nlc3NTdXBwcmVzc2lvbkVuYWJsZWQpCiB7Ci0gICAgaWYgKCFpc1ZhbGlkKCkp CisgICAgaWYgKHN0YXRlKCkgIT0gU3RhdGU6OlJ1bm5pbmcpCiAgICAgICAgIHJldHVybjsKICAg ICAKICAgICBjb25uZWN0aW9uKCktPnNlbmQoTWVzc2FnZXM6Ok5ldHdvcmtQcm9jZXNzOjpTZXRQ cm9jZXNzU3VwcHJlc3Npb25FbmFibGVkKHByb2Nlc3NTdXBwcmVzc2lvbkVuYWJsZWQpLCAwKTsK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nl c3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5Qcm9j ZXNzUHJveHkuY3BwCmluZGV4IDJjMTVmNWU2YjgzMGE2MjI4NDI4OTRlNjFlMjA0YzJmYzAzOTNh MGQuLjRlNGYzMGNjYzU5YjE5M2I4OTdiODNlYmU3ZDdlMTk1ODgxNDIxNTcgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpblByb2Nlc3NQcm94eS5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luUHJvY2Vzc1Byb3h5 LmNwcApAQCAtODgsNyArODgsNyBAQCB2b2lkIFBsdWdpblByb2Nlc3NQcm94eTo6Z2V0UGx1Z2lu UHJvY2Vzc0Nvbm5lY3Rpb24oUGFzc1JlZlB0cjxNZXNzYWdlczo6V2ViUHJvYwogewogICAgIG1f cGVuZGluZ0Nvbm5lY3Rpb25SZXBsaWVzLmFwcGVuZChyZXBseSk7CiAKLSAgICBpZiAoaXNMYXVu Y2hpbmcoKSkgeworICAgIGlmIChzdGF0ZSgpID09IFN0YXRlOjpMYXVuY2hpbmcpIHsKICAgICAg ICAgbV9udW1QZW5kaW5nQ29ubmVjdGlvblJlcXVlc3RzKys7CiAgICAgICAgIHJldHVybjsKICAg ICB9CkBAIC0xMDMsNyArMTAzLDcgQEAgdm9pZCBQbHVnaW5Qcm9jZXNzUHJveHk6OmdldFNpdGVz V2l0aERhdGEoV2ViUGx1Z2luU2l0ZURhdGFNYW5hZ2VyKiB3ZWJQbHVnaW5TaXQKICAgICBBU1NF UlQoIW1fcGVuZGluZ0dldFNpdGVzUmVwbGllcy5jb250YWlucyhjYWxsYmFja0lEKSk7CiAgICAg bV9wZW5kaW5nR2V0U2l0ZXNSZXBsaWVzLnNldChjYWxsYmFja0lELCB3ZWJQbHVnaW5TaXRlRGF0 YU1hbmFnZXIpOwogCi0gICAgaWYgKGlzTGF1bmNoaW5nKCkpIHsKKyAgICBpZiAoc3RhdGUoKSA9 PSBTdGF0ZTo6TGF1bmNoaW5nKSB7CiAgICAgICAgIG1fcGVuZGluZ0dldFNpdGVzUmVxdWVzdHMu YXBwZW5kKGNhbGxiYWNrSUQpOwogICAgICAgICByZXR1cm47CiAgICAgfQpAQCAtMTE3LDcgKzEx Nyw3IEBAIHZvaWQgUGx1Z2luUHJvY2Vzc1Byb3h5OjpjbGVhclNpdGVEYXRhKFdlYlBsdWdpblNp dGVEYXRhTWFuYWdlciogd2ViUGx1Z2luU2l0ZURhCiAgICAgQVNTRVJUKCFtX3BlbmRpbmdDbGVh clNpdGVEYXRhUmVwbGllcy5jb250YWlucyhjYWxsYmFja0lEKSk7CiAgICAgbV9wZW5kaW5nQ2xl YXJTaXRlRGF0YVJlcGxpZXMuc2V0KGNhbGxiYWNrSUQsIHdlYlBsdWdpblNpdGVEYXRhTWFuYWdl cik7CiAKLSAgICBpZiAoaXNMYXVuY2hpbmcoKSkgeworICAgIGlmIChzdGF0ZSgpID09IFN0YXRl OjpMYXVuY2hpbmcpIHsKICAgICAgICAgQ2xlYXJTaXRlRGF0YVJlcXVlc3QgcmVxdWVzdDsKICAg ICAgICAgcmVxdWVzdC5zaXRlcyA9IHNpdGVzOwogICAgICAgICByZXF1ZXN0LmZsYWdzID0gZmxh Z3M7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNw cCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDVjOGVj NzNhYjA2Yzk4NTZhNWFhNTQ0YWM4YzljMDU5NGM5MDBlMDkuLmEzZTFkMDMwNzI4MWIwM2EzNDM4 NzVkZmI2MDVlOTIzNDI4ODNlMzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwCkBAIC0zNzEsNyArMzcxLDggQEAgV2ViUGFnZVByb3h5OjpXZWJQYWdlUHJveHko UGFnZUNsaWVudCYgcGFnZUNsaWVudCwgV2ViUHJvY2Vzc1Byb3h5JiBwcm9jZXNzLCB1aW4KICAg ICBtX3Byb2Nlc3MtPmFkZE1lc3NhZ2VSZWNlaXZlcihNZXNzYWdlczo6V2ViUGFnZVByb3h5Ojpt ZXNzYWdlUmVjZWl2ZXJOYW1lKCksIG1fcGFnZUlELCAqdGhpcyk7CiAKICAgICAvLyBGSVhNRTog SWYgd2UgZXZlciBleHBvc2UgdGhlIHNlc3Npb24gc3RvcmFnZSBzaXplIGFzIGEgcHJlZmVyZW5j ZSwgd2UgbmVlZCB0byBwYXNzIGl0IGhlcmUuCi0gICAgbV9wcm9jZXNzLT5jb250ZXh0KCkuc3Rv cmFnZU1hbmFnZXIoKS5jcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFjZShtX3BhZ2VJRCwgbV9w cm9jZXNzLT5pc1ZhbGlkKCkgPyBtX3Byb2Nlc3MtPmNvbm5lY3Rpb24oKSA6IDAsIHN0ZDo6bnVt ZXJpY19saW1pdHM8dW5zaWduZWQ+OjptYXgoKSk7CisgICAgSVBDOjpDb25uZWN0aW9uKiBjb25u ZWN0aW9uID0gbV9wcm9jZXNzLT5zdGF0ZSgpID09IFdlYlByb2Nlc3NQcm94eTo6U3RhdGU6OlJ1 bm5pbmcgPyBtX3Byb2Nlc3MtPmNvbm5lY3Rpb24oKSA6IG51bGxwdHI7CisgICAgbV9wcm9jZXNz LT5jb250ZXh0KCkuc3RvcmFnZU1hbmFnZXIoKS5jcmVhdGVTZXNzaW9uU3RvcmFnZU5hbWVzcGFj ZShtX3BhZ2VJRCwgY29ubmVjdGlvbiwgc3RkOjpudW1lcmljX2xpbWl0czx1bnNpZ25lZD46Om1h eCgpKTsKICAgICBzZXRTZXNzaW9uKCpjb25maWd1cmF0aW9uLnNlc3Npb24pOwogfQogCkBAIC00 ODMsOCArNDg0LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmluaXRpYWxpemVDb250ZXh0TWVudUNs aWVudChjb25zdCBXS1BhZ2VDb250ZXh0TWVudUNsaWVudEJhc2UKIHZvaWQgV2ViUGFnZVByb3h5 OjpyZWF0dGFjaFRvV2ViUHJvY2VzcygpCiB7CiAgICAgQVNTRVJUKCFpc1ZhbGlkKCkpOwotICAg IEFTU0VSVCghbV9wcm9jZXNzLT5pc1ZhbGlkKCkpOwotICAgIEFTU0VSVCghbV9wcm9jZXNzLT5p c0xhdW5jaGluZygpKTsKKyAgICBBU1NFUlQobV9wcm9jZXNzLT5zdGF0ZSgpID09IFdlYlByb2Nl c3NQcm94eTo6U3RhdGU6OlRlcm1pbmF0ZWQpOwogCiAgICAgdXBkYXRlVmlld1N0YXRlKCk7CiAK QEAgLTEwMzEsNyArMTAzMSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojp3YWl0Rm9yRGlkVXBkYXRl Vmlld1N0YXRlKCkKIAogICAgIG1fd2FpdGluZ0ZvckRpZFVwZGF0ZVZpZXdTdGF0ZSA9IHRydWU7 CiAKLSAgICBpZiAoIW1fcHJvY2Vzcy0+aXNMYXVuY2hpbmcoKSkgeworICAgIGlmIChtX3Byb2Nl c3MtPnN0YXRlKCkgIT0gV2ViUHJvY2Vzc1Byb3h5OjpTdGF0ZTo6TGF1bmNoaW5nKSB7CiAgICAg ICAgIGF1dG8gdmlld1N0YXRlVXBkYXRlVGltZW91dCA9IHN0ZDo6Y2hyb25vOjptaWxsaXNlY29u ZHMoMjUwKTsKICAgICAgICAgbV9wcm9jZXNzLT5jb25uZWN0aW9uKCktPndhaXRGb3JBbmREaXNw YXRjaEltbWVkaWF0ZWx5PE1lc3NhZ2VzOjpXZWJQYWdlUHJveHk6OkRpZFVwZGF0ZVZpZXdTdGF0 ZT4obV9wYWdlSUQsIHZpZXdTdGF0ZVVwZGF0ZVRpbWVvdXQpOwogICAgIH0KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKaW5kZXggYTk5NjNlMTE4MDA2YTll ZmYyYTlhNGE0NGMxYzU3M2I5ZmIwNGNkMi4uMjJmOWFjMDQ4YjdjNDQyZWFjMTdiZTUzOWQzYTZl ZjEyYWNmZjYzNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nl c3NQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94 eS5jcHAKQEAgLTY0Niw3ICs2NDYsNyBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6d2luZG93U2Vy dmVyQ29ubmVjdGlvblN0YXRlQ2hhbmdlZCgpCiAKIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjpyZXF1 ZXN0VGVybWluYXRpb24oKQogewotICAgIGlmICghaXNWYWxpZCgpKQorICAgIGlmIChzdGF0ZSgp ICE9IFN0YXRlOjpSdW5uaW5nKQogICAgICAgICByZXR1cm47CiAKICAgICBDaGlsZFByb2Nlc3NQ cm94eTo6dGVybWluYXRlKCk7CkBAIC02NTksNyArNjU5LDcgQEAgdm9pZCBXZWJQcm9jZXNzUHJv eHk6OnJlcXVlc3RUZXJtaW5hdGlvbigpCiAKIHZvaWQgV2ViUHJvY2Vzc1Byb3h5OjplbmFibGVT dWRkZW5UZXJtaW5hdGlvbigpCiB7Ci0gICAgaWYgKCFpc1ZhbGlkKCkpCisgICAgaWYgKHN0YXRl KCkgIT0gU3RhdGU6OlJ1bm5pbmcpCiAgICAgICAgIHJldHVybjsKIAogICAgIEFTU0VSVChtX251 bWJlck9mVGltZXNTdWRkZW5UZXJtaW5hdGlvbldhc0Rpc2FibGVkKTsKQEAgLTY2OSw3ICs2Njks NyBAQCB2b2lkIFdlYlByb2Nlc3NQcm94eTo6ZW5hYmxlU3VkZGVuVGVybWluYXRpb24oKQogCiB2 b2lkIFdlYlByb2Nlc3NQcm94eTo6ZGlzYWJsZVN1ZGRlblRlcm1pbmF0aW9uKCkKIHsKLSAgICBp ZiAoIWlzVmFsaWQoKSkKKyAgICBpZiAoc3RhdGUoKSAhPSBTdGF0ZTo6UnVubmluZykKICAgICAg ICAgcmV0dXJuOwogCiAgICAgV2ViQ29yZTo6ZGlzYWJsZVN1ZGRlblRlcm1pbmF0aW9uKCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1RpbGVkQ29yZUFuaW1hdGlv bkRyYXdpbmdBcmVhUHJveHkubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1RpbGVk Q29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHkubW0KaW5kZXggNTIzZDk5YTE5NThkMDQyYzlk MTI4NjgxMzFlNzI2Zjc2YzFmZmQyMy4uYWUwNmNkM2RkMmYwODk2NTNmZWRjZjdjODNkMzk5ZTQy OGExY2ViZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9UaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYVByb3h5Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWFQcm94eS5tbQpAQCAtNzIsNyAr NzIsNyBAQCB2b2lkIFRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdBcmVhUHJveHk6OndhaXRGb3JQ b3NzaWJsZUdlb21ldHJ5VXBkYXRlKHN0ZDo6Y2hybwogICAgIGlmICghbV9pc1dhaXRpbmdGb3JE aWRVcGRhdGVHZW9tZXRyeSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKG1fd2ViUGFnZVBy b3h5LT5wcm9jZXNzKCkuaXNMYXVuY2hpbmcoKSkKKyAgICBpZiAobV93ZWJQYWdlUHJveHktPnBy b2Nlc3MoKS5zdGF0ZSgpICE9IFdlYlByb2Nlc3NQcm94eTo6U3RhdGU6OlJ1bm5pbmcpCiAgICAg ICAgIHJldHVybjsKIAogICAgIG1fd2ViUGFnZVByb3h5LT5wcm9jZXNzKCkuY29ubmVjdGlvbigp LT53YWl0Rm9yQW5kRGlzcGF0Y2hJbW1lZGlhdGVseTxNZXNzYWdlczo6RHJhd2luZ0FyZWFQcm94 eTo6RGlkVXBkYXRlR2VvbWV0cnk+KG1fd2ViUGFnZVByb3h5LT5wYWdlSUQoKSwgdGltZW91dCk7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvbWFjL1dlYlBhZ2VQcm94eU1h Yy5tbSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCmlu ZGV4IGU1YmU0OGNiMGFlOTUyMTNlN2JlMDk3MTk1ZWE5ZGE4MWY3OTNkMDkuLjJhMGU1NGVjYWE5 NDMyNWYxZTk0MzU0ZDBiNjE1M2FhMGIzZjIwZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9tYWMvV2ViUGFnZVByb3h5TWFjLm1tCkBAIC00MzcsNyArNDM3LDcgQEAgdm9pZCBX ZWJQYWdlUHJveHk6OmV4ZWN1dGVTYXZlZENvbW1hbmRCeVNlbGVjdG9yKGNvbnN0IFN0cmluZyYg c2VsZWN0b3IsIGJvb2wmIGgKIAogYm9vbCBXZWJQYWdlUHJveHk6OnNob3VsZERlbGF5V2luZG93 T3JkZXJpbmdGb3JFdmVudChjb25zdCBXZWJLaXQ6OldlYk1vdXNlRXZlbnQmIGV2ZW50KQogewot ICAgIGlmICghcHJvY2VzcygpLmlzVmFsaWQoKSkKKyAgICBpZiAocHJvY2VzcygpLnN0YXRlKCkg IT0gV2ViUHJvY2Vzc1Byb3h5OjpTdGF0ZTo6UnVubmluZykKICAgICAgICAgcmV0dXJuIGZhbHNl OwogCiAgICAgYm9vbCByZXN1bHQgPSBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9tYWMvV2ViUHJvY2Vzc1Byb3h5TWFjLm1tIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL21hYy9XZWJQcm9jZXNzUHJveHlNYWMubW0KaW5kZXggOTk0MGY5NDAxODhlOWEwNzgx YjhhNjMxYTNkZWZkZWMzNWZkYmY1NS4uZWZmYzIwYmQ5ZWQ1MzE5OTE0YzAyZDg3NjA3ODkwNGM2 MWEzODQ5ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQcm9j ZXNzUHJveHlNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL21hYy9XZWJQcm9j ZXNzUHJveHlNYWMubW0KQEAgLTY4LDcgKzY4LDcgQEAgYm9vbCBXZWJQcm9jZXNzUHJveHk6OmFs bFBhZ2VzQXJlUHJvY2Vzc1N1cHByZXNzaWJsZSgpIGNvbnN0CiAKIHZvaWQgV2ViUHJvY2Vzc1By b3h5Ojp1cGRhdGVQcm9jZXNzU3VwcHJlc3Npb25TdGF0ZSgpCiB7Ci0gICAgaWYgKCFpc1ZhbGlk KCkpCisgICAgaWYgKHN0YXRlKCkgIT0gU3RhdGU6OlJ1bm5pbmcpCiAgICAgICAgIHJldHVybjsK IAogICAgIGJvb2wgY2FuRW5hYmxlID0gYWxsUGFnZXNBcmVQcm9jZXNzU3VwcHJlc3NpYmxlKCk7 Cg==