47002 2010-10-01 11:41:57 -0700 Make resource identifiers unique across pages 2010-10-13 02:03:59 -0700 1 1 1 Unclassified WebKit Frames 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 44713 1 jennb jennb ap commit-queue dimich oldest_to_newest 288373 0 jennb 2010-10-01 11:41:57 -0700 In order to fix bug 44713, resource identifiers need to be unique across pages so that the resource id can be used in more than one Page/WebView. Making the ids unique is cleaner than changing the ids before using them in another object on a different page. Resource identifiers are generated from the Page's ProgressTracker. There are other uses of ProgressTracker::createUniqueIdentifier, but they are not dependent on the ids being only unique within a page, so this change should be safe. 289797 1 69823 jennb 2010-10-05 12:04:10 -0700 Created attachment 69823 patch 290468 2 69823 dimich 2010-10-06 11:20:57 -0700 Comment on attachment 69823 patch View in context: https://bugs.webkit.org/attachment.cgi?id=69823&action=review Looks great, I understand the actual ASSERTS will come as a close next patch since they rely on more code, so this adds a test ahead of code, which is ok. r- since the test can be improved. > LayoutTests/fast/frames/iframe-reparenting-id-collision.html:42 > + w1.addEventListener("load", windowLoaded, false); It could be more reliable to make this test to wait until both windows are loaded, but at the same time to ensure that their inner iframes are still loading. It can be accomplished by making this test a http test and hitting the 'slow loading' server script from iframes, while registering onload handler for both windows. This will guarantee that the test is free from timing issues. 292629 3 70463 jennb 2010-10-11 13:30:57 -0700 Created attachment 70463 Updated patch. Replaced test case with an http test. 293313 4 70463 dimich 2010-10-13 01:42:09 -0700 Comment on attachment 70463 Updated patch. r=me 293323 5 70463 commit-queue 2010-10-13 02:03:54 -0700 Comment on attachment 70463 Updated patch. Clearing flags on attachment: 70463 Committed r69643: <http://trac.webkit.org/changeset/69643> 293324 6 commit-queue 2010-10-13 02:03:59 -0700 All reviewed patches have been landed. Closing bug. 69823 2010-10-05 12:04:10 -0700 2010-10-11 13:30:57 -0700 patch patch.txt text/plain 6723 jennb ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBkZmExN2RmNS4uNWI0MzYzYSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDEwLTEw LTA1ICBKZW5uIEJyYWl0aHdhaXRlICA8amVubmJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1ha2UgcmVzb3VyY2UgaWRlbnRp ZmllcnMgdW5pcXVlIGFjcm9zcyBwYWdlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9NDcwMDIKKworICAgICAgICAqIGZhc3QvZnJhbWVzL2lmcmFtZS1y ZXBhcmVudGluZy1pZC1jb2xsaXNpb24tZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBm YXN0L2ZyYW1lcy9pZnJhbWUtcmVwYXJlbnRpbmctaWQtY29sbGlzaW9uLmh0bWw6IEFkZGVkLgor ICAgICAgICAqIGZhc3QvZnJhbWVzL3Jlc291cmNlcy9pZnJhbWUtcmVwYXJlbnRpbmctaWQtY29s bGlzaW9uMi5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBmYXN0L2ZyYW1lcy9yZXNvdXJjZXMvaWZy YW1lLXJlcGFyZW50aW5nLWlkLWNvbGxpc2lvbjMuaHRtbDogQWRkZWQuCisKIDIwMTAtMTAtMDUg IFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBL ZW50IFRhbXVyYS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvZnJhbWVzL2lmcmFtZS1y ZXBhcmVudGluZy1pZC1jb2xsaXNpb24tZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvZmFzdC9m cmFtZXMvaWZyYW1lLXJlcGFyZW50aW5nLWlkLWNvbGxpc2lvbi1leHBlY3RlZC50eHQKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uM2FmYjUyYgotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2Zhc3QvZnJhbWVzL2lmcmFtZS1yZXBhcmVudGluZy1pZC1jb2xsaXNpb24t ZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNiBAQAorVGhpcyB0ZXN0IGNoZWNrcyB0aGF0IHJlc291 cmNlIGlkcyBhcmUgdW5pcXVlIGFjcm9zcyBwYWdlcyBieSBvcGVuaW5nIHR3byBwYWdlcyB0aGF0 IGJvdGggbG9hZCB0aGUgc2FtZSBudW1iZXIgb2YgcmVzb3VyY2VzLCB0aGVuIGFkb3B0aW5nIHRo ZSBpZnJhbWUgZnJvbSBvbmUgcGFnZSB0byB0aGUgb3RoZXIuIElmIHJlc291cmNlIGlkcyBhcmUg bm90IHVuaXF1ZSBhY3Jvc3MgcGFnZXMsIHRoZXNlIHBhZ2VzIHdpbGwgaGF2ZSB0aGUgc2FtZSBy ZXNvdXJjZSBpZHMgYW5kIHRoZSBhZG9wdE5vZGUgd2lsbCBmYWlsIGR1ZSB0byBhbiBpZCBjb2xs aXNpb24uIFRoZSBpZnJhbWUgaXMgdGhlbiBhZG9wdGVkIGJhY2sgaW50byBpdHMgb3JpZ2luYWwg cGFnZSB0byBjaGVjayBmb3IgaWQgY29sbGlzaW9uIGZyb20gZmFpbHVyZSB0byBwcm9wZXJseSBy ZW1vdmUgaXRzIHJlc291cmNlIGlkIGZyb20gdGhlIG9yaWdpbmFsIHBhZ2UuCisKK1BBU1M6IExv YWRlZCBmaXJzdCBwYWdlLgorUEFTUzogQWRvcHRlZCBub2RlIHdpdGhvdXQgaWQgY29sbGlzaW9u LgorUEFTUzogQWRvcHRlZCBub2RlIGJhY2sgdG8gb3JpZ2luYWwgcGFnZS4KKwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvaWZyYW1lLXJlcGFyZW50aW5nLWlkLWNvbGxpc2lv bi5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvaWZyYW1lLXJlcGFyZW50aW5nLWlkLWNv bGxpc2lvbi5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLjRhNzIxMjUK LS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9pZnJhbWUtcmVwYXJl bnRpbmctaWQtY29sbGlzaW9uLmh0bWwKQEAgLTAsMCArMSw1NiBAQAorPGh0bWw+Cis8c2NyaXB0 PgorCit2YXIgdzEsIHcyOworCitpZiAod2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSB7Cisg ICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgIGxheW91dFRlc3RDb250 cm9sbGVyLndhaXRVbnRpbERvbmUoKTsKKyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5zZXRDYW5P cGVuV2luZG93cyh0cnVlKTsKK30KKworZnVuY3Rpb24gbG9nKG1lc3NhZ2UpCit7CisgICAgZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoImxvZyIpLmlubmVyVGV4dCArPSBtZXNzYWdlICsgIlxuIjsK K30KKworZnVuY3Rpb24gd2luZG93TG9hZGVkKCkKK3sKKyAgICBsb2coIlBBU1M6IExvYWRlZCBm aXJzdCBwYWdlLiIpOworCisgICAgLy8gRmlyc3QgYWRvcHROb2RlIHdpbGwgaGF2ZSBhbiBpZCBj b2xsaXNpb24gaWYgYm90aCBpZnJhbWVzIGhhdmUKKyAgICAvLyBzdGFydGVkIGxvYWRpbmcgYW5k IHJlc291cmNlIGlkcyBhcmUgbm90IHVuaXF1ZSBhY3Jvc3MgcGFnZXMuCisgICAgdmFyIGYgPSB3 MS5kb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiaWZyYW1lQSIpOworICAgIHcyLmRvY3VtZW50LmFk b3B0Tm9kZShmKTsKKyAgICB3Mi5kb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGYpOworCisgICAg bG9nKCJQQVNTOiBBZG9wdGVkIG5vZGUgd2l0aG91dCBpZCBjb2xsaXNpb24uIik7CisKKyAgICAv LyBBZG9wdCBub2RlIGJhY2sgdG8gaXRzIG9yaWdpbmFsIHBhZ2UgdG8gdmVyaWZ5IHRoYXQgdGhl IHJlc291cmNlIGlkCisgICAgLy8gZm9yIHRoZSBpZnJhbWUgd2FzIHByb3Blcmx5IHJlbW92ZWQg ZnJvbSBpdHMgb3JpZ2luYWwgcGFnZS4KKyAgICB3MS5kb2N1bWVudC5hZG9wdE5vZGUoZik7Cisg ICAgdzEuZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChmKTsKKyAgICBsb2coIlBBU1M6IEFkb3B0 ZWQgbm9kZSBiYWNrIHRvIG9yaWdpbmFsIHBhZ2UuIik7CisKKyAgICBpZiAod2luZG93LmxheW91 dFRlc3RDb250cm9sbGVyKQorICAgICAgICBsYXlvdXRUZXN0Q29udHJvbGxlci5ub3RpZnlEb25l KCk7Cit9CisKK2Z1bmN0aW9uIHRlc3QoKQoreworICAgIHcxID0gd2luZG93Lm9wZW4oInJlc291 cmNlcy9pZnJhbWUtcmVwYXJlbnRpbmctaWQtY29sbGlzaW9uMi5odG1sIik7CisgICAgdzEuYWRk RXZlbnRMaXN0ZW5lcigibG9hZCIsIHdpbmRvd0xvYWRlZCwgZmFsc2UpOworICAgIHcyID0gd2lu ZG93Lm9wZW4oInJlc291cmNlcy9pZnJhbWUtcmVwYXJlbnRpbmctaWQtY29sbGlzaW9uMy5odG1s Iik7Cit9Cis8L3NjcmlwdD4KKzxib2R5IG9ubG9hZD0idGVzdCgpIj4KKzxwPlRoaXMgdGVzdCBj aGVja3MgdGhhdCByZXNvdXJjZSBpZHMgYXJlIHVuaXF1ZSBhY3Jvc3MgcGFnZXMgYnkgb3Blbmlu ZwordHdvIHBhZ2VzIHRoYXQgYm90aCBsb2FkIHRoZSBzYW1lIG51bWJlciBvZiByZXNvdXJjZXMs IHRoZW4gYWRvcHRpbmcgdGhlCitpZnJhbWUgZnJvbSBvbmUgcGFnZSB0byB0aGUgb3RoZXIuIElm IHJlc291cmNlIGlkcyBhcmUgbm90IHVuaXF1ZSBhY3Jvc3MKK3BhZ2VzLCB0aGVzZSBwYWdlcyB3 aWxsIGhhdmUgdGhlIHNhbWUgcmVzb3VyY2UgaWRzIGFuZCB0aGUgYWRvcHROb2RlIHdpbGwKK2Zh aWwgZHVlIHRvIGFuIGlkIGNvbGxpc2lvbi4gVGhlIGlmcmFtZSBpcyB0aGVuIGFkb3B0ZWQgYmFj ayBpbnRvIGl0cworb3JpZ2luYWwgcGFnZSB0byBjaGVjayBmb3IgaWQgY29sbGlzaW9uIGZyb20g ZmFpbHVyZSB0byBwcm9wZXJseSByZW1vdmUKK2l0cyByZXNvdXJjZSBpZCBmcm9tIHRoZSBvcmln aW5hbCBwYWdlLjwvcD4KKzxwcmUgaWQ9bG9nPjwvcHJlPgorPC9ib2R5PgorPC9odG1sPgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvcmVzb3VyY2VzL2lmcmFtZS1yZXBhcmVu dGluZy1pZC1jb2xsaXNpb24yLmh0bWwgYi9MYXlvdXRUZXN0cy9mYXN0L2ZyYW1lcy9yZXNvdXJj ZXMvaWZyYW1lLXJlcGFyZW50aW5nLWlkLWNvbGxpc2lvbjIuaHRtbApuZXcgZmlsZSBtb2RlIDEw MDY0NAppbmRleCAwMDAwMDAwLi4xYzhmNmE5Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvZmFzdC9mcmFtZXMvcmVzb3VyY2VzL2lmcmFtZS1yZXBhcmVudGluZy1pZC1jb2xsaXNpb24y Lmh0bWwKQEAgLTAsMCArMSwzIEBACis8Ym9keT4KKzxpZnJhbWUgaWQ9ImlmcmFtZUEiIHNyYz0i ZGF0YTp0ZXh0L2h0bWwsZm9vIj48L2lmcmFtZT4KKzwvYm9keT4KZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2Zhc3QvZnJhbWVzL3Jlc291cmNlcy9pZnJhbWUtcmVwYXJlbnRpbmctaWQtY29sbGlz aW9uMy5odG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9mcmFtZXMvcmVzb3VyY2VzL2lmcmFtZS1yZXBh cmVudGluZy1pZC1jb2xsaXNpb24zLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMC4uNDM1NmMzMAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvZnJhbWVz L3Jlc291cmNlcy9pZnJhbWUtcmVwYXJlbnRpbmctaWQtY29sbGlzaW9uMy5odG1sCkBAIC0wLDAg KzEsMyBAQAorPGJvZHk+Cis8aWZyYW1lIGlkPSJpZnJhbWVCIiBzcmM9ImRhdGE6dGV4dC9odG1s LGJhciI+PC9pZnJhbWU+Cis8L2JvZHk+CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBi L1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGFkMjhkN2UuLmQwMjlkMGUgMTAwNjQ0Ci0tLSBhL1dl YkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAK KzIwMTAtMTAtMDUgIEplbm4gQnJhaXRod2FpdGUgIDxqZW5uYkBjaHJvbWl1bS5vcmc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSByZXNvdXJj ZSBpZGVudGlmaWVycyB1bmlxdWUgYWNyb3NzIHBhZ2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NzAwMgorCisgICAgICAgIFRlc3Q6IGZhc3QvZnJh bWVzL2lmcmFtZS1yZXBhcmVudGluZy1pZC1jb2xsaXNpb24uaHRtbAorCisgICAgICAgICogbG9h ZGVyL1Byb2dyZXNzVHJhY2tlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQcm9ncmVzc1RyYWNr ZXI6OlByb2dyZXNzVHJhY2tlcik6CisgICAgICAgIChXZWJDb3JlOjpQcm9ncmVzc1RyYWNrZXI6 OmNyZWF0ZVVuaXF1ZUlkZW50aWZpZXIpOgorICAgICAgICAqIGxvYWRlci9Qcm9ncmVzc1RyYWNr ZXIuaDoKKwogMjAxMC0xMC0wNSAgVG9ueSBDaGFuZyAgPHRvbnlAY2hyb21pdW0ub3JnPgogCiAg ICAgICAgIFJldmlld2VkIGJ5IEtlbnQgVGFtdXJhLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2Fk ZXIvUHJvZ3Jlc3NUcmFja2VyLmNwcCBiL1dlYkNvcmUvbG9hZGVyL1Byb2dyZXNzVHJhY2tlci5j cHAKaW5kZXggN2Y2MWNkMS4uNTYxZTZiYyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvUHJv Z3Jlc3NUcmFja2VyLmNwcAorKysgYi9XZWJDb3JlL2xvYWRlci9Qcm9ncmVzc1RyYWNrZXIuY3Bw CkBAIC01OSw5ICs1OSwxMCBAQCBzdHJ1Y3QgUHJvZ3Jlc3NJdGVtIDogTm9uY29weWFibGUgewog ICAgIGxvbmcgbG9uZyBlc3RpbWF0ZWRMZW5ndGg7CiB9OwogCit1bnNpZ25lZCBsb25nIFByb2dy ZXNzVHJhY2tlcjo6c191bmlxdWVJZGVudGlmaWVyID0gMDsKKwogUHJvZ3Jlc3NUcmFja2VyOjpQ cm9ncmVzc1RyYWNrZXIoKQotICAgIDogbV91bmlxdWVJZGVudGlmaWVyKDApCi0gICAgLCBtX3Rv dGFsUGFnZUFuZFJlc291cmNlQnl0ZXNUb0xvYWQoMCkKKyAgICA6IG1fdG90YWxQYWdlQW5kUmVz b3VyY2VCeXRlc1RvTG9hZCgwKQogICAgICwgbV90b3RhbEJ5dGVzUmVjZWl2ZWQoMCkKICAgICAs IG1fbGFzdE5vdGlmaWVkUHJvZ3Jlc3NWYWx1ZSgwKQogICAgICwgbV9sYXN0Tm90aWZpZWRQcm9n cmVzc1RpbWUoMCkKQEAgLTI1NSw3ICsyNTYsNyBAQCB2b2lkIFByb2dyZXNzVHJhY2tlcjo6Y29t cGxldGVQcm9ncmVzcyh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIpCiAKIHVuc2lnbmVkIGxvbmcg UHJvZ3Jlc3NUcmFja2VyOjpjcmVhdGVVbmlxdWVJZGVudGlmaWVyKCkKIHsKLSAgICByZXR1cm4g KyttX3VuaXF1ZUlkZW50aWZpZXI7CisgICAgcmV0dXJuICsrc191bmlxdWVJZGVudGlmaWVyOwog fQogCiAKZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL1Byb2dyZXNzVHJhY2tlci5oIGIvV2Vi Q29yZS9sb2FkZXIvUHJvZ3Jlc3NUcmFja2VyLmgKaW5kZXggNzQ0ZTEwMS4uNWQ1YjZiMiAxMDA2 NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIvUHJvZ3Jlc3NUcmFja2VyLmgKKysrIGIvV2ViQ29yZS9s b2FkZXIvUHJvZ3Jlc3NUcmFja2VyLmgKQEAgLTQxLDcgKzQxLDcgQEAgcHVibGljOgogICAgIFBy b2dyZXNzVHJhY2tlcigpOwogICAgIH5Qcm9ncmVzc1RyYWNrZXIoKTsKICAgICAKLSAgICB1bnNp Z25lZCBsb25nIGNyZWF0ZVVuaXF1ZUlkZW50aWZpZXIoKTsKKyAgICBzdGF0aWMgdW5zaWduZWQg bG9uZyBjcmVhdGVVbmlxdWVJZGVudGlmaWVyKCk7CiAKICAgICBkb3VibGUgZXN0aW1hdGVkUHJv Z3Jlc3MoKSBjb25zdDsKIApAQCAtNTksNyArNTksNyBAQCBwcml2YXRlOgogICAgIHZvaWQgcmVz ZXQoKTsKICAgICB2b2lkIGZpbmFsUHJvZ3Jlc3NDb21wbGV0ZSgpOwogICAgIAotICAgIHVuc2ln bmVkIGxvbmcgbV91bmlxdWVJZGVudGlmaWVyOworICAgIHN0YXRpYyB1bnNpZ25lZCBsb25nIHNf dW5pcXVlSWRlbnRpZmllcjsKICAgICAKICAgICBsb25nIGxvbmcgbV90b3RhbFBhZ2VBbmRSZXNv dXJjZUJ5dGVzVG9Mb2FkOwogICAgIGxvbmcgbG9uZyBtX3RvdGFsQnl0ZXNSZWNlaXZlZDsK 70463 2010-10-11 13:30:57 -0700 2010-10-13 02:03:54 -0700 Updated patch. patch2.txt text/plain 7459 jennb ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzMWIyMGIxLi5mYzk2MmI0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMTAt MTEgIEplbm4gQnJhaXRod2FpdGUgIDxqZW5uYkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSByZXNvdXJjZSBpZGVudGlm aWVycyB1bmlxdWUgYWNyb3NzIHBhZ2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00NzAwMgorCisgICAgICAgICogaHR0cC90ZXN0cy9taXNjL2lmcmFt ZS1yZXBhcmVudGluZy1pZC1jb2xsaXNpb24tZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAg KiBodHRwL3Rlc3RzL21pc2MvaWZyYW1lLXJlcGFyZW50aW5nLWlkLWNvbGxpc2lvbi5odG1sOiBB ZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL21pc2MvcmVzb3VyY2VzL2lmcmFtZS1yZXBhcmVu dGluZy1pZC1jb2xsaXNpb24tcGFnZS5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3Rz L21pc2MvcmVzb3VyY2VzL3NlbmQtYXN5bmMteGhyLmh0bWw6IEFkZGVkLgorCiAyMDEwLTEwLTAx ICBPbGl2ZXIgSHVudCAgPG9saXZlckBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg R2F2aW4gQmFycmFjbG91Z2guCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21p c2MvaWZyYW1lLXJlcGFyZW50aW5nLWlkLWNvbGxpc2lvbi1leHBlY3RlZC50eHQgYi9MYXlvdXRU ZXN0cy9odHRwL3Rlc3RzL21pc2MvaWZyYW1lLXJlcGFyZW50aW5nLWlkLWNvbGxpc2lvbi1leHBl Y3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uZDBjZDE5MQotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWlzYy9pZnJhbWUtcmVwYXJl bnRpbmctaWQtY29sbGlzaW9uLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDggQEAKK1RoaXMgdGVz dCBjaGVja3MgdGhhdCByZXNvdXJjZSBpZHMgYXJlIHVuaXF1ZSBhY3Jvc3MgcGFnZXMgYnkgb3Bl bmluZyB0d28gcGFnZXMgdGhhdCBib3RoIGNvbnRhaW4gYW4gaWZyYW1lIHRoYXQgbG9hZHMgdGhl IHNhbWUgbnVtYmVyIG9mIHJlc291cmNlcywgdGhlbiBhZG9wdGluZyB0aGUgaWZyYW1lIGZyb20g b25lIHBhZ2UgdG8gdGhlIG90aGVyLiBJZiByZXNvdXJjZSBpZHMgYXJlIG5vdCB1bmlxdWUgYWNy b3NzIHBhZ2VzLCB0aGVzZSBwYWdlcyB3aWxsIGhhdmUgdGhlIHNhbWUgcmVzb3VyY2UgaWRzIGFu ZCB0aGUgYWRvcHROb2RlIHdpbGwgZmFpbCBkdWUgdG8gYW4gaWQgY29sbGlzaW9uLiBUaGUgaWZy YW1lIGlzIHRoZW4gYWRvcHRlZCBiYWNrIGludG8gaXRzIG9yaWdpbmFsIHBhZ2UgdG8gY2hlY2sg Zm9yIGlkIGNvbGxpc2lvbiBmcm9tIGZhaWx1cmUgdG8gcHJvcGVybHkgcmVtb3ZlIGl0cyByZXNv dXJjZSBpZCBmcm9tIHRoZSBvcmlnaW5hbCBwYWdlLgorCitTdGFydGVkIGxvYWRpbmcgaWZyYW1l IFhIUiByZXF1ZXN0LgorU3RhcnRlZCBsb2FkaW5nIGlmcmFtZSBYSFIgcmVxdWVzdC4KK0JlZ2lu bmluZyBhZG9wdGlvbiBzZXF1ZW5jZS4KK1BBU1M6IGFkb3B0ZWQgbm9kZSB3aXRob3V0IGlkIGNv bGxpc2lvbgorUEFTUzogYWRvcHRlZCBiYWNrIHRvIG9yaWdpbmFsIHBhZ2Ugd2l0aG91dCBpZCBj b2xsaXNpb24KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9taXNjL2lmcmFt ZS1yZXBhcmVudGluZy1pZC1jb2xsaXNpb24uaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv bWlzYy9pZnJhbWUtcmVwYXJlbnRpbmctaWQtY29sbGlzaW9uLmh0bWwKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMC4uM2VlY2MxNQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2h0dHAvdGVzdHMvbWlzYy9pZnJhbWUtcmVwYXJlbnRpbmctaWQtY29sbGlzaW9uLmh0bWwK QEAgLTAsMCArMSw3OCBAQAorPGh0bWw+Cis8c2NyaXB0PgorCit2YXIgdzEsIHcyOwordmFyIGlm cmFtZVhIUkNvdW50ID0gMDsKKworaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJvbGxlcikgewor ICAgIGxheW91dFRlc3RDb250cm9sbGVyLmR1bXBBc1RleHQoKTsKKyAgICBsYXlvdXRUZXN0Q29u dHJvbGxlci53YWl0VW50aWxEb25lKCk7CisgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuc2V0Q2Fu T3BlbldpbmRvd3ModHJ1ZSk7Cit9CisKK2Z1bmN0aW9uIGxvZyhtZXNzYWdlKQoreworICAgIGRv Y3VtZW50LmdldEVsZW1lbnRCeUlkKCJsb2ciKS5pbm5lclRleHQgKz0gbWVzc2FnZSArICJcbiI7 Cit9CisKK2lmcmFtZVhIUkZpbmlzaGVkID0gZnVuY3Rpb24oKQoreworICAgIGxvZygiRkFJTDog SWZyYW1lIFhIUiByZXF1ZXN0IHNob3VsZCBuZXZlciBmaW5pc2ggbG9hZGluZyEiKTsKKyAgICBu b3RpZnlEb25lKCk7Cit9CisKK2lmcmFtZVhIUlN0YXJ0ZWQgPSBmdW5jdGlvbigpCit7CisgICAg bG9nKCJTdGFydGVkIGxvYWRpbmcgaWZyYW1lIFhIUiByZXF1ZXN0LiIpOworICAgICsraWZyYW1l WEhSQ291bnQ7CisKKyAgICBpZiAoaWZyYW1lWEhSQ291bnQgPCAyKQorICAgICAgICByZXR1cm47 CisKKyAgICBsb2coIkJlZ2lubmluZyBhZG9wdGlvbiBzZXF1ZW5jZS4iKTsKKworICAgIC8vIEZp cnN0IGFkb3B0Tm9kZSB3aWxsIGhhdmUgYW4gaWQgY29sbGlzaW9uIGlmIHJlc291cmNlIGlkcyBh cmUgbm90CisgICAgLy8gdW5pcXVlIGFjcm9zcyBwYWdlcy4KKyAgICB2YXIgZiA9IHcxLmRvY3Vt ZW50LmdldEVsZW1lbnRzQnlUYWdOYW1lKCJpZnJhbWUiKVswXTsKKyAgICB3Mi5kb2N1bWVudC5h ZG9wdE5vZGUoZik7CisgICAgdzIuZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChmKTsKKworICAg IGxvZygiUEFTUzogYWRvcHRlZCBub2RlIHdpdGhvdXQgaWQgY29sbGlzaW9uIik7CisKKyAgICAv LyBBZG9wdCBub2RlIGJhY2sgdG8gaXRzIG9yaWdpbmFsIHBhZ2UgdG8gdmVyaWZ5IHRoYXQgdGhl IHJlc291cmNlIGlkCisgICAgLy8gZm9yIHRoZSBpZnJhbWUgd2FzIHByb3Blcmx5IHJlbW92ZWQg ZnJvbSBpdHMgb3JpZ2luYWwgcGFnZS4KKyAgICB3MS5kb2N1bWVudC5hZG9wdE5vZGUoZik7Cisg ICAgdzEuZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChmKTsKKworICAgIGxvZygiUEFTUzogYWRv cHRlZCBiYWNrIHRvIG9yaWdpbmFsIHBhZ2Ugd2l0aG91dCBpZCBjb2xsaXNpb24iKTsKKworICAg IG5vdGlmeURvbmUoKTsKK30KKworZnVuY3Rpb24gbm90aWZ5RG9uZSgpCit7CisgICAgdzEuY2xv c2UoKTsKKyAgICB3Mi5jbG9zZSgpOworCisgICAgaWYgKHdpbmRvdy5sYXlvdXRUZXN0Q29udHJv bGxlcikKKyAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIubm90aWZ5RG9uZSgpOworfQorCitm dW5jdGlvbiB0ZXN0KCkKK3sKKyAgICB3MSA9IHdpbmRvdy5vcGVuKCJyZXNvdXJjZXMvaWZyYW1l LXJlcGFyZW50aW5nLWlkLWNvbGxpc2lvbi1wYWdlLmh0bWwiKTsKKyAgICB3MiA9IHdpbmRvdy5v cGVuKCJyZXNvdXJjZXMvaWZyYW1lLXJlcGFyZW50aW5nLWlkLWNvbGxpc2lvbi1wYWdlLmh0bWwi KTsKK30KKworPC9zY3JpcHQ+Cis8Ym9keSBvbmxvYWQ9InRlc3QoKSI+Cis8cD5UaGlzIHRlc3Qg Y2hlY2tzIHRoYXQgcmVzb3VyY2UgaWRzIGFyZSB1bmlxdWUgYWNyb3NzIHBhZ2VzIGJ5IG9wZW5p bmcKK3R3byBwYWdlcyB0aGF0IGJvdGggY29udGFpbiBhbiBpZnJhbWUgdGhhdCBsb2FkcyB0aGUg c2FtZSBudW1iZXIgb2YKK3Jlc291cmNlcywgdGhlbiBhZG9wdGluZyB0aGUgaWZyYW1lIGZyb20g b25lIHBhZ2UgdG8gdGhlIG90aGVyLiBJZiByZXNvdXJjZQoraWRzIGFyZSBub3QgdW5pcXVlIGFj cm9zcyBwYWdlcywgdGhlc2UgcGFnZXMgd2lsbCBoYXZlIHRoZSBzYW1lIHJlc291cmNlIGlkcyAK K2FuZCB0aGUgYWRvcHROb2RlIHdpbGwgZmFpbCBkdWUgdG8gYW4gaWQgY29sbGlzaW9uLiBUaGUg aWZyYW1lIGlzIHRoZW4gCithZG9wdGVkIGJhY2sgaW50byBpdHMgb3JpZ2luYWwgcGFnZSB0byBj aGVjayBmb3IgaWQgY29sbGlzaW9uIGZyb20gZmFpbHVyZQordG8gcHJvcGVybHkgcmVtb3ZlIGl0 cyByZXNvdXJjZSBpZCBmcm9tIHRoZSBvcmlnaW5hbCBwYWdlLiA8L3A+Cis8cHJlIGlkPWxvZz48 L3ByZT4KKzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVz dHMvbWlzYy9yZXNvdXJjZXMvaWZyYW1lLXJlcGFyZW50aW5nLWlkLWNvbGxpc2lvbi1wYWdlLmh0 bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21pc2MvcmVzb3VyY2VzL2lmcmFtZS1yZXBhcmVu dGluZy1pZC1jb2xsaXNpb24tcGFnZS5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAuLmQyMmVmOTMKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3Rz L21pc2MvcmVzb3VyY2VzL2lmcmFtZS1yZXBhcmVudGluZy1pZC1jb2xsaXNpb24tcGFnZS5odG1s CkBAIC0wLDAgKzEsMTYgQEAKKzxodG1sPgorPHNjcmlwdD4KK3JlcXVlc3RTZW50ID0gZnVuY3Rp b24oKQoreworICAgIG9wZW5lci5pZnJhbWVYSFJTdGFydGVkKCk7Cit9CisKK3JlcXVlc3RMb2Fk ZWQgPSBmdW5jdGlvbigpCit7CisgICAgb3BlbmVyLmlmcmFtZVhIUkZpbmlzaGVkKCk7Cit9Cis8 L3NjcmlwdD4KKzxib2R5PgorPGlmcmFtZSBzcmM9InNlbmQtYXN5bmMteGhyLmh0bWwiPjwvaWZy YW1lPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0 cy9taXNjL3Jlc291cmNlcy9zZW5kLWFzeW5jLXhoci5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90 ZXN0cy9taXNjL3Jlc291cmNlcy9zZW5kLWFzeW5jLXhoci5odG1sCm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAuLjI4MjFhOGYKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL21pc2MvcmVzb3VyY2VzL3NlbmQtYXN5bmMteGhyLmh0bWwKQEAgLTAsMCAr MSw3IEBACis8c2NyaXB0PgordmFyIHJlcSA9IG5ldyBYTUxIdHRwUmVxdWVzdCgpOworcmVxLm9w ZW4oIkdFVCIsICJoYW5nLWNvbm5lY3Rpb24ucGhwIiwgdHJ1ZSk7CityZXEub25sb2FkID0gcGFy ZW50LnJlcXVlc3RMb2FkZWQ7CityZXEuc2VuZChudWxsKTsKK3BhcmVudC5yZXF1ZXN0U2VudCgp OworPC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hh bmdlTG9nCmluZGV4IDkxMGIzZWUuLmU1YmNhMzAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdl TG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMTAtMTEg IEplbm4gQnJhaXRod2FpdGUgIDxqZW5uYkBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTWFrZSByZXNvdXJjZSBpZGVudGlmaWVy cyB1bmlxdWUgYWNyb3NzIHBhZ2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD00NzAwMgorCisgICAgICAgIFRlc3Q6IGh0dHAvdGVzdHMvbWlzYy9pZnJh bWUtcmVwYXJlbnRpbmctaWQtY29sbGlzaW9uLmh0bWwKKworICAgICAgICAqIGxvYWRlci9Qcm9n cmVzc1RyYWNrZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UHJvZ3Jlc3NUcmFja2VyOjpQcm9n cmVzc1RyYWNrZXIpOgorICAgICAgICAoV2ViQ29yZTo6UHJvZ3Jlc3NUcmFja2VyOjpjcmVhdGVV bmlxdWVJZGVudGlmaWVyKToKKyAgICAgICAgKiBsb2FkZXIvUHJvZ3Jlc3NUcmFja2VyLmg6CisK IDIwMTAtMTAtMTEgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgogCiAgICAgICAg IFJldmlld2VkIGJ5IERpcmsgU2NodWx6ZS4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL1By b2dyZXNzVHJhY2tlci5jcHAgYi9XZWJDb3JlL2xvYWRlci9Qcm9ncmVzc1RyYWNrZXIuY3BwCmlu ZGV4IDdmNjFjZDEuLjU2MWU2YmMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvbG9hZGVyL1Byb2dyZXNz VHJhY2tlci5jcHAKKysrIGIvV2ViQ29yZS9sb2FkZXIvUHJvZ3Jlc3NUcmFja2VyLmNwcApAQCAt NTksOSArNTksMTAgQEAgc3RydWN0IFByb2dyZXNzSXRlbSA6IE5vbmNvcHlhYmxlIHsKICAgICBs b25nIGxvbmcgZXN0aW1hdGVkTGVuZ3RoOwogfTsKIAordW5zaWduZWQgbG9uZyBQcm9ncmVzc1Ry YWNrZXI6OnNfdW5pcXVlSWRlbnRpZmllciA9IDA7CisKIFByb2dyZXNzVHJhY2tlcjo6UHJvZ3Jl c3NUcmFja2VyKCkKLSAgICA6IG1fdW5pcXVlSWRlbnRpZmllcigwKQotICAgICwgbV90b3RhbFBh Z2VBbmRSZXNvdXJjZUJ5dGVzVG9Mb2FkKDApCisgICAgOiBtX3RvdGFsUGFnZUFuZFJlc291cmNl Qnl0ZXNUb0xvYWQoMCkKICAgICAsIG1fdG90YWxCeXRlc1JlY2VpdmVkKDApCiAgICAgLCBtX2xh c3ROb3RpZmllZFByb2dyZXNzVmFsdWUoMCkKICAgICAsIG1fbGFzdE5vdGlmaWVkUHJvZ3Jlc3NU aW1lKDApCkBAIC0yNTUsNyArMjU2LDcgQEAgdm9pZCBQcm9ncmVzc1RyYWNrZXI6OmNvbXBsZXRl UHJvZ3Jlc3ModW5zaWduZWQgbG9uZyBpZGVudGlmaWVyKQogCiB1bnNpZ25lZCBsb25nIFByb2dy ZXNzVHJhY2tlcjo6Y3JlYXRlVW5pcXVlSWRlbnRpZmllcigpCiB7Ci0gICAgcmV0dXJuICsrbV91 bmlxdWVJZGVudGlmaWVyOworICAgIHJldHVybiArK3NfdW5pcXVlSWRlbnRpZmllcjsKIH0KIAog CmRpZmYgLS1naXQgYS9XZWJDb3JlL2xvYWRlci9Qcm9ncmVzc1RyYWNrZXIuaCBiL1dlYkNvcmUv bG9hZGVyL1Byb2dyZXNzVHJhY2tlci5oCmluZGV4IDc0NGUxMDEuLjVkNWI2YjIgMTAwNjQ0Ci0t LSBhL1dlYkNvcmUvbG9hZGVyL1Byb2dyZXNzVHJhY2tlci5oCisrKyBiL1dlYkNvcmUvbG9hZGVy L1Byb2dyZXNzVHJhY2tlci5oCkBAIC00MSw3ICs0MSw3IEBAIHB1YmxpYzoKICAgICBQcm9ncmVz c1RyYWNrZXIoKTsKICAgICB+UHJvZ3Jlc3NUcmFja2VyKCk7CiAgICAgCi0gICAgdW5zaWduZWQg bG9uZyBjcmVhdGVVbmlxdWVJZGVudGlmaWVyKCk7CisgICAgc3RhdGljIHVuc2lnbmVkIGxvbmcg Y3JlYXRlVW5pcXVlSWRlbnRpZmllcigpOwogCiAgICAgZG91YmxlIGVzdGltYXRlZFByb2dyZXNz KCkgY29uc3Q7CiAKQEAgLTU5LDcgKzU5LDcgQEAgcHJpdmF0ZToKICAgICB2b2lkIHJlc2V0KCk7 CiAgICAgdm9pZCBmaW5hbFByb2dyZXNzQ29tcGxldGUoKTsKICAgICAKLSAgICB1bnNpZ25lZCBs b25nIG1fdW5pcXVlSWRlbnRpZmllcjsKKyAgICBzdGF0aWMgdW5zaWduZWQgbG9uZyBzX3VuaXF1 ZUlkZW50aWZpZXI7CiAgICAgCiAgICAgbG9uZyBsb25nIG1fdG90YWxQYWdlQW5kUmVzb3VyY2VC eXRlc1RvTG9hZDsKICAgICBsb25nIGxvbmcgbV90b3RhbEJ5dGVzUmVjZWl2ZWQ7Cg==