169366 2017-03-08 13:24:00 -0800 WebGPU: Backend - hosting WebGPU layers 2022-11-25 19:30:06 -0800 1 1 1 Unclassified WebKit WebGL WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 167952 1 dino dino billmartinnn dino jonlee webkit-bug-importer oldest_to_newest 1284959 0 dino 2017-03-08 13:24:00 -0800 Implement local and remote hosting of WebGPULayer 1284973 1 dino 2017-03-08 13:31:08 -0800 <rdar://problem/30928735> 1287055 2 304233 jonlee 2017-03-13 00:06:54 -0700 Created attachment 304233 Patch 1287056 3 304234 jonlee 2017-03-13 00:08:11 -0700 Created attachment 304234 Patch 1287077 4 304234 dino 2017-03-13 00:13:48 -0700 Comment on attachment 304234 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=304234&action=review > Source/WebCore/ChangeLog:19 > + (WebCore::canvasCompositingStrategy): WebGPU canvas shoudl return CanvasAsLayerContents. Typo: should > Source/WebCore/html/canvas/WebGPURenderingContext.cpp:77 > Document& document = canvas.document(); > Frame* frame = document.frame(); > if (!frame) > return nullptr; This can be removed for now. > Source/WebCore/rendering/RenderLayerBacking.cpp:84 > - if (context->is3d()) > + if (context->is3d() || context->isGPU()) Should this be guarded with ENABLE(WEBGPU)? 1287078 5 jonlee 2017-03-13 00:18:44 -0700 Committed r213783: <http://trac.webkit.org/changeset/213783> 1287079 6 304234 jonlee 2017-03-13 00:19:01 -0700 Comment on attachment 304234 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=304234&action=review >> Source/WebCore/ChangeLog:19 >> + (WebCore::canvasCompositingStrategy): WebGPU canvas shoudl return CanvasAsLayerContents. > > Typo: should Done. >> Source/WebCore/html/canvas/WebGPURenderingContext.cpp:77 >> return nullptr; > > This can be removed for now. Done. >> Source/WebCore/rendering/RenderLayerBacking.cpp:84 >> + if (context->is3d() || context->isGPU()) > > Should this be guarded with ENABLE(WEBGPU)? Separated this out and wrapped in ENABLE. 304233 2017-03-13 00:06:54 -0700 2017-03-13 00:08:07 -0700 Patch bug-169366-20170313000653.patch text/plain 5282 jonlee U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzNzgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzQ2ZmM0ODc1MGE4YzZm MzQ5MDcwMWIwYTNjZGZjYjdkMWU0NDM4MS4uZGY1NzllNzE3YTVkMDY5ZjYyNjc3NDE3ZmU1Zjc3 NGU5M2M3ZTI1NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE3LTAzLTEzICBKb24g TGVlICA8am9ubGVlQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJHUFU6IEJhY2tlbmQgLSBob3N0 aW5nIFdlYkdQVSBsYXllcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE2OTM2NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogaHRtbC9jYW52YXMvV2ViR1BVUmVuZGVyaW5nQ29udGV4dC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpXZWJHUFVSZW5kZXJpbmdDb250ZXh0OjpjcmVhdGUpOiBDcmVhdGUgdGhl IGRldmljZSBhbmQgdGhlCisgICAgICAgIHJlbmRlcmluZyBjb250ZXh0LgorICAgICAgICAqIHBs YXRmb3JtL2dyYXBoaWNzL2NvY29hL0dQVUNvbW1hbmRCdWZmZXJNZXRhbC5tbToKKyAgICAgICAg KFdlYkNvcmU6OkdQVUNvbW1hbmRCdWZmZXI6OmNvbW1pdCk6CisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY29jb2EvR1BVRHJhd2FibGVNZXRhbC5tbToKKyAgICAgICAgKFdlYkNvcmU6OkdQ VURyYXdhYmxlOjpyZWxlYXNlKTogRml4IGEgbG9nIG1lc3NhZ2UKKyAgICAgICAgKiBwbGF0Zm9y bS9ncmFwaGljcy9ncHUvR1BVQ29tbWFuZEJ1ZmZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpH UFVDb21tYW5kQnVmZmVyOjpjb21taXQpOiBEZWxldGVkLiBNb3ZlZCB0byBHUFVDb21tYW5kQnVm ZmVyTWV0YWwuCisgICAgICAgICogcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpjYW52YXNDb21wb3NpdGluZ1N0cmF0ZWd5KTogV2ViR1BVIGNhbnZh cyBzaG91ZGwgcmV0dXJuIENhbnZhc0FzTGF5ZXJDb250ZW50cy4KKwogMjAxNy0wMy0xMiAgSm9u IExlZSAgPGpvbmxlZUBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHN0dWJzIGZyb20gV2Vi R1BVIGZyb250IGVuZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvV2Vi R1BVUmVuZGVyaW5nQ29udGV4dC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJH UFVSZW5kZXJpbmdDb250ZXh0LmNwcAppbmRleCBkNTBjY2Y0YzQwYjk4NTllNjk2MTBjYzFkMmI1 ZTljN2ExMTFiMDJmLi41NWJhNzk2ZGRjNWYyMzQwMTMyZDFiNzNhZGJjZjY0MGNjYjZjOWJmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHUFVSZW5kZXJpbmdDb250 ZXh0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHUFVSZW5kZXJpbmdD b250ZXh0LmNwcApAQCAtNzEsMjMgKzcxLDEyIEBAIHN0YXRpYyBjb25zdCBpbnQga01heFRleHR1 cmVTaXplID0gNDA5NjsKIAogc3RkOjp1bmlxdWVfcHRyPFdlYkdQVVJlbmRlcmluZ0NvbnRleHQ+ IFdlYkdQVVJlbmRlcmluZ0NvbnRleHQ6OmNyZWF0ZShIVE1MQ2FudmFzRWxlbWVudCYgY2FudmFz KQogewotICAgIFVOVVNFRF9QQVJBTShjYW52YXMpOwotLyogRklYTUU6IFdlYkdQVSAtIFRvIGJl IGltcGxlbWVudGVkLgogICAgIERvY3VtZW50JiBkb2N1bWVudCA9IGNhbnZhcy5kb2N1bWVudCgp OwogICAgIEZyYW1lKiBmcmFtZSA9IGRvY3VtZW50LmZyYW1lKCk7CiAgICAgaWYgKCFmcmFtZSkK ICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAKLSAgICBHUFVEZXZpY2U6OkF0dHJpYnV0ZXMgYXR0 cmlidXRlczsKLQotICAgIGF0dHJpYnV0ZXMuYW50aWFsaWFzID0gZmFsc2U7Ci0KLSAgICAvLyBG SVhNRTogV2ViR1BVIC0gaGFuZGxlIHJldGluYS4KLSAgICAvLyBpZiAocGFnZSkKLSAgICAvLyAg ICAgYXR0cmlidXRlcy5kZXZpY2VQaXhlbFJhdGlvID0gcGFnZS0+ZGV2aWNlU2NhbGVGYWN0b3Io KTsKLQotICAgIEhvc3RXaW5kb3cqIGhvc3RXaW5kb3cgPSBkb2N1bWVudC52aWV3KCktPnJvb3Qo KS0+aG9zdFdpbmRvdygpOwotICAgIFJlZlB0cjxHUFVEZXZpY2U+IGRldmljZShHUFVEZXZpY2U6 OmNyZWF0ZShhdHRyaWJ1dGVzLCBob3N0V2luZG93KSk7CisgICAgUmVmUHRyPEdQVURldmljZT4g ZGV2aWNlKEdQVURldmljZTo6Y3JlYXRlKCkpOwogCiAgICAgaWYgKCFkZXZpY2UpIHsKICAgICAg ICAgLy8gRklYTUU6IFdlYkdQVSAtIGRpc3BhdGNoIGFuIGV2ZW50IGhlcmUgZm9yIHRoZSBmYWls dXJlLgpAQCAtOTksOCArODgsNiBAQCBzdGQ6OnVuaXF1ZV9wdHI8V2ViR1BVUmVuZGVyaW5nQ29u dGV4dD4gV2ViR1BVUmVuZGVyaW5nQ29udGV4dDo6Y3JlYXRlKEhUTUxDYW52YQogICAgIHJlbmRl cmluZ0NvbnRleHQtPnN1c3BlbmRJZk5lZWRlZCgpOwogCiAgICAgcmV0dXJuIHJlbmRlcmluZ0Nv bnRleHQ7Ci0qLwotICAgIHJldHVybiBudWxscHRyOwogfQogCiBXZWJHUFVSZW5kZXJpbmdDb250 ZXh0OjpXZWJHUFVSZW5kZXJpbmdDb250ZXh0KEhUTUxDYW52YXNFbGVtZW50JiBjYW52YXMsIFBh c3NSZWZQdHI8R1BVRGV2aWNlPiBkZXZpY2UpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9HUFVDb21tYW5kQnVmZmVyTWV0YWwubW0gYi9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9HUFVDb21tYW5kQnVmZmVyTWV0YWwubW0K aW5kZXggMjE5ZjJlMDVhNDg2ZTUwYjJhZjQxYzE5NDBkNDE2MjJjMzhlYmZkYy4uZjFlYTU5MjA3 YmJkNzg3Mjk4YjQ1ZTc4NzQxODg3NmU5MTU2ODU5ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvR1BVQ29tbWFuZEJ1ZmZlck1ldGFsLm1tCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0dQVUNvbW1hbmRCdWZmZXJN ZXRhbC5tbQpAQCAtNjEsNiArNjEsMTQgQEAgdm9pZCBHUFVDb21tYW5kQnVmZmVyOjpwcmVzZW50 RHJhd2FibGUoR1BVRHJhd2FibGUqIGRyYXdhYmxlKQogICAgIGRyYXdhYmxlLT5yZWxlYXNlKCk7 CiB9CiAKK3ZvaWQgR1BVQ29tbWFuZEJ1ZmZlcjo6Y29tbWl0KCkKK3sKKyAgICBpZiAoIW1fY29t bWFuZEJ1ZmZlcikKKyAgICAgICAgcmV0dXJuOworCisgICAgW21fY29tbWFuZEJ1ZmZlciBjb21t aXRdOworfQorCiB9IC8vIG5hbWVzcGFjZSBXZWJDb3JlCiAKICNlbmRpZgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvR1BVRHJhd2FibGVNZXRhbC5t bSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29hL0dQVURyYXdhYmxlTWV0 YWwubW0KaW5kZXggNzU0OTRiNjNhM2VlZjliMjg3ZGEyYjA5OWEzMmI4ODY1OTc4NDE2Ni4uNDI1 ZTU5ZmZhNzc5YjFhNDdhM2MxODhkMTYwYWQ0MzY1OTk1ODY5MyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2EvR1BVRHJhd2FibGVNZXRhbC5tbQorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9HUFVEcmF3YWJsZU1ldGFs Lm1tCkBAIC00OCw3ICs0OCw3IEBAIEdQVURyYXdhYmxlOjpHUFVEcmF3YWJsZShHUFVEZXZpY2Uq IGRldmljZSkKIAogdm9pZCBHUFVEcmF3YWJsZTo6cmVsZWFzZSgpCiB7Ci0gICAgTE9HKFdlYkdQ VSwgIk1ldGFsRHJhd2FibGU6OnJlbGVhc2UoKSIpOworICAgIExPRyhXZWJHUFUsICJHUFVEcmF3 YWJsZTo6cmVsZWFzZSgpIik7CiAgICAgbV9kcmF3YWJsZSA9IG51bGxwdHI7CiB9CiAgICAgCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvR1BVQ29tbWFu ZEJ1ZmZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9ncHUvR1BVQ29t bWFuZEJ1ZmZlci5jcHAKaW5kZXggM2EwYWRjMzYyNmEzY2FiNDZkZjY3YThjMWVkMWJkOWQ5MTIw NTQ0Yy4uZWJkOGU3ZGQ3ODQ4ZTEyMDcwZWRmNWZlODBiN2JhNTMwYWY5YTJhNyAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0dQVUNvbW1hbmRCdWZmZXIu Y3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9HUFVDb21tYW5k QnVmZmVyLmNwcApAQCAtNDcsMTAgKzQ3LDYgQEAgR1BVQ29tbWFuZEJ1ZmZlcjo6fkdQVUNvbW1h bmRCdWZmZXIoKQogICAgIExPRyhXZWJHUFUsICJHUFVDb21tYW5kQnVmZmVyOjp+R1BVQ29tbWFu ZEJ1ZmZlcigpIik7CiB9CiAKLXZvaWQgR1BVQ29tbWFuZEJ1ZmZlcjo6Y29tbWl0KCkKLXsKLX0K LQogUmVmUHRyPEdQVVJlbmRlckNvbW1hbmRFbmNvZGVyPiBHUFVDb21tYW5kQnVmZmVyOjpjcmVh dGVSZW5kZXJDb21tYW5kRW5jb2RlcihHUFVSZW5kZXJQYXNzRGVzY3JpcHRvciogZGVzY3JpcHRv cikKIHsKICAgICByZXR1cm4gR1BVUmVuZGVyQ29tbWFuZEVuY29kZXI6OmNyZWF0ZSh0aGlzLCBk ZXNjcmlwdG9yKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJM YXllckJhY2tpbmcuY3BwIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFj a2luZy5jcHAKaW5kZXggZmRiNWMyODVkNGU4NGJlM2UxZjhhODk3YTdmYzA0ZWJkMTlmZWZhZS4u NmEwMDE3OTZmYjIyMDEyMGEyNTJlOTgyMTcxNzMzM2NhNDkyMWViOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAKQEAgLTgxLDcgKzgxLDcg QEAgQ2FudmFzQ29tcG9zaXRpbmdTdHJhdGVneSBjYW52YXNDb21wb3NpdGluZ1N0cmF0ZWd5KGNv bnN0IFJlbmRlck9iamVjdCYgcmVuZGVyZXIKICAgICBpZiAoIWNvbnRleHQgfHwgIWNvbnRleHQt PmlzQWNjZWxlcmF0ZWQoKSkKICAgICAgICAgcmV0dXJuIFVuYWNjZWxlcmF0ZWRDYW52YXM7CiAg ICAgCi0gICAgaWYgKGNvbnRleHQtPmlzM2QoKSkKKyAgICBpZiAoY29udGV4dC0+aXMzZCgpIHx8 IGNvbnRleHQtPmlzR1BVKCkpCiAgICAgICAgIHJldHVybiBDYW52YXNBc0xheWVyQ29udGVudHM7 CiAKICNpZiBFTkFCTEUoQUNDRUxFUkFURURfMkRfQ0FOVkFTKQo= 304234 2017-03-13 00:08:11 -0700 2017-03-13 00:13:48 -0700 Patch bug-169366-20170313000810.patch text/plain 5317 jonlee U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzNzgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYzQ2ZmM0ODc1MGE4YzZm MzQ5MDcwMWIwYTNjZGZjYjdkMWU0NDM4MS4uZTFkZDRhN2MyNTFmNjcwNTQ4MjBjNDQyNjBlZWI0 ZjFmNTI1MmM0MSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDE3LTAzLTEzICBKb24g TGVlICA8am9ubGVlQGFwcGxlLmNvbT4KKworICAgICAgICBXZWJHUFU6IEJhY2tlbmQgLSBob3N0 aW5nIFdlYkdQVSBsYXllcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE2OTM2NgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzA5Mjg3MzU+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBodG1sL2NhbnZh cy9XZWJHUFVSZW5kZXJpbmdDb250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OldlYkdQVVJl bmRlcmluZ0NvbnRleHQ6OmNyZWF0ZSk6IENyZWF0ZSB0aGUgZGV2aWNlIGFuZCB0aGUKKyAgICAg ICAgcmVuZGVyaW5nIGNvbnRleHQuCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvY29jb2Ev R1BVQ29tbWFuZEJ1ZmZlck1ldGFsLm1tOgorICAgICAgICAoV2ViQ29yZTo6R1BVQ29tbWFuZEJ1 ZmZlcjo6Y29tbWl0KToKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jb2NvYS9HUFVEcmF3 YWJsZU1ldGFsLm1tOgorICAgICAgICAoV2ViQ29yZTo6R1BVRHJhd2FibGU6OnJlbGVhc2UpOiBG aXggYSBsb2cgbWVzc2FnZQorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dwdS9HUFVDb21t YW5kQnVmZmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkdQVUNvbW1hbmRCdWZmZXI6OmNvbW1p dCk6IERlbGV0ZWQuIE1vdmVkIHRvIEdQVUNvbW1hbmRCdWZmZXJNZXRhbC4KKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNhbnZh c0NvbXBvc2l0aW5nU3RyYXRlZ3kpOiBXZWJHUFUgY2FudmFzIHNob3VkbCByZXR1cm4gQ2FudmFz QXNMYXllckNvbnRlbnRzLgorCiAyMDE3LTAzLTEyICBKb24gTGVlICA8am9ubGVlQGFwcGxlLmNv bT4KIAogICAgICAgICBSZW1vdmUgc3R1YnMgZnJvbSBXZWJHUFUgZnJvbnQgZW5kCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9XZWJHUFVSZW5kZXJpbmdDb250ZXh0LmNw cCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdQVVJlbmRlcmluZ0NvbnRleHQuY3Bw CmluZGV4IGQ1MGNjZjRjNDBiOTg1OWU2OTYxMGNjMWQyYjVlOWM3YTExMWIwMmYuLjU1YmE3OTZk ZGM1ZjIzNDAxMzJkMWI3M2FkYmNmNjQwY2NiNmM5YmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL2h0bWwvY2FudmFzL1dlYkdQVVJlbmRlcmluZ0NvbnRleHQuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvY2FudmFzL1dlYkdQVVJlbmRlcmluZ0NvbnRleHQuY3BwCkBAIC03MSwyMyAr NzEsMTIgQEAgc3RhdGljIGNvbnN0IGludCBrTWF4VGV4dHVyZVNpemUgPSA0MDk2OwogCiBzdGQ6 OnVuaXF1ZV9wdHI8V2ViR1BVUmVuZGVyaW5nQ29udGV4dD4gV2ViR1BVUmVuZGVyaW5nQ29udGV4 dDo6Y3JlYXRlKEhUTUxDYW52YXNFbGVtZW50JiBjYW52YXMpCiB7Ci0gICAgVU5VU0VEX1BBUkFN KGNhbnZhcyk7Ci0vKiBGSVhNRTogV2ViR1BVIC0gVG8gYmUgaW1wbGVtZW50ZWQuCiAgICAgRG9j dW1lbnQmIGRvY3VtZW50ID0gY2FudmFzLmRvY3VtZW50KCk7CiAgICAgRnJhbWUqIGZyYW1lID0g ZG9jdW1lbnQuZnJhbWUoKTsKICAgICBpZiAoIWZyYW1lKQogICAgICAgICByZXR1cm4gbnVsbHB0 cjsKIAotICAgIEdQVURldmljZTo6QXR0cmlidXRlcyBhdHRyaWJ1dGVzOwotCi0gICAgYXR0cmli dXRlcy5hbnRpYWxpYXMgPSBmYWxzZTsKLQotICAgIC8vIEZJWE1FOiBXZWJHUFUgLSBoYW5kbGUg cmV0aW5hLgotICAgIC8vIGlmIChwYWdlKQotICAgIC8vICAgICBhdHRyaWJ1dGVzLmRldmljZVBp eGVsUmF0aW8gPSBwYWdlLT5kZXZpY2VTY2FsZUZhY3RvcigpOwotCi0gICAgSG9zdFdpbmRvdyog aG9zdFdpbmRvdyA9IGRvY3VtZW50LnZpZXcoKS0+cm9vdCgpLT5ob3N0V2luZG93KCk7Ci0gICAg UmVmUHRyPEdQVURldmljZT4gZGV2aWNlKEdQVURldmljZTo6Y3JlYXRlKGF0dHJpYnV0ZXMsIGhv c3RXaW5kb3cpKTsKKyAgICBSZWZQdHI8R1BVRGV2aWNlPiBkZXZpY2UoR1BVRGV2aWNlOjpjcmVh dGUoKSk7CiAKICAgICBpZiAoIWRldmljZSkgewogICAgICAgICAvLyBGSVhNRTogV2ViR1BVIC0g ZGlzcGF0Y2ggYW4gZXZlbnQgaGVyZSBmb3IgdGhlIGZhaWx1cmUuCkBAIC05OSw4ICs4OCw2IEBA IHN0ZDo6dW5pcXVlX3B0cjxXZWJHUFVSZW5kZXJpbmdDb250ZXh0PiBXZWJHUFVSZW5kZXJpbmdD b250ZXh0OjpjcmVhdGUoSFRNTENhbnZhCiAgICAgcmVuZGVyaW5nQ29udGV4dC0+c3VzcGVuZElm TmVlZGVkKCk7CiAKICAgICByZXR1cm4gcmVuZGVyaW5nQ29udGV4dDsKLSovCi0gICAgcmV0dXJu IG51bGxwdHI7CiB9CiAKIFdlYkdQVVJlbmRlcmluZ0NvbnRleHQ6OldlYkdQVVJlbmRlcmluZ0Nv bnRleHQoSFRNTENhbnZhc0VsZW1lbnQmIGNhbnZhcywgUGFzc1JlZlB0cjxHUFVEZXZpY2U+IGRl dmljZSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NvY29h L0dQVUNvbW1hbmRCdWZmZXJNZXRhbC5tbSBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2NvY29hL0dQVUNvbW1hbmRCdWZmZXJNZXRhbC5tbQppbmRleCAyMTlmMmUwNWE0ODZlNTBi MmFmNDFjMTk0MGQ0MTYyMmMzOGViZmRjLi5mMWVhNTkyMDdiYmQ3ODcyOThiNDVlNzg3NDE4ODc2 ZTkxNTY4NTlkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j b2NvYS9HUFVDb21tYW5kQnVmZmVyTWV0YWwubW0KKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvY29jb2EvR1BVQ29tbWFuZEJ1ZmZlck1ldGFsLm1tCkBAIC02MSw2ICs2MSwx NCBAQCB2b2lkIEdQVUNvbW1hbmRCdWZmZXI6OnByZXNlbnREcmF3YWJsZShHUFVEcmF3YWJsZSog ZHJhd2FibGUpCiAgICAgZHJhd2FibGUtPnJlbGVhc2UoKTsKIH0KIAordm9pZCBHUFVDb21tYW5k QnVmZmVyOjpjb21taXQoKQoreworICAgIGlmICghbV9jb21tYW5kQnVmZmVyKQorICAgICAgICBy ZXR1cm47CisKKyAgICBbbV9jb21tYW5kQnVmZmVyIGNvbW1pdF07Cit9CisKIH0gLy8gbmFtZXNw YWNlIFdlYkNvcmUKIAogI2VuZGlmCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9jb2NvYS9HUFVEcmF3YWJsZU1ldGFsLm1tIGIvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvY29jb2EvR1BVRHJhd2FibGVNZXRhbC5tbQppbmRleCA3NTQ5NGI2M2Ez ZWVmOWIyODdkYTJiMDk5YTMyYjg4NjU5Nzg0MTY2Li40MjVlNTlmZmE3NzliMWE0N2EzYzE4OGQx NjBhZDQzNjU5OTU4NjkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFw aGljcy9jb2NvYS9HUFVEcmF3YWJsZU1ldGFsLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2dyYXBoaWNzL2NvY29hL0dQVURyYXdhYmxlTWV0YWwubW0KQEAgLTQ4LDcgKzQ4LDcgQEAg R1BVRHJhd2FibGU6OkdQVURyYXdhYmxlKEdQVURldmljZSogZGV2aWNlKQogCiB2b2lkIEdQVURy YXdhYmxlOjpyZWxlYXNlKCkKIHsKLSAgICBMT0coV2ViR1BVLCAiTWV0YWxEcmF3YWJsZTo6cmVs ZWFzZSgpIik7CisgICAgTE9HKFdlYkdQVSwgIkdQVURyYXdhYmxlOjpyZWxlYXNlKCkiKTsKICAg ICBtX2RyYXdhYmxlID0gbnVsbHB0cjsKIH0KICAgICAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9HUFVDb21tYW5kQnVmZmVyLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dwdS9HUFVDb21tYW5kQnVmZmVyLmNwcAppbmRleCAz YTBhZGMzNjI2YTNjYWI0NmRmNjdhOGMxZWQxYmQ5ZDkxMjA1NDRjLi5lYmQ4ZTdkZDc4NDhlMTIw NzBlZGY1ZmU4MGI3YmE1MzBhZjlhMmE3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ncmFwaGljcy9ncHUvR1BVQ29tbWFuZEJ1ZmZlci5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3B1L0dQVUNvbW1hbmRCdWZmZXIuY3BwCkBAIC00NywxMCAr NDcsNiBAQCBHUFVDb21tYW5kQnVmZmVyOjp+R1BVQ29tbWFuZEJ1ZmZlcigpCiAgICAgTE9HKFdl YkdQVSwgIkdQVUNvbW1hbmRCdWZmZXI6On5HUFVDb21tYW5kQnVmZmVyKCkiKTsKIH0KIAotdm9p ZCBHUFVDb21tYW5kQnVmZmVyOjpjb21taXQoKQotewotfQotCiBSZWZQdHI8R1BVUmVuZGVyQ29t bWFuZEVuY29kZXI+IEdQVUNvbW1hbmRCdWZmZXI6OmNyZWF0ZVJlbmRlckNvbW1hbmRFbmNvZGVy KEdQVVJlbmRlclBhc3NEZXNjcmlwdG9yKiBkZXNjcmlwdG9yKQogewogICAgIHJldHVybiBHUFVS ZW5kZXJDb21tYW5kRW5jb2Rlcjo6Y3JlYXRlKHRoaXMsIGRlc2NyaXB0b3IpOwpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlckxheWVyQmFja2luZy5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyTGF5ZXJCYWNraW5nLmNwcAppbmRleCBmZGI1YzI4 NWQ0ZTg0YmUzZTFmOGE4OTdhN2ZjMDRlYmQxOWZlZmFlLi42YTAwMTc5NmZiMjIwMTIwYTI1MmU5 ODIxNzE3MzMzY2E0OTIxZWI5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcv UmVuZGVyTGF5ZXJCYWNraW5nLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVu ZGVyTGF5ZXJCYWNraW5nLmNwcApAQCAtODEsNyArODEsNyBAQCBDYW52YXNDb21wb3NpdGluZ1N0 cmF0ZWd5IGNhbnZhc0NvbXBvc2l0aW5nU3RyYXRlZ3koY29uc3QgUmVuZGVyT2JqZWN0JiByZW5k ZXJlcgogICAgIGlmICghY29udGV4dCB8fCAhY29udGV4dC0+aXNBY2NlbGVyYXRlZCgpKQogICAg ICAgICByZXR1cm4gVW5hY2NlbGVyYXRlZENhbnZhczsKICAgICAKLSAgICBpZiAoY29udGV4dC0+ aXMzZCgpKQorICAgIGlmIChjb250ZXh0LT5pczNkKCkgfHwgY29udGV4dC0+aXNHUFUoKSkKICAg ICAgICAgcmV0dXJuIENhbnZhc0FzTGF5ZXJDb250ZW50czsKIAogI2lmIEVOQUJMRShBQ0NFTEVS QVRFRF8yRF9DQU5WQVMpCg==