58080 2011-04-07 14:27:11 -0700 Make IconSnapshot and PageURLRecord member variables private. 2011-04-07 18:44:17 -0700 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 levin levin abarth eric webkit.review.bot oldest_to_newest 381703 0 levin 2011-04-07 14:27:11 -0700 This helps to ensure that they are only modified in given ways and in general is a good C++ practice. 381709 1 88699 levin 2011-04-07 14:31:00 -0700 Created attachment 88699 Patch 381821 2 88699 darin 2011-04-07 16:21:24 -0700 Comment on attachment 88699 Patch Since we never want to change these after creating them, seems like a reasonable way to go. The other direction would be to make them structs. 381895 3 levin 2011-04-07 17:56:30 -0700 Committed as http://trac.webkit.org/changeset/83234 381926 4 webkit.review.bot 2011-04-07 18:44:17 -0700 http://trac.webkit.org/changeset/83234 might have broken Qt Linux Release The following tests are not passing: http/tests/security/contentSecurityPolicy/xsl-allowed.php 88699 2011-04-07 14:31:00 -0700 2011-04-07 16:21:24 -0700 Patch bug-58080-20110407143058.patch text/plain 10285 levin U3VidmVyc2lvbiBSZXZpc2lvbjogODMxODkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCAwNTg4MTMzNTViM2MzZTRm OTJlMzFmMDc0OWY1MjljNGI4NTUwM2M3Li5mZTg2YTA0NmQ5ZDVkYjRjMWM4MGIwOGMxOTdkNDZi YjFjOGQ1YmU5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUgQEAKKzIwMTEtMDQtMDcgIERhdmlk IExldmluICA8bGV2aW5AY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgSWNvblNuYXBzaG90IGFuZCBQYWdlVVJMUmVjb3Jk IG1lbWJlciB2YXJpYWJsZXMgcHJpdmF0ZS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTU4MDgwCisKKyAgICAgICAgTm8gY2hhbmdlIGluIGZ1bmN0aW9u YWxpdHkgc28gbm8gbmV3IHRlc3RzLgorCisgICAgICAgICogbG9hZGVyL2ljb24vSWNvbkRhdGFi YXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okljb25EYXRhYmFzZTo6d3JpdGVUb0RhdGFiYXNl KTogQ2hhbmdlZCB0byB1c2VkIHRoZSBhY2Nlc3NvciBmdW5jdGlvbnMuCisgICAgICAgIChXZWJD b3JlOjpJY29uRGF0YWJhc2U6OndyaXRlSWNvblNuYXBzaG90VG9TUUxEYXRhYmFzZSk6IERpdHRv LgorICAgICAgICAqIGxvYWRlci9pY29uL0ljb25SZWNvcmQuaDoKKyAgICAgICAgKFdlYkNvcmU6 Okljb25TbmFwc2hvdDo6SWNvblNuYXBzaG90KTogQ2hhbmdlZCB0byB1c2UgdGhlIG5ldyBtZW1i ZXIgdmFyaWFibGUgbmFtZXMuCisgICAgICAgIChXZWJDb3JlOjpJY29uU25hcHNob3Q6Omljb25V UkwpOiBFeHBvc2UgdGhlIHByb3BlcnR5LgorICAgICAgICAoV2ViQ29yZTo6SWNvblNuYXBzaG90 Ojp0aW1lc3RhbXApOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6Okljb25TbmFwc2hvdDo6ZGF0 YSk6IERpdHRvLgorICAgICAgICAqIGxvYWRlci9pY29uL1BhZ2VVUkxSZWNvcmQuaDoKKyAgICAg ICAgKFdlYkNvcmU6OlBhZ2VVUkxTbmFwc2hvdDo6UGFnZVVSTFNuYXBzaG90KTogQ2hhbmdlZCB0 byB1c2UgdGhlIG5ldyBtZW1iZXIgdmFyaWFibGUgbmFtZXMuCisgICAgICAgIChXZWJDb3JlOjpQ YWdlVVJMU25hcHNob3Q6OnBhZ2VVUkwpOiBFeHBvc2UgdGhlIHByb3BlcnR5LgorICAgICAgICAo V2ViQ29yZTo6UGFnZVVSTFNuYXBzaG90OjppY29uVVJMKTogRGl0dG8uCisKIDIwMTEtMDQtMDcg IERhbiBCZXJuc3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KIAogICAgICAgICBSZXZpZXdlZCBieSBB ZGFtIFJvYmVuLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNvbkRh dGFiYXNlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9pY29uL0ljb25EYXRhYmFzZS5jcHAK aW5kZXggYzJjYmI2YTJkZjZkMTdmOGUzNjIyNDRiZmM0NWYzMjE5ZjYzZTZiYy4uOTg1YjkyMTc3 OGI1YmQ1MjE1OTk5MGM1M2M0NzJmM2I5ZGYzNGI2YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvbG9hZGVyL2ljb24vSWNvbkRhdGFiYXNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvaWNvbi9JY29uRGF0YWJhc2UuY3BwCkBAIC0xNTkxLDE3ICsxNTkxLDE3IEBAIGJvb2wgSWNv bkRhdGFiYXNlOjp3cml0ZVRvRGF0YWJhc2UoKQogICAgIAogICAgIGZvciAodW5zaWduZWQgaSA9 IDA7IGkgPCBpY29uU25hcHNob3RzLnNpemUoKTsgKytpKSB7CiAgICAgICAgIHdyaXRlSWNvblNu YXBzaG90VG9TUUxEYXRhYmFzZShpY29uU25hcHNob3RzW2ldKTsKLSAgICAgICAgTE9HKEljb25E YXRhYmFzZSwgIldyb3RlIEljb25SZWNvcmQgZm9yIEljb25VUkwgJXMgd2l0aCB0aW1lU3RhbXAg b2YgJWkgdG8gdGhlIERCIiwgdXJsRm9yTG9nZ2luZyhpY29uU25hcHNob3RzW2ldLmljb25VUkwp LmFzY2lpKCkuZGF0YSgpLCBpY29uU25hcHNob3RzW2ldLnRpbWVzdGFtcCk7CisgICAgICAgIExP RyhJY29uRGF0YWJhc2UsICJXcm90ZSBJY29uUmVjb3JkIGZvciBJY29uVVJMICVzIHdpdGggdGlt ZVN0YW1wIG9mICVpIHRvIHRoZSBEQiIsIHVybEZvckxvZ2dpbmcoaWNvblNuYXBzaG90c1tpXS5p Y29uVVJMKCkpLmFzY2lpKCkuZGF0YSgpLCBpY29uU25hcHNob3RzW2ldLnRpbWVzdGFtcCgpKTsK ICAgICB9CiAgICAgCiAgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IHBhZ2VTbmFwc2hvdHMu c2l6ZSgpOyArK2kpIHsKICAgICAgICAgLy8gSWYgdGhlIGljb24gVVJMIGlzIGVtcHR5LCB0aGlz IHBhZ2UgaXMgbWVhbnQgdG8gYmUgZGVsZXRlZAogICAgICAgICAvLyBBU1NFUlRzIGFyZSBzYW5p dHkgY2hlY2tzIHRvIG1ha2Ugc3VyZSB0aGUgbWFwcGluZ3MgZXhpc3QgaWYgdGhleSBzaG91bGQg YW5kIGRvbid0IGlmIHRoZXkgc2hvdWxkbid0Ci0gICAgICAgIGlmIChwYWdlU25hcHNob3RzW2ld Lmljb25VUkwuaXNFbXB0eSgpKQotICAgICAgICAgICAgcmVtb3ZlUGFnZVVSTEZyb21TUUxEYXRh YmFzZShwYWdlU25hcHNob3RzW2ldLnBhZ2VVUkwpOworICAgICAgICBpZiAocGFnZVNuYXBzaG90 c1tpXS5pY29uVVJMKCkuaXNFbXB0eSgpKQorICAgICAgICAgICAgcmVtb3ZlUGFnZVVSTEZyb21T UUxEYXRhYmFzZShwYWdlU25hcHNob3RzW2ldLnBhZ2VVUkwoKSk7CiAgICAgICAgIGVsc2UKLSAg ICAgICAgICAgIHNldEljb25VUkxGb3JQYWdlVVJMSW5TUUxEYXRhYmFzZShwYWdlU25hcHNob3Rz W2ldLmljb25VUkwsIHBhZ2VTbmFwc2hvdHNbaV0ucGFnZVVSTCk7Ci0gICAgICAgIExPRyhJY29u RGF0YWJhc2UsICJDb21taXR0ZWQgSWNvblVSTCBmb3IgUGFnZVVSTCAlcyB0byBkYXRhYmFzZSIs IHVybEZvckxvZ2dpbmcocGFnZVNuYXBzaG90c1tpXS5wYWdlVVJMKS5hc2NpaSgpLmRhdGEoKSk7 CisgICAgICAgICAgICBzZXRJY29uVVJMRm9yUGFnZVVSTEluU1FMRGF0YWJhc2UocGFnZVNuYXBz aG90c1tpXS5pY29uVVJMKCksIHBhZ2VTbmFwc2hvdHNbaV0ucGFnZVVSTCgpKTsKKyAgICAgICAg TE9HKEljb25EYXRhYmFzZSwgIkNvbW1pdHRlZCBJY29uVVJMIGZvciBQYWdlVVJMICVzIHRvIGRh dGFiYXNlIiwgdXJsRm9yTG9nZ2luZyhwYWdlU25hcHNob3RzW2ldLnBhZ2VVUkwoKSkuYXNjaWko KS5kYXRhKCkpOwogICAgIH0KIAogICAgIHN5bmNUcmFuc2FjdGlvbi5jb21taXQoKTsKQEAgLTIw MjQsMTMgKzIwMjQsMTMgQEAgdm9pZCBJY29uRGF0YWJhc2U6OndyaXRlSWNvblNuYXBzaG90VG9T UUxEYXRhYmFzZShjb25zdCBJY29uU25hcHNob3QmIHNuYXBzaG90KQogewogICAgIEFTU0VSVF9J Q09OX1NZTkNfVEhSRUFEKCk7CiAgICAgCi0gICAgaWYgKHNuYXBzaG90Lmljb25VUkwuaXNFbXB0 eSgpKQorICAgIGlmIChzbmFwc2hvdC5pY29uVVJMKCkuaXNFbXB0eSgpKQogICAgICAgICByZXR1 cm47CiAgICAgICAgIAogICAgIC8vIEEgbnVsbGVkIG91dCB0aW1lc3RhbXAgYW5kIGRhdGEgbWVh bnMgdGhpcyBpY29uIGlzIGRlc3RpbmVkIHRvIGJlIGRlbGV0ZWQgLSBkbyB0aGF0IGluc3RlYWQg b2Ygd3JpdGluZyBpdCBvdXQKLSAgICBpZiAoIXNuYXBzaG90LnRpbWVzdGFtcCAmJiAhc25hcHNo b3QuZGF0YSkgewotICAgICAgICBMT0coSWNvbkRhdGFiYXNlLCAiUmVtb3ZpbmcgJXMgZnJvbSBv bi1kaXNrIGRhdGFiYXNlIiwgdXJsRm9yTG9nZ2luZyhzbmFwc2hvdC5pY29uVVJMKS5hc2NpaSgp LmRhdGEoKSk7Ci0gICAgICAgIHJlbW92ZUljb25Gcm9tU1FMRGF0YWJhc2Uoc25hcHNob3QuaWNv blVSTCk7CisgICAgaWYgKCFzbmFwc2hvdC50aW1lc3RhbXAoKSAmJiAhc25hcHNob3QuZGF0YSgp KSB7CisgICAgICAgIExPRyhJY29uRGF0YWJhc2UsICJSZW1vdmluZyAlcyBmcm9tIG9uLWRpc2sg ZGF0YWJhc2UiLCB1cmxGb3JMb2dnaW5nKHNuYXBzaG90Lmljb25VUkwoKSkuYXNjaWkoKS5kYXRh KCkpOworICAgICAgICByZW1vdmVJY29uRnJvbVNRTERhdGFiYXNlKHNuYXBzaG90Lmljb25VUkwo KSk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKQEAgLTIwMzgsMTggKzIwMzgsMTggQEAgdm9p ZCBJY29uRGF0YWJhc2U6OndyaXRlSWNvblNuYXBzaG90VG9TUUxEYXRhYmFzZShjb25zdCBJY29u U25hcHNob3QmIHNuYXBzaG90KQogICAgIC8vIEluIHByYWN0aWNlIHRoZSBvbmx5IGNhbGxlciBv ZiB0aGlzIG1ldGhvZCBpcyBhbHdheXMgd3JhcHBlZCBpbiBhIHRyYW5zYWN0aW9uIGl0c2VsZiBz byBwbGFjaW5nIGFub3RoZXIgaGVyZSBpcyB1bm5lY2Vzc2FyeQogICAgICAgICAKICAgICAvLyBH ZXQgdGhlIGljb25JRCBmb3IgdGhpcyB1cmwKLSAgICBpbnQ2NF90IGljb25JRCA9IGdldEljb25J REZvckljb25VUkxGcm9tU1FMRGF0YWJhc2Uoc25hcHNob3QuaWNvblVSTCk7CisgICAgaW50NjRf dCBpY29uSUQgPSBnZXRJY29uSURGb3JJY29uVVJMRnJvbVNRTERhdGFiYXNlKHNuYXBzaG90Lmlj b25VUkwoKSk7CiAgICAgCiAgICAgLy8gSWYgdGhlcmUgaXMgYWxyZWFkeSBhbiBpY29uSUQgaW4g cGxhY2UsIHVwZGF0ZSB0aGUgZGF0YWJhc2UuICAKICAgICAvLyBPdGhlcndpc2UsIGluc2VydCBu ZXcgcmVjb3JkcwogICAgIGlmIChpY29uSUQpIHsgICAgCiAgICAgICAgIHJlYWR5U1FMaXRlU3Rh dGVtZW50KG1fdXBkYXRlSWNvbkluZm9TdGF0ZW1lbnQsIG1fc3luY0RCLCAiVVBEQVRFIEljb25J bmZvIFNFVCBzdGFtcCA9ID8sIHVybCA9ID8gV0hFUkUgaWNvbklEID0gPzsiKTsKLSAgICAgICAg bV91cGRhdGVJY29uSW5mb1N0YXRlbWVudC0+YmluZEludDY0KDEsIHNuYXBzaG90LnRpbWVzdGFt cCk7Ci0gICAgICAgIG1fdXBkYXRlSWNvbkluZm9TdGF0ZW1lbnQtPmJpbmRUZXh0KDIsIHNuYXBz aG90Lmljb25VUkwpOworICAgICAgICBtX3VwZGF0ZUljb25JbmZvU3RhdGVtZW50LT5iaW5kSW50 NjQoMSwgc25hcHNob3QudGltZXN0YW1wKCkpOworICAgICAgICBtX3VwZGF0ZUljb25JbmZvU3Rh dGVtZW50LT5iaW5kVGV4dCgyLCBzbmFwc2hvdC5pY29uVVJMKCkpOwogICAgICAgICBtX3VwZGF0 ZUljb25JbmZvU3RhdGVtZW50LT5iaW5kSW50NjQoMywgaWNvbklEKTsKIAogICAgICAgICBpZiAo bV91cGRhdGVJY29uSW5mb1N0YXRlbWVudC0+c3RlcCgpICE9IFNRTFJlc3VsdERvbmUpCi0gICAg ICAgICAgICBMT0dfRVJST1IoIkZhaWxlZCB0byB1cGRhdGUgaWNvbiBpbmZvIGZvciB1cmwgJXMi LCB1cmxGb3JMb2dnaW5nKHNuYXBzaG90Lmljb25VUkwpLmFzY2lpKCkuZGF0YSgpKTsKKyAgICAg ICAgICAgIExPR19FUlJPUigiRmFpbGVkIHRvIHVwZGF0ZSBpY29uIGluZm8gZm9yIHVybCAlcyIs IHVybEZvckxvZ2dpbmcoc25hcHNob3QuaWNvblVSTCgpKS5hc2NpaSgpLmRhdGEoKSk7CiAgICAg ICAgIAogICAgICAgICBtX3VwZGF0ZUljb25JbmZvU3RhdGVtZW50LT5yZXNldCgpOwogICAgICAg ICAKQEAgLTIwNTgsMjIgKzIwNTgsMjIgQEAgdm9pZCBJY29uRGF0YWJhc2U6OndyaXRlSWNvblNu YXBzaG90VG9TUUxEYXRhYmFzZShjb25zdCBJY29uU25hcHNob3QmIHNuYXBzaG90KQogICAgICAg ICAgICAgICAgIAogICAgICAgICAvLyBJZiB3ZSAqaGF2ZSogaW1hZ2UgZGF0YSwgYmluZCBpdCB0 byB0aGlzIHN0YXRlbWVudCAtIE90aGVyd2lzZSBiaW5kICJudWxsIiBmb3IgdGhlIGJsb2IgZGF0 YSwgCiAgICAgICAgIC8vIHNpZ25pZnlpbmcgdGhhdCB0aGlzIGljb24gZG9lc24ndCBoYXZlIGFu eSBkYXRhICAgIAotICAgICAgICBpZiAoc25hcHNob3QuZGF0YSAmJiBzbmFwc2hvdC5kYXRhLT5z aXplKCkpCi0gICAgICAgICAgICBtX3VwZGF0ZUljb25EYXRhU3RhdGVtZW50LT5iaW5kQmxvYigx LCBzbmFwc2hvdC5kYXRhLT5kYXRhKCksIHNuYXBzaG90LmRhdGEtPnNpemUoKSk7CisgICAgICAg IGlmIChzbmFwc2hvdC5kYXRhKCkgJiYgc25hcHNob3QuZGF0YSgpLT5zaXplKCkpCisgICAgICAg ICAgICBtX3VwZGF0ZUljb25EYXRhU3RhdGVtZW50LT5iaW5kQmxvYigxLCBzbmFwc2hvdC5kYXRh KCktPmRhdGEoKSwgc25hcHNob3QuZGF0YSgpLT5zaXplKCkpOwogICAgICAgICBlbHNlCiAgICAg ICAgICAgICBtX3VwZGF0ZUljb25EYXRhU3RhdGVtZW50LT5iaW5kTnVsbCgxKTsKICAgICAgICAg CiAgICAgICAgIGlmIChtX3VwZGF0ZUljb25EYXRhU3RhdGVtZW50LT5zdGVwKCkgIT0gU1FMUmVz dWx0RG9uZSkKLSAgICAgICAgICAgIExPR19FUlJPUigiRmFpbGVkIHRvIHVwZGF0ZSBpY29uIGRh dGEgZm9yIHVybCAlcyIsIHVybEZvckxvZ2dpbmcoc25hcHNob3QuaWNvblVSTCkuYXNjaWkoKS5k YXRhKCkpOworICAgICAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQgdG8gdXBkYXRlIGljb24gZGF0 YSBmb3IgdXJsICVzIiwgdXJsRm9yTG9nZ2luZyhzbmFwc2hvdC5pY29uVVJMKCkpLmFzY2lpKCku ZGF0YSgpKTsKIAogICAgICAgICBtX3VwZGF0ZUljb25EYXRhU3RhdGVtZW50LT5yZXNldCgpOwog ICAgIH0gZWxzZSB7ICAgIAogICAgICAgICByZWFkeVNRTGl0ZVN0YXRlbWVudChtX3NldEljb25J bmZvU3RhdGVtZW50LCBtX3N5bmNEQiwgIklOU0VSVCBJTlRPIEljb25JbmZvICh1cmwsc3RhbXAp IFZBTFVFUyAoPywgPyk7Iik7Ci0gICAgICAgIG1fc2V0SWNvbkluZm9TdGF0ZW1lbnQtPmJpbmRU ZXh0KDEsIHNuYXBzaG90Lmljb25VUkwpOwotICAgICAgICBtX3NldEljb25JbmZvU3RhdGVtZW50 LT5iaW5kSW50NjQoMiwgc25hcHNob3QudGltZXN0YW1wKTsKKyAgICAgICAgbV9zZXRJY29uSW5m b1N0YXRlbWVudC0+YmluZFRleHQoMSwgc25hcHNob3QuaWNvblVSTCgpKTsKKyAgICAgICAgbV9z ZXRJY29uSW5mb1N0YXRlbWVudC0+YmluZEludDY0KDIsIHNuYXBzaG90LnRpbWVzdGFtcCgpKTsK IAogICAgICAgICBpZiAobV9zZXRJY29uSW5mb1N0YXRlbWVudC0+c3RlcCgpICE9IFNRTFJlc3Vs dERvbmUpCi0gICAgICAgICAgICBMT0dfRVJST1IoIkZhaWxlZCB0byBzZXQgaWNvbiBpbmZvIGZv ciB1cmwgJXMiLCB1cmxGb3JMb2dnaW5nKHNuYXBzaG90Lmljb25VUkwpLmFzY2lpKCkuZGF0YSgp KTsKKyAgICAgICAgICAgIExPR19FUlJPUigiRmFpbGVkIHRvIHNldCBpY29uIGluZm8gZm9yIHVy bCAlcyIsIHVybEZvckxvZ2dpbmcoc25hcHNob3QuaWNvblVSTCgpKS5hc2NpaSgpLmRhdGEoKSk7 CiAgICAgICAgIAogICAgICAgICBtX3NldEljb25JbmZvU3RhdGVtZW50LT5yZXNldCgpOwogICAg ICAgICAKQEAgLTIwODQsMTMgKzIwODQsMTMgQEAgdm9pZCBJY29uRGF0YWJhc2U6OndyaXRlSWNv blNuYXBzaG90VG9TUUxEYXRhYmFzZShjb25zdCBJY29uU25hcHNob3QmIHNuYXBzaG90KQogCiAg ICAgICAgIC8vIElmIHdlICpoYXZlKiBpbWFnZSBkYXRhLCBiaW5kIGl0IHRvIHRoaXMgc3RhdGVt ZW50IC0gT3RoZXJ3aXNlIGJpbmQgIm51bGwiIGZvciB0aGUgYmxvYiBkYXRhLCAKICAgICAgICAg Ly8gc2lnbmlmeWluZyB0aGF0IHRoaXMgaWNvbiBkb2Vzbid0IGhhdmUgYW55IGRhdGEgICAgCi0g ICAgICAgIGlmIChzbmFwc2hvdC5kYXRhICYmIHNuYXBzaG90LmRhdGEtPnNpemUoKSkKLSAgICAg ICAgICAgIG1fc2V0SWNvbkRhdGFTdGF0ZW1lbnQtPmJpbmRCbG9iKDIsIHNuYXBzaG90LmRhdGEt PmRhdGEoKSwgc25hcHNob3QuZGF0YS0+c2l6ZSgpKTsKKyAgICAgICAgaWYgKHNuYXBzaG90LmRh dGEoKSAmJiBzbmFwc2hvdC5kYXRhKCktPnNpemUoKSkKKyAgICAgICAgICAgIG1fc2V0SWNvbkRh dGFTdGF0ZW1lbnQtPmJpbmRCbG9iKDIsIHNuYXBzaG90LmRhdGEoKS0+ZGF0YSgpLCBzbmFwc2hv dC5kYXRhKCktPnNpemUoKSk7CiAgICAgICAgIGVsc2UKICAgICAgICAgICAgIG1fc2V0SWNvbkRh dGFTdGF0ZW1lbnQtPmJpbmROdWxsKDIpOwogICAgICAgICAKICAgICAgICAgaWYgKG1fc2V0SWNv bkRhdGFTdGF0ZW1lbnQtPnN0ZXAoKSAhPSBTUUxSZXN1bHREb25lKQotICAgICAgICAgICAgTE9H X0VSUk9SKCJGYWlsZWQgdG8gc2V0IGljb24gZGF0YSBmb3IgdXJsICVzIiwgdXJsRm9yTG9nZ2lu ZyhzbmFwc2hvdC5pY29uVVJMKS5hc2NpaSgpLmRhdGEoKSk7CisgICAgICAgICAgICBMT0dfRVJS T1IoIkZhaWxlZCB0byBzZXQgaWNvbiBkYXRhIGZvciB1cmwgJXMiLCB1cmxGb3JMb2dnaW5nKHNu YXBzaG90Lmljb25VUkwoKSkuYXNjaWkoKS5kYXRhKCkpOwogCiAgICAgICAgIG1fc2V0SWNvbkRh dGFTdGF0ZW1lbnQtPnJlc2V0KCk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL2ljb24vSWNvblJlY29yZC5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL2ljb24vSWNv blJlY29yZC5oCmluZGV4IGYxZmUxMmY1MWZmMDViNjliOTg3MDg1MzJmYWI0NThiN2QzNzQ5MTEu LjYyOTlmNTRjZTAzMGM5NTc1YThhZDRiOTRlYTk3OTA2MTlhZjRiMWUgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9pY29uL0ljb25SZWNvcmQuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvaWNvbi9JY29uUmVjb3JkLmgKQEAgLTUxLDE3ICs1MSwyMiBAQCBlbnVtIEltYWdl RGF0YVN0YXR1cyB7CiAKIGNsYXNzIEljb25TbmFwc2hvdCB7CiBwdWJsaWM6Ci0gICAgSWNvblNu YXBzaG90KCkgOiB0aW1lc3RhbXAoMCkgeyB9CisgICAgSWNvblNuYXBzaG90KCkgOiBtX3RpbWVz dGFtcCgwKSB7IH0KICAgICAKLSAgICBJY29uU25hcHNob3QoY29uc3QgU3RyaW5nJiB1cmwsIGlu dCBzdGFtcCwgU2hhcmVkQnVmZmVyKiB0aGVEYXRhKQotICAgICAgICA6IGljb25VUkwodXJsKQot ICAgICAgICAsIHRpbWVzdGFtcChzdGFtcCkKLSAgICAgICAgLCBkYXRhKHRoZURhdGEpCisgICAg SWNvblNuYXBzaG90KGNvbnN0IFN0cmluZyYgaWNvblVSTCwgaW50IHRpbWVzdGFtcCwgU2hhcmVk QnVmZmVyKiBkYXRhKQorICAgICAgICA6IG1faWNvblVSTChpY29uVVJMKQorICAgICAgICAsIG1f dGltZXN0YW1wKHRpbWVzdGFtcCkKKyAgICAgICAgLCBtX2RhdGEoZGF0YSkKICAgICB7IH0KLSAg ICAgICAgCi0gICAgU3RyaW5nIGljb25VUkw7Ci0gICAgaW50IHRpbWVzdGFtcDsKLSAgICBSZWZQ dHI8U2hhcmVkQnVmZmVyPiBkYXRhOworCisgICAgY29uc3QgU3RyaW5nJiBpY29uVVJMKCkgY29u c3QgeyByZXR1cm4gbV9pY29uVVJMOyB9CisgICAgaW50IHRpbWVzdGFtcCgpIGNvbnN0IHsgcmV0 dXJuIG1fdGltZXN0YW1wOyB9CisgICAgU2hhcmVkQnVmZmVyKiBkYXRhKCkgY29uc3QgeyByZXR1 cm4gbV9kYXRhLmdldCgpOyB9CisKK3ByaXZhdGU6CisgICAgU3RyaW5nIG1faWNvblVSTDsKKyAg ICBpbnQgbV90aW1lc3RhbXA7CisgICAgUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gbV9kYXRhOwogfTsK ICAgICAKIGNsYXNzIEljb25SZWNvcmQgOiBwdWJsaWMgUmVmQ291bnRlZDxJY29uUmVjb3JkPiB7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvaWNvbi9QYWdlVVJMUmVjb3JkLmgg Yi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvaWNvbi9QYWdlVVJMUmVjb3JkLmgKaW5kZXggNzkzNWRj OWU0Y2IzN2M0Yjc3YTA5NTFhNjcyM2QyYmNlNGUyMmJjZi4uYjllMGE0MWVlYmVhZTdjYWUxMDBm OTk5MDM3MDhlY2ZhNmMxMmQxMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL2lj b24vUGFnZVVSTFJlY29yZC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9pY29uL1BhZ2VV UkxSZWNvcmQuaApAQCAtNDIsMTMgKzQyLDE3IEBAIGNsYXNzIFBhZ2VVUkxTbmFwc2hvdCB7CiBw dWJsaWM6CiAgICAgUGFnZVVSTFNuYXBzaG90KCkgeyB9CiAgICAgCi0gICAgUGFnZVVSTFNuYXBz aG90KGNvbnN0IFN0cmluZyYgcGFnZSwgY29uc3QgU3RyaW5nJiBpY29uKQotICAgICAgICA6IHBh Z2VVUkwocGFnZSkKLSAgICAgICAgLCBpY29uVVJMKGljb24pCisgICAgUGFnZVVSTFNuYXBzaG90 KGNvbnN0IFN0cmluZyYgcGFnZVVSTCwgY29uc3QgU3RyaW5nJiBpY29uVVJMKQorICAgICAgICA6 IG1fcGFnZVVSTChwYWdlVVJMKQorICAgICAgICAsIG1faWNvblVSTChpY29uVVJMKQogICAgIHsg fQotICAgIAotICAgIFN0cmluZyBwYWdlVVJMOwotICAgIFN0cmluZyBpY29uVVJMOworCisgICAg Y29uc3QgU3RyaW5nJiBwYWdlVVJMKCkgY29uc3QgeyByZXR1cm4gbV9wYWdlVVJMOyB9CisgICAg Y29uc3QgU3RyaW5nJiBpY29uVVJMKCkgY29uc3QgeyByZXR1cm4gbV9pY29uVVJMOyB9CisKK3By aXZhdGU6CisgICAgU3RyaW5nIG1fcGFnZVVSTDsKKyAgICBTdHJpbmcgbV9pY29uVVJMOwogfTsK IAogY2xhc3MgUGFnZVVSTFJlY29yZCB7Cg==