208463 2020-03-02 12:34:39 -0800 Annotate editable elements with hit test order 2020-03-25 13:55:18 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Local Build iPhone / iPad iOS 13 RESOLVED FIXED InRadar P2 Normal --- 209561 1 dbates dbates cdumez esprehn+autocc ews-watchlist kangil.han webkit-bug-importer wenson_hsieh oldest_to_newest 1624670 0 dbates 2020-03-02 12:34:39 -0800 Until <rdar://problem/59737118> is fixed, annotate editable elements with their paint order towards fixing <rdar://problem/59602885>. 1624671 1 webkit-bug-importer 2020-03-02 12:34:51 -0800 <rdar://problem/59962843> 1624692 2 392176 dbates 2020-03-02 13:01:52 -0800 Created attachment 392176 Patch 1624712 3 392176 dbates 2020-03-02 13:25:11 -0800 Comment on attachment 392176 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=392176&action=review > Source/WebKit/UIProcess/API/Cocoa/_WKTextInputContextInternal.h:39 > +- (NSUInteger)_paintOrder; Should be @property 1624716 4 392179 dbates 2020-03-02 13:26:20 -0800 Created attachment 392179 Patch 1624739 5 392179 wenson_hsieh 2020-03-02 14:21:31 -0800 Comment on attachment 392179 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=392179&action=review > Source/WebKit/WebProcess/WebPage/WebPage.cpp:6834 > + context.paintOrder = count++; Nit: IMO, "hitTestingOrder" would be a more relevant name, since this index is directly influenced by the order of elements as they are hit-tested (which, in turn, depends on their painting order). 1624837 6 392215 dbates 2020-03-02 16:58:21 -0800 Created attachment 392215 To land 1624838 7 dbates 2020-03-02 16:59:18 -0800 Committed r257749: <https://trac.webkit.org/changeset/257749> 392176 2020-03-02 13:01:52 -0800 2020-03-02 13:26:18 -0800 Patch bug-208463-20200302130151.patch text/plain 7561 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3NjQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDMyM2YzMmE2MDY0ODk1 NTMyZDg4MDkyOTRiYjI1N2ZlNWRjOThkZS4uZWJiNGI1ZGM0OThmMmU3YmU5MDBjNDRlMDMzNWE2 NTY4MjhhYTBhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTAzLTAyICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBBbm5vdGF0ZSBlZGl0YWJs ZSBlbGVtZW50cyB3aXRoIHBhaW50IG9yZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg0NjMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU5OTYy ODQzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVu dGlsIDxyZGFyOi8vcHJvYmxlbS81OTczNzExOD4gaXMgZml4ZWQsIGFubm90YXRlIGVkaXRhYmxl IGVsZW1lbnRzIHdpdGggdGhlaXIgcGFpbnQgb3JkZXIKKyAgICAgICAgdG93YXJkcyBmaXhpbmcg PHJkYXI6Ly9wcm9ibGVtLzU5NjAyODg1Pi4KKworICAgICAgICAqIGRvbS9FbGVtZW50Q29udGV4 dC5oOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudENvbnRleHQ6OmVuY29kZSBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpFbGVtZW50Q29udGV4dDo6ZGVjb2RlKToKKyAgICAgICAgRW5jb2Rl IGFuZCBkZWNvZGUgdGhlIG9wdGlvbmFsIHBhaW50IG9yZGVyLgorCiAyMDIwLTAzLTAxICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBQYWdlOjplZGl0YWJsZUVs ZW1lbnRzSW5SZWN0KCkgc2hvdWxkIGZpbmQgbmVzdGVkIGVkaXRhYmxlIGVsZW1lbnRzIGFuZCBy ZXR1cm4gZm91bmQgZWxlbWVudHMgaW4gcGFpbnQgb3JkZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggOGEyOTNlNjYz NzM5YmM4MjQ2MTllNTYzODBhNDlmODJiODNhMzFkZC4uMTg4ZWJiN2VkNTgyYjZhY2ZlNTk1ODBj ODdmZDYzYjlmODcwZTlmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMyBAQAorMjAyMC0wMy0wMiAg RGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CisKKyAgICAgICAgQW5ub3RhdGUgZWRp dGFibGUgZWxlbWVudHMgd2l0aCBwYWludCBvcmRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4NDYzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81 OTk2Mjg0Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBVbnRpbCA8cmRhcjovL3Byb2JsZW0vNTk3MzcxMTg+IGlzIGZpeGVkLCBhbm5vdGF0ZSBlZGl0 YWJsZSBlbGVtZW50cyB3aXRoIHRoZWlyIHBhaW50IG9yZGVyCisgICAgICAgIHRvd2FyZHMgZml4 aW5nIDxyZGFyOi8vcHJvYmxlbS81OTYwMjg4NT4uIE9ubHkgZWxlbWVudCBjb250ZXh0cyBjcmVh dGVkIGFzIGEgcmVzdWx0IG9mCisgICAgICAgIGNhbGxpbmcgV2ViUGFnZTo6dGV4dElucHV0Q29u dGV4dHNJblJlY3QoKSBoYXZlIGEgbWVhbmluZ2Z1bCBwYWludCBvcmRlci4KKworICAgICAgICBO b3RlIHRoYXQgdGhlIHBhaW50IG9yZGVyIG9mIGFuIGVsZW1lbnQgY2FuIG9ubHkgYmUgbWVhbmlu Z2Z1bGx5IGNvbXBhcmVkIHRvIHRoZSBwYWludCBvcmRlcgorICAgICAgICBvZiBvdGhlciBlbGVt ZW50cyByZXR1cm5lZCBpbiB0aGUgc2FtZSBpbnZvY2F0aW9uIG9mIFdlYlBhZ2U6OnRleHRJbnB1 dENvbnRleHRzSW5SZWN0KCkuIFRoYXQKKyAgICAgICAgaXMsIHRoZSBwYWludCBvcmRlciBpcyBu b3QgcmVuZGVyIHRyZWUtdW5pcXVlLiBTbywgdGhlIHNhbWUgZWxlbWVudCByZXR1cm5lZCBieSB0 d28gZGlmZmVyZW50CisgICAgICAgIGludm9jYXRpb25zIG9mIFdlYlBhZ2U6OnRleHRJbnB1dENv bnRleHRzSW5SZWN0KCkgY2Fubm90IGJlIGNvbXBhcmVkIHRvIGFueSBvdGhlciBlbGVtZW50Cisg ICAgICAgIG91dHNpZGUgb2YgdGhlIGxpc3QgaXQgd2FzIHJldHVybmVkIGluIGV2ZW4gaWYgaXRz IHBhaW50IG9yZGVyIGlzIHRoZSBzYW1lIGluIGJvdGggbGlzdHMuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0NvY29hL19XS1RleHRJbnB1dENvbnRleHQubW06CisgICAgICAgICgtW19XS1Rl eHRJbnB1dENvbnRleHQgX3BhaW50T3JkZXJdKTogQWRkZWQuIElmIHRoZSBjb250ZXh0IGRvZXMg bm90IGhhdmUgYSBwYWludCBvcmRlcgorICAgICAgICAoZS5nLiByZXR1cm5lZCBmb3JtIFdlYlBh Z2U6OmNvbnRleHRGb3JFbGVtZW50KCkpIHRoZW4gSSBjaG9zZSB0byByZXR1cm4gMCDigJMgdHJl YXQgaXQgYXMgdGhlCisgICAgICAgIGZyb250bW9zdCBlbGVtZW50LgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvQ29jb2EvX1dLVGV4dElucHV0Q29udGV4dEludGVybmFsLmg6CisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl Ojp0ZXh0SW5wdXRDb250ZXh0c0luUmVjdCk6IEFzc2lnbiBlYWNoIGVsZW1lbnQncyBwYWludCBv cmRlci4gRm9sbG93aW5nIHIyNTc3MjIKKyAgICAgICAgdGhlIGVsZW1lbnRzIGFyZSBhbHJlYWR5 IG9yZGVyZWQgYnkgcGFpbnQgb3JkZXIgKGZyb250bW9zdCB0byBiYWNrbW9zdCkuIFNvLCB3ZSBj YW4gc2ltcGx5IGFzc2lnbgorICAgICAgICBtb25vdG9uaWNhbGx5IGluY3JlYXNpbmcgbnVtYmVy cy4KKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6Y29udGV4dEZvckVsZW1lbnQgY29uc3QpOiBQ YXNzIFdURjo6bnVsbG9wdCBmb3IgdGhlIHBhaW50IG9yZGVyIGFzIEkgZG8gbm90CisgICAgICAg IGhhdmUgYSBuZWVkIHRvIHN1cHBvcnQgcGFpbnQgb3JkZXIgZm9yIGluZGl2aWR1YWwgZWxlbWVu dHMuCisKIDIwMTktMDktMTMgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAg ICAgICAgIFN1cHBvcnQgYnVpbGRpbmcgV2ViS2l0IGZvciBNYWMgQ2F0YWx5c3QgZnJvbSBYY29k ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnRDb250ZXh0LmggYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vRWxlbWVudENvbnRleHQuaAppbmRleCA2ODliMDYxMGFiZTI3YzE4NjE1 OWI5NDBiNDVjMjdlMDFiM2NmNzVkLi40NjIyNzIxZmE3MzZhZGQ4MzA1ZmRkN2ZiNDljZTc5NTIz MjZkMzQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudENvbnRleHQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudENvbnRleHQuaApAQCAtMzUsNiArMzUsMTAg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogc3RydWN0IEVsZW1lbnRDb250ZXh0IHsKICAgICBGbG9h dFJlY3QgYm91bmRpbmdSZWN0OwogCisgICAgLy8gTG93ZXIgb3JkaW5hbCBtZWFucyB0aGUgZWxl bWVudCBpcyB2aXN1YWxseSBjbG9zZXIgdG8gYSBwZXJzb24ncyBmYWNlLgorICAgIC8vIEZJWE1F OiBSZW1vdmUgdGhpcyBvbmNlIDxyZGFyOi8vcHJvYmxlbS81OTczNzExOD4gaXMgZml4ZWQuCisg ICAgT3B0aW9uYWw8dW5zaWduZWQ+IHBhaW50T3JkZXI7CisKICAgICBQYWdlSWRlbnRpZmllciB3 ZWJQYWdlSWRlbnRpZmllcjsKICAgICBEb2N1bWVudElkZW50aWZpZXIgZG9jdW1lbnRJZGVudGlm aWVyOwogICAgIEVsZW1lbnRJZGVudGlmaWVyIGVsZW1lbnRJZGVudGlmaWVyOwpAQCAtNTgsNiAr NjIsNyBAQCBpbmxpbmUgYm9vbCBvcGVyYXRvcj09KGNvbnN0IEVsZW1lbnRDb250ZXh0JiBhLCBj b25zdCBFbGVtZW50Q29udGV4dCYgYikKIHRlbXBsYXRlPGNsYXNzIEVuY29kZXI+CiB2b2lkIEVs ZW1lbnRDb250ZXh0OjplbmNvZGUoRW5jb2RlciYgZW5jb2RlcikgY29uc3QKIHsKKyAgICBlbmNv ZGVyIDw8IHBhaW50T3JkZXI7CiAgICAgZW5jb2RlciA8PCBib3VuZGluZ1JlY3Q7CiAgICAgZW5j b2RlciA8PCB3ZWJQYWdlSWRlbnRpZmllcjsKICAgICBlbmNvZGVyIDw8IGRvY3VtZW50SWRlbnRp ZmllcjsKQEAgLTY5LDYgKzc0LDkgQEAgT3B0aW9uYWw8RWxlbWVudENvbnRleHQ+IEVsZW1lbnRD b250ZXh0OjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlcikKIHsKICAgICBFbGVtZW50Q29udGV4dCBj b250ZXh0OwogCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShjb250ZXh0LnBhaW50T3JkZXIpKQor ICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OworCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShj b250ZXh0LmJvdW5kaW5nUmVjdCkpCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tUZXh0SW5wdXRD b250ZXh0Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1RleHRJbnB1 dENvbnRleHQubW0KaW5kZXggN2ViNjVkMDAwOWZhOTc4YjMwYjE1YzJlZDg3YmIwODBlOTU5ZjMz Mi4uNjlhMzRhMTlmNmEzNzNhNGQwMmQ5YTFjOWQ5NGY1ODZhMTZiODdjYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1RleHRJbnB1dENvbnRleHQubW0K KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1RleHRJbnB1dENvbnRl eHQubW0KQEAgLTU0LDYgKzU0LDEyIEBAIC0gKENHUmVjdClib3VuZGluZ1JlY3QKICAgICByZXR1 cm4gX3RleHRJbnB1dENvbnRleHQuYm91bmRpbmdSZWN0OwogfQogCistIChOU1VJbnRlZ2VyKV9w YWludE9yZGVyCit7CisgICAgLy8gQWxsIGVsZW1lbnRzIHRoYXQgZG8gbm90IGhhdmUgYSBwYWlu dCBvcmRlciBhcmUgY29uc2lkZXJlZCBmcm9udG1vc3QuCisgICAgcmV0dXJuIF90ZXh0SW5wdXRD b250ZXh0LnBhaW50T3JkZXIudmFsdWVPcigwKTsKK30KKwogLSAoY29uc3QgV2ViQ29yZTo6RWxl bWVudENvbnRleHQmKV90ZXh0SW5wdXRDb250ZXh0CiB7CiAgICAgcmV0dXJuIF90ZXh0SW5wdXRD b250ZXh0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19X S1RleHRJbnB1dENvbnRleHRJbnRlcm5hbC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0NvY29hL19XS1RleHRJbnB1dENvbnRleHRJbnRlcm5hbC5oCmluZGV4IDhmNjdmYzI5ZWExOTAx OWUzODEzN2FjN2Y3NmMwOWFlZGM5YTg1YWUuLmEyOTFhZTMyY2E0MzA0N2NkYTRhNmM4YzM2Yjkw OGU1NzBjZGIxMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9fV0tUZXh0SW5wdXRDb250ZXh0SW50ZXJuYWwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvX1dLVGV4dElucHV0Q29udGV4dEludGVybmFsLmgKQEAgLTM1LDQgKzM1 LDcgQEAgc3RydWN0IEVsZW1lbnRDb250ZXh0OwogCiAtIChjb25zdCBXZWJDb3JlOjpFbGVtZW50 Q29udGV4dCYpX3RleHRJbnB1dENvbnRleHQ7CiAKKy8vIExvd2VyIG9yZGluYWwgbWVhbnMgdGhl IGVsZW1lbnQgaXMgdmlzdWFsbHkgY2xvc2VyIHRvIGEgcGVyc29uJ3MgZmFjZS4KKy0gKE5TVUlu dGVnZXIpX3BhaW50T3JkZXI7CisKIEBlbmQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5jcHAKaW5kZXggMDE4YTM2MWZiYzk5NWI5MTA2YWFjYTVmNWZkZGExNWJi Yzk2ZWZiNC4uY2E1OTBjMzNkMzVkMGE5NGY5MjFlOTFiYTQzZmI5NzBhM2EzMDY2NCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTY4MjIsNiAr NjgyMiw3IEBAIHZvaWQgV2ViUGFnZTo6dXBkYXRlSW5wdXRDb250ZXh0QWZ0ZXJCbHVycmluZ0Fu ZFJlZm9jdXNpbmdFbGVtZW50SWZOZWVkZWQoRWxlbWVuCiAKIHZvaWQgV2ViUGFnZTo6dGV4dElu cHV0Q29udGV4dHNJblJlY3QoV2ViQ29yZTo6RmxvYXRSZWN0IHNlYXJjaFJlY3QsIENvbXBsZXRp b25IYW5kbGVyPHZvaWQoY29uc3QgVmVjdG9yPFdlYkNvcmU6OkVsZW1lbnRDb250ZXh0PiYpPiYm IGNvbXBsZXRpb25IYW5kbGVyKQogeworICAgIHVuc2lnbmVkIGNvdW50ID0gMTsgLy8gWmVybyBp cyByZXNlcnZlZCBmb3IgX1dLVGV4dElucHV0Q29udGV4dCBvYmplY3RzIHRoYXQgZG8gbm90IGhh dmUgYSBwYWludCBvcmRlci4KICAgICBhdXRvIGNvbnRleHRzID0gbV9wYWdlLT5lZGl0YWJsZUVs ZW1lbnRzSW5SZWN0KHNlYXJjaFJlY3QpLm1hcChbJl0gKGNvbnN0IGF1dG8mIGVsZW1lbnQpIHsK ICAgICAgICAgYXV0byYgZG9jdW1lbnQgPSBlbGVtZW50LT5kb2N1bWVudCgpOwogCkBAIC02ODMw LDYgKzY4MzEsNyBAQCB2b2lkIFdlYlBhZ2U6OnRleHRJbnB1dENvbnRleHRzSW5SZWN0KFdlYkNv cmU6OkZsb2F0UmVjdCBzZWFyY2hSZWN0LCBDb21wbGV0aW9uSAogICAgICAgICBjb250ZXh0LmRv Y3VtZW50SWRlbnRpZmllciA9IGRvY3VtZW50LmlkZW50aWZpZXIoKTsKICAgICAgICAgY29udGV4 dC5lbGVtZW50SWRlbnRpZmllciA9IGRvY3VtZW50LmlkZW50aWZpZXJGb3JFbGVtZW50KGVsZW1l bnQpOwogICAgICAgICBjb250ZXh0LmJvdW5kaW5nUmVjdCA9IGVsZW1lbnQtPmNsaWVudFJlY3Qo KTsKKyAgICAgICAgY29udGV4dC5wYWludE9yZGVyID0gY291bnQrKzsKICAgICAgICAgcmV0dXJu IGNvbnRleHQ7CiAgICAgfSk7CiAgICAgY29tcGxldGlvbkhhbmRsZXIoY29udGV4dHMpOwpAQCAt Njg3Nyw3ICs2ODc5LDcgQEAgT3B0aW9uYWw8V2ViQ29yZTo6RWxlbWVudENvbnRleHQ+IFdlYlBh Z2U6OmNvbnRleHRGb3JFbGVtZW50KFdlYkNvcmU6OkVsZW1lbnQmIGUKICAgICBpZiAoIWZyYW1l KQogICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OwogCi0gICAgcmV0dXJuIFdlYkNvcmU6OkVs ZW1lbnRDb250ZXh0IHsgZWxlbWVudC5jbGllbnRSZWN0KCksIG1faWRlbnRpZmllciwgZG9jdW1l bnQuaWRlbnRpZmllcigpLCBkb2N1bWVudC5pZGVudGlmaWVyRm9yRWxlbWVudChlbGVtZW50KSB9 OworICAgIHJldHVybiBXZWJDb3JlOjpFbGVtZW50Q29udGV4dCB7IGVsZW1lbnQuY2xpZW50UmVj dCgpLCBXVEY6Om51bGxvcHQsIG1faWRlbnRpZmllciwgZG9jdW1lbnQuaWRlbnRpZmllcigpLCBk b2N1bWVudC5pZGVudGlmaWVyRm9yRWxlbWVudChlbGVtZW50KSB9OwogfQogCiB2b2lkIFdlYlBh Z2U6OnN0YXJ0VGV4dE1hbmlwdWxhdGlvbnMoVmVjdG9yPFdlYkNvcmU6OlRleHRNYW5pcHVsYXRp b25Db250cm9sbGVyOjpFeGNsdXNpb25SdWxlPiYmIGV4Y2x1c2lvblJ1bGVzLCBDb21wbGV0aW9u SGFuZGxlcjx2b2lkKCk+JiYgY29tcGxldGlvbkhhbmRsZXIpCg== 392179 2020-03-02 13:26:20 -0800 2020-03-02 16:58:15 -0800 Patch bug-208463-20200302132619.patch text/plain 7590 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3NjQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDMyM2YzMmE2MDY0ODk1 NTMyZDg4MDkyOTRiYjI1N2ZlNWRjOThkZS4uZWJiNGI1ZGM0OThmMmU3YmU5MDBjNDRlMDMzNWE2 NTY4MjhhYTBhYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTAzLTAyICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBBbm5vdGF0ZSBlZGl0YWJs ZSBlbGVtZW50cyB3aXRoIHBhaW50IG9yZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg0NjMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU5OTYy ODQzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVu dGlsIDxyZGFyOi8vcHJvYmxlbS81OTczNzExOD4gaXMgZml4ZWQsIGFubm90YXRlIGVkaXRhYmxl IGVsZW1lbnRzIHdpdGggdGhlaXIgcGFpbnQgb3JkZXIKKyAgICAgICAgdG93YXJkcyBmaXhpbmcg PHJkYXI6Ly9wcm9ibGVtLzU5NjAyODg1Pi4KKworICAgICAgICAqIGRvbS9FbGVtZW50Q29udGV4 dC5oOgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudENvbnRleHQ6OmVuY29kZSBjb25zdCk6Cisg ICAgICAgIChXZWJDb3JlOjpFbGVtZW50Q29udGV4dDo6ZGVjb2RlKToKKyAgICAgICAgRW5jb2Rl IGFuZCBkZWNvZGUgdGhlIG9wdGlvbmFsIHBhaW50IG9yZGVyLgorCiAyMDIwLTAzLTAxICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAogICAgICAgICBQYWdlOjplZGl0YWJsZUVs ZW1lbnRzSW5SZWN0KCkgc2hvdWxkIGZpbmQgbmVzdGVkIGVkaXRhYmxlIGVsZW1lbnRzIGFuZCBy ZXR1cm4gZm91bmQgZWxlbWVudHMgaW4gcGFpbnQgb3JkZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggOGEyOTNlNjYz NzM5YmM4MjQ2MTllNTYzODBhNDlmODJiODNhMzFkZC4uMTg4ZWJiN2VkNTgyYjZhY2ZlNTk1ODBj ODdmZDYzYjlmODcwZTlmOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzMyBAQAorMjAyMC0wMy0wMiAg RGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CisKKyAgICAgICAgQW5ub3RhdGUgZWRp dGFibGUgZWxlbWVudHMgd2l0aCBwYWludCBvcmRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA4NDYzCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81 OTk2Mjg0Mz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBVbnRpbCA8cmRhcjovL3Byb2JsZW0vNTk3MzcxMTg+IGlzIGZpeGVkLCBhbm5vdGF0ZSBlZGl0 YWJsZSBlbGVtZW50cyB3aXRoIHRoZWlyIHBhaW50IG9yZGVyCisgICAgICAgIHRvd2FyZHMgZml4 aW5nIDxyZGFyOi8vcHJvYmxlbS81OTYwMjg4NT4uIE9ubHkgZWxlbWVudCBjb250ZXh0cyBjcmVh dGVkIGFzIGEgcmVzdWx0IG9mCisgICAgICAgIGNhbGxpbmcgV2ViUGFnZTo6dGV4dElucHV0Q29u dGV4dHNJblJlY3QoKSBoYXZlIGEgbWVhbmluZ2Z1bCBwYWludCBvcmRlci4KKworICAgICAgICBO b3RlIHRoYXQgdGhlIHBhaW50IG9yZGVyIG9mIGFuIGVsZW1lbnQgY2FuIG9ubHkgYmUgbWVhbmlu Z2Z1bGx5IGNvbXBhcmVkIHRvIHRoZSBwYWludCBvcmRlcgorICAgICAgICBvZiBvdGhlciBlbGVt ZW50cyByZXR1cm5lZCBpbiB0aGUgc2FtZSBpbnZvY2F0aW9uIG9mIFdlYlBhZ2U6OnRleHRJbnB1 dENvbnRleHRzSW5SZWN0KCkuIFRoYXQKKyAgICAgICAgaXMsIHRoZSBwYWludCBvcmRlciBpcyBu b3QgcmVuZGVyIHRyZWUtdW5pcXVlLiBTbywgdGhlIHNhbWUgZWxlbWVudCByZXR1cm5lZCBieSB0 d28gZGlmZmVyZW50CisgICAgICAgIGludm9jYXRpb25zIG9mIFdlYlBhZ2U6OnRleHRJbnB1dENv bnRleHRzSW5SZWN0KCkgY2Fubm90IGJlIGNvbXBhcmVkIHRvIGFueSBvdGhlciBlbGVtZW50Cisg ICAgICAgIG91dHNpZGUgb2YgdGhlIGxpc3QgaXQgd2FzIHJldHVybmVkIGluIGV2ZW4gaWYgaXRz IHBhaW50IG9yZGVyIGlzIHRoZSBzYW1lIGluIGJvdGggbGlzdHMuCisKKyAgICAgICAgKiBVSVBy b2Nlc3MvQVBJL0NvY29hL19XS1RleHRJbnB1dENvbnRleHQubW06CisgICAgICAgICgtW19XS1Rl eHRJbnB1dENvbnRleHQgX3BhaW50T3JkZXJdKTogQWRkZWQuIElmIHRoZSBjb250ZXh0IGRvZXMg bm90IGhhdmUgYSBwYWludCBvcmRlcgorICAgICAgICAoZS5nLiByZXR1cm5lZCBmb3JtIFdlYlBh Z2U6OmNvbnRleHRGb3JFbGVtZW50KCkpIHRoZW4gSSBjaG9zZSB0byByZXR1cm4gMCDigJMgdHJl YXQgaXQgYXMgdGhlCisgICAgICAgIGZyb250bW9zdCBlbGVtZW50LgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvQ29jb2EvX1dLVGV4dElucHV0Q29udGV4dEludGVybmFsLmg6CisgICAgICAgICog V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdl Ojp0ZXh0SW5wdXRDb250ZXh0c0luUmVjdCk6IEFzc2lnbiBlYWNoIGVsZW1lbnQncyBwYWludCBv cmRlci4gRm9sbG93aW5nIHIyNTc3MjIKKyAgICAgICAgdGhlIGVsZW1lbnRzIGFyZSBhbHJlYWR5 IG9yZGVyZWQgYnkgcGFpbnQgb3JkZXIgKGZyb250bW9zdCB0byBiYWNrbW9zdCkuIFNvLCB3ZSBj YW4gc2ltcGx5IGFzc2lnbgorICAgICAgICBtb25vdG9uaWNhbGx5IGluY3JlYXNpbmcgbnVtYmVy cy4KKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6Y29udGV4dEZvckVsZW1lbnQgY29uc3QpOiBQ YXNzIFdURjo6bnVsbG9wdCBmb3IgdGhlIHBhaW50IG9yZGVyIGFzIEkgZG8gbm90CisgICAgICAg IGhhdmUgYSBuZWVkIHRvIHN1cHBvcnQgcGFpbnQgb3JkZXIgZm9yIGluZGl2aWR1YWwgZWxlbWVu dHMuCisKIDIwMTktMDktMTMgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAg ICAgICAgIFN1cHBvcnQgYnVpbGRpbmcgV2ViS2l0IGZvciBNYWMgQ2F0YWx5c3QgZnJvbSBYY29k ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnRDb250ZXh0LmggYi9Tb3Vy Y2UvV2ViQ29yZS9kb20vRWxlbWVudENvbnRleHQuaAppbmRleCA2ODliMDYxMGFiZTI3YzE4NjE1 OWI5NDBiNDVjMjdlMDFiM2NmNzVkLi40NjIyNzIxZmE3MzZhZGQ4MzA1ZmRkN2ZiNDljZTc5NTIz MjZkMzQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudENvbnRleHQuaAor KysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudENvbnRleHQuaApAQCAtMzUsNiArMzUsMTAg QEAgbmFtZXNwYWNlIFdlYkNvcmUgewogc3RydWN0IEVsZW1lbnRDb250ZXh0IHsKICAgICBGbG9h dFJlY3QgYm91bmRpbmdSZWN0OwogCisgICAgLy8gTG93ZXIgb3JkaW5hbCBtZWFucyB0aGUgZWxl bWVudCBpcyB2aXN1YWxseSBjbG9zZXIgdG8gYSBwZXJzb24ncyBmYWNlLgorICAgIC8vIEZJWE1F OiBSZW1vdmUgdGhpcyBvbmNlIDxyZGFyOi8vcHJvYmxlbS81OTczNzExOD4gaXMgZml4ZWQuCisg ICAgT3B0aW9uYWw8dW5zaWduZWQ+IHBhaW50T3JkZXI7CisKICAgICBQYWdlSWRlbnRpZmllciB3 ZWJQYWdlSWRlbnRpZmllcjsKICAgICBEb2N1bWVudElkZW50aWZpZXIgZG9jdW1lbnRJZGVudGlm aWVyOwogICAgIEVsZW1lbnRJZGVudGlmaWVyIGVsZW1lbnRJZGVudGlmaWVyOwpAQCAtNTgsNiAr NjIsNyBAQCBpbmxpbmUgYm9vbCBvcGVyYXRvcj09KGNvbnN0IEVsZW1lbnRDb250ZXh0JiBhLCBj b25zdCBFbGVtZW50Q29udGV4dCYgYikKIHRlbXBsYXRlPGNsYXNzIEVuY29kZXI+CiB2b2lkIEVs ZW1lbnRDb250ZXh0OjplbmNvZGUoRW5jb2RlciYgZW5jb2RlcikgY29uc3QKIHsKKyAgICBlbmNv ZGVyIDw8IHBhaW50T3JkZXI7CiAgICAgZW5jb2RlciA8PCBib3VuZGluZ1JlY3Q7CiAgICAgZW5j b2RlciA8PCB3ZWJQYWdlSWRlbnRpZmllcjsKICAgICBlbmNvZGVyIDw8IGRvY3VtZW50SWRlbnRp ZmllcjsKQEAgLTY5LDYgKzc0LDkgQEAgT3B0aW9uYWw8RWxlbWVudENvbnRleHQ+IEVsZW1lbnRD b250ZXh0OjpkZWNvZGUoRGVjb2RlciYgZGVjb2RlcikKIHsKICAgICBFbGVtZW50Q29udGV4dCBj b250ZXh0OwogCisgICAgaWYgKCFkZWNvZGVyLmRlY29kZShjb250ZXh0LnBhaW50T3JkZXIpKQor ICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OworCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShj b250ZXh0LmJvdW5kaW5nUmVjdCkpCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tUZXh0SW5wdXRD b250ZXh0Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1RleHRJbnB1 dENvbnRleHQubW0KaW5kZXggN2ViNjVkMDAwOWZhOTc4YjMwYjE1YzJlZDg3YmIwODBlOTU5ZjMz Mi4uNjlhMzRhMTlmNmEzNzNhNGQwMmQ5YTFjOWQ5NGY1ODZhMTZiODdjYiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1RleHRJbnB1dENvbnRleHQubW0K KysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1RleHRJbnB1dENvbnRl eHQubW0KQEAgLTU0LDYgKzU0LDEyIEBAIC0gKENHUmVjdClib3VuZGluZ1JlY3QKICAgICByZXR1 cm4gX3RleHRJbnB1dENvbnRleHQuYm91bmRpbmdSZWN0OwogfQogCistIChOU1VJbnRlZ2VyKV9w YWludE9yZGVyCit7CisgICAgLy8gQWxsIGVsZW1lbnRzIHRoYXQgZG8gbm90IGhhdmUgYSBwYWlu dCBvcmRlciBhcmUgY29uc2lkZXJlZCBmcm9udG1vc3QuCisgICAgcmV0dXJuIF90ZXh0SW5wdXRD b250ZXh0LnBhaW50T3JkZXIudmFsdWVPcigwKTsKK30KKwogLSAoY29uc3QgV2ViQ29yZTo6RWxl bWVudENvbnRleHQmKV90ZXh0SW5wdXRDb250ZXh0CiB7CiAgICAgcmV0dXJuIF90ZXh0SW5wdXRD b250ZXh0OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19X S1RleHRJbnB1dENvbnRleHRJbnRlcm5hbC5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJ L0NvY29hL19XS1RleHRJbnB1dENvbnRleHRJbnRlcm5hbC5oCmluZGV4IDhmNjdmYzI5ZWExOTAx OWUzODEzN2FjN2Y3NmMwOWFlZGM5YTg1YWUuLjQzYWI3NmJkMmMxNTI2MDU4MDVhMDk2NTE4OWMy NDg5YTc5ODllNjAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9fV0tUZXh0SW5wdXRDb250ZXh0SW50ZXJuYWwuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvX1dLVGV4dElucHV0Q29udGV4dEludGVybmFsLmgKQEAgLTM1LDQgKzM1 LDcgQEAgc3RydWN0IEVsZW1lbnRDb250ZXh0OwogCiAtIChjb25zdCBXZWJDb3JlOjpFbGVtZW50 Q29udGV4dCYpX3RleHRJbnB1dENvbnRleHQ7CiAKKy8vIExvd2VyIG9yZGluYWwgbWVhbnMgdGhl IGVsZW1lbnQgaXMgdmlzdWFsbHkgY2xvc2VyIHRvIGEgcGVyc29uJ3MgZmFjZS4KK0Bwcm9wZXJ0 eSAobm9uYXRvbWljLCByZWFkb25seSkgTlNVSW50ZWdlciBfcGFpbnRPcmRlcjsKKwogQGVuZApk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCAwMThh MzYxZmJjOTk1YjkxMDZhYWNhNWY1ZmRkYTE1YmJjOTZlZmI0Li5jYTU5MGMzM2QzNWQwYTk0Zjky MWU5MWJhNDNmYjk3MGEzYTMwNjY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2Vi UGFnZS9XZWJQYWdlLmNwcApAQCAtNjgyMiw2ICs2ODIyLDcgQEAgdm9pZCBXZWJQYWdlOjp1cGRh dGVJbnB1dENvbnRleHRBZnRlckJsdXJyaW5nQW5kUmVmb2N1c2luZ0VsZW1lbnRJZk5lZWRlZChF bGVtZW4KIAogdm9pZCBXZWJQYWdlOjp0ZXh0SW5wdXRDb250ZXh0c0luUmVjdChXZWJDb3JlOjpG bG9hdFJlY3Qgc2VhcmNoUmVjdCwgQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBWZWN0b3I8 V2ViQ29yZTo6RWxlbWVudENvbnRleHQ+Jik+JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CisgICAg dW5zaWduZWQgY291bnQgPSAxOyAvLyBaZXJvIGlzIHJlc2VydmVkIGZvciBfV0tUZXh0SW5wdXRD b250ZXh0IG9iamVjdHMgdGhhdCBkbyBub3QgaGF2ZSBhIHBhaW50IG9yZGVyLgogICAgIGF1dG8g Y29udGV4dHMgPSBtX3BhZ2UtPmVkaXRhYmxlRWxlbWVudHNJblJlY3Qoc2VhcmNoUmVjdCkubWFw KFsmXSAoY29uc3QgYXV0byYgZWxlbWVudCkgewogICAgICAgICBhdXRvJiBkb2N1bWVudCA9IGVs ZW1lbnQtPmRvY3VtZW50KCk7CiAKQEAgLTY4MzAsNiArNjgzMSw3IEBAIHZvaWQgV2ViUGFnZTo6 dGV4dElucHV0Q29udGV4dHNJblJlY3QoV2ViQ29yZTo6RmxvYXRSZWN0IHNlYXJjaFJlY3QsIENv bXBsZXRpb25ICiAgICAgICAgIGNvbnRleHQuZG9jdW1lbnRJZGVudGlmaWVyID0gZG9jdW1lbnQu aWRlbnRpZmllcigpOwogICAgICAgICBjb250ZXh0LmVsZW1lbnRJZGVudGlmaWVyID0gZG9jdW1l bnQuaWRlbnRpZmllckZvckVsZW1lbnQoZWxlbWVudCk7CiAgICAgICAgIGNvbnRleHQuYm91bmRp bmdSZWN0ID0gZWxlbWVudC0+Y2xpZW50UmVjdCgpOworICAgICAgICBjb250ZXh0LnBhaW50T3Jk ZXIgPSBjb3VudCsrOwogICAgICAgICByZXR1cm4gY29udGV4dDsKICAgICB9KTsKICAgICBjb21w bGV0aW9uSGFuZGxlcihjb250ZXh0cyk7CkBAIC02ODc3LDcgKzY4NzksNyBAQCBPcHRpb25hbDxX ZWJDb3JlOjpFbGVtZW50Q29udGV4dD4gV2ViUGFnZTo6Y29udGV4dEZvckVsZW1lbnQoV2ViQ29y ZTo6RWxlbWVudCYgZQogICAgIGlmICghZnJhbWUpCiAgICAgICAgIHJldHVybiBXVEY6Om51bGxv cHQ7CiAKLSAgICByZXR1cm4gV2ViQ29yZTo6RWxlbWVudENvbnRleHQgeyBlbGVtZW50LmNsaWVu dFJlY3QoKSwgbV9pZGVudGlmaWVyLCBkb2N1bWVudC5pZGVudGlmaWVyKCksIGRvY3VtZW50Lmlk ZW50aWZpZXJGb3JFbGVtZW50KGVsZW1lbnQpIH07CisgICAgcmV0dXJuIFdlYkNvcmU6OkVsZW1l bnRDb250ZXh0IHsgZWxlbWVudC5jbGllbnRSZWN0KCksIFdURjo6bnVsbG9wdCwgbV9pZGVudGlm aWVyLCBkb2N1bWVudC5pZGVudGlmaWVyKCksIGRvY3VtZW50LmlkZW50aWZpZXJGb3JFbGVtZW50 KGVsZW1lbnQpIH07CiB9CiAKIHZvaWQgV2ViUGFnZTo6c3RhcnRUZXh0TWFuaXB1bGF0aW9ucyhW ZWN0b3I8V2ViQ29yZTo6VGV4dE1hbmlwdWxhdGlvbkNvbnRyb2xsZXI6OkV4Y2x1c2lvblJ1bGU+ JiYgZXhjbHVzaW9uUnVsZXMsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJiBjb21wbGV0aW9u SGFuZGxlcikK 392215 2020-03-02 16:58:21 -0800 2020-03-02 16:58:21 -0800 To land bug-208463-20200302165816.patch text/plain 7625 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3NzQ3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDM3NmU1MjEzOWMxMjAy ZGVlYTkyMGRkMzI2N2Q5NzZhZWYzNGExZC4uYzg0NzVmOGM0OTIxZDM0ZGJlZTUxZWY2ZmUzMGU3 OTQwNDc5Y2E1ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIwLTAzLTAyICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBBbm5vdGF0ZSBlZGl0YWJs ZSBlbGVtZW50cyB3aXRoIGhpdCB0ZXN0IG9yZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg0NjMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU5 OTYyODQzPgorCisgICAgICAgIFJldmlld2VkIGJ5IFdlbnNvbiBIc2llaC4KKworICAgICAgICBV bnRpbCA8cmRhcjovL3Byb2JsZW0vNTk3MzcxMTg+IGlzIGZpeGVkLCBhbm5vdGF0ZSBlZGl0YWJs ZSBlbGVtZW50cyB3aXRoIHRoZWlyIGhpdCB0ZXN0IG9yZGVyCisgICAgICAgIHRvd2FyZHMgZml4 aW5nIDxyZGFyOi8vcHJvYmxlbS81OTYwMjg4NT4uCisKKyAgICAgICAgKiBkb20vRWxlbWVudENv bnRleHQuaDoKKyAgICAgICAgKFdlYkNvcmU6OkVsZW1lbnRDb250ZXh0OjplbmNvZGUgY29uc3Qp OgorICAgICAgICAoV2ViQ29yZTo6RWxlbWVudENvbnRleHQ6OmRlY29kZSk6CisgICAgICAgIEVu Y29kZSBhbmQgZGVjb2RlIHRoZSBvcHRpb25hbCBoaXQgdGVzdCBvcmRlci4KKwogMjAyMC0wMy0w MiAgU2FpZCBBYm91LUhhbGxhd2EgIDxzYWJvdWhhbGxhd2FAYXBwbGUuY29tPgogICAgICAgICBJ bXBsZW1lbnQgY2FudmFzIHJlbW90ZSByZW5kZXJpbmcKICAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNDk1NQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwppbmRleCAyMzVlNjUzNGRjMDk3 ZjkyN2ZhZDM2MjM1N2YxODZhOGZjOWU3NzM0Li43MTkwYTQ2ZDRlMGJiNTU4NzI1NDkwYmViM2Jl OWRhZWRiYmI4ZTc3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZworKysgYi9T b3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDMzIEBACisyMDIwLTAzLTAyICBEYW5p ZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBBbm5vdGF0ZSBlZGl0YWJs ZSBlbGVtZW50cyB3aXRoIGhpdCB0ZXN0IG9yZGVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDg0NjMKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzU5 OTYyODQzPgorCisgICAgICAgIFJldmlld2VkIGJ5IFdlbnNvbiBIc2llaC4KKworICAgICAgICBV bnRpbCA8cmRhcjovL3Byb2JsZW0vNTk3MzcxMTg+IGlzIGZpeGVkLCBhbm5vdGF0ZSBlZGl0YWJs ZSBlbGVtZW50cyB3aXRoIHRoZWlyIGhpdCB0ZXN0CisgICAgICAgIG9yZGVyIHRvd2FyZHMgZml4 aW5nIDxyZGFyOi8vcHJvYmxlbS81OTYwMjg4NT4uIE9ubHkgZWxlbWVudCBjb250ZXh0cyBjcmVh dGVkIGFzIGEgcmVzdWx0CisgICAgICAgIG9mIGNhbGxpbmcgV2ViUGFnZTo6dGV4dElucHV0Q29u dGV4dHNJblJlY3QoKSBoYXZlIGEgbWVhbmluZ2Z1bCBoaXQgdGVzdCBvcmRlci4KKworICAgICAg ICBOb3RlIHRoYXQgdGhlIGhpdCB0ZXN0IG9yZGVyIG9mIGFuIGVsZW1lbnQgY2FuIG9ubHkgYmUg bWVhbmluZ2Z1bGx5IGNvbXBhcmVkIHRvIHRoZSBoaXQgdGVzdAorICAgICAgICBvcmRlciBvZiBv dGhlciBlbGVtZW50cyByZXR1cm5lZCBpbiB0aGUgc2FtZSBpbnZvY2F0aW9uIG9mIFdlYlBhZ2U6 OnRleHRJbnB1dENvbnRleHRzSW5SZWN0KCkuCisgICAgICAgIFRoYXQgaXMsIHRoZSBoaXQgdGVz dCBvcmRlciBpcyBub3QgcmVuZGVyIHRyZWUtdW5pcXVlLiBTbywgdGhlIHNhbWUgZWxlbWVudCBy ZXR1cm5lZCBieSB0d28KKyAgICAgICAgZGlmZmVyZW50IGludm9jYXRpb25zIG9mIFdlYlBhZ2U6 OnRleHRJbnB1dENvbnRleHRzSW5SZWN0KCkgY2Fubm90IGJlIGNvbXBhcmVkIHRvIGFueSBvdGhl cgorICAgICAgICBlbGVtZW50IG91dHNpZGUgb2YgdGhlIGxpc3QgaXQgd2FzIHJldHVybmVkIGlu IGV2ZW4gaWYgaXRzIG9yZGVyIGlzIHRoZSBzYW1lIGluIGJvdGggbGlzdHMuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL0NvY29hL19XS1RleHRJbnB1dENvbnRleHQubW06CisgICAgICAgICgt W19XS1RleHRJbnB1dENvbnRleHQgX2hpdFRlc3RPcmRlcl0pOiBBZGRlZC4gSWYgdGhlIGNvbnRl eHQgZG9lcyBub3QgaGF2ZSBhIGhpdCB0ZXN0IG9yZGVyCisgICAgICAgIChlLmcuIHJldHVybmVk IGZvcm0gV2ViUGFnZTo6Y29udGV4dEZvckVsZW1lbnQoKSkgdGhlbiBJIGNob3NlIHRvIHJldHVy biAwIOKAkyB0cmVhdCBpdCBhcyB0aGUKKyAgICAgICAgZnJvbnRtb3N0IGVsZW1lbnQuCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tUZXh0SW5wdXRDb250ZXh0SW50ZXJuYWwuaDoK KyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJL aXQ6OldlYlBhZ2U6OnRleHRJbnB1dENvbnRleHRzSW5SZWN0KTogQXNzaWduIGVhY2ggZWxlbWVu dCdzIGhpdCB0ZXN0IG9yZGVyLiBGb2xsb3dpbmcKKyAgICAgICAgcjI1NzcyMiB0aGUgZWxlbWVu dHMgYXJlIGFscmVhZHkgb3JkZXJlZCBieSBoaXQgdGVzdCBvcmRlciAoZnJvbnRtb3N0IHRvIGJh Y2ttb3N0KS4gU28sIHdlIGNhbgorICAgICAgICBzaW1wbHkgYXNzaWduIG1vbm90b25pY2FsbHkg aW5jcmVhc2luZyBudW1iZXJzLgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpjb250ZXh0Rm9y RWxlbWVudCBjb25zdCk6IFBhc3MgV1RGOjpudWxsb3B0IGZvciB0aGUgaGl0IHRlc3Qgb3JkZXIg YXMgSSBkbworICAgICAgICBub3QgaGF2ZSBhIG5lZWQgdG8gc3VwcG9ydCBoaXQgdGVzdCBvcmRl ciBmb3IgaW5kaXZpZHVhbCBlbGVtZW50cy4KKwogMjAyMC0wMy0wMiAgU2FpZCBBYm91LUhhbGxh d2EgIDxzYWJvdWhhbGxhd2FAYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCBjYW52YXMg cmVtb3RlIHJlbmRlcmluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvZG9tL0VsZW1lbnRD b250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudENvbnRleHQuaAppbmRleCA2ODli MDYxMGFiZTI3YzE4NjE1OWI5NDBiNDVjMjdlMDFiM2NmNzVkLi5hNTBjMGY5ODE0MWE3M2Y4M2Rl ZmZiNTVkZWE0OTI0Y2E0MzNjYmVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vRWxl bWVudENvbnRleHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRWxlbWVudENvbnRleHQuaApA QCAtMzUsNiArMzUsMTAgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogc3RydWN0IEVsZW1lbnRDb250 ZXh0IHsKICAgICBGbG9hdFJlY3QgYm91bmRpbmdSZWN0OwogCisgICAgLy8gTG93ZXIgb3JkaW5h bCBtZWFucyB0aGUgZWxlbWVudCBpcyB2aXN1YWxseSBjbG9zZXIgdG8gYSBwZXJzb24ncyBmYWNl LgorICAgIC8vIEZJWE1FOiBSZW1vdmUgdGhpcyBvbmNlIDxyZGFyOi8vcHJvYmxlbS81OTczNzEx OD4gaXMgZml4ZWQuCisgICAgT3B0aW9uYWw8dW5zaWduZWQ+IGhpdFRlc3RPcmRlcjsKKwogICAg IFBhZ2VJZGVudGlmaWVyIHdlYlBhZ2VJZGVudGlmaWVyOwogICAgIERvY3VtZW50SWRlbnRpZmll ciBkb2N1bWVudElkZW50aWZpZXI7CiAgICAgRWxlbWVudElkZW50aWZpZXIgZWxlbWVudElkZW50 aWZpZXI7CkBAIC01OCw2ICs2Miw3IEBAIGlubGluZSBib29sIG9wZXJhdG9yPT0oY29uc3QgRWxl bWVudENvbnRleHQmIGEsIGNvbnN0IEVsZW1lbnRDb250ZXh0JiBiKQogdGVtcGxhdGU8Y2xhc3Mg RW5jb2Rlcj4KIHZvaWQgRWxlbWVudENvbnRleHQ6OmVuY29kZShFbmNvZGVyJiBlbmNvZGVyKSBj b25zdAogeworICAgIGVuY29kZXIgPDwgaGl0VGVzdE9yZGVyOwogICAgIGVuY29kZXIgPDwgYm91 bmRpbmdSZWN0OwogICAgIGVuY29kZXIgPDwgd2ViUGFnZUlkZW50aWZpZXI7CiAgICAgZW5jb2Rl ciA8PCBkb2N1bWVudElkZW50aWZpZXI7CkBAIC02OSw2ICs3NCw5IEBAIE9wdGlvbmFsPEVsZW1l bnRDb250ZXh0PiBFbGVtZW50Q29udGV4dDo6ZGVjb2RlKERlY29kZXImIGRlY29kZXIpCiB7CiAg ICAgRWxlbWVudENvbnRleHQgY29udGV4dDsKIAorICAgIGlmICghZGVjb2Rlci5kZWNvZGUoY29u dGV4dC5oaXRUZXN0T3JkZXIpKQorICAgICAgICByZXR1cm4gV1RGOjpudWxsb3B0OworCiAgICAg aWYgKCFkZWNvZGVyLmRlY29kZShjb250ZXh0LmJvdW5kaW5nUmVjdCkpCiAgICAgICAgIHJldHVy biBXVEY6Om51bGxvcHQ7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9Db2NvYS9fV0tUZXh0SW5wdXRDb250ZXh0Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL19XS1RleHRJbnB1dENvbnRleHQubW0KaW5kZXggN2ViNjVkMDAwOWZhOTc4YjMw YjE1YzJlZDg3YmIwODBlOTU5ZjMzMi4uM2ZkMGIxNmYyOTU2N2YxNzQxMDNiYTA4NTQ3ZmU3Nzcx ZGExN2E0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19X S1RleHRJbnB1dENvbnRleHQubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL19XS1RleHRJbnB1dENvbnRleHQubW0KQEAgLTU0LDYgKzU0LDEyIEBAIC0gKENHUmVjdCli b3VuZGluZ1JlY3QKICAgICByZXR1cm4gX3RleHRJbnB1dENvbnRleHQuYm91bmRpbmdSZWN0Owog fQogCistIChOU1VJbnRlZ2VyKV9oaXRUZXN0T3JkZXIKK3sKKyAgICAvLyBBbGwgZWxlbWVudHMg dGhhdCBkbyBub3QgaGF2ZSBhIGhpdCB0ZXN0IG9yZGVyIGFyZSBjb25zaWRlcmVkIGZyb250bW9z dC4KKyAgICByZXR1cm4gX3RleHRJbnB1dENvbnRleHQuaGl0VGVzdE9yZGVyLnZhbHVlT3IoMCk7 Cit9CisKIC0gKGNvbnN0IFdlYkNvcmU6OkVsZW1lbnRDb250ZXh0JilfdGV4dElucHV0Q29udGV4 dAogewogICAgIHJldHVybiBfdGV4dElucHV0Q29udGV4dDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tUZXh0SW5wdXRDb250ZXh0SW50ZXJuYWwuaCBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tUZXh0SW5wdXRDb250ZXh0SW50 ZXJuYWwuaAppbmRleCA4ZjY3ZmMyOWVhMTkwMTllMzgxMzdhYzdmNzZjMDlhZWRjOWE4NWFlLi4w Mjk3YTY3MWQxZjhmYTM3ZjVhOWJmZjFmMWI1ZWU3YTg0M2VjMjY1IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLVGV4dElucHV0Q29udGV4dEludGVybmFs LmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1RleHRJbnB1dENv bnRleHRJbnRlcm5hbC5oCkBAIC0zNSw0ICszNSw3IEBAIHN0cnVjdCBFbGVtZW50Q29udGV4dDsK IAogLSAoY29uc3QgV2ViQ29yZTo6RWxlbWVudENvbnRleHQmKV90ZXh0SW5wdXRDb250ZXh0Owog CisvLyBMb3dlciBvcmRpbmFsIG1lYW5zIHRoZSBlbGVtZW50IGlzIHZpc3VhbGx5IGNsb3NlciB0 byBhIHBlcnNvbidzIGZhY2UuCitAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIE5TVUlu dGVnZXIgX2hpdFRlc3RPcmRlcjsKKwogQGVuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3Mv V2ViUGFnZS9XZWJQYWdlLmNwcAppbmRleCAxOWJkMTgwMzAwNzAxYWQ3MTBkZDkxODIzNWNjNDk2 Yjc0OTE0YTllLi45ZDk1ZGUyYTIwMmE4N2M2YzZhY2ZiNGJiOGM0ZDk4YTA1YmNiODA5IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtNjg3OSw2 ICs2ODc5LDcgQEAgdm9pZCBXZWJQYWdlOjp1cGRhdGVJbnB1dENvbnRleHRBZnRlckJsdXJyaW5n QW5kUmVmb2N1c2luZ0VsZW1lbnRJZk5lZWRlZChFbGVtZW4KIAogdm9pZCBXZWJQYWdlOjp0ZXh0 SW5wdXRDb250ZXh0c0luUmVjdChXZWJDb3JlOjpGbG9hdFJlY3Qgc2VhcmNoUmVjdCwgQ29tcGxl dGlvbkhhbmRsZXI8dm9pZChjb25zdCBWZWN0b3I8V2ViQ29yZTo6RWxlbWVudENvbnRleHQ+Jik+ JiYgY29tcGxldGlvbkhhbmRsZXIpCiB7CisgICAgdW5zaWduZWQgY291bnQgPSAxOyAvLyBaZXJv IGlzIHJlc2VydmVkIGZvciBfV0tUZXh0SW5wdXRDb250ZXh0IG9iamVjdHMgdGhhdCBkbyBub3Qg aGF2ZSBhIGhpdCB0ZXN0IG9yZGVyLgogICAgIGF1dG8gY29udGV4dHMgPSBtX3BhZ2UtPmVkaXRh YmxlRWxlbWVudHNJblJlY3Qoc2VhcmNoUmVjdCkubWFwKFsmXSAoY29uc3QgYXV0byYgZWxlbWVu dCkgewogICAgICAgICBhdXRvJiBkb2N1bWVudCA9IGVsZW1lbnQtPmRvY3VtZW50KCk7CiAKQEAg LTY4ODcsNiArNjg4OCw3IEBAIHZvaWQgV2ViUGFnZTo6dGV4dElucHV0Q29udGV4dHNJblJlY3Qo V2ViQ29yZTo6RmxvYXRSZWN0IHNlYXJjaFJlY3QsIENvbXBsZXRpb25ICiAgICAgICAgIGNvbnRl eHQuZG9jdW1lbnRJZGVudGlmaWVyID0gZG9jdW1lbnQuaWRlbnRpZmllcigpOwogICAgICAgICBj b250ZXh0LmVsZW1lbnRJZGVudGlmaWVyID0gZG9jdW1lbnQuaWRlbnRpZmllckZvckVsZW1lbnQo ZWxlbWVudCk7CiAgICAgICAgIGNvbnRleHQuYm91bmRpbmdSZWN0ID0gZWxlbWVudC0+Y2xpZW50 UmVjdCgpOworICAgICAgICBjb250ZXh0LmhpdFRlc3RPcmRlciA9IGNvdW50Kys7CiAgICAgICAg IHJldHVybiBjb250ZXh0OwogICAgIH0pOwogICAgIGNvbXBsZXRpb25IYW5kbGVyKGNvbnRleHRz KTsKQEAgLTY5MzQsNyArNjkzNiw3IEBAIE9wdGlvbmFsPFdlYkNvcmU6OkVsZW1lbnRDb250ZXh0 PiBXZWJQYWdlOjpjb250ZXh0Rm9yRWxlbWVudChXZWJDb3JlOjpFbGVtZW50JiBlCiAgICAgaWYg KCFmcmFtZSkKICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKIAotICAgIHJldHVybiBXZWJD b3JlOjpFbGVtZW50Q29udGV4dCB7IGVsZW1lbnQuY2xpZW50UmVjdCgpLCBtX2lkZW50aWZpZXIs IGRvY3VtZW50LmlkZW50aWZpZXIoKSwgZG9jdW1lbnQuaWRlbnRpZmllckZvckVsZW1lbnQoZWxl bWVudCkgfTsKKyAgICByZXR1cm4gV2ViQ29yZTo6RWxlbWVudENvbnRleHQgeyBlbGVtZW50LmNs aWVudFJlY3QoKSwgV1RGOjpudWxsb3B0LCBtX2lkZW50aWZpZXIsIGRvY3VtZW50LmlkZW50aWZp ZXIoKSwgZG9jdW1lbnQuaWRlbnRpZmllckZvckVsZW1lbnQoZWxlbWVudCkgfTsKIH0KIAogdm9p ZCBXZWJQYWdlOjpzdGFydFRleHRNYW5pcHVsYXRpb25zKFZlY3RvcjxXZWJDb3JlOjpUZXh0TWFu aXB1bGF0aW9uQ29udHJvbGxlcjo6RXhjbHVzaW9uUnVsZT4mJiBleGNsdXNpb25SdWxlcywgQ29t cGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmIGNvbXBsZXRpb25IYW5kbGVyKQo=