223662 2021-03-23 16:05:13 -0700 [iOS] Date picker view jumps to center when switching between MobileSafari and another app 2021-03-25 13:22:17 -0700 1 1 1 Unclassified WebKit Forms Other iPhone / iPad Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 akeerthi akeerthi cdumez thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1743054 0 akeerthi 2021-03-23 16:05:13 -0700 ... 1743055 1 akeerthi 2021-03-23 16:05:25 -0700 <rdar://problem/74748727> 1743056 2 424075 akeerthi 2021-03-23 16:07:21 -0700 Created attachment 424075 Patch 1743060 3 424075 wenson_hsieh 2021-03-23 16:22:00 -0700 Comment on attachment 424075 Patch I think this might not work if the focused element is partially occluded (such that the center is covered by another element), but this is kind of already a problem with this approach already (since the last interaction location isn't guaranteed to find the same element anyways). It would probably be better if we used the focused element's ElementContext to make sure we're targeting the same element (or use the element context and grab the information we need from the same focused element). 1743581 4 424193 akeerthi 2021-03-24 15:51:31 -0700 Created attachment 424193 Patch 1743582 5 akeerthi 2021-03-24 15:53:35 -0700 (In reply to Wenson Hsieh from comment #3) > Comment on attachment 424075 [details] > Patch > > I think this might not work if the focused element is partially occluded > (such that the center is covered by another element), but this is kind of > already a problem with this approach already (since the last interaction > location isn't guaranteed to find the same element anyways). > > It would probably be better if we used the focused element's ElementContext > to make sure we're targeting the same element (or use the element context > and grab the information we need from the same focused element). The latest patch uses the information in FocusedElementInformation to present the context menu for form controls, so we don't need to worry about the position information being correct. 1743884 6 424193 thorton 2021-03-25 13:12:57 -0700 Comment on attachment 424193 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=424193&action=review > Source/WebKit/WebProcess/WebPage/ios/WebPageIOS.mm:3080 > +#if ENABLE(ASYNC_SCROLLING) Almost certainly unnecessary in this file but fine :) 1743895 7 ews-feeder 2021-03-25 13:22:15 -0700 Committed r275054: <https://commits.webkit.org/r275054> All reviewed patches have been landed. Closing bug and clearing flags on attachment 424193. 424075 2021-03-23 16:07:21 -0700 2021-03-24 15:51:29 -0700 Patch bug-223662-20210323190719.patch text/plain 3394 akeerthi U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0NjEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDllYmQwOTY2ZTczZDFlZTFj NjAwYmY2NjRmMjdmNTNlMTg3MmRlNTkuLmUwN2Y3YWZlYmZhM2RjZjRiN2I3YjQ3MjBlNGUzOGIx OTU1OTAwOWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAgQEAKKzIwMjEtMDMtMjMgIEFkaXR5YSBL ZWVydGhpICA8YWtlZXJ0aGlAYXBwbGUuY29tPgorCisgICAgICAgIFtpT1NdIERhdGUgcGlja2Vy IHZpZXcganVtcHMgdG8gY2VudGVyIHdoZW4gc3dpdGNoaW5nIGJldHdlZW4gTW9iaWxlU2FmYXJp IGFuZCBhbm90aGVyIGFwcAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MjIzNjYyCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NDc0ODcyNz4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUYXBwaW5nIG9uIGEg ZGF0ZSBpbnB1dCBwcmVzZW50cyBhIFVJRGF0ZVBpY2tlciBpbnNpZGUgb2YgYQorICAgICAgICBV SUNvbnRleHRNZW51SW50ZXJhY3Rpb24uIFRoZSBwcmVzZW50YXRpb24gb2YgY29udGV4dCBtZW51 cyBpcworICAgICAgICBkZXBlbmRlbnQgb24gdGhlIF9wb3NpdGlvbkluZm9ybWF0aW9uIGluIFdL Q29udGVudFZpZXdJbnRlcmFjdGlvbiBiZWluZworICAgICAgICB1cC10by1kYXRlLgorCisgICAg ICAgIFRvIGVuc3VyZSB0aGUgdmFsdWUgaXMgdXAtdG8tZGF0ZSwgYSBwb3NpdGlvbiBpbmZvcm1h dGlvbiByZXF1ZXN0IGlzCisgICAgICAgIG1hZGUgcHJpb3IgdG8gcHJlc2VudGluZyB0aGUgZGF0 ZSBwaWNrZXIuIEhvd2V2ZXIsIHRoZSBsb2NhdGlvbiB1c2VkCisgICAgICAgIGZvciB0aGUgcmVx dWVzdCBpcyB0aGUgY3VycmVudCBGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uJ3MKKyAgICAgICAg bGFzdEludGVyYWN0aW9uTG9jYXRpb24uIFRoaXMgaXMgZmluZSBpbiBtb3N0IGNhc2VzLCBzaW5j ZSB0aGUgZGF0ZQorICAgICAgICBwaWNrZXIgaXMgdXN1YWxseSBwcmVzZW50IGltbWVkaWF0ZWx5 IGFmdGVyIHRhcHBpbmcgb24gdGhlIGRhdGUgaW5wdXQuCisgICAgICAgIEhvd2V2ZXIsIHRoZSBk YXRlIHBpY2tlciBjYW4gYmUgY2xvc2VkIGFuZCBwcmVzZW50ZWQgYWdhaW4gd2hlbgorICAgICAg ICBzd2l0Y2hpbmcgYmV0d2VlbiBNb2JpbGVTYWZhcmkgYW5kIGFub3RoZXIgYXBwLCBhcyB0aGUg aW5wdXQgaXMgZm9jdXNlZAorICAgICAgICBhZ2FpbiB3aGVuIE1vYmlsZVNhZmFyaSBpcyByZW9w ZW5lZC4gSWYgdGhlIHN3aXRjaCBpcyBwZXJmb3JtZWQgdXNpbmcgYQorICAgICAgICBnZXN0dXJl LCB0aGUgbGFzdCBpbnRlcmFjdGlvbiBsb2NhdGlvbiBpcyBtb2RpZmllZC4gQ29uc2VxdWVudGx5 LCB0aGUKKyAgICAgICAgbGFzdCBpbnRlcmFjdGlvbiBsb2NhdGlvbiBkb2VzIG5vdCBhbHdheXMg Y29ycmVzcG9uZCB0byB0aGUgcG9zaXRpb24KKyAgICAgICAgb2YgdGhlIGRhdGUgaW5wdXQsIGFu ZCB0aGUgcG9zaXRpb24gaW5mb3JtYXRpb24gcmVxdWVzdCBnaXZlcyB1cworICAgICAgICBpbmNv cnJlY3QgaW5mb3JtYXRpb24sIGxlYWRpbmcgdG8gaW5jb3JyZWN0IHByZXNlbnRhdGlvbiBvZiB0 aGUgcGlja2VyLgorCisgICAgICAgIFRvIGZpeCwgdXNlIHRoZSBjZW50ZXIgb2YgdGhlIGVsZW1l bnQncyBpbnRlcmFjdGlvblJlY3Qgd2hlbiByZXF1ZXN0aW5nCisgICAgICAgIGEgcG9zaXRpb24g aW5mb3JtYXRpb24gdXBkYXRlLiBUaGlzIGVuc3VyZXMgdGhhdCB0aGUgcG9zaXRpb24gaW5mb3Jt YXRpb24KKyAgICAgICAgY29ycmVzcG9uZHMgdG8gdGhlIGRhdGUgaW5wdXQsIGFuZCBub3QgYW5v dGhlciBlbGVtZW50LgorCisgICAgICAgIE5vIG5ldyB0ZXN0cywgc2luY2UgdGhpcyBidWcgb25s eSByZXByb2R1Y2VzIHdoZW4gc3dpcGluZyB0byBzd2l0Y2ggYXBwcy4KKyAgICAgICAgT3RoZXIg dG91Y2hlcyBpbiB0aGUgd2ViIHZpZXcgaW1tZWRpYXRlbHkgZGlzbWlzcyB0aGUgZGF0ZSBwaWNr ZXIsIG1ha2luZworICAgICAgICB0aGUgYnVnIGRpZmZpY3VsdCB0byByZXByb2R1Y2UgaW4gYSB0 ZXN0LgorCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250 cm9sLm1tOgorICAgICAgICAoLVtXS0RhdGVUaW1lUGlja2VyIGNvbnRyb2xCZWdpbkVkaXRpbmdd KToKKwogMjAyMS0wMy0yMiAgQWRpdHlhIEtlZXJ0aGkgIDxha2VlcnRoaUBhcHBsZS5jb20+CiAK ICAgICAgICAgW2lQYWRPU10gU3RhbGUgY2hlY2tlZCBpdGVtIHdoZW4gcmVvcGVuaW5nIDxzZWxl Y3Q+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tEYXRl VGltZUlucHV0Q29udHJvbC5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9X S0RhdGVUaW1lSW5wdXRDb250cm9sLm1tCmluZGV4IDQyZWRhNDEzZmUzZjBkYWRhZGFmYzMxNzRm NTM4YzE0YTZmZDE0NDkuLjRjZDM3MWZhZTdjZTBiNWJjZTFmMzFhOGE2ZDViNDI1Njk5YWUxMjQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1l SW5wdXRDb250cm9sLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9X S0RhdGVUaW1lSW5wdXRDb250cm9sLm1tCkBAIC00MTUsNyArNDE1LDcgQEAgc3RhdGljIGNvbnN0 IE5TVGltZUludGVydmFsIGtNaWxsaXNlY29uZHNQZXJTZWNvbmQgPSAxMDAwOwogICAgIFtzZWxm IHNldERhdGVUaW1lUGlja2VyVG9Jbml0aWFsVmFsdWVdOwogICAgIAogI2lmIFVTRShVSUNPTlRF WFRNRU5VKQotICAgIFdlYktpdDo6SW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3QgcG9zaXRp b25JbmZvcm1hdGlvblJlcXVlc3QgeyBXZWJDb3JlOjpJbnRQb2ludChfdmlldy5mb2N1c2VkRWxl bWVudEluZm9ybWF0aW9uLmxhc3RJbnRlcmFjdGlvbkxvY2F0aW9uKSB9OworICAgIFdlYktpdDo6 SW50ZXJhY3Rpb25JbmZvcm1hdGlvblJlcXVlc3QgcG9zaXRpb25JbmZvcm1hdGlvblJlcXVlc3Qg eyBfdmlldy5mb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmludGVyYWN0aW9uUmVjdC5jZW50ZXIo KSB9OwogICAgIFtfdmlldyBkb0FmdGVyUG9zaXRpb25JbmZvcm1hdGlvblVwZGF0ZTpeKFdlYktp dDo6SW50ZXJhY3Rpb25JbmZvcm1hdGlvbkF0UG9zaXRpb24gaW50ZXJhY3Rpb25JbmZvcm1hdGlv bikgewogICAgICAgICBbc2VsZiBzaG93RGF0ZVRpbWVQaWNrZXJdOwogICAgIH0gZm9yUmVxdWVz dDpwb3NpdGlvbkluZm9ybWF0aW9uUmVxdWVzdF07Cg== 424193 2021-03-24 15:51:31 -0700 2021-03-25 13:22:16 -0700 Patch bug-223662-20210324185130.patch text/plain 15803 akeerthi U3VidmVyc2lvbiBSZXZpc2lvbjogMjc0OTM4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDRmOGEwZjlkMTA0YTIzMDM4 ZmIwN2M3OWNiZjYxZjA4Nzg4YTRmN2QuLjhlZGMwZDQ5MDg0ZjE5YjU4ZWY2YjUwNGQ3MzQwZjE0 YTBhM2QyZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTAxIEBACisyMDIxLTAzLTI0ICBBZGl0eWEg S2VlcnRoaSAgPGFrZWVydGhpQGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBEYXRlIHBpY2tl ciB2aWV3IGp1bXBzIHRvIGNlbnRlciB3aGVuIHN3aXRjaGluZyBiZXR3ZWVuIE1vYmlsZVNhZmFy aSBhbmQgYW5vdGhlciBhcHAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIyMzY2MgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNzQ3NDg3Mjc+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGFwcGluZyBvbiBh IGRhdGUgaW5wdXQgcHJlc2VudHMgYSBVSURhdGVQaWNrZXIgaW5zaWRlIG9mIGEKKyAgICAgICAg VUlDb250ZXh0TWVudUludGVyYWN0aW9uLiBUaGUgcHJlc2VudGF0aW9uIG9mIGNvbnRleHQgbWVu dXMgaXMKKyAgICAgICAgZGVwZW5kZW50IG9uIHRoZSBfcG9zaXRpb25JbmZvcm1hdGlvbiBpbiBX S0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24gYmVpbmcKKyAgICAgICAgdXAtdG8tZGF0ZS4KKworICAg ICAgICBUbyBlbnN1cmUgdGhlIHZhbHVlIGlzIHVwLXRvLWRhdGUsIGEgcG9zaXRpb24gaW5mb3Jt YXRpb24gcmVxdWVzdCBpcworICAgICAgICBtYWRlIHByaW9yIHRvIHByZXNlbnRpbmcgdGhlIGRh dGUgcGlja2VyLiBIb3dldmVyLCB0aGUgbG9jYXRpb24gdXNlZAorICAgICAgICBmb3IgdGhlIHJl cXVlc3QgaXMgdGhlIGN1cnJlbnQgRm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbidzCisgICAgICAg IGxhc3RJbnRlcmFjdGlvbkxvY2F0aW9uLiBUaGlzIGlzIGZpbmUgaW4gbW9zdCBjYXNlcywgc2lu Y2UgdGhlIGRhdGUKKyAgICAgICAgcGlja2VyIGlzIHVzdWFsbHkgcHJlc2VudCBpbW1lZGlhdGVs eSBhZnRlciB0YXBwaW5nIG9uIHRoZSBkYXRlIGlucHV0LgorICAgICAgICBIb3dldmVyLCB0aGUg ZGF0ZSBwaWNrZXIgY2FuIGJlIGNsb3NlZCBhbmQgcHJlc2VudGVkIGFnYWluIHdoZW4KKyAgICAg ICAgc3dpdGNoaW5nIGJldHdlZW4gTW9iaWxlU2FmYXJpIGFuZCBhbm90aGVyIGFwcCwgYXMgdGhl IGlucHV0IGlzIGZvY3VzZWQKKyAgICAgICAgYWdhaW4gd2hlbiBNb2JpbGVTYWZhcmkgaXMgcmVv cGVuZWQuIElmIHRoZSBzd2l0Y2ggaXMgcGVyZm9ybWVkIHVzaW5nIGEKKyAgICAgICAgZ2VzdHVy ZSwgdGhlIGxhc3QgaW50ZXJhY3Rpb24gbG9jYXRpb24gaXMgbW9kaWZpZWQuIENvbnNlcXVlbnRs eSwgdGhlCisgICAgICAgIGxhc3QgaW50ZXJhY3Rpb24gbG9jYXRpb24gZG9lcyBub3QgYWx3YXlz IGNvcnJlc3BvbmQgdG8gdGhlIHBvc2l0aW9uCisgICAgICAgIG9mIHRoZSBkYXRlIGlucHV0LCBh bmQgdGhlIHBvc2l0aW9uIGluZm9ybWF0aW9uIHJlcXVlc3QgZ2l2ZXMgdXMKKyAgICAgICAgaW5j b3JyZWN0IGluZm9ybWF0aW9uLCBsZWFkaW5nIHRvIGluY29ycmVjdCBwcmVzZW50YXRpb24gb2Yg dGhlIHBpY2tlci4KKworICAgICAgICBUbyBmaXgsIGFkZCBhIG5ldyB3YXkgb2YgcHJlc2VudGlu ZyBjb250ZXh0IG1lbnVzIHRoYXQgaXMgbm90IGRlcGVuZGVudAorICAgICAgICBvbiBwb3NpdGlv biBpbmZvcm1hdGlvbi4gSW5zdGVhZCwgZm9ybSBjb250cm9scyBjYW4gdXNlIHRoZSBpbmZvcm1h dGlvbgorICAgICAgICB0aGV5IGFscmVhZHkgaGF2ZSBpbiBGb2N1c2VkRWxlbWVudEluZm9ybWF0 aW9uIHRvIHByZXNlbnQgdGhlaXIKKyAgICAgICAgcGVyaXBoZXJhbHMuCisKKyAgICAgICAgTm8g bmV3IHRlc3RzLCBzaW5jZSB0aGlzIGJ1ZyBvbmx5IHJlcHJvZHVjZXMgd2hlbiBzd2lwaW5nIHRv IHN3aXRjaCBhcHBzLgorICAgICAgICBPdGhlciB0b3VjaGVzIGluIHRoZSB3ZWIgdmlldyBpbW1l ZGlhdGVseSBkaXNtaXNzIHRoZSBkYXRlIHBpY2tlciwgbWFraW5nCisgICAgICAgIHRoZSBidWcg ZGlmZmljdWx0IHRvIHJlcHJvZHVjZSBpbiBhIHRlc3QuCisKKyAgICAgICAgKiBTaGFyZWQvRm9j dXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OkZvY3VzZWRFbGVt ZW50SW5mb3JtYXRpb246OmVuY29kZSBjb25zdCk6CisgICAgICAgIChXZWJLaXQ6OkZvY3VzZWRF bGVtZW50SW5mb3JtYXRpb246OmRlY29kZSk6CisgICAgICAgICogU2hhcmVkL0ZvY3VzZWRFbGVt ZW50SW5mb3JtYXRpb24uaDoKKworICAgICAgICBBZGRlZCBhIG1lbWJlciB0byBpbmZvcm0gRm9j dXNlZEVsZW1lbnRJbmZvcm1hdGlvbiB3aGV0aGVyIHRoZSBmb2N1c2VkCisgICAgICAgIGVsZW1l bnQgaXMgaW4gYSBzdWJzY3JvbGxhYmxlIHJlZ2lvbi4KKworICAgICAgICBTZWUgcjI0ODQ0NyBm b3IgbW9yZSBkZXRhaWxzIG9uIHdoeSB0aGlzIGluZm9ybWF0aW9uIGlzIG5lZWRlZCB3aGVuCisg ICAgICAgIGNyZWF0aW5nIGEgVUlUYXJnZXRlZFByZXZpZXcuCisKKyAgICAgICAgKiBVSVByb2Nl c3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tOgorICAgICAgICAoLVtXS0NvbnRlbnRWaWV3 IG92ZXJyaWRlUG9zaXRpb25UcmFja2luZ1ZpZXdGb3JUYXJnZXRlZFByZXZpZXdJZk5lY2Vzc2Fy eTpjb250YWluZXJTY3JvbGxpbmdOb2RlSUQ6XSk6CisKKyAgICAgICAgRmFjdG9yZWQgb3V0IHRo ZSBsb2dpYyB0aGF0IG92ZXJyaWRlcyB0aGUgdGFyZ2V0ZWQgcHJldmlldydzIHBvc2l0aW9uCisg ICAgICAgIHRyYWNraW5nIHZpZXcgd2hlbiB0aGUgZWxlbWVudCBpcyBpbiBhIHN1YnNjcm9sbGFi bGUgcmVnaW9uLgorCisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2NyZWF0ZVRhcmdldGVkQ29u dGV4dE1lbnVIaW50UHJldmlld0ZvckZvY3VzZWRFbGVtZW50XSk6CisKKyAgICAgICAgQ3JlYXRl IGEgdGFyZ2V0ZWQgcHJldmlldyB1c2luZyB0aGUgY3VycmVudCBGb2N1c2VkRWxlbWVudEluZm9y bWF0aW9uLgorCisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2NyZWF0ZVRhcmdldGVkQ29udGV4 dE1lbnVIaW50UHJldmlld0lmUG9zc2libGVdKToKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL2Zv cm1zL1dLRGF0ZVRpbWVJbnB1dENvbnRyb2wubW06CisgICAgICAgICgtW1dLRGF0ZVRpbWVQaWNr ZXIgY29udHJvbEJlZ2luRWRpdGluZ10pOgorCisgICAgICAgIERpc3BsYXlpbmcgdGhlIGNvbnRl eHQgbWVudSBubyBsb25nZXIgbmVlZHMgdG8gYmUgZG9uZSBhc3luY2hyb25vdXNseQorICAgICAg ICBzaW5jZSB0aGUgRm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbiBpcyBhbHJlYWR5IGF2YWlsYWJs ZSBkdXJpbmcKKyAgICAgICAgY29udHJvbEJlZ2luRWRpdGluZy4KKworICAgICAgICAqIFVJUHJv Y2Vzcy9pb3MvZm9ybXMvV0tGb3JtU2VsZWN0UGlja2VyLm1tOgorCisgICAgICAgIEFkb3B0IHRo ZSBuZXcgbG9naWMgZm9yIDxzZWxlY3Q+IGVsZW1lbnRzLCBzaW5jZSB0aGUgcHJlc2VudGVkIGNv bnRleHQKKyAgICAgICAgbWVudSBpcyBhbiBpbnB1dCBwZXJpcGhlcmFsLCBhbmQgY2FuIHJ1biBp bnRvIHRoZSBzYW1lIGlzc3VlcyBhcyB0aGUKKyAgICAgICAgZGF0ZSBwaWNrZXIuCisKKyAgICAg ICAgKC1bV0tTZWxlY3RQaWNrZXIgY29udHJvbEJlZ2luRWRpdGluZ10pOgorICAgICAgICAoLVtX S1NlbGVjdFBpY2tlciBjb250ZXh0TWVudUludGVyYWN0aW9uOnByZXZpZXdGb3JIaWdobGlnaHRp bmdNZW51V2l0aENvbmZpZ3VyYXRpb246XSk6CisgICAgICAgICogV2ViUHJvY2Vzcy9XZWJQYWdl L2lvcy9XZWJQYWdlSU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlOjpjb21wbGV0ZVN5 bnRoZXRpY0NsaWNrKToKKworICAgICAgICBSZW1vdmUgYSByZWR1bmRhbnQgY2FsbCB0byBlbGVt ZW50RGlkUmVmb2N1cyBmb2xsb3dpbmcgcjI1ODMzMy4gVGhlCisgICAgICAgIEZvY3VzQ29udHJv bGxlciBhbHJlYWR5IGNhbGxzIGVsZW1lbnREaWRSZWZvY3VzIGJlZm9yZSB0aGlzIHBvaW50LCB3 aGVuCisgICAgICAgIHRoZSBtb3VzZXByZXNzIGV2ZW50IGlzIGRpc3BhdGNoZWQuCisKKyAgICAg ICAgVGhlIHJlZHVuZGFudCBjYWxsIHdhcyB1bmNvdmVyZWQgd2hlbiBtYWtpbmcgdGhlIGNvbnRl eHQgbWVudQorICAgICAgICBwcmVzZW50YXRpb24gc3luY2hyb25vdXMsIGFuZCBjYXVzZXMgcHJv YmxlbXMgd2l0aCB0aGUgcHJlc2VudGF0aW9uLgorICAgICAgICBTcGVjaWZpY2FsbHksIHRoZSBm aXJzdCBjYWxsIHRvIGVsZW1lbnREaWRSZWZvY3VzIGNhdXNlcyB0aGUgY29udGV4dAorICAgICAg ICBtZW51IHRvIGJlIHByZXNlbnRlZC4gVGhlIHNlY29uZCBjYWxsIHRoZW4gcmVzdWx0cyBpbiBh biBhdHRlbXB0CisgICAgICAgIHRvIHNjcm9sbCB0aGUgd2ViIHZpZXcsIHNpbmNlIHRoZSBjb250 ZXh0IG1lbnUgY2FuIG9ic2N1cmUgdGhlCisgICAgICAgIGFzc2lzdGVkIG5vZGUuIFRoZSBhZGRp dGlvbmFsIHNjcm9sbGluZyBpcyB1bndhbnRlZCBiZWhhdmlvciwgc2luY2UgaXQKKyAgICAgICAg ZG9lcyBub3Qgb2NjdXIgd2hlbiBmb2N1c2luZyB0aGUgbm9kZSBmb3IgdGhlIGZpcnN0IHRpbWUu CisKKyAgICAgICAgVGhpcyBpc3N1ZSB3YXMgcHJldmlvdXNseSB1bm9ic2VydmVkLCBzaW5jZSB0 aGUgYXN5bmNocm9ub3VzIHByZXNlbnRhdGlvbgorICAgICAgICBvZiB0aGUgY29udGV4dCBtZW51 IChhZnRlciBvYnRhaW5pbmcgbmV3IHBvc2l0aW9uIGluZm9ybWF0aW9uKSByZXN1bHRlZAorICAg ICAgICBpbiBib3RoIGNhbGxzIHRvIGVsZW1lbnREaWRSZWZvY3VzIG9jY3VyaW5nIGJlZm9yZSBw cmVzZW50YXRpb24uCisKKyAgICAgICAgKFdlYktpdDo6V2ViUGFnZTo6Z2V0Rm9jdXNlZEVsZW1l bnRJbmZvcm1hdGlvbik6CisKKyAgICAgICAgRm9yd2FyZCB0aGUgc2Nyb2xsaW5nIG5vZGUgaW5m b3JtYXRpb24gdG8gdGhlIFVJUHJvY2Vzcywgc28gdGhhdCB0aGUKKyAgICAgICAgcG9zaXRpb24g dHJhY2tpbmcgdmlldyBvZiB0aGUgVUlUYXJnZXRlZFByZXZpZXcgY2FuIGJlIG92ZXJyaWRkZW4K KyAgICAgICAgaWYgbmVjZXNzYXJ5LgorCiAyMDIxLTAzLTI0ICBQZXIgQXJuZSAgPHB2b2xsYW5A YXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBJT0tpdCBtZXRob2QgZmlsdGVyIHRlbGVtZXRyeQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvRm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlv bi5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmNw cAppbmRleCA2OTBlMjg2MGYxNzJiODYxZmJhMjM3Yzg0NDYxMDU5OWJiNjAwYjc3Li5iMzlmM2Y1 NjUyY2NhNmQ4M2VmMDJlY2NjZDEwMGVmYjdlZjUyODQxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0L1NoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmNwcApAQCAtOTksNiArOTksNyBA QCB2b2lkIEZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb246OmVuY29kZShJUEM6OkVuY29kZXImIGVu Y29kZXIpIGNvbnN0CiAgICAgZW5jb2RlciA8PCBsYWJlbDsKICAgICBlbmNvZGVyIDw8IGFyaWFM YWJlbDsKICAgICBlbmNvZGVyIDw8IGZvY3VzZWRFbGVtZW50SWRlbnRpZmllcjsKKyAgICBlbmNv ZGVyIDw8IGNvbnRhaW5lclNjcm9sbGluZ05vZGVJRDsKICNpZiBFTkFCTEUoREFUQUxJU1RfRUxF TUVOVCkKICAgICBlbmNvZGVyIDw8IGhhc1N1Z2dlc3Rpb25zOwogICAgIGVuY29kZXIgPDwgaXNG b2N1c2luZ1dpdGhEYXRhTGlzdERyb3Bkb3duOwpAQCAtMjI1LDYgKzIyNiw5IEBAIGJvb2wgRm9j dXNlZEVsZW1lbnRJbmZvcm1hdGlvbjo6ZGVjb2RlKElQQzo6RGVjb2RlciYgZGVjb2RlciwgRm9j dXNlZEVsZW1lbnRJbmZvCiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQuZm9jdXNlZEVs ZW1lbnRJZGVudGlmaWVyKSkKICAgICAgICAgcmV0dXJuIGZhbHNlOwogCisgICAgaWYgKCFkZWNv ZGVyLmRlY29kZShyZXN1bHQuY29udGFpbmVyU2Nyb2xsaW5nTm9kZUlEKSkKKyAgICAgICAgcmV0 dXJuIGZhbHNlOworCiAjaWYgRU5BQkxFKERBVEFMSVNUX0VMRU1FTlQpCiAgICAgaWYgKCFkZWNv ZGVyLmRlY29kZShyZXN1bHQuaGFzU3VnZ2VzdGlvbnMpKQogICAgICAgICByZXR1cm4gZmFsc2U7 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9ybWF0 aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9Gb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uLmgK aW5kZXggZDllZWU4Y2I4MTExODhmZWQ0MzU1YzgxNDY2Zjk1ODg5NWI0YTRlZS4uOWQwMTY0OWRl Mjk1ODU5YjIyMzAxMjk3Yzg1YmJjMTkyZmNlZjQ3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktp dC9TaGFyZWQvRm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5oCisrKyBiL1NvdXJjZS9XZWJLaXQv U2hhcmVkL0ZvY3VzZWRFbGVtZW50SW5mb3JtYXRpb24uaApAQCAtMTQxLDYgKzE0MSw3IEBAIHN0 cnVjdCBGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uIHsKICAgICBib29sIGlzRm9jdXNpbmdXaXRo VmFsaWRhdGlvbk1lc3NhZ2UgeyBmYWxzZSB9OwogCiAgICAgRm9jdXNlZEVsZW1lbnRJZGVudGlm aWVyIGZvY3VzZWRFbGVtZW50SWRlbnRpZmllciB7IDAgfTsKKyAgICBXZWJDb3JlOjpTY3JvbGxp bmdOb2RlSUQgY29udGFpbmVyU2Nyb2xsaW5nTm9kZUlEIHsgMCB9OwogCiAgICAgdm9pZCBlbmNv ZGUoSVBDOjpFbmNvZGVyJikgY29uc3Q7CiAgICAgc3RhdGljIFdBUk5fVU5VU0VEX1JFVFVSTiBi b29sIGRlY29kZShJUEM6OkRlY29kZXImLCBGb2N1c2VkRWxlbWVudEluZm9ybWF0aW9uJik7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVy YWN0aW9uLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVy YWN0aW9uLmgKaW5kZXggZjI0NjNmNDY2NTIzNTliYTU2OGUxNTk3NDMyMzk4ZTk1MmFiOTJmZC4u OGYyMGJmZTExNWY1M2IzNmE0NDA1ZTkwNjliNzBkODE4MmViYmFmOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5oCisrKyBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24uaApA QCAtNjcyLDYgKzY3Miw3IEBAIEZPUl9FQUNIX1BSSVZBVEVfV0tDT05URU5UVklFV19BQ1RJT04o REVDTEFSRV9XS0NPTlRFTlRWSUVXX0FDVElPTl9GT1JfV0VCX1ZJRVcpCiAtICh2b2lkKXNldENv bnRpbnVvdXNTcGVsbENoZWNraW5nRW5hYmxlZDooQk9PTCllbmFibGVkOwogCiAjaWYgVVNFKFVJ Q09OVEVYVE1FTlUpCistIChVSVRhcmdldGVkUHJldmlldyAqKV9jcmVhdGVUYXJnZXRlZENvbnRl eHRNZW51SGludFByZXZpZXdGb3JGb2N1c2VkRWxlbWVudDsKIC0gKFVJVGFyZ2V0ZWRQcmV2aWV3 ICopX2NyZWF0ZVRhcmdldGVkQ29udGV4dE1lbnVIaW50UHJldmlld0lmUG9zc2libGU7CiAtICh2 b2lkKV9yZW1vdmVDb250ZXh0TWVudVZpZXdJZlBvc3NpYmxlOwogI2VuZGlmCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1t IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXdJbnRlcmFjdGlvbi5t bQppbmRleCAwNWEyZTkxNTRiNzc5ZDZmNTFmYmZiMDM0OTFlMWY5NzFkYzJhODJlLi5iZDcxNjFj NzE1MWE2N2FmNzg1ZDYyMGU3NzI2ZmU3NTBkYjg3ZTk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlld0ludGVyYWN0aW9uLm1tCisrKyBiL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0NvbnRlbnRWaWV3SW50ZXJhY3Rpb24ubW0KQEAgLTgy MzgsNiArODIzOCwyOSBAQCBzdGF0aWMgUmV0YWluUHRyPFVJVGFyZ2V0ZWRQcmV2aWV3PiBjcmVh dGVGYWxsYmFja1RhcmdldGVkUHJldmlldyhVSVZpZXcgKnJvb3RWaQogICAgIHJldHVybiBhZG9w dE5TKFtbVUlUYXJnZXRlZFByZXZpZXcgYWxsb2NdIGluaXRXaXRoVmlldzpzbmFwc2hvdFZpZXcg cGFyYW1ldGVyczpwYXJhbWV0ZXJzLmdldCgpIHRhcmdldDp0YXJnZXQuZ2V0KCldKTsKIH0KIAor LSAodm9pZClvdmVycmlkZVBvc2l0aW9uVHJhY2tpbmdWaWV3Rm9yVGFyZ2V0ZWRQcmV2aWV3SWZO ZWNlc3Nhcnk6KFVJVGFyZ2V0ZWRQcmV2aWV3ICopdGFyZ2V0ZWRQcmV2aWV3IGNvbnRhaW5lclNj cm9sbGluZ05vZGVJRDooV2ViQ29yZTo6U2Nyb2xsaW5nTm9kZUlEKXNjcm9sbGluZ05vZGVJRAor eworICAgIGlmICghc2Nyb2xsaW5nTm9kZUlEKQorICAgICAgICByZXR1cm47CisKKyAgICBVSVNj cm9sbFZpZXcgKnBvc2l0aW9uVHJhY2tpbmdWaWV3ID0gc2VsZi53ZWJWaWV3LnNjcm9sbFZpZXc7 CisgICAgaWYgKGF1dG8qIHNjcm9sbGluZ0Nvb3JkaW5hdG9yID0gX3BhZ2UtPnNjcm9sbGluZ0Nv b3JkaW5hdG9yUHJveHkoKSkKKyAgICAgICAgcG9zaXRpb25UcmFja2luZ1ZpZXcgPSBzY3JvbGxp bmdDb29yZGluYXRvci0+c2Nyb2xsVmlld0ZvclNjcm9sbGluZ05vZGVJRChzY3JvbGxpbmdOb2Rl SUQpOworCisgICAgaWYgKFt0YXJnZXRlZFByZXZpZXcgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxl Y3Rvcihfc2V0T3ZlcnJpZGVQb3NpdGlvblRyYWNraW5nVmlldzopXSkKKyAgICAgICAgW3Rhcmdl dGVkUHJldmlldyBfc2V0T3ZlcnJpZGVQb3NpdGlvblRyYWNraW5nVmlldzpwb3NpdGlvblRyYWNr aW5nVmlld107Cit9CisKKy0gKFVJVGFyZ2V0ZWRQcmV2aWV3ICopX2NyZWF0ZVRhcmdldGVkQ29u dGV4dE1lbnVIaW50UHJldmlld0ZvckZvY3VzZWRFbGVtZW50Cit7CisgICAgUmV0YWluUHRyPFVJ VGFyZ2V0ZWRQcmV2aWV3PiB0YXJnZXRlZFByZXZpZXcgPSBjcmVhdGVGYWxsYmFja1RhcmdldGVk UHJldmlldyhzZWxmLCBzZWxmLmNvbnRhaW5lckZvckNvbnRleHRNZW51SGludFByZXZpZXdzLCBf Zm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5pbnRlcmFjdGlvblJlY3QpOworCisgICAgW3NlbGYg b3ZlcnJpZGVQb3NpdGlvblRyYWNraW5nVmlld0ZvclRhcmdldGVkUHJldmlld0lmTmVjZXNzYXJ5 OnRhcmdldGVkUHJldmlldy5nZXQoKSBjb250YWluZXJTY3JvbGxpbmdOb2RlSUQ6X2ZvY3VzZWRF bGVtZW50SW5mb3JtYXRpb24uY29udGFpbmVyU2Nyb2xsaW5nTm9kZUlEXTsKKworICAgIF9jb250 ZXh0TWVudUludGVyYWN0aW9uVGFyZ2V0ZWRQcmV2aWV3ID0gV1RGTW92ZSh0YXJnZXRlZFByZXZp ZXcpOworICAgIHJldHVybiBfY29udGV4dE1lbnVJbnRlcmFjdGlvblRhcmdldGVkUHJldmlldy5n ZXQoKTsKK30KKwogLSAoVUlUYXJnZXRlZFByZXZpZXcgKilfY3JlYXRlVGFyZ2V0ZWRDb250ZXh0 TWVudUhpbnRQcmV2aWV3SWZQb3NzaWJsZQogewogICAgIFJldGFpblB0cjxVSVRhcmdldGVkUHJl dmlldz4gdGFyZ2V0ZWRQcmV2aWV3OwpAQCAtODI1NSwxNCArODI3OCw3IEBAIHN0YXRpYyBSZXRh aW5QdHI8VUlUYXJnZXRlZFByZXZpZXc+IGNyZWF0ZUZhbGxiYWNrVGFyZ2V0ZWRQcmV2aWV3KFVJ VmlldyAqcm9vdFZpCiAgICAgaWYgKCF0YXJnZXRlZFByZXZpZXcpCiAgICAgICAgIHRhcmdldGVk UHJldmlldyA9IGNyZWF0ZUZhbGxiYWNrVGFyZ2V0ZWRQcmV2aWV3KHNlbGYsIHNlbGYuY29udGFp bmVyRm9yQ29udGV4dE1lbnVIaW50UHJldmlld3MsIF9wb3NpdGlvbkluZm9ybWF0aW9uLmJvdW5k cyk7CiAKLSAgICBpZiAoX3Bvc2l0aW9uSW5mb3JtYXRpb24uY29udGFpbmVyU2Nyb2xsaW5nTm9k ZUlEKSB7Ci0gICAgICAgIFVJU2Nyb2xsVmlldyAqcG9zaXRpb25UcmFja2luZ1ZpZXcgPSBzZWxm LndlYlZpZXcuc2Nyb2xsVmlldzsKLSAgICAgICAgaWYgKGF1dG8qIHNjcm9sbGluZ0Nvb3JkaW5h dG9yID0gX3BhZ2UtPnNjcm9sbGluZ0Nvb3JkaW5hdG9yUHJveHkoKSkKLSAgICAgICAgICAgIHBv c2l0aW9uVHJhY2tpbmdWaWV3ID0gc2Nyb2xsaW5nQ29vcmRpbmF0b3ItPnNjcm9sbFZpZXdGb3JT Y3JvbGxpbmdOb2RlSUQoX3Bvc2l0aW9uSW5mb3JtYXRpb24uY29udGFpbmVyU2Nyb2xsaW5nTm9k ZUlEKTsKLQotICAgICAgICBpZiAoW3RhcmdldGVkUHJldmlldyByZXNwb25kc1RvU2VsZWN0b3I6 QHNlbGVjdG9yKF9zZXRPdmVycmlkZVBvc2l0aW9uVHJhY2tpbmdWaWV3OildKQotICAgICAgICAg ICAgW3RhcmdldGVkUHJldmlldyBfc2V0T3ZlcnJpZGVQb3NpdGlvblRyYWNraW5nVmlldzpwb3Np dGlvblRyYWNraW5nVmlld107Ci0gICAgfQorICAgIFtzZWxmIG92ZXJyaWRlUG9zaXRpb25UcmFj a2luZ1ZpZXdGb3JUYXJnZXRlZFByZXZpZXdJZk5lY2Vzc2FyeTp0YXJnZXRlZFByZXZpZXcuZ2V0 KCkgY29udGFpbmVyU2Nyb2xsaW5nTm9kZUlEOl9wb3NpdGlvbkluZm9ybWF0aW9uLmNvbnRhaW5l clNjcm9sbGluZ05vZGVJRF07CiAKICAgICBfY29udGV4dE1lbnVJbnRlcmFjdGlvblRhcmdldGVk UHJldmlldyA9IFdURk1vdmUodGFyZ2V0ZWRQcmV2aWV3KTsKICAgICByZXR1cm4gX2NvbnRleHRN ZW51SW50ZXJhY3Rpb25UYXJnZXRlZFByZXZpZXcuZ2V0KCk7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMvV0tEYXRlVGltZUlucHV0Q29udHJvbC5tbSBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1t CmluZGV4IDQyZWRhNDEzZmUzZjBkYWRhZGFmYzMxNzRmNTM4YzE0YTZmZDE0NDkuLmU1ZjRhMzRk MWYzZDdlZGRhNjBmYzgyNWJmZDBlNGE5YTgyZGI4OTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1tCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0RhdGVUaW1lSW5wdXRDb250cm9sLm1t CkBAIC0xNTIsNyArMTUyLDcgQEAgc3RhdGljIGNvbnN0IE5TVGltZUludGVydmFsIGtNaWxsaXNl Y29uZHNQZXJTZWNvbmQgPSAxMDAwOwogCiAtIChVSVRhcmdldGVkUHJldmlldyAqKWNvbnRleHRN ZW51SW50ZXJhY3Rpb246KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbiAqKWludGVyYWN0aW9uIHBy ZXZpZXdGb3JIaWdobGlnaHRpbmdNZW51V2l0aENvbmZpZ3VyYXRpb246KFVJQ29udGV4dE1lbnVD b25maWd1cmF0aW9uICopY29uZmlndXJhdGlvbgogewotICAgIHJldHVybiBbX3ZpZXcgX2NyZWF0 ZVRhcmdldGVkQ29udGV4dE1lbnVIaW50UHJldmlld0lmUG9zc2libGVdOworICAgIHJldHVybiBb X3ZpZXcgX2NyZWF0ZVRhcmdldGVkQ29udGV4dE1lbnVIaW50UHJldmlld0ZvckZvY3VzZWRFbGVt ZW50XTsKIH0KIAogLSAoX1VJQ29udGV4dE1lbnVTdHlsZSAqKV9jb250ZXh0TWVudUludGVyYWN0 aW9uOihVSUNvbnRleHRNZW51SW50ZXJhY3Rpb24gKilpbnRlcmFjdGlvbiBzdHlsZUZvck1lbnVX aXRoQ29uZmlndXJhdGlvbjooVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gKiljb25maWd1cmF0 aW9uCkBAIC00MTMsMTQgKzQxMywxMCBAQCBzdGF0aWMgY29uc3QgTlNUaW1lSW50ZXJ2YWwga01p bGxpc2Vjb25kc1BlclNlY29uZCA9IDEwMDA7CiAgICAgX2luaXRpYWxWYWx1ZSA9IF92aWV3LmZv Y3VzZWRFbGVtZW50SW5mb3JtYXRpb24udmFsdWU7CiAgICAgX2luaXRpYWxWYWx1ZUFzTnVtYmVy ID0gX3ZpZXcuZm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi52YWx1ZUFzTnVtYmVyOwogICAgIFtz ZWxmIHNldERhdGVUaW1lUGlja2VyVG9Jbml0aWFsVmFsdWVdOwotICAgIAorCiAjaWYgVVNFKFVJ Q09OVEVYVE1FTlUpCi0gICAgV2ViS2l0OjpJbnRlcmFjdGlvbkluZm9ybWF0aW9uUmVxdWVzdCBw b3NpdGlvbkluZm9ybWF0aW9uUmVxdWVzdCB7IFdlYkNvcmU6OkludFBvaW50KF92aWV3LmZvY3Vz ZWRFbGVtZW50SW5mb3JtYXRpb24ubGFzdEludGVyYWN0aW9uTG9jYXRpb24pIH07Ci0gICAgW192 aWV3IGRvQWZ0ZXJQb3NpdGlvbkluZm9ybWF0aW9uVXBkYXRlOl4oV2ViS2l0OjpJbnRlcmFjdGlv bkluZm9ybWF0aW9uQXRQb3NpdGlvbiBpbnRlcmFjdGlvbkluZm9ybWF0aW9uKSB7Ci0gICAgICAg IFtzZWxmIHNob3dEYXRlVGltZVBpY2tlcl07Ci0gICAgfSBmb3JSZXF1ZXN0OnBvc2l0aW9uSW5m b3JtYXRpb25SZXF1ZXN0XTsKKyAgICBbc2VsZiBzaG93RGF0ZVRpbWVQaWNrZXJdOwogI2VuZGlm Ci0KIH0KIAogLSAodm9pZClzZXRIb3VyOihOU0ludGVnZXIpaG91ciBtaW51dGU6KE5TSW50ZWdl ciltaW51dGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9X S0Zvcm1TZWxlY3RQaWNrZXIubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvZm9ybXMv V0tGb3JtU2VsZWN0UGlja2VyLm1tCmluZGV4IGZjMmM1YzAyMjdjMmQxZmQ5YTNiMTM3NTM0YjJl Nzk2YTY5OGJiN2QuLjcyYzA3ZWIxM2M0MTJhNGI0OWU5YjkyMmQ3MDUwNzE3N2RhYzczNGIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9mb3Jtcy9XS0Zvcm1TZWxlY3RQ aWNrZXIubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL2Zvcm1zL1dLRm9ybVNl bGVjdFBpY2tlci5tbQpAQCAtNTA1LDExICs1MDUsNyBAQCBzdGF0aWMgY29uc3QgZmxvYXQgR3Jv dXBPcHRpb25UZXh0Q29sb3JBbHBoYSA9IDAuNTsKIAogI2lmIFVTRShVSUNPTlRFWFRNRU5VKQog ICAgIF9zZWxlY3RNZW51ID0gW3NlbGYgY3JlYXRlTWVudV07Ci0KLSAgICBXZWJLaXQ6OkludGVy YWN0aW9uSW5mb3JtYXRpb25SZXF1ZXN0IHBvc2l0aW9uSW5mb3JtYXRpb25SZXF1ZXN0IHsgV2Vi Q29yZTo6SW50UG9pbnQoX3ZpZXcuZm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbi5sYXN0SW50ZXJh Y3Rpb25Mb2NhdGlvbikgfTsKLSAgICBbX3ZpZXcgZG9BZnRlclBvc2l0aW9uSW5mb3JtYXRpb25V cGRhdGU6XihXZWJLaXQ6OkludGVyYWN0aW9uSW5mb3JtYXRpb25BdFBvc2l0aW9uIGludGVyYWN0 aW9uSW5mb3JtYXRpb24pIHsKLSAgICAgICAgW3NlbGYgc2hvd1NlbGVjdFBpY2tlcl07Ci0gICAg fSBmb3JSZXF1ZXN0OnBvc2l0aW9uSW5mb3JtYXRpb25SZXF1ZXN0XTsKKyAgICBbc2VsZiBzaG93 U2VsZWN0UGlja2VyXTsKICNlbmRpZgogfQogCkBAIC02MzEsNyArNjI3LDcgQEAgc3RhdGljIGNv bnN0IGZsb2F0IEdyb3VwT3B0aW9uVGV4dENvbG9yQWxwaGEgPSAwLjU7CiAKIC0gKFVJVGFyZ2V0 ZWRQcmV2aWV3ICopY29udGV4dE1lbnVJbnRlcmFjdGlvbjooVUlDb250ZXh0TWVudUludGVyYWN0 aW9uICopaW50ZXJhY3Rpb24gcHJldmlld0ZvckhpZ2hsaWdodGluZ01lbnVXaXRoQ29uZmlndXJh dGlvbjooVUlDb250ZXh0TWVudUNvbmZpZ3VyYXRpb24gKiljb25maWd1cmF0aW9uCiB7Ci0gICAg cmV0dXJuIFtfdmlldyBfY3JlYXRlVGFyZ2V0ZWRDb250ZXh0TWVudUhpbnRQcmV2aWV3SWZQb3Nz aWJsZV07CisgICAgcmV0dXJuIFtfdmlldyBfY3JlYXRlVGFyZ2V0ZWRDb250ZXh0TWVudUhpbnRQ cmV2aWV3Rm9yRm9jdXNlZEVsZW1lbnRdOwogfQogCiAtIChfVUlDb250ZXh0TWVudVN0eWxlICop X2NvbnRleHRNZW51SW50ZXJhY3Rpb246KFVJQ29udGV4dE1lbnVJbnRlcmFjdGlvbiAqKWludGVy YWN0aW9uIHN0eWxlRm9yTWVudVdpdGhDb25maWd1cmF0aW9uOihVSUNvbnRleHRNZW51Q29uZmln dXJhdGlvbiAqKWNvbmZpZ3VyYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJv Y2Vzcy9XZWJQYWdlL2lvcy9XZWJQYWdlSU9TLm1tIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L1dlYlBhZ2UvaW9zL1dlYlBhZ2VJT1MubW0KaW5kZXggMzNiODUxMjk2Njk0ZmZiNzA5MTA0NjBm YTY3YTgyMjMzYTE1N2I3NS4uOTJiZjdkN2Q1OTkyN2FmNzA5MDUyODE4MzIxYTBmMjAyY2YyNGU5 YiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBh Z2VJT1MubW0KKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvaW9zL1dlYlBh Z2VJT1MubW0KQEAgLTg2NiwxMyArODY2LDYgQEAgdm9pZCBXZWJQYWdlOjpjb21wbGV0ZVN5bnRo ZXRpY0NsaWNrKE5vZGUmIG5vZGVSZXNwb25kaW5nVG9DbGljaywgY29uc3QgV2ViQ29yZToKICAg ICBSZWZQdHI8RnJhbWU+IG5ld0ZvY3VzZWRGcmFtZSA9IG1fcGFnZS0+Zm9jdXNDb250cm9sbGVy KCkuZm9jdXNlZEZyYW1lKCk7CiAgICAgUmVmUHRyPEVsZW1lbnQ+IG5ld0ZvY3VzZWRFbGVtZW50 ID0gbmV3Rm9jdXNlZEZyYW1lID8gbmV3Rm9jdXNlZEZyYW1lLT5kb2N1bWVudCgpLT5mb2N1c2Vk RWxlbWVudCgpIDogbnVsbHB0cjsKIAotICAgIC8vIElmIHRoZSBmb2N1cyBoYXMgbm90IGNoYW5n ZWQsIHdlIG5lZWQgdG8gbm90aWZ5IHRoZSBjbGllbnQgYW55d2F5LCBzaW5jZSBpdCBtaWdodCBi ZQotICAgIC8vIG5lY2Vzc2FyeSB0byBzdGFydCBhc3Npc3RpbmcgdGhlIG5vZGUuCi0gICAgLy8g SWYgdGhlIG5vZGUgaGFzIGJlZW4gZm9jdXNlZCBieSBKYXZhU2NyaXB0IHdpdGhvdXQgdXNlciBp bnRlcmFjdGlvbiwgdGhlCi0gICAgLy8ga2V5Ym9hcmQgaXMgbm90IG9uIHNjcmVlbi4KLSAgICBp ZiAobmV3Rm9jdXNlZEVsZW1lbnQgJiYgbmV3Rm9jdXNlZEVsZW1lbnQgPT0gb2xkRm9jdXNlZEVs ZW1lbnQpCi0gICAgICAgIGVsZW1lbnREaWRSZWZvY3VzKCpuZXdGb2N1c2VkRWxlbWVudCk7Ci0K ICAgICBpZiAobm9kZVJlc3BvbmRpbmdUb0NsaWNrLmRvY3VtZW50KCkuc2V0dGluZ3MoKS5jb250 ZW50Q2hhbmdlT2JzZXJ2ZXJFbmFibGVkKCkpIHsKICAgICAgICAgYXV0byYgZG9jdW1lbnQgPSBu b2RlUmVzcG9uZGluZ1RvQ2xpY2suZG9jdW1lbnQoKTsKICAgICAgICAgLy8gRGlzcGF0Y2ggbW91 c2VPdXQgdG8gZGlzbWlzcyB0b29sdGlwIGNvbnRlbnQgd2hlbiB0YXBwaW5nIG9uIHRoZSBjb250 cm9sIGJhciBidXR0b25zIChjYywgc2V0dGluZ3MpLgpAQCAtMzA4Myw2ICszMDc2LDExIEBAIHZv aWQgV2ViUGFnZTo6Z2V0Rm9jdXNlZEVsZW1lbnRJbmZvcm1hdGlvbihGb2N1c2VkRWxlbWVudElu Zm9ybWF0aW9uJiBpbmZvcm1hdGlvCiAgICAgICAgIHJlbmRlcmVyLT5sb2NhbFRvQ29udGFpbmVy UG9pbnQoRmxvYXRQb2ludCgpLCBudWxscHRyLCBVc2VUcmFuc2Zvcm1zLCAmaW5GaXhlZCk7CiAg ICAgICAgIGluZm9ybWF0aW9uLmluc2lkZUZpeGVkUG9zaXRpb24gPSBpbkZpeGVkOwogICAgICAg ICBpbmZvcm1hdGlvbi5pc1JUTCA9IHJlbmRlcmVyLT5zdHlsZSgpLmRpcmVjdGlvbigpID09IFRl eHREaXJlY3Rpb246OlJUTDsKKworI2lmIEVOQUJMRShBU1lOQ19TQ1JPTExJTkcpCisgICAgICAg IGlmIChhdXRvKiBzY3JvbGxpbmdDb29yZGluYXRvciA9IHRoaXMtPnNjcm9sbGluZ0Nvb3JkaW5h dG9yKCkpCisgICAgICAgICAgICBpbmZvcm1hdGlvbi5jb250YWluZXJTY3JvbGxpbmdOb2RlSUQg PSBzY3JvbGxpbmdDb29yZGluYXRvci0+c2Nyb2xsYWJsZUNvbnRhaW5lck5vZGVJRCgqcmVuZGVy ZXIpOworI2VuZGlmCiAgICAgfSBlbHNlCiAgICAgICAgIGluZm9ybWF0aW9uLmludGVyYWN0aW9u UmVjdCA9IHsgfTsKIAo=