150149 2015-10-14 16:14:50 -0700 Modern IDB: Handle versionchange events 2015-10-16 16:17:27 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=150259 P2 Normal --- 150147 150148 149117 1 beidson beidson achristensen alecflett commit-queue jsbell ryanhaddad oldest_to_newest 1133298 0 beidson 2015-10-14 16:14:50 -0700 Modern IDB: Add versionchange events Now that we can commit version changes (https://bugs.webkit.org/show_bug.cgi?id=150147), we can have open database connections that can get versionchange events. 1133954 1 263301 beidson 2015-10-16 11:44:39 -0700 Created attachment 263301 Patch v1 1133963 2 263301 achristensen 2015-10-16 12:08:04 -0700 Comment on attachment 263301 Patch v1 View in context: https://bugs.webkit.org/attachment.cgi?id=263301&action=review > Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp:207 > + scriptExecutionContext()->eventQueue().enqueueEvent(adoptRef(&event.leakRef())); It seems like there might be a syntactically cleaner way to write. 1133973 3 beidson 2015-10-16 12:17:20 -0700 (In reply to comment #2) > Comment on attachment 263301 [details] > Patch v1 > > View in context: > https://bugs.webkit.org/attachment.cgi?id=263301&action=review > > > Source/WebCore/Modules/indexeddb/client/IDBDatabaseImpl.cpp:207 > > + scriptExecutionContext()->eventQueue().enqueueEvent(adoptRef(&event.leakRef())); > > It seems like there might be a syntactically cleaner way to write. Sadly not right now - No clean way to automatically go from Ref to PassRefPtr. Alas - The ugliness will be removed when PassRefPtr is purged completely! 1133993 4 263301 commit-queue 2015-10-16 13:04:51 -0700 Comment on attachment 263301 Patch v1 Clearing flags on attachment: 263301 Committed r191198: <http://trac.webkit.org/changeset/191198> 1133994 5 commit-queue 2015-10-16 13:04:56 -0700 All reviewed patches have been landed. Closing bug. 1134050 6 ryanhaddad 2015-10-16 14:31:38 -0700 One of the new tests is failing: --- /Volumes/Data/slave/elcapitan-release-tests-wk1/build/layout-test-results/storage/indexeddb/modern/versionchange-event-expected.txt +++ /Volumes/Data/slave/elcapitan-release-tests-wk1/build/layout-test-results/storage/indexeddb/modern/versionchange-event-actual.txt @@ -2,8 +2,8 @@ ALERT: Version change complete (firstPhase). Database version is now - 1 ALERT: Open success (secondPhase) ALERT: thirdPhase - Requested database connection with version 2 +ALERT: firstPhase connection versionchange event - old version: 1, new version: 2 ALERT: secondPhase connection versionchange event - old version: 1, new version: 2 -ALERT: firstPhase connection versionchange event - old version: 1, new version: 2 ALERT: Expected upgrade needed (thirdPhase) ALERT: Done This test: 1134051 7 ryanhaddad 2015-10-16 14:32:20 -0700 http://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=storage%2Findexeddb%2Fmodern%2Fversionchange-event.html 1134092 8 beidson 2015-10-16 15:56:09 -0700 The event order actually does not matter. The test just needs to handle both orders. I probably have a fix, but need to test it first, but need to finish my build first. ETA: soon 1134102 9 beidson 2015-10-16 16:16:31 -0700 https://trac.webkit.org/changeset/191222 1134104 10 ryanhaddad 2015-10-16 16:17:27 -0700 *** Bug 150259 has been marked as a duplicate of this bug. *** 263301 2015-10-16 11:44:39 -0700 2015-10-16 13:04:51 -0700 Patch v1 patch text/plain 14707 beidson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA2NjFiODZkLi44MWZiOWY0IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTUtMTAt MTYgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAgIE1vZGVybiBJ REI6IEFkZCB2ZXJzaW9uY2hhbmdlIGV2ZW50cy4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MDE0OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogc3RvcmFnZS9pbmRleGVkZGIvbW9kZXJuL3ZlcnNpb25j aGFuZ2UtZXZlbnQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBzdG9yYWdlL2luZGV4 ZWRkYi9tb2Rlcm4vdmVyc2lvbmNoYW5nZS1ldmVudC5odG1sOiBBZGRlZC4KKwogMjAxNS0xMC0x NiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQs IHNraXAgaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9kb20vaW50ZXJmYWNlcy5odG1s IG9uIERlYnVnIGJ1aWxkcy4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhl ZGRiL21vZGVybi92ZXJzaW9uY2hhbmdlLWV2ZW50LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3Rz L3N0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi92ZXJzaW9uY2hhbmdlLWV2ZW50LWV4cGVjdGVkLnR4 dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwLi4zOTg0MThiCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvbW9kZXJuL3ZlcnNpb25jaGFu Z2UtZXZlbnQtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTcgQEAKK0FMRVJUOiB1cGdyYWRlbmVl ZGVkIChmaXJzdFBoYXNlKTogb2xkIHZlcnNpb24gLSAwIG5ldyB2ZXJzaW9uIC0gMQorQUxFUlQ6 IFZlcnNpb24gY2hhbmdlIGNvbXBsZXRlIChmaXJzdFBoYXNlKS4gRGF0YWJhc2UgdmVyc2lvbiBp cyBub3cgLSAxCitBTEVSVDogT3BlbiBzdWNjZXNzIChzZWNvbmRQaGFzZSkKK0FMRVJUOiB0aGly ZFBoYXNlIC0gUmVxdWVzdGVkIGRhdGFiYXNlIGNvbm5lY3Rpb24gd2l0aCB2ZXJzaW9uIDIKK0FM RVJUOiBzZWNvbmRQaGFzZSBjb25uZWN0aW9uIHZlcnNpb25jaGFuZ2UgZXZlbnQgLSBvbGQgdmVy c2lvbjogMSwgbmV3IHZlcnNpb246IDIKK0FMRVJUOiBmaXJzdFBoYXNlIGNvbm5lY3Rpb24gdmVy c2lvbmNoYW5nZSBldmVudCAtIG9sZCB2ZXJzaW9uOiAxLCBuZXcgdmVyc2lvbjogMgorQUxFUlQ6 IEV4cGVjdGVkIHVwZ3JhZGUgbmVlZGVkICh0aGlyZFBoYXNlKQorQUxFUlQ6IERvbmUKK1RoaXMg dGVzdDoKKy1PcGVucyBhIGNvbm5lY3Rpb24gdG8gYSBkYXRhYmFzZSBhdCB2ZXJzaW9uIDEsIGNy ZWF0aW5nIHRoZSBkYXRhYmFzZQorLUNvbW1pdHMgdGhlIHZlcnNpb24gY2hhbmdlIHRyYW5zYWN0 aW9uIGZvciB0aGF0IGRhdGFiYXNlCistT3BlbnMgYSBzZWNvbmQgY29ubmVjdGlvbiB0byB0aGF0 IGRhdGFiYXNlLCByZXF1ZXN0aW5nIHZlcnNpb24gMQorLU9wZW5zIGEgdGhpcmQgY29ubmVjdGlv biB0byB0aGF0IGRhdGFiYXNlLCByZXF1ZXN0aW5nIHZlcnNpb24gMgorLU1ha2VzIHN1cmUgdGhl IGZpcnN0IGFuZCBzZWNvbmQgY29ubmVjdGlvbnMgZ2V0IHRoZSB2ZXJzaW9uY2hhbmdlIGV2ZW50 CistQ2xvc2VzIHRoZSBmaXJzdCBhbmQgc2Vjb25kIGNvbm5lY3Rpb25zCistTWFrZXMgc3VyZSB0 aGUgdmVyc2lvbmNoYW5nZSB0cmFuc2FjdGlvbiBmb3IgdGhlIHNlY29uZCBjb25uZWN0aW9uIHN0 YXJ0cyBzdWNjZXNzZnVsbHkKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRl eGVkZGIvbW9kZXJuL3ZlcnNpb25jaGFuZ2UtZXZlbnQuaHRtbCBiL0xheW91dFRlc3RzL3N0b3Jh Z2UvaW5kZXhlZGRiL21vZGVybi92ZXJzaW9uY2hhbmdlLWV2ZW50Lmh0bWwKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYzY1MDY4NQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL21vZGVybi92ZXJzaW9uY2hhbmdlLWV2ZW50Lmh0bWwK QEAgLTAsMCArMSwxMTAgQEAKK1RoaXMgdGVzdDo8YnI+CistT3BlbnMgYSBjb25uZWN0aW9uIHRv IGEgZGF0YWJhc2UgYXQgdmVyc2lvbiAxLCBjcmVhdGluZyB0aGUgZGF0YWJhc2U8YnI+CistQ29t bWl0cyB0aGUgdmVyc2lvbiBjaGFuZ2UgdHJhbnNhY3Rpb24gZm9yIHRoYXQgZGF0YWJhc2U8YnI+ CistT3BlbnMgYSBzZWNvbmQgY29ubmVjdGlvbiB0byB0aGF0IGRhdGFiYXNlLCByZXF1ZXN0aW5n IHZlcnNpb24gMTxicj4KKy1PcGVucyBhIHRoaXJkIGNvbm5lY3Rpb24gdG8gdGhhdCBkYXRhYmFz ZSwgcmVxdWVzdGluZyB2ZXJzaW9uIDI8YnI+CistTWFrZXMgc3VyZSB0aGUgZmlyc3QgYW5kIHNl Y29uZCBjb25uZWN0aW9ucyBnZXQgdGhlIHZlcnNpb25jaGFuZ2UgZXZlbnQ8YnI+CistQ2xvc2Vz IHRoZSBmaXJzdCBhbmQgc2Vjb25kIGNvbm5lY3Rpb25zPGJyPgorLU1ha2VzIHN1cmUgdGhlIHZl cnNpb25jaGFuZ2UgdHJhbnNhY3Rpb24gZm9yIHRoZSBzZWNvbmQgY29ubmVjdGlvbiBzdGFydHMg c3VjY2Vzc2Z1bGx5PGJyPgorPHNjcmlwdD4KKworaWYgKHdpbmRvdy50ZXN0UnVubmVyKSB7Cisg ICAgdGVzdFJ1bm5lci53YWl0VW50aWxEb25lKCk7CisgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0 KCk7Cit9CisKK2Z1bmN0aW9uIGRvbmUoKQoreworICAgIGFsZXJ0KCJEb25lIik7CisgICAgaWYg KHdpbmRvdy50ZXN0UnVubmVyKQorICAgICAgICB0ZXN0UnVubmVyLm5vdGlmeURvbmUoKTsKK30K KwordmFyIHJlcXVlc3QgPSB3aW5kb3cuaW5kZXhlZERCLm9wZW4oIlZlcnNpb25DaGFuZ2VUZXN0 RGF0YWJhc2UiKTsKK3ZhciBjb25uZWN0aW9uMTsKK3ZhciBjb25uZWN0aW9uMjsKKworcmVxdWVz dC5vbnN1Y2Nlc3MgPSBmdW5jdGlvbigpCit7CisgICAgYWxlcnQoIlVuZXhwZWN0ZWQgc3VjY2Vz cyAoZmlyc3RQaGFzZSkiKTsKKwlkb25lKCk7Cit9CityZXF1ZXN0Lm9uZXJyb3IgPSBmdW5jdGlv bihlKQoreworICAgIGFsZXJ0KCJVbmV4cGVjdGVkIGVycm9yIChmaXJzdFBoYXNlKSIpOworCWRv bmUoKTsKK30KKworcmVxdWVzdC5vbnVwZ3JhZGVuZWVkZWQgPSBmdW5jdGlvbihlKQoreworICAg IGFsZXJ0KCJ1cGdyYWRlbmVlZGVkIChmaXJzdFBoYXNlKTogb2xkIHZlcnNpb24gLSAiICsgZS5v bGRWZXJzaW9uICsgIiBuZXcgdmVyc2lvbiAtICIgKyBlLm5ld1ZlcnNpb24pOworICAgIHJlcXVl c3QudHJhbnNhY3Rpb24ub25jb21wbGV0ZSA9IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGFs ZXJ0KCJWZXJzaW9uIGNoYW5nZSBjb21wbGV0ZSAoZmlyc3RQaGFzZSkuIERhdGFiYXNlIHZlcnNp b24gaXMgbm93IC0gIiArIHJlcXVlc3QudHJhbnNhY3Rpb24uZGIudmVyc2lvbik7CisgICAgICAg IGNvbm5lY3Rpb24xID0gcmVxdWVzdC50cmFuc2FjdGlvbi5kYjsKKyAgICAgICAgY29ubmVjdGlv bjEub252ZXJzaW9uY2hhbmdlID0gZnVuY3Rpb24oZSkKKyAgICAgICAgeworICAgICAgICAgICAg YWxlcnQoImZpcnN0UGhhc2UgY29ubmVjdGlvbiB2ZXJzaW9uY2hhbmdlIGV2ZW50IC0gb2xkIHZl cnNpb246ICIgKyBlLm9sZFZlcnNpb24gKyAiLCBuZXcgdmVyc2lvbjogIiArIGUubmV3VmVyc2lv bik7CisgICAgICAgICAgICBjb25uZWN0aW9uMS5jbG9zZSgpOworICAgICAgICB9CisgICAgICAg IHNlY29uZFBoYXNlKCk7CisgICAgfQorICAgIHJlcXVlc3QudHJhbnNhY3Rpb24ub25hYm9ydCA9 IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGFsZXJ0KCJWZXJzaW9uIGNoYW5nZSB0cmFuc2Fj dGlvbiB1bmV4cGVjdGVkIGFib3J0IChmaXJzdFBoYXNlKSIpOworICAgICAgICBkb25lKCk7Cisg ICAgfQorICAgIHJlcXVlc3QudHJhbnNhY3Rpb24ub25lcnJvciA9IGZ1bmN0aW9uKCkKKyAgICB7 CisgICAgICAgIGFsZXJ0KCJWZXJzaW9uIGNoYW5nZSB0cmFuc2FjdGlvbiB1bmV4cGVjdGVkIGVy cm9yIChmaXJzdFBoYXNlKSIpOworICAgICAgICBkb25lKCk7CisgICAgfQorfQorCitmdW5jdGlv biBzZWNvbmRQaGFzZSgpCit7CisgICAgdmFyIHJlcXVlc3QgPSB3aW5kb3cuaW5kZXhlZERCLm9w ZW4oIlZlcnNpb25DaGFuZ2VUZXN0RGF0YWJhc2UiLCAxKTsKKyAgICByZXF1ZXN0Lm9uc3VjY2Vz cyA9IGZ1bmN0aW9uKCkKKyAgICB7CisgICAgICAgIGFsZXJ0KCJPcGVuIHN1Y2Nlc3MgKHNlY29u ZFBoYXNlKSIpOworICAgICAgICBjb25uZWN0aW9uMiA9IHJlcXVlc3QucmVzdWx0OworICAgICAg ICBjb25uZWN0aW9uMi5vbnZlcnNpb25jaGFuZ2UgPSBmdW5jdGlvbihlKQorICAgICAgICB7Cisg ICAgICAgICAgICBhbGVydCgic2Vjb25kUGhhc2UgY29ubmVjdGlvbiB2ZXJzaW9uY2hhbmdlIGV2 ZW50IC0gb2xkIHZlcnNpb246ICIgKyBlLm9sZFZlcnNpb24gKyAiLCBuZXcgdmVyc2lvbjogIiAr IGUubmV3VmVyc2lvbik7CisgICAgICAgICAgICBjb25uZWN0aW9uMi5jbG9zZSgpOworICAgICAg ICB9CisgICAgICAgIHRoaXJkUGhhc2UoKTsKKyAgICB9CisgICAgcmVxdWVzdC5vbmVycm9yID0g ZnVuY3Rpb24oZSkKKyAgICB7CisgICAgICAgIGFsZXJ0KCJVbmV4cGVjdGVkIG9wZW4gZXJyb3Ig KHNlY29uZFBoYXNlKSIgKyBlKTsKKyAgICAgICAgZG9uZSgpOworICAgIH0KKyAgICByZXF1ZXN0 Lm9udXBncmFkZW5lZWRlZCA9IGZ1bmN0aW9uKGUpCisgICAgeworICAgIAlhbGVydCgiVW5leHBl Y3RlZCB1cGdyYWRlIG5lZWRlZCAoc2Vjb25kUGhhc2UpIik7CisgICAgCWRvbmUoKTsKKyAgICB9 Cit9CisKK2Z1bmN0aW9uIHRoaXJkUGhhc2UoKQoreworICAgIHZhciByZXF1ZXN0ID0gd2luZG93 LmluZGV4ZWREQi5vcGVuKCJWZXJzaW9uQ2hhbmdlVGVzdERhdGFiYXNlIiwgMik7CisgICAgYWxl cnQoInRoaXJkUGhhc2UgLSBSZXF1ZXN0ZWQgZGF0YWJhc2UgY29ubmVjdGlvbiB3aXRoIHZlcnNp b24gMiIpOworICAgIHJlcXVlc3Qub25zdWNjZXNzID0gZnVuY3Rpb24oKQorICAgIHsKKyAgICAg ICAgYWxlcnQoIlVuZXhwZWN0ZWQgb3BlbiBzdWNjZXNzICh0aGlyZFBoYXNlKSIpOworICAgICAg ICBkb25lKCk7CisgICAgfQorICAgIHJlcXVlc3Qub25lcnJvciA9IGZ1bmN0aW9uKGUpCisgICAg eworICAgICAgICBhbGVydCgiVW5leHBlY3RlZCBvcGVuIGVycm9yICh0aGlyZFBoYXNlKSIgKyBl KTsKKyAgICAgICAgZG9uZSgpOworICAgIH0KKyAgICByZXF1ZXN0Lm9udXBncmFkZW5lZWRlZCA9 IGZ1bmN0aW9uKGUpCisgICAgeworICAgIAlhbGVydCgiRXhwZWN0ZWQgdXBncmFkZSBuZWVkZWQg KHRoaXJkUGhhc2UpIik7CisgICAgCWRvbmUoKTsKKyAgICB9Cit9Cis8L3NjcmlwdD4KZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxv ZwppbmRleCA4OTcwYTYzLi5hOWNmMDVhMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisy MDE1LTEwLTE2ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKworICAgICAgICBN b2Rlcm4gSURCOiBIYW5kbGUgdmVyc2lvbmNoYW5nZSBldmVudHMuCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTAxNDkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBzdG9yYWdlL2luZGV4ZWRkYi9t b2Rlcm4vdmVyc2lvbmNoYW5nZS1ldmVudC5odG1sCisgICAgICAgIAorICAgICAgICAtIElEQlZl cnNpb25DaGFuZ2VFdmVudHMgYXJlIG5vdyBkaXNwYXRjaGVkIHRvIG9wZW4gY29ubmVjdGlvbnMg d2hlbiBhCisgICAgICAgICAgdmVyc2lvbiB1cGdyYWRlIHJlcXVlc3QgY29tZXMgaW4uCisgICAg ICAgIC0gT25jZSBhbGwgb2YgdGhvc2Ugb3BlbiBjb25uZWN0aW9ucyBoYXZlIGNsb3NlZCwgdGhl IHZlcnNpb24gdXBncmFkZSAKKyAgICAgICAgICByZXF1ZXN0IGlzIGhhbmRsZWQuCisKKyAgICAg ICAgKiBNb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvSURCQ29ubmVjdGlvblRvU2VydmVyLmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OklEQkNsaWVudDo6SURCQ29ubmVjdGlvblRvU2VydmVyOjpmaXJl VmVyc2lvbkNoYW5nZUV2ZW50KToKKyAgICAgICAgKFdlYkNvcmU6OklEQkNsaWVudDo6SURCQ29u bmVjdGlvblRvU2VydmVyOjpyZWdpc3RlckRhdGFiYXNlQ29ubmVjdGlvbik6CisgICAgICAgIChX ZWJDb3JlOjpJREJDbGllbnQ6OklEQkNvbm5lY3Rpb25Ub1NlcnZlcjo6dW5yZWdpc3RlckRhdGFi YXNlQ29ubmVjdGlvbik6CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lEQkNv bm5lY3Rpb25Ub1NlcnZlci5oOgorCisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50 L0lEQkRhdGFiYXNlSW1wbC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJREJDbGllbnQ6OklEQkRh dGFiYXNlOjpmaXJlVmVyc2lvbkNoYW5nZUV2ZW50KToKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4 ZWRkYi9jbGllbnQvSURCRGF0YWJhc2VJbXBsLmg6CisKKyAgICAgICAgKiBNb2R1bGVzL2luZGV4 ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6SURC U2VydmVyOjpVbmlxdWVJREJEYXRhYmFzZTo6VW5pcXVlSURCRGF0YWJhc2UpOgorICAgICAgICAo V2ViQ29yZTo6SURCU2VydmVyOjpVbmlxdWVJREJEYXRhYmFzZTo6Y29ubmVjdGlvbkNsb3NlZEZy b21DbGllbnQpOgorICAgICAgICAoV2ViQ29yZTo6SURCU2VydmVyOjpVbmlxdWVJREJEYXRhYmFz ZTo6aW52b2tlVHJhbnNhY3Rpb25TY2hlZHVsZXIpOgorICAgICAgICAoV2ViQ29yZTo6SURCU2Vy dmVyOjpVbmlxdWVJREJEYXRhYmFzZTo6dHJhbnNhY3Rpb25TY2hlZHVsaW5nVGltZXJGaXJlZCk6 CisgICAgICAgICogTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmg6 CisKIDIwMTUtMTAtMTYgIEtlaXRoIFJvbGxpbiAgPGtyb2xsaW5AYXBwbGUuY29tPgogCiAgICAg ICAgIFRoZSB2YWx1ZSBzYW5pdGl6YXRpb24gYWxnb3JpdGhtIGZvciBpbnB1dFt0eXBlPXVybF0g c2hvdWxkIHN0cmlwIHdoaXRlc3BhY2VzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1 bGVzL2luZGV4ZWRkYi9jbGllbnQvSURCQ29ubmVjdGlvblRvU2VydmVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJDb25uZWN0aW9uVG9TZXJ2ZXIuY3Bw CmluZGV4IGRkZDBmZmYuLmFlODc0NDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVs ZXMvaW5kZXhlZGRiL2NsaWVudC9JREJDb25uZWN0aW9uVG9TZXJ2ZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJDb25uZWN0aW9uVG9TZXJ2ZXIu Y3BwCkBAIC0xMTMsMTEgKzExMywxNSBAQCB2b2lkIElEQkNvbm5lY3Rpb25Ub1NlcnZlcjo6ZGlk Q29tbWl0VHJhbnNhY3Rpb24oY29uc3QgSURCUmVzb3VyY2VJZGVudGlmaWVyJiB0cgogICAgIHRy YW5zYWN0aW9uLT5kaWRDb21taXQoZXJyb3IpOwogfQogCi12b2lkIElEQkNvbm5lY3Rpb25Ub1Nl cnZlcjo6ZmlyZVZlcnNpb25DaGFuZ2VFdmVudCh1aW50NjRfdCAvKmRhdGFiYXNlQ29ubmVjdGlv bklkZW50aWZpZXIqLyAsIHVpbnQ2NF90IC8qcmVxdWVzdGVkVmVyc2lvbiovKQordm9pZCBJREJD b25uZWN0aW9uVG9TZXJ2ZXI6OmZpcmVWZXJzaW9uQ2hhbmdlRXZlbnQodWludDY0X3QgZGF0YWJh c2VDb25uZWN0aW9uSWRlbnRpZmllciwgdWludDY0X3QgcmVxdWVzdGVkVmVyc2lvbikKIHsKICAg ICBMT0coSW5kZXhlZERCLCAiSURCQ29ubmVjdGlvblRvU2VydmVyOjpmaXJlVmVyc2lvbkNoYW5n ZUV2ZW50Iik7CiAKLSAgICAvLyBGSVhNRTogSW1wbGVtZW50IHZlcnNpb25jaGFuZ2UgZXZlbnRz IGZpcmluZyBvbiBhbHJlYWR5LW9wZW4gdHJhbnNhY3Rpb25zLgorICAgIGF1dG8gY29ubmVjdGlv biA9IG1fZGF0YWJhc2VDb25uZWN0aW9uTWFwLmdldChkYXRhYmFzZUNvbm5lY3Rpb25JZGVudGlm aWVyKTsKKyAgICBpZiAoIWNvbm5lY3Rpb24pCisgICAgICAgIHJldHVybjsKKworICAgIGNvbm5l Y3Rpb24tPmZpcmVWZXJzaW9uQ2hhbmdlRXZlbnQocmVxdWVzdGVkVmVyc2lvbik7CiB9CiAKIHZv aWQgSURCQ29ubmVjdGlvblRvU2VydmVyOjpkYXRhYmFzZUNvbm5lY3Rpb25DbG9zZWQoSURCRGF0 YWJhc2UmIGRhdGFiYXNlKQpAQCAtMTI5LDE0ICsxMzMsMTUgQEAgdm9pZCBJREJDb25uZWN0aW9u VG9TZXJ2ZXI6OmRhdGFiYXNlQ29ubmVjdGlvbkNsb3NlZChJREJEYXRhYmFzZSYgZGF0YWJhc2Up CiAKIHZvaWQgSURCQ29ubmVjdGlvblRvU2VydmVyOjpyZWdpc3RlckRhdGFiYXNlQ29ubmVjdGlv bihJREJEYXRhYmFzZSYgZGF0YWJhc2UpCiB7Ci0gICAgQVNTRVJUKCFtX2RhdGFiYXNlQ29ubmVj dGlvbnMuY29udGFpbnMoJmRhdGFiYXNlKSk7Ci0gICAgbV9kYXRhYmFzZUNvbm5lY3Rpb25zLmFk ZCgmZGF0YWJhc2UpOworICAgIEFTU0VSVCghbV9kYXRhYmFzZUNvbm5lY3Rpb25NYXAuY29udGFp bnMoZGF0YWJhc2UuZGF0YWJhc2VDb25uZWN0aW9uSWRlbnRpZmllcigpKSk7CisgICAgbV9kYXRh YmFzZUNvbm5lY3Rpb25NYXAuc2V0KGRhdGFiYXNlLmRhdGFiYXNlQ29ubmVjdGlvbklkZW50aWZp ZXIoKSwgJmRhdGFiYXNlKTsKIH0KIAogdm9pZCBJREJDb25uZWN0aW9uVG9TZXJ2ZXI6OnVucmVn aXN0ZXJEYXRhYmFzZUNvbm5lY3Rpb24oSURCRGF0YWJhc2UmIGRhdGFiYXNlKQogewotICAgIEFT U0VSVChtX2RhdGFiYXNlQ29ubmVjdGlvbnMuY29udGFpbnMoJmRhdGFiYXNlKSk7Ci0gICAgbV9k YXRhYmFzZUNvbm5lY3Rpb25zLnJlbW92ZSgmZGF0YWJhc2UpOworICAgIEFTU0VSVChtX2RhdGFi YXNlQ29ubmVjdGlvbk1hcC5jb250YWlucyhkYXRhYmFzZS5kYXRhYmFzZUNvbm5lY3Rpb25JZGVu dGlmaWVyKCkpKTsKKyAgICBBU1NFUlQobV9kYXRhYmFzZUNvbm5lY3Rpb25NYXAuZ2V0KGRhdGFi YXNlLmRhdGFiYXNlQ29ubmVjdGlvbklkZW50aWZpZXIoKSkgPT0gJmRhdGFiYXNlKTsKKyAgICBt X2RhdGFiYXNlQ29ubmVjdGlvbk1hcC5yZW1vdmUoZGF0YWJhc2UuZGF0YWJhc2VDb25uZWN0aW9u SWRlbnRpZmllcigpKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgSURCQ2xpZW50CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvSURCQ29ubmVjdGlvblRv U2VydmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9jbGllbnQvSURCQ29u bmVjdGlvblRvU2VydmVyLmgKaW5kZXggNDFhZDQzMi4uY2M0ZTM5MiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lEQkNvbm5lY3Rpb25Ub1NlcnZl ci5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9JREJDb25u ZWN0aW9uVG9TZXJ2ZXIuaApAQCAtNzMsNyArNzMsNyBAQCBwcml2YXRlOgogICAgIFJlZjxJREJD b25uZWN0aW9uVG9TZXJ2ZXJEZWxlZ2F0ZT4gbV9kZWxlZ2F0ZTsKIAogICAgIEhhc2hNYXA8SURC UmVzb3VyY2VJZGVudGlmaWVyLCBSZWZQdHI8SURCQ2xpZW50OjpJREJPcGVuREJSZXF1ZXN0Pj4g bV9vcGVuREJSZXF1ZXN0TWFwOwotICAgIEhhc2hTZXQ8UmVmUHRyPElEQkRhdGFiYXNlPj4gbV9k YXRhYmFzZUNvbm5lY3Rpb25zOworICAgIEhhc2hNYXA8dWludDY0X3QsIElEQkRhdGFiYXNlKj4g bV9kYXRhYmFzZUNvbm5lY3Rpb25NYXA7CiAgICAgSGFzaE1hcDxJREJSZXNvdXJjZUlkZW50aWZp ZXIsIFJlZlB0cjxJREJUcmFuc2FjdGlvbj4+IG1fY29tbWl0dGluZ1RyYW5zYWN0aW9uczsKIH07 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9J REJEYXRhYmFzZUltcGwuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xp ZW50L0lEQkRhdGFiYXNlSW1wbC5jcHAKaW5kZXggN2U3ZjU0OC4uMTAyOWE2NCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lEQkRhdGFiYXNlSW1w bC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lEQkRh dGFiYXNlSW1wbC5jcHAKQEAgLTI4LDExICsyOCwxNCBAQAogCiAjaWYgRU5BQkxFKElOREVYRURf REFUQUJBU0UpCiAKKyNpbmNsdWRlICJFdmVudFF1ZXVlLmgiCiAjaW5jbHVkZSAiSURCQ29ubmVj dGlvblRvU2VydmVyLmgiCiAjaW5jbHVkZSAiSURCT3BlbkRCUmVxdWVzdEltcGwuaCIKICNpbmNs dWRlICJJREJSZXN1bHREYXRhLmgiCiAjaW5jbHVkZSAiSURCVHJhbnNhY3Rpb25JbXBsLmgiCisj aW5jbHVkZSAiSURCVmVyc2lvbkNoYW5nZUV2ZW50SW1wbC5oIgogI2luY2x1ZGUgIkxvZ2dpbmcu aCIKKyNpbmNsdWRlICJTY3JpcHRFeGVjdXRpb25Db250ZXh0LmgiCiAKIG5hbWVzcGFjZSBXZWJD b3JlIHsKIG5hbWVzcGFjZSBJREJDbGllbnQgewpAQCAtMTkxLDYgKzE5NCwxOSBAQCB2b2lkIElE QkRhdGFiYXNlOjpkaWRDb21taXRPckFib3J0VHJhbnNhY3Rpb24oSURCVHJhbnNhY3Rpb24mIHRy YW5zYWN0aW9uKQogICAgIG1fY29tbWl0dGluZ1RyYW5zYWN0aW9ucy5yZW1vdmUodHJhbnNhY3Rp b24uaW5mbygpLmlkZW50aWZpZXIoKSk7CiB9CiAKK3ZvaWQgSURCRGF0YWJhc2U6OmZpcmVWZXJz aW9uQ2hhbmdlRXZlbnQodWludDY0X3QgcmVxdWVzdGVkVmVyc2lvbikKK3sKKyAgICB1aW50NjRf dCBjdXJyZW50VmVyc2lvbiA9IG1faW5mby52ZXJzaW9uKCk7CisgICAgTE9HKEluZGV4ZWREQiwg IklEQkRhdGFiYXNlOjpmaXJlVmVyc2lvbkNoYW5nZUV2ZW50IC0gY3VycmVudCB2ZXJzaW9uICVs bHUsIHJlcXVlc3RlZCB2ZXJzaW9uICVsbHUiLCBjdXJyZW50VmVyc2lvbiwgcmVxdWVzdGVkVmVy c2lvbik7CisKKyAgICBpZiAoIXNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSkKKyAgICAgICAgcmV0 dXJuOworICAgIAorICAgIFJlZjxFdmVudD4gZXZlbnQgPSBJREJWZXJzaW9uQ2hhbmdlRXZlbnQ6 OmNyZWF0ZShjdXJyZW50VmVyc2lvbiwgcmVxdWVzdGVkVmVyc2lvbiwgZXZlbnROYW1lcygpLnZl cnNpb25jaGFuZ2VFdmVudCk7CisgICAgZXZlbnQtPnNldFRhcmdldCh0aGlzKTsKKyAgICBzY3Jp cHRFeGVjdXRpb25Db250ZXh0KCktPmV2ZW50UXVldWUoKS5lbnF1ZXVlRXZlbnQoYWRvcHRSZWYo JmV2ZW50LmxlYWtSZWYoKSkpOworfQorCiB9IC8vIG5hbWVzcGFjZSBJREJDbGllbnQKIH0gLy8g bmFtZXNwYWNlIFdlYkNvcmUKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvY2xpZW50L0lEQkRhdGFiYXNlSW1wbC5oIGIvU291cmNlL1dlYkNvcmUvTW9kdWxl cy9pbmRleGVkZGIvY2xpZW50L0lEQkRhdGFiYXNlSW1wbC5oCmluZGV4IDVmZjY3YWMuLmJmNjA0 ODEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRiL2NsaWVudC9J REJEYXRhYmFzZUltcGwuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9j bGllbnQvSURCRGF0YWJhc2VJbXBsLmgKQEAgLTc3LDYgKzc3LDggQEAgcHVibGljOgogICAgIHZv aWQgZGlkQ29tbWl0VHJhbnNhY3Rpb24oSURCVHJhbnNhY3Rpb24mKTsKICAgICB2b2lkIGRpZEFi b3J0VHJhbnNhY3Rpb24oSURCVHJhbnNhY3Rpb24mKTsKIAorICAgIHZvaWQgZmlyZVZlcnNpb25D aGFuZ2VFdmVudCh1aW50NjRfdCByZXF1ZXN0ZWRWZXJzaW9uKTsKKwogcHJpdmF0ZToKICAgICBJ REJEYXRhYmFzZShTY3JpcHRFeGVjdXRpb25Db250ZXh0JiwgSURCQ29ubmVjdGlvblRvU2VydmVy JiwgY29uc3QgSURCUmVzdWx0RGF0YSYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9N b2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuY3BwIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1ZUlEQkRhdGFiYXNlLmNwcAppbmRl eCBhNmMyZjNkLi5jNDY2ZDNmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2lu ZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvaW5kZXhlZGRiL3NlcnZlci9VbmlxdWVJREJEYXRhYmFzZS5jcHAKQEAgLTQxLDYg KzQxLDcgQEAgbmFtZXNwYWNlIElEQlNlcnZlciB7CiBVbmlxdWVJREJEYXRhYmFzZTo6VW5pcXVl SURCRGF0YWJhc2UoSURCU2VydmVyJiBzZXJ2ZXIsIGNvbnN0IElEQkRhdGFiYXNlSWRlbnRpZmll ciYgaWRlbnRpZmllcikKICAgICA6IG1fc2VydmVyKHNlcnZlcikKICAgICAsIG1faWRlbnRpZmll cihpZGVudGlmaWVyKQorICAgICwgbV90cmFuc2FjdGlvblNjaGVkdWxpbmdUaW1lcigqdGhpcywg JlVuaXF1ZUlEQkRhdGFiYXNlOjp0cmFuc2FjdGlvblNjaGVkdWxpbmdUaW1lckZpcmVkKQogewog fQogCkBAIC0yNjYsOCArMjY3LDI2IEBAIHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OmNvbm5lY3Rp b25DbG9zZWRGcm9tQ2xpZW50KFVuaXF1ZUlEQkRhdGFiYXNlQ29ubmVjdGlvbiYKICAgICAgICAg cmV0dXJuOwogICAgIH0KIAotICAgIC8vIEZJWE1FOiBOb3cgdGhhdCBhIGRhdGFiYXNlIGNvbm5l Y3Rpb24gaGFzIGNsb3NlZCwgcHJldmlvdXNseSBibG9ja2VkIHRyYW5zYWN0aW9ucyBtaWdodCBi ZSBydW5uYWJsZS4KLSAgICAvLyBUcnkgdG8gcnVuIHRoZW0gbm93LgorICAgIC8vIE5vdyB0aGF0 IGEgZGF0YWJhc2UgY29ubmVjdGlvbiBoYXMgY2xvc2VkLCBwcmV2aW91c2x5IGJsb2NrZWQgdHJh bnNhY3Rpb25zIG1pZ2h0IGJlIHJ1bm5hYmxlLgorICAgIGludm9rZVRyYW5zYWN0aW9uU2NoZWR1 bGVyKCk7Cit9CisKK3ZvaWQgVW5pcXVlSURCRGF0YWJhc2U6Omludm9rZVRyYW5zYWN0aW9uU2No ZWR1bGVyKCkKK3sKKyAgICBpZiAoIW1fdHJhbnNhY3Rpb25TY2hlZHVsaW5nVGltZXIuaXNBY3Rp dmUoKSkKKyAgICAgICAgbV90cmFuc2FjdGlvblNjaGVkdWxpbmdUaW1lci5zdGFydE9uZVNob3Qo MCk7Cit9CisKK3ZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OnRyYW5zYWN0aW9uU2NoZWR1bGluZ1Rp bWVyRmlyZWQoKQoreworICAgIExPRyhJbmRleGVkREIsICIobWFpbikgVW5pcXVlSURCRGF0YWJh c2U6OnRyYW5zYWN0aW9uU2NoZWR1bGluZ1RpbWVyRmlyZWQiKTsKKworICAgIGlmICghaGFzQW55 T3BlbkNvbm5lY3Rpb25zKCkgJiYgbV92ZXJzaW9uQ2hhbmdlT3BlcmF0aW9uKSB7CisgICAgICAg IHN0YXJ0VmVyc2lvbkNoYW5nZVRyYW5zYWN0aW9uKCk7CisgICAgICAgIHJldHVybjsKKyAgICB9 CisKKyAgICAvLyBGSVhNRTogSGFuZGxlIHN0YXJ0aW5nIG90aGVyIHBlbmRpbmcgdHJhbnNhY3Rp b25zIGhlcmUuCiB9CiAKIHZvaWQgVW5pcXVlSURCRGF0YWJhc2U6OnBlcmZvcm1FcnJvckNhbGxi YWNrKHVpbnQ2NF90IGNhbGxiYWNrSWRlbnRpZmllciwgY29uc3QgSURCRXJyb3ImIGVycm9yKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvc2VydmVyL1VuaXF1 ZUlEQkRhdGFiYXNlLmggYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIv VW5pcXVlSURCRGF0YWJhc2UuaAppbmRleCA0ZGNmMzA4Li5mNjI1YzA4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURCRGF0YWJhc2Uu aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL2luZGV4ZWRkYi9zZXJ2ZXIvVW5pcXVlSURC RGF0YWJhc2UuaApAQCAtMzIsNiArMzIsNyBAQAogI2luY2x1ZGUgIklEQkRhdGFiYXNlSWRlbnRp Zmllci5oIgogI2luY2x1ZGUgIklEQkRhdGFiYXNlSW5mby5oIgogI2luY2x1ZGUgIklEQlNlcnZl ck9wZXJhdGlvbi5oIgorI2luY2x1ZGUgIlRpbWVyLmgiCiAjaW5jbHVkZSAiVW5pcXVlSURCRGF0 YWJhc2VDb25uZWN0aW9uLmgiCiAjaW5jbHVkZSAiVW5pcXVlSURCRGF0YWJhc2VUcmFuc2FjdGlv bi5oIgogI2luY2x1ZGUgPHd0Zi9EZXF1ZS5oPgpAQCAtODksNiArOTAsOSBAQCBwcml2YXRlOgog CiAgICAgdm9pZCBwZXJmb3JtRXJyb3JDYWxsYmFjayh1aW50NjRfdCBjYWxsYmFja0lkZW50aWZp ZXIsIGNvbnN0IElEQkVycm9yJik7CiAKKyAgICB2b2lkIGludm9rZVRyYW5zYWN0aW9uU2NoZWR1 bGVyKCk7CisgICAgdm9pZCB0cmFuc2FjdGlvblNjaGVkdWxpbmdUaW1lckZpcmVkKCk7CisKICAg ICBJREJTZXJ2ZXImIG1fc2VydmVyOwogICAgIElEQkRhdGFiYXNlSWRlbnRpZmllciBtX2lkZW50 aWZpZXI7CiAgICAgCkBAIC0xMDUsNiArMTA5LDggQEAgcHJpdmF0ZToKICAgICBzdGQ6OnVuaXF1 ZV9wdHI8SURCRGF0YWJhc2VJbmZvPiBtX2RhdGFiYXNlSW5mbzsKIAogICAgIEhhc2hNYXA8dWlu dDY0X3QsIEVycm9yQ2FsbGJhY2s+IG1fZXJyb3JDYWxsYmFja3M7CisKKyAgICBUaW1lciBtX3Ry YW5zYWN0aW9uU2NoZWR1bGluZ1RpbWVyOwogfTsKIAogfSAvLyBuYW1lc3BhY2UgSURCU2VydmVy Cg==