225405 2021-05-05 12:41:44 -0700 Sampled Page Top Color: tie into existing TCADA/RLTT systems so that the value is kept in sync with painting 2021-05-05 15:23:13 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 hi hi cdumez esprehn+autocc ews-watchlist hi kangil.han thorton webkit-bug-importer oldest_to_newest 1757042 0 hi 2021-05-05 12:41:44 -0700 . 1757049 1 427792 hi 2021-05-05 12:46:44 -0700 Created attachment 427792 Patch 1757056 2 427792 thorton 2021-05-05 12:53:57 -0700 Comment on attachment 427792 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427792&action=review > Source/WebKit/WebProcess/WebPage/WebPage.cpp:6469 > + send(Messages::WebPageProxy::SampledPageTopColorChanged(m_page->sampledPageTopColor())); I don't understand why there's a non-transactional version of this? It should just dirty the transaction and be sent that way (so that it, again, is synchronized with the layer content in the transaction). 1757058 3 427792 hi 2021-05-05 12:56:10 -0700 Comment on attachment 427792 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427792&action=review >> Source/WebKit/WebProcess/WebPage/WebPage.cpp:6469 >> + send(Messages::WebPageProxy::SampledPageTopColorChanged(m_page->sampledPageTopColor())); > > I don't understand why there's a non-transactional version of this? It should just dirty the transaction and be sent that way (so that it, again, is synchronized with the layer content in the transaction). This is only called inside `TiledCoreAnimationDrawingArea::updateRendering`. This is also how `themeColor` and `pageExtendedBackgroundColor` do it. It was my understanding that this is how it's done for macOS? Am I mistaken? 1757064 4 thorton 2021-05-05 13:09:59 -0700 (In reply to Devin Rousso from comment #3) > Comment on attachment 427792 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=427792&action=review > > >> Source/WebKit/WebProcess/WebPage/WebPage.cpp:6469 > >> + send(Messages::WebPageProxy::SampledPageTopColorChanged(m_page->sampledPageTopColor())); > > > > I don't understand why there's a non-transactional version of this? It should just dirty the transaction and be sent that way (so that it, again, is synchronized with the layer content in the transaction). > > This is only called inside `TiledCoreAnimationDrawingArea::updateRendering`. > This is also how `themeColor` and `pageExtendedBackgroundColor` do it. It > was my understanding that this is how it's done for macOS? Am I mistaken? Oh oh oh, yes, this is for non-transactional WebKit :) 1757126 5 ews-feeder 2021-05-05 15:22:43 -0700 Committed r277045 (237357@main): <https://commits.webkit.org/237357@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 427792. 1757127 6 webkit-bug-importer 2021-05-05 15:23:13 -0700 <rdar://problem/77578428> 427792 2021-05-05 12:46:44 -0700 2021-05-05 15:22:44 -0700 Patch bug-225405-20210505134643.patch text/plain 15975 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyMTlkMTI0NjY1NjI0MWExMzZkZjM3MmNiNDFmMzJkZWI1ZjQzNjA3Li5l MGFmZTE0NzQ1OGE2ODllYWFkMDg5ZDJiZTk3Mzk0MmRjZWU0OGM4IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjIgQEAKKzIwMjEtMDUtMDUgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29t PgorCisgICAgICAgIFNhbXBsZWQgUGFnZSBUb3AgQ29sb3I6IHRpZSBpbnRvIGV4aXN0aW5nIFRD QURBL1JMVFQgc3lzdGVtcyBzbyB0aGF0IHRoZSB2YWx1ZSBpcyBrZXB0IGluIHN5bmMgd2l0aCBw YWludGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjI1NDA1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg SW5zdGVhZCBvZiBzZW5kaW5nIGFuIElQQyB0byB0aGUgVUlQcm9jZXNzIHdoZW5ldmVyIHRoZSBs b2dpYyB0byBkZXRlcm1pbmUgdGhlIHNhbXBsZWQgcGFnZQorICAgICAgICB0b3AgY29sb3IgZmlu aXNoZXMsIHdhaXQgdG8gZGlzcGF0Y2ggdGhlIElQQyB1bnRpbCB3ZSdyZSBhYm91dCB0byByZW5k ZXIgKGp1c3QgbGlrZSB0aGVtZQorICAgICAgICBjb2xvciBhbmQgcGFnZSBleHRlbmRlZCBiYWNr Z3JvdW5kIGNvbG9yKS4gT24gbWFjT1MsIHRoaXMgbWVhbnMgdGhlIElQQyBpcyBkaXNwYXRjaGVk IGluc2lkZQorICAgICAgICBgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnVwZGF0ZVJl bmRlcmluZ2AuIE9uIGlPUywgdGhlIGBDb2xvcmAgaXMgaW5jbHVkZWQgYXMgcGFydCBvZgorICAg ICAgICB0aGUgYFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uYC4KKworICAgICAgICAqIGRvbS9E b2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpEb2N1bWVudDo6ZGV0ZXJtaW5lU2FtcGxl ZFBhZ2VUb3BDb2xvcik6CisKKyAgICAgICAgKiBwYWdlL0Nocm9tZUNsaWVudC5oOgorICAgICAg ICAoV2ViQ29yZTo6Q2hyb21lQ2xpZW50OjpzYW1wbGVkUGFnZVRvcENvbG9yQ2hhbmdlZCBjb25z dCk6IFJlbmFtZWQgZnJvbSBgZGlkU2FtcGxlUGFnZVRvcENvbG9yYC4KKwogMjAyMS0wNS0wNSAg QWxpY2lhIEJveWEgR2FyY8OtYSAgPGFib3lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW01TRV1b R1N0cmVhbWVyXSBXZWJLaXRNZWRpYVNyYyByZXdvcmsgdjIKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggMjIyODU3NDc4 NDEyNzMzZjY0MGJjZjAxYTlkYWVkZTlmYzc3MjA1Zi4uM2ZkN2YwNGU4OTJmOGNkODNjNmE2ZDM3 N2M4NDVmOThhMzVlODBmNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0MyBAQAorMjAyMS0wNS0wNSAg RGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAgU2FtcGxlZCBQYWdl IFRvcCBDb2xvcjogdGllIGludG8gZXhpc3RpbmcgVENBREEvUkxUVCBzeXN0ZW1zIHNvIHRoYXQg dGhlIHZhbHVlIGlzIGtlcHQgaW4gc3luYyB3aXRoIHBhaW50aW5nCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjU0MDUKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBJbnN0ZWFkIG9mIHNlbmRpbmcgYW4gSVBD IHRvIHRoZSBVSVByb2Nlc3Mgd2hlbmV2ZXIgdGhlIGxvZ2ljIHRvIGRldGVybWluZSB0aGUgc2Ft cGxlZCBwYWdlCisgICAgICAgIHRvcCBjb2xvciBmaW5pc2hlcywgd2FpdCB0byBkaXNwYXRjaCB0 aGUgSVBDIHVudGlsIHdlJ3JlIGFib3V0IHRvIHJlbmRlciAoanVzdCBsaWtlIHRoZW1lCisgICAg ICAgIGNvbG9yIGFuZCBwYWdlIGV4dGVuZGVkIGJhY2tncm91bmQgY29sb3IpLiBPbiBtYWNPUywg dGhpcyBtZWFucyB0aGUgSVBDIGlzIGRpc3BhdGNoZWQgaW5zaWRlCisgICAgICAgIGBUaWxlZENv cmVBbmltYXRpb25EcmF3aW5nQXJlYTo6dXBkYXRlUmVuZGVyaW5nYC4gT24gaU9TLCB0aGUgYENv bG9yYCBpcyBpbmNsdWRlZCBhcyBwYXJ0IG9mCisgICAgICAgIHRoZSBgUmVtb3RlTGF5ZXJUcmVl VHJhbnNhY3Rpb25gLgorCisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJD aHJvbWVDbGllbnQuaDoKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNo cm9tZUNsaWVudC5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkNocm9tZUNsaWVudDo6c2FtcGxl ZFBhZ2VUb3BDb2xvckNoYW5nZWQgY29uc3QpOiBSZW5hbWVkIGZyb20gYGRpZFNhbXBsZVBhZ2VU b3BDb2xvcmAuCisKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oOgorICAg ICAgICAoV2ViS2l0OjpXZWJQYWdlOjpzYW1wbGVkUGFnZVRvcENvbG9yQ2hhbmdlZCk6IEFkZGVk LgorICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcDoKKyAgICAgICAgKFdl YktpdDo6V2ViUGFnZTo6d2lsbENvbW1pdExheWVyVHJlZSk6CisgICAgICAgIChXZWJLaXQ6Oldl YlBhZ2U6OmZsdXNoUGVuZGluZ1NhbXBsZWRQYWdlVG9wQ29sb3JDaGFuZ2UpOiBBZGRlZC4KKyAg ICAgICAgKFdlYktpdDo6V2ViUGFnZTo6ZGlkU2FtcGxlUGFnZVRvcENvbG9yKTogRGVsZXRlZC4K KworICAgICAgICAqIFdlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJh d2luZ0FyZWEubW06CisgICAgICAgIChXZWJLaXQ6OlRpbGVkQ29yZUFuaW1hdGlvbkRyYXdpbmdB cmVhOjp1cGRhdGVSZW5kZXJpbmcpOgorICAgICAgICAqIFNoYXJlZC9SZW1vdGVMYXllclRyZWUv UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24uaDoKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTGF5 ZXJUcmVlVHJhbnNhY3Rpb246OnNhbXBsZWRQYWdlVG9wQ29sb3IgY29uc3QpOiBBZGRlZC4KKyAg ICAgICAgKFdlYktpdDo6UmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OnNldFNhbXBsZWRQYWdl VG9wQ29sb3IpOiBBZGRlZC4KKyAgICAgICAgKiBTaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90 ZUxheWVyVHJlZVRyYW5zYWN0aW9uLm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVMYXllclRy ZWVUcmFuc2FjdGlvbjo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYktpdDo6UmVtb3RlTGF5 ZXJUcmVlVHJhbnNhY3Rpb246OmRlY29kZSk6CisKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFn ZVByb3h5Lm1lc3NhZ2VzLmluOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdlUHJveHkuaDoK KyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZVByb3h5OjpzYW1wbGVkUGFnZVRvcENvbG9yQ2hhbmdlZCk6IFJlbmFtZWQgZnJvbSBg ZGlkU2FtcGxlUGFnZVRvcENvbG9yYC4KKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dlYlBhZ2VQ cm94eUlPUy5tbToKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZVByb3h5OjpkaWRDb21taXRMYXll clRyZWUpOgorCiAyMDIxLTA1LTA1ICBEZWFuIEphY2tzb24gIDxkaW5vQGFwcGxlLmNvbT4KIAog ICAgICAgICBTZXBhcmF0ZWQgbGF5ZXJzIG5lZWQgdG8gYmUgY29uZmlndXJlZApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9E b2N1bWVudC5jcHAKaW5kZXggNmQyNmRjMjU4M2NiNmRjMDc1ZDg2OWE1MGUyM2RjMDM3NzM3NjVm OC4uMGUwZWVjMWU3ZGI3OTc1YzM5MjkwZmE4YTBkNTljNDg4YzIyNGZhYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20v RG9jdW1lbnQuY3BwCkBAIC0zOTEwLDcgKzM5MTAsNyBAQCB2b2lkIERvY3VtZW50OjpkZXRlcm1p bmVTYW1wbGVkUGFnZVRvcENvbG9yKCkKIAogICAgIGF1dG8gbm90aWZ5RGlkU2FtcGxlUGFnZVRv cENvbG9yT25TY29wZUV4aXQgPSBtYWtlU2NvcGVFeGl0KFsmXSB7CiAgICAgICAgIGlmIChhdXRv KiBwYWdlID0gdGhpcy0+cGFnZSgpKQotICAgICAgICAgICAgcGFnZS0+Y2hyb21lKCkuY2xpZW50 KCkuZGlkU2FtcGxlUGFnZVRvcENvbG9yKCk7CisgICAgICAgICAgICBwYWdlLT5jaHJvbWUoKS5j bGllbnQoKS5zYW1wbGVkUGFnZVRvcENvbG9yQ2hhbmdlZCgpOwogICAgIH0pOwogCiAgICAgLy8g RklYTUU6IDxodHRwczovL3dlYmtpdC5vcmcvYi8yMjUxNjc+IChTYW1wbGVkIFBhZ2UgVG9wIENv bG9yOiBob29rIGludG8gcGFpbnRpbmcgbG9naWMgaW5zdGVhZCBvZiB0YWtpbmcgc25hcHNob3Rz KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9DaHJvbWVDbGllbnQuaCBiL1NvdXJj ZS9XZWJDb3JlL3BhZ2UvQ2hyb21lQ2xpZW50LmgKaW5kZXggYmFkOTE3MTg0MTc4OTJmNzhkOTFl MDM5NzRhNzFjYTk4MTQ4YjUwZC4uMjU5YmFlOWFlMGQzYmY0MzIzZTMyNDJmYzg4NmE1MWEzNzhm MmQ3ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGFnZS9DaHJvbWVDbGllbnQuaAorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wYWdlL0Nocm9tZUNsaWVudC5oCkBAIC0yMzMsNyArMjMzLDcgQEAg cHVibGljOgogCiAgICAgdmlydHVhbCB2b2lkIHRoZW1lQ29sb3JDaGFuZ2VkKCkgY29uc3QgeyB9 CiAgICAgdmlydHVhbCB2b2lkIHBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvckRpZENoYW5nZSgp IGNvbnN0IHsgfQotICAgIHZpcnR1YWwgdm9pZCBkaWRTYW1wbGVQYWdlVG9wQ29sb3IoKSBjb25z dCB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgc2FtcGxlZFBhZ2VUb3BDb2xvckNoYW5nZWQoKSBjb25z dCB7IH0KIAogICAgIHZpcnR1YWwgdm9pZCBleGNlZWRlZERhdGFiYXNlUXVvdGEoRnJhbWUmLCBj b25zdCBTdHJpbmcmIGRhdGFiYXNlTmFtZSwgRGF0YWJhc2VEZXRhaWxzKSA9IDA7CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVyVHJlZS9SZW1vdGVMYXllclRy ZWVUcmFuc2FjdGlvbi5oIGIvU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1Jl bW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLmgKaW5kZXggZmRjYzExYTliMzUyMTQ5ZTY0N2Y1NmEz ZTRkNWY2MDcxNzQ1NDQyOS4uOWU2Y2ZkZGFjODliNzc5Yzk2MTIxOWQ4NTc1N2U2ZTBmNGQyMTI3 ZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90 ZUxheWVyVHJlZVRyYW5zYWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3Rl TGF5ZXJUcmVlL1JlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLmgKQEAgLTIzOCw2ICsyMzgsOSBA QCBwdWJsaWM6CiAgICAgV2ViQ29yZTo6Q29sb3IgcGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9y KCkgY29uc3QgeyByZXR1cm4gbV9wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3I7IH0KICAgICB2 b2lkIHNldFBhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcihXZWJDb3JlOjpDb2xvciBjb2xvcikg eyBtX3BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvciA9IGNvbG9yOyB9CiAKKyAgICBXZWJDb3Jl OjpDb2xvciBzYW1wbGVkUGFnZVRvcENvbG9yKCkgY29uc3QgeyByZXR1cm4gbV9zYW1wbGVkUGFn ZVRvcENvbG9yOyB9CisgICAgdm9pZCBzZXRTYW1wbGVkUGFnZVRvcENvbG9yKFdlYkNvcmU6OkNv bG9yIGNvbG9yKSB7IG1fc2FtcGxlZFBhZ2VUb3BDb2xvciA9IGNvbG9yOyB9CisKICAgICBXZWJD b3JlOjpJbnRQb2ludCBzY3JvbGxQb3NpdGlvbigpIGNvbnN0IHsgcmV0dXJuIG1fc2Nyb2xsUG9z aXRpb247IH0KICAgICB2b2lkIHNldFNjcm9sbFBvc2l0aW9uKFdlYkNvcmU6OkludFBvaW50IHAp IHsgbV9zY3JvbGxQb3NpdGlvbiA9IHA7IH0KIApAQCAtMzE3LDYgKzMyMCw3IEBAIHByaXZhdGU6 CiAgICAgV2ViQ29yZTo6SW50UG9pbnQgbV9zY3JvbGxQb3NpdGlvbjsKICAgICBXZWJDb3JlOjpD b2xvciBtX3RoZW1lQ29sb3I7CiAgICAgV2ViQ29yZTo6Q29sb3IgbV9wYWdlRXh0ZW5kZWRCYWNr Z3JvdW5kQ29sb3I7CisgICAgV2ViQ29yZTo6Q29sb3IgbV9zYW1wbGVkUGFnZVRvcENvbG9yOwog ICAgIGRvdWJsZSBtX3BhZ2VTY2FsZUZhY3RvciB7IDEgfTsKICAgICBkb3VibGUgbV9taW5pbXVt U2NhbGVGYWN0b3IgeyAxIH07CiAgICAgZG91YmxlIG1fbWF4aW11bVNjYWxlRmFjdG9yIHsgMSB9 OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5ZXJUcmVlL1JlbW90 ZUxheWVyVHJlZVRyYW5zYWN0aW9uLm1tIGIvU291cmNlL1dlYktpdC9TaGFyZWQvUmVtb3RlTGF5 ZXJUcmVlL1JlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uLm1tCmluZGV4IGFiYWQ5Mjg4ZmUwYzMx MGIzY2RmYzE2Yzg4MWVhZmZhOGFlN2VhYTkuLjZhNmQzNGRkMGFiMmI5MzZkZTc4ZjAwYWRlNWJj YmQ4Nzg0Y2YzZDMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hhcmVkL1JlbW90ZUxheWVy VHJlZS9SZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1No YXJlZC9SZW1vdGVMYXllclRyZWUvUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24ubW0KQEAgLTU5 MCw2ICs1OTAsOCBAQCB2b2lkIFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uOjplbmNvZGUoSVBD OjpFbmNvZGVyJiBlbmNvZGVyKSBjb25zdAogCiAgICAgZW5jb2RlciA8PCBtX3RoZW1lQ29sb3I7 CiAgICAgZW5jb2RlciA8PCBtX3BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvcjsKKyAgICBlbmNv ZGVyIDw8IG1fc2FtcGxlZFBhZ2VUb3BDb2xvcjsKKwogICAgIGVuY29kZXIgPDwgbV9wYWdlU2Nh bGVGYWN0b3I7CiAgICAgZW5jb2RlciA8PCBtX21pbmltdW1TY2FsZUZhY3RvcjsKICAgICBlbmNv ZGVyIDw8IG1fbWF4aW11bVNjYWxlRmFjdG9yOwpAQCAtNjkwLDYgKzY5Miw5IEBAIGJvb2wgUmVt b3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb246OmRlY29kZShJUEM6OkRlY29kZXImIGRlY29kZXIsIFJl bW90ZUxheWVyVHJlZVRyCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQubV9wYWdlRXh0 ZW5kZWRCYWNrZ3JvdW5kQ29sb3IpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAKKyAgICBpZiAo IWRlY29kZXIuZGVjb2RlKHJlc3VsdC5tX3NhbXBsZWRQYWdlVG9wQ29sb3IpKQorICAgICAgICBy ZXR1cm4gZmFsc2U7CisKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5tX3BhZ2VTY2Fs ZUZhY3RvcikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L1dlYlBhZ2VQcm94eS5jcHAKaW5kZXggZTgyZGMxODZmZDZlOTMzZDI0OTAxN2E2MGVmMmZiODE1 YWJjYzZhMi4uNDMxNWE1OGI3ZjBjMjExMDdiNTBjZmVhZDBkMDg5YjhiMjYzODgzYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCkBAIC04NTI5LDcgKzg1MjksNyBA QCB2b2lkIFdlYlBhZ2VQcm94eTo6cGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yRGlkQ2hhbmdl KGNvbnN0IENvbG9yJiBwYWdlRXh0ZW5kZQogICAgIHBhZ2VDbGllbnQoKS5wYWdlRXh0ZW5kZWRC YWNrZ3JvdW5kQ29sb3JEaWRDaGFuZ2UoKTsKIH0KIAotdm9pZCBXZWJQYWdlUHJveHk6OmRpZFNh bXBsZVBhZ2VUb3BDb2xvcihjb25zdCBDb2xvciYgc2FtcGxlZFBhZ2VUb3BDb2xvcikKK3ZvaWQg V2ViUGFnZVByb3h5OjpzYW1wbGVkUGFnZVRvcENvbG9yQ2hhbmdlZChjb25zdCBDb2xvciYgc2Ft cGxlZFBhZ2VUb3BDb2xvcikKIHsKICAgICBpZiAobV9zYW1wbGVkUGFnZVRvcENvbG9yID09IHNh bXBsZWRQYWdlVG9wQ29sb3IpCiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5LmgKaW5kZXggNzIxMjZjZDA1ZTY1OGY1ZjVhMjE2NTQwMjdiOGFkYzY2Y2Vj YjgzOS4uODI3OTM2NmRmOGUzYTdiYzJjZjdiMmE5NWU2ODc1MzVlNTYyNDU5MiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmgKQEAgLTIxMDEsNyArMjEwMSw3IEBAIHByaXZh dGU6CiAgICAgdm9pZCBkaWRDaGFuZ2VQYWdlQ291bnQodW5zaWduZWQpOwogICAgIHZvaWQgdGhl bWVDb2xvckNoYW5nZWQoY29uc3QgV2ViQ29yZTo6Q29sb3ImKTsKICAgICB2b2lkIHBhZ2VFeHRl bmRlZEJhY2tncm91bmRDb2xvckRpZENoYW5nZShjb25zdCBXZWJDb3JlOjpDb2xvciYpOwotICAg IHZvaWQgZGlkU2FtcGxlUGFnZVRvcENvbG9yKGNvbnN0IFdlYkNvcmU6OkNvbG9yJik7CisgICAg dm9pZCBzYW1wbGVkUGFnZVRvcENvbG9yQ2hhbmdlZChjb25zdCBXZWJDb3JlOjpDb2xvciYpOwog I2lmIEVOQUJMRShORVRTQ0FQRV9QTFVHSU5fQVBJKQogICAgIHZvaWQgZGlkRmFpbFRvSW5pdGlh bGl6ZVBsdWdpbihjb25zdCBTdHJpbmcmIG1pbWVUeXBlLCBjb25zdCBTdHJpbmcmIGZyYW1lVVJM U3RyaW5nLCBjb25zdCBTdHJpbmcmIHBhZ2VVUkxTdHJpbmcpOwogICAgIHZvaWQgZGlkQmxvY2tJ bnNlY3VyZVBsdWdpblZlcnNpb24oY29uc3QgU3RyaW5nJiBtaW1lVHlwZSwgY29uc3QgU3RyaW5n JiBwbHVnaW5VUkxTdHJpbmcsIGNvbnN0IFN0cmluZyYgZnJhbWVVUkxTdHJpbmcsIGNvbnN0IFN0 cmluZyYgcGFnZVVSTFN0cmluZywgYm9vbCByZXBsYWNlbWVudE9ic2N1cmVkKTsKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbiBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5tZXNzYWdlcy5pbgppbmRleCA5YWUw ODFjYjFhMmI1YjIzNjFlZjkyNDIxZGEwMDQ2MDBiMDZjNWU1Li5mNGUwODJmYWZiYWJlOTNlMDFl ZTZlM2QwMTllMDNhYjliZjA5NWEyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJQYWdlUHJveHkubWVzc2FnZXMuaW4KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv V2ViUGFnZVByb3h5Lm1lc3NhZ2VzLmluCkBAIC03OSw3ICs3OSw3IEBAIG1lc3NhZ2VzIC0+IFdl YlBhZ2VQcm94eSB7CiAgICAgRGlkQ2hhbmdlUGFnZUNvdW50KHVuc2lnbmVkIHBhZ2VDb3VudCkK ICAgICBUaGVtZUNvbG9yQ2hhbmdlZChXZWJDb3JlOjpDb2xvciB0aGVtZUNvbG9yKQogICAgIFBh Z2VFeHRlbmRlZEJhY2tncm91bmRDb2xvckRpZENoYW5nZShXZWJDb3JlOjpDb2xvciBiYWNrZ3Jv dW5kQ29sb3IpCi0gICAgRGlkU2FtcGxlUGFnZVRvcENvbG9yKFdlYkNvcmU6OkNvbG9yIHNhbXBs ZWRQYWdlVG9wQ29sb3IpCisgICAgU2FtcGxlZFBhZ2VUb3BDb2xvckNoYW5nZWQoV2ViQ29yZTo6 Q29sb3Igc2FtcGxlZFBhZ2VUb3BDb2xvcikKICNpZiBFTkFCTEUoTkVUU0NBUEVfUExVR0lOX0FQ SSkKICAgICBEaWRGYWlsVG9Jbml0aWFsaXplUGx1Z2luKFN0cmluZyBtaW1lVHlwZSwgU3RyaW5n IGZyYW1lVVJMU3RyaW5nLCBTdHJpbmcgcGFnZVVSTFN0cmluZykKICAgICBEaWRCbG9ja0luc2Vj dXJlUGx1Z2luVmVyc2lvbihTdHJpbmcgbWltZVR5cGUsIFN0cmluZyBwbHVnaW5VUkxTdHJpbmcs IFN0cmluZyBmcmFtZVVSTFN0cmluZywgU3RyaW5nIHBhZ2VVUkxTdHJpbmcsIGJvb2wgcmVwbGFj ZW1lbnRPYnNjdXJlZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9X ZWJQYWdlUHJveHlJT1MubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVBy b3h5SU9TLm1tCmluZGV4IDUxYjM3ODY5MjAyZGQzYWIzOWUwOWUxMzY5NmY3ZTEwNmRlYjcxZDAu Ljc3YzgwNmQ0MmExYzE0YmZjMjAwNTgyZmM4ZWNmNzM2NmMzYjgwNWQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW0KKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQpAQCAtMzM5LDYgKzMzOSw3 IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpkaWRDb21taXRMYXllclRyZWUoY29uc3QgV2ViS2l0OjpS ZW1vdGVMYXllclRyZWVUcmFuc2FjdGlvbiYKIHsKICAgICB0aGVtZUNvbG9yQ2hhbmdlZChsYXll clRyZWVUcmFuc2FjdGlvbi50aGVtZUNvbG9yKCkpOwogICAgIHBhZ2VFeHRlbmRlZEJhY2tncm91 bmRDb2xvckRpZENoYW5nZShsYXllclRyZWVUcmFuc2FjdGlvbi5wYWdlRXh0ZW5kZWRCYWNrZ3Jv dW5kQ29sb3IoKSk7CisgICAgc2FtcGxlZFBhZ2VUb3BDb2xvckNoYW5nZWQobGF5ZXJUcmVlVHJh bnNhY3Rpb24uc2FtcGxlZFBhZ2VUb3BDb2xvcigpKTsKIAogICAgIGlmICghbV9oYXNVcGRhdGVk UmVuZGVyaW5nQWZ0ZXJEaWRDb21taXRMb2FkKSB7CiAgICAgICAgIGlmIChsYXllclRyZWVUcmFu c2FjdGlvbi50cmFuc2FjdGlvbklEKCkgPj0gbV9maXJzdExheWVyVHJlZVRyYW5zYWN0aW9uSWRB ZnRlckRpZENvbW1pdExvYWQpIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJvbWVDbGllbnQuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAKaW5kZXggZmM4NmUwZTk1 MWRlMTU5MjQ3YTdhNDhlZmY4OTg5OTYxYzgxZTE3ZC4uOTQ1YjViZGM2ZDZiYjM0OWZlMjIxZTEy NjU1ODQ4NGEwODQzZmE1NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQ cm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9tZUNsaWVudC5jcHAKQEAgLTExNjQsOSArMTE2 NCw5IEBAIHZvaWQgV2ViQ2hyb21lQ2xpZW50OjpwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3JE aWRDaGFuZ2UoKSBjb25zdAogICAgIG1fcGFnZS5wYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3JE aWRDaGFuZ2UoKTsKIH0KIAotdm9pZCBXZWJDaHJvbWVDbGllbnQ6OmRpZFNhbXBsZVBhZ2VUb3BD b2xvcigpIGNvbnN0Cit2b2lkIFdlYkNocm9tZUNsaWVudDo6c2FtcGxlZFBhZ2VUb3BDb2xvckNo YW5nZWQoKSBjb25zdAogewotICAgIG1fcGFnZS5kaWRTYW1wbGVQYWdlVG9wQ29sb3IoKTsKKyAg ICBtX3BhZ2Uuc2FtcGxlZFBhZ2VUb3BDb2xvckNoYW5nZWQoKTsKIH0KIAogdm9pZCBXZWJDaHJv bWVDbGllbnQ6OndoZWVsRXZlbnRIYW5kbGVyc0NoYW5nZWQoYm9vbCBoYXNIYW5kbGVycykKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJDaHJv bWVDbGllbnQuaCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJDb3JlU3VwcG9ydC9XZWJD aHJvbWVDbGllbnQuaAppbmRleCA0ZDRjYTliYjdjYmFmMDgwYWEyY2Q2ZjMxZjlhN2Q1ZjIxMjFh NDU0Li40ZWVmMWY4YWQxYzUyYWMwNTE2NTgyYmExNjE1NWNhZDAxYTE1NTcyIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViQ29yZVN1cHBvcnQvV2ViQ2hyb21lQ2xpZW50 LmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYkNvcmVTdXBwb3J0L1dlYkNocm9t ZUNsaWVudC5oCkBAIC0zMzIsNyArMzMyLDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgdGhlbWVD b2xvckNoYW5nZWQoKSBjb25zdCBmaW5hbDsKICAgICB2b2lkIHBhZ2VFeHRlbmRlZEJhY2tncm91 bmRDb2xvckRpZENoYW5nZSgpIGNvbnN0IGZpbmFsOwotICAgIHZvaWQgZGlkU2FtcGxlUGFnZVRv cENvbG9yKCkgY29uc3QgZmluYWw7CisgICAgdm9pZCBzYW1wbGVkUGFnZVRvcENvbG9yQ2hhbmdl ZCgpIGNvbnN0IGZpbmFsOwogICAgIAogICAgIHZvaWQgd2hlZWxFdmVudEhhbmRsZXJzQ2hhbmdl ZChib29sKSBmaW5hbDsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dl YlBhZ2UvV2ViUGFnZS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQ YWdlLmNwcAppbmRleCA2ZTQxNmY0MzE2MTQ3OWRlOTU1NjA1MmQ1MTg2NDIwYjQ5MWMxNGI5Li5m MmE3YjU2YmQwZDAyZWM3N2I0OTgyNzhiOTA0ZGYwNjM3ZjlkMWVmIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcApAQCAtNDAyNiw2ICs0MDI2LDcgQEAg dm9pZCBXZWJQYWdlOjp3aWxsQ29tbWl0TGF5ZXJUcmVlKFJlbW90ZUxheWVyVHJlZVRyYW5zYWN0 aW9uJiBsYXllclRyYW5zYWN0aW9uKQogICAgIGxheWVyVHJhbnNhY3Rpb24uc2V0UmVuZGVyVHJl ZVNpemUoY29yZVBhZ2UoKS0+cmVuZGVyVHJlZVNpemUoKSk7CiAgICAgbGF5ZXJUcmFuc2FjdGlv bi5zZXRUaGVtZUNvbG9yKGNvcmVQYWdlKCktPnRoZW1lQ29sb3IoKSk7CiAgICAgbGF5ZXJUcmFu c2FjdGlvbi5zZXRQYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3IoY29yZVBhZ2UoKS0+cGFnZUV4 dGVuZGVkQmFja2dyb3VuZENvbG9yKCkpOworICAgIGxheWVyVHJhbnNhY3Rpb24uc2V0U2FtcGxl ZFBhZ2VUb3BDb2xvcihjb3JlUGFnZSgpLT5zYW1wbGVkUGFnZVRvcENvbG9yKCkpOwogCiAgICAg bGF5ZXJUcmFuc2FjdGlvbi5zZXRCYXNlTGF5b3V0Vmlld3BvcnRTaXplKGZyYW1lVmlldy0+YmFz ZUxheW91dFZpZXdwb3J0U2l6ZSgpKTsKICAgICBsYXllclRyYW5zYWN0aW9uLnNldE1pblN0YWJs ZUxheW91dFZpZXdwb3J0T3JpZ2luKGZyYW1lVmlldy0+bWluU3RhYmxlTGF5b3V0Vmlld3BvcnRP cmlnaW4oKSk7CkBAIC00MDU2LDYgKzQwNTcsNyBAQCB2b2lkIFdlYlBhZ2U6OndpbGxDb21taXRM YXllclRyZWUoUmVtb3RlTGF5ZXJUcmVlVHJhbnNhY3Rpb24mIGxheWVyVHJhbnNhY3Rpb24pCiAK ICAgICBtX3BlbmRpbmdUaGVtZUNvbG9yQ2hhbmdlID0gZmFsc2U7CiAgICAgbV9wZW5kaW5nUGFn ZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yQ2hhbmdlID0gZmFsc2U7CisgICAgbV9wZW5kaW5nU2Ft cGxlZFBhZ2VUb3BDb2xvckNoYW5nZSA9IGZhbHNlOwogCiAgICAgaWYgKG1faGFzUGVuZGluZ0Vk aXRvclN0YXRlVXBkYXRlKSB7CiAgICAgICAgIGxheWVyVHJhbnNhY3Rpb24uc2V0RWRpdG9yU3Rh dGUoZWRpdG9yU3RhdGUoKSk7CkBAIC02NDU3LDkgKzY0NTksMTQgQEAgdm9pZCBXZWJQYWdlOjpm bHVzaFBlbmRpbmdQYWdlRXh0ZW5kZWRCYWNrZ3JvdW5kQ29sb3JDaGFuZ2UoKQogICAgIHNlbmQo TWVzc2FnZXM6OldlYlBhZ2VQcm94eTo6UGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yRGlkQ2hh bmdlKG1fcGFnZS0+cGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yKCkpKTsKIH0KIAotdm9pZCBX ZWJQYWdlOjpkaWRTYW1wbGVQYWdlVG9wQ29sb3IoKQordm9pZCBXZWJQYWdlOjpmbHVzaFBlbmRp bmdTYW1wbGVkUGFnZVRvcENvbG9yQ2hhbmdlKCkKIHsKLSAgICBzZW5kKE1lc3NhZ2VzOjpXZWJQ YWdlUHJveHk6OkRpZFNhbXBsZVBhZ2VUb3BDb2xvcihtX3BhZ2UtPnNhbXBsZWRQYWdlVG9wQ29s b3IoKSkpOworICAgIGlmICghbV9wZW5kaW5nU2FtcGxlZFBhZ2VUb3BDb2xvckNoYW5nZSkKKyAg ICAgICAgcmV0dXJuOworCisgICAgbV9wZW5kaW5nU2FtcGxlZFBhZ2VUb3BDb2xvckNoYW5nZSA9 IGZhbHNlOworCisgICAgc2VuZChNZXNzYWdlczo6V2ViUGFnZVByb3h5OjpTYW1wbGVkUGFnZVRv cENvbG9yQ2hhbmdlZChtX3BhZ2UtPnNhbXBsZWRQYWdlVG9wQ29sb3IoKSkpOwogfQogCiB2b2lk IFdlYlBhZ2U6OmZsdXNoUGVuZGluZ0VkaXRvclN0YXRlVXBkYXRlKCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaCBiL1NvdXJjZS9XZWJLaXQv V2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuaAppbmRleCBhYjAyMGZjNDQzZTgwMGYxZDk2ZTdi ZWUyOGNiMzZmZjY5Y2E2YjAwLi45NDU4ZDg1MjhmNjI4OTIyMGNkMTUyZTdkMmEyOTI0NWIwODgy ODgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdl LmgKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5oCkBAIC0x MjQxLDcgKzEyNDEsOCBAQCBwdWJsaWM6CiAgICAgdm9pZCBwYWdlRXh0ZW5kZWRCYWNrZ3JvdW5k Q29sb3JEaWRDaGFuZ2UoKSB7IG1fcGVuZGluZ1BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xvckNo YW5nZSA9IHRydWU7IH0KICAgICB2b2lkIGZsdXNoUGVuZGluZ1BhZ2VFeHRlbmRlZEJhY2tncm91 bmRDb2xvckNoYW5nZSgpOwogCi0gICAgdm9pZCBkaWRTYW1wbGVQYWdlVG9wQ29sb3IoKTsKKyAg ICB2b2lkIHNhbXBsZWRQYWdlVG9wQ29sb3JDaGFuZ2VkKCkgeyBtX3BlbmRpbmdTYW1wbGVkUGFn ZVRvcENvbG9yQ2hhbmdlID0gdHJ1ZTsgfQorICAgIHZvaWQgZmx1c2hQZW5kaW5nU2FtcGxlZFBh Z2VUb3BDb2xvckNoYW5nZSgpOwogCiAgICAgdm9pZCBmbHVzaFBlbmRpbmdFZGl0b3JTdGF0ZVVw ZGF0ZSgpOwogCkBAIC0yMTQzLDYgKzIxNDQsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9oYXNQ ZW5kaW5nSW5wdXRDb250ZXh0VXBkYXRlQWZ0ZXJCbHVycmluZ0FuZFJlZm9jdXNpbmdFbGVtZW50 IHsgZmFsc2UgfTsKICAgICBib29sIG1fcGVuZGluZ1RoZW1lQ29sb3JDaGFuZ2UgeyBmYWxzZSB9 OwogICAgIGJvb2wgbV9wZW5kaW5nUGFnZUV4dGVuZGVkQmFja2dyb3VuZENvbG9yQ2hhbmdlIHsg ZmFsc2UgfTsKKyAgICBib29sIG1fcGVuZGluZ1NhbXBsZWRQYWdlVG9wQ29sb3JDaGFuZ2UgeyBm YWxzZSB9OwogICAgIGJvb2wgbV9oYXNQZW5kaW5nRWRpdG9yU3RhdGVVcGRhdGUgeyBmYWxzZSB9 OwogCiAjaWYgRU5BQkxFKElPU19UT1VDSF9FVkVOVFMpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWEu bW0gYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9tYWMvVGlsZWRDb3JlQW5pbWF0 aW9uRHJhd2luZ0FyZWEubW0KaW5kZXggZTBkNjZiZDcyNjNmYmM4NWJkNThkYWMzOTVjMjU5ZmI3 ZTMwNDVlNy4uY2JkYWRkM2NiZmE0ZjYwOTExNDM4ZWQ4Mzg0ZTg0MDA2ODE4Y2Q4YyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvbWFjL1RpbGVkQ29yZUFuaW1h dGlvbkRyYXdpbmdBcmVhLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdl L21hYy9UaWxlZENvcmVBbmltYXRpb25EcmF3aW5nQXJlYS5tbQpAQCAtNDUxLDYgKzQ1MSw3IEBA IHZvaWQgVGlsZWRDb3JlQW5pbWF0aW9uRHJhd2luZ0FyZWE6OnVwZGF0ZVJlbmRlcmluZyhVcGRh dGVSZW5kZXJpbmdUeXBlIGZsdXNoVHlwCiAgICAgICAgIG1fd2ViUGFnZS51cGRhdGVSZW5kZXJp bmcoKTsKICAgICAgICAgbV93ZWJQYWdlLmZsdXNoUGVuZGluZ1RoZW1lQ29sb3JDaGFuZ2UoKTsK ICAgICAgICAgbV93ZWJQYWdlLmZsdXNoUGVuZGluZ1BhZ2VFeHRlbmRlZEJhY2tncm91bmRDb2xv ckNoYW5nZSgpOworICAgICAgICBtX3dlYlBhZ2UuZmx1c2hQZW5kaW5nU2FtcGxlZFBhZ2VUb3BD b2xvckNoYW5nZSgpOwogICAgICAgICBtX3dlYlBhZ2UuZmx1c2hQZW5kaW5nRWRpdG9yU3RhdGVV cGRhdGUoKTsKICAgICAgICAgbV93ZWJQYWdlLmZsdXNoUGVuZGluZ0ludHJpbnNpY0NvbnRlbnRT aXplVXBkYXRlKCk7CiAK