228886 2021-08-06 20:05:15 -0700 Clarify some identifier naming in RemoteRenderingBackend 2021-08-06 21:30:24 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser sabouhallawa simon.fraser webkit-bug-importer oldest_to_newest 1782646 0 simon.fraser 2021-08-06 20:05:15 -0700 Clarify some identifier naming in RemoteRenderingBackend 1782648 1 435111 simon.fraser 2021-08-06 20:06:03 -0700 Created attachment 435111 Patch 1782650 2 435111 sabouhallawa 2021-08-06 20:13:52 -0700 Comment on attachment 435111 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=435111&action=review > Source/WebKit/GPUProcess/graphics/RemoteRenderingBackend.cpp:341 > + // FIXME: All the callers pass m_pendingWakeupInfo.arguments so the body of this function should just be this loop. I am not sure I understand this comment. How should this function look in the future? 1782657 3 ews-feeder 2021-08-06 21:29:59 -0700 Committed r280754 (240339@main): <https://commits.webkit.org/240339@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 435111. 1782658 4 webkit-bug-importer 2021-08-06 21:30:24 -0700 <rdar://problem/81644215> 435111 2021-08-06 20:06:03 -0700 2021-08-06 21:30:00 -0700 Patch bug-228886-20210806200603.patch text/plain 8589 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNjUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGRhNmUyNTg2NzZhZWM1ZjM5 NzQ1M2JlNzU5NTFiZWE4NjAxNTI1ZmMuLmY2ZGY3YWYxNTgzYmVlZTJhZGU3NjllMGYwOWY1YjRm NWRkZDA3MWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjEtMDgtMDYgIFNpbW9uIEZy YXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgQ2xhcmlmeSBzb21lIGlk ZW50aWZpZXIgbmFtaW5nIGluIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyODg4NgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlbmFtZSBzb21lICJpZGVudGlmaWVy IiB2YXJpYWJsZXMgdG8gZGlmZmVyZW50aWF0ZSBiZXR3ZWVuIHJlc291cmNlIGlkZW50aWZpZXJz IGFuZAorICAgICAgICBpdGVtIGJ1ZmZlciBpZGVudGlmaWVycy4KKworICAgICAgICBObyBiZWhh dmlvciBjaGFuZ2UuCisKKyAgICAgICAgKiBHUFVQcm9jZXNzL2dyYXBoaWNzL1JlbW90ZVJlbmRl cmluZ0JhY2tlbmQuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5k OjpjcmVhdGVJbWFnZUJ1ZmZlcik6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlbmRlcmluZ0Jh Y2tlbmQ6Ondha2VVcEFuZEFwcGx5RGlzcGxheUxpc3QpOgorICAgICAgICAoV2ViS2l0OjpSZW1v dGVSZW5kZXJpbmdCYWNrZW5kOjpjYWNoZU5hdGl2ZUltYWdlKToKKyAgICAgICAgKFdlYktpdDo6 UmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6Y2FjaGVGb250KToKKyAgICAgICAgKFdlYktpdDo6UmVt b3RlUmVuZGVyaW5nQmFja2VuZDo6ZGlkQ3JlYXRlU2hhcmVkRGlzcGxheUxpc3RIYW5kbGUpOgor CiAyMDIxLTA4LTA2ICBTaW1vbiBGcmFzZXIgIDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAg ICAgICAgIFBhZ2Ugb24gbWhsdy5nby5qcCB0cmlnZ2VycyBXZWJDb250ZW50IHRlcm1pbmF0aW9u IGJ5IEdQVSBwcm9jZXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvZ3Jh cGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZC5jcHAgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nl c3MvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZC5jcHAKaW5kZXggMzk0NGQ1NWFmNzli ZGEyMTQxZmMyYmI5ZWVlNTFmYTEwOGE1NTc2Ni4uNDY0ZjJhYTQ0OGE0ODJkM2M1MzRiNWI2M2Nm MTZmNDgwZDFiODVmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL2dyYXBo aWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvR1BVUHJv Y2Vzcy9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kLmNwcApAQCAtMTUyLDcgKzE1Miw3 IEBAIHZvaWQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6ZGlkRmx1c2goRGlzcGxheUxpc3Q6OkZs dXNoSWRlbnRpZmllciBmbHVzaElkZW50aWZpCiAgICAgc2VuZChNZXNzYWdlczo6UmVtb3RlUmVu ZGVyaW5nQmFja2VuZFByb3h5OjpEaWRGbHVzaChmbHVzaElkZW50aWZpZXIsIHJlbmRlcmluZ1Jl c291cmNlSWRlbnRpZmllciksIG1fcmVuZGVyaW5nQmFja2VuZElkZW50aWZpZXIpOwogfQogCi12 b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OmNyZWF0ZUltYWdlQnVmZmVyKGNvbnN0IEZsb2F0 U2l6ZSYgbG9naWNhbFNpemUsIFJlbmRlcmluZ01vZGUgcmVuZGVyaW5nTW9kZSwgZmxvYXQgcmVz b2x1dGlvblNjYWxlLCBjb25zdCBEZXN0aW5hdGlvbkNvbG9yU3BhY2UmIGNvbG9yU3BhY2UsIFBp eGVsRm9ybWF0IHBpeGVsRm9ybWF0LCBSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIgcmVuZGVy aW5nUmVzb3VyY2VJZGVudGlmaWVyKQordm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpjcmVh dGVJbWFnZUJ1ZmZlcihjb25zdCBGbG9hdFNpemUmIGxvZ2ljYWxTaXplLCBSZW5kZXJpbmdNb2Rl IHJlbmRlcmluZ01vZGUsIGZsb2F0IHJlc29sdXRpb25TY2FsZSwgY29uc3QgRGVzdGluYXRpb25D b2xvclNwYWNlJiBjb2xvclNwYWNlLCBQaXhlbEZvcm1hdCBwaXhlbEZvcm1hdCwgUmVuZGVyaW5n UmVzb3VyY2VJZGVudGlmaWVyIGltYWdlQnVmZmVyUmVzb3VyY2VJZGVudGlmaWVyKQogewogICAg IEFTU0VSVCghUnVuTG9vcDo6aXNNYWluKCkpOwogICAgIEFTU0VSVChyZW5kZXJpbmdNb2RlID09 IFJlbmRlcmluZ01vZGU6OkFjY2VsZXJhdGVkIHx8IHJlbmRlcmluZ01vZGUgPT0gUmVuZGVyaW5n TW9kZTo6VW5hY2NlbGVyYXRlZCk7CkBAIC0xNjAsNyArMTYwLDcgQEAgdm9pZCBSZW1vdGVSZW5k ZXJpbmdCYWNrZW5kOjpjcmVhdGVJbWFnZUJ1ZmZlcihjb25zdCBGbG9hdFNpemUmIGxvZ2ljYWxT aXplLCBSZW4KICAgICBSZWZQdHI8SW1hZ2VCdWZmZXI+IGltYWdlQnVmZmVyOwogCiAgICAgaWYg KHJlbmRlcmluZ01vZGUgPT0gUmVuZGVyaW5nTW9kZTo6QWNjZWxlcmF0ZWQpIHsKLSAgICAgICAg aWYgKGF1dG8gYWNjZWxlcmF0ZWRJbWFnZUJ1ZmZlciA9IEFjY2VsZXJhdGVkUmVtb3RlSW1hZ2VC dWZmZXI6OmNyZWF0ZShsb2dpY2FsU2l6ZSwgcmVzb2x1dGlvblNjYWxlLCBjb2xvclNwYWNlLCBw aXhlbEZvcm1hdCwgKnRoaXMsIHJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcikpIHsKKyAgICAg ICAgaWYgKGF1dG8gYWNjZWxlcmF0ZWRJbWFnZUJ1ZmZlciA9IEFjY2VsZXJhdGVkUmVtb3RlSW1h Z2VCdWZmZXI6OmNyZWF0ZShsb2dpY2FsU2l6ZSwgcmVzb2x1dGlvblNjYWxlLCBjb2xvclNwYWNl LCBwaXhlbEZvcm1hdCwgKnRoaXMsIGltYWdlQnVmZmVyUmVzb3VyY2VJZGVudGlmaWVyKSkgewog I2lmIEhBVkUoSU9TVVJGQUNFX1NFVF9PV05FUlNISVBfSURFTlRJVFkpCiAgICAgICAgICAgICAv LyBNYXJrIHRoZSBJT1N1cmZhY2UgYXMgYmVpbmcgb3duZWQgYnkgdGhlIFdlYlByb2Nlc3MgZXZl biB0aG91Z2ggaXQgd2FzIGNvbnN0cnVjdGVkIGJ5IHRoZSBHUFVQcm9jZXNzIHNvIHRoYXQgSmV0 c2FtIGtub3dzIHdoaWNoIHByb2Nlc3MgdG8ga2lsbC4KICAgICAgICAgICAgIGFjY2VsZXJhdGVk SW1hZ2VCdWZmZXItPnNldFByb2Nlc3NPd25lcnNoaXAobV9ncHVDb25uZWN0aW9uVG9XZWJQcm9j ZXNzLT53ZWJQcm9jZXNzSWRlbnRpdHlUb2tlbigpKTsKQEAgLTE3MCw3ICsxNzAsNyBAQCB2b2lk IFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OmNyZWF0ZUltYWdlQnVmZmVyKGNvbnN0IEZsb2F0U2l6 ZSYgbG9naWNhbFNpemUsIFJlbgogICAgIH0KIAogICAgIGlmICghaW1hZ2VCdWZmZXIpCi0gICAg ICAgIGltYWdlQnVmZmVyID0gVW5hY2NlbGVyYXRlZFJlbW90ZUltYWdlQnVmZmVyOjpjcmVhdGUo bG9naWNhbFNpemUsIHJlc29sdXRpb25TY2FsZSwgY29sb3JTcGFjZSwgcGl4ZWxGb3JtYXQsICp0 aGlzLCByZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIpOworICAgICAgICBpbWFnZUJ1ZmZlciA9 IFVuYWNjZWxlcmF0ZWRSZW1vdGVJbWFnZUJ1ZmZlcjo6Y3JlYXRlKGxvZ2ljYWxTaXplLCByZXNv bHV0aW9uU2NhbGUsIGNvbG9yU3BhY2UsIHBpeGVsRm9ybWF0LCAqdGhpcywgaW1hZ2VCdWZmZXJS ZXNvdXJjZUlkZW50aWZpZXIpOwogCiAgICAgaWYgKCFpbWFnZUJ1ZmZlcikgewogICAgICAgICBB U1NFUlRfTk9UX1JFQUNIRUQoKTsKQEAgLTE4MCw3ICsxODAsNyBAQCB2b2lkIFJlbW90ZVJlbmRl cmluZ0JhY2tlbmQ6OmNyZWF0ZUltYWdlQnVmZmVyKGNvbnN0IEZsb2F0U2l6ZSYgbG9naWNhbFNp emUsIFJlbgogICAgIG1fcmVtb3RlUmVzb3VyY2VDYWNoZS5jYWNoZUltYWdlQnVmZmVyKG1ha2VS ZWYoKmltYWdlQnVmZmVyKSk7CiAgICAgdXBkYXRlUmVuZGVyaW5nUmVzb3VyY2VSZXF1ZXN0KCk7 CiAKLSAgICBpZiAobV9wZW5kaW5nV2FrZXVwSW5mbyAmJiBtX3BlbmRpbmdXYWtldXBJbmZvLT5z aG91bGRQZXJmb3JtV2FrZXVwKHJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcikpCisgICAgaWYg KG1fcGVuZGluZ1dha2V1cEluZm8gJiYgbV9wZW5kaW5nV2FrZXVwSW5mby0+c2hvdWxkUGVyZm9y bVdha2V1cChpbWFnZUJ1ZmZlclJlc291cmNlSWRlbnRpZmllcikpCiAgICAgICAgIHdha2VVcEFu ZEFwcGx5RGlzcGxheUxpc3Qoc3RkOjpleGNoYW5nZShtX3BlbmRpbmdXYWtldXBJbmZvLCBzdGQ6 Om51bGxvcHQpLT5hcmd1bWVudHMpOwogfQogCkBAIC0zMzgsNiArMzM4LDcgQEAgdm9pZCBSZW1v dGVSZW5kZXJpbmdCYWNrZW5kOjp3YWtlVXBBbmRBcHBseURpc3BsYXlMaXN0KGNvbnN0IEdQVVBy b2Nlc3NXYWtldXBNZXMKICAgICBMT0dfV0lUSF9TVFJFQU0oU2hhcmVkRGlzcGxheUxpc3RzLCBz dHJlYW0gPDwgIldha2luZyB1cCB0byBJdGVtc1siIDw8IGFyZ3VtZW50cy5pdGVtQnVmZmVySWRl bnRpZmllciA8PCAiXSA9PiBJbWFnZSgiIDw8IGFyZ3VtZW50cy5kZXN0aW5hdGlvbkltYWdlQnVm ZmVySWRlbnRpZmllciA8PCAiKSBhdCAiIDw8IGFyZ3VtZW50cy5vZmZzZXQpOwogICAgIGRlc3Rp bmF0aW9uSW1hZ2VCdWZmZXIgPSBuZXh0RGVzdGluYXRpb25JbWFnZUJ1ZmZlckFmdGVyQXBwbHlp bmdEaXNwbGF5TGlzdHMoKmRlc3RpbmF0aW9uSW1hZ2VCdWZmZXIsIGFyZ3VtZW50cy5vZmZzZXQs ICppbml0aWFsSGFuZGxlLCBhcmd1bWVudHMucmVhc29uKTsKIAorICAgIC8vIEZJWE1FOiBBbGwg dGhlIGNhbGxlcnMgcGFzcyBtX3BlbmRpbmdXYWtldXBJbmZvLmFyZ3VtZW50cyBzbyB0aGUgYm9k eSBvZiB0aGlzIGZ1bmN0aW9uIHNob3VsZCBqdXN0IGJlIHRoaXMgbG9vcC4KICAgICB3aGlsZSAo ZGVzdGluYXRpb25JbWFnZUJ1ZmZlciAmJiBtX3BlbmRpbmdXYWtldXBJbmZvKSB7CiAgICAgICAg IGlmIChtX3BlbmRpbmdXYWtldXBJbmZvLT5taXNzaW5nQ2FjaGVkUmVzb3VyY2VJZGVudGlmaWVy KQogICAgICAgICAgICAgYnJlYWs7CkBAIC00NzcsNyArNDc4LDcgQEAgdm9pZCBSZW1vdGVSZW5k ZXJpbmdCYWNrZW5kOjpnZXRTaGFyZWFibGVCaXRtYXBGb3JJbWFnZUJ1ZmZlcihXZWJDb3JlOjpS ZW5kZXJpbmcKICAgICBjb21wbGV0aW9uSGFuZGxlcihXVEZNb3ZlKGhhbmRsZSkpOwogfQogCi12 b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OmNhY2hlTmF0aXZlSW1hZ2UoY29uc3QgU2hhcmVh YmxlQml0bWFwOjpIYW5kbGUmIGhhbmRsZSwgUmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyIHJl bmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcikKK3ZvaWQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6 Y2FjaGVOYXRpdmVJbWFnZShjb25zdCBTaGFyZWFibGVCaXRtYXA6OkhhbmRsZSYgaGFuZGxlLCBS ZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIgbmF0aXZlSW1hZ2VSZXNvdXJjZUlkZW50aWZpZXIp CiB7CiAgICAgQVNTRVJUKCFSdW5Mb29wOjppc01haW4oKSk7CiAKQEAgLTQ4NSwxMyArNDg2LDEz IEBAIHZvaWQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6Y2FjaGVOYXRpdmVJbWFnZShjb25zdCBT aGFyZWFibGVCaXRtYXA6OkhhbmRsZSYgaGFuCiAgICAgaWYgKCFiaXRtYXApCiAgICAgICAgIHJl dHVybjsKIAotICAgIGF1dG8gaW1hZ2UgPSBOYXRpdmVJbWFnZTo6Y3JlYXRlKGJpdG1hcC0+Y3Jl YXRlUGxhdGZvcm1JbWFnZSgpLCByZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZpZXIpOworICAgIGF1 dG8gaW1hZ2UgPSBOYXRpdmVJbWFnZTo6Y3JlYXRlKGJpdG1hcC0+Y3JlYXRlUGxhdGZvcm1JbWFn ZSgpLCBuYXRpdmVJbWFnZVJlc291cmNlSWRlbnRpZmllcik7CiAgICAgaWYgKCFpbWFnZSkKICAg ICAgICAgcmV0dXJuOwogCiAgICAgbV9yZW1vdGVSZXNvdXJjZUNhY2hlLmNhY2hlTmF0aXZlSW1h Z2UobWFrZVJlZigqaW1hZ2UpKTsKIAotICAgIGlmIChtX3BlbmRpbmdXYWtldXBJbmZvICYmIG1f cGVuZGluZ1dha2V1cEluZm8tPnNob3VsZFBlcmZvcm1XYWtldXAocmVuZGVyaW5nUmVzb3VyY2VJ ZGVudGlmaWVyKSkKKyAgICBpZiAobV9wZW5kaW5nV2FrZXVwSW5mbyAmJiBtX3BlbmRpbmdXYWtl dXBJbmZvLT5zaG91bGRQZXJmb3JtV2FrZXVwKG5hdGl2ZUltYWdlUmVzb3VyY2VJZGVudGlmaWVy KSkKICAgICAgICAgd2FrZVVwQW5kQXBwbHlEaXNwbGF5TGlzdChzdGQ6OmV4Y2hhbmdlKG1fcGVu ZGluZ1dha2V1cEluZm8sIHN0ZDo6bnVsbG9wdCktPmFyZ3VtZW50cyk7CiB9CiAKQEAgLTQ5OSw5 ICs1MDAsOSBAQCB2b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OmNhY2hlRm9udChSZWY8Rm9u dD4mJiBmb250KQogewogICAgIEFTU0VSVCghUnVuTG9vcDo6aXNNYWluKCkpOwogCi0gICAgYXV0 byBpZGVudGlmaWVyID0gZm9udC0+cmVuZGVyaW5nUmVzb3VyY2VJZGVudGlmaWVyKCk7CisgICAg YXV0byBmb250UmVzb3VyY2VJZGVudGlmaWVyID0gZm9udC0+cmVuZGVyaW5nUmVzb3VyY2VJZGVu dGlmaWVyKCk7CiAgICAgbV9yZW1vdGVSZXNvdXJjZUNhY2hlLmNhY2hlRm9udChXVEZNb3ZlKGZv bnQpKTsKLSAgICBpZiAobV9wZW5kaW5nV2FrZXVwSW5mbyAmJiBtX3BlbmRpbmdXYWtldXBJbmZv LT5zaG91bGRQZXJmb3JtV2FrZXVwKGlkZW50aWZpZXIpKQorICAgIGlmIChtX3BlbmRpbmdXYWtl dXBJbmZvICYmIG1fcGVuZGluZ1dha2V1cEluZm8tPnNob3VsZFBlcmZvcm1XYWtldXAoZm9udFJl c291cmNlSWRlbnRpZmllcikpCiAgICAgICAgIHdha2VVcEFuZEFwcGx5RGlzcGxheUxpc3Qoc3Rk OjpleGNoYW5nZShtX3BlbmRpbmdXYWtldXBJbmZvLCBzdGQ6Om51bGxvcHQpLT5hcmd1bWVudHMp OwogfQogCkBAIC01MzEsMTggKzUzMiwxOCBAQCB2b2lkIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6 OmZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKFJlbmRlcmluZ1VwZGF0ZUlEIHJlbmRlcmluZwogICAg IHNlbmQoTWVzc2FnZXM6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6RGlkRmluYWxpemVS ZW5kZXJpbmdVcGRhdGUocmVuZGVyaW5nVXBkYXRlSUQpLCBtX3JlbmRlcmluZ0JhY2tlbmRJZGVu dGlmaWVyKTsKIH0KIAotdm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpkaWRDcmVhdGVTaGFy ZWREaXNwbGF5TGlzdEhhbmRsZShEaXNwbGF5TGlzdDo6SXRlbUJ1ZmZlcklkZW50aWZpZXIgaWRl bnRpZmllciwgY29uc3QgU2hhcmVkTWVtb3J5OjpJUENIYW5kbGUmIGhhbmRsZSwgUmVuZGVyaW5n UmVzb3VyY2VJZGVudGlmaWVyIGRlc3RpbmF0aW9uQnVmZmVySWRlbnRpZmllcikKK3ZvaWQgUmVt b3RlUmVuZGVyaW5nQmFja2VuZDo6ZGlkQ3JlYXRlU2hhcmVkRGlzcGxheUxpc3RIYW5kbGUoRGlz cGxheUxpc3Q6Okl0ZW1CdWZmZXJJZGVudGlmaWVyIGl0ZW1CdWZmZXJJZGVudGlmaWVyLCBjb25z dCBTaGFyZWRNZW1vcnk6OklQQ0hhbmRsZSYgaGFuZGxlLCBSZW5kZXJpbmdSZXNvdXJjZUlkZW50 aWZpZXIgZGVzdGluYXRpb25CdWZmZXJJZGVudGlmaWVyKQogewogICAgIEFTU0VSVCghUnVuTG9v cDo6aXNNYWluKCkpOwotICAgIE1FU1NBR0VfQ0hFQ0soIW1fc2hhcmVkRGlzcGxheUxpc3RIYW5k bGVzLmNvbnRhaW5zKGlkZW50aWZpZXIpLCAiRHVwbGljYXRlIHNoYXJlZCBkaXNwbGF5IGxpc3Qg aGFuZGxlIik7CisgICAgTUVTU0FHRV9DSEVDSyghbV9zaGFyZWREaXNwbGF5TGlzdEhhbmRsZXMu Y29udGFpbnMoaXRlbUJ1ZmZlcklkZW50aWZpZXIpLCAiRHVwbGljYXRlIHNoYXJlZCBkaXNwbGF5 IGxpc3QgaGFuZGxlIik7CiAKICAgICBpZiAoYXV0byBzaGFyZWRNZW1vcnkgPSBTaGFyZWRNZW1v cnk6Om1hcChoYW5kbGUuaGFuZGxlLCBTaGFyZWRNZW1vcnk6OlByb3RlY3Rpb246OlJlYWRXcml0 ZSkpIHsKLSAgICAgICAgYXV0byBoYW5kbGUgPSBEaXNwbGF5TGlzdFJlYWRlckhhbmRsZTo6Y3Jl YXRlKGlkZW50aWZpZXIsIHNoYXJlZE1lbW9yeS5yZWxlYXNlTm9uTnVsbCgpKTsKKyAgICAgICAg YXV0byBoYW5kbGUgPSBEaXNwbGF5TGlzdFJlYWRlckhhbmRsZTo6Y3JlYXRlKGl0ZW1CdWZmZXJJ ZGVudGlmaWVyLCBzaGFyZWRNZW1vcnkucmVsZWFzZU5vbk51bGwoKSk7CiAgICAgICAgIE1FU1NB R0VfQ0hFQ0soaGFuZGxlLCAiVGhlcmUgbXVzdCBiZSBlbm91Z2ggc3BhY2UgdG8gY3JlYXRlIHRo ZSBoYW5kbGUuIik7Ci0gICAgICAgIG1fc2hhcmVkRGlzcGxheUxpc3RIYW5kbGVzLnNldChpZGVu dGlmaWVyLCBoYW5kbGUpOworICAgICAgICBtX3NoYXJlZERpc3BsYXlMaXN0SGFuZGxlcy5zZXQo aXRlbUJ1ZmZlcklkZW50aWZpZXIsIGhhbmRsZSk7CiAgICAgfQogCi0gICAgaWYgKG1fcGVuZGlu Z1dha2V1cEluZm8gJiYgbV9wZW5kaW5nV2FrZXVwSW5mby0+c2hvdWxkUGVyZm9ybVdha2V1cChp ZGVudGlmaWVyKSkKKyAgICBpZiAobV9wZW5kaW5nV2FrZXVwSW5mbyAmJiBtX3BlbmRpbmdXYWtl dXBJbmZvLT5zaG91bGRQZXJmb3JtV2FrZXVwKGl0ZW1CdWZmZXJJZGVudGlmaWVyKSkKICAgICAg ICAgd2FrZVVwQW5kQXBwbHlEaXNwbGF5TGlzdChzdGQ6OmV4Y2hhbmdlKG1fcGVuZGluZ1dha2V1 cEluZm8sIHN0ZDo6bnVsbG9wdCktPmFyZ3VtZW50cyk7CiB9CiAK