228969 2021-08-10 14:12:42 -0700 [GPU Process] REGRESSION: WebContent often crashes when using iCloud photos 2021-08-12 13:28:08 -0700 1 1 1 Unclassified WebKit Canvas WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=228665 InRadar P2 Normal --- 1 sabouhallawa sabouhallawa dino mmaxfield simon.fraser thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1783279 0 sabouhallawa 2021-08-10 14:12:42 -0700 This will cause the WebProcess to be terminated. It is a remaining work of bug 228665. Right now these call stacks are possible and all of them are wrong. All of them call RemoteRenderingBackendProxy::releaseRemoteResource() while the GPUP is terminated and is being relaunched: NativeImage: WebKit::RemoteRenderingBackendProxy::releaseRemoteResource(WTF::ObjectIdentifier<WebCore::RenderingResourceIdentifierType>, unsigned long long) WebKit::RemoteResourceCacheProxy::releaseNativeImage(WTF::ObjectIdentifier<WebCore::RenderingResourceIdentifierType>) WebCore::NativeImage::~NativeImage() WebCore::DisplayList::DisplayList::clear() WebCore::DisplayList::ImageBuffer<WebKit::ImageBufferShareableMappedIOSurfaceBackend>::clearBackend() WebKit::RemoteResourceCacheProxy::remoteResourceCacheWasDestroyed() WebKit::RemoteRenderingBackendProxy::gpuProcessConnectionDidClose(WebKit::GPUProcessConnection&) WebKit::GPUProcessConnection::didClose(IPC::Connection&) WTF::Detail::CallableWrapper<IPC::Connection::connectionDidClose()::$_8, void>::call() ImageBuffer: WebKit::RemoteRenderingBackendProxy::releaseRemoteResource(WTF::ObjectIdentifier<WebCore::RenderingResourceIdentifierType>, unsigned long long) WebKit::RemoteResourceCacheProxy::releaseImageBuffer(WTF::ObjectIdentifier<WebCore::RenderingResourceIdentifierType>) WebKit::RemoteImageBufferProxy<WebKit::ImageBufferShareableMappedIOSurfaceBackend>::~RemoteImageBufferProxy() WebKit::RemoteImageBufferProxy<WebKit::ImageBufferShareableMappedIOSurfaceBackend>::~RemoteImageBufferProxy() WebCore::DisplayList::DisplayList::clear() WebCore::DisplayList::ImageBuffer<WebKit::ImageBufferShareableMappedIOSurfaceBackend>::clearBackend() WebKit::RemoteResourceCacheProxy::remoteResourceCacheWasDestroyed() WebKit::RemoteRenderingBackendProxy::gpuProcessConnectionDidClose(WebKit::GPUProcessConnection&) WebKit::GPUProcessConnection::didClose(IPC::Connection&) WTF::Detail::CallableWrapper<IPC::Connection::connectionDidClose()::$_8, void>::call() Font: WebKit::RemoteRenderingBackendProxy::releaseRemoteResource(WTF::ObjectIdentifier<WebCore::RenderingResourceIdentifierType>, unsigned long long) WebKit::RemoteResourceCacheProxy::clearFontMap() WebKit::RemoteResourceCacheProxy::remoteResourceCacheWasDestroyed() WebKit::RemoteRenderingBackendProxy::gpuProcessConnectionDidClose(WebKit::GPUProcessConnection&) WebKit::GPUProcessConnection::didClose(IPC::Connection&) WTF::Detail::CallableWrapper<IPC::Connection::connectionDidClose()::$_8, void>::call() 1783280 1 webkit-bug-importer 2021-08-10 14:13:19 -0700 <rdar://problem/81761078> 1783293 2 435292 sabouhallawa 2021-08-10 14:27:19 -0700 Created attachment 435292 Patch 1783307 3 435297 sabouhallawa 2021-08-10 14:43:49 -0700 Created attachment 435297 Patch 1783631 4 435373 sabouhallawa 2021-08-11 14:12:42 -0700 Created attachment 435373 Patch 1783914 5 435442 sabouhallawa 2021-08-12 12:24:04 -0700 Created attachment 435442 Patch 1783934 6 ews-feeder 2021-08-12 13:28:06 -0700 Committed r280981 (240482@main): <https://commits.webkit.org/240482@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 435442. 435292 2021-08-10 14:27:19 -0700 2021-08-10 14:43:47 -0700 Patch bug-228969-20210810142718.patch text/plain 6133 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNzg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM2ZjZkNDMxNzdiMDM3NzVm NDY3ODM2NjJjM2FiMWMxZTZjMGJkMjkuLmU1NzAwZGEzMzRmYTkxOWViMzBmMTg1Mzc5OGEzYWY2 Y2RlZjQ1MzMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzcgQEAKKzIwMjEtMDgtMTAgIFNhaWQgQWJv dS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVSBQcm9jZXNzXSBSRUdS RVNTSU9OOiBpQ2xvdWQgUGhvdG9zIFdlYiBhcHAgbWF5IHJlbGVhc2UgcmVzb3VyY2VzIGFmdGVy IEdQVVByb2Nlc3MgaXMgcmVsYXVuY2hlZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjI4OTY5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgUmVsZWFzaW5nIE5hdGl2ZUltYWdlOiBDYWxsaW5nIGNsZWFyTmF0 aXZlSW1hZ2VNYXAoKSBhZnRlciBjbGVhcmluZyB0aGUKKyAgICAgICAgYmFja2VuZCBvZiB0aGUg SW1hZ2VCdWZmZXJzIHdhcyBjYXVzaW5nIHRoaXMgcHJvYmxlbS4gV2hlbiBjbGVhcmluZyB0aGUK KyAgICAgICAgYmFja2VuZCBvZiBhbiBJbWFnZUJ1ZmZlciwgaXQgd2lsbCBjbGVhciBpdHMgRGlz cGxheUxpc3Qgd2hpY2ggbWF5IGhhdmUKKyAgICAgICAgdGhlIGxhc3QgcmVmZXJlbmNlIHRvIGEg TmF0aXZlSW1hZ2UuIFRoZSBkZXN0cnVjdG9yIG9mIE5hdGl2ZUltYWdlIGNhbGxzCisgICAgICAg IHJlbGVhc2VSZW1vdGVSZXNvdXJjZSgpIGJlZm9yZSBpdCBpcyByZW1vdmVkIGZyb20gdGhlIHRo ZSBOYXRpdmVJbWFnZU1hcC4KKworICAgICAgICBSZWxlYXNpbmcgRm9udDogY2xlYXJGb250TWFw KCkgd2FzIGFsd2F5cyBjYWxsaW5nIHJlbGVhc2VSZW1vdGVSZXNvdXJjZSgpCisgICAgICAgIGV2 ZW4gaWYgaXQgaXMgY2FsbGVkIGZvcm0gIHJlbW90ZVJlc291cmNlQ2FjaGVXYXNEZXN0cm95ZWQo KS4gVGhpcyBzaG91bGQKKyAgICAgICAgbm90IGhhcHBlbiBiZWNhdXNlIHRoZSBjb25uZWN0aW9u IHdpdGggR1BVUHJvY2VzcyBoYXMgYmVlbiBjbG9zZWQuCisKKyAgICAgICAgUmVsZWFzaW5nIElt YWdlQnVmZmVyOiBUaGlzIGhhcHBlbiB3aGVuIGEgRGlzcGxheUxpc3Qgb2YgYW4gSW1hZ2VCdWZm ZXIKKyAgICAgICAgJ0EnIGhvbGRzIHRoZSBsYXN0IHJlZmVyZW5jZSB0byBhbm90aGVyIEltYWdl QnVmZmVyICdCJyBhbmQgd2UgY2FsbAorICAgICAgICBjbGVhckJhY2tlbmQoKSBmb3IgJ0EnLiBj bGVhckJhY2tlbmQoKSB3aWxsIGNsZWFyIHRoZSBEaXNwbGF5TGlzdCBvZiAnQScKKyAgICAgICAg YW5kIGNhdXNlcyB0aGUgZGVsZXRpb24gb2YgJ0InLiBJbiB0aGlzIGNhc2Ugd2Ugc2hvdWxkIG5v dCBjYWxsIAorICAgICAgICByZWxlYXNlSW1hZ2VCdWZmZXIoKSBmb3IgJ0InIGJlY2F1c2UgdGhl IEdQVVBQcm9jZXNzIGlzIGNsb3NlZC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL2dyYXBo aWNzL1JlbW90ZUltYWdlQnVmZmVyUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlSW1h Z2VCdWZmZXJQcm94eTo6flJlbW90ZUltYWdlQnVmZmVyUHJveHkpOgorICAgICAgICAqIFdlYlBy b2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5oOgorICAgICAg ICAoV2ViS2l0OjpSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHk6OmlzR1BVUHJvY2Vzc0Nvbm5l Y3Rpb25DbG9zZWQgY29uc3QpOgorICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1Jl bW90ZVJlc291cmNlQ2FjaGVQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlc291 cmNlQ2FjaGVQcm94eTo6cmVsZWFzZUFsbFJlbW90ZUZvbnRzKToKKyAgICAgICAgKFdlYktpdDo6 UmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5OjpjbGVhckZvbnRNYXApOgorICAgICAgICAoV2ViS2l0 OjpSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OnJlbW90ZVJlc291cmNlQ2FjaGVXYXNEZXN0cm95 ZWQpOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OnJlbGVhc2VN ZW1vcnkpOgorICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlc291cmNl Q2FjaGVQcm94eS5oOgorCiAyMDIxLTA4LTA5ICBTYWlkIEFib3UtSGFsbGF3YSAgPHNhaWRAYXBw bGUuY29tPgogCiAgICAgICAgIEVhc2Ugc2FuZGJveGluZyByZXN0cmljdGlvbnMgZm9yIE1haWwg dG8gYWxsb3cgSEVJRiBpbWFnZSBkZWNvZGluZwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9X ZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVJbWFnZUJ1ZmZlclByb3h5LmggYi9Tb3VyY2Uv V2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZUltYWdlQnVmZmVyUHJveHkuaApp bmRleCA2ZDliZjg1OTYyZjA1NDVlMjQzYmE3ZDE4MWE2NTU5ODg5YjEyY2U1Li4yN2JjZDAwNTQ1 MDk1OGU4MDIxMjMzMGMxZTg5NmUzYzg5MTczNGZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZUltYWdlQnVmZmVyUHJveHkuaAorKysgYi9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZUltYWdlQnVmZmVyUHJv eHkuaApAQCAtNjUsNyArNjUsNyBAQCBwdWJsaWM6CiAKICAgICB+UmVtb3RlSW1hZ2VCdWZmZXJQ cm94eSgpCiAgICAgewotICAgICAgICBpZiAoIW1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5 KSB7CisgICAgICAgIGlmICghbV9yZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkgfHwgbV9yZW1v dGVSZW5kZXJpbmdCYWNrZW5kUHJveHktPmlzR1BVUHJvY2Vzc0Nvbm5lY3Rpb25DbG9zZWQoKSkg ewogICAgICAgICAgICAgY2xlYXJEaXNwbGF5TGlzdCgpOwogICAgICAgICAgICAgcmV0dXJuOwog ICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBo aWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9j ZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkuaAppbmRleCA1OTdj MDdmM2Q5N2YwMWUzZmI5ZmM5NzUyNzhmMzAzOTNjMzliOTNiLi44N2FlNTIyY2JiYjI4MWZjNGE4 ODA3NjViOTlmNGM5MDI1NmE5ZDI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZFBy b3h5LmgKQEAgLTEyMiw2ICsxMjIsOCBAQCBwdWJsaWM6CiAKICAgICBSZW5kZXJpbmdCYWNrZW5k SWRlbnRpZmllciBlbnN1cmVCYWNrZW5kQ3JlYXRlZCgpOwogCisgICAgYm9vbCBpc0dQVVByb2Nl c3NDb25uZWN0aW9uQ2xvc2VkKCkgY29uc3QgeyByZXR1cm4gIW1fZ3B1UHJvY2Vzc0Nvbm5lY3Rp b247IH0KKwogcHJpdmF0ZToKICAgICBleHBsaWNpdCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJv eHkoV2ViUGFnZSYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BV L2dyYXBoaWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5jcHAKaW5kZXgg MjBhZDQ4NDdjNjY3M2E5NDVmNzVkMDk5NTA3OGUxNTA1YmI4MjdmMi4uYmJkMTllYzQ4MTQ1Nzg3 MGM3OTNlZGRhNWEyOGNjNWM0NTI0YzQ3YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVzb3VyY2VDYWNoZVBy b3h5LmNwcApAQCAtMTY0LDEwICsxNjQsMTQgQEAgdm9pZCBSZW1vdGVSZXNvdXJjZUNhY2hlUHJv eHk6OnByZXBhcmVGb3JOZXh0UmVuZGVyaW5nVXBkYXRlKCkKICAgICBtX251bWJlck9mRm9udHNV c2VkSW5DdXJyZW50UmVuZGVyaW5nVXBkYXRlID0gMDsKIH0KIAotdm9pZCBSZW1vdGVSZXNvdXJj ZUNhY2hlUHJveHk6OmNsZWFyRm9udE1hcCgpCit2b2lkIFJlbW90ZVJlc291cmNlQ2FjaGVQcm94 eTo6cmVsZWFzZUFsbFJlbW90ZUZvbnRzKCkKIHsKICAgICBmb3IgKGF1dG8mIGZvbnRTdGF0ZSA6 IG1fZm9udHMpCiAgICAgICAgIG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LnJlbGVhc2VS ZW1vdGVSZXNvdXJjZShmb250U3RhdGUua2V5LCBmb250U3RhdGUudmFsdWUudXNlQ291bnQpOwor fQorCit2b2lkIFJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6Y2xlYXJGb250TWFwKCkKK3sKICAg ICBtX2ZvbnRzLmNsZWFyKCk7CiAgICAgbV9udW1iZXJPZkZvbnRzVXNlZEluQ3VycmVudFJlbmRl cmluZ1VwZGF0ZSA9IDA7CiB9CkBAIC0yMDMsMTkgKzIwNywyNiBAQCB2b2lkIFJlbW90ZVJlc291 cmNlQ2FjaGVQcm94eTo6ZmluYWxpemVSZW5kZXJpbmdVcGRhdGUoKQogCiB2b2lkIFJlbW90ZVJl c291cmNlQ2FjaGVQcm94eTo6cmVtb3RlUmVzb3VyY2VDYWNoZVdhc0Rlc3Ryb3llZCgpCiB7Ci0g ICAgZm9yIChhdXRvJiBpdGVtIDogbV9pbWFnZUJ1ZmZlcnMudmFsdWVzKCkpIHsKKyAgICBjbGVh ck5hdGl2ZUltYWdlTWFwKCk7CisgICAgY2xlYXJGb250TWFwKCk7CisKKyAgICBmb3IgKGF1dG8m IGl0ZW0gOiBjb3B5VG9WZWN0b3IobV9pbWFnZUJ1ZmZlcnMudmFsdWVzKCkpKSB7CiAgICAgICAg IGlmICghaXRlbS5pbWFnZUJ1ZmZlcikKICAgICAgICAgICAgIGNvbnRpbnVlOwotICAgICAgICBt X3JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5jcmVhdGVSZW1vdGVJbWFnZUJ1ZmZlcigqaXRl bS5pbWFnZUJ1ZmZlcik7CiAgICAgICAgIGl0ZW0udXNlQ291bnQgPSAwOwogICAgICAgICBpdGVt LmltYWdlQnVmZmVyLT5jbGVhckJhY2tlbmQoKTsKICAgICB9Ci0gICAgY2xlYXJOYXRpdmVJbWFn ZU1hcCgpOwotICAgIGNsZWFyRm9udE1hcCgpOworCisgICAgZm9yIChhdXRvJiBpdGVtIDogbV9p bWFnZUJ1ZmZlcnMudmFsdWVzKCkpIHsKKyAgICAgICAgaWYgKCFpdGVtLmltYWdlQnVmZmVyKQor ICAgICAgICAgICAgY29udGludWU7CisgICAgICAgIG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFBy b3h5LmNyZWF0ZVJlbW90ZUltYWdlQnVmZmVyKCppdGVtLmltYWdlQnVmZmVyKTsKKyAgICB9CiB9 CiAKIHZvaWQgUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5OjpyZWxlYXNlTWVtb3J5KCkKIHsKKyAg ICByZWxlYXNlQWxsUmVtb3RlRm9udHMoKTsKICAgICBjbGVhckZvbnRNYXAoKTsKICAgICBtX3Jl bW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5kZWxldGVBbGxGb250cygpOwogfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZXNvdXJjZUNh Y2hlUHJveHkuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3Rl UmVzb3VyY2VDYWNoZVByb3h5LmgKaW5kZXggNGUxYmFjYTcwNWJhZWQ1ZThjMjViZmM0M2U2NDEx ZmJiZjIzODNhNy4uZmFiMmRlNjIyNDViODE1NjA4YTVhOTIzYzJhMGU2ZDJjMWQ0YmU4YSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZXNv dXJjZUNhY2hlUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBo aWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5oCkBAIC01Nyw2ICs1Nyw4IEBAIHB1YmxpYzoK ICAgICB2b2lkIGZpbmFsaXplUmVuZGVyaW5nVXBkYXRlKCk7CiAKICAgICB2b2lkIHJlbW90ZVJl c291cmNlQ2FjaGVXYXNEZXN0cm95ZWQoKTsKKyAgICB2b2lkIHJlY3JlYXRlUmVtb3RlSW1hZ2VC dWZmZXJCYWNrZW5kcygpOworICAgIHZvaWQgcmVsZWFzZUFsbFJlbW90ZUZvbnRzKCk7CiAgICAg dm9pZCByZWxlYXNlTWVtb3J5KCk7CiAKIHByaXZhdGU6Cg== 435297 2021-08-10 14:43:49 -0700 2021-08-11 14:12:39 -0700 Patch bug-228969-20210810144348.patch text/plain 6257 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwNzg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM2ZjZkNDMxNzdiMDM3NzVm NDY3ODM2NjJjM2FiMWMxZTZjMGJkMjkuLjIxNTNhZTNjZDg0MGRmY2YwMTIxMzc5OWFlYTkyZmQ5 YzUyOGViNzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzggQEAKKzIwMjEtMDgtMTAgIFNhaWQgQWJv dS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVSBQcm9jZXNzXSBSRUdS RVNTSU9OOiBXZWJDb250ZW50IG9mdGVuIGNyYXNoZXMgd2hlbiB1c2luZyBpQ2xvdWQgcGhvdG9z CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg5NjkK KyAgICAgICAgPHJkYXI6Ly84MTc2MTA3OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBSZWxlYXNpbmcgTmF0aXZlSW1hZ2U6IENhbGxpbmcgY2xlYXJO YXRpdmVJbWFnZU1hcCgpIGFmdGVyIGNsZWFyaW5nIHRoZQorICAgICAgICBiYWNrZW5kIG9mIHRo ZSBJbWFnZUJ1ZmZlcnMgd2FzIGNhdXNpbmcgdGhpcyBwcm9ibGVtLiBXaGVuIGNsZWFyaW5nIHRo ZQorICAgICAgICBiYWNrZW5kIG9mIGFuIEltYWdlQnVmZmVyLCBpdCB3aWxsIGNsZWFyIGl0cyBE aXNwbGF5TGlzdCB3aGljaCBtYXkgaGF2ZQorICAgICAgICB0aGUgbGFzdCByZWZlcmVuY2UgdG8g YSBOYXRpdmVJbWFnZS4gVGhlIGRlc3RydWN0b3Igb2YgTmF0aXZlSW1hZ2UgY2FsbHMKKyAgICAg ICAgcmVsZWFzZVJlbW90ZVJlc291cmNlKCkgYmVmb3JlIGl0IGlzIHJlbW92ZWQgZnJvbSB0aGUg dGhlIE5hdGl2ZUltYWdlTWFwLgorCisgICAgICAgIFJlbGVhc2luZyBGb250OiBjbGVhckZvbnRN YXAoKSB3YXMgYWx3YXlzIGNhbGxpbmcgcmVsZWFzZVJlbW90ZVJlc291cmNlKCkKKyAgICAgICAg ZXZlbiBpZiBpdCBpcyBjYWxsZWQgZm9ybSAgcmVtb3RlUmVzb3VyY2VDYWNoZVdhc0Rlc3Ryb3ll ZCgpLiBUaGlzIHNob3VsZAorICAgICAgICBub3QgaGFwcGVuIGJlY2F1c2UgdGhlIGNvbm5lY3Rp b24gd2l0aCBHUFVQcm9jZXNzIGhhcyBiZWVuIGNsb3NlZC4KKworICAgICAgICBSZWxlYXNpbmcg SW1hZ2VCdWZmZXI6IFRoaXMgaGFwcGVuIHdoZW4gYSBEaXNwbGF5TGlzdCBvZiBhbiBJbWFnZUJ1 ZmZlcgorICAgICAgICAnQScgaG9sZHMgdGhlIGxhc3QgcmVmZXJlbmNlIHRvIGFub3RoZXIgSW1h Z2VCdWZmZXIgJ0InIGFuZCB3ZSBjYWxsCisgICAgICAgIGNsZWFyQmFja2VuZCgpIGZvciAnQScu IGNsZWFyQmFja2VuZCgpIHdpbGwgY2xlYXIgdGhlIERpc3BsYXlMaXN0IG9mICdBJworICAgICAg ICBhbmQgY2F1c2VzIHRoZSBkZWxldGlvbiBvZiAnQicuIEluIHRoaXMgY2FzZSB3ZSBzaG91bGQg bm90IGNhbGwgCisgICAgICAgIHJlbGVhc2VJbWFnZUJ1ZmZlcigpIGZvciAnQicgYmVjYXVzZSB0 aGUgR1BVUFByb2Nlc3MgaXMgY2xvc2VkLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9HUFUvZ3Jh cGhpY3MvUmVtb3RlSW1hZ2VCdWZmZXJQcm94eS5oOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVJ bWFnZUJ1ZmZlclByb3h5Ojp+UmVtb3RlSW1hZ2VCdWZmZXJQcm94eSk6CisgICAgICAgICogV2Vi UHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5Lmg6CisgICAg ICAgIChXZWJLaXQ6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6aXNHUFVQcm9jZXNzQ29u bmVjdGlvbkNsb3NlZCBjb25zdCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3Mv UmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVz b3VyY2VDYWNoZVByb3h5OjpyZWxlYXNlQWxsUmVtb3RlRm9udHMpOgorICAgICAgICAoV2ViS2l0 OjpSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OmNsZWFyRm9udE1hcCk6CisgICAgICAgIChXZWJL aXQ6OlJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6cmVtb3RlUmVzb3VyY2VDYWNoZVdhc0Rlc3Ry b3llZCk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6cmVsZWFz ZU1lbW9yeSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVzb3Vy Y2VDYWNoZVByb3h5Lmg6CisKIDIwMjEtMDgtMDkgIFNhaWQgQWJvdS1IYWxsYXdhICA8c2FpZEBh cHBsZS5jb20+CiAKICAgICAgICAgRWFzZSBzYW5kYm94aW5nIHJlc3RyaWN0aW9ucyBmb3IgTWFp bCB0byBhbGxvdyBIRUlGIGltYWdlIGRlY29kaW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZUltYWdlQnVmZmVyUHJveHkuaCBiL1NvdXJj ZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlSW1hZ2VCdWZmZXJQcm94eS5o CmluZGV4IDZkOWJmODU5NjJmMDU0NWUyNDNiYTdkMTgxYTY1NTk4ODliMTJjZTUuLjI3YmNkMDA1 NDUwOTU4ZTgwMjEyMzMwYzFlODk2ZTNjODkxNzM0ZmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlSW1hZ2VCdWZmZXJQcm94eS5oCisrKyBi L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlSW1hZ2VCdWZmZXJQ cm94eS5oCkBAIC02NSw3ICs2NSw3IEBAIHB1YmxpYzoKIAogICAgIH5SZW1vdGVJbWFnZUJ1ZmZl clByb3h5KCkKICAgICB7Ci0gICAgICAgIGlmICghbV9yZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJv eHkpIHsKKyAgICAgICAgaWYgKCFtX3JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eSB8fCBtX3Jl bW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS0+aXNHUFVQcm9jZXNzQ29ubmVjdGlvbkNsb3NlZCgp KSB7CiAgICAgICAgICAgICBjbGVhckRpc3BsYXlMaXN0KCk7CiAgICAgICAgICAgICByZXR1cm47 CiAgICAgICAgIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3Jh cGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1dlYlBy b2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5oCmluZGV4IDU5 N2MwN2YzZDk3ZjAxZTNmYjlmYzk3NTI3OGYzMDM5M2MzOWI5M2IuLjg3YWU1MjJjYmJiMjgxZmM0 YTg4MDc2NWI5OWY0YzkwMjU2YTlkMjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LmgKKysrIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5k UHJveHkuaApAQCAtMTIyLDYgKzEyMiw4IEBAIHB1YmxpYzoKIAogICAgIFJlbmRlcmluZ0JhY2tl bmRJZGVudGlmaWVyIGVuc3VyZUJhY2tlbmRDcmVhdGVkKCk7CiAKKyAgICBib29sIGlzR1BVUHJv Y2Vzc0Nvbm5lY3Rpb25DbG9zZWQoKSBjb25zdCB7IHJldHVybiAhbV9ncHVQcm9jZXNzQ29ubmVj dGlvbjsgfQorCiBwcml2YXRlOgogICAgIGV4cGxpY2l0IFJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQ cm94eShXZWJQYWdlJik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9H UFUvZ3JhcGhpY3MvUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5LmNwcAppbmRl eCAyMGFkNDg0N2M2NjczYTk0NWY3NWQwOTk1MDc4ZTE1MDViYjgyN2YyLi5mMjcyOWIyMGE4Yjdk M2M4MDRlMWYwNGY3Y2MzMzgwOGRjZjRjMWMzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5jcHAKKysrIGIv U291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZXNvdXJjZUNhY2hl UHJveHkuY3BwCkBAIC0xNjQsMTAgKzE2NCwxNCBAQCB2b2lkIFJlbW90ZVJlc291cmNlQ2FjaGVQ cm94eTo6cHJlcGFyZUZvck5leHRSZW5kZXJpbmdVcGRhdGUoKQogICAgIG1fbnVtYmVyT2ZGb250 c1VzZWRJbkN1cnJlbnRSZW5kZXJpbmdVcGRhdGUgPSAwOwogfQogCi12b2lkIFJlbW90ZVJlc291 cmNlQ2FjaGVQcm94eTo6Y2xlYXJGb250TWFwKCkKK3ZvaWQgUmVtb3RlUmVzb3VyY2VDYWNoZVBy b3h5OjpyZWxlYXNlQWxsUmVtb3RlRm9udHMoKQogewogICAgIGZvciAoYXV0byYgZm9udFN0YXRl IDogbV9mb250cykKICAgICAgICAgbV9yZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkucmVsZWFz ZVJlbW90ZVJlc291cmNlKGZvbnRTdGF0ZS5rZXksIGZvbnRTdGF0ZS52YWx1ZS51c2VDb3VudCk7 Cit9CisKK3ZvaWQgUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5OjpjbGVhckZvbnRNYXAoKQorewog ICAgIG1fZm9udHMuY2xlYXIoKTsKICAgICBtX251bWJlck9mRm9udHNVc2VkSW5DdXJyZW50UmVu ZGVyaW5nVXBkYXRlID0gMDsKIH0KQEAgLTIwMywxOSArMjA3LDI4IEBAIHZvaWQgUmVtb3RlUmVz b3VyY2VDYWNoZVByb3h5OjpmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgpCiAKIHZvaWQgUmVtb3Rl UmVzb3VyY2VDYWNoZVByb3h5OjpyZW1vdGVSZXNvdXJjZUNhY2hlV2FzRGVzdHJveWVkKCkKIHsK LSAgICBmb3IgKGF1dG8mIGl0ZW0gOiBtX2ltYWdlQnVmZmVycy52YWx1ZXMoKSkgeworICAgIGNs ZWFyTmF0aXZlSW1hZ2VNYXAoKTsKKyAgICBjbGVhckZvbnRNYXAoKTsKKworICAgIC8vIEdldCBh IGNvcHkgb2YgbV9pbWFnZUJ1ZmZlcnMudmFsdWVzKCkgYmVjYXVzZSBjbGVhckJhY2tlbmQoKQor ICAgIC8vIG1heSByZWxlYXNlIHNvbWUgb2YgdGhlIGNhY2hlZCBJbWFnZUJ1ZmZlcnMuCisgICAg Zm9yIChhdXRvJiBpdGVtIDogY29weVRvVmVjdG9yKG1faW1hZ2VCdWZmZXJzLnZhbHVlcygpKSkg ewogICAgICAgICBpZiAoIWl0ZW0uaW1hZ2VCdWZmZXIpCiAgICAgICAgICAgICBjb250aW51ZTsK LSAgICAgICAgbV9yZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkuY3JlYXRlUmVtb3RlSW1hZ2VC dWZmZXIoKml0ZW0uaW1hZ2VCdWZmZXIpOwogICAgICAgICBpdGVtLnVzZUNvdW50ID0gMDsKICAg ICAgICAgaXRlbS5pbWFnZUJ1ZmZlci0+Y2xlYXJCYWNrZW5kKCk7CiAgICAgfQotICAgIGNsZWFy TmF0aXZlSW1hZ2VNYXAoKTsKLSAgICBjbGVhckZvbnRNYXAoKTsKKworICAgIGZvciAoYXV0byYg aXRlbSA6IG1faW1hZ2VCdWZmZXJzLnZhbHVlcygpKSB7CisgICAgICAgIGlmICghaXRlbS5pbWFn ZUJ1ZmZlcikKKyAgICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICBtX3JlbW90ZVJlbmRlcmlu Z0JhY2tlbmRQcm94eS5jcmVhdGVSZW1vdGVJbWFnZUJ1ZmZlcigqaXRlbS5pbWFnZUJ1ZmZlcik7 CisgICAgfQogfQogCiB2b2lkIFJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6cmVsZWFzZU1lbW9y eSgpCiB7CisgICAgcmVsZWFzZUFsbFJlbW90ZUZvbnRzKCk7CiAgICAgY2xlYXJGb250TWFwKCk7 CiAgICAgbV9yZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkuZGVsZXRlQWxsRm9udHMoKTsKIH0K ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3Rl UmVzb3VyY2VDYWNoZVByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBo aWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5oCmluZGV4IDRlMWJhY2E3MDViYWVkNWU4YzI1 YmZjNDNlNjQxMWZiYmYyMzgzYTcuLmZhYjJkZTYyMjQ1YjgxNTYwOGE1YTkyM2MyYTBlNmQyYzFk NGJlOGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3Mv UmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5LmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L0dQVS9ncmFwaGljcy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuaApAQCAtNTcsNiArNTcsOCBA QCBwdWJsaWM6CiAgICAgdm9pZCBmaW5hbGl6ZVJlbmRlcmluZ1VwZGF0ZSgpOwogCiAgICAgdm9p ZCByZW1vdGVSZXNvdXJjZUNhY2hlV2FzRGVzdHJveWVkKCk7CisgICAgdm9pZCByZWNyZWF0ZVJl bW90ZUltYWdlQnVmZmVyQmFja2VuZHMoKTsKKyAgICB2b2lkIHJlbGVhc2VBbGxSZW1vdGVGb250 cygpOwogICAgIHZvaWQgcmVsZWFzZU1lbW9yeSgpOwogCiBwcml2YXRlOgo= 435373 2021-08-11 14:12:42 -0700 2021-08-12 11:17:49 -0700 Patch bug-228969-20210811141241.patch text/plain 6220 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwOTMwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGIwZjdlZTU4ODIzNGNhZDdk MWUxMTg5ZTc2OTgxZmEzMDk0MzhlYzkuLmNmZWVkNjY0OTVmMjdmMTlmNzU0YWQzNDcxNTIyOTBh NmRjN2I2YmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzggQEAKKzIwMjEtMDgtMTEgIFNhaWQgQWJv dS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVSBQcm9jZXNzXSBSRUdS RVNTSU9OOiBXZWJDb250ZW50IG9mdGVuIGNyYXNoZXMgd2hlbiB1c2luZyBpQ2xvdWQgcGhvdG9z CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg5NjkK KyAgICAgICAgPHJkYXI6Ly84MTc2MTA3OD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBSZWxlYXNpbmcgTmF0aXZlSW1hZ2U6IENhbGxpbmcgY2xlYXJO YXRpdmVJbWFnZU1hcCgpIGFmdGVyIGNsZWFyaW5nIHRoZQorICAgICAgICBiYWNrZW5kIG9mIHRo ZSBJbWFnZUJ1ZmZlcnMgd2FzIGNhdXNpbmcgdGhpcyBwcm9ibGVtLiBXaGVuIGNsZWFyaW5nIHRo ZQorICAgICAgICBiYWNrZW5kIG9mIGFuIEltYWdlQnVmZmVyLCBpdCB3aWxsIGNsZWFyIGl0cyBE aXNwbGF5TGlzdCB3aGljaCBtYXkgaGF2ZQorICAgICAgICB0aGUgbGFzdCByZWZlcmVuY2UgdG8g YSBOYXRpdmVJbWFnZS4gVGhlIGRlc3RydWN0b3Igb2YgTmF0aXZlSW1hZ2UgY2FsbHMKKyAgICAg ICAgcmVsZWFzZVJlbW90ZVJlc291cmNlKCkgYmVmb3JlIGl0IGlzIHJlbW92ZWQgZnJvbSB0aGUg dGhlIE5hdGl2ZUltYWdlTWFwLgorCisgICAgICAgIFJlbGVhc2luZyBGb250OiBjbGVhckZvbnRN YXAoKSB3YXMgYWx3YXlzIGNhbGxpbmcgcmVsZWFzZVJlbW90ZVJlc291cmNlKCkKKyAgICAgICAg ZXZlbiBpZiBpdCBpcyBjYWxsZWQgZm9ybSAgcmVtb3RlUmVzb3VyY2VDYWNoZVdhc0Rlc3Ryb3ll ZCgpLiBUaGlzIHNob3VsZAorICAgICAgICBub3QgaGFwcGVuIGJlY2F1c2UgdGhlIGNvbm5lY3Rp b24gd2l0aCBHUFVQcm9jZXNzIGhhcyBiZWVuIGNsb3NlZC4KKworICAgICAgICBSZWxlYXNpbmcg SW1hZ2VCdWZmZXI6IFRoaXMgaGFwcGVuIHdoZW4gYSBEaXNwbGF5TGlzdCBvZiBhbiBJbWFnZUJ1 ZmZlcgorICAgICAgICAnQScgaG9sZHMgdGhlIGxhc3QgcmVmZXJlbmNlIHRvIGFub3RoZXIgSW1h Z2VCdWZmZXIgJ0InIGFuZCB3ZSBjYWxsCisgICAgICAgIGNsZWFyQmFja2VuZCgpIGZvciAnQScu IGNsZWFyQmFja2VuZCgpIHdpbGwgY2xlYXIgdGhlIERpc3BsYXlMaXN0IG9mICdBJworICAgICAg ICBhbmQgY2F1c2VzIHRoZSBkZWxldGlvbiBvZiAnQicuIEluIHRoaXMgY2FzZSB3ZSBzaG91bGQg bm90IGNhbGwgCisgICAgICAgIHJlbGVhc2VJbWFnZUJ1ZmZlcigpIGZvciAnQicgYmVjYXVzZSB0 aGUgR1BVUFByb2Nlc3MgaXMgY2xvc2VkLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9HUFUvZ3Jh cGhpY3MvUmVtb3RlSW1hZ2VCdWZmZXJQcm94eS5oOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVJ bWFnZUJ1ZmZlclByb3h5Ojp+UmVtb3RlSW1hZ2VCdWZmZXJQcm94eSk6CisgICAgICAgICogV2Vi UHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5Lmg6CisgICAg ICAgIChXZWJLaXQ6OlJlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eTo6aXNHUFVQcm9jZXNzQ29u bmVjdGlvbkNsb3NlZCBjb25zdCk6CisgICAgICAgICogV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3Mv UmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlUmVz b3VyY2VDYWNoZVByb3h5OjpyZWxlYXNlQWxsUmVtb3RlRm9udHMpOgorICAgICAgICAoV2ViS2l0 OjpSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OmNsZWFyRm9udE1hcCk6CisgICAgICAgIChXZWJL aXQ6OlJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6cmVtb3RlUmVzb3VyY2VDYWNoZVdhc0Rlc3Ry b3llZCk6CisgICAgICAgIChXZWJLaXQ6OlJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6cmVsZWFz ZU1lbW9yeSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVzb3Vy Y2VDYWNoZVByb3h5Lmg6CisKIDIwMjEtMDgtMTEgIERhbmEgRXN0cmEgIDxkZXN0cmFAYXBwbGUu Y29tPgogCiAgICAgICAgIFN0YXJ0IHNtb290aCBrZXlib2FyZCBzY3JvbGxpbmcgYW5pbWF0aW9u IHdoZW4gcGFnZVVwIG9yIHBhZ2VEb3duIGtleSBpcyBwcmVzc2VkLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVJbWFnZUJ1ZmZlclByb3h5 LmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZUltYWdlQnVm ZmVyUHJveHkuaAppbmRleCA2ZDliZjg1OTYyZjA1NDVlMjQzYmE3ZDE4MWE2NTU5ODg5YjEyY2U1 Li4yN2JjZDAwNTQ1MDk1OGU4MDIxMjMzMGMxZTg5NmUzYzg5MTczNGZiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZUltYWdlQnVmZmVyUHJv eHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZUlt YWdlQnVmZmVyUHJveHkuaApAQCAtNjUsNyArNjUsNyBAQCBwdWJsaWM6CiAKICAgICB+UmVtb3Rl SW1hZ2VCdWZmZXJQcm94eSgpCiAgICAgewotICAgICAgICBpZiAoIW1fcmVtb3RlUmVuZGVyaW5n QmFja2VuZFByb3h5KSB7CisgICAgICAgIGlmICghbV9yZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJv eHkgfHwgbV9yZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHktPmlzR1BVUHJvY2Vzc0Nvbm5lY3Rp b25DbG9zZWQoKSkgewogICAgICAgICAgICAgY2xlYXJEaXNwbGF5TGlzdCgpOwogICAgICAgICAg ICAgcmV0dXJuOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5oIGIvU291cmNlL1dl YktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHku aAppbmRleCA1OTdjMDdmM2Q5N2YwMWUzZmI5ZmM5NzUyNzhmMzAzOTNjMzliOTNiLi44N2FlNTIy Y2JiYjI4MWZjNGE4ODA3NjViOTlmNGM5MDI1NmE5ZDI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5o CisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVy aW5nQmFja2VuZFByb3h5LmgKQEAgLTEyMiw2ICsxMjIsOCBAQCBwdWJsaWM6CiAKICAgICBSZW5k ZXJpbmdCYWNrZW5kSWRlbnRpZmllciBlbnN1cmVCYWNrZW5kQ3JlYXRlZCgpOwogCisgICAgYm9v bCBpc0dQVVByb2Nlc3NDb25uZWN0aW9uQ2xvc2VkKCkgY29uc3QgeyByZXR1cm4gIW1fZ3B1UHJv Y2Vzc0Nvbm5lY3Rpb247IH0KKwogcHJpdmF0ZToKICAgICBleHBsaWNpdCBSZW1vdGVSZW5kZXJp bmdCYWNrZW5kUHJveHkoV2ViUGFnZSYpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94 eS5jcHAKaW5kZXggMjBhZDQ4NDdjNjY3M2E5NDVmNzVkMDk5NTA3OGUxNTA1YmI4MjdmMi4uZjI3 MjliMjBhOGI3ZDNjODA0ZTFmMDRmN2NjMzM4MDhkY2Y0YzFjMyAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHku Y3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVz b3VyY2VDYWNoZVByb3h5LmNwcApAQCAtMTY0LDEwICsxNjQsMTQgQEAgdm9pZCBSZW1vdGVSZXNv dXJjZUNhY2hlUHJveHk6OnByZXBhcmVGb3JOZXh0UmVuZGVyaW5nVXBkYXRlKCkKICAgICBtX251 bWJlck9mRm9udHNVc2VkSW5DdXJyZW50UmVuZGVyaW5nVXBkYXRlID0gMDsKIH0KIAotdm9pZCBS ZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OmNsZWFyRm9udE1hcCgpCit2b2lkIFJlbW90ZVJlc291 cmNlQ2FjaGVQcm94eTo6cmVsZWFzZUFsbFJlbW90ZUZvbnRzKCkKIHsKICAgICBmb3IgKGF1dG8m IGZvbnRTdGF0ZSA6IG1fZm9udHMpCiAgICAgICAgIG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFBy b3h5LnJlbGVhc2VSZW1vdGVSZXNvdXJjZShmb250U3RhdGUua2V5LCBmb250U3RhdGUudmFsdWUu dXNlQ291bnQpOworfQorCit2b2lkIFJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6Y2xlYXJGb250 TWFwKCkKK3sKICAgICBtX2ZvbnRzLmNsZWFyKCk7CiAgICAgbV9udW1iZXJPZkZvbnRzVXNlZElu Q3VycmVudFJlbmRlcmluZ1VwZGF0ZSA9IDA7CiB9CkBAIC0yMDMsMTkgKzIwNywyOCBAQCB2b2lk IFJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6ZmluYWxpemVSZW5kZXJpbmdVcGRhdGUoKQogCiB2 b2lkIFJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6cmVtb3RlUmVzb3VyY2VDYWNoZVdhc0Rlc3Ry b3llZCgpCiB7Ci0gICAgZm9yIChhdXRvJiBpdGVtIDogbV9pbWFnZUJ1ZmZlcnMudmFsdWVzKCkp IHsKKyAgICBjbGVhck5hdGl2ZUltYWdlTWFwKCk7CisgICAgY2xlYXJGb250TWFwKCk7CisKKyAg ICAvLyBHZXQgYSBjb3B5IG9mIG1faW1hZ2VCdWZmZXJzLnZhbHVlcygpIGJlY2F1c2UgY2xlYXJC YWNrZW5kKCkKKyAgICAvLyBtYXkgcmVsZWFzZSBzb21lIG9mIHRoZSBjYWNoZWQgSW1hZ2VCdWZm ZXJzLgorICAgIGZvciAoYXV0byYgaXRlbSA6IGNvcHlUb1ZlY3RvcihtX2ltYWdlQnVmZmVycy52 YWx1ZXMoKSkpIHsKICAgICAgICAgaWYgKCFpdGVtLmltYWdlQnVmZmVyKQogICAgICAgICAgICAg Y29udGludWU7Ci0gICAgICAgIG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LmNyZWF0ZVJl bW90ZUltYWdlQnVmZmVyKCppdGVtLmltYWdlQnVmZmVyKTsKICAgICAgICAgaXRlbS51c2VDb3Vu dCA9IDA7CiAgICAgICAgIGl0ZW0uaW1hZ2VCdWZmZXItPmNsZWFyQmFja2VuZCgpOwogICAgIH0K LSAgICBjbGVhck5hdGl2ZUltYWdlTWFwKCk7Ci0gICAgY2xlYXJGb250TWFwKCk7CisKKyAgICBm b3IgKGF1dG8mIGl0ZW0gOiBtX2ltYWdlQnVmZmVycy52YWx1ZXMoKSkgeworICAgICAgICBpZiAo IWl0ZW0uaW1hZ2VCdWZmZXIpCisgICAgICAgICAgICBjb250aW51ZTsKKyAgICAgICAgbV9yZW1v dGVSZW5kZXJpbmdCYWNrZW5kUHJveHkuY3JlYXRlUmVtb3RlSW1hZ2VCdWZmZXIoKml0ZW0uaW1h Z2VCdWZmZXIpOworICAgIH0KIH0KIAogdm9pZCBSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OnJl bGVhc2VNZW1vcnkoKQogeworICAgIHJlbGVhc2VBbGxSZW1vdGVGb250cygpOwogICAgIGNsZWFy Rm9udE1hcCgpOwogICAgIG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LmRlbGV0ZUFsbEZv bnRzKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBo aWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L0dQVS9ncmFwaGljcy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuaAppbmRleCA0ZTFiYWNhNzA1 YmFlZDVlOGMyNWJmYzQzZTY0MTFmYmJmMjM4M2E3Li5kNjUzNjZkMjA5MjZjMDY0YTA3MjdjOGU3 YzBiYTk0ZjJjMTg1MzIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BV L2dyYXBoaWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5LmgKQEAgLTU3 LDYgKzU3LDcgQEAgcHVibGljOgogICAgIHZvaWQgZmluYWxpemVSZW5kZXJpbmdVcGRhdGUoKTsK IAogICAgIHZvaWQgcmVtb3RlUmVzb3VyY2VDYWNoZVdhc0Rlc3Ryb3llZCgpOworICAgIHZvaWQg cmVsZWFzZUFsbFJlbW90ZUZvbnRzKCk7CiAgICAgdm9pZCByZWxlYXNlTWVtb3J5KCk7CiAKIHBy aXZhdGU6Cg== 435442 2021-08-12 12:24:04 -0700 2021-08-12 13:28:07 -0700 Patch bug-228969-20210812122403.patch text/plain 8074 sabouhallawa U3VidmVyc2lvbiBSZXZpc2lvbjogMjgwOTcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDZjNDBjYjBhN2Y1ZmQyZmJm Y2M5NDMxODhhNDUxYmRmNGYzNDlmYTkuLmIxNDMwMjA2YjYzMDk3YWE4YzBhNGRiZTgwYjI4OTRi NTIxYmY1MTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNjkgQEAKKzIwMjEtMDgtMTIgIFNhaWQgQWJv dS1IYWxsYXdhICA8c2FpZEBhcHBsZS5jb20+CisKKyAgICAgICAgW0dQVSBQcm9jZXNzXSBSRUdS RVNTSU9OOiBXZWJDb250ZW50IG9mdGVuIGNyYXNoZXMgd2hlbiB1c2luZyBpQ2xvdWQgcGhvdG9z CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjg5NjkK KyAgICAgICAgPHJkYXI6Ly84MTc2MTA3OD4KKworICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBG cmFzZXIuCisKKyAgICAgICAgVGVybWluYXRpbmcgdGhlIEdQVVByb2Nlc3MgaXMgdmVyeSBzdHJl c3NmdWwgc2l0dWF0aW9uIHdoaWNoIGhhcyB0byBiZQorICAgICAgICBoYW5kbGVkIGNhcmVmdWxs eS4gVGhlIHNpZGUgZWZmZWN0IG9mIGVhY2ggZnVuY3Rpb24gd2hpY2ggaXMgY2FsbGVkIHRocm91 Z2gKKyAgICAgICAgZ3B1UHJvY2Vzc0Nvbm5lY3Rpb25EaWRDbG9zZSgpIGhhcyB0byBiZSB1bmRl cnN0b29kIHRvIGdldCB0aGUgcmlnaHQKKyAgICAgICAgc2VxdWVuY2Ugb2YgY2FsbHMuIFRoZXJl IGFyZSBwcm9ibGVtcyBpbiByZWxlYXNpbmcgYWxsIGtpbmRzIG9mIHJlc291cmNlcy4KKworICAg ICAgICAtIFJlbGVhc2luZyBOYXRpdmVJbWFnZTogQ2FsbGluZyBjbGVhck5hdGl2ZUltYWdlTWFw KCkgYWZ0ZXIgY2xlYXJpbmcgdGhlCisgICAgICAgIGJhY2tlbmQgb2YgdGhlIEltYWdlQnVmZmVy cyB3YXMgY2F1c2luZyBhIHByb2JsZW0uIFdoZW4gY2xlYXJpbmcgdGhlCisgICAgICAgIGJhY2tl bmQgb2YgYW4gSW1hZ2VCdWZmZXIsIGl0IHdpbGwgY2xlYXIgaXRzIERpc3BsYXlMaXN0IHdoaWNo IG1heSBoYXZlCisgICAgICAgIHRoZSBsYXN0IHJlZmVyZW5jZSB0byBhIE5hdGl2ZUltYWdlLiBU aGUgZGVzdHJ1Y3RvciBvZiBOYXRpdmVJbWFnZSBjYWxscworICAgICAgICByZWxlYXNlUmVtb3Rl UmVzb3VyY2UoKSBiZWZvcmUgaXQgaXMgcmVtb3ZlZCBmcm9tIHRoZSB0aGUgTmF0aXZlSW1hZ2VN YXAuCisgICAgICAgIFRoaXMgd2lsbCBzZW5kIGEgbWVzc2FnZSB0byB0aGUgcmVsYXVuY2hlZCBH UFVQIHRvIHJlbGVhc2UgYSBOYXRpdmVJbWFnZQorICAgICAgICB3aGljaCBpcyBub3QgaW4gaXRz IGNhY2hlLgorCisgICAgICAgIC0gUmVsZWFzaW5nIEZvbnQ6IGNsZWFyRm9udE1hcCgpIHdhcyBh bHdheXMgY2FsbGluZyByZWxlYXNlUmVtb3RlUmVzb3VyY2UoKQorICAgICAgICBldmVuIGlmIGl0 IGlzIGNhbGxlZCBmb3JtICByZW1vdGVSZXNvdXJjZUNhY2hlV2FzRGVzdHJveWVkKCkuIFRoaXMg c2hvdWxkCisgICAgICAgIG5vdCBoYXBwZW4gYmVjYXVzZSB0aGUgY29ubmVjdGlvbiB3aXRoIEdQ VVByb2Nlc3MgaGFzIGJlZW4gY2xvc2VkLgorCisgICAgICAgIC0gUmVsZWFzaW5nIEltYWdlQnVm ZmVyOiBUaGlzIGhhcHBlbiB3aGVuIGEgRGlzcGxheUxpc3Qgb2YgYW4gSW1hZ2VCdWZmZXIKKyAg ICAgICAgJ0EnIGhvbGRzIHRoZSBsYXN0IHJlZmVyZW5jZSB0byBhbm90aGVyIEltYWdlQnVmZmVy ICdCJyBhbmQgd2UgY2FsbAorICAgICAgICBjbGVhckJhY2tlbmQoKSBmb3IgJ0EnLiBjbGVhckJh Y2tlbmQoKSB3aWxsIGNsZWFyIHRoZSBEaXNwbGF5TGlzdCBvZiAnQScKKyAgICAgICAgYW5kIGNh dXNlcyB0aGUgZGVsZXRpb24gb2YgJ0InLiBJbiB0aGlzIGNhc2Ugd2Ugc2hvdWxkIG5vdCBjYWxs IAorICAgICAgICByZWxlYXNlSW1hZ2VCdWZmZXIoKSBmb3IgJ0InIGJlY2F1c2UgdGhlIEdQVVBQ cm9jZXNzIGlzIGNsb3NlZC4KKworICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1Jl bW90ZUltYWdlQnVmZmVyUHJveHkuaDoKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlSW1hZ2VCdWZm ZXJQcm94eTo6flJlbW90ZUltYWdlQnVmZmVyUHJveHkpOgorICAgICAgICBJZiB0aGUgSW1hZ2VC dWZmZXIgaXMgYmVpbmcgcmVsZWFzZWQgYmVjYXVzZSBvZiB0aGUgY2xlYW4tdXAgd2UgZG8gd2hl bgorICAgICAgICB0aGUgR1BVUHJvY2VzcyBpcyB0ZXJtaW5hdGVkLCB3ZSBzaG91bGQgbm90IHJl bGVhc2UgdGhlIGNvcnJlc3BvbmRpbmcgCisgICAgICAgIFJlbW90ZUltYWdlQnVmZmVyIHNpbmNl IGl0IGlzIGFscmVhZHkgZ29uZS4KKworICAgICAgICAqIFdlYlByb2Nlc3MvR1BVL2dyYXBoaWNz L1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5oOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVS ZW5kZXJpbmdCYWNrZW5kUHJveHk6OmlzR1BVUHJvY2Vzc0Nvbm5lY3Rpb25DbG9zZWQgY29uc3Qp OgorICAgICAgICBUaGlzIHdpbGwgcmV0dXJuIHRydWUgaWYgd2UgYXJlIGRlbGV0aW5nIGEgUmVt b3RlSW1hZ2VCdWZmZXJQcm94eSB0aHJvdWdoCisgICAgICAgIFJlbW90ZVJlc291cmNlQ2FjaGVQ cm94eTo6cmVtb3RlUmVzb3VyY2VDYWNoZVdhc0Rlc3Ryb3llZCgpLgorCisgICAgICAgICogV2Vi UHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5LmNwcDoKKyAgICAg ICAgKFdlYktpdDo6UmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5OjpyZWxlYXNlQWxsUmVtb3RlRm9u dHMpOgorICAgICAgICBUaGlzIGZ1bmN0aW9uIHdpbGwgYmUgdXNlZCB0byByZWxlYXNlIHRoZSBy ZW1vdGUgZm9udHMuIEl0IHNob3VsZCBiZSBjYWxsZWQKKyAgICAgICAgZnJvbSBSZW1vdGVSZXNv dXJjZUNhY2hlUHJveHk6OnJlbGVhc2VNZW1vcnkoKSB3aGVyZSB3ZSBzdXJlIHRoZSBHUFVQIGlz CisgICAgICAgIGFsaXZlIGFuZCBhbGwgdGhlIGZvbnRzIGFyZSBjYWNoZWQgdGhlcmUuCisKKyAg ICAgICAgKFdlYktpdDo6UmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5OjpjbGVhckZvbnRNYXApOgor ICAgICAgICBUaGUgcGFydCBvZiByZWxlYXNpbmcgdGhlIHJlbW90ZSBmb250cyB3YXMgbW92ZWQg ZnJvbSB0aGlzIGZ1bmN0aW9uIHRvIAorICAgICAgICByZWxlYXNlQWxsUmVtb3RlRm9udHMoKS4K KworICAgICAgICAoV2ViS2l0OjpSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OnJlbW90ZVJlc291 cmNlQ2FjaGVXYXNEZXN0cm95ZWQpOgorICAgICAgICAxLiBDbGVhcmluZyB0aGUgTmF0aXZlSW1h Z2VzIGFuZCB0aGUgRm9udHMgaGFzIHRvIGNvbWUgYmVmb3JlIGNsZWFyaW5nCisgICAgICAgIHRo ZSBiYWNrZW5kcyBvZiB0aGUgSW1hZ2VCdWZmZXJzLiBUaGUgcmVhc29uIGlzIGNsZWFyQmFja2Vu ZCgpIGNsZWFycyB0aGUgCisgICAgICAgIERpc3BsYXlMaXN0IHdoaWNoIG1heSByZWxlYXNlIHRo ZSBsYXN0IHJlZmVyZW5jZSBvZiBhIE5hdGl2ZUltYWdlIG9yIEZvbnQuCisgICAgICAgIFdlIHdh bnQgdG8gZGV0YWNoIHRoZSBOYXRpdmVJbWFnZXMgYW5kIHRoZSBGb250cyBmcm9tIHRoZSBjYWNo ZSBiZWZvcmUgdGhlbi4KKyAgICAgICAgMi4gV2Ugc2hvdWxkIGhhdmUgdHdvIGRpZmZlcmVudCBs b29wczogb25lIGZvciBjbGVhcmluZyB0aGUgYmFja2VuZHMgb2YKKyAgICAgICAgdGhlIEltYWdl QnVmZmVycyBhbmQgYW5vdGhlciBvbmUgZm9yIHJlY3JlYXRpbmcgdGhlc2UgYmFja2VuZHMuIFRo ZSByZWFzb24KKyAgICAgICAgZm9yIHRoaXMgaXMgY2xlYXJCYWNrZW5kKCkgY2xlYXJzIHRoZSBE aXNwbGF5TGlzdCB3aGljaCBtYXkgcmVsZWFzZSB0aGUKKyAgICAgICAgbGFzdCByZWZlcmVuY2Ug b2YgYSBhbm90aGVyIHNvdXJjZSBSZW1vdGVJbWFnZUJ1ZmZlclByb3h5IHVzZWQgYnkgYSAKKyAg ICAgICAgRHJhd0ltYWdlQnVmZmVyIGl0ZW0gZm9yIGV4YW1wbGUuCisKKyAgICAgICAgKFdlYktp dDo6UmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5OjpyZWxlYXNlTWVtb3J5KToKKyAgICAgICAgKiBX ZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuaDoKKwogMjAy MS0wOC0xMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAg ICAgICAgW0FUS10gQ3JpdGljYWwgd2FybmluZ3Mgb24gY2hpbGRyZW4tY2hhbmdlZDo6YWRkIHNp Z25hbCBlbWlzc2lvbgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9n cmFwaGljcy9SZW1vdGVJbWFnZUJ1ZmZlclByb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nl c3MvR1BVL2dyYXBoaWNzL1JlbW90ZUltYWdlQnVmZmVyUHJveHkuaAppbmRleCA2ZDliZjg1OTYy ZjA1NDVlMjQzYmE3ZDE4MWE2NTU5ODg5YjEyY2U1Li4yN2JjZDAwNTQ1MDk1OGU4MDIxMjMzMGMx ZTg5NmUzYzg5MTczNGZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BV L2dyYXBoaWNzL1JlbW90ZUltYWdlQnVmZmVyUHJveHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1dl YlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZUltYWdlQnVmZmVyUHJveHkuaApAQCAtNjUsNyAr NjUsNyBAQCBwdWJsaWM6CiAKICAgICB+UmVtb3RlSW1hZ2VCdWZmZXJQcm94eSgpCiAgICAgewot ICAgICAgICBpZiAoIW1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5KSB7CisgICAgICAgIGlm ICghbV9yZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkgfHwgbV9yZW1vdGVSZW5kZXJpbmdCYWNr ZW5kUHJveHktPmlzR1BVUHJvY2Vzc0Nvbm5lY3Rpb25DbG9zZWQoKSkgewogICAgICAgICAgICAg Y2xlYXJEaXNwbGF5TGlzdCgpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlbmRl cmluZ0JhY2tlbmRQcm94eS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGlj cy9SZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkuaAppbmRleCA1OTdjMDdmM2Q5N2YwMWUzZmI5 ZmM5NzUyNzhmMzAzOTNjMzliOTNiLi44N2FlNTIyY2JiYjI4MWZjNGE4ODA3NjViOTlmNGM5MDI1 NmE5ZDI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNz L1JlbW90ZVJlbmRlcmluZ0JhY2tlbmRQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LmgKQEAgLTEyMiw2 ICsxMjIsOCBAQCBwdWJsaWM6CiAKICAgICBSZW5kZXJpbmdCYWNrZW5kSWRlbnRpZmllciBlbnN1 cmVCYWNrZW5kQ3JlYXRlZCgpOwogCisgICAgYm9vbCBpc0dQVVByb2Nlc3NDb25uZWN0aW9uQ2xv c2VkKCkgY29uc3QgeyByZXR1cm4gIW1fZ3B1UHJvY2Vzc0Nvbm5lY3Rpb247IH0KKwogcHJpdmF0 ZToKICAgICBleHBsaWNpdCBSZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkoV2ViUGFnZSYpOwog CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90 ZVJlc291cmNlQ2FjaGVQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dy YXBoaWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94eS5jcHAKaW5kZXggMjBhZDQ4NDdjNjY3M2E5 NDVmNzVkMDk5NTA3OGUxNTA1YmI4MjdmMi4uZjI3MjliMjBhOGI3ZDNjODA0ZTFmMDRmN2NjMzM4 MDhkY2Y0YzFjMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFw aGljcy9SZW1vdGVSZXNvdXJjZUNhY2hlUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2Vi UHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVtb3RlUmVzb3VyY2VDYWNoZVByb3h5LmNwcApAQCAtMTY0 LDEwICsxNjQsMTQgQEAgdm9pZCBSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OnByZXBhcmVGb3JO ZXh0UmVuZGVyaW5nVXBkYXRlKCkKICAgICBtX251bWJlck9mRm9udHNVc2VkSW5DdXJyZW50UmVu ZGVyaW5nVXBkYXRlID0gMDsKIH0KIAotdm9pZCBSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OmNs ZWFyRm9udE1hcCgpCit2b2lkIFJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6cmVsZWFzZUFsbFJl bW90ZUZvbnRzKCkKIHsKICAgICBmb3IgKGF1dG8mIGZvbnRTdGF0ZSA6IG1fZm9udHMpCiAgICAg ICAgIG1fcmVtb3RlUmVuZGVyaW5nQmFja2VuZFByb3h5LnJlbGVhc2VSZW1vdGVSZXNvdXJjZShm b250U3RhdGUua2V5LCBmb250U3RhdGUudmFsdWUudXNlQ291bnQpOworfQorCit2b2lkIFJlbW90 ZVJlc291cmNlQ2FjaGVQcm94eTo6Y2xlYXJGb250TWFwKCkKK3sKICAgICBtX2ZvbnRzLmNsZWFy KCk7CiAgICAgbV9udW1iZXJPZkZvbnRzVXNlZEluQ3VycmVudFJlbmRlcmluZ1VwZGF0ZSA9IDA7 CiB9CkBAIC0yMDMsMTkgKzIwNywyOCBAQCB2b2lkIFJlbW90ZVJlc291cmNlQ2FjaGVQcm94eTo6 ZmluYWxpemVSZW5kZXJpbmdVcGRhdGUoKQogCiB2b2lkIFJlbW90ZVJlc291cmNlQ2FjaGVQcm94 eTo6cmVtb3RlUmVzb3VyY2VDYWNoZVdhc0Rlc3Ryb3llZCgpCiB7Ci0gICAgZm9yIChhdXRvJiBp dGVtIDogbV9pbWFnZUJ1ZmZlcnMudmFsdWVzKCkpIHsKKyAgICBjbGVhck5hdGl2ZUltYWdlTWFw KCk7CisgICAgY2xlYXJGb250TWFwKCk7CisKKyAgICAvLyBHZXQgYSBjb3B5IG9mIG1faW1hZ2VC dWZmZXJzLnZhbHVlcygpIGJlY2F1c2UgY2xlYXJCYWNrZW5kKCkKKyAgICAvLyBtYXkgcmVsZWFz ZSBzb21lIG9mIHRoZSBjYWNoZWQgSW1hZ2VCdWZmZXJzLgorICAgIGZvciAoYXV0byYgaXRlbSA6 IGNvcHlUb1ZlY3RvcihtX2ltYWdlQnVmZmVycy52YWx1ZXMoKSkpIHsKICAgICAgICAgaWYgKCFp dGVtLmltYWdlQnVmZmVyKQogICAgICAgICAgICAgY29udGludWU7Ci0gICAgICAgIG1fcmVtb3Rl UmVuZGVyaW5nQmFja2VuZFByb3h5LmNyZWF0ZVJlbW90ZUltYWdlQnVmZmVyKCppdGVtLmltYWdl QnVmZmVyKTsKICAgICAgICAgaXRlbS51c2VDb3VudCA9IDA7CiAgICAgICAgIGl0ZW0uaW1hZ2VC dWZmZXItPmNsZWFyQmFja2VuZCgpOwogICAgIH0KLSAgICBjbGVhck5hdGl2ZUltYWdlTWFwKCk7 Ci0gICAgY2xlYXJGb250TWFwKCk7CisKKyAgICBmb3IgKGF1dG8mIGl0ZW0gOiBtX2ltYWdlQnVm ZmVycy52YWx1ZXMoKSkgeworICAgICAgICBpZiAoIWl0ZW0uaW1hZ2VCdWZmZXIpCisgICAgICAg ICAgICBjb250aW51ZTsKKyAgICAgICAgbV9yZW1vdGVSZW5kZXJpbmdCYWNrZW5kUHJveHkuY3Jl YXRlUmVtb3RlSW1hZ2VCdWZmZXIoKml0ZW0uaW1hZ2VCdWZmZXIpOworICAgIH0KIH0KIAogdm9p ZCBSZW1vdGVSZXNvdXJjZUNhY2hlUHJveHk6OnJlbGVhc2VNZW1vcnkoKQogeworICAgIHJlbGVh c2VBbGxSZW1vdGVGb250cygpOwogICAgIGNsZWFyRm9udE1hcCgpOwogICAgIG1fcmVtb3RlUmVu ZGVyaW5nQmFja2VuZFByb3h5LmRlbGV0ZUFsbEZvbnRzKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlc291cmNlQ2FjaGVQcm94 eS5oIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL0dQVS9ncmFwaGljcy9SZW1vdGVSZXNvdXJj ZUNhY2hlUHJveHkuaAppbmRleCA0ZTFiYWNhNzA1YmFlZDVlOGMyNWJmYzQzZTY0MTFmYmJmMjM4 M2E3Li5kNjUzNjZkMjA5MjZjMDY0YTA3MjdjOGU3YzBiYTk0ZjJjMTg1MzIzIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvR1BVL2dyYXBoaWNzL1JlbW90ZVJlc291cmNlQ2Fj aGVQcm94eS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9HUFUvZ3JhcGhpY3MvUmVt b3RlUmVzb3VyY2VDYWNoZVByb3h5LmgKQEAgLTU3LDYgKzU3LDcgQEAgcHVibGljOgogICAgIHZv aWQgZmluYWxpemVSZW5kZXJpbmdVcGRhdGUoKTsKIAogICAgIHZvaWQgcmVtb3RlUmVzb3VyY2VD YWNoZVdhc0Rlc3Ryb3llZCgpOworICAgIHZvaWQgcmVsZWFzZUFsbFJlbW90ZUZvbnRzKCk7CiAg ICAgdm9pZCByZWxlYXNlTWVtb3J5KCk7CiAKIHByaXZhdGU6Cg==