228219 2021-07-22 22:52:01 -0700 [GPU Process] Migrate the DisplayList::Replayer::Delegate from RemoteImageBuffer to RemoteRenderingBackend 2021-07-23 09:52:19 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 228222 1 mmaxfield mmaxfield dino jonlee sabouhallawa simon.fraser thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1778986 0 mmaxfield 2021-07-22 22:52:01 -0700 [GPU Process] Migrate the DisplayList::Replayer::Delegate from RemoteImageBuffer to RemoteRenderingBackend 1778991 1 434066 mmaxfield 2021-07-22 23:12:22 -0700 Created attachment 434066 Patch 1779059 2 434066 wenson_hsieh 2021-07-23 07:40:43 -0700 Comment on attachment 434066 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=434066&action=review > Source/WebKit/ChangeLog:16 > + DisplayList classes like DisplayList::Recorder and DisplayList::Replayer and the higher level WebKit classe is to use their delegate Nit - "classe" 1779076 3 mmaxfield 2021-07-23 09:51:40 -0700 Committed r280245 (239913@main): <https://commits.webkit.org/239913@main> 1779077 4 webkit-bug-importer 2021-07-23 09:52:19 -0700 <rdar://problem/81022846> 434066 2021-07-22 23:12:22 -0700 2021-07-23 07:40:43 -0700 Patch bug-228219-20210722231221.patch text/plain 9075 mmaxfield U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwMjE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDljMzQ2MjdiM2Y4MjljZDVh YzM1MTllOTBiZjVlYWM5ODBlNGU3YTUuLmZiYTA0MzMwNjY0MzhlNTViNWJkNmY4YmM3YWFhYjU2 NWEwMGE0ODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDMgQEAKKzIwMjEtMDctMjIgIE15bGVzIEMu IE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4KKworICAgICAgICBbR1BVIFByb2Nlc3Nd IE1pZ3JhdGUgdGhlIERpc3BsYXlMaXN0OjpSZXBsYXllcjo6RGVsZWdhdGUgZnJvbSBSZW1vdGVJ bWFnZUJ1ZmZlciB0byBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjgyMTkKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGlzIGlzIHBhcnQgMSBvZiBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI4MjE2LgorCisgICAgICAgIEZvciB0aGlz IHRhc2ssIHdlIG5lZWQgdG8gY291bnQgcmVzb3VyY2UgdXNlczoKKyAgICAgICAgMS4gQXMgdGhl IHJlY29yZGVyIGluIHRoZSB3ZWIgcHJvY2VzcyByZWNvcmRzIERpc3BsYXlMaXN0IGl0ZW1zIHdo aWNoIHJlZmVyZW5jZSByZXNvdXJjZXMsIHRob3NlIHVzZXMgbmVlZCB0byBpbmNyZW1lbnQgYSBj b3VudGVyLgorICAgICAgICAyLiBBcyB0aGUgcmVwbGF5ZXIgaW4gdGhlIEdQVSBwcm9jZXNzIHJl cGxheXMgRGlzcGxheUxpc3QgaXRlbXMgd2hpY2ggcmVmZXJlbmNlIHJlc291cmNlcywgdGhvc2Ug dXNlcyBuZWVkIHRvIGluY3JlbWVudCBhIHBhcmFsbGVsIGNvdW50ZXIuCisKKyAgICAgICAgVGhl IG1vc3QgbmF0dXJhbCBwbGFjZSBmb3IgdGhlIGNvdW50ZXJzIHRvIGxpdmUgaXMgaW4gUmVtb3Rl UmVzb3VyY2VDYWNoZVByb3h5IGFuZCBSZW1vdGVSZXNvdXJjZUNhY2hlLCByZXNwZWN0aXZlbHku IFRoZXNlIHR3byBjbGFzc2VzCisgICAgICAgIGFyZSBhY2Nlc3NpYmxlIGZyb20gdGhlIFJlbW90 ZVJlbmRlcmluZ0JhY2tlbmRQcm94eSBhbmQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZCwgcmVzcGVj dGl2ZWx5LiBUaGUgbW9zdCBuYXR1cmFsIGludGVyZmFjZSBiZXR3ZWVuIHRoZQorICAgICAgICBE aXNwbGF5TGlzdCBjbGFzc2VzIGxpa2UgRGlzcGxheUxpc3Q6OlJlY29yZGVyIGFuZCBEaXNwbGF5 TGlzdDo6UmVwbGF5ZXIgYW5kIHRoZSBoaWdoZXIgbGV2ZWwgV2ViS2l0IGNsYXNzZSBpcyB0byB1 c2UgdGhlaXIgZGVsZWdhdGUKKyAgICAgICAgaW50ZXJmYWNlcy4KKworICAgICAgICBGb3IgMSBh Ym92ZSwgUmVtb3RlSW1hZ2VCdWZmZXJQcm94eSBoYXMgYWNjZXNzIHRvIHRoZSBSZW1vdGVSZW5k ZXJpbmdCYWNrZW5kUHJveHkgYW5kIGlzIGFscmVhZHkgYSBEaXNwbGF5TGlzdDo6UmVjb3JkZXI6 OkRlbGVnYXRlLCBzbworICAgICAgICB0aGVyZSdzIG5vIHByb2JsZW0gdGhlcmUuIEhvd2V2ZXIs IGZvciAyLCBtZXNzYWdlcyBhcmUgZGVsaXZlcmVkIGZpcnN0IHRvIHRoZSBSZW1vdGVSZW5kZXJp bmdCYWNrZW5kLCB3aGljaCBpcyB0aGUgcGxhY2UgdGhhdCBoYXMgYWNjZXNzIHRvCisgICAgICAg IHRoZSBSZW1vdGVSZXNvdXJjZUNhY2hlLiBNYWtpbmcgdGhlIFJlbW90ZVJlbmRlcmluZ0JhY2tl bmQgaGF2ZSB0aGUgRGlzcGxheUxpc3Q6OlJlcGxheWVyOjpEZWxlZ2F0ZSB3b3VsZCBiZSBhIG5h dHVyYWwgcGxhY2UgdG8gZWl0aGVyCisgICAgICAgIEEpIGNhbGwgdGhlIG5lY2Vzc2FyeSBmdW5j dGlvbiBpbiB0aGUgUmVtb3RlSW1hZ2VCdWZmZXIsIG9yIEIpIGludGVyYWN0IHdpdGggdGhlIFJl bW90ZVJlc291cmNlQ2FjaGUgdG8gaW5jcmVtZW50IHRoZSBuZWNlc3NhcnkgY291bnRlci4KKwor ICAgICAgICBJbmRlZWQsIHRoaXMgbWFrZXMgYSBsb3Qgb2Ygc2Vuc2UgYmVjYXVzZSwgZm9yIDIg b2YgdGhlIDMgZGVsZWdhdGUgbWV0aG9kcywgUmVtb3RlSW1hZ2VCdWZmZXIganVzdCBpbW1lZGlh dGVseSB0dXJucyBhcm91bmQgYW5kIGZvcndhcmRzCisgICAgICAgIHRoZSBjYWxsIHRvIHRoZSBS ZW1vdGVSZW5kZXJpbmdCYWNrZW5kIGFueXdheS4gU28sIG1pZ3JhdGluZyB0aGlzIGludGVyZmFj ZSB0byBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kIGFjdHVhbGx5IGVuZHMgdXAgbWFraW5nIGl0IGEg Yml0CisgICAgICAgIHNpbXBsZXIuCisKKyAgICAgICAgTm8gbmV3IHRlc3RzIGJlY2F1c2UgdGhl cmUgaXMgbm8gYmVoYXZpb3IgY2hhbmdlLgorCisgICAgICAgICogR1BVUHJvY2Vzcy9ncmFwaGlj cy9SZW1vdGVJbWFnZUJ1ZmZlci5oOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVJbWFnZUJ1ZmZl cjo6YXBwbHkpOgorICAgICAgICAoKTogRGVsZXRlZC4KKyAgICAgICAgKiBHUFVQcm9jZXNzL2dy YXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmQuY3BwOgorICAgICAgICAoV2ViS2l0OjpSZW1v dGVSZW5kZXJpbmdCYWNrZW5kOjpSZXBsYXllckRlbGVnYXRlOjpSZXBsYXllckRlbGVnYXRlKToK KyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6UmVwbGF5ZXJEZWxlZ2F0 ZTo6YXBwbHkpOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpSZXBs YXllckRlbGVnYXRlOjpkaWRDcmVhdGVNYXNrSW1hZ2VCdWZmZXIpOgorICAgICAgICAoV2ViS2l0 OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpSZXBsYXllckRlbGVnYXRlOjpkaWRSZXNldE1hc2tJ bWFnZUJ1ZmZlcik6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OnN1 Ym1pdCk6CisgICAgICAgICogR1BVUHJvY2Vzcy9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNr ZW5kLmg6CisKIDIwMjEtMDctMjIgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgog CiAgICAgICAgIFtMaXZlIFRleHRdIFtpT1NdIEFuYWx5c2lzIHNob3VsZCBhbHNvIHNlYXJjaCBm b3IgYW55IEFwcCBDbGlwIGNvZGVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nl c3MvZ3JhcGhpY3MvUmVtb3RlSW1hZ2VCdWZmZXIuaCBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vz cy9ncmFwaGljcy9SZW1vdGVJbWFnZUJ1ZmZlci5oCmluZGV4IGQyZjk1YmQ5NmNhYzA0MGY2MTIy Y2I0ODBjZTg4YmUxZGFjMGQxZDEuLmNiM2Y4ZTgzNWQwYzgwYTdhNTI3NjlhNGQ2MjA3ZDc4YTU4 ODRiNDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9ncmFwaGljcy9SZW1v dGVJbWFnZUJ1ZmZlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9ncmFwaGljcy9S ZW1vdGVJbWFnZUJ1ZmZlci5oCkBAIC0zOCw3ICszOCw3IEBACiBuYW1lc3BhY2UgV2ViS2l0IHsK IAogdGVtcGxhdGU8dHlwZW5hbWUgQmFja2VuZFR5cGU+Ci1jbGFzcyBSZW1vdGVJbWFnZUJ1ZmZl ciA6IHB1YmxpYyBXZWJDb3JlOjpDb25jcmV0ZUltYWdlQnVmZmVyPEJhY2tlbmRUeXBlPiwgcHVi bGljIFdlYkNvcmU6OkRpc3BsYXlMaXN0OjpSZXBsYXllcjo6RGVsZWdhdGUgeworY2xhc3MgUmVt b3RlSW1hZ2VCdWZmZXIgOiBwdWJsaWMgV2ViQ29yZTo6Q29uY3JldGVJbWFnZUJ1ZmZlcjxCYWNr ZW5kVHlwZT4gewogICAgIHVzaW5nIEJhc2VDb25jcmV0ZUltYWdlQnVmZmVyID0gV2ViQ29yZTo6 Q29uY3JldGVJbWFnZUJ1ZmZlcjxCYWNrZW5kVHlwZT47CiAgICAgdXNpbmcgQmFzZUNvbmNyZXRl SW1hZ2VCdWZmZXI6OmNvbnRleHQ7CiAgICAgdXNpbmcgQmFzZUNvbmNyZXRlSW1hZ2VCdWZmZXI6 Om1fYmFja2VuZDsKQEAgLTc1LDcgKzc1LDkgQEAgcHVibGljOgogI2VuZGlmCiAKIHByaXZhdGU6 Ci0gICAgYm9vbCBhcHBseShXZWJDb3JlOjpEaXNwbGF5TGlzdDo6SXRlbUhhbmRsZSBpdGVtLCBX ZWJDb3JlOjpHcmFwaGljc0NvbnRleHQmIGNvbnRleHQpIG92ZXJyaWRlCisgICAgZnJpZW5kIGNs YXNzIFJlbW90ZVJlbmRlcmluZ0JhY2tlbmQ7CisKKyAgICBib29sIGFwcGx5KFdlYkNvcmU6OkRp c3BsYXlMaXN0OjpJdGVtSGFuZGxlIGl0ZW0sIFdlYkNvcmU6OkdyYXBoaWNzQ29udGV4dCYgY29u dGV4dCkKICAgICB7CiAgICAgICAgIGlmIChpdGVtLmlzPFdlYkNvcmU6OkRpc3BsYXlMaXN0OjpH ZXRQaXhlbEJ1ZmZlcj4oKSkgewogICAgICAgICAgICAgYXV0byYgZ2V0UGl4ZWxCdWZmZXJJdGVt ID0gaXRlbS5nZXQ8V2ViQ29yZTo6RGlzcGxheUxpc3Q6OkdldFBpeGVsQnVmZmVyPigpOwpAQCAt MTA4LDE2ICsxMTAsNiBAQCBwcml2YXRlOgogICAgICAgICByZXR1cm4gbV9yZW1vdGVSZW5kZXJp bmdCYWNrZW5kLmFwcGx5TWVkaWFJdGVtKGl0ZW0sIGNvbnRleHQpOwogICAgIH0KIAotICAgIHZv aWQgZGlkQ3JlYXRlTWFza0ltYWdlQnVmZmVyKFdlYkNvcmU6OkltYWdlQnVmZmVyJiBpbWFnZUJ1 ZmZlcikgZmluYWwKLSAgICB7Ci0gICAgICAgIG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZC5kaWRD cmVhdGVNYXNrSW1hZ2VCdWZmZXIoaW1hZ2VCdWZmZXIpOwotICAgIH0KLQotICAgIHZvaWQgZGlk UmVzZXRNYXNrSW1hZ2VCdWZmZXIoKSBmaW5hbAotICAgIHsKLSAgICAgICAgbV9yZW1vdGVSZW5k ZXJpbmdCYWNrZW5kLmRpZFJlc2V0TWFza0ltYWdlQnVmZmVyKCk7Ci0gICAgfQotCiAgICAgUmVt b3RlUmVuZGVyaW5nQmFja2VuZCYgbV9yZW1vdGVSZW5kZXJpbmdCYWNrZW5kOwogICAgIFdlYkNv cmU6OlJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllciBtX3JlbmRlcmluZ1Jlc291cmNlSWRlbnRp ZmllcjsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvZ3JhcGhpY3Mv UmVtb3RlUmVuZGVyaW5nQmFja2VuZC5jcHAgYi9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvZ3Jh cGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZC5jcHAKaW5kZXggYTVlZGY5MWE3YjU0MmM1ZjZi ZTcyNzgxMDI5ZDhkYTFjNmU2NTJjMi4uZWE4Mjg2ZGEwYzlkZTRkZmNhN2RlMzViZTMzN2RmMDMy YzAzN2U3ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL2dyYXBoaWNzL1Jl bW90ZVJlbmRlcmluZ0JhY2tlbmQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9n cmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kLmNwcApAQCAtMTg0LDE2ICsxODQsNDIgQEAg dm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpjcmVhdGVJbWFnZUJ1ZmZlcihjb25zdCBGbG9h dFNpemUmIGxvZ2ljYWxTaXplLCBSZW4KICAgICAgICAgd2FrZVVwQW5kQXBwbHlEaXNwbGF5TGlz dChzdGQ6OmV4Y2hhbmdlKG1fcGVuZGluZ1dha2V1cEluZm8sIHN0ZDo6bnVsbG9wdCktPmFyZ3Vt ZW50cyk7CiB9CiAKK1JlbW90ZVJlbmRlcmluZ0JhY2tlbmQ6OlJlcGxheWVyRGVsZWdhdGU6OlJl cGxheWVyRGVsZWdhdGUoV2ViQ29yZTo6SW1hZ2VCdWZmZXImIGRlc3RpbmF0aW9uLCBSZW1vdGVS ZW5kZXJpbmdCYWNrZW5kJiByZW1vdGVSZW5kZXJpbmdCYWNrZW5kLCBHUFVDb25uZWN0aW9uVG9X ZWJQcm9jZXNzJiBncHVDb25uZWN0aW9uVG9XZWJQcm9jZXNzKQorICAgIDogbV9kZXN0aW5hdGlv bihkZXN0aW5hdGlvbikKKyAgICAsIG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZChyZW1vdGVSZW5k ZXJpbmdCYWNrZW5kKQorICAgICwgbV9ncHVDb25uZWN0aW9uVG9XZWJQcm9jZXNzKGdwdUNvbm5l Y3Rpb25Ub1dlYlByb2Nlc3MpCit7Cit9CisKK2Jvb2wgUmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6 UmVwbGF5ZXJEZWxlZ2F0ZTo6YXBwbHkoV2ViQ29yZTo6RGlzcGxheUxpc3Q6Okl0ZW1IYW5kbGUg aXRlbSwgV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0JiBncmFwaGljc0NvbnRleHQpCit7CisgICAg Ly8gRklYTUU6IEluc3BlY3QgdGhlIGl0ZW0gYW5kIHJlY29yZCByZXNvdXJjZSB1c2UgaGVyZS4K KworICAgIGF1dG8gYXBwbHkgPSBbJl0oYXV0byYmIGRlc3RpbmF0aW9uKSB7CisgICAgICAgIHJl dHVybiBkZXN0aW5hdGlvbi5hcHBseShpdGVtLCBncmFwaGljc0NvbnRleHQpOworICAgIH07CisK KyAgICBpZiAobV9kZXN0aW5hdGlvbi5yZW5kZXJpbmdNb2RlKCkgPT0gUmVuZGVyaW5nTW9kZTo6 QWNjZWxlcmF0ZWQpCisgICAgICAgIHJldHVybiBhcHBseShzdGF0aWNfY2FzdDxBY2NlbGVyYXRl ZFJlbW90ZUltYWdlQnVmZmVyJj4obV9kZXN0aW5hdGlvbikpOworICAgIHJldHVybiBhcHBseShz dGF0aWNfY2FzdDxVbmFjY2VsZXJhdGVkUmVtb3RlSW1hZ2VCdWZmZXImPihtX2Rlc3RpbmF0aW9u KSk7Cit9CisKK3ZvaWQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6UmVwbGF5ZXJEZWxlZ2F0ZTo6 ZGlkQ3JlYXRlTWFza0ltYWdlQnVmZmVyKFdlYkNvcmU6OkltYWdlQnVmZmVyJiBpbWFnZUJ1ZmZl cikKK3sKKyAgICBtX3JlbW90ZVJlbmRlcmluZ0JhY2tlbmQuZGlkQ3JlYXRlTWFza0ltYWdlQnVm ZmVyKGltYWdlQnVmZmVyKTsKK30KKwordm9pZCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpSZXBs YXllckRlbGVnYXRlOjpkaWRSZXNldE1hc2tJbWFnZUJ1ZmZlcigpCit7CisgICAgbV9yZW1vdGVS ZW5kZXJpbmdCYWNrZW5kLmRpZFJlc2V0TWFza0ltYWdlQnVmZmVyKCk7Cit9CisKIERpc3BsYXlM aXN0OjpSZXBsYXlSZXN1bHQgUmVtb3RlUmVuZGVyaW5nQmFja2VuZDo6c3VibWl0KGNvbnN0IERp c3BsYXlMaXN0OjpEaXNwbGF5TGlzdCYgZGlzcGxheUxpc3QsIEltYWdlQnVmZmVyJiBkZXN0aW5h dGlvbikKIHsKICAgICBpZiAoZGlzcGxheUxpc3QuaXNFbXB0eSgpKQogICAgICAgICByZXR1cm4g eyB9OwogCi0gICAgRGlzcGxheUxpc3Q6OlJlcGxheWVyOjpEZWxlZ2F0ZSogcmVwbGF5ZXJEZWxl Z2F0ZSA9IG51bGxwdHI7Ci0gICAgaWYgKGRlc3RpbmF0aW9uLnJlbmRlcmluZ01vZGUoKSA9PSBS ZW5kZXJpbmdNb2RlOjpBY2NlbGVyYXRlZCkKLSAgICAgICAgcmVwbGF5ZXJEZWxlZ2F0ZSA9IHN0 YXRpY19jYXN0PEFjY2VsZXJhdGVkUmVtb3RlSW1hZ2VCdWZmZXIqPigmZGVzdGluYXRpb24pOwot ICAgIGVsc2UKLSAgICAgICAgcmVwbGF5ZXJEZWxlZ2F0ZSA9IHN0YXRpY19jYXN0PFVuYWNjZWxl cmF0ZWRSZW1vdGVJbWFnZUJ1ZmZlcio+KCZkZXN0aW5hdGlvbik7CisgICAgUmVwbGF5ZXJEZWxl Z2F0ZSByZXBsYXllckRlbGVnYXRlKGRlc3RpbmF0aW9uLCAqdGhpcywgbV9ncHVDb25uZWN0aW9u VG9XZWJQcm9jZXNzKTsKIAogICAgIHJldHVybiBXZWJDb3JlOjpEaXNwbGF5TGlzdDo6UmVwbGF5 ZXIgewogICAgICAgICBkZXN0aW5hdGlvbi5jb250ZXh0KCksCkBAIC0yMDIsNyArMjI4LDcgQEAg RGlzcGxheUxpc3Q6OlJlcGxheVJlc3VsdCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kOjpzdWJtaXQo Y29uc3QgRGlzcGxheUxpc3Q6OkRpc3AKICAgICAgICAgJnJlbW90ZVJlc291cmNlQ2FjaGUoKS5u YXRpdmVJbWFnZXMoKSwKICAgICAgICAgJnJlbW90ZVJlc291cmNlQ2FjaGUoKS5mb250cygpLAog ICAgICAgICBtX2N1cnJlbnRNYXNrSW1hZ2VCdWZmZXIuZ2V0KCksCi0gICAgICAgIHJlcGxheWVy RGVsZWdhdGUKKyAgICAgICAgJnJlcGxheWVyRGVsZWdhdGUKICAgICB9LnJlcGxheSgpOwogfQog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvZ3JhcGhpY3MvUmVtb3RlUmVu ZGVyaW5nQmFja2VuZC5oIGIvU291cmNlL1dlYktpdC9HUFVQcm9jZXNzL2dyYXBoaWNzL1JlbW90 ZVJlbmRlcmluZ0JhY2tlbmQuaAppbmRleCBhMzUxNjViMTkxMWY5YTkzZjNkNGE4ZGU5MWIxMDFm NzU2OWFiYjIyLi5mN2JmNmJjM2IwNzNhZGJlYWU2ZjZiODYyZmEzNjdmNmFiMDBlNWIwIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0dQVVByb2Nlc3MvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5n QmFja2VuZC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvR1BVUHJvY2Vzcy9ncmFwaGljcy9SZW1vdGVS ZW5kZXJpbmdCYWNrZW5kLmgKQEAgLTE0Nyw2ICsxNDcsMjAgQEAgcHJpdmF0ZToKICAgICB2b2lk IHJlbGVhc2VSZW1vdGVSZXNvdXJjZShXZWJDb3JlOjpSZW5kZXJpbmdSZXNvdXJjZUlkZW50aWZp ZXIpOwogICAgIHZvaWQgZGlkQ3JlYXRlU2hhcmVkRGlzcGxheUxpc3RIYW5kbGUoV2ViQ29yZTo6 RGlzcGxheUxpc3Q6Okl0ZW1CdWZmZXJJZGVudGlmaWVyLCBjb25zdCBTaGFyZWRNZW1vcnk6OklQ Q0hhbmRsZSYsIFdlYkNvcmU6OlJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllciBkZXN0aW5hdGlv bkJ1ZmZlcklkZW50aWZpZXIpOwogCisgICAgY2xhc3MgUmVwbGF5ZXJEZWxlZ2F0ZSA6IHB1Ymxp YyBXZWJDb3JlOjpEaXNwbGF5TGlzdDo6UmVwbGF5ZXI6OkRlbGVnYXRlIHsKKyAgICBwdWJsaWM6 CisgICAgICAgIFJlcGxheWVyRGVsZWdhdGUoV2ViQ29yZTo6SW1hZ2VCdWZmZXImLCBSZW1vdGVS ZW5kZXJpbmdCYWNrZW5kJiwgR1BVQ29ubmVjdGlvblRvV2ViUHJvY2VzcyYpOworCisgICAgcHJp dmF0ZToKKyAgICAgICAgYm9vbCBhcHBseShXZWJDb3JlOjpEaXNwbGF5TGlzdDo6SXRlbUhhbmRs ZSwgV2ViQ29yZTo6R3JhcGhpY3NDb250ZXh0JikgZmluYWw7CisgICAgICAgIHZvaWQgZGlkQ3Jl YXRlTWFza0ltYWdlQnVmZmVyKFdlYkNvcmU6OkltYWdlQnVmZmVyJikgZmluYWw7CisgICAgICAg IHZvaWQgZGlkUmVzZXRNYXNrSW1hZ2VCdWZmZXIoKSBmaW5hbDsKKworICAgICAgICBXZWJDb3Jl OjpJbWFnZUJ1ZmZlciYgbV9kZXN0aW5hdGlvbjsKKyAgICAgICAgUmVtb3RlUmVuZGVyaW5nQmFj a2VuZCYgbV9yZW1vdGVSZW5kZXJpbmdCYWNrZW5kOworICAgICAgICBSZWY8R1BVQ29ubmVjdGlv blRvV2ViUHJvY2Vzcz4gbV9ncHVDb25uZWN0aW9uVG9XZWJQcm9jZXNzOworICAgIH07CisKICAg ICBzdHJ1Y3QgUGVuZGluZ1dha2V1cEluZm9ybWF0aW9uIHsKICAgICAgICAgR1BVUHJvY2Vzc1dh a2V1cE1lc3NhZ2VBcmd1bWVudHMgYXJndW1lbnRzOwogICAgICAgICBzdGQ6Om9wdGlvbmFsPFdl YkNvcmU6OlJlbmRlcmluZ1Jlc291cmNlSWRlbnRpZmllcj4gbWlzc2luZ0NhY2hlZFJlc291cmNl SWRlbnRpZmllcjsK