274108 2024-05-13 12:57:22 -0700 [Remote Inspection] AX: Add screen reader support for targeted elements 2024-05-14 14:35:42 -0700 1 1 1 Unclassified WebKit Accessibility WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 jhoffman23 jhoffman23 andresg_22 webkit-bug-importer wenson_hsieh oldest_to_newest 2035029 0 jhoffman23 2024-05-13 12:57:22 -0700 ... 2035030 1 webkit-bug-importer 2024-05-13 12:57:33 -0700 <rdar://problem/128019306> 2035031 2 jhoffman23 2024-05-13 12:57:44 -0700 rdar://128019127 2035034 3 471394 jhoffman23 2024-05-13 13:05:33 -0700 Created attachment 471394 Patch 2035058 4 471394 wenson_hsieh 2024-05-13 13:38:37 -0700 Comment on attachment 471394 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=471394&action=review > Source/WebCore/page/text-extraction/TextExtraction.cpp:469 > +static void extractRenderedText(Vector<StringsAndBlockOffset>& stringsAndOffsets, ContainerNode& node, BlockFlowDirection direction, bool shouldIncludeGeometry) Nit - maybe make this an `enum class : bool`? 2035077 5 471395 jhoffman23 2024-05-13 14:27:31 -0700 Created attachment 471395 Patch 2035078 6 471394 jhoffman23 2024-05-13 14:28:05 -0700 Comment on attachment 471394 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=471394&action=review >> Source/WebCore/page/text-extraction/TextExtraction.cpp:469 >> +static void extractRenderedText(Vector<StringsAndBlockOffset>& stringsAndOffsets, ContainerNode& node, BlockFlowDirection direction, bool shouldIncludeGeometry) > > Nit - maybe make this an `enum class : bool`? Updated! 2035079 7 jhoffman23 2024-05-13 14:28:14 -0700 View in context: https://bugs.webkit.org/attachment.cgi?id=471394&action=review >> Source/WebCore/page/text-extraction/TextExtraction.cpp:469 >> +static void extractRenderedText(Vector<StringsAndBlockOffset>& stringsAndOffsets, ContainerNode& node, BlockFlowDirection direction, bool shouldIncludeGeometry) > > Nit - maybe make this an `enum class : bool`? Updated! 2035375 8 ews-feeder 2024-05-14 14:35:41 -0700 Committed 278780@main (ab68b25713f7): <https://commits.webkit.org/278780@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 471395. 471394 2024-05-13 13:05:33 -0700 2024-05-13 14:27:29 -0700 Patch bug-274108-20240513130532.patch text/plain 11249 jhoffman23 RnJvbSAwMDQ2ZGQ4YzEwYWFlN2VlODA1NGIxOWMxYjIxYzU1MTk2YmZjMGFkIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb3NodWEgSG9mZm1hbiA8am9zaF9ob2ZmbWFuQGFwcGxlLmNv bT4KRGF0ZTogTW9uLCAxMyBNYXkgMjAyNCAxMjo1NToxNSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hd IFtSZW1vdGUgSW5zcGVjdGlvbl0gQVg6IEFkZCBzY3JlZW4gcmVhZGVyIHN1cHBvcnQgZm9yIGVs ZW1lbnQKIHRhcmdldGluZyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Mjc0MTA4IHJkYXI6Ly8xMjgwMTkxMjcKClJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgoKVG8g c3VyZmFjZSB0YXJnZXRpbmcgaW5mb3JtYXRpb24gdG8gc2NyZWVuIHJlYWRlcnMsIHdlIG5lZWQg dG8gYWRkIGEgbmV3IHRleHQgcHJvcGVydHksCnNjcmVlblJlYWRlclRleHQsIHRvIGV4cG9zZSB0 aG9zZSBiaXRzIG9mIHJlbmRlcmVkIHRleHQgcmVsZXZhbnQgdG8gc2NyZWVuIHJlYWRlciB1c2Vy cy4KCiogU291cmNlL1dlYkNvcmUvcGFnZS9FbGVtZW50VGFyZ2V0aW5nQ29udHJvbGxlci5jcHA6 CihXZWJDb3JlOjp0YXJnZXRlZEVsZW1lbnRJbmZvKToKKiBTb3VyY2UvV2ViQ29yZS9wYWdlL0Vs ZW1lbnRUYXJnZXRpbmdUeXBlcy5oOgoqIFNvdXJjZS9XZWJDb3JlL3BhZ2UvdGV4dC1leHRyYWN0 aW9uL1RleHRFeHRyYWN0aW9uLmNwcDoKKFdlYkNvcmU6OlRleHRFeHRyYWN0aW9uOjpleHRyYWN0 UmVuZGVyZWRUZXh0KToKKiBTb3VyY2UvV2ViQ29yZS9wYWdlL3RleHQtZXh0cmFjdGlvbi9UZXh0 RXh0cmFjdGlvbi5oOgoqIFNvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVy cy5zZXJpYWxpemF0aW9uLmluOgoqIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElUYXJn ZXRlZEVsZW1lbnRJbmZvLmg6CiogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19X S1RhcmdldGVkRWxlbWVudEluZm8uaDoKKiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29j b2EvX1dLVGFyZ2V0ZWRFbGVtZW50SW5mby5tbToKKC1bX1dLVGFyZ2V0ZWRFbGVtZW50SW5mbyBz Y3JlZW5SZWFkZXJUZXh0XSk6CiogVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9FbGVtZW50VGFyZ2V0aW5nVGVzdHMubW06CihUZXN0V2ViS2l0QVBJOjpURVNUKEVsZW1lbnRU YXJnZXRpbmcsIFRhcmdldGVkRWxlbWVudFNjcmVlblJlYWRlclRleHQpKToKLS0tCiAuLi4vcGFn ZS9FbGVtZW50VGFyZ2V0aW5nQ29udHJvbGxlci5jcHAgICAgICAgfCAgMyArKy0KIFNvdXJjZS9X ZWJDb3JlL3BhZ2UvRWxlbWVudFRhcmdldGluZ1R5cGVzLmggICB8ICAxICsKIC4uLi9wYWdlL3Rl eHQtZXh0cmFjdGlvbi9UZXh0RXh0cmFjdGlvbi5jcHAgICB8IDI2ICsrKysrKysrKysrLS0tLS0t LS0KIC4uLi9wYWdlL3RleHQtZXh0cmFjdGlvbi9UZXh0RXh0cmFjdGlvbi5oICAgICB8ICAyICst CiAuLi4vV2ViQ29yZUFyZ3VtZW50Q29kZXJzLnNlcmlhbGl6YXRpb24uaW4gICAgfCAgMSArCiAu Li4vVUlQcm9jZXNzL0FQSS9BUElUYXJnZXRlZEVsZW1lbnRJbmZvLmggICAgfCAgMSArCiAuLi4v QVBJL0NvY29hL19XS1RhcmdldGVkRWxlbWVudEluZm8uaCAgICAgICAgfCAgMSArCiAuLi4vQVBJ L0NvY29hL19XS1RhcmdldGVkRWxlbWVudEluZm8ubW0gICAgICAgfCAgNSArKysrCiAuLi4vV2Vi S2l0Q29jb2EvRWxlbWVudFRhcmdldGluZ1Rlc3RzLm1tICAgICAgfCAxMCArKysrKysrCiA5IGZp bGVzIGNoYW5nZWQsIDM3IGluc2VydGlvbnMoKyksIDEzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRWxlbWVudFRhcmdldGluZ0NvbnRyb2xsZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvcGFnZS9FbGVtZW50VGFyZ2V0aW5nQ29udHJvbGxlci5jcHAKaW5kZXgg MmQ4MmE2ZjY5OGViLi5mZDA0N2NkNzQ4OGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRWxlbWVudFRhcmdldGluZ0NvbnRyb2xsZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRWxlbWVudFRhcmdldGluZ0NvbnRyb2xsZXIuY3BwCkBAIC01OTgsOCArNTk4LDkgQEAgc3Rh dGljIFRhcmdldGVkRWxlbWVudEluZm8gdGFyZ2V0ZWRFbGVtZW50SW5mbyhFbGVtZW50JiBlbGVt ZW50LCBJc05lYXJieVRhcmdldAogICAgICAgICAuZWxlbWVudElkZW50aWZpZXIgPSBlbGVtZW50 LmlkZW50aWZpZXIoKSwKICAgICAgICAgLmRvY3VtZW50SWRlbnRpZmllciA9IGVsZW1lbnQuZG9j dW1lbnQoKS5pZGVudGlmaWVyKCksCiAgICAgICAgIC5vZmZzZXRFZGdlcyA9IGNvbXB1dGVPZmZz ZXRFZGdlcyhyZW5kZXJlci0+c3R5bGUoKSksCi0gICAgICAgIC5yZW5kZXJlZFRleHQgPSBUZXh0 RXh0cmFjdGlvbjo6ZXh0cmFjdFJlbmRlcmVkVGV4dChlbGVtZW50KSwKKyAgICAgICAgLnJlbmRl cmVkVGV4dCA9IFRleHRFeHRyYWN0aW9uOjpleHRyYWN0UmVuZGVyZWRUZXh0KGVsZW1lbnQsIHRy dWUpLAogICAgICAgICAuc2VhcmNoYWJsZVRleHQgPSBzZWFyY2hhYmxlVGV4dEZvclRhcmdldChl bGVtZW50KSwKKyAgICAgICAgLnNjcmVlblJlYWRlclRleHQgPSBUZXh0RXh0cmFjdGlvbjo6ZXh0 cmFjdFJlbmRlcmVkVGV4dChlbGVtZW50LCBmYWxzZSksCiAgICAgICAgIC5zZWxlY3RvcnMgPSBz ZWxlY3RvcnNGb3JUYXJnZXQoZWxlbWVudCwgY2FjaGUpLAogICAgICAgICAuYm91bmRzSW5Sb290 VmlldyA9IGVsZW1lbnQuYm91bmRpbmdCb3hJblJvb3RWaWV3Q29vcmRpbmF0ZXMoKSwKICAgICAg ICAgLmJvdW5kc0luQ2xpZW50Q29vcmRpbmF0ZXMgPSBjb21wdXRlQ2xpZW50UmVjdCgqcmVuZGVy ZXIpLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9FbGVtZW50VGFyZ2V0aW5nVHlw ZXMuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRWxlbWVudFRhcmdldGluZ1R5cGVzLmgKaW5kZXgg YmIwODFjMmVmZGQ1Li4yNWQwYzMyNjhiZWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvRWxlbWVudFRhcmdldGluZ1R5cGVzLmgKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS9FbGVt ZW50VGFyZ2V0aW5nVHlwZXMuaApAQCAtNTcsNiArNTcsNyBAQCBzdHJ1Y3QgVGFyZ2V0ZWRFbGVt ZW50SW5mbyB7CiAgICAgUmVjdEVkZ2VzPGJvb2w+IG9mZnNldEVkZ2VzOwogICAgIFN0cmluZyBy ZW5kZXJlZFRleHQ7CiAgICAgU3RyaW5nIHNlYXJjaGFibGVUZXh0OworICAgIFN0cmluZyBzY3Jl ZW5SZWFkZXJUZXh0OwogICAgIFZlY3RvcjxWZWN0b3I8U3RyaW5nPj4gc2VsZWN0b3JzOwogICAg IEZsb2F0UmVjdCBib3VuZHNJblJvb3RWaWV3OwogICAgIEZsb2F0UmVjdCBib3VuZHNJbkNsaWVu dENvb3JkaW5hdGVzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS90ZXh0LWV4dHJh Y3Rpb24vVGV4dEV4dHJhY3Rpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS90ZXh0LWV4dHJh Y3Rpb24vVGV4dEV4dHJhY3Rpb24uY3BwCmluZGV4IDM3ZGRiMmU1MzIwZi4uODQ3ZjRhNGRiNGFk IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3RleHQtZXh0cmFjdGlvbi9UZXh0RXh0 cmFjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS90ZXh0LWV4dHJhY3Rpb24vVGV4 dEV4dHJhY3Rpb24uY3BwCkBAIC00NjYsNyArNDY2LDcgQEAgc3RhdGljIEludFNpemUgcmVkdWNl UHJlY2lzaW9uKEZsb2F0U2l6ZSBzaXplKQogICAgIH07CiB9CiAKLXN0YXRpYyB2b2lkIGV4dHJh Y3RSZW5kZXJlZFRleHQoVmVjdG9yPFN0cmluZ3NBbmRCbG9ja09mZnNldD4mIHN0cmluZ3NBbmRP ZmZzZXRzLCBDb250YWluZXJOb2RlJiBub2RlLCBCbG9ja0Zsb3dEaXJlY3Rpb24gZGlyZWN0aW9u KQorc3RhdGljIHZvaWQgZXh0cmFjdFJlbmRlcmVkVGV4dChWZWN0b3I8U3RyaW5nc0FuZEJsb2Nr T2Zmc2V0PiYgc3RyaW5nc0FuZE9mZnNldHMsIENvbnRhaW5lck5vZGUmIG5vZGUsIEJsb2NrRmxv d0RpcmVjdGlvbiBkaXJlY3Rpb24sIGJvb2wgc2hvdWxkSW5jbHVkZUdlb21ldHJ5KQogewogICAg IENoZWNrZWRQdHIgcmVuZGVyZXIgPSBub2RlLnJlbmRlcmVyKCk7CiAgICAgaWYgKCFyZW5kZXJl cikKQEAgLTUwNiw3ICs1MDYsNyBAQCBzdGF0aWMgdm9pZCBleHRyYWN0UmVuZGVyZWRUZXh0KFZl Y3RvcjxTdHJpbmdzQW5kQmxvY2tPZmZzZXQ+JiBzdHJpbmdzQW5kT2Zmc2V0cwogCiAgICAgaWYg KENoZWNrZWRQdHIgZnJhbWVSZW5kZXJlciA9IGR5bmFtaWNEb3duY2FzdDxSZW5kZXJJRnJhbWU+ KCpyZW5kZXJlcikpIHsKICAgICAgICAgaWYgKGF1dG8gY29udGVudERvY3VtZW50ID0gZnJhbWVS ZW5kZXJlci0+aWZyYW1lRWxlbWVudCgpLnByb3RlY3RlZENvbnRlbnREb2N1bWVudCgpKQotICAg ICAgICAgICAgZXh0cmFjdFJlbmRlcmVkVGV4dChzdHJpbmdzQW5kT2Zmc2V0cywgKmNvbnRlbnRE b2N1bWVudCwgZGlyZWN0aW9uKTsKKyAgICAgICAgICAgIGV4dHJhY3RSZW5kZXJlZFRleHQoc3Ry aW5nc0FuZE9mZnNldHMsICpjb250ZW50RG9jdW1lbnQsIGRpcmVjdGlvbiwgc2hvdWxkSW5jbHVk ZUdlb21ldHJ5KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtNTE4LDkgKzUxOCwxMSBA QCBzdGF0aWMgdm9pZCBleHRyYWN0UmVuZGVyZWRUZXh0KFZlY3RvcjxTdHJpbmdzQW5kQmxvY2tP ZmZzZXQ+JiBzdHJpbmdzQW5kT2Zmc2V0cwogICAgICAgICBhcHBlbmRTdHJpbmdzKHsgbWFrZVN0 cmluZygneycsIHJvdW5kZWRTaXplSWdub3Jpbmdab29tLndpZHRoKCksICcsJywgcm91bmRlZFNp emVJZ25vcmluZ1pvb20uaGVpZ2h0KCksICd9JykgfSwgZnJhbWVWaWV3LT5jb250ZW50c1RvUm9v dFZpZXcocmVuZGVyUmVwbGFjZWQuYWJzb2x1dGVCb3VuZGluZ0JveFJlY3QoKSkpOwogICAgIH07 CiAKLSAgICBpZiAoQ2hlY2tlZFB0ciByZW5kZXJSZXBsYWNlZCA9IGR5bmFtaWNEb3duY2FzdDxS ZW5kZXJSZXBsYWNlZD4oKnJlbmRlcmVyKSkgewotICAgICAgICBhcHBlbmRSZXBsYWNlZFJlbmRl cmVyKCpyZW5kZXJSZXBsYWNlZCk7Ci0gICAgICAgIHJldHVybjsKKyAgICBpZiAoc2hvdWxkSW5j bHVkZUdlb21ldHJ5KSB7CisgICAgICAgIGlmIChDaGVja2VkUHRyIHJlbmRlclJlcGxhY2VkID0g ZHluYW1pY0Rvd25jYXN0PFJlbmRlclJlcGxhY2VkPigqcmVuZGVyZXIpKSB7CisgICAgICAgICAg ICBhcHBlbmRSZXBsYWNlZFJlbmRlcmVyKCpyZW5kZXJSZXBsYWNlZCk7CisgICAgICAgICAgICBy ZXR1cm47CisgICAgICAgIH0KICAgICB9CiAKICAgICBmb3IgKGF1dG8mIGRlc2NlbmRhbnQgOiBk ZXNjZW5kYW50c09mVHlwZTxSZW5kZXJPYmplY3Q+KCpyZW5kZXJlcikpIHsKQEAgLTU0NSwxOCAr NTQ3LDIwIEBAIHN0YXRpYyB2b2lkIGV4dHJhY3RSZW5kZXJlZFRleHQoVmVjdG9yPFN0cmluZ3NB bmRCbG9ja09mZnNldD4mIHN0cmluZ3NBbmRPZmZzZXRzCiAKICAgICAgICAgaWYgKENoZWNrZWRQ dHIgZnJhbWVSZW5kZXJlciA9IGR5bmFtaWNEb3duY2FzdDxSZW5kZXJJRnJhbWU+KGRlc2NlbmRh bnQpKSB7CiAgICAgICAgICAgICBpZiAoYXV0byBjb250ZW50RG9jdW1lbnQgPSBmcmFtZVJlbmRl cmVyLT5pZnJhbWVFbGVtZW50KCkucHJvdGVjdGVkQ29udGVudERvY3VtZW50KCkpCi0gICAgICAg ICAgICAgICAgZXh0cmFjdFJlbmRlcmVkVGV4dChzdHJpbmdzQW5kT2Zmc2V0cywgKmNvbnRlbnRE b2N1bWVudCwgZGlyZWN0aW9uKTsKKyAgICAgICAgICAgICAgICBleHRyYWN0UmVuZGVyZWRUZXh0 KHN0cmluZ3NBbmRPZmZzZXRzLCAqY29udGVudERvY3VtZW50LCBkaXJlY3Rpb24sIHNob3VsZElu Y2x1ZGVHZW9tZXRyeSk7CiAgICAgICAgICAgICBjb250aW51ZTsKICAgICAgICAgfQogCi0gICAg ICAgIGlmIChDaGVja2VkUHRyIHJlbmRlclJlcGxhY2VkID0gZHluYW1pY0Rvd25jYXN0PFJlbmRl clJlcGxhY2VkPihkZXNjZW5kYW50KSkgewotICAgICAgICAgICAgYXBwZW5kUmVwbGFjZWRSZW5k ZXJlcigqcmVuZGVyUmVwbGFjZWQpOwotICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIGlm IChzaG91bGRJbmNsdWRlR2VvbWV0cnkpIHsKKyAgICAgICAgICAgIGlmIChDaGVja2VkUHRyIHJl bmRlclJlcGxhY2VkID0gZHluYW1pY0Rvd25jYXN0PFJlbmRlclJlcGxhY2VkPihkZXNjZW5kYW50 KSkgeworICAgICAgICAgICAgICAgIGFwcGVuZFJlcGxhY2VkUmVuZGVyZXIoKnJlbmRlclJlcGxh Y2VkKTsKKyAgICAgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgICAgIH0KICAgICAgICAg fQogICAgIH0KIH0KIAotU3RyaW5nIGV4dHJhY3RSZW5kZXJlZFRleHQoRWxlbWVudCYgZWxlbWVu dCkKK1N0cmluZyBleHRyYWN0UmVuZGVyZWRUZXh0KEVsZW1lbnQmIGVsZW1lbnQsIGJvb2wgc2hv dWxkSW5jbHVkZUdlb21ldHJ5KQogewogICAgIGlmICghZWxlbWVudC5yZW5kZXJlcigpKQogICAg ICAgICByZXR1cm4gZW1wdHlTdHJpbmcoKTsKQEAgLTU2NCw3ICs1NjgsNyBAQCBTdHJpbmcgZXh0 cmFjdFJlbmRlcmVkVGV4dChFbGVtZW50JiBlbGVtZW50KQogICAgIGF1dG8gZGlyZWN0aW9uID0g ZWxlbWVudC5yZW5kZXJlcigpLT5zdHlsZSgpLmJsb2NrRmxvd0RpcmVjdGlvbigpOwogCiAgICAg VmVjdG9yPFN0cmluZ3NBbmRCbG9ja09mZnNldD4gc3RyaW5nc0FuZE9mZnNldHM7Ci0gICAgZXh0 cmFjdFJlbmRlcmVkVGV4dChzdHJpbmdzQW5kT2Zmc2V0cywgZWxlbWVudCwgZGlyZWN0aW9uKTsK KyAgICBleHRyYWN0UmVuZGVyZWRUZXh0KHN0cmluZ3NBbmRPZmZzZXRzLCBlbGVtZW50LCBkaXJl Y3Rpb24sIHNob3VsZEluY2x1ZGVHZW9tZXRyeSk7CiAKICAgICBib29sIGFzY2VuZGluZ09yZGVy ID0gWyZdIHsKICAgICAgICAgc3dpdGNoIChkaXJlY3Rpb24pIHsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvdGV4dC1leHRyYWN0aW9uL1RleHRFeHRyYWN0aW9uLmggYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL3RleHQtZXh0cmFjdGlvbi9UZXh0RXh0cmFjdGlvbi5oCmluZGV4IDZkMmI2 ZDQ2ZmQ5ZS4uMGQ3NTQ3ZGQyMWRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3Rl eHQtZXh0cmFjdGlvbi9UZXh0RXh0cmFjdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2Uv dGV4dC1leHRyYWN0aW9uL1RleHRFeHRyYWN0aW9uLmgKQEAgLTM5LDcgKzM5LDcgQEAgbmFtZXNw YWNlIFRleHRFeHRyYWN0aW9uIHsKIAogV0VCQ09SRV9FWFBPUlQgSXRlbSBleHRyYWN0SXRlbShz dGQ6Om9wdGlvbmFsPFdlYkNvcmU6OkZsb2F0UmVjdD4mJiBjb2xsZWN0aW9uUmVjdEluUm9vdFZp ZXcsIFBhZ2UmKTsKIAotU3RyaW5nIGV4dHJhY3RSZW5kZXJlZFRleHQoRWxlbWVudCYpOworU3Ry aW5nIGV4dHJhY3RSZW5kZXJlZFRleHQoRWxlbWVudCYsIGJvb2wpOwogCiB9IC8vIG5hbWVzcGFj ZSBUZXh0RXh0cmFjdGlvbgogfSAvLyBuYW1lc3BhY2UgV2ViQ29yZQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLnNlcmlhbGl6YXRpb24uaW4g Yi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMuc2VyaWFsaXphdGlv bi5pbgppbmRleCAxMDU4OGE4ZjJkOWYuLmEwNTBkNWNmNTJjNCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLnNlcmlhbGl6YXRpb24uaW4KKysr IGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3VtZW50Q29kZXJzLnNlcmlhbGl6YXRp b24uaW4KQEAgLTkwNCw2ICs5MDQsNyBAQCBoZWFkZXI6IDxXZWJDb3JlL0VsZW1lbnRUYXJnZXRp bmdUeXBlcy5oPgogICAgIFdlYkNvcmU6OlJlY3RFZGdlczxib29sPiBvZmZzZXRFZGdlcwogICAg IFN0cmluZyByZW5kZXJlZFRleHQKICAgICBTdHJpbmcgc2VhcmNoYWJsZVRleHQKKyAgICBTdHJp bmcgc2NyZWVuUmVhZGVyVGV4dDsKICAgICBWZWN0b3I8VmVjdG9yPFN0cmluZz4+IHNlbGVjdG9y cwogICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBib3VuZHNJblJvb3RWaWV3CiAgICAgV2ViQ29yZTo6 RmxvYXRSZWN0IGJvdW5kc0luQ2xpZW50Q29vcmRpbmF0ZXMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9BUElUYXJnZXRlZEVsZW1lbnRJbmZvLmggYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQVBJVGFyZ2V0ZWRFbGVtZW50SW5mby5oCmluZGV4IGY5NTlhYmFl ZDE0Zi4uMTI0ZGQyOTQ0NzA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQVBJVGFyZ2V0ZWRFbGVtZW50SW5mby5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L0FQSS9BUElUYXJnZXRlZEVsZW1lbnRJbmZvLmgKQEAgLTUyLDYgKzUyLDcgQEAgcHVibGljOgog CiAgICAgY29uc3QgV1RGOjpTdHJpbmcmIHJlbmRlcmVkVGV4dCgpIGNvbnN0IHsgcmV0dXJuIG1f aW5mby5yZW5kZXJlZFRleHQ7IH0KICAgICBjb25zdCBXVEY6OlN0cmluZyYgc2VhcmNoYWJsZVRl eHQoKSBjb25zdCB7IHJldHVybiBtX2luZm8uc2VhcmNoYWJsZVRleHQ7IH0KKyAgICBjb25zdCBX VEY6OlN0cmluZyYgc2NyZWVuUmVhZGVyVGV4dCgpIGNvbnN0IHsgcmV0dXJuIG1faW5mby5zY3Jl ZW5SZWFkZXJUZXh0OyB9CiAgICAgY29uc3QgVmVjdG9yPFZlY3RvcjxXVEY6OlN0cmluZz4+JiBz ZWxlY3RvcnMoKSBjb25zdCB7IHJldHVybiBtX2luZm8uc2VsZWN0b3JzOyB9CiAgICAgV2ViQ29y ZTo6UG9zaXRpb25UeXBlIHBvc2l0aW9uVHlwZSgpIGNvbnN0IHsgcmV0dXJuIG1faW5mby5wb3Np dGlvblR5cGU7IH0KICAgICBXZWJDb3JlOjpGbG9hdFJlY3QgYm91bmRzSW5Sb290VmlldygpIGNv bnN0IHsgcmV0dXJuIG1faW5mby5ib3VuZHNJblJvb3RWaWV3OyB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLVGFyZ2V0ZWRFbGVtZW50SW5mby5oIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1RhcmdldGVkRWxlbWVudEluZm8u aAppbmRleCBmMTIxNzkyOGYxMGUuLmIzZTM3NmZkMDMwZSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1RhcmdldGVkRWxlbWVudEluZm8uaAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLVGFyZ2V0ZWRFbGVtZW50SW5mby5o CkBAIC01Miw2ICs1Miw3IEBAIFdLX0NMQVNTX0FWQUlMQUJMRShtYWNvcyhXS19NQUNfVEJBKSwg aW9zKFdLX0lPU19UQkEpLCB2aXNpb25vcyhXS19YUk9TX1RCQSkpCiBAcHJvcGVydHkgKG5vbmF0 b21pYywgcmVhZG9ubHksIGNvcHkpIE5TQXJyYXk8TlNBcnJheTxOU1N0cmluZyAqPiAqPiAqc2Vs ZWN0b3JzSW5jbHVkaW5nU2hhZG93SG9zdHM7CiBAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9u bHksIGNvcHkpIE5TU3RyaW5nICpyZW5kZXJlZFRleHQ7CiBAcHJvcGVydHkgKG5vbmF0b21pYywg cmVhZG9ubHksIGNvcHkpIE5TU3RyaW5nICpzZWFyY2hhYmxlVGV4dDsKK0Bwcm9wZXJ0eSAobm9u YXRvbWljLCByZWFkb25seSwgY29weSkgTlNTdHJpbmcgKnNjcmVlblJlYWRlclRleHQ7CiBAcHJv cGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIF9XS1JlY3RFZGdlIG9mZnNldEVkZ2VzOwogCiAv LyBJbiByb290IHZpZXcgY29vcmRpbmF0ZXMuIFRvIGJlIGRlcHJlY2F0ZWQgYW5kIHJlbW92ZWQs IG9uY2UgY2xpZW50cyBhZG9wdCB0aGUgbW9yZSBleHBsaWNpdCBib3VuZHMgcHJvcGVydGllcyBh Ym92ZS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tU YXJnZXRlZEVsZW1lbnRJbmZvLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L19XS1RhcmdldGVkRWxlbWVudEluZm8ubW0KaW5kZXggY2FiOWIzMzcxNWZiLi41NjVhMDQxM2Vj OTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tUYXJn ZXRlZEVsZW1lbnRJbmZvLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9fV0tUYXJnZXRlZEVsZW1lbnRJbmZvLm1tCkBAIC0xMTQsNiArMTE0LDExIEBAIC0gKE5TU3Ry aW5nICopc2VhcmNoYWJsZVRleHQKICAgICByZXR1cm4gX2luZm8tPnNlYXJjaGFibGVUZXh0KCk7 CiB9CiAKKy0gKE5TU3RyaW5nICopc2NyZWVuUmVhZGVyVGV4dAoreworICAgIHJldHVybiBfaW5m by0+c2NyZWVuUmVhZGVyVGV4dCgpOworfQorCiAtIChfV0tSZWN0RWRnZSlvZmZzZXRFZGdlcwog ewogICAgIF9XS1JlY3RFZGdlIGVkZ2VzID0gX1dLUmVjdEVkZ2VOb25lOwpkaWZmIC0tZ2l0IGEv VG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9FbGVtZW50VGFyZ2V0aW5nVGVz dHMubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL0VsZW1lbnRUYXJn ZXRpbmdUZXN0cy5tbQppbmRleCA0MDFiZWNiY2RlODkuLjBmZGE1ODUzMDZmOSAxMDA2NDQKLS0t IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9FbGVtZW50VGFyZ2V0aW5n VGVzdHMubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9FbGVt ZW50VGFyZ2V0aW5nVGVzdHMubW0KQEAgLTUwMSw0ICs1MDEsMTQgQEAgVEVTVChFbGVtZW50VGFy Z2V0aW5nLCBBZGp1c3RWaXNpYmlsaXR5QWZ0ZXJSZWNyZWF0aW5nRWxlbWVudCkKICAgICBVdGls OjpydW4oJmRpZEFkanVzdG1lbnQpOwogfQogCitURVNUKEVsZW1lbnRUYXJnZXRpbmcsIFRhcmdl dGVkRWxlbWVudFNjcmVlblJlYWRlclRleHQpCit7CisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHRO UyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCA4 MDAsIDYwMCldKTsKKyAgICBbd2ViVmlldyBzeW5jaHJvbm91c2x5TG9hZFRlc3RQYWdlTmFtZWQ6 QCJlbGVtZW50LXRhcmdldGluZy03Il07CisgICAgUmV0YWluUHRyIGVsZW1lbnQgPSBbW3dlYlZp ZXcgdGFyZ2V0ZWRFbGVtZW50SW5mb0F0OkNHUG9pbnRNYWtlKDEwMCwgMTAwKV0gZmlyc3RPYmpl Y3RdOworCisgICAgRVhQRUNUX1RSVUUoW1tlbGVtZW50IHJlbmRlcmVkVGV4dF0gY29udGFpbnNT dHJpbmc6QCJ7MjAwLDEwMH0iXSk7CisgICAgRVhQRUNUX0ZBTFNFKFtbZWxlbWVudCBzY3JlZW5S ZWFkZXJUZXh0XSBjb250YWluc1N0cmluZzpAInsyMDAsMTAwfSJdKTsKK30KKwogfSAvLyBuYW1l c3BhY2UgVGVzdFdlYktpdEFQSQo= 471395 2024-05-13 14:27:31 -0700 2024-05-14 14:35:42 -0700 Patch bug-274108-20240513142730.patch text/plain 11499 jhoffman23 RnJvbSBkMTE4NTBhOTVkMDY3ZDNmZjc0ZjY0OTNiZTY4ZjU1OGE3M2Y1NTg5IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb3NodWEgSG9mZm1hbiA8am9zaF9ob2ZmbWFuQGFwcGxlLmNv bT4KRGF0ZTogTW9uLCAxMyBNYXkgMjAyNCAxMjo1NToxNSAtMDcwMApTdWJqZWN0OiBbUEFUQ0hd IFtSZW1vdGUgSW5zcGVjdGlvbl0gQVg6IEFkZCBzY3JlZW4gcmVhZGVyIHN1cHBvcnQgZm9yIGVs ZW1lbnQKIHRhcmdldGluZyBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 Mjc0MTA4IHJkYXI6Ly8xMjgwMTkxMjcKClJldmlld2VkIGJ5IFdlbnNvbiBIc2llaC4KClRvIHN1 cmZhY2UgdGFyZ2V0aW5nIGluZm9ybWF0aW9uIHRvIHNjcmVlbiByZWFkZXJzLCB3ZSBuZWVkIHRv IGFkZCBhIG5ldyB0ZXh0IHByb3BlcnR5LApzY3JlZW5SZWFkZXJUZXh0LCB0byBleHBvc2UgdGhv c2UgYml0cyBvZiByZW5kZXJlZCB0ZXh0IHJlbGV2YW50IHRvIHNjcmVlbiByZWFkZXIgdXNlcnMu CgoqIFNvdXJjZS9XZWJDb3JlL3BhZ2UvRWxlbWVudFRhcmdldGluZ0NvbnRyb2xsZXIuY3BwOgoo V2ViQ29yZTo6dGFyZ2V0ZWRFbGVtZW50SW5mbyk6CiogU291cmNlL1dlYkNvcmUvcGFnZS9FbGVt ZW50VGFyZ2V0aW5nVHlwZXMuaDoKKiBTb3VyY2UvV2ViQ29yZS9wYWdlL3RleHQtZXh0cmFjdGlv bi9UZXh0RXh0cmFjdGlvbi5jcHA6CihXZWJDb3JlOjpUZXh0RXh0cmFjdGlvbjo6ZXh0cmFjdFJl bmRlcmVkVGV4dCk6CiogU291cmNlL1dlYkNvcmUvcGFnZS90ZXh0LWV4dHJhY3Rpb24vVGV4dEV4 dHJhY3Rpb24uaDoKKiBTb3VyY2UvV2ViS2l0L1NoYXJlZC9XZWJDb3JlQXJndW1lbnRDb2RlcnMu c2VyaWFsaXphdGlvbi5pbjoKKiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJVGFyZ2V0 ZWRFbGVtZW50SW5mby5oOgoqIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tU YXJnZXRlZEVsZW1lbnRJbmZvLmg6CiogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L19XS1RhcmdldGVkRWxlbWVudEluZm8ubW06CigtW19XS1RhcmdldGVkRWxlbWVudEluZm8gc2Ny ZWVuUmVhZGVyVGV4dF0pOgoqIFRvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev RWxlbWVudFRhcmdldGluZ1Rlc3RzLm1tOgooVGVzdFdlYktpdEFQSTo6VEVTVChFbGVtZW50VGFy Z2V0aW5nLCBUYXJnZXRlZEVsZW1lbnRTY3JlZW5SZWFkZXJUZXh0KSk6Ci0tLQogLi4uL3BhZ2Uv RWxlbWVudFRhcmdldGluZ0NvbnRyb2xsZXIuY3BwICAgICAgIHwgIDMgKystCiBTb3VyY2UvV2Vi Q29yZS9wYWdlL0VsZW1lbnRUYXJnZXRpbmdUeXBlcy5oICAgfCAgMSArCiAuLi4vcGFnZS90ZXh0 LWV4dHJhY3Rpb24vVGV4dEV4dHJhY3Rpb24uY3BwICAgfCAyNiArKysrKysrKysrKy0tLS0tLS0t CiAuLi4vcGFnZS90ZXh0LWV4dHJhY3Rpb24vVGV4dEV4dHJhY3Rpb24uaCAgICAgfCAgNCArKy0K IC4uLi9XZWJDb3JlQXJndW1lbnRDb2RlcnMuc2VyaWFsaXphdGlvbi5pbiAgICB8ICAxICsKIC4u Li9VSVByb2Nlc3MvQVBJL0FQSVRhcmdldGVkRWxlbWVudEluZm8uaCAgICB8ICAxICsKIC4uLi9B UEkvQ29jb2EvX1dLVGFyZ2V0ZWRFbGVtZW50SW5mby5oICAgICAgICB8ICAxICsKIC4uLi9BUEkv Q29jb2EvX1dLVGFyZ2V0ZWRFbGVtZW50SW5mby5tbSAgICAgICB8ICA1ICsrKysKIC4uLi9XZWJL aXRDb2NvYS9FbGVtZW50VGFyZ2V0aW5nVGVzdHMubW0gICAgICB8IDEwICsrKysrKysKIDkgZmls ZXMgY2hhbmdlZCwgMzkgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGFnZS9FbGVtZW50VGFyZ2V0aW5nQ29udHJvbGxlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wYWdlL0VsZW1lbnRUYXJnZXRpbmdDb250cm9sbGVyLmNwcAppbmRleCAy ZDgyYTZmNjk4ZWIuLjQyNGQwNGU0MjgxNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFn ZS9FbGVtZW50VGFyZ2V0aW5nQ29udHJvbGxlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFn ZS9FbGVtZW50VGFyZ2V0aW5nQ29udHJvbGxlci5jcHAKQEAgLTU5OCw4ICs1OTgsOSBAQCBzdGF0 aWMgVGFyZ2V0ZWRFbGVtZW50SW5mbyB0YXJnZXRlZEVsZW1lbnRJbmZvKEVsZW1lbnQmIGVsZW1l bnQsIElzTmVhcmJ5VGFyZ2V0CiAgICAgICAgIC5lbGVtZW50SWRlbnRpZmllciA9IGVsZW1lbnQu aWRlbnRpZmllcigpLAogICAgICAgICAuZG9jdW1lbnRJZGVudGlmaWVyID0gZWxlbWVudC5kb2N1 bWVudCgpLmlkZW50aWZpZXIoKSwKICAgICAgICAgLm9mZnNldEVkZ2VzID0gY29tcHV0ZU9mZnNl dEVkZ2VzKHJlbmRlcmVyLT5zdHlsZSgpKSwKLSAgICAgICAgLnJlbmRlcmVkVGV4dCA9IFRleHRF eHRyYWN0aW9uOjpleHRyYWN0UmVuZGVyZWRUZXh0KGVsZW1lbnQpLAorICAgICAgICAucmVuZGVy ZWRUZXh0ID0gVGV4dEV4dHJhY3Rpb246OmV4dHJhY3RSZW5kZXJlZFRleHQoZWxlbWVudCwgVGV4 dEV4dHJhY3Rpb246OkluY2x1ZGVHZW9tZXRyeVRleHQ6OlllcyksCiAgICAgICAgIC5zZWFyY2hh YmxlVGV4dCA9IHNlYXJjaGFibGVUZXh0Rm9yVGFyZ2V0KGVsZW1lbnQpLAorICAgICAgICAuc2Ny ZWVuUmVhZGVyVGV4dCA9IFRleHRFeHRyYWN0aW9uOjpleHRyYWN0UmVuZGVyZWRUZXh0KGVsZW1l bnQsIFRleHRFeHRyYWN0aW9uOjpJbmNsdWRlR2VvbWV0cnlUZXh0OjpObyksCiAgICAgICAgIC5z ZWxlY3RvcnMgPSBzZWxlY3RvcnNGb3JUYXJnZXQoZWxlbWVudCwgY2FjaGUpLAogICAgICAgICAu Ym91bmRzSW5Sb290VmlldyA9IGVsZW1lbnQuYm91bmRpbmdCb3hJblJvb3RWaWV3Q29vcmRpbmF0 ZXMoKSwKICAgICAgICAgLmJvdW5kc0luQ2xpZW50Q29vcmRpbmF0ZXMgPSBjb21wdXRlQ2xpZW50 UmVjdCgqcmVuZGVyZXIpLApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9FbGVtZW50 VGFyZ2V0aW5nVHlwZXMuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvRWxlbWVudFRhcmdldGluZ1R5 cGVzLmgKaW5kZXggYmIwODFjMmVmZGQ1Li4yNWQwYzMyNjhiZWQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvRWxlbWVudFRhcmdldGluZ1R5cGVzLmgKKysrIGIvU291cmNlL1dlYkNv cmUvcGFnZS9FbGVtZW50VGFyZ2V0aW5nVHlwZXMuaApAQCAtNTcsNiArNTcsNyBAQCBzdHJ1Y3Qg VGFyZ2V0ZWRFbGVtZW50SW5mbyB7CiAgICAgUmVjdEVkZ2VzPGJvb2w+IG9mZnNldEVkZ2VzOwog ICAgIFN0cmluZyByZW5kZXJlZFRleHQ7CiAgICAgU3RyaW5nIHNlYXJjaGFibGVUZXh0OworICAg IFN0cmluZyBzY3JlZW5SZWFkZXJUZXh0OwogICAgIFZlY3RvcjxWZWN0b3I8U3RyaW5nPj4gc2Vs ZWN0b3JzOwogICAgIEZsb2F0UmVjdCBib3VuZHNJblJvb3RWaWV3OwogICAgIEZsb2F0UmVjdCBi b3VuZHNJbkNsaWVudENvb3JkaW5hdGVzOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFn ZS90ZXh0LWV4dHJhY3Rpb24vVGV4dEV4dHJhY3Rpb24uY3BwIGIvU291cmNlL1dlYkNvcmUvcGFn ZS90ZXh0LWV4dHJhY3Rpb24vVGV4dEV4dHJhY3Rpb24uY3BwCmluZGV4IDM3ZGRiMmU1MzIwZi4u ZDhkNDZiYTZiOWFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3RleHQtZXh0cmFj dGlvbi9UZXh0RXh0cmFjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGFnZS90ZXh0LWV4 dHJhY3Rpb24vVGV4dEV4dHJhY3Rpb24uY3BwCkBAIC00NjYsNyArNDY2LDcgQEAgc3RhdGljIElu dFNpemUgcmVkdWNlUHJlY2lzaW9uKEZsb2F0U2l6ZSBzaXplKQogICAgIH07CiB9CiAKLXN0YXRp YyB2b2lkIGV4dHJhY3RSZW5kZXJlZFRleHQoVmVjdG9yPFN0cmluZ3NBbmRCbG9ja09mZnNldD4m IHN0cmluZ3NBbmRPZmZzZXRzLCBDb250YWluZXJOb2RlJiBub2RlLCBCbG9ja0Zsb3dEaXJlY3Rp b24gZGlyZWN0aW9uKQorc3RhdGljIHZvaWQgZXh0cmFjdFJlbmRlcmVkVGV4dChWZWN0b3I8U3Ry aW5nc0FuZEJsb2NrT2Zmc2V0PiYgc3RyaW5nc0FuZE9mZnNldHMsIENvbnRhaW5lck5vZGUmIG5v ZGUsIEJsb2NrRmxvd0RpcmVjdGlvbiBkaXJlY3Rpb24sIEluY2x1ZGVHZW9tZXRyeVRleHQgaW5j bHVkZUdlb21ldHJ5VGV4dCkKIHsKICAgICBDaGVja2VkUHRyIHJlbmRlcmVyID0gbm9kZS5yZW5k ZXJlcigpOwogICAgIGlmICghcmVuZGVyZXIpCkBAIC01MDYsNyArNTA2LDcgQEAgc3RhdGljIHZv aWQgZXh0cmFjdFJlbmRlcmVkVGV4dChWZWN0b3I8U3RyaW5nc0FuZEJsb2NrT2Zmc2V0PiYgc3Ry aW5nc0FuZE9mZnNldHMKIAogICAgIGlmIChDaGVja2VkUHRyIGZyYW1lUmVuZGVyZXIgPSBkeW5h bWljRG93bmNhc3Q8UmVuZGVySUZyYW1lPigqcmVuZGVyZXIpKSB7CiAgICAgICAgIGlmIChhdXRv IGNvbnRlbnREb2N1bWVudCA9IGZyYW1lUmVuZGVyZXItPmlmcmFtZUVsZW1lbnQoKS5wcm90ZWN0 ZWRDb250ZW50RG9jdW1lbnQoKSkKLSAgICAgICAgICAgIGV4dHJhY3RSZW5kZXJlZFRleHQoc3Ry aW5nc0FuZE9mZnNldHMsICpjb250ZW50RG9jdW1lbnQsIGRpcmVjdGlvbik7CisgICAgICAgICAg ICBleHRyYWN0UmVuZGVyZWRUZXh0KHN0cmluZ3NBbmRPZmZzZXRzLCAqY29udGVudERvY3VtZW50 LCBkaXJlY3Rpb24sIGluY2x1ZGVHZW9tZXRyeVRleHQpOwogICAgICAgICByZXR1cm47CiAgICAg fQogCkBAIC01MTgsOSArNTE4LDExIEBAIHN0YXRpYyB2b2lkIGV4dHJhY3RSZW5kZXJlZFRleHQo VmVjdG9yPFN0cmluZ3NBbmRCbG9ja09mZnNldD4mIHN0cmluZ3NBbmRPZmZzZXRzCiAgICAgICAg IGFwcGVuZFN0cmluZ3MoeyBtYWtlU3RyaW5nKCd7Jywgcm91bmRlZFNpemVJZ25vcmluZ1pvb20u d2lkdGgoKSwgJywnLCByb3VuZGVkU2l6ZUlnbm9yaW5nWm9vbS5oZWlnaHQoKSwgJ30nKSB9LCBm cmFtZVZpZXctPmNvbnRlbnRzVG9Sb290VmlldyhyZW5kZXJSZXBsYWNlZC5hYnNvbHV0ZUJvdW5k aW5nQm94UmVjdCgpKSk7CiAgICAgfTsKIAotICAgIGlmIChDaGVja2VkUHRyIHJlbmRlclJlcGxh Y2VkID0gZHluYW1pY0Rvd25jYXN0PFJlbmRlclJlcGxhY2VkPigqcmVuZGVyZXIpKSB7Ci0gICAg ICAgIGFwcGVuZFJlcGxhY2VkUmVuZGVyZXIoKnJlbmRlclJlcGxhY2VkKTsKLSAgICAgICAgcmV0 dXJuOworICAgIGlmIChpbmNsdWRlR2VvbWV0cnlUZXh0ID09IEluY2x1ZGVHZW9tZXRyeVRleHQ6 OlllcykgeworICAgICAgICBpZiAoQ2hlY2tlZFB0ciByZW5kZXJSZXBsYWNlZCA9IGR5bmFtaWNE b3duY2FzdDxSZW5kZXJSZXBsYWNlZD4oKnJlbmRlcmVyKSkgeworICAgICAgICAgICAgYXBwZW5k UmVwbGFjZWRSZW5kZXJlcigqcmVuZGVyUmVwbGFjZWQpOworICAgICAgICAgICAgcmV0dXJuOwor ICAgICAgICB9CiAgICAgfQogCiAgICAgZm9yIChhdXRvJiBkZXNjZW5kYW50IDogZGVzY2VuZGFu dHNPZlR5cGU8UmVuZGVyT2JqZWN0PigqcmVuZGVyZXIpKSB7CkBAIC01NDUsMTggKzU0NywyMCBA QCBzdGF0aWMgdm9pZCBleHRyYWN0UmVuZGVyZWRUZXh0KFZlY3RvcjxTdHJpbmdzQW5kQmxvY2tP ZmZzZXQ+JiBzdHJpbmdzQW5kT2Zmc2V0cwogCiAgICAgICAgIGlmIChDaGVja2VkUHRyIGZyYW1l UmVuZGVyZXIgPSBkeW5hbWljRG93bmNhc3Q8UmVuZGVySUZyYW1lPihkZXNjZW5kYW50KSkgewog ICAgICAgICAgICAgaWYgKGF1dG8gY29udGVudERvY3VtZW50ID0gZnJhbWVSZW5kZXJlci0+aWZy YW1lRWxlbWVudCgpLnByb3RlY3RlZENvbnRlbnREb2N1bWVudCgpKQotICAgICAgICAgICAgICAg IGV4dHJhY3RSZW5kZXJlZFRleHQoc3RyaW5nc0FuZE9mZnNldHMsICpjb250ZW50RG9jdW1lbnQs IGRpcmVjdGlvbik7CisgICAgICAgICAgICAgICAgZXh0cmFjdFJlbmRlcmVkVGV4dChzdHJpbmdz QW5kT2Zmc2V0cywgKmNvbnRlbnREb2N1bWVudCwgZGlyZWN0aW9uLCBpbmNsdWRlR2VvbWV0cnlU ZXh0KTsKICAgICAgICAgICAgIGNvbnRpbnVlOwogICAgICAgICB9CiAKLSAgICAgICAgaWYgKENo ZWNrZWRQdHIgcmVuZGVyUmVwbGFjZWQgPSBkeW5hbWljRG93bmNhc3Q8UmVuZGVyUmVwbGFjZWQ+ KGRlc2NlbmRhbnQpKSB7Ci0gICAgICAgICAgICBhcHBlbmRSZXBsYWNlZFJlbmRlcmVyKCpyZW5k ZXJSZXBsYWNlZCk7Ci0gICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgaWYgKGluY2x1ZGVH ZW9tZXRyeVRleHQgPT0gSW5jbHVkZUdlb21ldHJ5VGV4dDo6WWVzKSB7CisgICAgICAgICAgICBp ZiAoQ2hlY2tlZFB0ciByZW5kZXJSZXBsYWNlZCA9IGR5bmFtaWNEb3duY2FzdDxSZW5kZXJSZXBs YWNlZD4oZGVzY2VuZGFudCkpIHsKKyAgICAgICAgICAgICAgICBhcHBlbmRSZXBsYWNlZFJlbmRl cmVyKCpyZW5kZXJSZXBsYWNlZCk7CisgICAgICAgICAgICAgICAgY29udGludWU7CisgICAgICAg ICAgICB9CiAgICAgICAgIH0KICAgICB9CiB9CiAKLVN0cmluZyBleHRyYWN0UmVuZGVyZWRUZXh0 KEVsZW1lbnQmIGVsZW1lbnQpCitTdHJpbmcgZXh0cmFjdFJlbmRlcmVkVGV4dChFbGVtZW50JiBl bGVtZW50LCBJbmNsdWRlR2VvbWV0cnlUZXh0IGluY2x1ZGVHZW9tZXRyeVRleHQpCiB7CiAgICAg aWYgKCFlbGVtZW50LnJlbmRlcmVyKCkpCiAgICAgICAgIHJldHVybiBlbXB0eVN0cmluZygpOwpA QCAtNTY0LDcgKzU2OCw3IEBAIFN0cmluZyBleHRyYWN0UmVuZGVyZWRUZXh0KEVsZW1lbnQmIGVs ZW1lbnQpCiAgICAgYXV0byBkaXJlY3Rpb24gPSBlbGVtZW50LnJlbmRlcmVyKCktPnN0eWxlKCku YmxvY2tGbG93RGlyZWN0aW9uKCk7CiAKICAgICBWZWN0b3I8U3RyaW5nc0FuZEJsb2NrT2Zmc2V0 PiBzdHJpbmdzQW5kT2Zmc2V0czsKLSAgICBleHRyYWN0UmVuZGVyZWRUZXh0KHN0cmluZ3NBbmRP ZmZzZXRzLCBlbGVtZW50LCBkaXJlY3Rpb24pOworICAgIGV4dHJhY3RSZW5kZXJlZFRleHQoc3Ry aW5nc0FuZE9mZnNldHMsIGVsZW1lbnQsIGRpcmVjdGlvbiwgaW5jbHVkZUdlb21ldHJ5VGV4dCk7 CiAKICAgICBib29sIGFzY2VuZGluZ09yZGVyID0gWyZdIHsKICAgICAgICAgc3dpdGNoIChkaXJl Y3Rpb24pIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvdGV4dC1leHRyYWN0aW9u L1RleHRFeHRyYWN0aW9uLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL3RleHQtZXh0cmFjdGlvbi9U ZXh0RXh0cmFjdGlvbi5oCmluZGV4IDZkMmI2ZDQ2ZmQ5ZS4uZTQ1MWVmMmRmNDM0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL3RleHQtZXh0cmFjdGlvbi9UZXh0RXh0cmFjdGlvbi5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvdGV4dC1leHRyYWN0aW9uL1RleHRFeHRyYWN0aW9u LmgKQEAgLTM3LDkgKzM3LDExIEBAIGVudW0gY2xhc3MgRXhjZXB0aW9uQ29kZSA6IHVpbnQ4X3Q7 CiAKIG5hbWVzcGFjZSBUZXh0RXh0cmFjdGlvbiB7CiAKK2VudW0gY2xhc3MgSW5jbHVkZUdlb21l dHJ5VGV4dCA6IGJvb2wgeyBObywgWWVzIH07CisKIFdFQkNPUkVfRVhQT1JUIEl0ZW0gZXh0cmFj dEl0ZW0oc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpGbG9hdFJlY3Q+JiYgY29sbGVjdGlvblJlY3RJ blJvb3RWaWV3LCBQYWdlJik7CiAKLVN0cmluZyBleHRyYWN0UmVuZGVyZWRUZXh0KEVsZW1lbnQm KTsKK1N0cmluZyBleHRyYWN0UmVuZGVyZWRUZXh0KEVsZW1lbnQmLCBJbmNsdWRlR2VvbWV0cnlU ZXh0KTsKIAogfSAvLyBuYW1lc3BhY2UgVGV4dEV4dHJhY3Rpb24KIH0gLy8gbmFtZXNwYWNlIFdl YkNvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENv ZGVycy5zZXJpYWxpemF0aW9uLmluIGIvU291cmNlL1dlYktpdC9TaGFyZWQvV2ViQ29yZUFyZ3Vt ZW50Q29kZXJzLnNlcmlhbGl6YXRpb24uaW4KaW5kZXggMTA1ODhhOGYyZDlmLi5hMDUwZDVjZjUy YzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYkNvcmVBcmd1bWVudENvZGVy cy5zZXJpYWxpemF0aW9uLmluCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1dlYkNvcmVBcmd1 bWVudENvZGVycy5zZXJpYWxpemF0aW9uLmluCkBAIC05MDQsNiArOTA0LDcgQEAgaGVhZGVyOiA8 V2ViQ29yZS9FbGVtZW50VGFyZ2V0aW5nVHlwZXMuaD4KICAgICBXZWJDb3JlOjpSZWN0RWRnZXM8 Ym9vbD4gb2Zmc2V0RWRnZXMKICAgICBTdHJpbmcgcmVuZGVyZWRUZXh0CiAgICAgU3RyaW5nIHNl YXJjaGFibGVUZXh0CisgICAgU3RyaW5nIHNjcmVlblJlYWRlclRleHQ7CiAgICAgVmVjdG9yPFZl Y3RvcjxTdHJpbmc+PiBzZWxlY3RvcnMKICAgICBXZWJDb3JlOjpGbG9hdFJlY3QgYm91bmRzSW5S b290VmlldwogICAgIFdlYkNvcmU6OkZsb2F0UmVjdCBib3VuZHNJbkNsaWVudENvb3JkaW5hdGVz CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJVGFyZ2V0ZWRFbGVt ZW50SW5mby5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVRhcmdldGVkRWxlbWVu dEluZm8uaAppbmRleCBmOTU5YWJhZWQxNGYuLjEyNGRkMjk0NDcwNSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0FQSVRhcmdldGVkRWxlbWVudEluZm8uaAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQVBJVGFyZ2V0ZWRFbGVtZW50SW5mby5oCkBAIC01 Miw2ICs1Miw3IEBAIHB1YmxpYzoKIAogICAgIGNvbnN0IFdURjo6U3RyaW5nJiByZW5kZXJlZFRl eHQoKSBjb25zdCB7IHJldHVybiBtX2luZm8ucmVuZGVyZWRUZXh0OyB9CiAgICAgY29uc3QgV1RG OjpTdHJpbmcmIHNlYXJjaGFibGVUZXh0KCkgY29uc3QgeyByZXR1cm4gbV9pbmZvLnNlYXJjaGFi bGVUZXh0OyB9CisgICAgY29uc3QgV1RGOjpTdHJpbmcmIHNjcmVlblJlYWRlclRleHQoKSBjb25z dCB7IHJldHVybiBtX2luZm8uc2NyZWVuUmVhZGVyVGV4dDsgfQogICAgIGNvbnN0IFZlY3RvcjxW ZWN0b3I8V1RGOjpTdHJpbmc+PiYgc2VsZWN0b3JzKCkgY29uc3QgeyByZXR1cm4gbV9pbmZvLnNl bGVjdG9yczsgfQogICAgIFdlYkNvcmU6OlBvc2l0aW9uVHlwZSBwb3NpdGlvblR5cGUoKSBjb25z dCB7IHJldHVybiBtX2luZm8ucG9zaXRpb25UeXBlOyB9CiAgICAgV2ViQ29yZTo6RmxvYXRSZWN0 IGJvdW5kc0luUm9vdFZpZXcoKSBjb25zdCB7IHJldHVybiBtX2luZm8uYm91bmRzSW5Sb290Vmll dzsgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1Rh cmdldGVkRWxlbWVudEluZm8uaCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9f V0tUYXJnZXRlZEVsZW1lbnRJbmZvLmgKaW5kZXggZjEyMTc5MjhmMTBlLi5iM2UzNzZmZDAzMGUg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tUYXJnZXRl ZEVsZW1lbnRJbmZvLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL19X S1RhcmdldGVkRWxlbWVudEluZm8uaApAQCAtNTIsNiArNTIsNyBAQCBXS19DTEFTU19BVkFJTEFC TEUobWFjb3MoV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSwgdmlzaW9ub3MoV0tfWFJPU19U QkEpKQogQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5LCBjb3B5KSBOU0FycmF5PE5TQXJy YXk8TlNTdHJpbmcgKj4gKj4gKnNlbGVjdG9yc0luY2x1ZGluZ1NoYWRvd0hvc3RzOwogQHByb3Bl cnR5IChub25hdG9taWMsIHJlYWRvbmx5LCBjb3B5KSBOU1N0cmluZyAqcmVuZGVyZWRUZXh0Owog QHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5LCBjb3B5KSBOU1N0cmluZyAqc2VhcmNoYWJs ZVRleHQ7CitAcHJvcGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHksIGNvcHkpIE5TU3RyaW5nICpz Y3JlZW5SZWFkZXJUZXh0OwogQHByb3BlcnR5IChub25hdG9taWMsIHJlYWRvbmx5KSBfV0tSZWN0 RWRnZSBvZmZzZXRFZGdlczsKIAogLy8gSW4gcm9vdCB2aWV3IGNvb3JkaW5hdGVzLiBUbyBiZSBk ZXByZWNhdGVkIGFuZCByZW1vdmVkLCBvbmNlIGNsaWVudHMgYWRvcHQgdGhlIG1vcmUgZXhwbGlj aXQgYm91bmRzIHByb3BlcnRpZXMgYWJvdmUuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvX1dLVGFyZ2V0ZWRFbGVtZW50SW5mby5tbSBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tUYXJnZXRlZEVsZW1lbnRJbmZvLm1tCmluZGV4IGNh YjliMzM3MTVmYi4uNTY1YTA0MTNlYzk1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9BUEkvQ29jb2EvX1dLVGFyZ2V0ZWRFbGVtZW50SW5mby5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLVGFyZ2V0ZWRFbGVtZW50SW5mby5tbQpAQCAtMTE0 LDYgKzExNCwxMSBAQCAtIChOU1N0cmluZyAqKXNlYXJjaGFibGVUZXh0CiAgICAgcmV0dXJuIF9p bmZvLT5zZWFyY2hhYmxlVGV4dCgpOwogfQogCistIChOU1N0cmluZyAqKXNjcmVlblJlYWRlclRl eHQKK3sKKyAgICByZXR1cm4gX2luZm8tPnNjcmVlblJlYWRlclRleHQoKTsKK30KKwogLSAoX1dL UmVjdEVkZ2Upb2Zmc2V0RWRnZXMKIHsKICAgICBfV0tSZWN0RWRnZSBlZGdlcyA9IF9XS1JlY3RF ZGdlTm9uZTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29j b2EvRWxlbWVudFRhcmdldGluZ1Rlc3RzLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9FbGVtZW50VGFyZ2V0aW5nVGVzdHMubW0KaW5kZXggNDAxYmVjYmNkZTg5Li4w ZmRhNTg1MzA2ZjkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvRWxlbWVudFRhcmdldGluZ1Rlc3RzLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvRWxlbWVudFRhcmdldGluZ1Rlc3RzLm1tCkBAIC01MDEsNCArNTAx LDE0IEBAIFRFU1QoRWxlbWVudFRhcmdldGluZywgQWRqdXN0VmlzaWJpbGl0eUFmdGVyUmVjcmVh dGluZ0VsZW1lbnQpCiAgICAgVXRpbDo6cnVuKCZkaWRBZGp1c3RtZW50KTsKIH0KIAorVEVTVChF bGVtZW50VGFyZ2V0aW5nLCBUYXJnZXRlZEVsZW1lbnRTY3JlZW5SZWFkZXJUZXh0KQoreworICAg IGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZy YW1lOkNHUmVjdE1ha2UoMCwgMCwgODAwLCA2MDApXSk7CisgICAgW3dlYlZpZXcgc3luY2hyb25v dXNseUxvYWRUZXN0UGFnZU5hbWVkOkAiZWxlbWVudC10YXJnZXRpbmctNyJdOworICAgIFJldGFp blB0ciBlbGVtZW50ID0gW1t3ZWJWaWV3IHRhcmdldGVkRWxlbWVudEluZm9BdDpDR1BvaW50TWFr ZSgxMDAsIDEwMCldIGZpcnN0T2JqZWN0XTsKKworICAgIEVYUEVDVF9UUlVFKFtbZWxlbWVudCBy ZW5kZXJlZFRleHRdIGNvbnRhaW5zU3RyaW5nOkAiezIwMCwxMDB9Il0pOworICAgIEVYUEVDVF9G QUxTRShbW2VsZW1lbnQgc2NyZWVuUmVhZGVyVGV4dF0gY29udGFpbnNTdHJpbmc6QCJ7MjAwLDEw MH0iXSk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkK