115868 2013-05-09 11:53:49 -0700 Use explicit qualifiers for names in the std:: namespace 2013-05-09 12:03:07 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 887002 0 andersca 2013-05-09 11:53:49 -0700 Use explicit qualifiers for names in the std:: namespace 887003 1 201261 andersca 2013-05-09 11:54:21 -0700 Created attachment 201261 Patch 887005 2 201261 kling 2013-05-09 11:55:42 -0700 Comment on attachment 201261 Patch igp! r=me 887012 3 andersca 2013-05-09 12:03:07 -0700 Committed r149832: <http://trac.webkit.org/changeset/149832> 201261 2013-05-09 11:54:21 -0700 2013-05-09 11:55:41 -0700 Patch bug-115868-20130509115325.patch text/plain 13297 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5ODIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggOGI5OTJmYzUyODE2MTJj MzdiZTQwNDQ2OGE4NDBmY2YxMzlkYTI2Ny4uNjY4YThiYjBlZTViMzczZGUzYmRmZmI4YzVhN2Nm YmRjZjAzODZkMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDEzLTA1LTA5ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIGV4cGxpY2l0 IHF1YWxpZmllcnMgZm9yIG5hbWVzIGluIHRoZSBzdGQ6OiBuYW1lc3BhY2UKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNTg2OAorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2hhcmVkL21hYy9Bcmd1bWVu dENvZGVyc01hYy5tbToKKyAgICAgICAgKENvcmVJUEM6OmVuY29kZSk6CisgICAgICAgICogVUlQ cm9jZXNzL0FQSS9DL1dLUGx1Z2luU2l0ZURhdGFNYW5hZ2VyLmNwcDoKKyAgICAgICAgKFdLUGx1 Z2luU2l0ZURhdGFNYW5hZ2VyQ2xlYXJBbGxTaXRlRGF0YSk6CisgICAgICAgICogVUlQcm9jZXNz L1BsdWdpbnMvUGx1Z2luSW5mb1N0b3JlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6UGx1Z2luSW5m b1N0b3JlOjpmaW5kUGx1Z2luRm9yRXh0ZW5zaW9uKToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vi RnJhbWVQcm94eS5jcHA6CisgICAgICAgICogVUlQcm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHA6 CisgICAgICAgICogV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlQnJvd3NlckZ1 bmNzLmNwcDoKKyAgICAgICAgKFdlYktpdDo6cGFyc2VQb3N0QnVmZmVyKToKKyAgICAgICAgKiBX ZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW4uY3BwOgorICAgICAgICAo V2ViS2l0OjpOZXRzY2FwZVBsdWdpbjo6bG9hZFVSTCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9Q bHVnaW5zL05ldHNjYXBlL05ldHNjYXBlUGx1Z2luU3RyZWFtLmNwcDoKKyAgICAgICAgKFdlYktp dDo6TmV0c2NhcGVQbHVnaW5TdHJlYW06OmRlbGl2ZXJEYXRhVG9QbHVnaW4pOgorICAgICAgICAq IFdlYlByb2Nlc3MvUGx1Z2lucy9QREYvU2ltcGxlUERGUGx1Z2luLm1tOgorICAgICAgICAqIFdl YlByb2Nlc3MvV2ViUGFnZS9EcmF3aW5nQXJlYUltcGwuY3BwOgorICAgICAgICAqIFdlYlByb2Nl c3MvV2ViUGFnZS9GaW5kQ29udHJvbGxlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZpbmRDb250 cm9sbGVyOjpjb3VudFN0cmluZ01hdGNoZXMpOgorICAgICAgICAoV2ViS2l0OjpGaW5kQ29udHJv bGxlcjo6dXBkYXRlRmluZFVJQWZ0ZXJQYWdlU2Nyb2xsKToKKyAgICAgICAgKiBXZWJQcm9jZXNz L1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdlL21hYy9X ZWJQYWdlTWFjLm1tOgorICAgICAgICAoV2ViS2l0OjpkcmF3UERGUGFnZSk6CisgICAgICAgICog V2ViUHJvY2Vzcy9tYWMvV2ViUHJvY2Vzc01hYy5tbToKKwogMjAxMy0wNS0wOSAgVGltb3RoeSBI YXRjaGVyICA8dGltb3RoeUBhcHBsZS5jb20+CiAKICAgICAgICAgTWFrZSBkcmFnZ2luZyBvZmYg YSB0YWIgaW4gU2FmYXJpIHdpdGggYSBkb2NrZWQgSW5zcGVjdG9yIHJlYXR0YWNoIHRoZSBJbnNw ZWN0b3IuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL0FyZ3VtZW50Q29k ZXJzTWFjLm1tIGIvU291cmNlL1dlYktpdDIvU2hhcmVkL21hYy9Bcmd1bWVudENvZGVyc01hYy5t bQppbmRleCA4ZjU0MGVhN2NjNTMwNTY5MjZmZmFjY2I4MmI0NzBiOTJiMDFiMmY5Li5jMmQ1YWI3 MjJmOTYzY2UzZWYxYTcxZGM4ZjkzNGI4Yzc1YjA0YTQyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9TaGFyZWQvbWFjL0FyZ3VtZW50Q29kZXJzTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQy L1NoYXJlZC9tYWMvQXJndW1lbnRDb2RlcnNNYWMubW0KQEAgLTMzLDcgKzMzLDYgQEAKICNpbXBv cnQgPFdlYkNvcmUvQ29sb3JNYWMuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7Ci11c2lu ZyBuYW1lc3BhY2Ugc3RkOwogCiBuYW1lc3BhY2UgQ29yZUlQQyB7CiAKQEAgLTIzMCw3ICsyMjks NyBAQCB2b2lkIGVuY29kZShBcmd1bWVudEVuY29kZXImIGVuY29kZXIsIE5TQXR0cmlidXRlZFN0 cmluZyAqc3RyaW5nKQogICAgICAgICBBU1NFUlQoZWZmZWN0aXZlUmFuZ2UubGVuZ3RoKTsKICAg ICAgICAgQVNTRVJUKE5TTWF4UmFuZ2UoZWZmZWN0aXZlUmFuZ2UpIDw9IGxlbmd0aCk7CiAKLSAg ICAgICAgcmFuZ2VzLmFwcGVuZChtYWtlX3BhaXIoZWZmZWN0aXZlUmFuZ2UsIGF0dHJpYnV0ZXNB dEluZGV4KSk7CisgICAgICAgIHJhbmdlcy5hcHBlbmQoc3RkOjptYWtlX3BhaXIoZWZmZWN0aXZl UmFuZ2UsIGF0dHJpYnV0ZXNBdEluZGV4KSk7CiAKICAgICAgICAgcG9zaXRpb24gPSBOU01heFJh bmdlKGVmZmVjdGl2ZVJhbmdlKTsKICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0MvV0tQbHVnaW5TaXRlRGF0YU1hbmFnZXIuY3BwIGIvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9DL1dLUGx1Z2luU2l0ZURhdGFNYW5hZ2VyLmNwcAppbmRleCAzOTUz OWY0NDk1YjBlYTVmZGY0ZWNlMzAzNjU5ZWNjMWEyMDc4ZmY3Li4xMTA1Y2EyN2FjZTk4NWM5Yjc1 YzAyNjJjZDYzNTkwYjIzOTUxYWE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nl c3MvQVBJL0MvV0tQbHVnaW5TaXRlRGF0YU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvQy9XS1BsdWdpblNpdGVEYXRhTWFuYWdlci5jcHAKQEAgLTM1LDcgKzM1 LDYgQEAKICNlbmRpZgogCiB1c2luZyBuYW1lc3BhY2UgV2ViS2l0OwotdXNpbmcgbmFtZXNwYWNl IHN0ZDsKIAogV0tUeXBlSUQgV0tQbHVnaW5TaXRlRGF0YU1hbmFnZXJHZXRUeXBlSUQoKQogewpA QCAtODcsNyArODYsNyBAQCB2b2lkIFdLUGx1Z2luU2l0ZURhdGFNYW5hZ2VyQ2xlYXJTaXRlRGF0 YShXS1BsdWdpblNpdGVEYXRhTWFuYWdlclJlZiBtYW5hZ2VyUmVmLAogdm9pZCBXS1BsdWdpblNp dGVEYXRhTWFuYWdlckNsZWFyQWxsU2l0ZURhdGEoV0tQbHVnaW5TaXRlRGF0YU1hbmFnZXJSZWYg bWFuYWdlclJlZiwgdm9pZCogY29udGV4dCwgV0tQbHVnaW5TaXRlRGF0YU1hbmFnZXJDbGVhclNp dGVEYXRhRnVuY3Rpb24gZnVuY3Rpb24pCiB7CiAjaWYgRU5BQkxFKE5FVFNDQVBFX1BMVUdJTl9B UEkpCi0gICAgdG9JbXBsKG1hbmFnZXJSZWYpLT5jbGVhclNpdGVEYXRhKDAsIE5QX0NMRUFSX0FM TCwgbnVtZXJpY19saW1pdHM8dWludDY0X3Q+OjptYXgoKSwgVm9pZENhbGxiYWNrOjpjcmVhdGUo Y29udGV4dCwgZnVuY3Rpb24pKTsKKyAgICB0b0ltcGwobWFuYWdlclJlZiktPmNsZWFyU2l0ZURh dGEoMCwgTlBfQ0xFQVJfQUxMLCBzdGQ6Om51bWVyaWNfbGltaXRzPHVpbnQ2NF90Pjo6bWF4KCks IFZvaWRDYWxsYmFjazo6Y3JlYXRlKGNvbnRleHQsIGZ1bmN0aW9uKSk7CiAjZWxzZQogICAgIFVO VVNFRF9QQVJBTShtYW5hZ2VyUmVmKTsKICAgICBVTlVTRURfUEFSQU0oY29udGV4dCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5JbmZvU3RvcmUu Y3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1BsdWdpbnMvUGx1Z2luSW5mb1N0b3JlLmNw cAppbmRleCBhYjg4MGJkZTBlNWEyODAxOGI5YmI3N2QzNzg2MTYyZmRjODU0N2UxLi4zOGNlNjRh NzA4ZTJkOWM2ZDAwMjVkYzM0MTA2OTg4MjllMGZlYjJkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvUGx1Z2lucy9QbHVnaW5JbmZvU3RvcmUuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9QbHVnaW5zL1BsdWdpbkluZm9TdG9yZS5jcHAKQEAgLTM1LDcgKzM1 LDYgQEAKICNpbmNsdWRlIDx3dGYvTGlzdEhhc2hTZXQuaD4KICNpbmNsdWRlIDx3dGYvU3RkTGli RXh0cmFzLmg+CiAKLXVzaW5nIG5hbWVzcGFjZSBzdGQ7CiB1c2luZyBuYW1lc3BhY2UgV2ViQ29y ZTsKIAogbmFtZXNwYWNlIFdlYktpdCB7CkBAIC0xNTEsNyArMTUwLDcgQEAgUGx1Z2luTW9kdWxl SW5mbyBQbHVnaW5JbmZvU3RvcmU6OmZpbmRQbHVnaW5Gb3JFeHRlbnNpb24oY29uc3QgU3RyaW5n JiBleHRlbnNpb24KICAgICAgICAgICAgIAogICAgICAgICAgICAgY29uc3QgVmVjdG9yPFN0cmlu Zz4mIGV4dGVuc2lvbnMgPSBtaW1lQ2xhc3NJbmZvLmV4dGVuc2lvbnM7CiAgICAgICAgICAgICAK LSAgICAgICAgICAgIGlmIChmaW5kKGV4dGVuc2lvbnMuYmVnaW4oKSwgZXh0ZW5zaW9ucy5lbmQo KSwgZXh0ZW5zaW9uKSAhPSBleHRlbnNpb25zLmVuZCgpKSB7CisgICAgICAgICAgICBpZiAoc3Rk OjpmaW5kKGV4dGVuc2lvbnMuYmVnaW4oKSwgZXh0ZW5zaW9ucy5lbmQoKSwgZXh0ZW5zaW9uKSAh PSBleHRlbnNpb25zLmVuZCgpKSB7CiAgICAgICAgICAgICAgICAgLy8gV2UgZm91bmQgYSBzdXBw b3J0ZWQgZXh0ZW5zaW9uLCBzZXQgdGhlIGNvcnJlY3QgTUlNRSB0eXBlLgogICAgICAgICAgICAg ICAgIG1pbWVUeXBlID0gbWltZUNsYXNzSW5mby50eXBlOwogICAgICAgICAgICAgICAgIHJldHVy biBwbHVnaW47CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRnJhbWVQ cm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvV2ViRnJhbWVQcm94eS5jcHAKaW5k ZXggYmU3ZjYzNmIyM2EzNzExZDI1NDVlZWE2ZTZkZjhiNzdjODliNDU1NC4uZGVkYjVjMjliZmY1 ZmIwYzRmOGU5MWNjZmI3Y2I3MWRhZjNhOGQ5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL1dlYkZyYW1lUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJGcmFtZVByb3h5LmNwcApAQCAtMzksNyArMzksNiBAQAogI2luY2x1ZGUgPHd0Zi90ZXh0 L1dURlN0cmluZy5oPgogCiB1c2luZyBuYW1lc3BhY2UgV2ViQ29yZTsKLXVzaW5nIG5hbWVzcGFj ZSBzdGQ7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vz cy9XZWJQcm9jZXNzUHJveHkuY3BwCmluZGV4IGQ0Mzg0MGFmZWIzN2U3MmQ1Njg5ZjBiOWE2NmYy NzI5MDg2MWY4NGUuLjFkZjAwOTY4NDkzY2JiMWIyMjliYTM2N2MxYzY2NjRkN2E1NTExYjQgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCkBAIC02Miw3 ICs2Miw2IEBACiAjZW5kaWYKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7Ci11c2luZyBuYW1l c3BhY2Ugc3RkOwogCiAjZGVmaW5lIE1FU1NBR0VfQ0hFQ0soYXNzZXJ0aW9uKSBNRVNTQUdFX0NI RUNLX0JBU0UoYXNzZXJ0aW9uLCBjb25uZWN0aW9uKCkpCiAjZGVmaW5lIE1FU1NBR0VfQ0hFQ0tf VVJMKHVybCkgTUVTU0FHRV9DSEVDS19CQVNFKGNoZWNrVVJMUmVjZWl2ZWRGcm9tV2ViUHJvY2Vz cyh1cmwpLCBjb25uZWN0aW9uKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9j ZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVCcm93c2VyRnVuY3MuY3BwIGIvU291cmNlL1dl YktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBlQnJvd3NlckZ1bmNzLmNw cAppbmRleCBkMGVlNTA5ZWQ3ZjM5NTM3N2I3ZTE4YWM2NTFlMjA2NDYxM2U1NWNlLi43OTdiN2Rj Y2NjNmI1OWY3MTIwMjYyODZjYmIzYTUxZjcwMjFiMmE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVCcm93c2VyRnVuY3MuY3Bw CisrKyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2Fw ZUJyb3dzZXJGdW5jcy5jcHAKQEAgLTQwLDcgKzQwLDYgQEAKICNpbmNsdWRlIDx3dGYvdGV4dC9T dHJpbmdCdWlsZGVyLmg+CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwotdXNpbmcgbmFtZXNw YWNlIHN0ZDsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKQEAgLTI0OCw3ICsyNDcsNyBAQCBzdGF0 aWMgTlBFcnJvciBwYXJzZVBvc3RCdWZmZXIoYm9vbCBpc0ZpbGUsIGNvbnN0IGNoYXIgKmJ1ZmZl ciwgdWludDMyX3QgbGVuZ3RoLAogICAgICAgICAgICAgICAgIFN0cmluZyBjb250ZW50TGVuZ3Ro ID0gaGVhZGVyRmllbGRzLmdldCgiQ29udGVudC1MZW5ndGgiKTsKICAgICAgICAgICAgICAgICAK ICAgICAgICAgICAgICAgICBpZiAoIWNvbnRlbnRMZW5ndGguaXNOdWxsKCkpCi0gICAgICAgICAg ICAgICAgICAgIGRhdGFMZW5ndGggPSBtaW4oY29udGVudExlbmd0aC50b0ludCgpLCAoaW50KWRh dGFMZW5ndGgpOworICAgICAgICAgICAgICAgICAgICBkYXRhTGVuZ3RoID0gc3RkOjptaW4oY29u dGVudExlbmd0aC50b0ludCgpLCAoaW50KWRhdGFMZW5ndGgpOwogICAgICAgICAgICAgICAgIGhl YWRlckZpZWxkcy5yZW1vdmUoIkNvbnRlbnQtTGVuZ3RoIik7CiAgICAgICAgICAgICAgICAgCiAg ICAgICAgICAgICAgICAgcG9zdEJ1ZmZlciArPSBsb2NhdGlvbjsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAg Yi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVn aW4uY3BwCmluZGV4IDM5MzA3YTk5NjEyYTgyYTA1ZjNhNWQyNzVmNTYyZGMyYjU2ZmQzOWYuLmZh YjM0MmIwMjk4ZGI3OWNmM2U1MTU4MzJlOWViMTlkMjhjZDFhYWYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpbi5jcHAK KysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05ldHNjYXBl UGx1Z2luLmNwcApAQCAtNDMsNyArNDMsNiBAQAogI2luY2x1ZGUgPHd0Zi90ZXh0L0NTdHJpbmcu aD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7Ci11c2luZyBuYW1lc3BhY2Ugc3RkOwogCiBu YW1lc3BhY2UgV2ViS2l0IHsKIApAQCAtMTg4LDcgKzE4Nyw3IEBAIHZvaWQgTmV0c2NhcGVQbHVn aW46OmxvYWRVUkwoY29uc3QgU3RyaW5nJiBtZXRob2QsIGNvbnN0IFN0cmluZyYgdXJsU3RyaW5n LCBjb25zCiAgICAgICAgIC8vIEV2ZW50dWFsbHkgd2UgYXJlIGdvaW5nIHRvIGdldCBhIGZyYW1l RGlkRmluaXNoTG9hZGluZyBvciBmcmFtZURpZEZhaWwgY2FsbCBmb3IgdGhpcyByZXF1ZXN0Lgog ICAgICAgICAvLyBLZWVwIHRyYWNrIG9mIHRoZSBub3RpZmljYXRpb24gZGF0YSBzbyB3ZSBjYW4g Y2FsbCBOUFBfVVJMTm90aWZ5LgogICAgICAgICBBU1NFUlQoIW1fcGVuZGluZ1VSTE5vdGlmaWNh dGlvbnMuY29udGFpbnMocmVxdWVzdElEKSk7Ci0gICAgICAgIG1fcGVuZGluZ1VSTE5vdGlmaWNh dGlvbnMuc2V0KHJlcXVlc3RJRCwgbWFrZV9wYWlyKHVybFN0cmluZywgbm90aWZpY2F0aW9uRGF0 YSkpOworICAgICAgICBtX3BlbmRpbmdVUkxOb3RpZmljYXRpb25zLnNldChyZXF1ZXN0SUQsIHN0 ZDo6bWFrZV9wYWlyKHVybFN0cmluZywgbm90aWZpY2F0aW9uRGF0YSkpOwogICAgIH0KIH0KIApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5zL05ldHNjYXBlL05l dHNjYXBlUGx1Z2luU3RyZWFtLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lu cy9OZXRzY2FwZS9OZXRzY2FwZVBsdWdpblN0cmVhbS5jcHAKaW5kZXggNjVhYjJlNWVhNDNhZjJl NzZkOGFlZWVhMDgxNGJhZmQxMGEyNTU0MS4uOWNiMWE2ZGVlODY0Yjc4MTNmZjkzNGU4MmU1MGZi ZTBjMDYyZTM2NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9QbHVnaW5z L05ldHNjYXBlL05ldHNjYXBlUGx1Z2luU3RyZWFtLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9X ZWJQcm9jZXNzL1BsdWdpbnMvTmV0c2NhcGUvTmV0c2NhcGVQbHVnaW5TdHJlYW0uY3BwCkBAIC0z NCw3ICszNCw2IEBACiAjaW5jbHVkZSA8d3RmL1ZlY3Rvci5oPgogCiB1c2luZyBuYW1lc3BhY2Ug V2ViQ29yZTsKLXVzaW5nIG5hbWVzcGFjZSBzdGQ7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewogCkBA IC0yMjEsNyArMjIwLDcgQEAgdm9pZCBOZXRzY2FwZVBsdWdpblN0cmVhbTo6ZGVsaXZlckRhdGFU b1BsdWdpbigpCiAgICAgICAgIH0KIAogICAgICAgICAvLyBGaWd1cmUgb3V0IGhvdyBtdWNoIGRh dGEgdG8gc2VuZCB0byB0aGUgcGx1Zy1pbi4KLSAgICAgICAgaW50MzJfdCBkYXRhTGVuZ3RoID0g bWluKG51bUJ5dGVzUGx1Z2luQ2FuSGFuZGxlLCBudW1CeXRlc1RvRGVsaXZlciAtIG51bUJ5dGVz RGVsaXZlcmVkKTsKKyAgICAgICAgaW50MzJfdCBkYXRhTGVuZ3RoID0gc3RkOjptaW4obnVtQnl0 ZXNQbHVnaW5DYW5IYW5kbGUsIG51bUJ5dGVzVG9EZWxpdmVyIC0gbnVtQnl0ZXNEZWxpdmVyZWQp OwogICAgICAgICB1aW50OF90KiBkYXRhID0gbV9kZWxpdmVyeURhdGEtPmRhdGEoKSArIG51bUJ5 dGVzRGVsaXZlcmVkOwogCiAgICAgICAgIGludDMyX3QgbnVtQnl0ZXNXcml0dGVuID0gbV9wbHVn aW4tPk5QUF9Xcml0ZSgmbV9ucFN0cmVhbSwgbV9vZmZzZXQsIGRhdGFMZW5ndGgsIGRhdGEpOwpA QCAtMjM1LDcgKzIzNCw3IEBAIHZvaWQgTmV0c2NhcGVQbHVnaW5TdHJlYW06OmRlbGl2ZXJEYXRh VG9QbHVnaW4oKQogICAgICAgICBpZiAoIW1faXNTdGFydGVkKQogICAgICAgICAgICAgcmV0dXJu OwogCi0gICAgICAgIG51bUJ5dGVzV3JpdHRlbiA9IG1pbihudW1CeXRlc1dyaXR0ZW4sIGRhdGFM ZW5ndGgpOworICAgICAgICBudW1CeXRlc1dyaXR0ZW4gPSBzdGQ6Om1pbihudW1CeXRlc1dyaXR0 ZW4sIGRhdGFMZW5ndGgpOwogICAgICAgICBtX29mZnNldCArPSBudW1CeXRlc1dyaXR0ZW47CiAg ICAgICAgIG51bUJ5dGVzRGVsaXZlcmVkICs9IG51bUJ5dGVzV3JpdHRlbjsKICAgICB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1BsdWdpbnMvUERGL1NpbXBsZVBERlBs dWdpbi5tbSBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvU2ltcGxlUERG UGx1Z2luLm1tCmluZGV4IDkzOGUwNjQ3NTliNzk2NTQxZjcyYTc5NjMxNTAyNGFiOGMwMzZkNDku LjYxMGMyMDljNTkwYjg5MWY1YWQxYWU4ZTZlZjkyNmVmMzk4ZDlmMTQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvU2ltcGxlUERGUGx1Z2luLm1tCisr KyBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvUGx1Z2lucy9QREYvU2ltcGxlUERGUGx1Z2lu Lm1tCkBAIC01Miw3ICs1Miw2IEBACiAjaW1wb3J0IDxXZWJDb3JlL1Njcm9sbGJhclRoZW1lLmg+ CiAKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwotdXNpbmcgbmFtZXNwYWNlIHN0ZDsKIAogc3Rh dGljIGNvbnN0IGNoYXIqIHBvc3RTY3JpcHRNSU1FVHlwZSA9ICJhcHBsaWNhdGlvbi9wb3N0c2Ny aXB0IjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0Ry YXdpbmdBcmVhSW1wbC5jcHAgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJh d2luZ0FyZWFJbXBsLmNwcAppbmRleCA2NDYzOTdiZjUzNDdhMDgzYjg5NDQ1MzRjNzc3ZWM0ZmUy ZmI1NWQ3Li42ZWUzYWY1OGNjNzMzMDQyY2I3NGUyNGFiZDgyNjc2ZjBhMjEyMDkyIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBsLmNw cAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRHJhd2luZ0FyZWFJbXBs LmNwcApAQCAtMzgsNyArMzgsNiBAQAogI2luY2x1ZGUgPFdlYkNvcmUvU2V0dGluZ3MuaD4KIAog dXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7Ci11c2luZyBuYW1lc3BhY2Ugc3RkOwogCiBuYW1lc3Bh Y2UgV2ViS2l0IHsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQ YWdlL0ZpbmRDb250cm9sbGVyLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFn ZS9GaW5kQ29udHJvbGxlci5jcHAKaW5kZXggMjc5ZjZhYjJiNWEzZWVlZTQ1NzBiNjY5ZDg1MmM3 OGE1NzRlMWI4ZS4uMGE3ZWQxN2IyOWZlMDhhZjFhOGQzNDhkYzBmNmNjY2VjNDc3NGNhZCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdlL0ZpbmRDb250cm9sbGVy LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvRmluZENvbnRyb2xs ZXIuY3BwCkBAIC00MSw3ICs0MSw2IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9QYWdlLmg+CiAjaW5j bHVkZSA8V2ViQ29yZS9QbHVnaW5Eb2N1bWVudC5oPgogCi11c2luZyBuYW1lc3BhY2Ugc3RkOwog dXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKIG5hbWVzcGFjZSBXZWJLaXQgewpAQCAtNzcsNyAr NzYsNyBAQCBzdGF0aWMgUGx1Z2luVmlldyogcGx1Z2luVmlld0ZvckZyYW1lKEZyYW1lKiBmcmFt ZSkKIAogdm9pZCBGaW5kQ29udHJvbGxlcjo6Y291bnRTdHJpbmdNYXRjaGVzKGNvbnN0IFN0cmlu ZyYgc3RyaW5nLCBGaW5kT3B0aW9ucyBvcHRpb25zLCB1bnNpZ25lZCBtYXhNYXRjaENvdW50KQog ewotICAgIGlmIChtYXhNYXRjaENvdW50ID09IG51bWVyaWNfbGltaXRzPHVuc2lnbmVkPjo6bWF4 KCkpCisgICAgaWYgKG1heE1hdGNoQ291bnQgPT0gc3RkOjpudW1lcmljX2xpbWl0czx1bnNpZ25l ZD46Om1heCgpKQogICAgICAgICAtLW1heE1hdGNoQ291bnQ7CiAgICAgCiAgICAgUGx1Z2luVmll dyogcGx1Z2luVmlldyA9IHBsdWdpblZpZXdGb3JGcmFtZShtX3dlYlBhZ2UtPm1haW5GcmFtZSgp KTsKQEAgLTEzMSw4ICsxMzAsNyBAQCB2b2lkIEZpbmRDb250cm9sbGVyOjp1cGRhdGVGaW5kVUlB ZnRlclBhZ2VTY3JvbGwoYm9vbCBmb3VuZCwgY29uc3QgU3RyaW5nJiBzdHJpbgogICAgICAgICB1 bnNpZ25lZCBtYXRjaENvdW50ID0gMTsKIAogICAgICAgICBpZiAoc2hvdWxkU2hvd092ZXJsYXkg fHwgc2hvdWxkU2hvd0hpZ2hsaWdodCkgewotCi0gICAgICAgICAgICBpZiAobWF4TWF0Y2hDb3Vu dCA9PSBudW1lcmljX2xpbWl0czx1bnNpZ25lZD46Om1heCgpKQorICAgICAgICAgICAgaWYgKG1h eE1hdGNoQ291bnQgPT0gc3RkOjpudW1lcmljX2xpbWl0czx1bnNpZ25lZD46Om1heCgpKQogICAg ICAgICAgICAgICAgIC0tbWF4TWF0Y2hDb3VudDsKIAogICAgICAgICAgICAgaWYgKHBsdWdpblZp ZXcpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApp bmRleCBkYTA2OTA5NTFiMjZjZDA0ZTBjMzE1M2Y3YTBkYWRmOTAzYTkyZDc0Li4zNDdiYmNmZmYw ZmMyZmNjYmY1MWVjNGFhNGVmNWMyMzBlZGI3MTg3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCkBAIC0xOTUsNyArMTk1LDYgQEAKIAogdXNpbmcg bmFtZXNwYWNlIEpTQzsKIHVzaW5nIG5hbWVzcGFjZSBXZWJDb3JlOwotdXNpbmcgbmFtZXNwYWNl IHN0ZDsKIAogbmFtZXNwYWNlIFdlYktpdCB7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbSBiL1NvdXJjZS9XZWJLaXQyL1dl YlByb2Nlc3MvV2ViUGFnZS9tYWMvV2ViUGFnZU1hYy5tbQppbmRleCA3NDM3NzE4NWQ4Y2U0ZGYz MWQ0NGViMGE1NzUzYThhZDJiZjA0Zjg4Li4xNzQ3NTQ2OGYxMDlmOWM3NjczYmQ1OWI1ZmUyNzQw Y2FiMzZmODE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL1dlYlBhZ2Uv bWFjL1dlYlBhZ2VNYWMubW0KKysrIGIvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9XZWJQYWdl L21hYy9XZWJQYWdlTWFjLm1tCkBAIC03MCw3ICs3MCw2IEBACiAjaW1wb3J0IDxXZWJLaXRTeXN0 ZW1JbnRlcmZhY2UuaD4KIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7Ci11c2luZyBuYW1lc3Bh Y2Ugc3RkOwogCiBuYW1lc3BhY2UgV2ViS2l0IHsKIApAQCAtOTMzLDcgKzkzMiw3IEBAIHN0YXRp YyB2b2lkIGRyYXdQREZQYWdlKFBERkRvY3VtZW50ICpwZGZEb2N1bWVudCwgQ0ZJbmRleCBwYWdl SW5kZXgsIENHQ29udGV4dFJlCiAKICAgICBib29sIHNob3VsZFJvdGF0ZSA9IChwYXBlclNpemUu d2lkdGggPCBwYXBlclNpemUuaGVpZ2h0KSAhPSAoY3JvcEJveC5zaXplLndpZHRoIDwgY3JvcEJv eC5zaXplLmhlaWdodCk7CiAgICAgaWYgKHNob3VsZFJvdGF0ZSkKLSAgICAgICAgc3dhcChjcm9w Qm94LnNpemUud2lkdGgsIGNyb3BCb3guc2l6ZS5oZWlnaHQpOworICAgICAgICBzdGQ6OnN3YXAo Y3JvcEJveC5zaXplLndpZHRoLCBjcm9wQm94LnNpemUuaGVpZ2h0KTsKIAogICAgIC8vIENlbnRl ci4KICAgICBDR0Zsb2F0IHdpZHRoRGlmZmVyZW5jZSA9IHBhcGVyU2l6ZS53aWR0aCAvIHBhZ2VT ZXR1cFNjYWxlRmFjdG9yIC0gY3JvcEJveC5zaXplLndpZHRoOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdDIvV2ViUHJvY2Vzcy9tYWMvV2ViUHJvY2Vzc01hYy5tbSBiL1NvdXJjZS9XZWJLaXQy L1dlYlByb2Nlc3MvbWFjL1dlYlByb2Nlc3NNYWMubW0KaW5kZXggMWQ3MTI1MzRiNjViMTUwN2Nm YzVlYzE3MzZmNDgxZDc5OTI1NTAxMS4uMTkwNjA4NDgxNWRmZDYwNGZjNjc5YjExOGExYzFlNmU5 NzFlMDQ3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvV2ViUHJvY2Vzcy9tYWMvV2ViUHJv Y2Vzc01hYy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9XZWJQcm9jZXNzL21hYy9XZWJQcm9jZXNz TWFjLm1tCkBAIC01NSw3ICs1NSw2IEBACiAjZW5kaWYKIAogdXNpbmcgbmFtZXNwYWNlIFdlYkNv cmU7Ci11c2luZyBuYW1lc3BhY2Ugc3RkOwogCiBjb25zdCBDRlN0cmluZ1JlZiBrTFNBY3RpdmVQ YWdlVXNlclZpc2libGVPcmlnaW5zS2V5ID0gQ0ZTVFIoIkxTQWN0aXZlUGFnZVVzZXJWaXNpYmxl T3JpZ2luc0tleSIpOwogCg==