142337 2015-03-05 05:09:40 -0800 Switch NetworkCacheStorage to WorkQueue abstraction 2015-03-05 09:06:22 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 koivisto webkit-unassigned commit-queue oldest_to_newest 1074484 0 koivisto 2015-03-05 05:09:40 -0800 Instead of using dispatch_async directly. 1074485 1 247947 koivisto 2015-03-05 05:15:25 -0800 Created attachment 247947 patch 1074528 2 247947 commit-queue 2015-03-05 09:06:19 -0800 Comment on attachment 247947 patch Clearing flags on attachment: 247947 Committed r181079: <http://trac.webkit.org/changeset/181079> 1074529 3 commit-queue 2015-03-05 09:06:22 -0800 All reviewed patches have been landed. Closing bug. 247947 2015-03-05 05:15:25 -0800 2015-03-05 09:06:19 -0800 patch disk-cache-workqueue.patch text/plain 10725 koivisto SW5kZXg6IFNvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cJKHJldmlzaW9uIDE4MTA3NSkKKysrIFNvdXJjZS9XZWJLaXQyL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDE1LTAzLTA1ICBBbnR0aSBL b2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KKworICAgICAgICBTd2l0Y2ggTmV0d29ya0NhY2hl U3RvcmFnZSB0byBXb3JrUXVldWUgYWJzdHJhY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0MjMzNworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIERvbid0IHVzZSBkaXNwYXRjaF9hc3luYyBkaXJlY3Rs eS4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2Uu aDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlU3RvcmFnZTo6aW9RdWV1ZSk6CisgICAg ICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZVN0b3JhZ2U6OmJhY2tncm91bmRJT1F1ZXVlKToKKyAg ICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlQ29jb2EubW06 CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZVN0b3JhZ2U6Ok5ldHdvcmtDYWNoZVN0b3Jh Z2UpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGVTdG9yYWdlOjppbml0aWFsaXplKToK KyAgICAgICAgKFdlYktpdDo6TmV0d29ya0NhY2hlU3RvcmFnZTo6cmVtb3ZlRW50cnkpOgorICAg ICAgICAoV2ViS2l0OjpOZXR3b3JrQ2FjaGVTdG9yYWdlOjpkaXNwYXRjaFJlYWRPcGVyYXRpb24p OgorICAgICAgICAoV2ViS2l0OjpyZXRyaWV2ZUZyb21NZW1vcnkpOgorICAgICAgICAoV2ViS2l0 OjpOZXR3b3JrQ2FjaGVTdG9yYWdlOjp0cmF2ZXJzZSk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdv cmtDYWNoZVN0b3JhZ2U6OmRpc3BhdGNoRnVsbFdyaXRlT3BlcmF0aW9uKToKKyAgICAgICAgKFdl YktpdDo6TmV0d29ya0NhY2hlU3RvcmFnZTo6ZGlzcGF0Y2hIZWFkZXJXcml0ZU9wZXJhdGlvbik6 CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtDYWNoZVN0b3JhZ2U6OmNsZWFyKToKKyAgICAgICAg KFdlYktpdDo6TmV0d29ya0NhY2hlU3RvcmFnZTo6c2hyaW5rSWZOZWVkZWQpOgorICAgICAgICAo V2ViS2l0OjpOZXR3b3JrQ2FjaGVTdG9yYWdlOjpkZWxldGVPbGRWZXJzaW9ucyk6CisKIDIwMTUt MDMtMDUgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0BpZ2FsaWEuY29tPgogCiAgICAg ICAgIFtTT1VQXSBEaXNhYmxlIFJDNApJbmRleDogU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nl c3MvY2FjaGUvTmV0d29ya0NhY2hlU3RvcmFnZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQyL05ldHdvcmtQcm9jZXNzL2NhY2hlL05ldHdvcmtDYWNoZVN0b3JhZ2UuaAkocmV2aXNpb24g MTgxMDI0KQorKysgU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2FjaGUvTmV0d29ya0Nh Y2hlU3RvcmFnZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zNCw2ICszNCw3IEBACiAjaW5jbHVkZSA8 d3RmL0RlcXVlLmg+CiAjaW5jbHVkZSA8d3RmL0hhc2hTZXQuaD4KICNpbmNsdWRlIDx3dGYvT3B0 aW9uYWwuaD4KKyNpbmNsdWRlIDx3dGYvV29ya1F1ZXVlLmg+CiAjaW5jbHVkZSA8d3RmL3RleHQv V1RGU3RyaW5nLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKQEAgLTEwMiw2ICsxMDMsOSBAQCBw cml2YXRlOgogICAgIHZvaWQgZGlzcGF0Y2hIZWFkZXJXcml0ZU9wZXJhdGlvbihjb25zdCBXcml0 ZU9wZXJhdGlvbiYpOwogICAgIHZvaWQgZGlzcGF0Y2hQZW5kaW5nV3JpdGVPcGVyYXRpb25zKCk7 CiAKKyAgICBXb3JrUXVldWUmIGlvUXVldWUoKSB7IHJldHVybiBtX2lvUXVldWUuZ2V0KCk7IH0K KyAgICBXb3JrUXVldWUmIGJhY2tncm91bmRJT1F1ZXVlKCkgeyByZXR1cm4gbV9iYWNrZ3JvdW5k SU9RdWV1ZS5nZXQoKTsgfQorCiAgICAgY29uc3QgU3RyaW5nIG1fYmFzZURpcmVjdG9yeVBhdGg7 CiAgICAgY29uc3QgU3RyaW5nIG1fZGlyZWN0b3J5UGF0aDsKIApAQCAtMTE4LDEwICsxMjIsOCBA QCBwcml2YXRlOgogICAgIERlcXVlPHN0ZDo6dW5pcXVlX3B0cjxjb25zdCBXcml0ZU9wZXJhdGlv bj4+IG1fcGVuZGluZ1dyaXRlT3BlcmF0aW9uczsKICAgICBIYXNoU2V0PHN0ZDo6dW5pcXVlX3B0 cjxjb25zdCBXcml0ZU9wZXJhdGlvbj4+IG1fYWN0aXZlV3JpdGVPcGVyYXRpb25zOwogCi0jaWYg UExBVEZPUk0oQ09DT0EpCi0gICAgbXV0YWJsZSBEaXNwYXRjaFB0cjxkaXNwYXRjaF9xdWV1ZV90 PiBtX2lvUXVldWU7Ci0gICAgbXV0YWJsZSBEaXNwYXRjaFB0cjxkaXNwYXRjaF9xdWV1ZV90PiBt X2JhY2tncm91bmRJT1F1ZXVlOwotI2VuZGlmCisgICAgUmVmPFdvcmtRdWV1ZT4gbV9pb1F1ZXVl OworICAgIFJlZjxXb3JrUXVldWU+IG1fYmFja2dyb3VuZElPUXVldWU7CiB9OwogCiB9CkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdl Q29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvY2Fj aGUvTmV0d29ya0NhY2hlU3RvcmFnZUNvY29hLm1tCShyZXZpc2lvbiAxODEwMjQpCisrKyBTb3Vy Y2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9jYWNoZS9OZXR3b3JrQ2FjaGVTdG9yYWdlQ29jb2Eu bW0JKHdvcmtpbmcgY29weSkKQEAgLTY5LDExICs2OSw5IEBAIHN0YXRpYyBTdHJpbmcgbWFrZVZl cnNpb25lZERpcmVjdG9yeVBhdGgKIE5ldHdvcmtDYWNoZVN0b3JhZ2U6Ok5ldHdvcmtDYWNoZVN0 b3JhZ2UoY29uc3QgU3RyaW5nJiBiYXNlRGlyZWN0b3J5UGF0aCkKICAgICA6IG1fYmFzZURpcmVj dG9yeVBhdGgoYmFzZURpcmVjdG9yeVBhdGgpCiAgICAgLCBtX2RpcmVjdG9yeVBhdGgobWFrZVZl cnNpb25lZERpcmVjdG9yeVBhdGgoYmFzZURpcmVjdG9yeVBhdGgpKQotICAgICwgbV9pb1F1ZXVl KGFkb3B0RGlzcGF0Y2goZGlzcGF0Y2hfcXVldWVfY3JlYXRlKCJjb20uYXBwbGUuV2ViS2l0LkNh Y2hlLlN0b3JhZ2UiLCBESVNQQVRDSF9RVUVVRV9DT05DVVJSRU5UKSkpCi0gICAgLCBtX2JhY2tn cm91bmRJT1F1ZXVlKGFkb3B0RGlzcGF0Y2goZGlzcGF0Y2hfcXVldWVfY3JlYXRlKCJjb20uYXBw bGUuV2ViS2l0LkNhY2hlLlN0b3JhZ2UuQmFja2dyb3VuZCIsIERJU1BBVENIX1FVRVVFX0NPTkNV UlJFTlQpKSkKKyAgICAsIG1faW9RdWV1ZShXb3JrUXVldWU6OmNyZWF0ZSgiY29tLmFwcGxlLldl YktpdC5DYWNoZS5TdG9yYWdlIiwgV29ya1F1ZXVlOjpUeXBlOjpDb25jdXJyZW50KSkKKyAgICAs IG1fYmFja2dyb3VuZElPUXVldWUoV29ya1F1ZXVlOjpjcmVhdGUoImNvbS5hcHBsZS5XZWJLaXQu Q2FjaGUuU3RvcmFnZSIsIFdvcmtRdWV1ZTo6VHlwZTo6Q29uY3VycmVudCwgV29ya1F1ZXVlOjpR T1M6OkJhY2tncm91bmQpKQogewotICAgIGRpc3BhdGNoX3NldF90YXJnZXRfcXVldWUobV9iYWNr Z3JvdW5kSU9RdWV1ZS5nZXQoKSwgZGlzcGF0Y2hfZ2V0X2dsb2JhbF9xdWV1ZShESVNQQVRDSF9R VUVVRV9QUklPUklUWV9CQUNLR1JPVU5ELCAwKSk7Ci0KICAgICBkZWxldGVPbGRWZXJzaW9ucygp OwogICAgIGluaXRpYWxpemUoKTsKIH0KQEAgLTg0LDE0ICs4MiwxNCBAQCB2b2lkIE5ldHdvcmtD YWNoZVN0b3JhZ2U6OmluaXRpYWxpemUoKQogCiAgICAgU3RyaW5nQ2FwdHVyZSBjYWNoZVBhdGhD YXB0dXJlKG1fZGlyZWN0b3J5UGF0aCk7CiAKLSAgICBkaXNwYXRjaF9hc3luYyhtX2JhY2tncm91 bmRJT1F1ZXVlLmdldCgpLCBbdGhpcywgY2FjaGVQYXRoQ2FwdHVyZV0geworICAgIGJhY2tncm91 bmRJT1F1ZXVlKCkuZGlzcGF0Y2goW3RoaXMsIGNhY2hlUGF0aENhcHR1cmVdIHsKICAgICAgICAg U3RyaW5nIGNhY2hlUGF0aCA9IGNhY2hlUGF0aENhcHR1cmUuc3RyaW5nKCk7CiAgICAgICAgIHRy YXZlcnNlQ2FjaGVGaWxlcyhjYWNoZVBhdGgsIFt0aGlzXShjb25zdCBTdHJpbmcmIGZpbGVOYW1l LCBjb25zdCBTdHJpbmcmIHBhcnRpdGlvblBhdGgpIHsKICAgICAgICAgICAgIE5ldHdvcmtDYWNo ZUtleTo6SGFzaFR5cGUgaGFzaDsKICAgICAgICAgICAgIGlmICghTmV0d29ya0NhY2hlS2V5Ojpz dHJpbmdUb0hhc2goZmlsZU5hbWUsIGhhc2gpKQogICAgICAgICAgICAgICAgIHJldHVybjsKICAg ICAgICAgICAgIHVuc2lnbmVkIHNob3J0SGFzaCA9IE5ldHdvcmtDYWNoZUtleTo6dG9TaG9ydEhh c2goaGFzaCk7Ci0gICAgICAgICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9x dWV1ZSgpLCBbdGhpcywgc2hvcnRIYXNoXSB7CisgICAgICAgICAgICBSdW5Mb29wOjptYWluKCku ZGlzcGF0Y2goW3RoaXMsIHNob3J0SGFzaF0gewogICAgICAgICAgICAgICAgIG1fY29udGVudHNG aWx0ZXIuYWRkKHNob3J0SGFzaCk7CiAgICAgICAgICAgICB9KTsKICAgICAgICAgICAgIGF1dG8g ZmlsZVBhdGggPSBXZWJDb3JlOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQocGFydGl0aW9uUGF0 aCwgZmlsZU5hbWUpOwpAQCAtMjkyLDcgKzI5MCw3IEBAIHZvaWQgTmV0d29ya0NhY2hlU3RvcmFn ZTo6cmVtb3ZlRW50cnkoY28KICAgICAgICAgbV9jb250ZW50c0ZpbHRlci5yZW1vdmUoa2V5LnNo b3J0SGFzaCgpKTsKIAogICAgIFN0cmluZ0NhcHR1cmUgZmlsZVBhdGhDYXB0dXJlKGZpbGVQYXRo Rm9yS2V5KGtleSwgbV9kaXJlY3RvcnlQYXRoKSk7Ci0gICAgZGlzcGF0Y2hfYXN5bmMobV9iYWNr Z3JvdW5kSU9RdWV1ZS5nZXQoKSwgW3RoaXMsIGZpbGVQYXRoQ2FwdHVyZV0geworICAgIGJhY2tn cm91bmRJT1F1ZXVlKCkuZGlzcGF0Y2goW3RoaXMsIGZpbGVQYXRoQ2FwdHVyZV0gewogICAgICAg ICBXZWJDb3JlOjpkZWxldGVGaWxlKGZpbGVQYXRoQ2FwdHVyZS5zdHJpbmcoKSk7CiAgICAgfSk7 CiB9CkBAIC0zMDMsMTAgKzMwMSw5IEBAIHZvaWQgTmV0d29ya0NhY2hlU3RvcmFnZTo6ZGlzcGF0 Y2hSZWFkT3AKICAgICBBU1NFUlQobV9hY3RpdmVSZWFkT3BlcmF0aW9ucy5jb250YWlucygmcmVh ZCkpOwogCiAgICAgU3RyaW5nQ2FwdHVyZSBjYWNoZVBhdGhDYXB0dXJlKG1fZGlyZWN0b3J5UGF0 aCk7Ci0gICAgZGlzcGF0Y2hfYXN5bmMobV9pb1F1ZXVlLmdldCgpLCBbdGhpcywgJnJlYWQsIGNh Y2hlUGF0aENhcHR1cmVdIHsKKyAgICBpb1F1ZXVlKCkuZGlzcGF0Y2goW3RoaXMsICZyZWFkLCBj YWNoZVBhdGhDYXB0dXJlXSB7CiAgICAgICAgIGF1dG8gY2hhbm5lbCA9IG9wZW5GaWxlRm9yS2V5 KHJlYWQua2V5LCBOZXR3b3JrQ2FjaGVJT0NoYW5uZWw6OlR5cGU6OlJlYWQsIGNhY2hlUGF0aENh cHR1cmUuc3RyaW5nKCkpOwogICAgICAgICBpbnQgZmQgPSBjaGFubmVsLT5maWxlRGVzY3JpcHRv cigpOwotCiAgICAgICAgIGNoYW5uZWwtPnJlYWQoMCwgc3RkOjpudW1lcmljX2xpbWl0czxzaXpl X3Q+OjptYXgoKSwgW3RoaXMsICZyZWFkLCBmZF0oTmV0d29ya0NhY2hlRGF0YSYgZmlsZURhdGEs IGludCBlcnJvcikgewogICAgICAgICAgICAgaWYgKGVycm9yKSB7CiAgICAgICAgICAgICAgICAg cmVtb3ZlRW50cnkocmVhZC5rZXkpOwpAQCAtMzU0LDcgKzM1MSw3IEBAIHRlbXBsYXRlIDxjbGFz cyBUPiBib29sIHJldHJpZXZlRnJvbU1lbW8KICAgICAgICAgaWYgKG9wZXJhdGlvbi0+ZW50cnku a2V5ID09IGtleSkgewogICAgICAgICAgICAgTE9HKE5ldHdvcmtDYWNoZVN0b3JhZ2UsICIoTmV0 d29ya1Byb2Nlc3MpIGZvdW5kIHdyaXRlIG9wZXJhdGlvbiBpbiBwcm9ncmVzcyIpOwogICAgICAg ICAgICAgYXV0byBlbnRyeSA9IG9wZXJhdGlvbi0+ZW50cnk7Ci0gICAgICAgICAgICBkaXNwYXRj aF9hc3luYyhkaXNwYXRjaF9nZXRfbWFpbl9xdWV1ZSgpLCBbZW50cnksIGNvbXBsZXRpb25IYW5k bGVyXSB7CisgICAgICAgICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW2VudHJ5LCBjb21w bGV0aW9uSGFuZGxlcl0gewogICAgICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKHN0ZDo6 bWFrZV91bmlxdWU8TmV0d29ya0NhY2hlU3RvcmFnZTo6RW50cnk+KGVudHJ5KSk7CiAgICAgICAg ICAgICB9KTsKICAgICAgICAgICAgIHJldHVybiB0cnVlOwpAQCAtNDI1LDcgKzQyMiw3IEBAIHZv aWQgTmV0d29ya0NhY2hlU3RvcmFnZTo6dXBkYXRlKGNvbnN0IEUKIHZvaWQgTmV0d29ya0NhY2hl U3RvcmFnZTo6dHJhdmVyc2Uoc3RkOjpmdW5jdGlvbjx2b2lkIChjb25zdCBFbnRyeSopPiYmIHRy YXZlcnNlSGFuZGxlcikKIHsKICAgICBTdHJpbmdDYXB0dXJlIGNhY2hlUGF0aENhcHR1cmUobV9k aXJlY3RvcnlQYXRoKTsKLSAgICBkaXNwYXRjaF9hc3luYyhtX2lvUXVldWUuZ2V0KCksIFt0aGlz LCBjYWNoZVBhdGhDYXB0dXJlLCB0cmF2ZXJzZUhhbmRsZXJdIHsKKyAgICBpb1F1ZXVlKCkuZGlz cGF0Y2goW3RoaXMsIGNhY2hlUGF0aENhcHR1cmUsIHRyYXZlcnNlSGFuZGxlcl0gewogICAgICAg ICBTdHJpbmcgY2FjaGVQYXRoID0gY2FjaGVQYXRoQ2FwdHVyZS5zdHJpbmcoKTsKICAgICAgICAg YXV0byBzZW1hcGhvcmUgPSBhZG9wdERpc3BhdGNoKGRpc3BhdGNoX3NlbWFwaG9yZV9jcmVhdGUo MCkpOwogICAgICAgICB0cmF2ZXJzZUNhY2hlRmlsZXMoY2FjaGVQYXRoLCBbdGhpcywgJnNlbWFw aG9yZSwgJnRyYXZlcnNlSGFuZGxlcl0oY29uc3QgU3RyaW5nJiBmaWxlTmFtZSwgY29uc3QgU3Ry aW5nJiBwYXJ0aXRpb25QYXRoKSB7CkBAIC00NDMsNyArNDQwLDcgQEAgdm9pZCBOZXR3b3JrQ2Fj aGVTdG9yYWdlOjp0cmF2ZXJzZShzdGQ6OgogICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICBk aXNwYXRjaF9zZW1hcGhvcmVfd2FpdChzZW1hcGhvcmUuZ2V0KCksIERJU1BBVENIX1RJTUVfRk9S RVZFUik7CiAgICAgICAgIH0pOwotICAgICAgICBkaXNwYXRjaF9hc3luYyhkaXNwYXRjaF9nZXRf bWFpbl9xdWV1ZSgpLCBbdGhpcywgdHJhdmVyc2VIYW5kbGVyXSB7CisgICAgICAgIFJ1bkxvb3A6 Om1haW4oKS5kaXNwYXRjaChbdGhpcywgdHJhdmVyc2VIYW5kbGVyXSB7CiAgICAgICAgICAgICB0 cmF2ZXJzZUhhbmRsZXIobnVsbHB0cik7CiAgICAgICAgIH0pOwogICAgIH0pOwpAQCAtNDgxLDcg KzQ3OCw3IEBAIHZvaWQgTmV0d29ya0NhY2hlU3RvcmFnZTo6ZGlzcGF0Y2hGdWxsV3IKICAgICAg ICAgbV9jb250ZW50c0ZpbHRlci5hZGQod3JpdGUuZW50cnkua2V5LnNob3J0SGFzaCgpKTsKIAog ICAgIFN0cmluZ0NhcHR1cmUgY2FjaGVQYXRoQ2FwdHVyZShtX2RpcmVjdG9yeVBhdGgpOwotICAg IGRpc3BhdGNoX2FzeW5jKG1fYmFja2dyb3VuZElPUXVldWUuZ2V0KCksIFt0aGlzLCAmd3JpdGUs IGNhY2hlUGF0aENhcHR1cmVdIHsKKyAgICBiYWNrZ3JvdW5kSU9RdWV1ZSgpLmRpc3BhdGNoKFt0 aGlzLCAmd3JpdGUsIGNhY2hlUGF0aENhcHR1cmVdIHsKICAgICAgICAgYXV0byBlbmNvZGVkSGVh ZGVyID0gZW5jb2RlRW50cnlIZWFkZXIod3JpdGUuZW50cnkpOwogICAgICAgICBhdXRvIGhlYWRl ckFuZEJvZHlEYXRhID0gYWRvcHREaXNwYXRjaChkaXNwYXRjaF9kYXRhX2NyZWF0ZV9jb25jYXQo ZW5jb2RlZEhlYWRlci5kaXNwYXRjaERhdGEoKSwgd3JpdGUuZW50cnkuYm9keS5kaXNwYXRjaERh dGEoKSkpOwogCkBAIC01MjYsMTQgKzUyMywxNCBAQCB2b2lkIE5ldHdvcmtDYWNoZVN0b3JhZ2U6 OmRpc3BhdGNoSGVhZGVyCiAKICAgICAvLyBUcnkgdG8gdXBkYXRlIHRoZSBoZWFkZXIgb2YgYW4g ZXhpc3RpbmcgZW50cnkuCiAgICAgU3RyaW5nQ2FwdHVyZSBjYWNoZVBhdGhDYXB0dXJlKG1fZGly ZWN0b3J5UGF0aCk7Ci0gICAgZGlzcGF0Y2hfYXN5bmMobV9iYWNrZ3JvdW5kSU9RdWV1ZS5nZXQo KSwgW3RoaXMsICZ3cml0ZSwgY2FjaGVQYXRoQ2FwdHVyZV0geworICAgIGJhY2tncm91bmRJT1F1 ZXVlKCkuZGlzcGF0Y2goW3RoaXMsICZ3cml0ZSwgY2FjaGVQYXRoQ2FwdHVyZV0gewogICAgICAg ICBhdXRvIGhlYWRlckRhdGEgPSBlbmNvZGVFbnRyeUhlYWRlcih3cml0ZS5lbnRyeSk7CiAgICAg ICAgIGF1dG8gZXhpc3RpbmdIZWFkZXJEYXRhID0gZW5jb2RlRW50cnlIZWFkZXIod3JpdGUuZXhp c3RpbmdFbnRyeS52YWx1ZSgpKTsKIAogICAgICAgICBib29sIHBhZ2VSb3VuZGVkSGVhZGVyU2l6 ZUNoYW5nZWQgPSBoZWFkZXJEYXRhLnNpemUoKSAhPSBleGlzdGluZ0hlYWRlckRhdGEuc2l6ZSgp OwogICAgICAgICBpZiAocGFnZVJvdW5kZWRIZWFkZXJTaXplQ2hhbmdlZCkgewogICAgICAgICAg ICAgTE9HKE5ldHdvcmtDYWNoZVN0b3JhZ2UsICIoTmV0d29ya1Byb2Nlc3MpIHBhZ2Utcm91bmRl ZCBoZWFkZXIgc2l6ZSBjaGFuZ2VkLCBzdG9yaW5nIGZ1bGwgZW50cnkiKTsKLSAgICAgICAgICAg IGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVlKCksIFt0aGlzLCAmd3JpdGVd IHsKKyAgICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNwYXRjaChbdGhpcywgJndyaXRlXSB7 CiAgICAgICAgICAgICAgICAgZGlzcGF0Y2hGdWxsV3JpdGVPcGVyYXRpb24od3JpdGUpOwogICAg ICAgICAgICAgfSk7CiAgICAgICAgICAgICByZXR1cm47CkBAIC01NzMsNyArNTcwLDcgQEAgdm9p ZCBOZXR3b3JrQ2FjaGVTdG9yYWdlOjpjbGVhcigpCiAKICAgICBTdHJpbmdDYXB0dXJlIGRpcmVj dG9yeVBhdGhDYXB0dXJlKG1fZGlyZWN0b3J5UGF0aCk7CiAKLSAgICBkaXNwYXRjaF9hc3luYyht X2lvUXVldWUuZ2V0KCksIFtkaXJlY3RvcnlQYXRoQ2FwdHVyZV0geworICAgIGlvUXVldWUoKS5k aXNwYXRjaChbZGlyZWN0b3J5UGF0aENhcHR1cmVdIHsKICAgICAgICAgU3RyaW5nIGRpcmVjdG9y eVBhdGggPSBkaXJlY3RvcnlQYXRoQ2FwdHVyZS5zdHJpbmcoKTsKICAgICAgICAgdHJhdmVyc2VE aXJlY3RvcnkoZGlyZWN0b3J5UGF0aCwgRFRfRElSLCBbJmRpcmVjdG9yeVBhdGhdKGNvbnN0IFN0 cmluZyYgc3ViZGlyTmFtZSkgewogICAgICAgICAgICAgU3RyaW5nIHN1YmRpclBhdGggPSBXZWJD b3JlOjpwYXRoQnlBcHBlbmRpbmdDb21wb25lbnQoZGlyZWN0b3J5UGF0aCwgc3ViZGlyTmFtZSk7 CkBAIC02MDIsNyArNTk5LDcgQEAgdm9pZCBOZXR3b3JrQ2FjaGVTdG9yYWdlOjpzaHJpbmtJZk5l ZWRlZAogICAgIG1fYXBwcm94aW1hdGVTaXplID0gMDsKIAogICAgIFN0cmluZ0NhcHR1cmUgY2Fj aGVQYXRoQ2FwdHVyZShtX2RpcmVjdG9yeVBhdGgpOwotICAgIGRpc3BhdGNoX2FzeW5jKG1fYmFj a2dyb3VuZElPUXVldWUuZ2V0KCksIFt0aGlzLCBjYWNoZVBhdGhDYXB0dXJlXSB7CisgICAgYmFj a2dyb3VuZElPUXVldWUoKS5kaXNwYXRjaChbdGhpcywgY2FjaGVQYXRoQ2FwdHVyZV0gewogICAg ICAgICBTdHJpbmcgY2FjaGVQYXRoID0gY2FjaGVQYXRoQ2FwdHVyZS5zdHJpbmcoKTsKICAgICAg ICAgdHJhdmVyc2VDYWNoZUZpbGVzKGNhY2hlUGF0aCwgW3RoaXNdKGNvbnN0IFN0cmluZyYgZmls ZU5hbWUsIGNvbnN0IFN0cmluZyYgcGFydGl0aW9uUGF0aCkgewogICAgICAgICAgICAgYXV0byBm aWxlUGF0aCA9IFdlYkNvcmU6OnBhdGhCeUFwcGVuZGluZ0NvbXBvbmVudChwYXJ0aXRpb25QYXRo LCBmaWxlTmFtZSk7CkBAIC02MjAsNyArNjE3LDcgQEAgdm9pZCBOZXR3b3JrQ2FjaGVTdG9yYWdl OjpzaHJpbmtJZk5lZWRlZAogICAgICAgICAgICAgaWYgKCFOZXR3b3JrQ2FjaGVLZXk6OnN0cmlu Z1RvSGFzaChmaWxlTmFtZSwgaGFzaCkpCiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAg ICAgICAgdW5zaWduZWQgc2hvcnRIYXNoID0gTmV0d29ya0NhY2hlS2V5Ojp0b1Nob3J0SGFzaCho YXNoKTsKLSAgICAgICAgICAgIGRpc3BhdGNoX2FzeW5jKGRpc3BhdGNoX2dldF9tYWluX3F1ZXVl KCksIFt0aGlzLCBzaG9ydEhhc2hdIHsKKyAgICAgICAgICAgIFJ1bkxvb3A6Om1haW4oKS5kaXNw YXRjaChbdGhpcywgc2hvcnRIYXNoXSB7CiAgICAgICAgICAgICAgICAgaWYgKG1fY29udGVudHNG aWx0ZXIubWF5Q29udGFpbihzaG9ydEhhc2gpKQogICAgICAgICAgICAgICAgICAgICBtX2NvbnRl bnRzRmlsdGVyLnJlbW92ZShzaG9ydEhhc2gpOwogICAgICAgICAgICAgfSk7CkBAIC02NDIsNyAr NjM5LDcgQEAgdm9pZCBOZXR3b3JrQ2FjaGVTdG9yYWdlOjpkZWxldGVPbGRWZXJzaQogewogICAg IC8vIERlbGV0ZSBWMSBjYWNoZS4KICAgICBTdHJpbmdDYXB0dXJlIGNhY2hlUGF0aENhcHR1cmUo bV9iYXNlRGlyZWN0b3J5UGF0aCk7Ci0gICAgZGlzcGF0Y2hfYXN5bmMobV9iYWNrZ3JvdW5kSU9R dWV1ZS5nZXQoKSwgW2NhY2hlUGF0aENhcHR1cmVdIHsKKyAgICBiYWNrZ3JvdW5kSU9RdWV1ZSgp LmRpc3BhdGNoKFtjYWNoZVBhdGhDYXB0dXJlXSB7CiAgICAgICAgIFN0cmluZyBjYWNoZVBhdGgg PSBjYWNoZVBhdGhDYXB0dXJlLnN0cmluZygpOwogICAgICAgICB0cmF2ZXJzZURpcmVjdG9yeShj YWNoZVBhdGgsIERUX0RJUiwgWyZjYWNoZVBhdGhdKGNvbnN0IFN0cmluZyYgc3ViZGlyTmFtZSkg ewogICAgICAgICAgICAgaWYgKHN1YmRpck5hbWUuc3RhcnRzV2l0aCh2ZXJzaW9uRGlyZWN0b3J5 UHJlZml4KSkK