150825 2015-11-02 17:00:40 -0800 CTTE the responsiveness timer getter 2015-11-03 10:45:33 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca dbates ossy oldest_to_newest 1138771 0 andersca 2015-11-02 17:00:40 -0800 CTTE the responsiveness timer getter 1138775 1 264647 andersca 2015-11-02 17:08:56 -0800 Created attachment 264647 Patch 1138777 2 264647 dbates 2015-11-02 17:13:40 -0800 Comment on attachment 264647 Patch Please fix the EFL build before landing. 1138934 3 264693 ossy 2015-11-03 08:09:29 -0800 Created attachment 264693 GTK/EFL buildfix It fixes the EFL build, please integrate it to your patch before landing. (I think it fixes GTK too, but I haven't tested it.) 1138937 4 264694 ossy 2015-11-03 08:56:27 -0800 Created attachment 264694 GTK and EFL buildfix fixed EFL and GTK build too 1138972 5 andersca 2015-11-03 10:45:33 -0800 Committed r191959: <http://trac.webkit.org/changeset/191959> 264647 2015-11-02 17:08:56 -0800 2015-11-02 17:13:40 -0800 Patch bug-150825-20151102170804.patch text/plain 21345 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTkxOTI0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggODA0NjIzN2NjZGU1NDlj MjMwZjUwZGE1MTg2YTQ1NjAzNzVjODA0Ny4uYjQ4ZjU2YzY5OGRlNGI5MDhhOWMyNDgyZWNkZDM0 YjhiMmY3YTZiOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDU3IEBACiAyMDE1LTExLTAyICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQ1RURSB0aGUgcmVz cG9uc2l2ZW5lc3MgdGltZXIgZ2V0dGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xNTA4MjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9tYWMvV0tQYWdlUHJpdmF0ZU1hYy5t bToKKyAgICAgICAgKC1bV0tPYnNlcnZhYmxlUGFnZVN0YXRlIF93ZWJQcm9jZXNzSXNSZXNwb25z aXZlXSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Jyb3dzaW5nQ29udGV4dENv bnRyb2xsZXIubW06CisgICAgICAgICgtW1dLQnJvd3NpbmdDb250ZXh0Q29udHJvbGxlciBfd2Vi UHJvY2Vzc0lzUmVzcG9uc2l2ZV0pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tX ZWJWaWV3Lm1tOgorICAgICAgICAoLVtXS1dlYlZpZXcgX3dlYlByb2Nlc3NJc1Jlc3BvbnNpdmVd KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZVByb3h5OjpyZWF0dGFjaFRvV2ViUHJvY2Vzc0ZvclJlbG9hZCk6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6cmVhdHRhY2hUb1dlYlByb2Nlc3NXaXRoSXRlbSk6Cisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6dHJ5Q2xvc2UpOgorICAgICAgICAoV2ViS2l0 OjpXZWJQYWdlUHJveHk6OmxvYWRSZXF1ZXN0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVBy b3h5Ojpsb2FkRmlsZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bG9hZERhdGEp OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmxvYWRIVE1MU3RyaW5nKToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpsb2FkQWx0ZXJuYXRlSFRNTFN0cmluZyk6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bG9hZFBsYWluVGV4dFN0cmluZyk6CisgICAgICAg IChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6bG9hZFdlYkFyY2hpdmVEYXRhKToKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZVByb3h5OjpuYXZpZ2F0ZVRvUERGTGlua1dpdGhTaW11bGF0ZWRDbGljayk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c3RvcExvYWRpbmcpOgorICAgICAgICAo V2ViS2l0OjpXZWJQYWdlUHJveHk6OnJlbG9hZCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6Z29Gb3J3YXJkKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpnb0JhY2sp OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmdvVG9CYWNrRm9yd2FyZEl0ZW0pOgor ICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpc3BhdGNoVmlld1N0YXRlQ2hhbmdlKToK KyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpoYW5kbGVNb3VzZUV2ZW50KToKKyAgICAg ICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpzZW5kV2hlZWxFdmVudCk6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2VQcm94eTo6aGFuZGxlS2V5Ym9hcmRFdmVudCk6CisgICAgICAgIChXZWJLaXQ6 OldlYlBhZ2VQcm94eTo6aGFuZGxlR2VzdHVyZUV2ZW50KToKKyAgICAgICAgKFdlYktpdDo6V2Vi UGFnZVByb3h5OjpoYW5kbGVUb3VjaEV2ZW50U3luY2hyb25vdXNseSk6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2VQcm94eTo6aGFuZGxlVG91Y2hFdmVudCk6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2VQcm94eTo6Y2xvc2VQYWdlKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5Ojpy dW5KYXZhU2NyaXB0QWxlcnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJ1bkph dmFTY3JpcHRDb25maXJtKToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpydW5KYXZh U2NyaXB0UHJvbXB0KToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpydW5CZWZvcmVV bmxvYWRDb25maXJtUGFuZWwpOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJ1bk9w ZW5QYW5lbCk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c2hvd1BvcHVwTWVudSk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6aW50ZXJuYWxTaG93Q29udGV4dE1lbnUp OgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmRpZFJlY2VpdmVFdmVudCk6CisgICAg ICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6c3RvcFJlc3BvbnNpdmVuZXNzVGltZXIpOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnJ1bk1vZGFsKToKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZVByb3h5Ojp1cGRhdGVCYWNraW5nU3RvcmVEaXNjYXJkYWJsZVN0YXRlKToKKyAgICAg ICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5Lmg6CisgICAgICAgIChXZWJLaXQ6OldlYlBy b2Nlc3NQcm94eTo6cmVzcG9uc2l2ZW5lc3NUaW1lcik6CisKKzIwMTUtMTEtMDIgIEFuZGVycyBD YXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBBZGQgS1ZPLWNvbXBsaWFu dCBfd2ViUHJvY2Vzc0lzUmVzcG9uc2l2ZSBwcm9wZXJ0eSB0byBXS1dlYlZpZXcgYW5kIF9XS09i c2VydmFibGVQYWdlU3RhdGUKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE1MDgxOAogICAgICAgICByZGFyOi8vcHJvYmxlbS8yMjM3MjEzMQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL21hYy9XS1BhZ2VQcml2YXRlTWFj Lm1tIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL21hYy9XS1BhZ2VQcml2YXRlTWFj Lm1tCmluZGV4IDMwYWFkMTk4MDRjNWY0NGEwMjAwOGU4NTViYjc5NWE5ZTY2NDM2NTMuLjE3MGM2 ZDhlNDRlN2Q0ZDAzZjJjMmY3MDRmMWMwZGEzZGQ0MWI5MzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9tYWMvV0tQYWdlUHJpdmF0ZU1hYy5tbQorKysgYi9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvbWFjL1dLUGFnZVByaXZhdGVNYWMubW0KQEAgLTg3 LDcgKzg3LDcgQEAgdXNpbmcgbmFtZXNwYWNlIFdlYktpdDsKIAogLSAoQk9PTClfd2ViUHJvY2Vz c0lzUmVzcG9uc2l2ZQogewotICAgIHJldHVybiBfcGFnZS0+cHJvY2VzcygpLnJlc3BvbnNpdmVu ZXNzVGltZXIoKS0+aXNSZXNwb25zaXZlKCk7CisgICAgcmV0dXJuIF9wYWdlLT5wcm9jZXNzKCku cmVzcG9uc2l2ZW5lc3NUaW1lcigpLmlzUmVzcG9uc2l2ZSgpOwogfQogCiAtIChkb3VibGUpZXN0 aW1hdGVkUHJvZ3Jlc3MKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkv Q29jb2EvV0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyLm1tIGIvU291cmNlL1dlYktpdDIvVUlQ cm9jZXNzL0FQSS9Db2NvYS9XS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIubW0KaW5kZXggYzk4 OGMxNjZmNjg4MGMzMDMwMTgzMmY4NWM5MzM1ZjFhMjk1MzczZC4uZGUyZjNhYWRhMmJhYjQzMDkx ZDg4OGM1MjE5NmYzMDM2YTU0YmNiNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIubW0KKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIu bW0KQEAgLTc2OSw3ICs3NjksNyBAQCBzdGF0aWMgdm9pZCBzZXRVcFBhZ2VQb2xpY3lDbGllbnQo V0tCcm93c2luZ0NvbnRleHRDb250cm9sbGVyICpicm93c2luZ0NvbnRleHQsCiAKIC0gKEJPT0wp X3dlYlByb2Nlc3NJc1Jlc3BvbnNpdmUKIHsKLSAgICByZXR1cm4gX3BhZ2UtPnByb2Nlc3MoKS5y ZXNwb25zaXZlbmVzc1RpbWVyKCktPmlzUmVzcG9uc2l2ZSgpOworICAgIHJldHVybiBfcGFnZS0+ cHJvY2VzcygpLnJlc3BvbnNpdmVuZXNzVGltZXIoKS5pc1Jlc3BvbnNpdmUoKTsKIH0KIAogQGVu ZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZp ZXcubW0gYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpp bmRleCAxYjhmZGU5ODQyNzk1OWRjZGI3Y2M4NjQ5NDU0MGVlMzFiZDg0MzJmLi5iNGY1NzYyYjM1 NDMyNDhmZjQ0ODY0NTRjYTBjNjE4OWRjZTVlNjRkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQpAQCAtNDAwNCw3ICs0MDA0LDcgQEAgc3Rh dGljIGlubGluZSBXZWJLaXQ6OkZpbmRPcHRpb25zIHRvRmluZE9wdGlvbnMoX1dLRmluZE9wdGlv bnMgd2tGaW5kT3B0aW9ucykKIAogLSAoQk9PTClfd2ViUHJvY2Vzc0lzUmVzcG9uc2l2ZQogewot ICAgIHJldHVybiBfcGFnZS0+cHJvY2VzcygpLnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+aXNSZXNw b25zaXZlKCk7CisgICAgcmV0dXJuIF9wYWdlLT5wcm9jZXNzKCkucmVzcG9uc2l2ZW5lc3NUaW1l cigpLmlzUmVzcG9uc2l2ZSgpOwogfQogCiBAZW5kCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwCmluZGV4IDA5OGE3ODRhNTNkMmE2ZjNlMmQ4MzI3ZWE1NmZkMGYzZjdi MTM3Y2QuLjY5YTUzYjc5NzIzOTk1MzVhNGI0NTU3NzI1Nzc5NDJlNGVmMDIyOTEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC03NDAsNyArNzQwLDcgQEAg UmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gV2ViUGFnZVByb3h5OjpyZWF0dGFjaFRvV2ViUHJvY2Vz c0ZvclJlbG9hZCgpCiAKICAgICAvLyBXZSBhbGxvdyBzdGFsZSBjb250ZW50IHdoZW4gcmVsb2Fk aW5nIGEgV2ViUHJvY2VzcyB0aGF0J3MgYmVlbiBraWxsZWQgb3IgY3Jhc2hlZC4KICAgICBtX3By b2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkdvVG9CYWNrRm9yd2FyZEl0ZW0obmF2aWdh dGlvbi0+bmF2aWdhdGlvbklEKCksIG1fYmFja0ZvcndhcmRMaXN0LT5jdXJyZW50SXRlbSgpLT5p dGVtSUQoKSksIG1fcGFnZUlEKTsKLSAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIo KS0+c3RhcnQoKTsKKyAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS5zdGFydCgp OwogCiAgICAgcmV0dXJuIFdURjo6bW92ZShuYXZpZ2F0aW9uKTsKIH0KQEAgLTc2Miw3ICs3NjIs NyBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OnJlYXR0YWNoVG9XZWJQ cm9jZXNzV2l0aEl0ZW0oV2ViQmFja0ZvcndhcgogICAgIGF1dG8gbmF2aWdhdGlvbiA9IG1fbmF2 aWdhdGlvblN0YXRlLT5jcmVhdGVCYWNrRm9yd2FyZE5hdmlnYXRpb24oKTsKIAogICAgIG1fcHJv Y2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6R29Ub0JhY2tGb3J3YXJkSXRlbShuYXZpZ2F0 aW9uLT5uYXZpZ2F0aW9uSUQoKSwgaXRlbS0+aXRlbUlEKCkpLCBtX3BhZ2VJRCk7Ci0gICAgbV9w cm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCktPnN0YXJ0KCk7CisgICAgbV9wcm9jZXNzLT5y ZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKIAogICAgIHJldHVybiBXVEY6Om1vdmUobmF2 aWdhdGlvbik7CiB9CkBAIC04NjMsNyArODYzLDcgQEAgYm9vbCBXZWJQYWdlUHJveHk6OnRyeUNs b3NlKCkKICAgICAgICAgcmV0dXJuIHRydWU7CiAKICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2Fn ZXM6OldlYlBhZ2U6OlRyeUNsb3NlKCksIG1fcGFnZUlEKTsKLSAgICBtX3Byb2Nlc3MtPnJlc3Bv bnNpdmVuZXNzVGltZXIoKS0+c3RhcnQoKTsKKyAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNz VGltZXIoKS5zdGFydCgpOwogICAgIHJldHVybiBmYWxzZTsKIH0KIApAQCAtOTAxLDcgKzkwMSw3 IEBAIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6bG9hZFJlcXVlc3QoY29u c3QgUmVzb3VyY2VSZXF1ZXN0JiByZXF1ZXN0CiAgICAgaWYgKGNyZWF0ZWRFeHRlbnNpb24pCiAg ICAgICAgIG1fcHJvY2Vzcy0+d2lsbEFjcXVpcmVVbml2ZXJzYWxGaWxlUmVhZFNhbmRib3hFeHRl bnNpb24oKTsKICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkxvYWRSZXF1 ZXN0KG5hdmlnYXRpb24tPm5hdmlnYXRpb25JRCgpLCByZXF1ZXN0LCBzYW5kYm94RXh0ZW5zaW9u SGFuZGxlLCAodWludDY0X3Qpc2hvdWxkT3BlbkV4dGVybmFsVVJMc1BvbGljeSwgVXNlckRhdGEo cHJvY2VzcygpLnRyYW5zZm9ybU9iamVjdHNUb0hhbmRsZXModXNlckRhdGEpLmdldCgpKSksIG1f cGFnZUlEKTsKLSAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+c3RhcnQoKTsK KyAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS5zdGFydCgpOwogCiAgICAgcmV0 dXJuIFdURjo6bW92ZShuYXZpZ2F0aW9uKTsKIH0KQEAgLTkzOSw3ICs5MzksNyBAQCBSZWZQdHI8 QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OmxvYWRGaWxlKGNvbnN0IFN0cmluZyYgZmls ZVVSTFN0cmluZywgY29ucwogICAgIFNhbmRib3hFeHRlbnNpb246OmNyZWF0ZUhhbmRsZShyZXNv dXJjZURpcmVjdG9yeVBhdGgsIFNhbmRib3hFeHRlbnNpb246OlJlYWRPbmx5LCBzYW5kYm94RXh0 ZW5zaW9uSGFuZGxlKTsKICAgICBtX3Byb2Nlc3MtPmFzc3VtZVJlYWRBY2Nlc3NUb0Jhc2VVUkwo cmVzb3VyY2VEaXJlY3RvcnlVUkwpOwogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2Vi UGFnZTo6TG9hZFJlcXVlc3QobmF2aWdhdGlvbi0+bmF2aWdhdGlvbklEKCksIGZpbGVVUkwsIHNh bmRib3hFeHRlbnNpb25IYW5kbGUsICh1aW50NjRfdClTaG91bGRPcGVuRXh0ZXJuYWxVUkxzUG9s aWN5OjpTaG91bGROb3RBbGxvdywgVXNlckRhdGEocHJvY2VzcygpLnRyYW5zZm9ybU9iamVjdHNU b0hhbmRsZXModXNlckRhdGEpLmdldCgpKSksIG1fcGFnZUlEKTsKLSAgICBtX3Byb2Nlc3MtPnJl c3BvbnNpdmVuZXNzVGltZXIoKS0+c3RhcnQoKTsKKyAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVu ZXNzVGltZXIoKS5zdGFydCgpOwogCiAgICAgcmV0dXJuIFdURjo6bW92ZShuYXZpZ2F0aW9uKTsK IH0KQEAgLTk2MCw3ICs5NjAsNyBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJv eHk6OmxvYWREYXRhKEFQSTo6RGF0YSogZGF0YSwgY29uc3QgU3RyaW5nJiBNSQogCiAgICAgbV9w cm9jZXNzLT5hc3N1bWVSZWFkQWNjZXNzVG9CYXNlVVJMKGJhc2VVUkwpOwogICAgIG1fcHJvY2Vz cy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6TG9hZERhdGEobmF2aWdhdGlvbi0+bmF2aWdhdGlv bklEKCksIGRhdGEtPmRhdGFSZWZlcmVuY2UoKSwgTUlNRVR5cGUsIGVuY29kaW5nLCBiYXNlVVJM LCBVc2VyRGF0YShwcm9jZXNzKCkudHJhbnNmb3JtT2JqZWN0c1RvSGFuZGxlcyh1c2VyRGF0YSku Z2V0KCkpKSwgbV9wYWdlSUQpOwotICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigp LT5zdGFydCgpOworICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0YXJ0KCk7 CiAKICAgICByZXR1cm4gV1RGOjptb3ZlKG5hdmlnYXRpb24pOwogfQpAQCAtOTgyLDcgKzk4Miw3 IEBAIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6bG9hZEhUTUxTdHJpbmco Y29uc3QgU3RyaW5nJiBodG1sU3RyaW5nLCBjCiAKICAgICBtX3Byb2Nlc3MtPmFzc3VtZVJlYWRB Y2Nlc3NUb0Jhc2VVUkwoYmFzZVVSTCk7CiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpX ZWJQYWdlOjpMb2FkSFRNTFN0cmluZyhuYXZpZ2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSwgaHRtbFN0 cmluZywgYmFzZVVSTCwgVXNlckRhdGEocHJvY2VzcygpLnRyYW5zZm9ybU9iamVjdHNUb0hhbmRs ZXModXNlckRhdGEpLmdldCgpKSksIG1fcGFnZUlEKTsKLSAgICBtX3Byb2Nlc3MtPnJlc3BvbnNp dmVuZXNzVGltZXIoKS0+c3RhcnQoKTsKKyAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGlt ZXIoKS5zdGFydCgpOwogCiAgICAgcmV0dXJuIFdURjo6bW92ZShuYXZpZ2F0aW9uKTsKIH0KQEAg LTEwMDUsNyArMTAwNSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkQWx0ZXJuYXRlSFRNTFN0 cmluZyhjb25zdCBTdHJpbmcmIGh0bWxTdHJpbmcsIGNvbnN0IFN0cmluCiAgICAgbV9wcm9jZXNz LT5hc3N1bWVSZWFkQWNjZXNzVG9CYXNlVVJMKGJhc2VVUkwpOwogICAgIG1fcHJvY2Vzcy0+YXNz dW1lUmVhZEFjY2Vzc1RvQmFzZVVSTCh1bnJlYWNoYWJsZVVSTCk7CiAgICAgbV9wcm9jZXNzLT5z ZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpMb2FkQWx0ZXJuYXRlSFRNTFN0cmluZyhodG1sU3RyaW5n LCBiYXNlVVJMLCB1bnJlYWNoYWJsZVVSTCwgbV9mYWlsaW5nUHJvdmlzaW9uYWxMb2FkVVJMLCBV c2VyRGF0YShwcm9jZXNzKCkudHJhbnNmb3JtT2JqZWN0c1RvSGFuZGxlcyh1c2VyRGF0YSkuZ2V0 KCkpKSwgbV9wYWdlSUQpOwotICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLT5z dGFydCgpOworICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0YXJ0KCk7CiB9 CiAKIHZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkUGxhaW5UZXh0U3RyaW5nKGNvbnN0IFN0cmluZyYg c3RyaW5nLCBBUEk6Ok9iamVjdCogdXNlckRhdGEpCkBAIC0xMDE3LDcgKzEwMTcsNyBAQCB2b2lk IFdlYlBhZ2VQcm94eTo6bG9hZFBsYWluVGV4dFN0cmluZyhjb25zdCBTdHJpbmcmIHN0cmluZywg QVBJOjpPYmplY3QqIHVzZXJEYQogICAgICAgICByZWF0dGFjaFRvV2ViUHJvY2VzcygpOwogCiAg ICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpMb2FkUGxhaW5UZXh0U3RyaW5n KHN0cmluZywgVXNlckRhdGEocHJvY2VzcygpLnRyYW5zZm9ybU9iamVjdHNUb0hhbmRsZXModXNl ckRhdGEpLmdldCgpKSksIG1fcGFnZUlEKTsKLSAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNz VGltZXIoKS0+c3RhcnQoKTsKKyAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS5z dGFydCgpOwogfQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6bG9hZFdlYkFyY2hpdmVEYXRhKEFQSTo6 RGF0YSogd2ViQXJjaGl2ZURhdGEsIEFQSTo6T2JqZWN0KiB1c2VyRGF0YSkKQEAgLTEwMjksNyAr MTAyOSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpsb2FkV2ViQXJjaGl2ZURhdGEoQVBJOjpEYXRh KiB3ZWJBcmNoaXZlRGF0YSwgQVBJOjpPYmplY3QqIHVzCiAgICAgICAgIHJlYXR0YWNoVG9XZWJQ cm9jZXNzKCk7CiAKICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OkxvYWRX ZWJBcmNoaXZlRGF0YSh3ZWJBcmNoaXZlRGF0YS0+ZGF0YVJlZmVyZW5jZSgpLCBVc2VyRGF0YShw cm9jZXNzKCkudHJhbnNmb3JtT2JqZWN0c1RvSGFuZGxlcyh1c2VyRGF0YSkuZ2V0KCkpKSwgbV9w YWdlSUQpOwotICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLT5zdGFydCgpOwor ICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0YXJ0KCk7CiB9CiAKIHZvaWQg V2ViUGFnZVByb3h5OjpuYXZpZ2F0ZVRvUERGTGlua1dpdGhTaW11bGF0ZWRDbGljayhjb25zdCBT dHJpbmcmIHVybCwgSW50UG9pbnQgZG9jdW1lbnRQb2ludCwgSW50UG9pbnQgc2NyZWVuUG9pbnQp CkBAIC0xMDQ0LDcgKzEwNDQsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6bmF2aWdhdGVUb1BERkxp bmtXaXRoU2ltdWxhdGVkQ2xpY2soY29uc3QgU3RyaW5nJiB1cmwsIEludFBvaQogICAgICAgICBy ZWF0dGFjaFRvV2ViUHJvY2VzcygpOwogCiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpX ZWJQYWdlOjpOYXZpZ2F0ZVRvUERGTGlua1dpdGhTaW11bGF0ZWRDbGljayh1cmwsIGRvY3VtZW50 UG9pbnQsIHNjcmVlblBvaW50KSwgbV9wYWdlSUQpOwotICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2 ZW5lc3NUaW1lcigpLT5zdGFydCgpOworICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1l cigpLnN0YXJ0KCk7CiB9CiAKIHZvaWQgV2ViUGFnZVByb3h5OjpzdG9wTG9hZGluZygpCkBAIC0x MDUzLDcgKzEwNTMsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6c3RvcExvYWRpbmcoKQogICAgICAg ICByZXR1cm47CiAKICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVzc2FnZXM6OldlYlBhZ2U6OlN0b3BM b2FkaW5nKCksIG1fcGFnZUlEKTsKLSAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIo KS0+c3RhcnQoKTsKKyAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS5zdGFydCgp OwogfQogCiBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OnJlbG9hZChib29s IHJlbG9hZEZyb21PcmlnaW4sIGJvb2wgY29udGVudEJsb2NrZXJzRW5hYmxlZCkKQEAgLTEwNzcs NyArMTA3Nyw3IEBAIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6cmVsb2Fk KGJvb2wgcmVsb2FkRnJvbU9yaWdpbiwgYm9vbCBjb250ZW50CiAgICAgYXV0byBuYXZpZ2F0aW9u ID0gbV9uYXZpZ2F0aW9uU3RhdGUtPmNyZWF0ZVJlbG9hZE5hdmlnYXRpb24oKTsKIAogICAgIG1f cHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6UmVsb2FkKG5hdmlnYXRpb24tPm5hdmln YXRpb25JRCgpLCByZWxvYWRGcm9tT3JpZ2luLCBjb250ZW50QmxvY2tlcnNFbmFibGVkLCBzYW5k Ym94RXh0ZW5zaW9uSGFuZGxlKSwgbV9wYWdlSUQpOwotICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2 ZW5lc3NUaW1lcigpLT5zdGFydCgpOworICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1l cigpLnN0YXJ0KCk7CiAKICAgICByZXR1cm4gV1RGOjptb3ZlKG5hdmlnYXRpb24pOwogfQpAQCAt MTExOCw3ICsxMTE4LDcgQEAgUmVmUHRyPEFQSTo6TmF2aWdhdGlvbj4gV2ViUGFnZVByb3h5Ojpn b0ZvcndhcmQoKQogICAgICAgICBuYXZpZ2F0aW9uID0gbV9uYXZpZ2F0aW9uU3RhdGUtPmNyZWF0 ZUJhY2tGb3J3YXJkTmF2aWdhdGlvbigpOwogCiAgICAgbV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2Vz OjpXZWJQYWdlOjpHb0ZvcndhcmQobmF2aWdhdGlvbiA/IG5hdmlnYXRpb24tPm5hdmlnYXRpb25J RCgpIDogMCwgZm9yd2FyZEl0ZW0tPml0ZW1JRCgpKSwgbV9wYWdlSUQpOwotICAgIG1fcHJvY2Vz cy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLT5zdGFydCgpOworICAgIG1fcHJvY2Vzcy0+cmVzcG9u c2l2ZW5lc3NUaW1lcigpLnN0YXJ0KCk7CiAKICAgICByZXR1cm4gbmF2aWdhdGlvbjsKIH0KQEAg LTExNDEsNyArMTE0MSw3IEBAIFJlZlB0cjxBUEk6Ok5hdmlnYXRpb24+IFdlYlBhZ2VQcm94eTo6 Z29CYWNrKCkKICAgICAgICAgbmF2aWdhdGlvbiA9IG1fbmF2aWdhdGlvblN0YXRlLT5jcmVhdGVC YWNrRm9yd2FyZE5hdmlnYXRpb24oKTsKIAogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6 V2ViUGFnZTo6R29CYWNrKG5hdmlnYXRpb24gPyBuYXZpZ2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSA6 IDAsIGJhY2tJdGVtLT5pdGVtSUQoKSksIG1fcGFnZUlEKTsKLSAgICBtX3Byb2Nlc3MtPnJlc3Bv bnNpdmVuZXNzVGltZXIoKS0+c3RhcnQoKTsKKyAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNz VGltZXIoKS5zdGFydCgpOwogCiAgICAgcmV0dXJuIG5hdmlnYXRpb247CiB9CkBAIC0xMTYwLDcg KzExNjAsNyBAQCBSZWZQdHI8QVBJOjpOYXZpZ2F0aW9uPiBXZWJQYWdlUHJveHk6OmdvVG9CYWNr Rm9yd2FyZEl0ZW0oV2ViQmFja0ZvcndhcmRMaXN0SXRlbQogICAgICAgICBuYXZpZ2F0aW9uID0g bV9uYXZpZ2F0aW9uU3RhdGUtPmNyZWF0ZUJhY2tGb3J3YXJkTmF2aWdhdGlvbigpOwogCiAgICAg bV9wcm9jZXNzLT5zZW5kKE1lc3NhZ2VzOjpXZWJQYWdlOjpHb1RvQmFja0ZvcndhcmRJdGVtKG5h dmlnYXRpb24gPyBuYXZpZ2F0aW9uLT5uYXZpZ2F0aW9uSUQoKSA6IDAsIGl0ZW0tPml0ZW1JRCgp KSwgbV9wYWdlSUQpOwotICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLT5zdGFy dCgpOworICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0YXJ0KCk7CiAKICAg ICByZXR1cm4gbmF2aWdhdGlvbjsKIH0KQEAgLTE0MzcsNyArMTQzNyw3IEBAIHZvaWQgV2ViUGFn ZVByb3h5OjpkaXNwYXRjaFZpZXdTdGF0ZUNoYW5nZSgpCiAgICAgLy8gc3RhdGUsIGl0IG1pZ2h0 IG5vdCBzZW5kIGJhY2sgYSByZXBseSAoc2luY2UgaXQgd29uJ3QgcGFpbnQgYW55dGhpbmcgaWYg dGhlIHdlYiBwYWdlIGlzIGhpZGRlbikgc28gd2UKICAgICAvLyBzdG9wIHRoZSB1bnJlc3BvbnNp dmVuZXNzIHRpbWVyIGhlcmUuCiAgICAgaWYgKChjaGFuZ2VkICYgVmlld1N0YXRlOjpJc1Zpc2li bGUpICYmICFpc1ZpZXdWaXNpYmxlKCkpCi0gICAgICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5l c3NUaW1lcigpLT5zdG9wKCk7CisgICAgICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1l cigpLnN0b3AoKTsKIAogICAgIGlmIChjaGFuZ2VkICYgVmlld1N0YXRlOjpJc0luV2luZG93KSB7 CiAgICAgICAgIGlmIChpc0luV2luZG93KCkpCkBAIC0xNjc3LDcgKzE2NzcsNyBAQCB2b2lkIFdl YlBhZ2VQcm94eTo6aGFuZGxlTW91c2VFdmVudChjb25zdCBOYXRpdmVXZWJNb3VzZUV2ZW50JiBl dmVudCkKIAogICAgIC8vIE5PVEU6IFRoaXMgZG9lcyBub3Qgc3RhcnQgdGhlIHJlc3BvbnNpdmVu ZXNzIHRpbWVyIGJlY2F1c2UgbW91c2UgbW92ZSBzaG91bGQgbm90IGluZGljYXRlIGludGVyYWN0 aW9uLgogICAgIGlmIChldmVudC50eXBlKCkgIT0gV2ViRXZlbnQ6Ok1vdXNlTW92ZSkKLSAgICAg ICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCktPnN0YXJ0KCk7CisgICAgICAgIG1f cHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0YXJ0KCk7CiAgICAgZWxzZSB7CiAgICAg ICAgIGlmIChtX3Byb2Nlc3NpbmdNb3VzZU1vdmVFdmVudCkgewogICAgICAgICAgICAgbV9uZXh0 TW91c2VNb3ZlRXZlbnQgPSBzdGQ6Om1ha2VfdW5pcXVlPE5hdGl2ZVdlYk1vdXNlRXZlbnQ+KGV2 ZW50KTsKQEAgLTE3OTksNyArMTc5OSw3IEBAIHZvaWQgV2ViUGFnZVByb3h5Ojpwcm9jZXNzTmV4 dFF1ZXVlZFdoZWVsRXZlbnQoKQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6c2VuZFdoZWVsRXZlbnQo Y29uc3QgV2ViV2hlZWxFdmVudCYgZXZlbnQpCiB7Ci0gICAgbV9wcm9jZXNzLT5yZXNwb25zaXZl bmVzc1RpbWVyKCktPnN0YXJ0KCk7CisgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVy KCkuc3RhcnQoKTsKIAogICAgIG1fcHJvY2Vzcy0+c2VuZCgKICAgICAgICAgTWVzc2FnZXM6OkV2 ZW50RGlzcGF0Y2hlcjo6V2hlZWxFdmVudCgKQEAgLTE4MjEsNyArMTgyMSw3IEBAIHZvaWQgV2Vi UGFnZVByb3h5OjpoYW5kbGVLZXlib2FyZEV2ZW50KGNvbnN0IE5hdGl2ZVdlYktleWJvYXJkRXZl bnQmIGV2ZW50KQogCiAgICAgbV9rZXlFdmVudFF1ZXVlLmFwcGVuZChldmVudCk7CiAKLSAgICBt X3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+c3RhcnQoKTsKKyAgICBtX3Byb2Nlc3Mt PnJlc3BvbnNpdmVuZXNzVGltZXIoKS5zdGFydCgpOwogICAgIGlmIChtX2tleUV2ZW50UXVldWUu c2l6ZSgpID09IDEpIC8vIE90aGVyd2lzZSwgc2VudCBmcm9tIERpZFJlY2VpdmVFdmVudCBtZXNz YWdlIGhhbmRsZXIuCiAgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6 S2V5RXZlbnQoZXZlbnQpLCBtX3BhZ2VJRCk7CiB9CkBAIC0xOTE2LDcgKzE5MTYsNyBAQCB2b2lk IFdlYlBhZ2VQcm94eTo6aGFuZGxlR2VzdHVyZUV2ZW50KGNvbnN0IE5hdGl2ZVdlYkdlc3R1cmVF dmVudCYgZXZlbnQpCiAKICAgICBtX2dlc3R1cmVFdmVudFF1ZXVlLmFwcGVuZChldmVudCk7CiAg ICAgLy8gRklYTUU6IENvbnNpZGVyIGRvaW5nIHNvbWUgY29hbGVzY2luZyBoZXJlLgotICAgIG1f cHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLT5zdGFydCgpOworICAgIG1fcHJvY2Vzcy0+ cmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0YXJ0KCk7CiAKICAgICBtX3Byb2Nlc3MtPnNlbmQoTWVz c2FnZXM6OkV2ZW50RGlzcGF0Y2hlcjo6R2VzdHVyZUV2ZW50KG1fcGFnZUlELCBldmVudCksIDAp OwogfQpAQCAtMTkzNiwxMiArMTkzNiwxMiBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6aGFuZGxlVG91 Y2hFdmVudFN5bmNocm9ub3VzbHkoY29uc3QgTmF0aXZlV2ViVG91Y2hFdmVudCYgZXZlbgogICAg IGlmICghbV9pc1RyYWNraW5nVG91Y2hFdmVudHMpCiAgICAgICAgIHJldHVybjsKIAotICAgIG1f cHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLT5zdGFydCgpOworICAgIG1fcHJvY2Vzcy0+ cmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0YXJ0KCk7CiAgICAgYm9vbCBoYW5kbGVkID0gZmFsc2U7 CiAgICAgbV9wcm9jZXNzLT5zZW5kU3luYyhNZXNzYWdlczo6V2ViUGFnZTo6VG91Y2hFdmVudFN5 bmMoZXZlbnQpLCBNZXNzYWdlczo6V2ViUGFnZTo6VG91Y2hFdmVudFN5bmM6OlJlcGx5KGhhbmRs ZWQpLCBtX3BhZ2VJRCk7CiAgICAgZGlkUmVjZWl2ZUV2ZW50KGV2ZW50LnR5cGUoKSwgaGFuZGxl ZCk7CiAgICAgbV9wYWdlQ2xpZW50LmRvbmVXaXRoVG91Y2hFdmVudChldmVudCwgaGFuZGxlZCk7 Ci0gICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCktPnN0b3AoKTsKKyAgICBtX3By b2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS5zdG9wKCk7CiAKICAgICBpZiAoZXZlbnQuYWxs VG91Y2hQb2ludHNBcmVSZWxlYXNlZCgpKQogICAgICAgICBtX2lzVHJhY2tpbmdUb3VjaEV2ZW50 cyA9IGZhbHNlOwpAQCAtMTk3OCw3ICsxOTc4LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmhhbmRs ZVRvdWNoRXZlbnQoY29uc3QgTmF0aXZlV2ViVG91Y2hFdmVudCYgZXZlbnQpCiAgICAgLy8gd2Ug ZG8gbm90IHNlbmQgYW55IG9mIHRoZSBldmVudHMgdG8gdGhlIHBhZ2UgZXZlbiBpZiBpcyBoYXMg bGlzdGVuZXJzLgogICAgIGlmICghbV9pc1BhZ2VTdXNwZW5kZWQpIHsKICAgICAgICAgbV90b3Vj aEV2ZW50UXVldWUuYXBwZW5kKGV2ZW50KTsKLSAgICAgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZl bmVzc1RpbWVyKCktPnN0YXJ0KCk7CisgICAgICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NU aW1lcigpLnN0YXJ0KCk7CiAgICAgICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFn ZTo6VG91Y2hFdmVudChldmVudCksIG1fcGFnZUlEKTsKICAgICB9IGVsc2UgewogICAgICAgICBp ZiAobV90b3VjaEV2ZW50UXVldWUuaXNFbXB0eSgpKSB7CkBAIC0zNTM3LDcgKzM1MzcsNyBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6ZGlkRXhpdEZ1bGxzY3JlZW4oKQogdm9pZCBXZWJQYWdlUHJveHk6 OmNsb3NlUGFnZShib29sIHN0b3BSZXNwb25zaXZlbmVzc1RpbWVyKQogewogICAgIGlmIChzdG9w UmVzcG9uc2l2ZW5lc3NUaW1lcikKLSAgICAgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1Rp bWVyKCktPnN0b3AoKTsKKyAgICAgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCku c3RvcCgpOwogCiAgICAgbV9wYWdlQ2xpZW50LmNsZWFyQWxsRWRpdENvbW1hbmRzKCk7CiAgICAg bV91aUNsaWVudC0+Y2xvc2UodGhpcyk7CkBAIC0zNTQ5LDcgKzM1NDksNyBAQCB2b2lkIFdlYlBh Z2VQcm94eTo6cnVuSmF2YVNjcmlwdEFsZXJ0KHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IFNlY3Vy aXR5T3JpZ2luRGF0YQogICAgIE1FU1NBR0VfQ0hFQ0soZnJhbWUpOwogCiAgICAgLy8gU2luY2Ug cnVuSmF2YVNjcmlwdEFsZXJ0KCkgY2FuIHNwaW4gYSBuZXN0ZWQgcnVuIGxvb3Agd2UgbmVlZCB0 byB0dXJuIG9mZiB0aGUgcmVzcG9uc2l2ZW5lc3MgdGltZXIuCi0gICAgbV9wcm9jZXNzLT5yZXNw b25zaXZlbmVzc1RpbWVyKCktPnN0b3AoKTsKKyAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNz VGltZXIoKS5zdG9wKCk7CiAKICAgICBtX3VpQ2xpZW50LT5ydW5KYXZhU2NyaXB0QWxlcnQodGhp cywgbWVzc2FnZSwgZnJhbWUsIHNlY3VyaXR5T3JpZ2luLCBbcmVwbHldeyByZXBseS0+c2VuZCgp OyB9KTsKIH0KQEAgLTM1NjAsNyArMzU2MCw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpydW5KYXZh U2NyaXB0Q29uZmlybSh1aW50NjRfdCBmcmFtZUlELCBjb25zdCBTZWN1cml0eU9yaWdpbkRhCiAg ICAgTUVTU0FHRV9DSEVDSyhmcmFtZSk7CiAKICAgICAvLyBTaW5jZSBydW5KYXZhU2NyaXB0Q29u ZmlybSgpIGNhbiBzcGluIGEgbmVzdGVkIHJ1biBsb29wIHdlIG5lZWQgdG8gdHVybiBvZmYgdGhl IHJlc3BvbnNpdmVuZXNzIHRpbWVyLgotICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1l cigpLT5zdG9wKCk7CisgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RvcCgp OwogCiAgICAgbV91aUNsaWVudC0+cnVuSmF2YVNjcmlwdENvbmZpcm0odGhpcywgbWVzc2FnZSwg ZnJhbWUsIHNlY3VyaXR5T3JpZ2luLCBbcmVwbHldKGJvb2wgcmVzdWx0KSB7IHJlcGx5LT5zZW5k KHJlc3VsdCk7IH0pOwogfQpAQCAtMzU3MSw3ICszNTcxLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6 OnJ1bkphdmFTY3JpcHRQcm9tcHQodWludDY0X3QgZnJhbWVJRCwgY29uc3QgU2VjdXJpdHlPcmln aW5EYXQKICAgICBNRVNTQUdFX0NIRUNLKGZyYW1lKTsKIAogICAgIC8vIFNpbmNlIHJ1bkphdmFT Y3JpcHRQcm9tcHQoKSBjYW4gc3BpbiBhIG5lc3RlZCBydW4gbG9vcCB3ZSBuZWVkIHRvIHR1cm4g b2ZmIHRoZSByZXNwb25zaXZlbmVzcyB0aW1lci4KLSAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVu ZXNzVGltZXIoKS0+c3RvcCgpOworICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigp LnN0b3AoKTsKIAogICAgIG1fdWlDbGllbnQtPnJ1bkphdmFTY3JpcHRQcm9tcHQodGhpcywgbWVz c2FnZSwgZGVmYXVsdFZhbHVlLCBmcmFtZSwgc2VjdXJpdHlPcmlnaW4sIFtyZXBseV0oY29uc3Qg U3RyaW5nJiByZXN1bHQpIHsgcmVwbHktPnNlbmQocmVzdWx0KTsgfSk7CiB9CkBAIC0zNzMzLDcg KzM3MzMsNyBAQCB2b2lkIFdlYlBhZ2VQcm94eTo6cnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVs KGNvbnN0IFN0cmluZyYgbWVzc2FnZSwgdWludDY0X3QgZgogICAgIE1FU1NBR0VfQ0hFQ0soZnJh bWUpOwogCiAgICAgLy8gU2luY2UgcnVuQmVmb3JlVW5sb2FkQ29uZmlybVBhbmVsKCkgY2FuIHNw aW4gYSBuZXN0ZWQgcnVuIGxvb3Agd2UgbmVlZCB0byB0dXJuIG9mZiB0aGUgcmVzcG9uc2l2ZW5l c3MgdGltZXIuCi0gICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCktPnN0b3AoKTsK KyAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS5zdG9wKCk7CiAKICAgICBzaG91 bGRDbG9zZSA9IG1fdWlDbGllbnQtPnJ1bkJlZm9yZVVubG9hZENvbmZpcm1QYW5lbCh0aGlzLCBt ZXNzYWdlLCBmcmFtZSk7CiB9CkBAIC0zNzg3LDcgKzM3ODcsNyBAQCB2b2lkIFdlYlBhZ2VQcm94 eTo6cnVuT3BlblBhbmVsKHVpbnQ2NF90IGZyYW1lSUQsIGNvbnN0IEZpbGVDaG9vc2VyU2V0dGlu Z3MmIHNldAogICAgIG1fb3BlblBhbmVsUmVzdWx0TGlzdGVuZXIgPSBXZWJPcGVuUGFuZWxSZXN1 bHRMaXN0ZW5lclByb3h5OjpjcmVhdGUodGhpcyk7CiAKICAgICAvLyBTaW5jZSBydW5PcGVuUGFu ZWwoKSBjYW4gc3BpbiBhIG5lc3RlZCBydW4gbG9vcCB3ZSBuZWVkIHRvIHR1cm4gb2ZmIHRoZSBy ZXNwb25zaXZlbmVzcyB0aW1lci4KLSAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIo KS0+c3RvcCgpOworICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0b3AoKTsK IAogICAgIGlmICghbV91aUNsaWVudC0+cnVuT3BlblBhbmVsKHRoaXMsIGZyYW1lLCBwYXJhbWV0 ZXJzLmdldCgpLCBtX29wZW5QYW5lbFJlc3VsdExpc3RlbmVyLmdldCgpKSkgewogICAgICAgICBp ZiAoIW1fcGFnZUNsaWVudC5oYW5kbGVSdW5PcGVuUGFuZWwodGhpcywgZnJhbWUsIHBhcmFtZXRl cnMuZ2V0KCksIG1fb3BlblBhbmVsUmVzdWx0TGlzdGVuZXIuZ2V0KCkpKQpAQCAtNDE1NCw3ICs0 MTU0LDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnNob3dQb3B1cE1lbnUoY29uc3QgSW50UmVjdCYg cmVjdCwgdWludDY0X3QgdGV4dERpcmVjdGlvbiwgY28KICAgICAgICAgcmV0dXJuOwogCiAgICAg Ly8gU2luY2Ugc2hvd1BvcHVwTWVudSgpIGNhbiBzcGluIGEgbmVzdGVkIHJ1biBsb29wIHdlIG5l ZWQgdG8gdHVybiBvZmYgdGhlIHJlc3BvbnNpdmVuZXNzIHRpbWVyLgotICAgIG1fcHJvY2Vzcy0+ cmVzcG9uc2l2ZW5lc3NUaW1lcigpLT5zdG9wKCk7CisgICAgbV9wcm9jZXNzLT5yZXNwb25zaXZl bmVzc1RpbWVyKCkuc3RvcCgpOwogCiAjaWYgUExBVEZPUk0oRUZMKQogICAgIFVOVVNFRF9QQVJB TShkYXRhKTsKQEAgLTQyMDIsNyArNDIwMiw3IEBAIHZvaWQgV2ViUGFnZVByb3h5OjppbnRlcm5h bFNob3dDb250ZXh0TWVudShjb25zdCBDb250ZXh0TWVudUNvbnRleHREYXRhJiBjb250ZXh0CiAg ICAgICAgIHJldHVybjsKIAogICAgIC8vIFNpbmNlIHNob3dDb250ZXh0TWVudSgpIGNhbiBzcGlu IGEgbmVzdGVkIHJ1biBsb29wIHdlIG5lZWQgdG8gdHVybiBvZmYgdGhlIHJlc3BvbnNpdmVuZXNz IHRpbWVyLgotICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLT5zdG9wKCk7Cisg ICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RvcCgpOwogCiAgICAgbV9hY3Rp dmVDb250ZXh0TWVudS0+c2hvdygpOwogfQpAQCAtNDUyNSw3ICs0NTI1LDcgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OmRpZFJlY2VpdmVFdmVudCh1aW50MzJfdCBvcGFxdWVUeXBlLCBib29sIGhhbmRs ZWQpCiAgICAgY2FzZSBXZWJFdmVudDo6R2VzdHVyZUNoYW5nZToKICAgICBjYXNlIFdlYkV2ZW50 OjpHZXN0dXJlRW5kOgogI2VuZGlmCi0gICAgICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NU aW1lcigpLT5zdG9wKCk7CisgICAgICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigp LnN0b3AoKTsKICAgICAgICAgYnJlYWs7CiAgICAgfQogCkBAIC00NjM4LDcgKzQ2MzgsNyBAQCB2 b2lkIFdlYlBhZ2VQcm94eTo6ZGlkUmVjZWl2ZUV2ZW50KHVpbnQzMl90IG9wYXF1ZVR5cGUsIGJv b2wgaGFuZGxlZCkKIAogdm9pZCBXZWJQYWdlUHJveHk6OnN0b3BSZXNwb25zaXZlbmVzc1RpbWVy KCkKIHsKLSAgICBtX3Byb2Nlc3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+c3RvcCgpOworICAg IG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0b3AoKTsKIH0KIAogdm9pZCBXZWJQ YWdlUHJveHk6OnZvaWRDYWxsYmFjayh1aW50NjRfdCBjYWxsYmFja0lEKQpAQCAtNTMzMSw3ICs1 MzMxLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OmRyYXdGb290ZXIoV2ViRnJhbWVQcm94eSogZnJh bWUsIGNvbnN0IEZsb2F0UmVjdCYgcmVjdCkKIHZvaWQgV2ViUGFnZVByb3h5OjpydW5Nb2RhbCgp CiB7CiAgICAgLy8gU2luY2UgcnVuTW9kYWwoKSBjYW4gKGFuZCBwcm9iYWJseSB3aWxsKSBzcGlu IGEgbmVzdGVkIHJ1biBsb29wIHdlIG5lZWQgdG8gdHVybiBvZmYgdGhlIHJlc3BvbnNpdmVuZXNz IHRpbWVyLgotICAgIG1fcHJvY2Vzcy0+cmVzcG9uc2l2ZW5lc3NUaW1lcigpLT5zdG9wKCk7Cisg ICAgbV9wcm9jZXNzLT5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RvcCgpOwogCiAgICAgLy8gT3Vy IENvbm5lY3Rpb24ncyBydW4gbG9vcCBtaWdodCBoYXZlIG1vcmUgbWVzc2FnZXMgd2FpdGluZyB0 byBiZSBoYW5kbGVkIGFmdGVyIHRoaXMgUnVuTW9kYWwgbWVzc2FnZS4KICAgICAvLyBUbyBtYWtl IHN1cmUgdGhleSBhcmUgaGFuZGxlZCBpbnNpZGUgb2YgdGhlIHRoZSBuZXN0ZWQgbW9kYWwgcnVu IGxvb3Agd2UgbXVzdCBmaXJzdCBzaWduYWwgdGhlIENvbm5lY3Rpb24ncwpAQCAtNTUyMSw3ICs1 NTIxLDcgQEAgdm9pZCBXZWJQYWdlUHJveHk6OnVwZGF0ZUJhY2tpbmdTdG9yZURpc2NhcmRhYmxl U3RhdGUoKQogCiAgICAgYm9vbCBpc0Rpc2NhcmRhYmxlOwogCi0gICAgaWYgKCFtX3Byb2Nlc3Mt PnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+aXNSZXNwb25zaXZlKCkpCisgICAgaWYgKCFtX3Byb2Nl c3MtPnJlc3BvbnNpdmVuZXNzVGltZXIoKS5pc1Jlc3BvbnNpdmUoKSkKICAgICAgICAgaXNEaXNj YXJkYWJsZSA9IGZhbHNlOwogICAgIGVsc2UKICAgICAgICAgaXNEaXNjYXJkYWJsZSA9ICFtX3Bh Z2VDbGllbnQuaXNWaWV3V2luZG93QWN0aXZlKCkgfHwgIWlzVmlld1Zpc2libGUoKTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuaAppbmRleCA2OTBkZjNjMGExYWYw MjU2YmEyZGNmYmI4ZDc0NGVhMjBiZjBkN2U3Li5kZTY4MDRjNDZmYjQyNzg2M2U0YTJjZjFiMjQx NWZlOWQ1ZWFhZDQ3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUHJv Y2Vzc1Byb3h5LmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94 eS5oCkBAIC05OCw3ICs5OCw3IEBAIHB1YmxpYzoKIAogICAgIFdlYkJhY2tGb3J3YXJkTGlzdEl0 ZW0qIHdlYkJhY2tGb3J3YXJkSXRlbSh1aW50NjRfdCBpdGVtSUQpIGNvbnN0OwogCi0gICAgUmVz cG9uc2l2ZW5lc3NUaW1lciogcmVzcG9uc2l2ZW5lc3NUaW1lcigpIHsgcmV0dXJuICZtX3Jlc3Bv bnNpdmVuZXNzVGltZXI7IH0KKyAgICBSZXNwb25zaXZlbmVzc1RpbWVyJiByZXNwb25zaXZlbmVz c1RpbWVyKCkgeyByZXR1cm4gbV9yZXNwb25zaXZlbmVzc1RpbWVyOyB9CiAKICAgICBXZWJGcmFt ZVByb3h5KiB3ZWJGcmFtZSh1aW50NjRfdCkgY29uc3Q7CiAgICAgYm9vbCBjYW5DcmVhdGVGcmFt ZSh1aW50NjRfdCBmcmFtZUlEKSBjb25zdDsK 264693 2015-11-03 08:09:29 -0800 2015-11-03 08:56:27 -0800 GTK/EFL buildfix 1.patch text/plain 1351 ossy ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNz L0Nvb3JkaW5hdGVkRHJhd2luZ0FyZWFQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZERyYXdpbmdBcmVhUHJveHkuY3BwCmlu ZGV4IGE0NjUxZjQuLmM4NDJiMWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkRHJhd2luZ0FyZWFQcm94eS5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0 ZWREcmF3aW5nQXJlYVByb3h5LmNwcApAQCAtMTc4LDcgKzE3OCw3IEBAIHZvaWQgQ29vcmRpbmF0 ZWREcmF3aW5nQXJlYVByb3h5OjpkaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZSh1aW50NjRfdCBi YWNraW5nU3RvCiAgICAgbV9pc1dhaXRpbmdGb3JEaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZSA9 IGZhbHNlOwogCiAgICAgLy8gU3RvcCB0aGUgcmVzcG9uc2l2ZW5lc3MgdGltZXIgdGhhdCB3YXMg c3RhcnRlZCBpbiBzZW5kVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUuCi0gICAgbV93ZWJQYWdlUHJv eHkucHJvY2VzcygpLnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+c3RvcCgpOworICAgIG1fd2ViUGFn ZVByb3h5LnByb2Nlc3MoKS5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RvcCgpOwogCiAgICAgaWYg KGxheWVyVHJlZUNvbnRleHQgIT0gbV9sYXllclRyZWVDb250ZXh0KSB7CiAgICAgICAgIGlmICgh bV9sYXllclRyZWVDb250ZXh0LmlzRW1wdHkoKSkgewpAQCAtMjkyLDcgKzI5Miw3IEBAIHZvaWQg Q29vcmRpbmF0ZWREcmF3aW5nQXJlYVByb3h5OjpzZW5kVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUo UmVzcG9uZEltbWVkaWF0ZWx5CiAgICAgaWYgKG1faXNXYWl0aW5nRm9yRGlkVXBkYXRlQmFja2lu Z1N0b3JlU3RhdGUpIHsKICAgICAgICAgLy8gU3RhcnQgdGhlIHJlc3BvbnNpdmVuZXNzIHRpbWVy LiBXZSB3aWxsIHN0b3AgaXQgd2hlbiB3ZSBoZWFyIGJhY2sgZnJvbSB0aGUgV2ViUHJvY2Vzcwog ICAgICAgICAvLyBpbiBkaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZS4KLSAgICAgICAgbV93ZWJQ YWdlUHJveHkucHJvY2VzcygpLnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+c3RhcnQoKTsKKyAgICAg ICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLnJlc3BvbnNpdmVuZXNzVGltZXIoKS5zdGFydCgp OwogICAgIH0KIAogICAgIGlmIChtX2lzV2FpdGluZ0ZvckRpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0 YXRlICYmICFtX2xheWVyVHJlZUNvbnRleHQuaXNFbXB0eSgpKSB7Cg== 264694 2015-11-03 08:56:27 -0800 2015-11-03 08:56:27 -0800 GTK and EFL buildfix 1.patch text/plain 2594 ossy ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db29yZGluYXRlZEdyYXBoaWNz L0Nvb3JkaW5hdGVkRHJhd2luZ0FyZWFQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQ29vcmRpbmF0ZWRHcmFwaGljcy9Db29yZGluYXRlZERyYXdpbmdBcmVhUHJveHkuY3BwCmlu ZGV4IGE0NjUxZjQuLmM4NDJiMWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9Db29yZGluYXRlZEdyYXBoaWNzL0Nvb3JkaW5hdGVkRHJhd2luZ0FyZWFQcm94eS5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0Nvb3JkaW5hdGVkR3JhcGhpY3MvQ29vcmRpbmF0 ZWREcmF3aW5nQXJlYVByb3h5LmNwcApAQCAtMTc4LDcgKzE3OCw3IEBAIHZvaWQgQ29vcmRpbmF0 ZWREcmF3aW5nQXJlYVByb3h5OjpkaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZSh1aW50NjRfdCBi YWNraW5nU3RvCiAgICAgbV9pc1dhaXRpbmdGb3JEaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZSA9 IGZhbHNlOwogCiAgICAgLy8gU3RvcCB0aGUgcmVzcG9uc2l2ZW5lc3MgdGltZXIgdGhhdCB3YXMg c3RhcnRlZCBpbiBzZW5kVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUuCi0gICAgbV93ZWJQYWdlUHJv eHkucHJvY2VzcygpLnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+c3RvcCgpOworICAgIG1fd2ViUGFn ZVByb3h5LnByb2Nlc3MoKS5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RvcCgpOwogCiAgICAgaWYg KGxheWVyVHJlZUNvbnRleHQgIT0gbV9sYXllclRyZWVDb250ZXh0KSB7CiAgICAgICAgIGlmICgh bV9sYXllclRyZWVDb250ZXh0LmlzRW1wdHkoKSkgewpAQCAtMjkyLDcgKzI5Miw3IEBAIHZvaWQg Q29vcmRpbmF0ZWREcmF3aW5nQXJlYVByb3h5OjpzZW5kVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUo UmVzcG9uZEltbWVkaWF0ZWx5CiAgICAgaWYgKG1faXNXYWl0aW5nRm9yRGlkVXBkYXRlQmFja2lu Z1N0b3JlU3RhdGUpIHsKICAgICAgICAgLy8gU3RhcnQgdGhlIHJlc3BvbnNpdmVuZXNzIHRpbWVy LiBXZSB3aWxsIHN0b3AgaXQgd2hlbiB3ZSBoZWFyIGJhY2sgZnJvbSB0aGUgV2ViUHJvY2Vzcwog ICAgICAgICAvLyBpbiBkaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZS4KLSAgICAgICAgbV93ZWJQ YWdlUHJveHkucHJvY2VzcygpLnJlc3BvbnNpdmVuZXNzVGltZXIoKS0+c3RhcnQoKTsKKyAgICAg ICAgbV93ZWJQYWdlUHJveHkucHJvY2VzcygpLnJlc3BvbnNpdmVuZXNzVGltZXIoKS5zdGFydCgp OwogICAgIH0KIAogICAgIGlmIChtX2lzV2FpdGluZ0ZvckRpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0 YXRlICYmICFtX2xheWVyVHJlZUNvbnRleHQuaXNFbXB0eSgpKSB7CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQcm94eUltcGwuY3BwIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0RyYXdpbmdBcmVhUHJveHlJbXBsLmNwcAppbmRleCA1MWQzNWZjLi5h NGQ5ODE5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvRHJhd2luZ0FyZWFQ cm94eUltcGwuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9EcmF3aW5nQXJlYVBy b3h5SW1wbC5jcHAKQEAgLTE0OSw3ICsxNDksNyBAQCB2b2lkIERyYXdpbmdBcmVhUHJveHlJbXBs OjpkaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZSh1aW50NjRfdCBiYWNraW5nU3RvcmVTdGF0ZQog ICAgIG1faXNXYWl0aW5nRm9yRGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUgPSBmYWxzZTsKIAog ICAgIC8vIFN0b3AgdGhlIHJlc3BvbnNpdmVuZXNzIHRpbWVyIHRoYXQgd2FzIHN0YXJ0ZWQgaW4g c2VuZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRlLgotICAgIG1fd2ViUGFnZVByb3h5LnByb2Nlc3Mo KS5yZXNwb25zaXZlbmVzc1RpbWVyKCktPnN0b3AoKTsKKyAgICBtX3dlYlBhZ2VQcm94eS5wcm9j ZXNzKCkucmVzcG9uc2l2ZW5lc3NUaW1lcigpLnN0b3AoKTsKIAogICAgIGlmIChsYXllclRyZWVD b250ZXh0ICE9IG1fbGF5ZXJUcmVlQ29udGV4dCkgewogICAgICAgICBpZiAoIW1fbGF5ZXJUcmVl Q29udGV4dC5pc0VtcHR5KCkpIHsKQEAgLTI3Miw3ICsyNzIsNyBAQCB2b2lkIERyYXdpbmdBcmVh UHJveHlJbXBsOjpzZW5kVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUoUmVzcG9uZEltbWVkaWF0ZWx5 T3JOb3QgcgogICAgIGlmIChtX2lzV2FpdGluZ0ZvckRpZFVwZGF0ZUJhY2tpbmdTdG9yZVN0YXRl KSB7CiAgICAgICAgIC8vIFN0YXJ0IHRoZSByZXNwb25zaXZlbmVzcyB0aW1lci4gV2Ugd2lsbCBz dG9wIGl0IHdoZW4gd2UgaGVhciBiYWNrIGZyb20gdGhlIFdlYlByb2Nlc3MKICAgICAgICAgLy8g aW4gZGlkVXBkYXRlQmFja2luZ1N0b3JlU3RhdGUuCi0gICAgICAgIG1fd2ViUGFnZVByb3h5LnBy b2Nlc3MoKS5yZXNwb25zaXZlbmVzc1RpbWVyKCktPnN0YXJ0KCk7CisgICAgICAgIG1fd2ViUGFn ZVByb3h5LnByb2Nlc3MoKS5yZXNwb25zaXZlbmVzc1RpbWVyKCkuc3RhcnQoKTsKICAgICB9CiAK ICAgICBpZiAobV9pc1dhaXRpbmdGb3JEaWRVcGRhdGVCYWNraW5nU3RvcmVTdGF0ZSAmJiAhbV9s YXllclRyZWVDb250ZXh0LmlzRW1wdHkoKSkgewo=