236891 2022-02-19 13:34:32 -0800 [WebGPU] Tracer bullet part 4: Move Device's construction methods to the files of the things they create 2022-02-21 11:24:19 -0800 1 1 1 Unclassified WebKit WebGPU WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 236879 236898 236899 1 mmaxfield mmaxfield dino rmorisset webkit-bug-importer oldest_to_newest 1843897 0 mmaxfield 2022-02-19 13:34:32 -0800 Device is kind of a factory object, and has lots of methods which create other objects in the API. To avoid Device.cpp becoming a catch-all place for tons of unrelated creation routines, this patch moves the routine that creates an X into X.mm. 1843898 1 452654 mmaxfield 2022-02-19 13:36:09 -0800 Created attachment 452654 Patch 1844234 2 452654 dino 2022-02-21 09:22:35 -0800 Comment on attachment 452654 Patch I'm not sure this is any better. Now one needs to remember that Device::create methods are not in Device.mm. But either way is fine. 1844282 3 mmaxfield 2022-02-21 11:00:08 -0800 (In reply to Dean Jackson from comment #2) > Comment on attachment 452654 [details] > Patch > > I'm not sure this is any better. Now one needs to remember that > Device::create methods are not in Device.mm. But either way is fine. Yeah. I think the principle here is "keep related concepts together." The creation routines deal deeply with the guts of the objects they create, so I figure that code should be close to the rest of the routines in the objects. 1844292 4 mmaxfield 2022-02-21 11:23:45 -0800 Committed r290255 (?): <https://commits.webkit.org/r290255> 1844293 5 webkit-bug-importer 2022-02-21 11:24:19 -0800 <rdar://problem/89247272> 452654 2022-02-19 13:36:09 -0800 2022-02-21 09:22:35 -0800 Patch patch.txt text/plain 14480 mmaxfield ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJHUFUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkdQVS9DaGFu Z2VMb2cKaW5kZXggODRjNjA4YzI5NzgyLi43ZDYyNWI2YjczM2UgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJHUFUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJHUFUvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsNjAgQEAKKzIwMjItMDItMTkgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxl LmNvbT4KKworICAgICAgICBbV2ViR1BVXSBUcmFjZXIgYnVsbGV0IHBhcnQgNDogTW92ZSBEZXZp Y2UncyBjb25zdHJ1Y3Rpb24gbWV0aG9kcyB0byB0aGUgZmlsZXMgb2YgdGhlIHRoaW5ncyB0aGV5 IGNyZWF0ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjM2ODkxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg RGV2aWNlIGlzIGtpbmQgb2YgYSBmYWN0b3J5IG9iamVjdCwgYW5kIGhhcyBsb3RzIG9mIG1ldGhv ZHMgd2hpY2ggY3JlYXRlCisgICAgICAgIG90aGVyIG9iamVjdHMgaW4gdGhlIEFQSS4gVG8gYXZv aWQgRGV2aWNlLmNwcCBiZWNvbWluZyBhIGNhdGNoLWFsbCBwbGFjZQorICAgICAgICBmb3IgdG9u cyBvZiB1bnJlbGF0ZWQgY3JlYXRpb24gcm91dGluZXMsIHRoaXMgcGF0Y2ggbW92ZXMgdGhlIHJv dXRpbmUgdGhhdAorICAgICAgICBjcmVhdGVzIGFuIFggaW50byBYLm1tLgorCisgICAgICAgICog V2ViR1BVL0JpbmRHcm91cC5tbToKKyAgICAgICAgKFdlYkdQVTo6RGV2aWNlOjpjcmVhdGVCaW5k R3JvdXApOgorICAgICAgICAqIFdlYkdQVS9CaW5kR3JvdXBMYXlvdXQubW06CisgICAgICAgIChX ZWJHUFU6OkRldmljZTo6Y3JlYXRlQmluZEdyb3VwTGF5b3V0KToKKyAgICAgICAgKiBXZWJHUFUv QnVmZmVyLm1tOgorICAgICAgICAoV2ViR1BVOjpEZXZpY2U6OmNyZWF0ZUJ1ZmZlcik6CisgICAg ICAgICogV2ViR1BVL0NvbW1hbmRFbmNvZGVyLm1tOgorICAgICAgICAoV2ViR1BVOjpEZXZpY2U6 OmNyZWF0ZUNvbW1hbmRFbmNvZGVyKToKKyAgICAgICAgKiBXZWJHUFUvQ29tcHV0ZVBpcGVsaW5l Lm1tOgorICAgICAgICAoV2ViR1BVOjpEZXZpY2U6OmNyZWF0ZUNvbXB1dGVQaXBlbGluZSk6Cisg ICAgICAgIChXZWJHUFU6OkRldmljZTo6Y3JlYXRlQ29tcHV0ZVBpcGVsaW5lQXN5bmMpOgorICAg ICAgICAqIFdlYkdQVS9EZXZpY2UubW06CisgICAgICAgIChXZWJHUFU6OkRldmljZTo6Y3JlYXRl QmluZEdyb3VwKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkdQVTo6RGV2aWNlOjpjcmVhdGVCaW5k R3JvdXBMYXlvdXQpOiBEZWxldGVkLgorICAgICAgICAoV2ViR1BVOjpEZXZpY2U6OmNyZWF0ZUJ1 ZmZlcik6IERlbGV0ZWQuCisgICAgICAgIChXZWJHUFU6OkRldmljZTo6Y3JlYXRlQ29tbWFuZEVu Y29kZXIpOiBEZWxldGVkLgorICAgICAgICAoV2ViR1BVOjpEZXZpY2U6OmNyZWF0ZUNvbXB1dGVQ aXBlbGluZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJHUFU6OkRldmljZTo6Y3JlYXRlQ29tcHV0 ZVBpcGVsaW5lQXN5bmMpOiBEZWxldGVkLgorICAgICAgICAoV2ViR1BVOjpEZXZpY2U6OmNyZWF0 ZVBpcGVsaW5lTGF5b3V0KTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkdQVTo6RGV2aWNlOjpjcmVh dGVRdWVyeVNldCk6IERlbGV0ZWQuCisgICAgICAgIChXZWJHUFU6OkRldmljZTo6Y3JlYXRlUmVu ZGVyQnVuZGxlRW5jb2Rlcik6IERlbGV0ZWQuCisgICAgICAgIChXZWJHUFU6OkRldmljZTo6Y3Jl YXRlUmVuZGVyUGlwZWxpbmUpOiBEZWxldGVkLgorICAgICAgICAoV2ViR1BVOjpEZXZpY2U6OmNy ZWF0ZVJlbmRlclBpcGVsaW5lQXN5bmMpOiBEZWxldGVkLgorICAgICAgICAoV2ViR1BVOjpEZXZp Y2U6OmNyZWF0ZVNhbXBsZXIpOiBEZWxldGVkLgorICAgICAgICAoV2ViR1BVOjpEZXZpY2U6OmNy ZWF0ZVNoYWRlck1vZHVsZSk6IERlbGV0ZWQuCisgICAgICAgIChXZWJHUFU6OkRldmljZTo6Y3Jl YXRlU3dhcENoYWluKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkdQVTo6RGV2aWNlOjpjcmVhdGVU ZXh0dXJlKTogRGVsZXRlZC4KKyAgICAgICAgKiBXZWJHUFUvUGlwZWxpbmVMYXlvdXQubW06Cisg ICAgICAgIChXZWJHUFU6OkRldmljZTo6Y3JlYXRlUGlwZWxpbmVMYXlvdXQpOgorICAgICAgICAq IFdlYkdQVS9RdWVyeVNldC5tbToKKyAgICAgICAgKFdlYkdQVTo6RGV2aWNlOjpjcmVhdGVRdWVy eVNldCk6CisgICAgICAgICogV2ViR1BVL1JlbmRlckJ1bmRsZUVuY29kZXIubW06CisgICAgICAg IChXZWJHUFU6OkRldmljZTo6Y3JlYXRlUmVuZGVyQnVuZGxlRW5jb2Rlcik6CisgICAgICAgICog V2ViR1BVL1JlbmRlclBpcGVsaW5lLm1tOgorICAgICAgICAoV2ViR1BVOjpEZXZpY2U6OmNyZWF0 ZVJlbmRlclBpcGVsaW5lKToKKyAgICAgICAgKFdlYkdQVTo6RGV2aWNlOjpjcmVhdGVSZW5kZXJQ aXBlbGluZUFzeW5jKToKKyAgICAgICAgKiBXZWJHUFUvU2FtcGxlci5tbToKKyAgICAgICAgKFdl YkdQVTo6RGV2aWNlOjpjcmVhdGVTYW1wbGVyKToKKyAgICAgICAgKiBXZWJHUFUvU2hhZGVyTW9k dWxlLm1tOgorICAgICAgICAoV2ViR1BVOjpEZXZpY2U6OmNyZWF0ZVNoYWRlck1vZHVsZSk6Cisg ICAgICAgICogV2ViR1BVL1N3YXBDaGFpbi5tbToKKyAgICAgICAgKFdlYkdQVTo6RGV2aWNlOjpj cmVhdGVTd2FwQ2hhaW4pOgorICAgICAgICAqIFdlYkdQVS9UZXh0dXJlLm1tOgorICAgICAgICAo V2ViR1BVOjpEZXZpY2U6OmNyZWF0ZVRleHR1cmUpOgorCiAyMDIyLTAyLTE5ICBNeWxlcyBDLiBN YXhmaWVsZCAgPG1tYXhmaWVsZEBhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYkdQVV0gVHJhY2Vy IGJ1bGxldCBwYXJ0IDM6IFR3ZWFrIFdHU0wgQVBJCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViR1BV L1dlYkdQVS9CaW5kR3JvdXAubW0gYi9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9CaW5kR3JvdXAubW0K aW5kZXggYzJiNzQ0ZGVjNmUzLi5iNGVjYmIyZGRkY2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJH UFUvV2ViR1BVL0JpbmRHcm91cC5tbQorKysgYi9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9CaW5kR3Jv dXAubW0KQEAgLTI2LDEwICsyNiwxNyBAQAogI2ltcG9ydCAiY29uZmlnLmgiCiAjaW1wb3J0ICJC aW5kR3JvdXAuaCIKIAorI2ltcG9ydCAiRGV2aWNlLmgiCiAjaW1wb3J0ICJXZWJHUFVFeHQuaCIK IAogbmFtZXNwYWNlIFdlYkdQVSB7CiAKK1JlZlB0cjxCaW5kR3JvdXA+IERldmljZTo6Y3JlYXRl QmluZEdyb3VwKGNvbnN0IFdHUFVCaW5kR3JvdXBEZXNjcmlwdG9yKiBkZXNjcmlwdG9yKQorewor ICAgIFVOVVNFRF9QQVJBTShkZXNjcmlwdG9yKTsKKyAgICByZXR1cm4gQmluZEdyb3VwOjpjcmVh dGUoKTsKK30KKwogQmluZEdyb3VwOjpCaW5kR3JvdXAoKSA9IGRlZmF1bHQ7CiAKIEJpbmRHcm91 cDo6fkJpbmRHcm91cCgpID0gZGVmYXVsdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJHUFUvV2Vi R1BVL0JpbmRHcm91cExheW91dC5tbSBiL1NvdXJjZS9XZWJHUFUvV2ViR1BVL0JpbmRHcm91cExh eW91dC5tbQppbmRleCBiMzczNDg4YWY4NTEuLjViODFiNzIzZWM0ZiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkdQVS9XZWJHUFUvQmluZEdyb3VwTGF5b3V0Lm1tCisrKyBiL1NvdXJjZS9XZWJHUFUv V2ViR1BVL0JpbmRHcm91cExheW91dC5tbQpAQCAtMjYsMTAgKzI2LDE3IEBACiAjaW1wb3J0ICJj b25maWcuaCIKICNpbXBvcnQgIkJpbmRHcm91cExheW91dC5oIgogCisjaW1wb3J0ICJEZXZpY2Uu aCIKICNpbXBvcnQgIldlYkdQVUV4dC5oIgogCiBuYW1lc3BhY2UgV2ViR1BVIHsKIAorUmVmUHRy PEJpbmRHcm91cExheW91dD4gRGV2aWNlOjpjcmVhdGVCaW5kR3JvdXBMYXlvdXQoY29uc3QgV0dQ VUJpbmRHcm91cExheW91dERlc2NyaXB0b3IqIGRlc2NyaXB0b3IpCit7CisgICAgVU5VU0VEX1BB UkFNKGRlc2NyaXB0b3IpOworICAgIHJldHVybiBCaW5kR3JvdXBMYXlvdXQ6OmNyZWF0ZSgpOwor fQorCiBCaW5kR3JvdXBMYXlvdXQ6OkJpbmRHcm91cExheW91dCgpID0gZGVmYXVsdDsKIAogQmlu ZEdyb3VwTGF5b3V0Ojp+QmluZEdyb3VwTGF5b3V0KCkgPSBkZWZhdWx0OwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkdQVS9XZWJHUFUvQnVmZmVyLm1tIGIvU291cmNlL1dlYkdQVS9XZWJHUFUvQnVm ZmVyLm1tCmluZGV4IDlmNjM5N2E5MzA5YS4uNDFhNjE5NzI2NmQwIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViR1BVL1dlYkdQVS9CdWZmZXIubW0KKysrIGIvU291cmNlL1dlYkdQVS9XZWJHUFUvQnVm ZmVyLm1tCkBAIC0yNiwxMCArMjYsMTcgQEAKICNpbXBvcnQgImNvbmZpZy5oIgogI2ltcG9ydCAi QnVmZmVyLmgiCiAKKyNpbXBvcnQgIkRldmljZS5oIgogI2ltcG9ydCAiV2ViR1BVRXh0LmgiCiAK IG5hbWVzcGFjZSBXZWJHUFUgewogCitSZWZQdHI8QnVmZmVyPiBEZXZpY2U6OmNyZWF0ZUJ1ZmZl cihjb25zdCBXR1BVQnVmZmVyRGVzY3JpcHRvciogZGVzY3JpcHRvcikKK3sKKyAgICBVTlVTRURf UEFSQU0oZGVzY3JpcHRvcik7CisgICAgcmV0dXJuIEJ1ZmZlcjo6Y3JlYXRlKCk7Cit9CisKIEJ1 ZmZlcjo6QnVmZmVyKCkgPSBkZWZhdWx0OwogCiBCdWZmZXI6On5CdWZmZXIoKSA9IGRlZmF1bHQ7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9Db21tYW5kRW5jb2Rlci5tbSBiL1Nv dXJjZS9XZWJHUFUvV2ViR1BVL0NvbW1hbmRFbmNvZGVyLm1tCmluZGV4IDUyNjk0YWJjY2Y0ZS4u MmUzYmIxZDU0ZTZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9Db21tYW5kRW5j b2Rlci5tbQorKysgYi9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9Db21tYW5kRW5jb2Rlci5tbQpAQCAt MjksMTIgKzI5LDE5IEBACiAjaW1wb3J0ICJCdWZmZXIuaCIKICNpbXBvcnQgIkNvbW1hbmRCdWZm ZXIuaCIKICNpbXBvcnQgIkNvbXB1dGVQYXNzRW5jb2Rlci5oIgorI2ltcG9ydCAiRGV2aWNlLmgi CiAjaW1wb3J0ICJRdWVyeVNldC5oIgogI2ltcG9ydCAiUmVuZGVyUGFzc0VuY29kZXIuaCIKICNp bXBvcnQgIldlYkdQVUV4dC5oIgogCiBuYW1lc3BhY2UgV2ViR1BVIHsKIAorUmVmUHRyPENvbW1h bmRFbmNvZGVyPiBEZXZpY2U6OmNyZWF0ZUNvbW1hbmRFbmNvZGVyKGNvbnN0IFdHUFVDb21tYW5k RW5jb2RlckRlc2NyaXB0b3IqIGRlc2NyaXB0b3IpCit7CisgICAgVU5VU0VEX1BBUkFNKGRlc2Ny aXB0b3IpOworICAgIHJldHVybiBDb21tYW5kRW5jb2Rlcjo6Y3JlYXRlKCk7Cit9CisKIENvbW1h bmRFbmNvZGVyOjpDb21tYW5kRW5jb2RlcigpID0gZGVmYXVsdDsKIAogQ29tbWFuZEVuY29kZXI6 On5Db21tYW5kRW5jb2RlcigpID0gZGVmYXVsdDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJHUFUv V2ViR1BVL0NvbXB1dGVQaXBlbGluZS5tbSBiL1NvdXJjZS9XZWJHUFUvV2ViR1BVL0NvbXB1dGVQ aXBlbGluZS5tbQppbmRleCA5NmQ5ZDVmNDU2ZjEuLjA1ZGFiNWMzZjZkMiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkdQVS9XZWJHUFUvQ29tcHV0ZVBpcGVsaW5lLm1tCisrKyBiL1NvdXJjZS9XZWJH UFUvV2ViR1BVL0NvbXB1dGVQaXBlbGluZS5tbQpAQCAtMjgsMTAgKzI4LDIzIEBACiAKIAogI2lt cG9ydCAiQmluZEdyb3VwTGF5b3V0LmgiCisjaW1wb3J0ICJEZXZpY2UuaCIKICNpbXBvcnQgIldl YkdQVUV4dC5oIgogCiBuYW1lc3BhY2UgV2ViR1BVIHsKIAorUmVmUHRyPENvbXB1dGVQaXBlbGlu ZT4gRGV2aWNlOjpjcmVhdGVDb21wdXRlUGlwZWxpbmUoY29uc3QgV0dQVUNvbXB1dGVQaXBlbGlu ZURlc2NyaXB0b3IqIGRlc2NyaXB0b3IpCit7CisgICAgVU5VU0VEX1BBUkFNKGRlc2NyaXB0b3Ip OworICAgIHJldHVybiBDb21wdXRlUGlwZWxpbmU6OmNyZWF0ZSgpOworfQorCit2b2lkIERldmlj ZTo6Y3JlYXRlQ29tcHV0ZVBpcGVsaW5lQXN5bmMoY29uc3QgV0dQVUNvbXB1dGVQaXBlbGluZURl c2NyaXB0b3IqIGRlc2NyaXB0b3IsIFdURjo6RnVuY3Rpb248dm9pZChXR1BVQ3JlYXRlUGlwZWxp bmVBc3luY1N0YXR1cywgUmVmUHRyPENvbXB1dGVQaXBlbGluZT4mJiwgY29uc3QgY2hhciogbWVz c2FnZSk+JiYgY2FsbGJhY2spCit7CisgICAgVU5VU0VEX1BBUkFNKGRlc2NyaXB0b3IpOworICAg IFVOVVNFRF9QQVJBTShjYWxsYmFjayk7Cit9CisKIENvbXB1dGVQaXBlbGluZTo6Q29tcHV0ZVBp cGVsaW5lKCkgPSBkZWZhdWx0OwogCiBDb21wdXRlUGlwZWxpbmU6On5Db21wdXRlUGlwZWxpbmUo KSA9IGRlZmF1bHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9EZXZpY2UubW0g Yi9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9EZXZpY2UubW0KaW5kZXggZWUwZDQxNDYwNGEyLi42NzJh YWRjMWUwZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJHUFUvV2ViR1BVL0RldmljZS5tbQorKysg Yi9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9EZXZpY2UubW0KQEAgLTUwLDk3ICs1MCw2IEBAIERldmlj ZTo6RGV2aWNlKCkgPSBkZWZhdWx0OwogCiBEZXZpY2U6On5EZXZpY2UoKSA9IGRlZmF1bHQ7CiAK LVJlZlB0cjxCaW5kR3JvdXA+IERldmljZTo6Y3JlYXRlQmluZEdyb3VwKGNvbnN0IFdHUFVCaW5k R3JvdXBEZXNjcmlwdG9yKiBkZXNjcmlwdG9yKQotewotICAgIFVOVVNFRF9QQVJBTShkZXNjcmlw dG9yKTsKLSAgICByZXR1cm4gQmluZEdyb3VwOjpjcmVhdGUoKTsKLX0KLQotUmVmUHRyPEJpbmRH cm91cExheW91dD4gRGV2aWNlOjpjcmVhdGVCaW5kR3JvdXBMYXlvdXQoY29uc3QgV0dQVUJpbmRH cm91cExheW91dERlc2NyaXB0b3IqIGRlc2NyaXB0b3IpCi17Ci0gICAgVU5VU0VEX1BBUkFNKGRl c2NyaXB0b3IpOwotICAgIHJldHVybiBCaW5kR3JvdXBMYXlvdXQ6OmNyZWF0ZSgpOwotfQotCi1S ZWZQdHI8QnVmZmVyPiBEZXZpY2U6OmNyZWF0ZUJ1ZmZlcihjb25zdCBXR1BVQnVmZmVyRGVzY3Jp cHRvciogZGVzY3JpcHRvcikKLXsKLSAgICBVTlVTRURfUEFSQU0oZGVzY3JpcHRvcik7Ci0gICAg cmV0dXJuIEJ1ZmZlcjo6Y3JlYXRlKCk7Ci19Ci0KLVJlZlB0cjxDb21tYW5kRW5jb2Rlcj4gRGV2 aWNlOjpjcmVhdGVDb21tYW5kRW5jb2Rlcihjb25zdCBXR1BVQ29tbWFuZEVuY29kZXJEZXNjcmlw dG9yKiBkZXNjcmlwdG9yKQotewotICAgIFVOVVNFRF9QQVJBTShkZXNjcmlwdG9yKTsKLSAgICBy ZXR1cm4gQ29tbWFuZEVuY29kZXI6OmNyZWF0ZSgpOwotfQotCi1SZWZQdHI8Q29tcHV0ZVBpcGVs aW5lPiBEZXZpY2U6OmNyZWF0ZUNvbXB1dGVQaXBlbGluZShjb25zdCBXR1BVQ29tcHV0ZVBpcGVs aW5lRGVzY3JpcHRvciogZGVzY3JpcHRvcikKLXsKLSAgICBVTlVTRURfUEFSQU0oZGVzY3JpcHRv cik7Ci0gICAgcmV0dXJuIENvbXB1dGVQaXBlbGluZTo6Y3JlYXRlKCk7Ci19Ci0KLXZvaWQgRGV2 aWNlOjpjcmVhdGVDb21wdXRlUGlwZWxpbmVBc3luYyhjb25zdCBXR1BVQ29tcHV0ZVBpcGVsaW5l RGVzY3JpcHRvciogZGVzY3JpcHRvciwgV1RGOjpGdW5jdGlvbjx2b2lkKFdHUFVDcmVhdGVQaXBl bGluZUFzeW5jU3RhdHVzLCBSZWZQdHI8Q29tcHV0ZVBpcGVsaW5lPiYmLCBjb25zdCBjaGFyKiBt ZXNzYWdlKT4mJiBjYWxsYmFjaykKLXsKLSAgICBVTlVTRURfUEFSQU0oZGVzY3JpcHRvcik7Ci0g ICAgVU5VU0VEX1BBUkFNKGNhbGxiYWNrKTsKLX0KLQotUmVmUHRyPFBpcGVsaW5lTGF5b3V0PiBE ZXZpY2U6OmNyZWF0ZVBpcGVsaW5lTGF5b3V0KGNvbnN0IFdHUFVQaXBlbGluZUxheW91dERlc2Ny aXB0b3IqIGRlc2NyaXB0b3IpCi17Ci0gICAgVU5VU0VEX1BBUkFNKGRlc2NyaXB0b3IpOwotICAg IHJldHVybiBQaXBlbGluZUxheW91dDo6Y3JlYXRlKCk7Ci19Ci0KLVJlZlB0cjxRdWVyeVNldD4g RGV2aWNlOjpjcmVhdGVRdWVyeVNldChjb25zdCBXR1BVUXVlcnlTZXREZXNjcmlwdG9yKiBkZXNj cmlwdG9yKQotewotICAgIFVOVVNFRF9QQVJBTShkZXNjcmlwdG9yKTsKLSAgICByZXR1cm4gUXVl cnlTZXQ6OmNyZWF0ZSgpOwotfQotCi1SZWZQdHI8UmVuZGVyQnVuZGxlRW5jb2Rlcj4gRGV2aWNl OjpjcmVhdGVSZW5kZXJCdW5kbGVFbmNvZGVyKGNvbnN0IFdHUFVSZW5kZXJCdW5kbGVFbmNvZGVy RGVzY3JpcHRvciogZGVzY3JpcHRvcikKLXsKLSAgICBVTlVTRURfUEFSQU0oZGVzY3JpcHRvcik7 Ci0gICAgcmV0dXJuIFJlbmRlckJ1bmRsZUVuY29kZXI6OmNyZWF0ZSgpOwotfQotCi1SZWZQdHI8 UmVuZGVyUGlwZWxpbmU+IERldmljZTo6Y3JlYXRlUmVuZGVyUGlwZWxpbmUoY29uc3QgV0dQVVJl bmRlclBpcGVsaW5lRGVzY3JpcHRvciogZGVzY3JpcHRvcikKLXsKLSAgICBVTlVTRURfUEFSQU0o ZGVzY3JpcHRvcik7Ci0gICAgcmV0dXJuIFJlbmRlclBpcGVsaW5lOjpjcmVhdGUoKTsKLX0KLQot dm9pZCBEZXZpY2U6OmNyZWF0ZVJlbmRlclBpcGVsaW5lQXN5bmMoY29uc3QgV0dQVVJlbmRlclBp cGVsaW5lRGVzY3JpcHRvciogZGVzY3JpcHRvciwgV1RGOjpGdW5jdGlvbjx2b2lkKFdHUFVDcmVh dGVQaXBlbGluZUFzeW5jU3RhdHVzLCBSZWZQdHI8UmVuZGVyUGlwZWxpbmU+JiYsIGNvbnN0IGNo YXIqIG1lc3NhZ2UpPiYmIGNhbGxiYWNrKQotewotICAgIFVOVVNFRF9QQVJBTShkZXNjcmlwdG9y KTsKLSAgICBVTlVTRURfUEFSQU0oY2FsbGJhY2spOwotfQotCi1SZWZQdHI8U2FtcGxlcj4gRGV2 aWNlOjpjcmVhdGVTYW1wbGVyKGNvbnN0IFdHUFVTYW1wbGVyRGVzY3JpcHRvciogZGVzY3JpcHRv cikKLXsKLSAgICBVTlVTRURfUEFSQU0oZGVzY3JpcHRvcik7Ci0gICAgcmV0dXJuIFNhbXBsZXI6 OmNyZWF0ZSgpOwotfQotCi1SZWZQdHI8U2hhZGVyTW9kdWxlPiBEZXZpY2U6OmNyZWF0ZVNoYWRl ck1vZHVsZShjb25zdCBXR1BVU2hhZGVyTW9kdWxlRGVzY3JpcHRvciogZGVzY3JpcHRvcikKLXsK LSAgICBVTlVTRURfUEFSQU0oZGVzY3JpcHRvcik7Ci0gICAgcmV0dXJuIFNoYWRlck1vZHVsZTo6 Y3JlYXRlKCk7Ci19Ci0KLVJlZlB0cjxTd2FwQ2hhaW4+IERldmljZTo6Y3JlYXRlU3dhcENoYWlu KGNvbnN0IFN1cmZhY2UmIHN1cmZhY2UsIGNvbnN0IFdHUFVTd2FwQ2hhaW5EZXNjcmlwdG9yKiBk ZXNjcmlwdG9yKQotewotICAgIFVOVVNFRF9QQVJBTShzdXJmYWNlKTsKLSAgICBVTlVTRURfUEFS QU0oZGVzY3JpcHRvcik7Ci0gICAgcmV0dXJuIFN3YXBDaGFpbjo6Y3JlYXRlKCk7Ci19Ci0KLVJl ZlB0cjxUZXh0dXJlPiBEZXZpY2U6OmNyZWF0ZVRleHR1cmUoY29uc3QgV0dQVVRleHR1cmVEZXNj cmlwdG9yKiBkZXNjcmlwdG9yKQotewotICAgIFVOVVNFRF9QQVJBTShkZXNjcmlwdG9yKTsKLSAg ICByZXR1cm4gVGV4dHVyZTo6Y3JlYXRlKCk7Ci19Ci0KIHZvaWQgRGV2aWNlOjpkZXN0cm95KCkK IHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJHUFUvV2ViR1BVL1BpcGVsaW5lTGF5b3V0Lm1t IGIvU291cmNlL1dlYkdQVS9XZWJHUFUvUGlwZWxpbmVMYXlvdXQubW0KaW5kZXggZTdhMzc1NTM5 YmI1Li43OTIwN2EwZGNhYzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJHUFUvV2ViR1BVL1BpcGVs aW5lTGF5b3V0Lm1tCisrKyBiL1NvdXJjZS9XZWJHUFUvV2ViR1BVL1BpcGVsaW5lTGF5b3V0Lm1t CkBAIC0yNiwxMCArMjYsMTcgQEAKICNpbXBvcnQgImNvbmZpZy5oIgogI2ltcG9ydCAiUGlwZWxp bmVMYXlvdXQuaCIKIAorI2ltcG9ydCAiRGV2aWNlLmgiCiAjaW1wb3J0ICJXZWJHUFVFeHQuaCIK IAogbmFtZXNwYWNlIFdlYkdQVSB7CiAKK1JlZlB0cjxQaXBlbGluZUxheW91dD4gRGV2aWNlOjpj cmVhdGVQaXBlbGluZUxheW91dChjb25zdCBXR1BVUGlwZWxpbmVMYXlvdXREZXNjcmlwdG9yKiBk ZXNjcmlwdG9yKQoreworICAgIFVOVVNFRF9QQVJBTShkZXNjcmlwdG9yKTsKKyAgICByZXR1cm4g UGlwZWxpbmVMYXlvdXQ6OmNyZWF0ZSgpOworfQorCiBQaXBlbGluZUxheW91dDo6UGlwZWxpbmVM YXlvdXQoKSA9IGRlZmF1bHQ7CiAKIFBpcGVsaW5lTGF5b3V0Ojp+UGlwZWxpbmVMYXlvdXQoKSA9 IGRlZmF1bHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9RdWVyeVNldC5tbSBi L1NvdXJjZS9XZWJHUFUvV2ViR1BVL1F1ZXJ5U2V0Lm1tCmluZGV4IDU3ODQyMTJjNzNjMC4uZjU2 N2VkY2ZlM2RmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9RdWVyeVNldC5tbQor KysgYi9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9RdWVyeVNldC5tbQpAQCAtMjYsMTAgKzI2LDE3IEBA CiAjaW1wb3J0ICJjb25maWcuaCIKICNpbXBvcnQgIlF1ZXJ5U2V0LmgiCiAKKyNpbXBvcnQgIkRl dmljZS5oIgogI2ltcG9ydCAiV2ViR1BVRXh0LmgiCiAKIG5hbWVzcGFjZSBXZWJHUFUgewogCitS ZWZQdHI8UXVlcnlTZXQ+IERldmljZTo6Y3JlYXRlUXVlcnlTZXQoY29uc3QgV0dQVVF1ZXJ5U2V0 RGVzY3JpcHRvciogZGVzY3JpcHRvcikKK3sKKyAgICBVTlVTRURfUEFSQU0oZGVzY3JpcHRvcik7 CisgICAgcmV0dXJuIFF1ZXJ5U2V0OjpjcmVhdGUoKTsKK30KKwogUXVlcnlTZXQ6OlF1ZXJ5U2V0 KCkgPSBkZWZhdWx0OwogCiBRdWVyeVNldDo6flF1ZXJ5U2V0KCkgPSBkZWZhdWx0OwpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkdQVS9XZWJHUFUvUmVuZGVyQnVuZGxlRW5jb2Rlci5tbSBiL1NvdXJj ZS9XZWJHUFUvV2ViR1BVL1JlbmRlckJ1bmRsZUVuY29kZXIubW0KaW5kZXggN2I2ZDcyOTZjZDVh Li4zZGIxMTAwZWE3ZWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJHUFUvV2ViR1BVL1JlbmRlckJ1 bmRsZUVuY29kZXIubW0KKysrIGIvU291cmNlL1dlYkdQVS9XZWJHUFUvUmVuZGVyQnVuZGxlRW5j b2Rlci5tbQpAQCAtMjgsMTIgKzI4LDE5IEBACiAKICNpbXBvcnQgIkJpbmRHcm91cC5oIgogI2lt cG9ydCAiQnVmZmVyLmgiCisjaW1wb3J0ICJEZXZpY2UuaCIKICNpbXBvcnQgIlJlbmRlckJ1bmRs ZS5oIgogI2ltcG9ydCAiUmVuZGVyUGlwZWxpbmUuaCIKICNpbXBvcnQgIldlYkdQVUV4dC5oIgog CiBuYW1lc3BhY2UgV2ViR1BVIHsKIAorUmVmUHRyPFJlbmRlckJ1bmRsZUVuY29kZXI+IERldmlj ZTo6Y3JlYXRlUmVuZGVyQnVuZGxlRW5jb2Rlcihjb25zdCBXR1BVUmVuZGVyQnVuZGxlRW5jb2Rl ckRlc2NyaXB0b3IqIGRlc2NyaXB0b3IpCit7CisgICAgVU5VU0VEX1BBUkFNKGRlc2NyaXB0b3Ip OworICAgIHJldHVybiBSZW5kZXJCdW5kbGVFbmNvZGVyOjpjcmVhdGUoKTsKK30KKwogUmVuZGVy QnVuZGxlRW5jb2Rlcjo6UmVuZGVyQnVuZGxlRW5jb2RlcigpID0gZGVmYXVsdDsKIAogUmVuZGVy QnVuZGxlRW5jb2Rlcjo6flJlbmRlckJ1bmRsZUVuY29kZXIoKSA9IGRlZmF1bHQ7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9SZW5kZXJQaXBlbGluZS5tbSBiL1NvdXJjZS9XZWJH UFUvV2ViR1BVL1JlbmRlclBpcGVsaW5lLm1tCmluZGV4IGUzNjUwM2FhYTJhNi4uZGMzZjUyZDE1 YzRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9SZW5kZXJQaXBlbGluZS5tbQor KysgYi9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9SZW5kZXJQaXBlbGluZS5tbQpAQCAtMjcsMTAgKzI3 LDIzIEBACiAjaW1wb3J0ICJSZW5kZXJQaXBlbGluZS5oIgogCiAjaW1wb3J0ICJCaW5kR3JvdXBM YXlvdXQuaCIKKyNpbXBvcnQgIkRldmljZS5oIgogI2ltcG9ydCAiV2ViR1BVRXh0LmgiCiAKIG5h bWVzcGFjZSBXZWJHUFUgewogCitSZWZQdHI8UmVuZGVyUGlwZWxpbmU+IERldmljZTo6Y3JlYXRl UmVuZGVyUGlwZWxpbmUoY29uc3QgV0dQVVJlbmRlclBpcGVsaW5lRGVzY3JpcHRvciogZGVzY3Jp cHRvcikKK3sKKyAgICBVTlVTRURfUEFSQU0oZGVzY3JpcHRvcik7CisgICAgcmV0dXJuIFJlbmRl clBpcGVsaW5lOjpjcmVhdGUoKTsKK30KKwordm9pZCBEZXZpY2U6OmNyZWF0ZVJlbmRlclBpcGVs aW5lQXN5bmMoY29uc3QgV0dQVVJlbmRlclBpcGVsaW5lRGVzY3JpcHRvciogZGVzY3JpcHRvciwg V1RGOjpGdW5jdGlvbjx2b2lkKFdHUFVDcmVhdGVQaXBlbGluZUFzeW5jU3RhdHVzLCBSZWZQdHI8 UmVuZGVyUGlwZWxpbmU+JiYsIGNvbnN0IGNoYXIqIG1lc3NhZ2UpPiYmIGNhbGxiYWNrKQorewor ICAgIFVOVVNFRF9QQVJBTShkZXNjcmlwdG9yKTsKKyAgICBVTlVTRURfUEFSQU0oY2FsbGJhY2sp OworfQorCiBSZW5kZXJQaXBlbGluZTo6UmVuZGVyUGlwZWxpbmUoKSA9IGRlZmF1bHQ7CiAKIFJl bmRlclBpcGVsaW5lOjp+UmVuZGVyUGlwZWxpbmUoKSA9IGRlZmF1bHQ7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViR1BVL1dlYkdQVS9TYW1wbGVyLm1tIGIvU291cmNlL1dlYkdQVS9XZWJHUFUvU2Ft cGxlci5tbQppbmRleCA2YTE2YTIyMjY2NmQuLjExYzg5NGM3ZTEyNCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkdQVS9XZWJHUFUvU2FtcGxlci5tbQorKysgYi9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9T YW1wbGVyLm1tCkBAIC0yNiwxMCArMjYsMTcgQEAKICNpbXBvcnQgImNvbmZpZy5oIgogI2ltcG9y dCAiU2FtcGxlci5oIgogCisjaW1wb3J0ICJEZXZpY2UuaCIKICNpbXBvcnQgIldlYkdQVUV4dC5o IgogCiBuYW1lc3BhY2UgV2ViR1BVIHsKIAorUmVmUHRyPFNhbXBsZXI+IERldmljZTo6Y3JlYXRl U2FtcGxlcihjb25zdCBXR1BVU2FtcGxlckRlc2NyaXB0b3IqIGRlc2NyaXB0b3IpCit7CisgICAg VU5VU0VEX1BBUkFNKGRlc2NyaXB0b3IpOworICAgIHJldHVybiBTYW1wbGVyOjpjcmVhdGUoKTsK K30KKwogU2FtcGxlcjo6U2FtcGxlcigpID0gZGVmYXVsdDsKIAogU2FtcGxlcjo6flNhbXBsZXIo KSA9IGRlZmF1bHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9TaGFkZXJNb2R1 bGUubW0gYi9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9TaGFkZXJNb2R1bGUubW0KaW5kZXggNmNiM2M5 ZTlmMGRhLi41ZDNlNGRjMmM2MmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJHUFUvV2ViR1BVL1No YWRlck1vZHVsZS5tbQorKysgYi9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9TaGFkZXJNb2R1bGUubW0K QEAgLTI2LDEwICsyNiwxNyBAQAogI2ltcG9ydCAiY29uZmlnLmgiCiAjaW1wb3J0ICJTaGFkZXJN b2R1bGUuaCIKIAorI2ltcG9ydCAiRGV2aWNlLmgiCiAjaW1wb3J0ICJXZWJHUFVFeHQuaCIKIAog bmFtZXNwYWNlIFdlYkdQVSB7CiAKK1JlZlB0cjxTaGFkZXJNb2R1bGU+IERldmljZTo6Y3JlYXRl U2hhZGVyTW9kdWxlKGNvbnN0IFdHUFVTaGFkZXJNb2R1bGVEZXNjcmlwdG9yKiBkZXNjcmlwdG9y KQoreworICAgIFVOVVNFRF9QQVJBTShkZXNjcmlwdG9yKTsKKyAgICByZXR1cm4gU2hhZGVyTW9k dWxlOjpjcmVhdGUoKTsKK30KKwogU2hhZGVyTW9kdWxlOjpTaGFkZXJNb2R1bGUoKSA9IGRlZmF1 bHQ7CiAKIFNoYWRlck1vZHVsZTo6flNoYWRlck1vZHVsZSgpID0gZGVmYXVsdDsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJHUFUvV2ViR1BVL1N3YXBDaGFpbi5tbSBiL1NvdXJjZS9XZWJHUFUvV2Vi R1BVL1N3YXBDaGFpbi5tbQppbmRleCA5ZmNmOGQ1YTkyZWEuLmJmMTFhMzEzNWViMiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkdQVS9XZWJHUFUvU3dhcENoYWluLm1tCisrKyBiL1NvdXJjZS9XZWJH UFUvV2ViR1BVL1N3YXBDaGFpbi5tbQpAQCAtMjYsMTEgKzI2LDE5IEBACiAjaW1wb3J0ICJjb25m aWcuaCIKICNpbXBvcnQgIlN3YXBDaGFpbi5oIgogCisjaW1wb3J0ICJEZXZpY2UuaCIKICNpbXBv cnQgIlRleHR1cmVWaWV3LmgiCiAjaW1wb3J0ICJXZWJHUFVFeHQuaCIKIAogbmFtZXNwYWNlIFdl YkdQVSB7CiAKK1JlZlB0cjxTd2FwQ2hhaW4+IERldmljZTo6Y3JlYXRlU3dhcENoYWluKGNvbnN0 IFN1cmZhY2UmIHN1cmZhY2UsIGNvbnN0IFdHUFVTd2FwQ2hhaW5EZXNjcmlwdG9yKiBkZXNjcmlw dG9yKQoreworICAgIFVOVVNFRF9QQVJBTShzdXJmYWNlKTsKKyAgICBVTlVTRURfUEFSQU0oZGVz Y3JpcHRvcik7CisgICAgcmV0dXJuIFN3YXBDaGFpbjo6Y3JlYXRlKCk7Cit9CisKIFN3YXBDaGFp bjo6U3dhcENoYWluKCkgPSBkZWZhdWx0OwogCiBTd2FwQ2hhaW46On5Td2FwQ2hhaW4oKSA9IGRl ZmF1bHQ7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViR1BVL1dlYkdQVS9UZXh0dXJlLm1tIGIvU291 cmNlL1dlYkdQVS9XZWJHUFUvVGV4dHVyZS5tbQppbmRleCA1NmE5YTE2YzlhYzcuLmE2ZDJkNjQw ZTA1OSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkdQVS9XZWJHUFUvVGV4dHVyZS5tbQorKysgYi9T b3VyY2UvV2ViR1BVL1dlYkdQVS9UZXh0dXJlLm1tCkBAIC0yNiwxMSArMjYsMTggQEAKICNpbXBv cnQgImNvbmZpZy5oIgogI2ltcG9ydCAiVGV4dHVyZS5oIgogCisjaW1wb3J0ICJEZXZpY2UuaCIK ICNpbXBvcnQgIlRleHR1cmVWaWV3LmgiCiAjaW1wb3J0ICJXZWJHUFVFeHQuaCIKIAogbmFtZXNw YWNlIFdlYkdQVSB7CiAKK1JlZlB0cjxUZXh0dXJlPiBEZXZpY2U6OmNyZWF0ZVRleHR1cmUoY29u c3QgV0dQVVRleHR1cmVEZXNjcmlwdG9yKiBkZXNjcmlwdG9yKQoreworICAgIFVOVVNFRF9QQVJB TShkZXNjcmlwdG9yKTsKKyAgICByZXR1cm4gVGV4dHVyZTo6Y3JlYXRlKCk7Cit9CisKIFRleHR1 cmU6OlRleHR1cmUoKSA9IGRlZmF1bHQ7CiAKIFRleHR1cmU6On5UZXh0dXJlKCkgPSBkZWZhdWx0 Owo=