216435 2020-09-12 07:38:18 -0700 Clean up LazyLoadImageObserver 2020-09-13 02:46:17 -0700 1 1 1 Unclassified WebKit Images WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 rbuis rbuis cdumez changseok darin esprehn+autocc ews-watchlist gyuyoung.kim kangil.han webkit-bug-importer oldest_to_newest 1687921 0 rbuis 2020-09-12 07:38:18 -0700 Clean up LazyLoadImageObserver to match LazyLoadFrameObserver, inspired by the review of bug 215442. Specifically remove the friend declaration and create function, rename m_lazyLoadImageObserver to make its use more clear and therefore remove the comment about it. 1687922 1 408594 rbuis 2020-09-12 07:40:35 -0700 Created attachment 408594 Patch 1687979 2 408594 darin 2020-09-12 14:27:03 -0700 Comment on attachment 408594 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408594&action=review > Source/WebCore/html/LazyLoadImageObserver.h:46 > + RefPtr<IntersectionObserver> m_lazyLoadImageIntersectionObserver; You made this name longer, but I might have gone the opposite direction. Given that this is the intersection observer in the class LazyLoadImageObserver, obviously it’s the one for lazily loading image, so I would leave the words "lazy", "load", and "image" out of the name. I might even just call it m_observer, given the narrow context of being the only data member of this particular class. A longer name isn’t really helpful to understand what this is for. 1688076 3 408645 rbuis 2020-09-13 01:37:17 -0700 Created attachment 408645 Patch 1688078 4 408594 rbuis 2020-09-13 02:41:10 -0700 Comment on attachment 408594 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408594&action=review >> Source/WebCore/html/LazyLoadImageObserver.h:46 >> + RefPtr<IntersectionObserver> m_lazyLoadImageIntersectionObserver; > > You made this name longer, but I might have gone the opposite direction. Given that this is the intersection observer in the class LazyLoadImageObserver, obviously it’s the one for lazily loading image, so I would leave the words "lazy", "load", and "image" out of the name. I might even just call it m_observer, given the narrow context of being the only data member of this particular class. A longer name isn’t really helpful to understand what this is for. Interesting. I think you are right, given the class name the member var name was too long and contained duplicate information. Fixed now, also for LazyLoadFrameObserver to be consistent. 1688079 5 ews-feeder 2020-09-13 02:45:12 -0700 Committed r266991: <https://trac.webkit.org/changeset/266991> All reviewed patches have been landed. Closing bug and clearing flags on attachment 408645. 1688080 6 webkit-bug-importer 2020-09-13 02:46:17 -0700 <rdar://problem/68795266> 408594 2020-09-12 07:40:35 -0700 2020-09-13 01:37:11 -0700 Patch bug-216435-20200912164034.patch text/plain 5104 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2OTc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWFiYmJiNTlhMGI1Zjdm Y2ZiNzZkMzk3MTAzMzE4ZWQ2Nzg1N2U5Ni4uMDAyZjYyMzg4M2YwMDAwODViYzczMDI5YmMzNjgy MjlmMTU4MjY0MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDIwLTA5LTEyICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAgTGF6eUxvYWRJbWFn ZU9ic2VydmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTY0MzUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBDbGVhbiB1cCBMYXp5TG9hZEltYWdlT2JzZXJ2ZXIgdG8gbWF0Y2ggTGF6eUxvYWRGcmFtZU9i c2VydmVyLCBpbnNwaXJlZCBieSB0aGUKKyAgICAgICAgcmV2aWV3IG9mIGJ1ZyAyMTU0NDIuIFNw ZWNpZmljYWxseSByZW1vdmUgdGhlIGZyaWVuZCBkZWNsYXJhdGlvbiBhbmQgY3JlYXRlCisgICAg ICAgIGZ1bmN0aW9uLCByZW5hbWUgbV9sYXp5TG9hZEltYWdlT2JzZXJ2ZXIgdG8gbWFrZSBpdHMg dXNlIG1vcmUgY2xlYXIgYW5kIHRoZXJlZm9yZQorICAgICAgICByZW1vdmUgdGhlIGNvbW1lbnQg YWJvdXQgaXQuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6RG9jdW1lbnQ6OmxhenlMb2FkSW1hZ2VPYnNlcnZlcik6CisgICAgICAgICogaHRtbC9IVE1M SUZyYW1lRWxlbWVudC5jcHA6CisgICAgICAgICogaHRtbC9MYXp5TG9hZEltYWdlT2JzZXJ2ZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6TGF6eUxvYWRJbWFnZU9ic2VydmVyOjp1bm9ic2VydmUp OgorICAgICAgICAoV2ViQ29yZTo6TGF6eUxvYWRJbWFnZU9ic2VydmVyOjppbnRlcnNlY3Rpb25P YnNlcnZlcik6CisgICAgICAgIChXZWJDb3JlOjpMYXp5TG9hZEltYWdlT2JzZXJ2ZXI6OmlzT2Jz ZXJ2ZWQgY29uc3QpOgorICAgICAgICAqIGh0bWwvTGF6eUxvYWRJbWFnZU9ic2VydmVyLmg6Cisg ICAgICAgIChXZWJDb3JlOjpMYXp5TG9hZEltYWdlT2JzZXJ2ZXI6OmNyZWF0ZSk6IERlbGV0ZWQu CisKIDIwMjAtMDktMTIgIE15bGVzIEMuIE1heGZpZWxkICA8bW1heGZpZWxkQGFwcGxlLmNvbT4K IAogICAgICAgICBBZGRyZXNzaW5nIGZlZWRiYWNrIG9uIHIyNjY5MzYKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1l bnQuY3BwCmluZGV4IGJkNGJlNWEyNmEzZTdiMGJhMzcxYjIwMGM1ZmNkYmQ0YWUwNDIzZWEuLmMx NGNkZGMzYzEzNWY2NWQzMDk2OGJlMzRmOWI2NjQ3YmY2NTg5MmEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3Vt ZW50LmNwcApAQCAtODYyNiw3ICs4NjI2LDcgQEAgVGV4dE1hbmlwdWxhdGlvbkNvbnRyb2xsZXIm IERvY3VtZW50Ojp0ZXh0TWFuaXB1bGF0aW9uQ29udHJvbGxlcigpCiBMYXp5TG9hZEltYWdlT2Jz ZXJ2ZXImIERvY3VtZW50OjpsYXp5TG9hZEltYWdlT2JzZXJ2ZXIoKQogewogICAgIGlmICghbV9s YXp5TG9hZEltYWdlT2JzZXJ2ZXIpCi0gICAgICAgIG1fbGF6eUxvYWRJbWFnZU9ic2VydmVyID0g TGF6eUxvYWRJbWFnZU9ic2VydmVyOjpjcmVhdGUoKTsKKyAgICAgICAgbV9sYXp5TG9hZEltYWdl T2JzZXJ2ZXIgPSBtYWtlVW5pcXVlPExhenlMb2FkSW1hZ2VPYnNlcnZlcj4oKTsKICAgICByZXR1 cm4gKm1fbGF6eUxvYWRJbWFnZU9ic2VydmVyOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxJRnJhbWVFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TElGcmFtZUVsZW1lbnQuY3BwCmluZGV4IGFmMjZkZDc5YjMwNTI1N2YwM2E2MWI1OTQ4YTE4ZjMw ODA1ZWQ2MjAuLmY2ODNlZmUzZWIxOWUwM2I3ODUwMjhlZjU3ZjVkZjU1MDVlMmFlYjUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElGcmFtZUVsZW1lbnQuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL2h0bWwvSFRNTElGcmFtZUVsZW1lbnQuY3BwCkBAIC0zNCw3ICszNCw2IEBA CiAjaW5jbHVkZSAiU2NyaXB0YWJsZURvY3VtZW50UGFyc2VyLmgiCiAjaW5jbHVkZSAiU2V0dGlu Z3MuaCIKICNpbmNsdWRlIDx3dGYvSXNvTWFsbG9jSW5saW5lcy5oPgotI2luY2x1ZGUgPHd0Zi9T ZXRGb3JTY29wZS5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvTGF6eUxvYWRJbWFnZU9ic2VydmVyLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvTGF6eUxvYWRJbWFnZU9ic2VydmVyLmNwcAppbmRleCA2NTA2ZWM2N2MzODg1NDcxZTI2 NzY4ZGE2YTFiMmRiZmMxNGVmNGRmLi4zMmI3MDg1NjFmNTcwYjk4OTMyYTFlOTUzZDZhNjgyYWZh OGZiYjNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0xhenlMb2FkSW1hZ2VPYnNl cnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9MYXp5TG9hZEltYWdlT2JzZXJ2ZXIu Y3BwCkBAIC03NiwyNiArNzYsMjYgQEAgdm9pZCBMYXp5TG9hZEltYWdlT2JzZXJ2ZXI6Om9ic2Vy dmUoRWxlbWVudCYgZWxlbWVudCkKIAogdm9pZCBMYXp5TG9hZEltYWdlT2JzZXJ2ZXI6OnVub2Jz ZXJ2ZShFbGVtZW50JiBlbGVtZW50LCBEb2N1bWVudCYgZG9jdW1lbnQpCiB7Ci0gICAgaWYgKGF1 dG8mIG9ic2VydmVyID0gZG9jdW1lbnQubGF6eUxvYWRJbWFnZU9ic2VydmVyKCkubV9sYXp5TG9h ZEludGVyc2VjdGlvbk9ic2VydmVyKQorICAgIGlmIChhdXRvJiBvYnNlcnZlciA9IGRvY3VtZW50 LmxhenlMb2FkSW1hZ2VPYnNlcnZlcigpLm1fbGF6eUxvYWRJbWFnZUludGVyc2VjdGlvbk9ic2Vy dmVyKQogICAgICAgICBvYnNlcnZlci0+dW5vYnNlcnZlKGVsZW1lbnQpOwogfQogCiBJbnRlcnNl Y3Rpb25PYnNlcnZlciogTGF6eUxvYWRJbWFnZU9ic2VydmVyOjppbnRlcnNlY3Rpb25PYnNlcnZl cihEb2N1bWVudCYgZG9jdW1lbnQpCiB7Ci0gICAgaWYgKCFtX2xhenlMb2FkSW50ZXJzZWN0aW9u T2JzZXJ2ZXIpIHsKKyAgICBpZiAoIW1fbGF6eUxvYWRJbWFnZUludGVyc2VjdGlvbk9ic2VydmVy KSB7CiAgICAgICAgIGF1dG8gY2FsbGJhY2sgPSBMYXp5SW1hZ2VMb2FkSW50ZXJzZWN0aW9uT2Jz ZXJ2ZXJDYWxsYmFjazo6Y3JlYXRlKGRvY3VtZW50KTsKICAgICAgICAgSW50ZXJzZWN0aW9uT2Jz ZXJ2ZXI6OkluaXQgb3B0aW9ucyB7IFdURjo6bnVsbG9wdCwgZW1wdHlTdHJpbmcoKSwgeyB9IH07 CiAgICAgICAgIGF1dG8gb2JzZXJ2ZXIgPSBJbnRlcnNlY3Rpb25PYnNlcnZlcjo6Y3JlYXRlKGRv Y3VtZW50LCBXVEZNb3ZlKGNhbGxiYWNrKSwgV1RGTW92ZShvcHRpb25zKSk7CiAgICAgICAgIGlm IChvYnNlcnZlci5oYXNFeGNlcHRpb24oKSkKICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwot ICAgICAgICBtX2xhenlMb2FkSW50ZXJzZWN0aW9uT2JzZXJ2ZXIgPSBvYnNlcnZlci5yZXR1cm5W YWx1ZSgpLnB0cigpOworICAgICAgICBtX2xhenlMb2FkSW1hZ2VJbnRlcnNlY3Rpb25PYnNlcnZl ciA9IG9ic2VydmVyLnJldHVyblZhbHVlKCkucHRyKCk7CiAgICAgfQotICAgIHJldHVybiBtX2xh enlMb2FkSW50ZXJzZWN0aW9uT2JzZXJ2ZXIuZ2V0KCk7CisgICAgcmV0dXJuIG1fbGF6eUxvYWRJ bWFnZUludGVyc2VjdGlvbk9ic2VydmVyLmdldCgpOwogfQogCiBib29sIExhenlMb2FkSW1hZ2VP YnNlcnZlcjo6aXNPYnNlcnZlZChFbGVtZW50JiBlbGVtZW50KSBjb25zdAogewotICAgIHJldHVy biBtX2xhenlMb2FkSW50ZXJzZWN0aW9uT2JzZXJ2ZXIgJiYgbV9sYXp5TG9hZEludGVyc2VjdGlv bk9ic2VydmVyLT5vYnNlcnZhdGlvblRhcmdldHMoKS5jb250YWlucygmZWxlbWVudCk7CisgICAg cmV0dXJuIG1fbGF6eUxvYWRJbWFnZUludGVyc2VjdGlvbk9ic2VydmVyICYmIG1fbGF6eUxvYWRJ bWFnZUludGVyc2VjdGlvbk9ic2VydmVyLT5vYnNlcnZhdGlvblRhcmdldHMoKS5jb250YWlucygm ZWxlbWVudCk7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvTGF6eUxv YWRJbWFnZU9ic2VydmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0xhenlMb2FkSW1hZ2VPYnNl cnZlci5oCmluZGV4IDAwMDQ5ZmNmZGRiNDk4ODQ4MjkzNTg2MjdmZmJmNmY1ZjUzM2NlYWUuLjA0 MDBiMmQ3OTVlNTJhNWYzNGNmYjZkMTY4ODg1MTgyYTI1M2M3OWEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvTGF6eUxvYWRJbWFnZU9ic2VydmVyLmgKKysrIGIvU291cmNlL1dlYkNv cmUvaHRtbC9MYXp5TG9hZEltYWdlT2JzZXJ2ZXIuaApAQCAtNDEsMTggKzQxLDkgQEAgcHVibGlj OgogICAgIGJvb2wgaXNPYnNlcnZlZChFbGVtZW50JikgY29uc3Q7CiAKIHByaXZhdGU6Ci0gICAg ZnJpZW5kIGNsYXNzIERvY3VtZW50OwotCi0gICAgc3RhdGljIHN0ZDo6dW5pcXVlX3B0cjxMYXp5 TG9hZEltYWdlT2JzZXJ2ZXI+IGNyZWF0ZSgpCi0gICAgewotICAgICAgICByZXR1cm4gc3RkOjp1 bmlxdWVfcHRyPExhenlMb2FkSW1hZ2VPYnNlcnZlcj4obmV3IExhenlMb2FkSW1hZ2VPYnNlcnZl cigpKTsKLSAgICB9Ci0gICAgTGF6eUxvYWRJbWFnZU9ic2VydmVyKCkgPSBkZWZhdWx0OwotCiAg ICAgSW50ZXJzZWN0aW9uT2JzZXJ2ZXIqIGludGVyc2VjdGlvbk9ic2VydmVyKERvY3VtZW50Jik7 CiAKLSAgICAvLyBUaGUgaW50ZXJzZWN0aW9uIG9ic2VydmVyIHJlc3BvbnNpYmxlIGZvciBsb2Fk aW5nIHRoZSBpbWFnZSBvbmNlIGl0J3MgbmVhciB0aGUgdmlld3BvcnQuCi0gICAgUmVmUHRyPElu dGVyc2VjdGlvbk9ic2VydmVyPiBtX2xhenlMb2FkSW50ZXJzZWN0aW9uT2JzZXJ2ZXI7CisgICAg UmVmUHRyPEludGVyc2VjdGlvbk9ic2VydmVyPiBtX2xhenlMb2FkSW1hZ2VJbnRlcnNlY3Rpb25P YnNlcnZlcjsKIH07CiAKIH0gLy8gbmFtZXNwYWNlCg== 408645 2020-09-13 01:37:17 -0700 2020-09-13 02:45:12 -0700 Patch bug-216435-20200913103716.patch text/plain 8207 rbuis U3VidmVyc2lvbiBSZXZpc2lvbjogMjY2OTg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzg4ZjgwYjczMGRkZGZj YWVhOTMyNGVkNGNhYjNlMmM0YmI4Y2FjNC4uZWJiNTNjM2Y3ZmMzZmNhMjdjNTg1M2U2ZTlkNDM2 Y2FhNGIwNTJjMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDIwLTA5LTEzICBSb2Ig QnVpcyAgPHJidWlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgQ2xlYW4gdXAgTGF6eUxvYWRJbWFn ZU9ic2VydmVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTY0MzUKKworICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBBZGxlci4KKworICAgICAgICBD bGVhbiB1cCBMYXp5TG9hZEltYWdlT2JzZXJ2ZXIgdG8gbWF0Y2ggTGF6eUxvYWRGcmFtZU9ic2Vy dmVyLCBpbnNwaXJlZCBieSB0aGUKKyAgICAgICAgcmV2aWV3IG9mIGJ1ZyAyMTU0NDIuIFNwZWNp ZmljYWxseSByZW1vdmUgdGhlIGZyaWVuZCBkZWNsYXJhdGlvbiBhbmQgY3JlYXRlCisgICAgICAg IGZ1bmN0aW9uLCByZW5hbWUgbV9sYXp5TG9hZEltYWdlT2JzZXJ2ZXIgdG8gbWFrZSBpdHMgdXNl IG1vcmUgY2xlYXIgYW5kIHRoZXJlZm9yZQorICAgICAgICByZW1vdmUgdGhlIGNvbW1lbnQgYWJv dXQgaXQuCisKKyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 RG9jdW1lbnQ6OmxhenlMb2FkSW1hZ2VPYnNlcnZlcik6CisgICAgICAgICogaHRtbC9IVE1MSUZy YW1lRWxlbWVudC5jcHA6CisgICAgICAgICogaHRtbC9MYXp5TG9hZEZyYW1lT2JzZXJ2ZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TGF6eUxvYWRGcmFtZU9ic2VydmVyOjpvYnNlcnZlKToKKyAg ICAgICAgKFdlYkNvcmU6OkxhenlMb2FkRnJhbWVPYnNlcnZlcjo6dW5vYnNlcnZlKToKKyAgICAg ICAgKFdlYkNvcmU6OkxhenlMb2FkRnJhbWVPYnNlcnZlcjo6aW50ZXJzZWN0aW9uT2JzZXJ2ZXIp OgorICAgICAgICAoV2ViQ29yZTo6TGF6eUxvYWRGcmFtZU9ic2VydmVyOjppc09ic2VydmVkIGNv bnN0KToKKyAgICAgICAgKiBodG1sL0xhenlMb2FkRnJhbWVPYnNlcnZlci5oOgorICAgICAgICAq IGh0bWwvTGF6eUxvYWRJbWFnZU9ic2VydmVyLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkxhenlM b2FkSW1hZ2VPYnNlcnZlcjo6dW5vYnNlcnZlKToKKyAgICAgICAgKFdlYkNvcmU6OkxhenlMb2Fk SW1hZ2VPYnNlcnZlcjo6aW50ZXJzZWN0aW9uT2JzZXJ2ZXIpOgorICAgICAgICAoV2ViQ29yZTo6 TGF6eUxvYWRJbWFnZU9ic2VydmVyOjppc09ic2VydmVkIGNvbnN0KToKKyAgICAgICAgKiBodG1s L0xhenlMb2FkSW1hZ2VPYnNlcnZlci5oOgorICAgICAgICAoV2ViQ29yZTo6TGF6eUxvYWRJbWFn ZU9ic2VydmVyOjpjcmVhdGUpOiBEZWxldGVkLgorCiAyMDIwLTA5LTEyICBUeWxlciBXaWxjb2Nr ICA8dHdpbGNvLm9AcHJvdG9ubWFpbC5jb20+CiAKICAgICAgICAgU2FmZWx5IGhhbmRsZSBvdmVy bHktbG9uZyBDU1MgdmFyaWFibGUgdmFsdWVzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9k b20vRG9jdW1lbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAppbmRleCBi ZDRiZTVhMjZhM2U3YjBiYTM3MWIyMDBjNWZjZGJkNGFlMDQyM2VhLi5jMTRjZGRjM2MxMzVmNjVk MzA5NjhiZTM0ZjliNjY0N2JmNjU4OTJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKQEAgLTg2 MjYsNyArODYyNiw3IEBAIFRleHRNYW5pcHVsYXRpb25Db250cm9sbGVyJiBEb2N1bWVudDo6dGV4 dE1hbmlwdWxhdGlvbkNvbnRyb2xsZXIoKQogTGF6eUxvYWRJbWFnZU9ic2VydmVyJiBEb2N1bWVu dDo6bGF6eUxvYWRJbWFnZU9ic2VydmVyKCkKIHsKICAgICBpZiAoIW1fbGF6eUxvYWRJbWFnZU9i c2VydmVyKQotICAgICAgICBtX2xhenlMb2FkSW1hZ2VPYnNlcnZlciA9IExhenlMb2FkSW1hZ2VP YnNlcnZlcjo6Y3JlYXRlKCk7CisgICAgICAgIG1fbGF6eUxvYWRJbWFnZU9ic2VydmVyID0gbWFr ZVVuaXF1ZTxMYXp5TG9hZEltYWdlT2JzZXJ2ZXI+KCk7CiAgICAgcmV0dXJuICptX2xhenlMb2Fk SW1hZ2VPYnNlcnZlcjsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1M SUZyYW1lRWxlbWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJRnJhbWVFbGVtZW50 LmNwcAppbmRleCBhZjI2ZGQ3OWIzMDUyNTdmMDNhNjFiNTk0OGExOGYzMDgwNWVkNjIwLi5mNjgz ZWZlM2ViMTllMDNiNzg1MDI4ZWY1N2Y1ZGY1NTA1ZTJhZWI1IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxJRnJhbWVFbGVtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL0hUTUxJRnJhbWVFbGVtZW50LmNwcApAQCAtMzQsNyArMzQsNiBAQAogI2luY2x1ZGUgIlNj cmlwdGFibGVEb2N1bWVudFBhcnNlci5oIgogI2luY2x1ZGUgIlNldHRpbmdzLmgiCiAjaW5jbHVk ZSA8d3RmL0lzb01hbGxvY0lubGluZXMuaD4KLSNpbmNsdWRlIDx3dGYvU2V0Rm9yU2NvcGUuaD4K IAogbmFtZXNwYWNlIFdlYkNvcmUgewogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1s L0xhenlMb2FkRnJhbWVPYnNlcnZlci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0xhenlMb2Fk RnJhbWVPYnNlcnZlci5jcHAKaW5kZXggYTA4MGQ0OWZlZTEwZTdmZTAzOWYxYTA0ZjI1OTc1M2Uz OWI0ODljMS4uY2IxMzJiNTE0NmQ4NjM5YTJmYWMxNDI2ZTMyY2VmNzU0ODlmN2M1OCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9MYXp5TG9hZEZyYW1lT2JzZXJ2ZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL2h0bWwvTGF6eUxvYWRGcmFtZU9ic2VydmVyLmNwcApAQCAtNzIsOCAr NzIsOCBAQCBMYXp5TG9hZEZyYW1lT2JzZXJ2ZXI6OkxhenlMb2FkRnJhbWVPYnNlcnZlcihIVE1M SUZyYW1lRWxlbWVudCYgZWxlbWVudCkKIAogdm9pZCBMYXp5TG9hZEZyYW1lT2JzZXJ2ZXI6Om9i c2VydmUoY29uc3QgQXRvbVN0cmluZyYgZnJhbWVVUkwsIGNvbnN0IFJlZmVycmVyUG9saWN5JiBy ZWZlcnJlclBvbGljeSkKIHsKLSAgICBhdXRvJiBvYnNlcnZlciA9IG1fZWxlbWVudC5sYXp5TG9h ZEZyYW1lT2JzZXJ2ZXIoKTsKLSAgICBhdXRvKiBpbnRlcnNlY3Rpb25PYnNlcnZlciA9IG9ic2Vy dmVyLmludGVyc2VjdGlvbk9ic2VydmVyKG1fZWxlbWVudC5kb2N1bWVudCgpKTsKKyAgICBhdXRv JiBmcmFtZU9ic2VydmVyID0gbV9lbGVtZW50LmxhenlMb2FkRnJhbWVPYnNlcnZlcigpOworICAg IGF1dG8qIGludGVyc2VjdGlvbk9ic2VydmVyID0gZnJhbWVPYnNlcnZlci5pbnRlcnNlY3Rpb25P YnNlcnZlcihtX2VsZW1lbnQuZG9jdW1lbnQoKSk7CiAgICAgaWYgKCFpbnRlcnNlY3Rpb25PYnNl cnZlcikKICAgICAgICAgcmV0dXJuOwogICAgIG1fZnJhbWVVUkwgPSBmcmFtZVVSTDsKQEAgLTgz LDI3ICs4MywyNyBAQCB2b2lkIExhenlMb2FkRnJhbWVPYnNlcnZlcjo6b2JzZXJ2ZShjb25zdCBB dG9tU3RyaW5nJiBmcmFtZVVSTCwgY29uc3QgUmVmZXJyZXJQbwogCiB2b2lkIExhenlMb2FkRnJh bWVPYnNlcnZlcjo6dW5vYnNlcnZlKCkKIHsKLSAgICBhdXRvJiBvYnNlcnZlciA9IG1fZWxlbWVu dC5sYXp5TG9hZEZyYW1lT2JzZXJ2ZXIoKTsKLSAgICBBU1NFUlQob2JzZXJ2ZXIuaXNPYnNlcnZl ZChtX2VsZW1lbnQpKTsKLSAgICBvYnNlcnZlci5tX2xhenlMb2FkRnJhbWVJbnRlcnNlY3Rpb25P YnNlcnZlci0+dW5vYnNlcnZlKG1fZWxlbWVudCk7CisgICAgYXV0byYgZnJhbWVPYnNlcnZlciA9 IG1fZWxlbWVudC5sYXp5TG9hZEZyYW1lT2JzZXJ2ZXIoKTsKKyAgICBBU1NFUlQoZnJhbWVPYnNl cnZlci5pc09ic2VydmVkKG1fZWxlbWVudCkpOworICAgIGZyYW1lT2JzZXJ2ZXIubV9vYnNlcnZl ci0+dW5vYnNlcnZlKG1fZWxlbWVudCk7CiB9CiAKIEludGVyc2VjdGlvbk9ic2VydmVyKiBMYXp5 TG9hZEZyYW1lT2JzZXJ2ZXI6OmludGVyc2VjdGlvbk9ic2VydmVyKERvY3VtZW50JiBkb2N1bWVu dCkKIHsKLSAgICBpZiAoIW1fbGF6eUxvYWRGcmFtZUludGVyc2VjdGlvbk9ic2VydmVyKSB7Cisg ICAgaWYgKCFtX29ic2VydmVyKSB7CiAgICAgICAgIGF1dG8gY2FsbGJhY2sgPSBMYXp5RnJhbWVM b2FkSW50ZXJzZWN0aW9uT2JzZXJ2ZXJDYWxsYmFjazo6Y3JlYXRlKGRvY3VtZW50KTsKICAgICAg ICAgSW50ZXJzZWN0aW9uT2JzZXJ2ZXI6OkluaXQgb3B0aW9ucyB7IFdURjo6bnVsbG9wdCwgZW1w dHlTdHJpbmcoKSwgeyB9IH07CiAgICAgICAgIGF1dG8gb2JzZXJ2ZXIgPSBJbnRlcnNlY3Rpb25P YnNlcnZlcjo6Y3JlYXRlKGRvY3VtZW50LCBXVEZNb3ZlKGNhbGxiYWNrKSwgV1RGTW92ZShvcHRp b25zKSk7CiAgICAgICAgIGlmIChvYnNlcnZlci5oYXNFeGNlcHRpb24oKSkKICAgICAgICAgICAg IHJldHVybiBudWxscHRyOwotICAgICAgICBtX2xhenlMb2FkRnJhbWVJbnRlcnNlY3Rpb25PYnNl cnZlciA9IG9ic2VydmVyLnJlbGVhc2VSZXR1cm5WYWx1ZSgpOworICAgICAgICBtX29ic2VydmVy ID0gb2JzZXJ2ZXIucmVsZWFzZVJldHVyblZhbHVlKCk7CiAgICAgfQotICAgIHJldHVybiBtX2xh enlMb2FkRnJhbWVJbnRlcnNlY3Rpb25PYnNlcnZlci5nZXQoKTsKKyAgICByZXR1cm4gbV9vYnNl cnZlci5nZXQoKTsKIH0KIAogYm9vbCBMYXp5TG9hZEZyYW1lT2JzZXJ2ZXI6OmlzT2JzZXJ2ZWQo RWxlbWVudCYgZWxlbWVudCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV9sYXp5TG9hZEZyYW1lSW50 ZXJzZWN0aW9uT2JzZXJ2ZXIgJiYgbV9sYXp5TG9hZEZyYW1lSW50ZXJzZWN0aW9uT2JzZXJ2ZXIt Pm9ic2VydmF0aW9uVGFyZ2V0cygpLmNvbnRhaW5zKCZlbGVtZW50KTsKKyAgICByZXR1cm4gbV9v YnNlcnZlciAmJiBtX29ic2VydmVyLT5vYnNlcnZhdGlvblRhcmdldHMoKS5jb250YWlucygmZWxl bWVudCk7CiB9CiAKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvTGF6eUxvYWRG cmFtZU9ic2VydmVyLmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0xhenlMb2FkRnJhbWVPYnNlcnZl ci5oCmluZGV4IDg4M2U3NzRhM2I5ZGUyM2JmZjE3Y2FmN2FlY2RlOTdmODY4OGQ2ZDQuLmExODM0 OGNhNDk4YTc2NzZjNmM4YzU0ZDNlZjFiODU1NTI1MGQxNmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvTGF6eUxvYWRGcmFtZU9ic2VydmVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUv aHRtbC9MYXp5TG9hZEZyYW1lT2JzZXJ2ZXIuaApAQCAtNTEsNyArNTEsNyBAQCBwcml2YXRlOgog ICAgIEhUTUxJRnJhbWVFbGVtZW50JiBtX2VsZW1lbnQ7CiAgICAgQXRvbVN0cmluZyBtX2ZyYW1l VVJMOwogICAgIFJlZmVycmVyUG9saWN5IG1fcmVmZXJyZXJQb2xpY3k7Ci0gICAgUmVmUHRyPElu dGVyc2VjdGlvbk9ic2VydmVyPiBtX2xhenlMb2FkRnJhbWVJbnRlcnNlY3Rpb25PYnNlcnZlcjsK KyAgICBSZWZQdHI8SW50ZXJzZWN0aW9uT2JzZXJ2ZXI+IG1fb2JzZXJ2ZXI7CiB9OwogCiB9IC8v IG5hbWVzcGFjZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9MYXp5TG9hZEltYWdl T2JzZXJ2ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9MYXp5TG9hZEltYWdlT2JzZXJ2ZXIu Y3BwCmluZGV4IDY1MDZlYzY3YzM4ODU0NzFlMjY3NjhkYTZhMWIyZGJmYzE0ZWY0ZGYuLmFkZTlh N2M1NTM3ZWU5MjZhMDdhNGVkZWNiMGNlYjBiOWM0YzgxM2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2h0bWwvTGF6eUxvYWRJbWFnZU9ic2VydmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9odG1sL0xhenlMb2FkSW1hZ2VPYnNlcnZlci5jcHAKQEAgLTc2LDI2ICs3NiwyNiBAQCB2b2lk IExhenlMb2FkSW1hZ2VPYnNlcnZlcjo6b2JzZXJ2ZShFbGVtZW50JiBlbGVtZW50KQogCiB2b2lk IExhenlMb2FkSW1hZ2VPYnNlcnZlcjo6dW5vYnNlcnZlKEVsZW1lbnQmIGVsZW1lbnQsIERvY3Vt ZW50JiBkb2N1bWVudCkKIHsKLSAgICBpZiAoYXV0byYgb2JzZXJ2ZXIgPSBkb2N1bWVudC5sYXp5 TG9hZEltYWdlT2JzZXJ2ZXIoKS5tX2xhenlMb2FkSW50ZXJzZWN0aW9uT2JzZXJ2ZXIpCisgICAg aWYgKGF1dG8mIG9ic2VydmVyID0gZG9jdW1lbnQubGF6eUxvYWRJbWFnZU9ic2VydmVyKCkubV9v YnNlcnZlcikKICAgICAgICAgb2JzZXJ2ZXItPnVub2JzZXJ2ZShlbGVtZW50KTsKIH0KIAogSW50 ZXJzZWN0aW9uT2JzZXJ2ZXIqIExhenlMb2FkSW1hZ2VPYnNlcnZlcjo6aW50ZXJzZWN0aW9uT2Jz ZXJ2ZXIoRG9jdW1lbnQmIGRvY3VtZW50KQogewotICAgIGlmICghbV9sYXp5TG9hZEludGVyc2Vj dGlvbk9ic2VydmVyKSB7CisgICAgaWYgKCFtX29ic2VydmVyKSB7CiAgICAgICAgIGF1dG8gY2Fs bGJhY2sgPSBMYXp5SW1hZ2VMb2FkSW50ZXJzZWN0aW9uT2JzZXJ2ZXJDYWxsYmFjazo6Y3JlYXRl KGRvY3VtZW50KTsKICAgICAgICAgSW50ZXJzZWN0aW9uT2JzZXJ2ZXI6OkluaXQgb3B0aW9ucyB7 IFdURjo6bnVsbG9wdCwgZW1wdHlTdHJpbmcoKSwgeyB9IH07CiAgICAgICAgIGF1dG8gb2JzZXJ2 ZXIgPSBJbnRlcnNlY3Rpb25PYnNlcnZlcjo6Y3JlYXRlKGRvY3VtZW50LCBXVEZNb3ZlKGNhbGxi YWNrKSwgV1RGTW92ZShvcHRpb25zKSk7CiAgICAgICAgIGlmIChvYnNlcnZlci5oYXNFeGNlcHRp b24oKSkKICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwotICAgICAgICBtX2xhenlMb2FkSW50 ZXJzZWN0aW9uT2JzZXJ2ZXIgPSBvYnNlcnZlci5yZXR1cm5WYWx1ZSgpLnB0cigpOworICAgICAg ICBtX29ic2VydmVyID0gb2JzZXJ2ZXIucmV0dXJuVmFsdWUoKS5wdHIoKTsKICAgICB9Ci0gICAg cmV0dXJuIG1fbGF6eUxvYWRJbnRlcnNlY3Rpb25PYnNlcnZlci5nZXQoKTsKKyAgICByZXR1cm4g bV9vYnNlcnZlci5nZXQoKTsKIH0KIAogYm9vbCBMYXp5TG9hZEltYWdlT2JzZXJ2ZXI6OmlzT2Jz ZXJ2ZWQoRWxlbWVudCYgZWxlbWVudCkgY29uc3QKIHsKLSAgICByZXR1cm4gbV9sYXp5TG9hZElu dGVyc2VjdGlvbk9ic2VydmVyICYmIG1fbGF6eUxvYWRJbnRlcnNlY3Rpb25PYnNlcnZlci0+b2Jz ZXJ2YXRpb25UYXJnZXRzKCkuY29udGFpbnMoJmVsZW1lbnQpOworICAgIHJldHVybiBtX29ic2Vy dmVyICYmIG1fb2JzZXJ2ZXItPm9ic2VydmF0aW9uVGFyZ2V0cygpLmNvbnRhaW5zKCZlbGVtZW50 KTsKIH0KIAogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9MYXp5TG9hZEltYWdl T2JzZXJ2ZXIuaCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvTGF6eUxvYWRJbWFnZU9ic2VydmVyLmgK aW5kZXggMDAwNDlmY2ZkZGI0OTg4NDgyOTM1ODYyN2ZmYmY2ZjVmNTMzY2VhZS4uN2E0ZjEzMjM5 ZWY2Nzk3ZWZiYWJlNjliYzIxNTQ4YWIzZmQ5NWNiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaHRtbC9MYXp5TG9hZEltYWdlT2JzZXJ2ZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1s L0xhenlMb2FkSW1hZ2VPYnNlcnZlci5oCkBAIC00MSwxOCArNDEsOSBAQCBwdWJsaWM6CiAgICAg Ym9vbCBpc09ic2VydmVkKEVsZW1lbnQmKSBjb25zdDsKIAogcHJpdmF0ZToKLSAgICBmcmllbmQg Y2xhc3MgRG9jdW1lbnQ7Ci0KLSAgICBzdGF0aWMgc3RkOjp1bmlxdWVfcHRyPExhenlMb2FkSW1h Z2VPYnNlcnZlcj4gY3JlYXRlKCkKLSAgICB7Ci0gICAgICAgIHJldHVybiBzdGQ6OnVuaXF1ZV9w dHI8TGF6eUxvYWRJbWFnZU9ic2VydmVyPihuZXcgTGF6eUxvYWRJbWFnZU9ic2VydmVyKCkpOwot ICAgIH0KLSAgICBMYXp5TG9hZEltYWdlT2JzZXJ2ZXIoKSA9IGRlZmF1bHQ7Ci0KICAgICBJbnRl cnNlY3Rpb25PYnNlcnZlciogaW50ZXJzZWN0aW9uT2JzZXJ2ZXIoRG9jdW1lbnQmKTsKIAotICAg IC8vIFRoZSBpbnRlcnNlY3Rpb24gb2JzZXJ2ZXIgcmVzcG9uc2libGUgZm9yIGxvYWRpbmcgdGhl IGltYWdlIG9uY2UgaXQncyBuZWFyIHRoZSB2aWV3cG9ydC4KLSAgICBSZWZQdHI8SW50ZXJzZWN0 aW9uT2JzZXJ2ZXI+IG1fbGF6eUxvYWRJbnRlcnNlY3Rpb25PYnNlcnZlcjsKKyAgICBSZWZQdHI8 SW50ZXJzZWN0aW9uT2JzZXJ2ZXI+IG1fb2JzZXJ2ZXI7CiB9OwogCiB9IC8vIG5hbWVzcGFjZQo=