163299 2016-10-11 14:39:09 -0700 Clean up WebPageGroup somewhat 2016-10-11 15:05:45 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca sam oldest_to_newest 1239019 0 andersca 2016-10-11 14:39:09 -0700 Clean up WebPageGroup somewhat 1239020 1 291299 andersca 2016-10-11 14:41:47 -0700 Created attachment 291299 Patch 1239032 2 andersca 2016-10-11 15:04:21 -0700 Committed r207168: <http://trac.webkit.org/changeset/207168> 1239035 3 sam 2016-10-11 15:05:45 -0700 Nice. 291299 2016-10-11 14:41:47 -0700 2016-10-11 15:00:10 -0700 Patch bug-163299-20161011143836.patch text/plain 14883 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3MTU4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggZDc3ZDEyNTI2ZTkxYjAz ZWY5MDJmNTViYWRjNmEzODM0ZmRmOWM2Yi4uY2UyNDZkMjc3Yjk3ZmI5YTNmZGIzZGFkOTJmZDk3 NjRjMTkyZTczMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDQzIEBACisyMDE2LTEwLTExICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAgV2Vi UGFnZUdyb3VwIHNvbWV3aGF0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xNjMyOTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFNoYXJlZC9BUEkvYy9XS0RlcHJlY2F0ZWRGdW5jdGlvbnMuY3BwOgorICAg ICAgICAoV0tQYWdlR3JvdXBDb3B5SWRlbnRpZmllcik6CisgICAgICAgIE1vdmUgdGhpcyBoZXJl IGZyb20gV0tQYWdlR3JvdXAuCisKKyAgICAgICAgKFdLUGFnZUdyb3VwQWRkVXNlckNvbnRlbnRG aWx0ZXIpOgorICAgICAgICAoV0tQYWdlR3JvdXBSZW1vdmVVc2VyQ29udGVudEZpbHRlcik6Cisg ICAgICAgIChXS1BhZ2VHcm91cFJlbW92ZUFsbFVzZXJDb250ZW50RmlsdGVycyk6CisgICAgICAg IEp1c3QgY2FsbCBkaXJlY3RseSBpbnRvIHRoZSB1c2VyIGNvbnRlbnQgY29udHJvbGxlci4KKwor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQy9XS1BhZ2VHcm91cC5jcHA6CisgICAgICAgIChXS1Bh Z2VHcm91cEFkZFVzZXJTdHlsZVNoZWV0KToKKyAgICAgICAgKFdLUGFnZUdyb3VwUmVtb3ZlQWxs VXNlclN0eWxlU2hlZXRzKToKKyAgICAgICAgKFdLUGFnZUdyb3VwQWRkVXNlclNjcmlwdCk6Cisg ICAgICAgIChXS1BhZ2VHcm91cFJlbW92ZUFsbFVzZXJTY3JpcHRzKToKKyAgICAgICAgSnVzdCBj YWxsIGRpcmVjdGx5IGludG8gdGhlIHVzZXIgY29udGVudCBjb250cm9sbGVyLgorCisgICAgICAg ICogVUlQcm9jZXNzL0FQSS9DL1dLUGFnZUdyb3VwLmg6CisgICAgICAgICogVUlQcm9jZXNzL1dl YlBhZ2VHcm91cC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VHcm91cDo6YWRkVXNlclN0 eWxlU2hlZXQpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlR3JvdXA6OmFkZFVz ZXJTY3JpcHQpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlR3JvdXA6OnJlbW92 ZUFsbFVzZXJTdHlsZVNoZWV0cyk6IERlbGV0ZWQuCisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VH cm91cDo6cmVtb3ZlQWxsVXNlclNjcmlwdHMpOiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpX ZWJQYWdlR3JvdXA6OnJlbW92ZUFsbFVzZXJDb250ZW50KTogRGVsZXRlZC4KKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZUdyb3VwOjphZGRVc2VyQ29udGVudEV4dGVuc2lvbik6IERlbGV0ZWQuCisg ICAgICAgIChXZWJLaXQ6OldlYlBhZ2VHcm91cDo6cmVtb3ZlVXNlckNvbnRlbnRFeHRlbnNpb24p OiBEZWxldGVkLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlR3JvdXA6OnJlbW92ZUFsbFVzZXJD b250ZW50RXh0ZW5zaW9ucyk6IERlbGV0ZWQuCisgICAgICAgIEdldCByaWQgb2YgdGhlc2UsIGFs bCB0aGVpciBjYWxsZXJzIGp1c3QgY2FsbCBpbnRvIHRoZSB1c2VyIGNvbnRlbnQgY29udHJvbGxl ciBub3cuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZUdyb3VwLmg6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VHcm91cDo6aWRlbnRpZmllcik6IERlbGV0ZWQuCisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2VHcm91cDo6c2VuZFRvQWxsUHJvY2Vzc2VzSW5Hcm91cCk6IERlbGV0ZWQuCisg ICAgICAgIFJlbW92ZSB1bnVzZWQgY29kZS4KKwogMjAxNi0xMC0xMSAgQWxleCBDaHJpc3RlbnNl biAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFJlbW92ZSBkZWFkIG5ldHdv cmtpbmcgY29kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvU2hhcmVkL0FQSS9jL1dLRGVw cmVjYXRlZEZ1bmN0aW9ucy5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tEZXBy ZWNhdGVkRnVuY3Rpb25zLmNwcAppbmRleCBhMjIyZjIwYjE0MTdhNjg2ZjNjMGY1YTQyNWYzNzhj OTZkNDNhZWRmLi45MTVmNDRhN2Y0OWRkOWNjOWY1MjMwM2I2MmViM2MxZjg4NjY1OTgwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tEZXByZWNhdGVkRnVuY3Rpb25z LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvQVBJL2MvV0tEZXByZWNhdGVkRnVuY3Rp b25zLmNwcApAQCAtMzMsNiArMzMsNyBAQAogI2luY2x1ZGUgIldLTXV0YWJsZURpY3Rpb25hcnku aCIKICNpbmNsdWRlICJXS1ByZWZlcmVuY2VzUmVmUHJpdmF0ZS5oIgogI2luY2x1ZGUgIldlYlBh Z2VHcm91cC5oIgorI2luY2x1ZGUgIldlYlVzZXJDb250ZW50Q29udHJvbGxlclByb3h5LmgiCiAK ICNpZiBQTEFURk9STShNQUMpCiAjaW5jbHVkZSAiV0tDb250ZXh0UHJpdmF0ZU1hYy5oIgpAQCAt NDEsNiArNDIsNyBAQAogLy8gRGVwcmVjYXRlZCBmdW5jdGlvbnMgdGhhdCBzaG91bGQgYmUgcmVt b3ZlZCBmcm9tIHRoZSBmcmFtZXdvcmsgb25jZSBub2JvZHkgdXNlcyB0aGVtLgogCiBleHRlcm4g IkMiIHsKK1dLX0VYUE9SVCBXS1N0cmluZ1JlZiBXS1BhZ2VHcm91cENvcHlJZGVudGlmaWVyKFdL UGFnZUdyb3VwUmVmIHBhZ2VHcm91cCk7CiBXS19FWFBPUlQgdm9pZCBXS1BhZ2VHcm91cEFkZFVz ZXJDb250ZW50RmlsdGVyKFdLUGFnZUdyb3VwUmVmIHBhZ2VHcm91cCwgV0tVc2VyQ29udGVudEZp bHRlclJlZiB1c2VyQ29udGVudEZpbHRlcik7CiBXS19FWFBPUlQgdm9pZCBXS1BhZ2VHcm91cFJl bW92ZVVzZXJDb250ZW50RmlsdGVyKFdLUGFnZUdyb3VwUmVmIHBhZ2VHcm91cCwgV0tTdHJpbmdS ZWYgdXNlckNvbnRlbnRGaWx0ZXJOYW1lKTsKIFdLX0VYUE9SVCB2b2lkIFdLUGFnZUdyb3VwUmVt b3ZlQWxsVXNlckNvbnRlbnRGaWx0ZXJzKFdLUGFnZUdyb3VwUmVmIHBhZ2VHcm91cCk7CkBAIC01 NiwxMCArNTgsMTUgQEAgdm9pZCBXS0NvbnRleHRTZXRQcm9jZXNzTW9kZWwoV0tDb250ZXh0UmVm LCBXS1Byb2Nlc3NNb2RlbCkKIHsKIH0KIAorV0tTdHJpbmdSZWYgV0tQYWdlR3JvdXBDb3B5SWRl bnRpZmllcihXS1BhZ2VHcm91cFJlZikKK3sKKyAgICByZXR1cm4gbnVsbHB0cjsKK30KKwogdm9p ZCBXS1BhZ2VHcm91cEFkZFVzZXJDb250ZW50RmlsdGVyKFdLUGFnZUdyb3VwUmVmIHBhZ2VHcm91 cFJlZiwgV0tVc2VyQ29udGVudEZpbHRlclJlZiB1c2VyQ29udGVudEZpbHRlclJlZikKIHsKICNp ZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJT05TKQotICAgIHRvSW1wbChwYWdlR3JvdXBSZWYpLT5h ZGRVc2VyQ29udGVudEV4dGVuc2lvbigqdG9JbXBsKHVzZXJDb250ZW50RmlsdGVyUmVmKSk7Cisg ICAgdG9JbXBsKHBhZ2VHcm91cFJlZiktPnVzZXJDb250ZW50Q29udHJvbGxlcigpLmFkZFVzZXJD b250ZW50RXh0ZW5zaW9uKCp0b0ltcGwodXNlckNvbnRlbnRGaWx0ZXJSZWYpKTsKICNlbHNlCiAg ICAgVU5VU0VEX1BBUkFNKHBhZ2VHcm91cFJlZik7CiAgICAgVU5VU0VEX1BBUkFNKHVzZXJDb250 ZW50RmlsdGVyUmVmKTsKQEAgLTY5LDE4ICs3NiwxNyBAQCB2b2lkIFdLUGFnZUdyb3VwQWRkVXNl ckNvbnRlbnRGaWx0ZXIoV0tQYWdlR3JvdXBSZWYgcGFnZUdyb3VwUmVmLCBXS1VzZXJDb250ZW50 Rgogdm9pZCBXS1BhZ2VHcm91cFJlbW92ZVVzZXJDb250ZW50RmlsdGVyKFdLUGFnZUdyb3VwUmVm IHBhZ2VHcm91cFJlZiwgV0tTdHJpbmdSZWYgdXNlckNvbnRlbnRGaWx0ZXJOYW1lUmVmKQogewog I2lmIEVOQUJMRShDT05URU5UX0VYVEVOU0lPTlMpCi0gICAgdG9JbXBsKHBhZ2VHcm91cFJlZikt PnJlbW92ZVVzZXJDb250ZW50RXh0ZW5zaW9uKHRvV1RGU3RyaW5nKHVzZXJDb250ZW50RmlsdGVy TmFtZVJlZikpOworICAgIHRvSW1wbChwYWdlR3JvdXBSZWYpLT51c2VyQ29udGVudENvbnRyb2xs ZXIoKS5yZW1vdmVVc2VyQ29udGVudEV4dGVuc2lvbih0b1dURlN0cmluZyh1c2VyQ29udGVudEZp bHRlck5hbWVSZWYpKTsKICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKHBhZ2VHcm91cFJlZik7CiAg ICAgVU5VU0VEX1BBUkFNKHVzZXJDb250ZW50RmlsdGVyTmFtZVJlZik7CiAjZW5kaWYKIH0KIAot CiB2b2lkIFdLUGFnZUdyb3VwUmVtb3ZlQWxsVXNlckNvbnRlbnRGaWx0ZXJzKFdLUGFnZUdyb3Vw UmVmIHBhZ2VHcm91cFJlZikKIHsKICNpZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJT05TKQotICAg IHRvSW1wbChwYWdlR3JvdXBSZWYpLT5yZW1vdmVBbGxVc2VyQ29udGVudEV4dGVuc2lvbnMoKTsK KyAgICB0b0ltcGwocGFnZUdyb3VwUmVmKS0+dXNlckNvbnRlbnRDb250cm9sbGVyKCkucmVtb3Zl QWxsVXNlckNvbnRlbnRFeHRlbnNpb25zKCk7CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShwYWdl R3JvdXBSZWYpOwogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0MvV0tQYWdlR3JvdXAuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dL UGFnZUdyb3VwLmNwcAppbmRleCBmYzQ2NmU1MmVmMTUyY2FjMjVkYjRjNDgwYWUwZTYxYTdhNDQz YzU4Li44MWU5Y2JmNjA2OTJjZjc4ODljNzBhYmU2MTYxNjNlM2JhNTAxMTEzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0MvV0tQYWdlR3JvdXAuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2VHcm91cC5jcHAKQEAgLTI3LDYgKzI3 LDkgQEAKICNpbmNsdWRlICJXS1BhZ2VHcm91cC5oIgogCiAjaW5jbHVkZSAiQVBJVXNlckNvbnRl bnRFeHRlbnNpb24uaCIKKyNpbmNsdWRlICJBUElVc2VyQ29udGVudFdvcmxkLmgiCisjaW5jbHVk ZSAiQVBJVXNlclNjcmlwdC5oIgorI2luY2x1ZGUgIkFQSVVzZXJTdHlsZVNoZWV0LmgiCiAjaW5j bHVkZSAiV0tBUElDYXN0LmgiCiAjaW5jbHVkZSAiV2ViUGFnZUdyb3VwLmgiCiAjaW5jbHVkZSAi V2ViUHJlZmVyZW5jZXMuaCIKQEAgLTQ1LDExICs0OCw2IEBAIFdLUGFnZUdyb3VwUmVmIFdLUGFn ZUdyb3VwQ3JlYXRlV2l0aElkZW50aWZpZXIoV0tTdHJpbmdSZWYgaWRlbnRpZmllcikKICAgICBy ZXR1cm4gdG9BUEkocGFnZUdyb3VwLmxlYWtSZWYoKSk7CiB9CiAKLVdLU3RyaW5nUmVmIFdLUGFn ZUdyb3VwQ29weUlkZW50aWZpZXIoV0tQYWdlR3JvdXBSZWYgcGFnZUdyb3VwUmVmKQotewotICAg IHJldHVybiB0b0NvcGllZEFQSSh0b0ltcGwocGFnZUdyb3VwUmVmKS0+aWRlbnRpZmllcigpKTsK LX0KLQogdm9pZCBXS1BhZ2VHcm91cFNldFByZWZlcmVuY2VzKFdLUGFnZUdyb3VwUmVmIHBhZ2VH cm91cFJlZiwgV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlc1JlZikKIHsKICAgICB0b0ltcGwo cGFnZUdyb3VwUmVmKS0+c2V0UHJlZmVyZW5jZXModG9JbXBsKHByZWZlcmVuY2VzUmVmKSk7CkBA IC02NSwyMiArNjMsNDMgQEAgV0tVc2VyQ29udGVudENvbnRyb2xsZXJSZWYgV0tQYWdlR3JvdXBH ZXRVc2VyQ29udGVudENvbnRyb2xsZXIoV0tQYWdlR3JvdXBSZWYgcGEKICAgICByZXR1cm4gdG9B UEkoJnRvSW1wbChwYWdlR3JvdXBSZWYpLT51c2VyQ29udGVudENvbnRyb2xsZXIoKSk7CiB9CiAK LXZvaWQgV0tQYWdlR3JvdXBBZGRVc2VyU3R5bGVTaGVldChXS1BhZ2VHcm91cFJlZiBwYWdlR3Jv dXBSZWYsIFdLU3RyaW5nUmVmIHNvdXJjZVJlZiwgV0tVUkxSZWYgYmFzZVVSTCwgV0tBcnJheVJl ZiB3aGl0ZWxpc3RlZFVSTFBhdHRlcm5zLCBXS0FycmF5UmVmIGJsYWNrbGlzdGVkVVJMUGF0dGVy bnMsIFdLVXNlckNvbnRlbnRJbmplY3RlZEZyYW1lcyBpbmplY3RlZEZyYW1lcykKK3ZvaWQgV0tQ YWdlR3JvdXBBZGRVc2VyU3R5bGVTaGVldChXS1BhZ2VHcm91cFJlZiBwYWdlR3JvdXBSZWYsIFdL U3RyaW5nUmVmIHNvdXJjZVJlZiwgV0tVUkxSZWYgYmFzZVVSTFJlZiwgV0tBcnJheVJlZiB3aGl0 ZWxpc3RlZFVSTFBhdHRlcm5zLCBXS0FycmF5UmVmIGJsYWNrbGlzdGVkVVJMUGF0dGVybnMsIFdL VXNlckNvbnRlbnRJbmplY3RlZEZyYW1lcyBpbmplY3RlZEZyYW1lcykKIHsKLSAgICB0b0ltcGwo cGFnZUdyb3VwUmVmKS0+YWRkVXNlclN0eWxlU2hlZXQodG9XVEZTdHJpbmcoc291cmNlUmVmKSwg dG9XVEZTdHJpbmcoYmFzZVVSTCksIHRvSW1wbCh3aGl0ZWxpc3RlZFVSTFBhdHRlcm5zKSwgdG9J bXBsKGJsYWNrbGlzdGVkVVJMUGF0dGVybnMpLCB0b1VzZXJDb250ZW50SW5qZWN0ZWRGcmFtZXMo aW5qZWN0ZWRGcmFtZXMpLCBXZWJDb3JlOjpVc2VyU3R5bGVVc2VyTGV2ZWwpOworICAgIGF1dG8g c291cmNlID0gdG9XVEZTdHJpbmcoc291cmNlUmVmKTsKKworICAgIGlmIChzb3VyY2UuaXNFbXB0 eSgpKQorICAgICAgICByZXR1cm47CisKKyAgICBhdXRvIGJhc2VVUkxTdHJpbmcgPSB0b1dURlN0 cmluZyhiYXNlVVJMUmVmKTsKKyAgICBhdXRvIHdoaXRlbGlzdCA9IHRvSW1wbCh3aGl0ZWxpc3Rl ZFVSTFBhdHRlcm5zKTsKKyAgICBhdXRvIGJsYWNrbGlzdCA9IHRvSW1wbChibGFja2xpc3RlZFVS TFBhdHRlcm5zKTsKKworICAgIFJlZjxBUEk6OlVzZXJTdHlsZVNoZWV0PiB1c2VyU3R5bGVTaGVl dCA9IEFQSTo6VXNlclN0eWxlU2hlZXQ6OmNyZWF0ZShXZWJDb3JlOjpVc2VyU3R5bGVTaGVldCB7 IHNvdXJjZSwgKGJhc2VVUkxTdHJpbmcuaXNFbXB0eSgpID8gV2ViQ29yZTo6YmxhbmtVUkwoKSA6 IFdlYkNvcmU6OlVSTChXZWJDb3JlOjpVUkwoKSwgYmFzZVVSTFN0cmluZykpLCB3aGl0ZWxpc3Qg PyB3aGl0ZWxpc3QtPnRvU3RyaW5nVmVjdG9yKCkgOiBWZWN0b3I8U3RyaW5nPigpLCBibGFja2xp c3QgPyBibGFja2xpc3QtPnRvU3RyaW5nVmVjdG9yKCkgOiBWZWN0b3I8U3RyaW5nPigpLCB0b1Vz ZXJDb250ZW50SW5qZWN0ZWRGcmFtZXMoaW5qZWN0ZWRGcmFtZXMpLCBXZWJDb3JlOjpVc2VyU3R5 bGVVc2VyTGV2ZWwgfSwgQVBJOjpVc2VyQ29udGVudFdvcmxkOjpub3JtYWxXb3JsZCgpKTsKKwor ICAgIHRvSW1wbChwYWdlR3JvdXBSZWYpLT51c2VyQ29udGVudENvbnRyb2xsZXIoKS5hZGRVc2Vy U3R5bGVTaGVldCh1c2VyU3R5bGVTaGVldC5nZXQoKSk7CiB9CiAKLXZvaWQgV0tQYWdlR3JvdXBS ZW1vdmVBbGxVc2VyU3R5bGVTaGVldHMoV0tQYWdlR3JvdXBSZWYgcGFnZUdyb3VwUmVmKQordm9p ZCBXS1BhZ2VHcm91cFJlbW92ZUFsbFVzZXJTdHlsZVNoZWV0cyhXS1BhZ2VHcm91cFJlZiBwYWdl R3JvdXApCiB7Ci0gICAgdG9JbXBsKHBhZ2VHcm91cFJlZiktPnJlbW92ZUFsbFVzZXJTdHlsZVNo ZWV0cygpOworICAgIHRvSW1wbChwYWdlR3JvdXApLT51c2VyQ29udGVudENvbnRyb2xsZXIoKS5y ZW1vdmVBbGxVc2VyU3R5bGVTaGVldHMoKTsKIH0KIAotdm9pZCBXS1BhZ2VHcm91cEFkZFVzZXJT Y3JpcHQoV0tQYWdlR3JvdXBSZWYgcGFnZUdyb3VwUmVmLCBXS1N0cmluZ1JlZiBzb3VyY2VSZWYs IFdLVVJMUmVmIGJhc2VVUkwsIFdLQXJyYXlSZWYgd2hpdGVsaXN0ZWRVUkxQYXR0ZXJucywgV0tB cnJheVJlZiBibGFja2xpc3RlZFVSTFBhdHRlcm5zLCBXS1VzZXJDb250ZW50SW5qZWN0ZWRGcmFt ZXMgaW5qZWN0ZWRGcmFtZXMsIF9XS1VzZXJTY3JpcHRJbmplY3Rpb25UaW1lIGluamVjdGlvblRp bWUpCit2b2lkIFdLUGFnZUdyb3VwQWRkVXNlclNjcmlwdChXS1BhZ2VHcm91cFJlZiBwYWdlR3Jv dXBSZWYsIFdLU3RyaW5nUmVmIHNvdXJjZVJlZiwgV0tVUkxSZWYgYmFzZVVSTFJlZiwgV0tBcnJh eVJlZiB3aGl0ZWxpc3RlZFVSTFBhdHRlcm5zLCBXS0FycmF5UmVmIGJsYWNrbGlzdGVkVVJMUGF0 dGVybnMsIFdLVXNlckNvbnRlbnRJbmplY3RlZEZyYW1lcyBpbmplY3RlZEZyYW1lcywgX1dLVXNl clNjcmlwdEluamVjdGlvblRpbWUgaW5qZWN0aW9uVGltZSkKIHsKLSAgICB0b0ltcGwocGFnZUdy b3VwUmVmKS0+YWRkVXNlclNjcmlwdCh0b1dURlN0cmluZyhzb3VyY2VSZWYpLCB0b1dURlN0cmlu ZyhiYXNlVVJMKSwgdG9JbXBsKHdoaXRlbGlzdGVkVVJMUGF0dGVybnMpLCB0b0ltcGwoYmxhY2ts aXN0ZWRVUkxQYXR0ZXJucyksIHRvVXNlckNvbnRlbnRJbmplY3RlZEZyYW1lcyhpbmplY3RlZEZy YW1lcyksIHRvVXNlclNjcmlwdEluamVjdGlvblRpbWUoaW5qZWN0aW9uVGltZSkpOworICAgIGF1 dG8gc291cmNlID0gdG9XVEZTdHJpbmcoc291cmNlUmVmKTsKKworICAgIGlmIChzb3VyY2UuaXNF bXB0eSgpKQorICAgICAgICByZXR1cm47CisKKyAgICBhdXRvIGJhc2VVUkxTdHJpbmcgPSB0b1dU RlN0cmluZyhiYXNlVVJMUmVmKTsKKyAgICBhdXRvIHdoaXRlbGlzdCA9IHRvSW1wbCh3aGl0ZWxp c3RlZFVSTFBhdHRlcm5zKTsKKyAgICBhdXRvIGJsYWNrbGlzdCA9IHRvSW1wbChibGFja2xpc3Rl ZFVSTFBhdHRlcm5zKTsKKworICAgIFJlZjxBUEk6OlVzZXJTY3JpcHQ+IHVzZXJTY3JpcHQgPSBB UEk6OlVzZXJTY3JpcHQ6OmNyZWF0ZShXZWJDb3JlOjpVc2VyU2NyaXB0IHsgc291cmNlLCAoYmFz ZVVSTFN0cmluZy5pc0VtcHR5KCkgPyBXZWJDb3JlOjpibGFua1VSTCgpIDogV2ViQ29yZTo6VVJM KFdlYkNvcmU6OlVSTCgpLCBiYXNlVVJMU3RyaW5nKSksIHdoaXRlbGlzdCA/IHdoaXRlbGlzdC0+ dG9TdHJpbmdWZWN0b3IoKSA6IFZlY3RvcjxTdHJpbmc+KCksIGJsYWNrbGlzdCA/IGJsYWNrbGlz dC0+dG9TdHJpbmdWZWN0b3IoKSA6IFZlY3RvcjxTdHJpbmc+KCksIHRvVXNlclNjcmlwdEluamVj dGlvblRpbWUoaW5qZWN0aW9uVGltZSksIHRvVXNlckNvbnRlbnRJbmplY3RlZEZyYW1lcyhpbmpl Y3RlZEZyYW1lcykgfSwgQVBJOjpVc2VyQ29udGVudFdvcmxkOjpub3JtYWxXb3JsZCgpKTsKKyAg ICB0b0ltcGwocGFnZUdyb3VwUmVmKS0+dXNlckNvbnRlbnRDb250cm9sbGVyKCkuYWRkVXNlclNj cmlwdCh1c2VyU2NyaXB0LmdldCgpKTsKIH0KIAogdm9pZCBXS1BhZ2VHcm91cFJlbW92ZUFsbFVz ZXJTY3JpcHRzKFdLUGFnZUdyb3VwUmVmIHBhZ2VHcm91cFJlZikKIHsKLSAgICB0b0ltcGwocGFn ZUdyb3VwUmVmKS0+cmVtb3ZlQWxsVXNlclNjcmlwdHMoKTsKKyAgICB0b0ltcGwocGFnZUdyb3Vw UmVmKS0+dXNlckNvbnRlbnRDb250cm9sbGVyKCkucmVtb3ZlQWxsVXNlclNjcmlwdHMoKTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQy9XS1BhZ2VHcm91cC5o IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9DL1dLUGFnZUdyb3VwLmgKaW5kZXggOGY1 MzE5NjIzZTUxOGEyN2RmNTE1ODM1NWFkMTI4MjYzNTFhYjFiZC4uZDgyMDgwNGYwMThlZjBmNjQ4 ZmIwNTUwNzUwYWM1ZWRkNzk4YTM0YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9DL1dLUGFnZUdyb3VwLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9DL1dLUGFnZUdyb3VwLmgKQEAgLTM4LDggKzM4LDYgQEAgV0tfRVhQT1JUIFdLVHlwZUlEIFdL UGFnZUdyb3VwR2V0VHlwZUlEKCk7CiAKIFdLX0VYUE9SVCBXS1BhZ2VHcm91cFJlZiBXS1BhZ2VH cm91cENyZWF0ZVdpdGhJZGVudGlmaWVyKFdLU3RyaW5nUmVmIGlkZW50aWZpZXIpOwogCi1XS19F WFBPUlQgV0tTdHJpbmdSZWYgV0tQYWdlR3JvdXBDb3B5SWRlbnRpZmllcihXS1BhZ2VHcm91cFJl ZiBwYWdlR3JvdXApOwotCiBXS19FWFBPUlQgdm9pZCBXS1BhZ2VHcm91cFNldFByZWZlcmVuY2Vz KFdLUGFnZUdyb3VwUmVmIHBhZ2VHcm91cCwgV0tQcmVmZXJlbmNlc1JlZiBwcmVmZXJlbmNlcyk7 CiBXS19FWFBPUlQgV0tQcmVmZXJlbmNlc1JlZiBXS1BhZ2VHcm91cEdldFByZWZlcmVuY2VzKFdL UGFnZUdyb3VwUmVmIHBhZ2VHcm91cCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9XZWJQYWdlR3JvdXAuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBh Z2VHcm91cC5jcHAKaW5kZXggMmRkMDM1ZTc1Mzc4Mzc1YjRhMzA0ZTM0MzZlMDVhZTFhYWJiMGM0 YS4uYTA0ZTAzNzBhYTgxZTJjMGRmNzllNjU5NTIyYmFkZTBmODFmNjU1YyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VHcm91cC5jcHAKKysrIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VHcm91cC5jcHAKQEAgLTE0Miw1NSArMTQyLDQgQEAgV2Vi VXNlckNvbnRlbnRDb250cm9sbGVyUHJveHkmIFdlYlBhZ2VHcm91cDo6dXNlckNvbnRlbnRDb250 cm9sbGVyKCkKICAgICByZXR1cm4gKm1fdXNlckNvbnRlbnRDb250cm9sbGVyOwogfQogCi12b2lk IFdlYlBhZ2VHcm91cDo6YWRkVXNlclN0eWxlU2hlZXQoY29uc3QgU3RyaW5nJiBzb3VyY2UsIGNv bnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJOjpBcnJheSogd2hpdGVsaXN0LCBBUEk6OkFycmF5KiBi bGFja2xpc3QsIFdlYkNvcmU6OlVzZXJDb250ZW50SW5qZWN0ZWRGcmFtZXMgaW5qZWN0ZWRGcmFt ZXMsIFdlYkNvcmU6OlVzZXJTdHlsZUxldmVsIGxldmVsKQotewotICAgIGlmIChzb3VyY2UuaXNF bXB0eSgpKQotICAgICAgICByZXR1cm47Ci0KLSAgICBSZWY8QVBJOjpVc2VyU3R5bGVTaGVldD4g dXNlclN0eWxlU2hlZXQgPSBBUEk6OlVzZXJTdHlsZVNoZWV0OjpjcmVhdGUoV2ViQ29yZTo6VXNl clN0eWxlU2hlZXQgeyBzb3VyY2UsIChiYXNlVVJMLmlzRW1wdHkoKSA/IFdlYkNvcmU6OmJsYW5r VVJMKCkgOiBXZWJDb3JlOjpVUkwoV2ViQ29yZTo6VVJMKCksIGJhc2VVUkwpKSwgd2hpdGVsaXN0 ID8gd2hpdGVsaXN0LT50b1N0cmluZ1ZlY3RvcigpIDogVmVjdG9yPFN0cmluZz4oKSwgYmxhY2ts aXN0ID8gYmxhY2tsaXN0LT50b1N0cmluZ1ZlY3RvcigpIDogVmVjdG9yPFN0cmluZz4oKSwgaW5q ZWN0ZWRGcmFtZXMsIGxldmVsIH0sIEFQSTo6VXNlckNvbnRlbnRXb3JsZDo6bm9ybWFsV29ybGQo KSk7Ci0gICAgbV91c2VyQ29udGVudENvbnRyb2xsZXItPmFkZFVzZXJTdHlsZVNoZWV0KHVzZXJT dHlsZVNoZWV0LmdldCgpKTsKLX0KLQotdm9pZCBXZWJQYWdlR3JvdXA6OmFkZFVzZXJTY3JpcHQo Y29uc3QgU3RyaW5nJiBzb3VyY2UsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwgQVBJOjpBcnJheSog d2hpdGVsaXN0LCBBUEk6OkFycmF5KiBibGFja2xpc3QsIFdlYkNvcmU6OlVzZXJDb250ZW50SW5q ZWN0ZWRGcmFtZXMgaW5qZWN0ZWRGcmFtZXMsIFdlYkNvcmU6OlVzZXJTY3JpcHRJbmplY3Rpb25U aW1lIGluamVjdGlvblRpbWUpCi17Ci0gICAgaWYgKHNvdXJjZS5pc0VtcHR5KCkpCi0gICAgICAg IHJldHVybjsKLQotICAgIFJlZjxBUEk6OlVzZXJTY3JpcHQ+IHVzZXJTY3JpcHQgPSBBUEk6OlVz ZXJTY3JpcHQ6OmNyZWF0ZShXZWJDb3JlOjpVc2VyU2NyaXB0IHsgc291cmNlLCAoYmFzZVVSTC5p c0VtcHR5KCkgPyBXZWJDb3JlOjpibGFua1VSTCgpIDogV2ViQ29yZTo6VVJMKFdlYkNvcmU6OlVS TCgpLCBiYXNlVVJMKSksIHdoaXRlbGlzdCA/IHdoaXRlbGlzdC0+dG9TdHJpbmdWZWN0b3IoKSA6 IFZlY3RvcjxTdHJpbmc+KCksIGJsYWNrbGlzdCA/IGJsYWNrbGlzdC0+dG9TdHJpbmdWZWN0b3Io KSA6IFZlY3RvcjxTdHJpbmc+KCksIGluamVjdGlvblRpbWUsIGluamVjdGVkRnJhbWVzIH0sIEFQ STo6VXNlckNvbnRlbnRXb3JsZDo6bm9ybWFsV29ybGQoKSk7Ci0gICAgbV91c2VyQ29udGVudENv bnRyb2xsZXItPmFkZFVzZXJTY3JpcHQodXNlclNjcmlwdC5nZXQoKSk7Ci19Ci0KLXZvaWQgV2Vi UGFnZUdyb3VwOjpyZW1vdmVBbGxVc2VyU3R5bGVTaGVldHMoKQotewotICAgIG1fdXNlckNvbnRl bnRDb250cm9sbGVyLT5yZW1vdmVBbGxVc2VyU3R5bGVTaGVldHMoKTsKLX0KLQotdm9pZCBXZWJQ YWdlR3JvdXA6OnJlbW92ZUFsbFVzZXJTY3JpcHRzKCkKLXsKLSAgICBtX3VzZXJDb250ZW50Q29u dHJvbGxlci0+cmVtb3ZlQWxsVXNlclNjcmlwdHMoKTsKLX0KLQotdm9pZCBXZWJQYWdlR3JvdXA6 OnJlbW92ZUFsbFVzZXJDb250ZW50KCkKLXsKLSAgICBtX3VzZXJDb250ZW50Q29udHJvbGxlci0+ cmVtb3ZlQWxsVXNlclN0eWxlU2hlZXRzKCk7Ci0gICAgbV91c2VyQ29udGVudENvbnRyb2xsZXIt PnJlbW92ZUFsbFVzZXJTY3JpcHRzKCk7Ci19Ci0KLSNpZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJ T05TKQotdm9pZCBXZWJQYWdlR3JvdXA6OmFkZFVzZXJDb250ZW50RXh0ZW5zaW9uKEFQSTo6VXNl ckNvbnRlbnRFeHRlbnNpb24mIHVzZXJDb250ZW50RXh0ZW5zaW9uKQotewotICAgIG1fdXNlckNv bnRlbnRDb250cm9sbGVyLT5hZGRVc2VyQ29udGVudEV4dGVuc2lvbih1c2VyQ29udGVudEV4dGVu c2lvbik7Ci19Ci0KLXZvaWQgV2ViUGFnZUdyb3VwOjpyZW1vdmVVc2VyQ29udGVudEV4dGVuc2lv bihjb25zdCBTdHJpbmcmIGNvbnRlbnRFeHRlbnNpb25OYW1lKQotewotICAgIG1fdXNlckNvbnRl bnRDb250cm9sbGVyLT5yZW1vdmVVc2VyQ29udGVudEV4dGVuc2lvbihjb250ZW50RXh0ZW5zaW9u TmFtZSk7Ci19Ci0KLXZvaWQgV2ViUGFnZUdyb3VwOjpyZW1vdmVBbGxVc2VyQ29udGVudEV4dGVu c2lvbnMoKQotewotICAgIG1fdXNlckNvbnRlbnRDb250cm9sbGVyLT5yZW1vdmVBbGxVc2VyQ29u dGVudEV4dGVuc2lvbnMoKTsKLX0KLSNlbmRpZgotCiB9IC8vIG5hbWVzcGFjZSBXZWJLaXQKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlR3JvdXAuaCBiL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQYWdlR3JvdXAuaAppbmRleCA4MzZhMjcwM2MxNjA1NzYy NGI3MjQxZDU5M2NmYjEwYjJhZjJiNTBhLi5hM2ViYTYxZWFmMjBlNWY0YWIxMDQzYjJkNGI3N2Iz ZTdmNDM5NGE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViUGFnZUdy b3VwLmgKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1dlYlBhZ2VHcm91cC5oCkBAIC01 Myw3ICs1Myw2IEBAIHB1YmxpYzoKICAgICB2b2lkIGFkZFBhZ2UoV2ViUGFnZVByb3h5Kik7CiAg ICAgdm9pZCByZW1vdmVQYWdlKFdlYlBhZ2VQcm94eSopOwogCi0gICAgY29uc3QgU3RyaW5nJiBp ZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9kYXRhLmlkZW50aWZpZXI7IH0KICAgICB1aW50 NjRfdCBwYWdlR3JvdXBJRCgpIGNvbnN0IHsgcmV0dXJuIG1fZGF0YS5wYWdlR3JvdXBJRDsgfQog CiAgICAgY29uc3QgV2ViUGFnZUdyb3VwRGF0YSYgZGF0YSgpIGNvbnN0IHsgcmV0dXJuIG1fZGF0 YTsgfQpAQCAtNjQsNDIgKzYzLDEzIEBAIHB1YmxpYzoKIAogICAgIFdlYlVzZXJDb250ZW50Q29u dHJvbGxlclByb3h5JiB1c2VyQ29udGVudENvbnRyb2xsZXIoKTsKIAotICAgIHZvaWQgYWRkVXNl clN0eWxlU2hlZXQoY29uc3QgU3RyaW5nJiBzb3VyY2UsIGNvbnN0IFN0cmluZyYgYmFzZVVSTCwg QVBJOjpBcnJheSogd2hpdGVsaXN0LCBBUEk6OkFycmF5KiBibGFja2xpc3QsIFdlYkNvcmU6OlVz ZXJDb250ZW50SW5qZWN0ZWRGcmFtZXMsIFdlYkNvcmU6OlVzZXJTdHlsZUxldmVsKTsKLSAgICB2 b2lkIGFkZFVzZXJTY3JpcHQoY29uc3QgU3RyaW5nJiBzb3VyY2UsIGNvbnN0IFN0cmluZyYgYmFz ZVVSTCwgQVBJOjpBcnJheSogd2hpdGVsaXN0LCBBUEk6OkFycmF5KiBibGFja2xpc3QsIFdlYkNv cmU6OlVzZXJDb250ZW50SW5qZWN0ZWRGcmFtZXMsIFdlYkNvcmU6OlVzZXJTY3JpcHRJbmplY3Rp b25UaW1lKTsKLSAgICB2b2lkIHJlbW92ZUFsbFVzZXJTdHlsZVNoZWV0cygpOwotICAgIHZvaWQg cmVtb3ZlQWxsVXNlclNjcmlwdHMoKTsKLSAgICB2b2lkIHJlbW92ZUFsbFVzZXJDb250ZW50KCk7 Ci0KLSNpZiBFTkFCTEUoQ09OVEVOVF9FWFRFTlNJT05TKQotICAgIHZvaWQgYWRkVXNlckNvbnRl bnRFeHRlbnNpb24oQVBJOjpVc2VyQ29udGVudEV4dGVuc2lvbiYpOwotICAgIHZvaWQgcmVtb3Zl VXNlckNvbnRlbnRFeHRlbnNpb24oY29uc3QgU3RyaW5nJik7Ci0gICAgdm9pZCByZW1vdmVBbGxV c2VyQ29udGVudEV4dGVuc2lvbnMoKTsKLSNlbmRpZgotCiBwcml2YXRlOgotICAgIHRlbXBsYXRl PHR5cGVuYW1lIFQ+IHZvaWQgc2VuZFRvQWxsUHJvY2Vzc2VzSW5Hcm91cChjb25zdCBUJiwgdWlu dDY0X3QgZGVzdGluYXRpb25JRCk7Ci0KICAgICBXZWJQYWdlR3JvdXBEYXRhIG1fZGF0YTsKICAg ICBSZWZQdHI8V2ViUHJlZmVyZW5jZXM+IG1fcHJlZmVyZW5jZXM7CiAgICAgUmVmUHRyPFdlYlVz ZXJDb250ZW50Q29udHJvbGxlclByb3h5PiBtX3VzZXJDb250ZW50Q29udHJvbGxlcjsKICAgICBI YXNoU2V0PFdlYlBhZ2VQcm94eSo+IG1fcGFnZXM7CiB9OwogCi10ZW1wbGF0ZTx0eXBlbmFtZSBU Pgotdm9pZCBXZWJQYWdlR3JvdXA6OnNlbmRUb0FsbFByb2Nlc3Nlc0luR3JvdXAoY29uc3QgVCYg bWVzc2FnZSwgdWludDY0X3QgZGVzdGluYXRpb25JRCkKLXsKLSAgICBIYXNoU2V0PFdlYlByb2Nl c3NQcm94eSo+IHByb2Nlc3Nlc1NlZW47Ci0KLSAgICBmb3IgKFdlYlBhZ2VQcm94eSogd2ViUGFn ZVByb3h5IDogbV9wYWdlcykgewotICAgICAgICBXZWJQcm9jZXNzUHJveHkmIHdlYlByb2Nlc3NQ cm94eSA9IHdlYlBhZ2VQcm94eS0+cHJvY2VzcygpOwotICAgICAgICBpZiAoIXByb2Nlc3Nlc1Nl ZW4uYWRkKCZ3ZWJQcm9jZXNzUHJveHkpLmlzTmV3RW50cnkpCi0gICAgICAgICAgICBjb250aW51 ZTsKLQotICAgICAgICBpZiAod2ViUHJvY2Vzc1Byb3h5LmNhblNlbmRNZXNzYWdlKCkpCi0gICAg ICAgICAgICB3ZWJQcm9jZXNzUHJveHkuc2VuZChUKG1lc3NhZ2UpLCBkZXN0aW5hdGlvbklEKTsK LSAgICB9Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYktpdAogCiAjZW5kaWYgLy8gV2ViUGFnZUdy b3VwX2gK