210090 2020-04-06 19:27:16 -0700 Initialization of modal nodes should happen lazily, not in the AXObjectCache constructor. 2020-04-07 04:53:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 andresg_22 andresg_22 aboxhall apinheiro cfleizach dmazzoni ews-watchlist jcraig jdiggs samuel_white webkit-bug-importer oldest_to_newest 1638424 0 andresg_22 2020-04-06 19:27:16 -0700 Initialization of modal nodes should happen lazily, not in the AXObjectCache constructor. 1638426 1 395646 andresg_22 2020-04-06 19:45:26 -0700 Created attachment 395646 Patch 1638428 2 395646 cfleizach 2020-04-06 19:57:32 -0700 Comment on attachment 395646 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395646&action=review > Source/WebCore/accessibility/AXObjectCache.cpp:305 > + m_currentModalNode = currentModalNode(); should currentModalNode() set m_currentModalNode? I feel like that way it can cache the value as needed and return the variable appropriately from one place of access > Source/WebCore/accessibility/AXObjectCache.cpp:318 > + m_currentModalNode = currentModalNode(); then here can just return currentModalNode() 1638432 3 395648 andresg_22 2020-04-06 20:38:23 -0700 Created attachment 395648 Patch 1638434 4 andresg_22 2020-04-06 20:41:23 -0700 (In reply to chris fleizach from comment #2) > Comment on attachment 395646 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=395646&action=review > > > Source/WebCore/accessibility/AXObjectCache.cpp:305 > > + m_currentModalNode = currentModalNode(); > > should currentModalNode() set m_currentModalNode? I feel like that way it > can cache the value as needed and return the variable appropriately from one > place of access Done. > > > Source/WebCore/accessibility/AXObjectCache.cpp:318 > > + m_currentModalNode = currentModalNode(); > > then here can just return currentModalNode() Done. 1638511 5 ews-feeder 2020-04-07 04:52:30 -0700 Committed r259633: <https://trac.webkit.org/changeset/259633> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395648. 1638512 6 webkit-bug-importer 2020-04-07 04:53:18 -0700 <rdar://problem/61388295> 395646 2020-04-06 19:45:26 -0700 2020-04-06 20:38:21 -0700 Patch bug-210090-20200406224525.patch text/plain 7680 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NTcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmU3ODVlMThmZjExOTk0 MjMxYjAzZDhkZjcwNDZhMWZkZWE5MzRiOC4uODU5OTBmOWU1NDlkYTg5MmNiZjBhYWZiZjYxYWJj MDQzYWVkMGIwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTA0LTA2ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBJbml0aWFsaXph dGlvbiBvZiBtb2RhbCBub2RlcyBzaG91bGQgaGFwcGVuIGxhemlseSwgbm90IGluIHRoZSBBWE9i amVjdENhY2hlIGNvbnN0cnVjdG9yLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjEwMDkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgLSBUaGUgaW5pdGlhbGl6YXRpb24gb2YgbW9kYWwgbm9kZXMgd2FzIHBl cmZvcm1lZCBpbiB0aGUgQVhPYmplY3RDYWNoZQorICAgICAgICBjb25zdHJ1Y3Rvciwgd2hpY2gg aXMgbm90IG5lY2Vzc2FyeS4gSW5zdGVhZCwgdGhpcyBjaGFuZ2UgcGVyZm9ybXMgdGhlCisgICAg ICAgIGluaXRpYWxpemF0aW9uIG9mIHRoZSBtb2RhbCBub2RlcyBiZWZvcmUgdGhleSBhcmUgbmVl ZGVkLgorICAgICAgICAtIHVwZGF0ZUN1cnJlbnRNb2RhbE5vZGUgd2FzIHJlcGxhY2VkIHdpdGgg Y3VycmVudE1vZGFsTm9kZSwgYW5kIGl0cworICAgICAgICBpbXBsZW1lbnRhdGlvbiBjbGVhbmVk IHVwLgorICAgICAgICAtIE5vdyB0aGUgaW5pdGlhbGl6YXRpb24gYW5kIHVwZGF0ZSBvZiBBWE9i amVjdENhY2hlZDo6bV9tb2RhbE5vZGVzU2V0CisgICAgICAgIGFuZCBtX2N1cnJlbnRNT2RhbE5v ZGUgaXMgY2xlYXJlci4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpBWE9iamVjdENhY2hlKToKKyAg ICAgICAgKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OmZpbmRNb2RhbE5vZGVzKToKKyAgICAgICAg KFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OmN1cnJlbnRNb2RhbE5vZGUgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6bW9kYWxOb2RlKToKKyAgICAgICAgKFdlYkNvcmU6 OkFYT2JqZWN0Q2FjaGU6OmhhbmRsZU1vZGFsQ2hhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OkFY T2JqZWN0Q2FjaGU6OnVwZGF0ZUN1cnJlbnRNb2RhbE5vZGUpOiBSZW5hbWVkIGN1cnJlbnRNb2Rh bE5vZGUuCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmg6CisKIDIwMjAt MDQtMDYgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92 ZSBpbnN0YW5jZSBmaWVsZHMgYW5kIG1ldGhvZHMgZnJvbSBTdHlsZUNvbG9yCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwIGIvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcAppbmRleCAzYTE5ODI3OTBh ZWJhZTg5MjIyZDY5ODY3MWMyMGM0MGEwZTc5OGZmLi4yNWE1NWZmYTBhNTdhMTljYmVhZGUyOTg2 NDIyYjNkMzRhYWQ4ZDJiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L0FYT2JqZWN0Q2FjaGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhP YmplY3RDYWNoZS5jcHAKQEAgLTIyMSw3ICsyMjEsNiBAQCBBWE9iamVjdENhY2hlOjpBWE9iamVj dENhY2hlKERvY3VtZW50JiBkb2N1bWVudCkKICAgICAsIG1fY3VycmVudE1vZGFsTm9kZShudWxs cHRyKQogICAgICwgbV9wZXJmb3JtQ2FjaGVVcGRhdGVUaW1lcigqdGhpcywgJkFYT2JqZWN0Q2Fj aGU6OnBlcmZvcm1DYWNoZVVwZGF0ZVRpbWVyRmlyZWQpCiB7Ci0gICAgZmluZE1vZGFsTm9kZXMo KTsKIH0KIAogQVhPYmplY3RDYWNoZTo6fkFYT2JqZWN0Q2FjaGUoKQpAQCAtMjQ0LDUwICsyNDMs MzkgQEAgdm9pZCBBWE9iamVjdENhY2hlOjpmaW5kTW9kYWxOb2RlcygpCiB7CiAgICAgLy8gVHJh dmVyc2UgdGhlIERPTSB0cmVlIHRvIGxvb2sgZm9yIHRoZSBhcmlhLW1vZGFsPXRydWUgbm9kZXMu CiAgICAgZm9yIChFbGVtZW50KiBlbGVtZW50ID0gRWxlbWVudFRyYXZlcnNhbDo6Zmlyc3RXaXRo aW4oZG9jdW1lbnQoKS5yb290Tm9kZSgpKTsgZWxlbWVudDsgZWxlbWVudCA9IEVsZW1lbnRUcmF2 ZXJzYWw6Om5leHRJbmNsdWRpbmdQc2V1ZG8oKmVsZW1lbnQpKSB7Ci0gICAgICAgIAogICAgICAg ICAvLyBNdXN0IGhhdmUgZGlhbG9nIG9yIGFsZXJ0ZGlhbG9nIHJvbGUKICAgICAgICAgaWYgKCFu b2RlSGFzUm9sZShlbGVtZW50LCAiZGlhbG9nIikgJiYgIW5vZGVIYXNSb2xlKGVsZW1lbnQsICJh bGVydGRpYWxvZyIpKQogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIGlmICghZXF1YWxM ZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UoZWxlbWVudC0+YXR0cmlidXRlV2l0aG91dFN5bmNocm9u aXphdGlvbihhcmlhX21vZGFsQXR0ciksICJ0cnVlIikpCiAgICAgICAgICAgICBjb250aW51ZTsK LSAgICAgICAgCisKICAgICAgICAgbV9tb2RhbE5vZGVzU2V0LmFkZChlbGVtZW50KTsKICAgICB9 Ci0gICAgCi0gICAgLy8gU2V0IHRoZSBjdXJyZW50IHZhbGlkIGFyaWEtbW9kYWwgbm9kZSBpZiBw b3NzaWJsZS4KLSAgICB1cGRhdGVDdXJyZW50TW9kYWxOb2RlKCk7CisKKyAgICBtX21vZGFsTm9k ZXNJbml0aWFsaXplZCA9IHRydWU7CiB9CiAKLXZvaWQgQVhPYmplY3RDYWNoZTo6dXBkYXRlQ3Vy cmVudE1vZGFsTm9kZSgpCitOb2RlKiBBWE9iamVjdENhY2hlOjpjdXJyZW50TW9kYWxOb2RlKCkg Y29uc3QKIHsKICAgICAvLyBUaGVyZSBtaWdodCBiZSBtdWx0aXBsZSBub2RlcyB3aXRoIGFyaWEt bW9kYWw9dHJ1ZSBzZXQuCiAgICAgLy8gV2UgdXNlIHRoaXMgZnVuY3Rpb24gdG8gcGljayB0aGUg b25lIHdlIHdhbnQuCi0gICAgbV9jdXJyZW50TW9kYWxOb2RlID0gbnVsbHB0cjsKICAgICBpZiAo bV9tb2RhbE5vZGVzU2V0LmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuOwotICAgIAotICAgIC8v IFdlIG9ubHkgY2FyZSBhYm91dCB0aGUgbm9kZXMgd2hpY2ggYXJlIHZpc2libGUuCi0gICAgTGlz dEhhc2hTZXQ8UmVmUHRyPE5vZGU+PiB2aXNpYmxlTm9kZXM7Ci0gICAgZm9yIChhdXRvJiBvYmpl Y3QgOiBtX21vZGFsTm9kZXNTZXQpIHsKLSAgICAgICAgaWYgKGlzTm9kZVZpc2libGUob2JqZWN0 KSkKLSAgICAgICAgICAgIHZpc2libGVOb2Rlcy5hZGQob2JqZWN0KTsKLSAgICB9Ci0gICAgCi0g ICAgaWYgKHZpc2libGVOb2Rlcy5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybjsKLSAgICAKLSAg ICAvLyBJZiBhbnkgb2YgdGhlIG5vZGUgYXJlIGtleWJvYXJkIGZvY3VzZWQsIHdlIHdhbnQgdG8g cGljayB0aGF0LgotICAgIE5vZGUqIGZvY3VzZWROb2RlID0gZG9jdW1lbnQoKS5mb2N1c2VkRWxl bWVudCgpOwotICAgIGZvciAoYXV0byYgb2JqZWN0IDogdmlzaWJsZU5vZGVzKSB7Ci0gICAgICAg IGlmIChmb2N1c2VkTm9kZSAhPSBudWxscHRyICYmIGZvY3VzZWROb2RlLT5pc0Rlc2NlbmRhbnRP ZihvYmplY3QuZ2V0KCkpKSB7Ci0gICAgICAgICAgICBtX2N1cnJlbnRNb2RhbE5vZGUgPSBvYmpl Y3QuZ2V0KCk7Ci0gICAgICAgICAgICBicmVhazsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisK KyAgICAvLyBJZiBhbnkgb2YgdGhlIG1vZGFsIG5vZGVzIGNvbnRhaW5zIHRoZSBrZXlib2FyZCBm b2N1cywgd2Ugd2FudCB0byBwaWNrIHRoYXQgb25lLgorICAgIC8vIElmIG5vdCwgd2Ugd2FudCB0 byBwaWNrIHRoZSBsYXN0IHZpc2libGUgZGlhbG9nIGluIHRoZSBET00uCisgICAgUmVmUHRyPEVs ZW1lbnQ+IGZvY3VzZWRFbGVtZW50ID0gZG9jdW1lbnQoKS5mb2N1c2VkRWxlbWVudCgpOworICAg IFJlZlB0cjxOb2RlPiBsYXN0VmlzaWJsZTsKKyAgICBmb3IgKGF1dG8mIG5vZGUgOiBtX21vZGFs Tm9kZXNTZXQpIHsKKyAgICAgICAgaWYgKGlzTm9kZVZpc2libGUobm9kZSkpIHsKKyAgICAgICAg ICAgIGlmIChmb2N1c2VkRWxlbWVudCAmJiBmb2N1c2VkRWxlbWVudC0+aXNEZXNjZW5kYW50T2Yo bm9kZSkpCisgICAgICAgICAgICAgICAgcmV0dXJuIG5vZGU7CisKKyAgICAgICAgICAgIGxhc3RW aXNpYmxlID0gbm9kZTsKICAgICAgICAgfQogICAgIH0KLSAgICAKLSAgICAvLyBJZiBub25lIG9m IHRoZSBub2RlcyBhcmUgZm9jdXNlZCwgd2Ugd2FudCB0byBwaWNrIHRoZSBsYXN0IGRpYWxvZyBp biB0aGUgRE9NLgotICAgIGlmICghbV9jdXJyZW50TW9kYWxOb2RlKQotICAgICAgICBtX2N1cnJl bnRNb2RhbE5vZGUgPSB2aXNpYmxlTm9kZXMubGFzdCgpLmdldCgpOworCisgICAgcmV0dXJuIGxh c3RWaXNpYmxlLmdldCgpOwogfQogCiBib29sIEFYT2JqZWN0Q2FjaGU6OmlzTm9kZVZpc2libGUo Tm9kZSogbm9kZSkgY29uc3QKQEAgLTMxMiwxNyArMzAwLDIzIEBAIGJvb2wgQVhPYmplY3RDYWNo ZTo6aXNOb2RlVmlzaWJsZShOb2RlKiBub2RlKSBjb25zdAogTm9kZSogQVhPYmplY3RDYWNoZTo6 bW9kYWxOb2RlKCkKIHsKICAgICAvLyBUaGlzIGZ1bmN0aW9uIHJldHVybnMgdGhlIHZhbGlkIGFy aWEgbW9kYWwgbm9kZS4KKyAgICBpZiAoIW1fbW9kYWxOb2Rlc0luaXRpYWxpemVkKSB7CisgICAg ICAgIGZpbmRNb2RhbE5vZGVzKCk7CisgICAgICAgIG1fY3VycmVudE1vZGFsTm9kZSA9IGN1cnJl bnRNb2RhbE5vZGUoKTsKKyAgICAgICAgcmV0dXJuIG1fY3VycmVudE1vZGFsTm9kZTsKKyAgICB9 CisKICAgICBpZiAobV9tb2RhbE5vZGVzU2V0LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIG51 bGxwdHI7Ci0gICAgCisKICAgICAvLyBDaGVjayB0aGUgY3VycmVudCB2YWxpZCBhcmlhIG1vZGFs IG5vZGUgZmlyc3QuCiAgICAgLy8gVXN1YWxseSB3aGVuIG9uZSBkaWFsb2cgc2V0cyBhcmlhLW1v ZGFsPXRydWUsIHRoYXQgZGlhbG9nIGlzIHRoZSBvbmUgd2Ugd2FudC4KICAgICBpZiAoaXNOb2Rl VmlzaWJsZShtX2N1cnJlbnRNb2RhbE5vZGUpKQogICAgICAgICByZXR1cm4gbV9jdXJyZW50TW9k YWxOb2RlOwotICAgIAorCiAgICAgLy8gUmVjb21wdXRlIHRoZSB2YWxpZCBhcmlhIG1vZGFsIG5v ZGUgd2hlbiBtX2N1cnJlbnRNb2RhbE5vZGUgaXMgbnVsbCBvciBoaWRkZW4uCi0gICAgdXBkYXRl Q3VycmVudE1vZGFsTm9kZSgpOwotICAgIHJldHVybiBpc05vZGVWaXNpYmxlKG1fY3VycmVudE1v ZGFsTm9kZSkgPyBtX2N1cnJlbnRNb2RhbE5vZGUgOiBudWxscHRyOworICAgIG1fY3VycmVudE1v ZGFsTm9kZSA9IGN1cnJlbnRNb2RhbE5vZGUoKTsKKyAgICByZXR1cm4gbV9jdXJyZW50TW9kYWxO b2RlOwogfQogCiBBY2Nlc3NpYmlsaXR5T2JqZWN0KiBBWE9iamVjdENhY2hlOjpmb2N1c2VkSW1h Z2VNYXBVSUVsZW1lbnQoSFRNTEFyZWFFbGVtZW50KiBhcmVhRWxlbWVudCkKQEAgLTE2NzksMTEg KzE2NzMsMTUgQEAgdm9pZCBBWE9iamVjdENhY2hlOjpoYW5kbGVNb2RhbENoYW5nZShOb2RlKiBu b2RlKQogewogICAgIGlmICghaXM8RWxlbWVudD4obm9kZSkpCiAgICAgICAgIHJldHVybjsKLSAg ICAKKwogICAgIGlmICghbm9kZUhhc1JvbGUobm9kZSwgImRpYWxvZyIpICYmICFub2RlSGFzUm9s ZShub2RlLCAiYWxlcnRkaWFsb2ciKSkKICAgICAgICAgcmV0dXJuOwotICAgIAorCiAgICAgc3Rv cENhY2hpbmdDb21wdXRlZE9iamVjdEF0dHJpYnV0ZXMoKTsKKworICAgIGlmICghbV9tb2RhbE5v ZGVzSW5pdGlhbGl6ZWQpCisgICAgICAgIGZpbmRNb2RhbE5vZGVzKCk7CisKICAgICBpZiAoZXF1 YWxMZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UoZG93bmNhc3Q8RWxlbWVudD4oKm5vZGUpLmF0dHJp YnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24oYXJpYV9tb2RhbEF0dHIpLCAidHJ1ZSIpKSB7CiAg ICAgICAgIC8vIEFkZCB0aGUgbmV3bHkgbW9kaWZpZWQgbm9kZSB0byB0aGUgbW9kYWwgbm9kZXMg c2V0LCBhbmQgc2V0IGl0IHRvIGJlIHRoZSBjdXJyZW50IHZhbGlkIGFyaWEgbW9kYWwgbm9kZS4K ICAgICAgICAgLy8gV2Ugd2lsbCByZWNvbXB1dGUgdGhlIGN1cnJlbnQgdmFsaWQgYXJpYSBtb2Rh bCBub2RlIGluIG1vZGFsTm9kZSgpIHdoZW4gdGhpcyBub2RlIGlzIG5vdCB2aXNpYmxlLgpAQCAt MTY5MiwxMSArMTY5MCwxMiBAQCB2b2lkIEFYT2JqZWN0Q2FjaGU6OmhhbmRsZU1vZGFsQ2hhbmdl KE5vZGUqIG5vZGUpCiAgICAgfSBlbHNlIHsKICAgICAgICAgLy8gUmVtb3ZlIHRoZSBub2RlIGZy b20gdGhlIG1vZGFsIG5vZGVzIHNldC4gVGhlcmUgbWlnaHQgYmUgb3RoZXIgdmlzaWJsZSBtb2Rh bCBub2Rlcywgc28gd2UgcmVjb21wdXRlIGhlcmUuCiAgICAgICAgIG1fbW9kYWxOb2Rlc1NldC5y ZW1vdmUobm9kZSk7Ci0gICAgICAgIHVwZGF0ZUN1cnJlbnRNb2RhbE5vZGUoKTsKKyAgICAgICAg bV9jdXJyZW50TW9kYWxOb2RlID0gY3VycmVudE1vZGFsTm9kZSgpOwogICAgIH0KKwogICAgIGlm IChtX2N1cnJlbnRNb2RhbE5vZGUpCiAgICAgICAgIGZvY3VzTW9kYWxOb2RlKCk7Ci0gICAgCisK ICAgICBzdGFydENhY2hpbmdDb21wdXRlZE9iamVjdEF0dHJpYnV0ZXNVbnRpbFRyZWVNdXRhdGVz KCk7CiB9CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmpl Y3RDYWNoZS5oIGIvU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgK aW5kZXggYTM5YjE3Mzc5MjFiM2ZkM2FlNTYwYzg3NGVmZDI0YTdlYzNiZjE3OC4uYWQ2MjgyNmZh NDJhZDJkYzkzY2YxOGVmZjMxMDMzOWZmOWU1MjBkZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKKysrIGIvU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmgKQEAgLTQ1Miw3ICs0NTIsNyBAQCBwcml2YXRlOgog CiAgICAgLy8gYXJpYS1tb2RhbCByZWxhdGVkCiAgICAgdm9pZCBmaW5kTW9kYWxOb2RlcygpOwot ICAgIHZvaWQgdXBkYXRlQ3VycmVudE1vZGFsTm9kZSgpOworICAgIE5vZGUqIGN1cnJlbnRNb2Rh bE5vZGUoKSBjb25zdDsKICAgICBib29sIGlzTm9kZVZpc2libGUoTm9kZSopIGNvbnN0OwogICAg IHZvaWQgaGFuZGxlTW9kYWxDaGFuZ2UoTm9kZSopOwogCkBAIC00NzgsMTEgKzQ3OCwxMiBAQCBw cml2YXRlOgogICAgIAogICAgIFRpbWVyIG1fbGl2ZVJlZ2lvbkNoYW5nZWRQb3N0VGltZXI7CiAg ICAgTGlzdEhhc2hTZXQ8UmVmUHRyPEFjY2Vzc2liaWxpdHlPYmplY3Q+PiBtX2xpdmVSZWdpb25P YmplY3RzU2V0OwotICAgIAorCiAgICAgVGltZXIgbV9mb2N1c01vZGFsTm9kZVRpbWVyOwogICAg IE5vZGUqIG1fY3VycmVudE1vZGFsTm9kZTsKICAgICBMaXN0SGFzaFNldDxOb2RlKj4gbV9tb2Rh bE5vZGVzU2V0OwotICAgIAorICAgIGJvb2wgbV9tb2RhbE5vZGVzSW5pdGlhbGl6ZWQgeyBmYWxz ZSB9OworCiAgICAgVGltZXIgbV9wZXJmb3JtQ2FjaGVVcGRhdGVUaW1lcjsKIAogICAgIEFYVGV4 dFN0YXRlQ2hhbmdlSW50ZW50IG1fdGV4dFNlbGVjdGlvbkludGVudDsK 395648 2020-04-06 20:38:23 -0700 2020-04-07 04:52:31 -0700 Patch bug-210090-20200406233822.patch text/plain 7720 andresg_22 U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NTcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmU3ODVlMThmZjExOTk0 MjMxYjAzZDhkZjcwNDZhMWZkZWE5MzRiOC4uODU5OTBmOWU1NDlkYTg5MmNiZjBhYWZiZjYxYWJj MDQzYWVkMGIwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDIwLTA0LTA2ICBBbmRy ZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KKworICAgICAgICBJbml0aWFsaXph dGlvbiBvZiBtb2RhbCBub2RlcyBzaG91bGQgaGFwcGVuIGxhemlseSwgbm90IGluIHRoZSBBWE9i amVjdENhY2hlIGNvbnN0cnVjdG9yLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MjEwMDkwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgLSBUaGUgaW5pdGlhbGl6YXRpb24gb2YgbW9kYWwgbm9kZXMgd2FzIHBl cmZvcm1lZCBpbiB0aGUgQVhPYmplY3RDYWNoZQorICAgICAgICBjb25zdHJ1Y3Rvciwgd2hpY2gg aXMgbm90IG5lY2Vzc2FyeS4gSW5zdGVhZCwgdGhpcyBjaGFuZ2UgcGVyZm9ybXMgdGhlCisgICAg ICAgIGluaXRpYWxpemF0aW9uIG9mIHRoZSBtb2RhbCBub2RlcyBiZWZvcmUgdGhleSBhcmUgbmVl ZGVkLgorICAgICAgICAtIHVwZGF0ZUN1cnJlbnRNb2RhbE5vZGUgd2FzIHJlcGxhY2VkIHdpdGgg Y3VycmVudE1vZGFsTm9kZSwgYW5kIGl0cworICAgICAgICBpbXBsZW1lbnRhdGlvbiBjbGVhbmVk IHVwLgorICAgICAgICAtIE5vdyB0aGUgaW5pdGlhbGl6YXRpb24gYW5kIHVwZGF0ZSBvZiBBWE9i amVjdENhY2hlZDo6bV9tb2RhbE5vZGVzU2V0CisgICAgICAgIGFuZCBtX2N1cnJlbnRNT2RhbE5v ZGUgaXMgY2xlYXJlci4KKworICAgICAgICAqIGFjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpBWE9iamVjdENhY2hlOjpBWE9iamVjdENhY2hlKToKKyAg ICAgICAgKFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OmZpbmRNb2RhbE5vZGVzKToKKyAgICAgICAg KFdlYkNvcmU6OkFYT2JqZWN0Q2FjaGU6OmN1cnJlbnRNb2RhbE5vZGUgY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6QVhPYmplY3RDYWNoZTo6bW9kYWxOb2RlKToKKyAgICAgICAgKFdlYkNvcmU6 OkFYT2JqZWN0Q2FjaGU6OmhhbmRsZU1vZGFsQ2hhbmdlKToKKyAgICAgICAgKFdlYkNvcmU6OkFY T2JqZWN0Q2FjaGU6OnVwZGF0ZUN1cnJlbnRNb2RhbE5vZGUpOiBSZW5hbWVkIGN1cnJlbnRNb2Rh bE5vZGUuCisgICAgICAgICogYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmg6CisKIDIwMjAt MDQtMDYgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJlbW92 ZSBpbnN0YW5jZSBmaWVsZHMgYW5kIG1ldGhvZHMgZnJvbSBTdHlsZUNvbG9yCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwIGIvU291cmNl L1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BWE9iamVjdENhY2hlLmNwcAppbmRleCAzYTE5ODI3OTBh ZWJhZTg5MjIyZDY5ODY3MWMyMGM0MGEwZTc5OGZmLi5iMDExZDkzNjE5YzhjZTcxMjU0MzIxMDEy MjgzMjFjMWE2Yjg1MGFlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5 L0FYT2JqZWN0Q2FjaGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhP YmplY3RDYWNoZS5jcHAKQEAgLTIyMSw3ICsyMjEsNiBAQCBBWE9iamVjdENhY2hlOjpBWE9iamVj dENhY2hlKERvY3VtZW50JiBkb2N1bWVudCkKICAgICAsIG1fY3VycmVudE1vZGFsTm9kZShudWxs cHRyKQogICAgICwgbV9wZXJmb3JtQ2FjaGVVcGRhdGVUaW1lcigqdGhpcywgJkFYT2JqZWN0Q2Fj aGU6OnBlcmZvcm1DYWNoZVVwZGF0ZVRpbWVyRmlyZWQpCiB7Ci0gICAgZmluZE1vZGFsTm9kZXMo KTsKIH0KIAogQVhPYmplY3RDYWNoZTo6fkFYT2JqZWN0Q2FjaGUoKQpAQCAtMjQ0LDUwICsyNDMs NDUgQEAgdm9pZCBBWE9iamVjdENhY2hlOjpmaW5kTW9kYWxOb2RlcygpCiB7CiAgICAgLy8gVHJh dmVyc2UgdGhlIERPTSB0cmVlIHRvIGxvb2sgZm9yIHRoZSBhcmlhLW1vZGFsPXRydWUgbm9kZXMu CiAgICAgZm9yIChFbGVtZW50KiBlbGVtZW50ID0gRWxlbWVudFRyYXZlcnNhbDo6Zmlyc3RXaXRo aW4oZG9jdW1lbnQoKS5yb290Tm9kZSgpKTsgZWxlbWVudDsgZWxlbWVudCA9IEVsZW1lbnRUcmF2 ZXJzYWw6Om5leHRJbmNsdWRpbmdQc2V1ZG8oKmVsZW1lbnQpKSB7Ci0gICAgICAgIAogICAgICAg ICAvLyBNdXN0IGhhdmUgZGlhbG9nIG9yIGFsZXJ0ZGlhbG9nIHJvbGUKICAgICAgICAgaWYgKCFu b2RlSGFzUm9sZShlbGVtZW50LCAiZGlhbG9nIikgJiYgIW5vZGVIYXNSb2xlKGVsZW1lbnQsICJh bGVydGRpYWxvZyIpKQogICAgICAgICAgICAgY29udGludWU7CiAgICAgICAgIGlmICghZXF1YWxM ZXR0ZXJzSWdub3JpbmdBU0NJSUNhc2UoZWxlbWVudC0+YXR0cmlidXRlV2l0aG91dFN5bmNocm9u aXphdGlvbihhcmlhX21vZGFsQXR0ciksICJ0cnVlIikpCiAgICAgICAgICAgICBjb250aW51ZTsK LSAgICAgICAgCisKICAgICAgICAgbV9tb2RhbE5vZGVzU2V0LmFkZChlbGVtZW50KTsKICAgICB9 Ci0gICAgCi0gICAgLy8gU2V0IHRoZSBjdXJyZW50IHZhbGlkIGFyaWEtbW9kYWwgbm9kZSBpZiBw b3NzaWJsZS4KLSAgICB1cGRhdGVDdXJyZW50TW9kYWxOb2RlKCk7CisKKyAgICBtX21vZGFsTm9k ZXNJbml0aWFsaXplZCA9IHRydWU7CiB9CiAKLXZvaWQgQVhPYmplY3RDYWNoZTo6dXBkYXRlQ3Vy cmVudE1vZGFsTm9kZSgpCitOb2RlKiBBWE9iamVjdENhY2hlOjpjdXJyZW50TW9kYWxOb2RlKCkK IHsKICAgICAvLyBUaGVyZSBtaWdodCBiZSBtdWx0aXBsZSBub2RlcyB3aXRoIGFyaWEtbW9kYWw9 dHJ1ZSBzZXQuCiAgICAgLy8gV2UgdXNlIHRoaXMgZnVuY3Rpb24gdG8gcGljayB0aGUgb25lIHdl IHdhbnQuCiAgICAgbV9jdXJyZW50TW9kYWxOb2RlID0gbnVsbHB0cjsKICAgICBpZiAobV9tb2Rh bE5vZGVzU2V0LmlzRW1wdHkoKSkKLSAgICAgICAgcmV0dXJuOwotICAgIAotICAgIC8vIFdlIG9u bHkgY2FyZSBhYm91dCB0aGUgbm9kZXMgd2hpY2ggYXJlIHZpc2libGUuCi0gICAgTGlzdEhhc2hT ZXQ8UmVmUHRyPE5vZGU+PiB2aXNpYmxlTm9kZXM7Ci0gICAgZm9yIChhdXRvJiBvYmplY3QgOiBt X21vZGFsTm9kZXNTZXQpIHsKLSAgICAgICAgaWYgKGlzTm9kZVZpc2libGUob2JqZWN0KSkKLSAg ICAgICAgICAgIHZpc2libGVOb2Rlcy5hZGQob2JqZWN0KTsKLSAgICB9Ci0gICAgCi0gICAgaWYg KHZpc2libGVOb2Rlcy5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybjsKLSAgICAKLSAgICAvLyBJ ZiBhbnkgb2YgdGhlIG5vZGUgYXJlIGtleWJvYXJkIGZvY3VzZWQsIHdlIHdhbnQgdG8gcGljayB0 aGF0LgotICAgIE5vZGUqIGZvY3VzZWROb2RlID0gZG9jdW1lbnQoKS5mb2N1c2VkRWxlbWVudCgp OwotICAgIGZvciAoYXV0byYgb2JqZWN0IDogdmlzaWJsZU5vZGVzKSB7Ci0gICAgICAgIGlmIChm b2N1c2VkTm9kZSAhPSBudWxscHRyICYmIGZvY3VzZWROb2RlLT5pc0Rlc2NlbmRhbnRPZihvYmpl Y3QuZ2V0KCkpKSB7Ci0gICAgICAgICAgICBtX2N1cnJlbnRNb2RhbE5vZGUgPSBvYmplY3QuZ2V0 KCk7Ci0gICAgICAgICAgICBicmVhazsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisKKyAgICAv LyBJZiBhbnkgb2YgdGhlIG1vZGFsIG5vZGVzIGNvbnRhaW5zIHRoZSBrZXlib2FyZCBmb2N1cywg d2Ugd2FudCB0byBwaWNrIHRoYXQgb25lLgorICAgIC8vIElmIG5vdCwgd2Ugd2FudCB0byBwaWNr IHRoZSBsYXN0IHZpc2libGUgZGlhbG9nIGluIHRoZSBET00uCisgICAgUmVmUHRyPEVsZW1lbnQ+ IGZvY3VzZWRFbGVtZW50ID0gZG9jdW1lbnQoKS5mb2N1c2VkRWxlbWVudCgpOworICAgIFJlZlB0 cjxOb2RlPiBsYXN0VmlzaWJsZTsKKyAgICBmb3IgKGF1dG8mIG5vZGUgOiBtX21vZGFsTm9kZXNT ZXQpIHsKKyAgICAgICAgaWYgKGlzTm9kZVZpc2libGUobm9kZSkpIHsKKyAgICAgICAgICAgIGlm IChmb2N1c2VkRWxlbWVudCAmJiBmb2N1c2VkRWxlbWVudC0+aXNEZXNjZW5kYW50T2Yobm9kZSkp IHsKKyAgICAgICAgICAgICAgICBtX2N1cnJlbnRNb2RhbE5vZGUgPSBub2RlOworICAgICAgICAg ICAgICAgIGJyZWFrOworICAgICAgICAgICAgfQorCisgICAgICAgICAgICBsYXN0VmlzaWJsZSA9 IG5vZGU7CiAgICAgICAgIH0KICAgICB9Ci0gICAgCi0gICAgLy8gSWYgbm9uZSBvZiB0aGUgbm9k ZXMgYXJlIGZvY3VzZWQsIHdlIHdhbnQgdG8gcGljayB0aGUgbGFzdCBkaWFsb2cgaW4gdGhlIERP TS4KKwogICAgIGlmICghbV9jdXJyZW50TW9kYWxOb2RlKQotICAgICAgICBtX2N1cnJlbnRNb2Rh bE5vZGUgPSB2aXNpYmxlTm9kZXMubGFzdCgpLmdldCgpOworICAgICAgICBtX2N1cnJlbnRNb2Rh bE5vZGUgPSBsYXN0VmlzaWJsZS5nZXQoKTsKKworICAgIHJldHVybiBtX2N1cnJlbnRNb2RhbE5v ZGU7CiB9CiAKIGJvb2wgQVhPYmplY3RDYWNoZTo6aXNOb2RlVmlzaWJsZShOb2RlKiBub2RlKSBj b25zdApAQCAtMzEyLDE3ICszMDYsMjEgQEAgYm9vbCBBWE9iamVjdENhY2hlOjppc05vZGVWaXNp YmxlKE5vZGUqIG5vZGUpIGNvbnN0CiBOb2RlKiBBWE9iamVjdENhY2hlOjptb2RhbE5vZGUoKQog ewogICAgIC8vIFRoaXMgZnVuY3Rpb24gcmV0dXJucyB0aGUgdmFsaWQgYXJpYSBtb2RhbCBub2Rl LgorICAgIGlmICghbV9tb2RhbE5vZGVzSW5pdGlhbGl6ZWQpIHsKKyAgICAgICAgZmluZE1vZGFs Tm9kZXMoKTsKKyAgICAgICAgcmV0dXJuIGN1cnJlbnRNb2RhbE5vZGUoKTsKKyAgICB9CisKICAg ICBpZiAobV9tb2RhbE5vZGVzU2V0LmlzRW1wdHkoKSkKICAgICAgICAgcmV0dXJuIG51bGxwdHI7 Ci0gICAgCi0gICAgLy8gQ2hlY2sgdGhlIGN1cnJlbnQgdmFsaWQgYXJpYSBtb2RhbCBub2RlIGZp cnN0LgorCisgICAgLy8gQ2hlY2sgdGhlIGNhY2hlZCBjdXJyZW50IHZhbGlkIGFyaWEgbW9kYWwg bm9kZSBmaXJzdC4KICAgICAvLyBVc3VhbGx5IHdoZW4gb25lIGRpYWxvZyBzZXRzIGFyaWEtbW9k YWw9dHJ1ZSwgdGhhdCBkaWFsb2cgaXMgdGhlIG9uZSB3ZSB3YW50LgogICAgIGlmIChpc05vZGVW aXNpYmxlKG1fY3VycmVudE1vZGFsTm9kZSkpCiAgICAgICAgIHJldHVybiBtX2N1cnJlbnRNb2Rh bE5vZGU7Ci0gICAgCisKICAgICAvLyBSZWNvbXB1dGUgdGhlIHZhbGlkIGFyaWEgbW9kYWwgbm9k ZSB3aGVuIG1fY3VycmVudE1vZGFsTm9kZSBpcyBudWxsIG9yIGhpZGRlbi4KLSAgICB1cGRhdGVD dXJyZW50TW9kYWxOb2RlKCk7Ci0gICAgcmV0dXJuIGlzTm9kZVZpc2libGUobV9jdXJyZW50TW9k YWxOb2RlKSA/IG1fY3VycmVudE1vZGFsTm9kZSA6IG51bGxwdHI7CisgICAgcmV0dXJuIGN1cnJl bnRNb2RhbE5vZGUoKTsKIH0KIAogQWNjZXNzaWJpbGl0eU9iamVjdCogQVhPYmplY3RDYWNoZTo6 Zm9jdXNlZEltYWdlTWFwVUlFbGVtZW50KEhUTUxBcmVhRWxlbWVudCogYXJlYUVsZW1lbnQpCkBA IC0xNjc5LDExICsxNjc3LDE1IEBAIHZvaWQgQVhPYmplY3RDYWNoZTo6aGFuZGxlTW9kYWxDaGFu Z2UoTm9kZSogbm9kZSkKIHsKICAgICBpZiAoIWlzPEVsZW1lbnQ+KG5vZGUpKQogICAgICAgICBy ZXR1cm47Ci0gICAgCisKICAgICBpZiAoIW5vZGVIYXNSb2xlKG5vZGUsICJkaWFsb2ciKSAmJiAh bm9kZUhhc1JvbGUobm9kZSwgImFsZXJ0ZGlhbG9nIikpCiAgICAgICAgIHJldHVybjsKLSAgICAK KwogICAgIHN0b3BDYWNoaW5nQ29tcHV0ZWRPYmplY3RBdHRyaWJ1dGVzKCk7CisKKyAgICBpZiAo IW1fbW9kYWxOb2Rlc0luaXRpYWxpemVkKQorICAgICAgICBmaW5kTW9kYWxOb2RlcygpOworCiAg ICAgaWYgKGVxdWFsTGV0dGVyc0lnbm9yaW5nQVNDSUlDYXNlKGRvd25jYXN0PEVsZW1lbnQ+KCpu b2RlKS5hdHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9uKGFyaWFfbW9kYWxBdHRyKSwgInRy dWUiKSkgewogICAgICAgICAvLyBBZGQgdGhlIG5ld2x5IG1vZGlmaWVkIG5vZGUgdG8gdGhlIG1v ZGFsIG5vZGVzIHNldCwgYW5kIHNldCBpdCB0byBiZSB0aGUgY3VycmVudCB2YWxpZCBhcmlhIG1v ZGFsIG5vZGUuCiAgICAgICAgIC8vIFdlIHdpbGwgcmVjb21wdXRlIHRoZSBjdXJyZW50IHZhbGlk IGFyaWEgbW9kYWwgbm9kZSBpbiBtb2RhbE5vZGUoKSB3aGVuIHRoaXMgbm9kZSBpcyBub3Qgdmlz aWJsZS4KQEAgLTE2OTIsMTEgKzE2OTQsMTIgQEAgdm9pZCBBWE9iamVjdENhY2hlOjpoYW5kbGVN b2RhbENoYW5nZShOb2RlKiBub2RlKQogICAgIH0gZWxzZSB7CiAgICAgICAgIC8vIFJlbW92ZSB0 aGUgbm9kZSBmcm9tIHRoZSBtb2RhbCBub2RlcyBzZXQuIFRoZXJlIG1pZ2h0IGJlIG90aGVyIHZp c2libGUgbW9kYWwgbm9kZXMsIHNvIHdlIHJlY29tcHV0ZSBoZXJlLgogICAgICAgICBtX21vZGFs Tm9kZXNTZXQucmVtb3ZlKG5vZGUpOwotICAgICAgICB1cGRhdGVDdXJyZW50TW9kYWxOb2RlKCk7 CisgICAgICAgIGN1cnJlbnRNb2RhbE5vZGUoKTsKICAgICB9CisKICAgICBpZiAobV9jdXJyZW50 TW9kYWxOb2RlKQogICAgICAgICBmb2N1c01vZGFsTm9kZSgpOwotICAgIAorCiAgICAgc3RhcnRD YWNoaW5nQ29tcHV0ZWRPYmplY3RBdHRyaWJ1dGVzVW50aWxUcmVlTXV0YXRlcygpOwogfQogCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuaCBi L1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5oCmluZGV4IGEzOWIx NzM3OTIxYjNmZDNhZTU2MGM4NzRlZmQyNGE3ZWMzYmYxNzguLmExNDExOTQzMmM1ODBkYTA0ODcy YjI1NDliNjYwMmE5NThhYzAxODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2li aWxpdHkvQVhPYmplY3RDYWNoZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv QVhPYmplY3RDYWNoZS5oCkBAIC00NTIsNyArNDUyLDcgQEAgcHJpdmF0ZToKIAogICAgIC8vIGFy aWEtbW9kYWwgcmVsYXRlZAogICAgIHZvaWQgZmluZE1vZGFsTm9kZXMoKTsKLSAgICB2b2lkIHVw ZGF0ZUN1cnJlbnRNb2RhbE5vZGUoKTsKKyAgICBOb2RlKiBjdXJyZW50TW9kYWxOb2RlKCk7CiAg ICAgYm9vbCBpc05vZGVWaXNpYmxlKE5vZGUqKSBjb25zdDsKICAgICB2b2lkIGhhbmRsZU1vZGFs Q2hhbmdlKE5vZGUqKTsKIApAQCAtNDc4LDExICs0NzgsMTIgQEAgcHJpdmF0ZToKICAgICAKICAg ICBUaW1lciBtX2xpdmVSZWdpb25DaGFuZ2VkUG9zdFRpbWVyOwogICAgIExpc3RIYXNoU2V0PFJl ZlB0cjxBY2Nlc3NpYmlsaXR5T2JqZWN0Pj4gbV9saXZlUmVnaW9uT2JqZWN0c1NldDsKLSAgICAK KwogICAgIFRpbWVyIG1fZm9jdXNNb2RhbE5vZGVUaW1lcjsKICAgICBOb2RlKiBtX2N1cnJlbnRN b2RhbE5vZGU7CiAgICAgTGlzdEhhc2hTZXQ8Tm9kZSo+IG1fbW9kYWxOb2Rlc1NldDsKLSAgICAK KyAgICBib29sIG1fbW9kYWxOb2Rlc0luaXRpYWxpemVkIHsgZmFsc2UgfTsKKwogICAgIFRpbWVy IG1fcGVyZm9ybUNhY2hlVXBkYXRlVGltZXI7CiAKICAgICBBWFRleHRTdGF0ZUNoYW5nZUludGVu dCBtX3RleHRTZWxlY3Rpb25JbnRlbnQ7Cg==