202297 2019-09-26 16:28:37 -0700 Add some logging to help diagnose blank or stuck WKWebViews 2019-09-26 17:59:44 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton bdakin cdumez commit-queue simon.fraser webkit-bug-importer wenson_hsieh oldest_to_newest 1574675 0 thorton 2019-09-26 16:28:37 -0700 Add some logging to help diagnose blank or stuck WKWebViews 1574676 1 379694 thorton 2019-09-26 16:34:51 -0700 Created attachment 379694 Patch 1574677 2 webkit-bug-importer 2019-09-26 16:35:35 -0700 <rdar://problem/55763610> 1574685 3 379694 wenson_hsieh 2019-09-26 17:07:13 -0700 Comment on attachment 379694 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379694&action=review > Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm:379 > + WTF::Optional<MonotonicTime> _timeOfFirstVisibleContentRectUpdateWithPendingCommit; Nit - I don’t think the WTF:: is necessary here. 1574686 4 379700 thorton 2019-09-26 17:14:52 -0700 Created attachment 379700 Patch 1574687 5 thorton 2019-09-26 17:15:16 -0700 You are correct though this file is full of it. I removed it in my case but not the others. 1574697 6 379700 commit-queue 2019-09-26 17:59:43 -0700 Comment on attachment 379700 Patch Clearing flags on attachment: 379700 Committed r250405: <https://trac.webkit.org/changeset/250405> 1574698 7 commit-queue 2019-09-26 17:59:44 -0700 All reviewed patches have been landed. Closing bug. 379694 2019-09-26 16:34:51 -0700 2019-09-26 17:14:51 -0700 Patch bug-202297-20190926163450.patch text/plain 19178 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMzg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDlkMWZmZjMzNTZjYWI2ZDFm MTNlOWRjN2Y3ODRmZGVhN2EwNGZkNTguLjhlMjdhMGVjMzdlMmQ2MDA1MjEyNTdmZjExZjRhZTZj ZTBhNGRmZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTQgQEAKKzIwMTktMDktMjYgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHNvbWUgbG9nZ2lu ZyB0byBoZWxwIGRpYWdub3NlIGJsYW5rIG9yIHN0dWNrIFdLV2ViVmlld3MKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMjI5NworCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE91ciBjdXJyZW50IGxvZ2dpbmcg aXMgaW5zdWZmaWNpZW50IHRvIHJ1bGUgb3V0IHNvbWUgb2YgdGhlIHBvdGVudGlhbAorICAgICAg ICBjYXVzZXMgb2Ygc3R1Y2svYmxhbmsgV0tXZWJWaWV3cyBpbiA8cmRhcjovL3Byb2JsZW0vNTMz OTkwNTQ+LiBBZGQKKyAgICAgICAgc29tZSBuZXcgbG9nZ2luZywgYW5kIGltcHJvdmUgc29tZSBl eGlzdGluZyBsb2dnaW5nLCB0byBhaWQgaW4gZGlhZ25vc2lzLgorCisgICAgICAgICogVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW06CisgICAgICAgICgtW1dLV2ViVmlldyBfd2lsbElu dm9rZVVJU2Nyb2xsVmlld0RlbGVnYXRlQ2FsbGJhY2tdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3 IF9kaWRJbnZva2VVSVNjcm9sbFZpZXdEZWxlZ2F0ZUNhbGxiYWNrXSk6CisgICAgICAgIFJlbmFt ZSBfZGVsYXlVcGRhdGVWaXNpYmxlQ29udGVudFJlY3RzIHRvIGJlIG1vcmUgc3BlY2lmaWMgdGhh dCBpdAorICAgICAgICB3YXMgZHVlIHRvIHVzIGJlaW5nIHVuZGVybmVhdGggYSBVSVNjcm9sbFZp ZXcgZGVsZWdhdGUgY2FsbGJhY2suCisKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9wcm9jZXNzV2ls bFN3YXBPckRpZEV4aXRdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9kaWRDb21taXRMYXllclRy ZWU6XSk6CisgICAgICAgIEFkZCBhIGxvZyB3aGVuIHdlIHJlY2VpdmUgYW4gaW5jb21pbmcgY29t bWl0IHdoaWxlIHZpc2libGUgY29udGVudCByZWN0CisgICAgICAgIHVwZGF0ZXMgYXJlIGJlaW5n IGRlZmVycmVkLiBBbHNvLCBpbmNsdWRlIHRoZSBjdXJyZW50IHRyYW5zYWN0aW9uIElECisgICAg ICAgIGFuZCB0aGUgdHJhbnNhY3Rpb24gSUQgdGhhdCBfbmVlZHNSZXNldFZpZXdTdGF0ZS4uLiBp cyB3YWl0aW5nIGZvciwgdG8KKyAgICAgICAgaGVscCBydWxlIG91dCBhIGNsYXNzIG9mIHBvdGVu dGlhbCBwcm9ibGVtcy4KKworICAgICAgICBBZGQgYSBsb2cgd2hlbiB3ZSByZWNlaXZlIGFuIGlu Y29taW5nIGNvbW1pdCBtb3JlIHRoYW4gNSBzZWNvbmRzIGFmdGVyCisgICAgICAgIGEgdmlzaWJs ZSBjb250ZW50IHJlY3QgdXBkYXRlLgorCisgICAgICAgICgtW1dLV2ViVmlldyBfdXBkYXRlVmlz aWJsZUNvbnRlbnRSZWN0c10pOgorICAgICAgICBLZWVwIHRyYWNrIG9mIHdoZW4gd2UgZGVmZXIg dmlzdWFsIGNvbnRlbnQgcmVjdCB1cGRhdGVzIGZvciBhbnkgcmVhc29uLAorICAgICAgICBhbmQg bG9nIHRoZSBmaXJzdCB0aW1lIHdlIGRvIGFuIHVwZGF0ZSBhZnRlciBkZWZlcnJpbmcgdGhlbS4g VGhpcyB3aWxsIG1ha2UKKyAgICAgICAgaXQgTVVDSCBlYXNpZXIgYXQtYS1nbGFuY2UgdG8gdGVs bCBpZiBvbmUgb2YgdGhlICJiYWlsaW5nIiBtZXNzYWdlcworICAgICAgICByZXByZXNlbnRzIGEg bG9uZy10ZXJtIHN0YXRlIChhIHByb2JsZW0pLCBvciBpcyBleHBlY3RlZC4KKworICAgICAgICBL ZWVwIHRyYWNrIG9mIGhvdyBsb25nIGl0J3MgYmVlbiBzaW5jZSB3ZSBzZW50IGEgdmlzaWJsZSBj b250ZW50IHJlY3QgdXBkYXRlCisgICAgICAgIGFuZCBkaWRuJ3QgZ2V0IGEgY29tbWl0IGJhY2sg ZnJvbSB0aGUgV2ViIENvbnRlbnQgcHJvY2VzczsgaWYgaXQncyBiZWVuCisgICAgICAgIG1vcmUg dGhhbiA1IHNlY29uZHMsIHN0YXJ0IGxvZ2dpbmcuCisKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9j YW5jZWxBbmltYXRlZFJlc2l6ZV0pOgorICAgICAgICAoLVtXS1dlYlZpZXcgX2RpZENvbXBsZXRl QW5pbWF0ZWRSZXNpemVdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9iZWdpbkFuaW1hdGVkUmVz aXplV2l0aFVwZGF0ZXM6XSk6CisgICAgICAgICgtW1dLV2ViVmlldyBfZW5kQW5pbWF0ZWRSZXNp emVdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9yZXNpemVXaGlsZUhpZGluZ0NvbnRlbnRXaXRo VXBkYXRlczpdKToKKyAgICAgICAgVHVybiBhbmltYXRlZCByZXNpemUgbG9nZ2luZyBpbnRvIHJl bGVhc2UgbG9nZ2luZy4gSXQgaXMgYSBjb21tb24gY3VscHJpdAorICAgICAgICBmb3IgbWFueSBr aW5kcyBvZiBidWdzLCB3aGlsZSBhbHNvIG5vdCBiZWluZyBoaWdoIHZvbHVtZSwgc28gdGhpcyBp cyB3ZWxsIHdvcnRoIGl0LgorICAgICAgICAKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2Uv V2ViUGFnZS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OmZyZWV6ZUxheWVyVHJlZSk6 CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2U6OnVuZnJlZXplTGF5ZXJUcmVlKToKKyAgICAgICAg U2hvdyB0aGUgY3VycmVudCB2YWx1ZSBvZiBtX2xheWVyVHJlZUZyZWV6ZVJlYXNvbnMgaW4gYWRk aXRpb24gdG8gdGhlIG9sZCB2YWx1ZSBhbmQgZGVsdGEsCisgICAgICAgIHNvIHlvdSBkb24ndCBo YXZlIHRvIG1hbnVhbGx5IGNvbXB1dGUgdGhlIGN1cnJlbnQgdmFsdWUgd2hlbiByZWFkaW5nIGxv Z3MuCisKIDIwMTktMDktMjYgIFBhdHJpY2sgR3JpZmZpcyAgPHBncmlmZmlzQGlnYWxpYS5jb20+ CiAKICAgICAgICAgW0dUS10gRml4IGxvZ2ljIG9mIGRhcmsgdGhlbWUgZGV0ZWN0aW9uCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQppbmRleCBiNDk3 MTM1YmU3MjY4MDU4ZWYwMWZmNjY2ZTUwNjIzYjdhOGYyZDc1Li4wODc2MjYxNjMxMzI0ZWJhNzNj NjgxYWY3YjU1OTBlMTBlZDY2YzFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXcubW0KQEAgLTE4NSw2ICsxODUsNyBAQCBAZW5kCiAjaWYgUExBVEZP Uk0oSU9TX0ZBTUlMWSkKIHN0YXRpYyBjb25zdCB1aW50MzJfdCBmaXJzdFNES1ZlcnNpb25XaXRo TGlua1ByZXZpZXdFbmFibGVkQnlEZWZhdWx0ID0gMHhBMDAwMDsKIHN0YXRpYyBjb25zdCBTZWNv bmRzIGRlbGF5QmVmb3JlTm9WaXNpYmxlQ29udGVudHNSZWN0c0xvZ2dpbmcgPSAxX3M7CitzdGF0 aWMgY29uc3QgU2Vjb25kcyBkZWxheUJlZm9yZU5vQ29tbWl0c0xvZ2dpbmcgPSA1X3M7CiAjZW5k aWYKIAogI2lmIFBMQVRGT1JNKE1BQykKQEAgLTMxNyw2ICszMTgsNyBAQCBAaW1wbGVtZW50YXRp b24gV0tXZWJWaWV3IHsKICAgICBCT09MIF9oYXNDb21taXR0ZWRMb2FkRm9yTWFpbkZyYW1lOwog ICAgIEJPT0wgX25lZWRzUmVzZXRWaWV3U3RhdGVBZnRlckNvbW1pdExvYWRGb3JNYWluRnJhbWU7 CiAgICAgV2ViS2l0OjpUcmFuc2FjdGlvbklEIF9maXJzdFBhaW50QWZ0ZXJDb21taXRMb2FkVHJh bnNhY3Rpb25JRDsKKyAgICBXZWJLaXQ6OlRyYW5zYWN0aW9uSUQgX2xhc3RUcmFuc2FjdGlvbklE OwogICAgIFdlYktpdDo6RHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZSBfZHluYW1pY1ZpZXdwb3J0 VXBkYXRlTW9kZTsKICAgICBXZWJLaXQ6OkR5bmFtaWNWaWV3cG9ydFNpemVVcGRhdGVJRCBfY3Vy cmVudER5bmFtaWNWaWV3cG9ydFNpemVVcGRhdGVJRDsKICAgICBDQVRyYW5zZm9ybTNEIF9yZXNp emVBbmltYXRpb25UcmFuc2Zvcm1BZGp1c3RtZW50czsKQEAgLTM1MSw4ICszNTMsMTAgQEAgQGlt cGxlbWVudGF0aW9uIFdLV2ViVmlldyB7CiAgICAgQ0dGbG9hdCBfdG90YWxTY3JvbGxWaWV3Qm90 dG9tSW5zZXRBZGp1c3RtZW50Rm9yS2V5Ym9hcmQ7CiAgICAgQk9PTCBfY3VycmVudGx5QWRqdXN0 aW5nU2Nyb2xsVmlld0luc2V0c0ZvcktleWJvYXJkOwogCi0gICAgQk9PTCBfZGVsYXlVcGRhdGVW aXNpYmxlQ29udGVudFJlY3RzOwotICAgIEJPT0wgX2hhZERlbGF5ZWRVcGRhdGVWaXNpYmxlQ29u dGVudFJlY3RzOworICAgIEJPT0wgX2ludm9raW5nVUlTY3JvbGxWaWV3RGVsZWdhdGVDYWxsYmFj azsKKyAgICBCT09MIF9kaWREZWZlclVwZGF0ZVZpc2libGVDb250ZW50UmVjdHNGb3JVSVNjcm9s bFZpZXdEZWxlZ2F0ZUNhbGxiYWNrOworICAgIEJPT0wgX2RpZERlZmVyVXBkYXRlVmlzaWJsZUNv bnRlbnRSZWN0c0ZvckFueVJlYXNvbjsKKyAgICBCT09MIF9kaWREZWZlclVwZGF0ZVZpc2libGVD b250ZW50UmVjdHNGb3JVbnN0YWJsZVNjcm9sbFZpZXc7CiAKICAgICBCT09MIF93YWl0aW5nRm9y RW5kQW5pbWF0ZWRSZXNpemU7CiAgICAgQk9PTCBfd2FpdGluZ0ZvckNvbW1pdEFmdGVyQW5pbWF0 ZWRSZXNpemU7CkBAIC0zNzIsNiArMzc2LDggQEAgQGltcGxlbWVudGF0aW9uIFdLV2ViVmlldyB7 CiAgICAgTW9ub3RvbmljVGltZSBfdGltZU9mUmVxdWVzdEZvclZpc2libGVDb250ZW50UmVjdFVw ZGF0ZTsKICAgICBNb25vdG9uaWNUaW1lIF90aW1lT2ZMYXN0VmlzaWJsZUNvbnRlbnRSZWN0VXBk YXRlOwogCisgICAgV1RGOjpPcHRpb25hbDxNb25vdG9uaWNUaW1lPiBfdGltZU9mRmlyc3RWaXNp YmxlQ29udGVudFJlY3RVcGRhdGVXaXRoUGVuZGluZ0NvbW1pdDsKKwogICAgIE5TVUludGVnZXIg X2ZvY3VzUHJlc2VydmF0aW9uQ291bnQ7CiAgICAgTlNVSW50ZWdlciBfYWN0aXZlRm9jdXNlZFN0 YXRlUmV0YWluQ291bnQ7CiAKQEAgLTc5NSw4ICs4MDEsMTEgQEAgLSAodm9pZClfaW5pdGlhbGl6 ZVdpdGhDb25maWd1cmF0aW9uOihXS1dlYlZpZXdDb25maWd1cmF0aW9uICopY29uZmlndXJhdGlv bgogI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCiAgICAgX2RyYWdJbnRlcmFjdGlvblBvbGljeSA9 IF9XS0RyYWdJbnRlcmFjdGlvblBvbGljeURlZmF1bHQ7CiAKLSAgICBfdGltZU9mUmVxdWVzdEZv clZpc2libGVDb250ZW50UmVjdFVwZGF0ZSA9IE1vbm90b25pY1RpbWU6Om5vdygpOwotICAgIF90 aW1lT2ZMYXN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlID0gTW9ub3RvbmljVGltZTo6bm93KCk7 CisgICAgYXV0byB0aW1lTm93ID0gTW9ub3RvbmljVGltZTo6bm93KCk7CisgICAgX3RpbWVPZlJl cXVlc3RGb3JWaXNpYmxlQ29udGVudFJlY3RVcGRhdGUgPSB0aW1lTm93OworICAgIF90aW1lT2ZM YXN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlID0gdGltZU5vdzsKKyAgICBfdGltZU9mRmlyc3RW aXNpYmxlQ29udGVudFJlY3RVcGRhdGVXaXRoUGVuZGluZ0NvbW1pdCA9IHRpbWVOb3c7CisKICNp ZiBQTEFURk9STShXQVRDSE9TKQogICAgIF9hbGxvd3NWaWV3cG9ydFNocmlua1RvRml0ID0gWUVT OwogI2Vsc2UKQEAgLTE2OTEsMTQgKzE3MDAsMTQgQEAgLSAodm9pZClfaGFuZGxlS2V5VUlFdmVu dDooOjpVSUV2ZW50ICopZXZlbnQKIAogLSAodm9pZClfd2lsbEludm9rZVVJU2Nyb2xsVmlld0Rl bGVnYXRlQ2FsbGJhY2sKIHsKLSAgICBfZGVsYXlVcGRhdGVWaXNpYmxlQ29udGVudFJlY3RzID0g WUVTOworICAgIF9pbnZva2luZ1VJU2Nyb2xsVmlld0RlbGVnYXRlQ2FsbGJhY2sgPSBZRVM7CiB9 CiAKIC0gKHZvaWQpX2RpZEludm9rZVVJU2Nyb2xsVmlld0RlbGVnYXRlQ2FsbGJhY2sKIHsKLSAg ICBfZGVsYXlVcGRhdGVWaXNpYmxlQ29udGVudFJlY3RzID0gTk87Ci0gICAgaWYgKF9oYWREZWxh eWVkVXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0cykgewotICAgICAgICBfaGFkRGVsYXllZFVwZGF0 ZVZpc2libGVDb250ZW50UmVjdHMgPSBOTzsKKyAgICBfaW52b2tpbmdVSVNjcm9sbFZpZXdEZWxl Z2F0ZUNhbGxiYWNrID0gTk87CisgICAgaWYgKF9kaWREZWZlclVwZGF0ZVZpc2libGVDb250ZW50 UmVjdHNGb3JVSVNjcm9sbFZpZXdEZWxlZ2F0ZUNhbGxiYWNrKSB7CisgICAgICAgIF9kaWREZWZl clVwZGF0ZVZpc2libGVDb250ZW50UmVjdHNGb3JVSVNjcm9sbFZpZXdEZWxlZ2F0ZUNhbGxiYWNr ID0gTk87CiAgICAgICAgIFtzZWxmIF9zY2hlZHVsZVZpc2libGVDb250ZW50UmVjdFVwZGF0ZV07 CiAgICAgfQogfQpAQCAtMTg4MSw4ICsxODkwLDEwIEBAIC0gKHZvaWQpX3Byb2Nlc3NXaWxsU3dh cE9yRGlkRXhpdAogICAgIF9zY3JvbGxPZmZzZXRUb1Jlc3RvcmUgPSBXVEY6Om51bGxvcHQ7CiAg ICAgX3Vub2JzY3VyZWRDZW50ZXJUb1Jlc3RvcmUgPSBXVEY6Om51bGxvcHQ7CiAgICAgX3Njcm9s bFZpZXdCYWNrZ3JvdW5kQ29sb3IgPSBXZWJDb3JlOjpDb2xvcigpOwotICAgIF9kZWxheVVwZGF0 ZVZpc2libGVDb250ZW50UmVjdHMgPSBOTzsKLSAgICBfaGFkRGVsYXllZFVwZGF0ZVZpc2libGVD b250ZW50UmVjdHMgPSBOTzsKKyAgICBfaW52b2tpbmdVSVNjcm9sbFZpZXdEZWxlZ2F0ZUNhbGxi YWNrID0gTk87CisgICAgX2RpZERlZmVyVXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0c0ZvclVJU2Ny b2xsVmlld0RlbGVnYXRlQ2FsbGJhY2sgPSBOTzsKKyAgICBfZGlkRGVmZXJVcGRhdGVWaXNpYmxl Q29udGVudFJlY3RzRm9yQW55UmVhc29uID0gTk87CisgICAgX2RpZERlZmVyVXBkYXRlVmlzaWJs ZUNvbnRlbnRSZWN0c0ZvclVuc3RhYmxlU2Nyb2xsVmlldyA9IE5POwogICAgIF9jdXJyZW50bHlB ZGp1c3RpbmdTY3JvbGxWaWV3SW5zZXRzRm9yS2V5Ym9hcmQgPSBOTzsKICAgICBfbGFzdFNlbnRW aWV3TGF5b3V0U2l6ZSA9IFdURjo6bnVsbG9wdDsKICAgICBfbGFzdFNlbnRNYXhpbXVtVW5vYnNj dXJlZFNpemUgPSBXVEY6Om51bGxvcHQ7CkBAIC0xODk0LDYgKzE5MDUsOCBAQCAtICh2b2lkKV9w cm9jZXNzV2lsbFN3YXBPckRpZEV4aXQKICAgICBfZmlyc3RQYWludEFmdGVyQ29tbWl0TG9hZFRy YW5zYWN0aW9uSUQgPSB7IH07CiAgICAgX2ZpcnN0VHJhbnNhY3Rpb25JREFmdGVyUGFnZVJlc3Rv cmUgPSBXVEY6Om51bGxvcHQ7CiAKKyAgICBfbGFzdFRyYW5zYWN0aW9uSUQgPSB7IH07CisKICAg ICBfaGFzU2NoZWR1bGVkVmlzaWJsZVJlY3RVcGRhdGUgPSBOTzsKICAgICBfY29tbWl0RGlkUmVz dG9yZVNjcm9sbFBvc2l0aW9uID0gTk87CiAKQEAgLTIwMjAsMTAgKzIwMzMsMjQgQEAgLSAodm9p ZClfZGlkQ29tbWl0TGF5ZXJUcmVlRHVyaW5nQW5pbWF0ZWRSZXNpemU6KGNvbnN0IFdlYktpdDo6 UmVtb3RlTGF5ZXJUcmVlVHIKIAogLSAodm9pZClfZGlkQ29tbWl0TGF5ZXJUcmVlOihjb25zdCBX ZWJLaXQ6OlJlbW90ZUxheWVyVHJlZVRyYW5zYWN0aW9uJilsYXllclRyZWVUcmFuc2FjdGlvbgog eworICAgIGlmIChfZGlkRGVmZXJVcGRhdGVWaXNpYmxlQ29udGVudFJlY3RzRm9yVW5zdGFibGVT Y3JvbGxWaWV3KSB7CisgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoIiVwIChQYWdlSUQ9 JWxsdSkgLVtXS1dlYlZpZXcgX2RpZENvbW1pdExheWVyVHJlZTpdIC0gcmVjZWl2ZWQgYSBjb21t aXQgKCVsbHUpIHdoaWxlIGRlZmVycmluZyB2aXNpYmxlIGNvbnRlbnQgcmVjdCB1cGRhdGVzIChf ZHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZSAlZCwgX25lZWRzUmVzZXRWaWV3U3RhdGVBZnRlckNv bW1pdExvYWRGb3JNYWluRnJhbWUgJWQgKHdhbnRzIGNvbW1pdCAlbGx1KSwgc2l6ZUNoYW5nZWRT aW5jZUxhc3RWaXNpYmxlQ29udGVudFJlY3RVcGRhdGUgJWQsIFtfc2Nyb2xsVmlldyBpc1pvb21C b3VuY2luZ10gJWQsIF9jdXJyZW50bHlBZGp1c3RpbmdTY3JvbGxWaWV3SW5zZXRzRm9yS2V5Ym9h cmQgJWQpIiwKKyAgICAgICAgc2VsZiwgX3BhZ2UtPmlkZW50aWZpZXIoKS50b1VJbnQ2NCgpLCBs YXllclRyZWVUcmFuc2FjdGlvbi50cmFuc2FjdGlvbklEKCkudG9VSW50NjQoKSwgX2R5bmFtaWNW aWV3cG9ydFVwZGF0ZU1vZGUsIF9uZWVkc1Jlc2V0Vmlld1N0YXRlQWZ0ZXJDb21taXRMb2FkRm9y TWFpbkZyYW1lLCBfZmlyc3RQYWludEFmdGVyQ29tbWl0TG9hZFRyYW5zYWN0aW9uSUQudG9VSW50 NjQoKSwgW19jb250ZW50VmlldyBzaXplQ2hhbmdlZFNpbmNlTGFzdFZpc2libGVDb250ZW50UmVj dFVwZGF0ZV0sIFtfc2Nyb2xsVmlldyBpc1pvb21Cb3VuY2luZ10sIF9jdXJyZW50bHlBZGp1c3Rp bmdTY3JvbGxWaWV3SW5zZXRzRm9yS2V5Ym9hcmQpOworICAgIH0KKworICAgIGlmIChfdGltZU9m Rmlyc3RWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVXaXRoUGVuZGluZ0NvbW1pdCkgeworICAgICAg ICBhdXRvIHRpbWVTaW5jZUZpcnN0UmVxdWVzdFdpdGhQZW5kaW5nQ29tbWl0ID0gTW9ub3Rvbmlj VGltZTo6bm93KCkgLSAqX3RpbWVPZkZpcnN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlV2l0aFBl bmRpbmdDb21taXQ7CisgICAgICAgIGlmICh0aW1lU2luY2VGaXJzdFJlcXVlc3RXaXRoUGVuZGlu Z0NvbW1pdCA+IGRlbGF5QmVmb3JlTm9Db21taXRzTG9nZ2luZykKKyAgICAgICAgICAgIFJFTEVB U0VfTE9HX0lGX0FMTE9XRUQoIiVwIChQYWdlSUQ9JWxsdSkgLVtXS1dlYlZpZXcgX2RpZENvbW1p dExheWVyVHJlZTpdIC0gZmluYWxseSByZWNlaXZlZCBjb21taXQgJS4yZnMgYWZ0ZXIgdmlzaWJs ZSBjb250ZW50IHJlY3QgdXBkYXRlIHJlcXVlc3Q7IHRyYW5zYWN0aW9uSUQgJWxsdSIsIHNlbGYs IF9wYWdlLT5pZGVudGlmaWVyKCkudG9VSW50NjQoKSwgdGltZVNpbmNlRmlyc3RSZXF1ZXN0V2l0 aFBlbmRpbmdDb21taXQudmFsdWUoKSwgbGF5ZXJUcmVlVHJhbnNhY3Rpb24udHJhbnNhY3Rpb25J RCgpLnRvVUludDY0KCkpOworICAgICAgICBfdGltZU9mRmlyc3RWaXNpYmxlQ29udGVudFJlY3RV cGRhdGVXaXRoUGVuZGluZ0NvbW1pdCA9IFdURjo6bnVsbG9wdDsKKyAgICB9CisKKyAgICBfbGFz dFRyYW5zYWN0aW9uSUQgPSBsYXllclRyZWVUcmFuc2FjdGlvbi50cmFuc2FjdGlvbklEKCk7CisK ICAgICBpZiAoIVtzZWxmIHVzZXNTdGFuZGFyZENvbnRlbnRWaWV3XSkKICAgICAgICAgcmV0dXJu OwogCi0gICAgTE9HX1dJVEhfU1RSRUFNKFZpc2libGVSZWN0cywgc3RyZWFtIDw8ICItW1dLV2Vi VmlldyAiIDw8IF9wYWdlLT5pZGVudGlmaWVyKCkgPDwgIiBfZGlkQ29tbWl0TGF5ZXJUcmVlOl0g dHJhbnNhY3Rpb25JRCAiIDw8ICBsYXllclRyZWVUcmFuc2FjdGlvbi50cmFuc2FjdGlvbklEKCkg PDwgIiBfZHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZSAiIDw8IChpbnQpX2R5bmFtaWNWaWV3cG9y dFVwZGF0ZU1vZGUpOworICAgIExPR19XSVRIX1NUUkVBTShWaXNpYmxlUmVjdHMsIHN0cmVhbSA8 PCAiLVtXS1dlYlZpZXcgIiA8PCBfcGFnZS0+aWRlbnRpZmllcigpIDw8ICIgX2RpZENvbW1pdExh eWVyVHJlZTpdIHRyYW5zYWN0aW9uSUQgIiA8PCBsYXllclRyZWVUcmFuc2FjdGlvbi50cmFuc2Fj dGlvbklEKCkgPDwgIiBfZHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZSAiIDw8IChpbnQpX2R5bmFt aWNWaWV3cG9ydFVwZGF0ZU1vZGUpOwogCiAgICAgYm9vbCBuZWVkVXBkYXRlVmlzaWJsZUNvbnRl bnRSZWN0cyA9IF9wYWdlLT51cGRhdGVMYXlvdXRWaWV3cG9ydFBhcmFtZXRlcnMobGF5ZXJUcmVl VHJhbnNhY3Rpb24pOwogCkBAIC0zMTE1LDEzICszMTQyLDIyIEBAIC0gKHZvaWQpX3VwZGF0ZVZp c2libGVDb250ZW50UmVjdHMKICAgICBpZiAoIVtzZWxmIHVzZXNTdGFuZGFyZENvbnRlbnRWaWV3 XSkgewogICAgICAgICBbX3Bhc3N3b3JkVmlldyBzZXRGcmFtZTpzZWxmLmJvdW5kc107CiAgICAg ICAgIFtfY3VzdG9tQ29udGVudFZpZXcgd2ViX2NvbXB1dGVkQ29udGVudEluc2V0RGlkQ2hhbmdl XTsKLSAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiJXAgLVtXS1dlYlZpZXcgX3VwZGF0 ZVZpc2libGVDb250ZW50UmVjdHM6XSAtIHVzZXNTdGFuZGFyZENvbnRlbnRWaWV3IGlzIE5PLCBi YWlsaW5nIiwgc2VsZik7CisgICAgICAgIF9kaWREZWZlclVwZGF0ZVZpc2libGVDb250ZW50UmVj dHNGb3JBbnlSZWFzb24gPSBZRVM7CisgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoIiVw IChQYWdlSUQ9JWxsdSkgLVtXS1dlYlZpZXcgX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHM6XSAt IHVzZXNTdGFuZGFyZENvbnRlbnRWaWV3IGlzIE5PLCBiYWlsaW5nIiwgc2VsZiwgX3BhZ2UtPmlk ZW50aWZpZXIoKS50b1VJbnQ2NCgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAotICAgIGlm IChfZGVsYXlVcGRhdGVWaXNpYmxlQ29udGVudFJlY3RzKSB7Ci0gICAgICAgIF9oYWREZWxheWVk VXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0cyA9IFlFUzsKLSAgICAgICAgUkVMRUFTRV9MT0dfSUZf QUxMT1dFRCgiJXAgLVtXS1dlYlZpZXcgX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHM6XSAtIF9k ZWxheVVwZGF0ZVZpc2libGVDb250ZW50UmVjdHMgaXMgWUVTLCBiYWlsaW5nIiwgc2VsZik7Cisg ICAgYXV0byB0aW1lTm93ID0gTW9ub3RvbmljVGltZTo6bm93KCk7CisgICAgaWYgKF90aW1lT2ZG aXJzdFZpc2libGVDb250ZW50UmVjdFVwZGF0ZVdpdGhQZW5kaW5nQ29tbWl0KSB7CisgICAgICAg IGF1dG8gdGltZVNpbmNlRmlyc3RSZXF1ZXN0V2l0aFBlbmRpbmdDb21taXQgPSB0aW1lTm93IC0g Kl90aW1lT2ZGaXJzdFZpc2libGVDb250ZW50UmVjdFVwZGF0ZVdpdGhQZW5kaW5nQ29tbWl0Owor ICAgICAgICBpZiAodGltZVNpbmNlRmlyc3RSZXF1ZXN0V2l0aFBlbmRpbmdDb21taXQgPiBkZWxh eUJlZm9yZU5vQ29tbWl0c0xvZ2dpbmcpCisgICAgICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExP V0VEKCIlcCAoUGFnZUlEPSVsbHUpIC1bV0tXZWJWaWV3IF91cGRhdGVWaXNpYmxlQ29udGVudFJl Y3RzOl0gLSBoYXZlIG5vdCByZWNlaXZlZCBhIGNvbW1pdCAlLjJmcyBhZnRlciB2aXNpYmxlIGNv bnRlbnQgcmVjdCB1cGRhdGU7IGxhc3RUcmFuc2FjdGlvbklEICVsbHUiLCBzZWxmLCBfcGFnZS0+ aWRlbnRpZmllcigpLnRvVUludDY0KCksIHRpbWVTaW5jZUZpcnN0UmVxdWVzdFdpdGhQZW5kaW5n Q29tbWl0LnZhbHVlKCksIF9sYXN0VHJhbnNhY3Rpb25JRC50b1VJbnQ2NCgpKTsKKyAgICB9CisK KyAgICBpZiAoX2ludm9raW5nVUlTY3JvbGxWaWV3RGVsZWdhdGVDYWxsYmFjaykgeworICAgICAg ICBfZGlkRGVmZXJVcGRhdGVWaXNpYmxlQ29udGVudFJlY3RzRm9yVUlTY3JvbGxWaWV3RGVsZWdh dGVDYWxsYmFjayA9IFlFUzsKKyAgICAgICAgX2RpZERlZmVyVXBkYXRlVmlzaWJsZUNvbnRlbnRS ZWN0c0ZvckFueVJlYXNvbiA9IFlFUzsKKyAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgi JXAgKFBhZ2VJRD0lbGx1KSAtW1dLV2ViVmlldyBfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0czpd IC0gX2ludm9raW5nVUlTY3JvbGxWaWV3RGVsZWdhdGVDYWxsYmFjayBpcyBZRVMsIGJhaWxpbmci LCBzZWxmLCBfcGFnZS0+aWRlbnRpZmllcigpLnRvVUludDY0KCkpOwogICAgICAgICByZXR1cm47 CiAgICAgfQogCkBAIC0zMTI5LDExICszMTY1LDIwIEBAIC0gKHZvaWQpX3VwZGF0ZVZpc2libGVD b250ZW50UmVjdHMKICAgICAgICAgfHwgKF9uZWVkc1Jlc2V0Vmlld1N0YXRlQWZ0ZXJDb21taXRM b2FkRm9yTWFpbkZyYW1lICYmICFbX2NvbnRlbnRWaWV3IHNpemVDaGFuZ2VkU2luY2VMYXN0Vmlz aWJsZUNvbnRlbnRSZWN0VXBkYXRlXSkKICAgICAgICAgfHwgW19zY3JvbGxWaWV3IGlzWm9vbUJv dW5jaW5nXQogICAgICAgICB8fCBfY3VycmVudGx5QWRqdXN0aW5nU2Nyb2xsVmlld0luc2V0c0Zv cktleWJvYXJkKSB7Ci0gICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoIiVwIC1bV0tXZWJW aWV3IF91cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzOl0gLSBzY3JvbGwgdmlldyBzdGF0ZSBpcyBu b24tc3RhYmxlLCBiYWlsaW5nIChfZHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZSAlZCwgX25lZWRz UmVzZXRWaWV3U3RhdGVBZnRlckNvbW1pdExvYWRGb3JNYWluRnJhbWUgJWQsIHNpemVDaGFuZ2Vk U2luY2VMYXN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlICVkLCBbX3Njcm9sbFZpZXcgaXNab29t Qm91bmNpbmddICVkLCBfY3VycmVudGx5QWRqdXN0aW5nU2Nyb2xsVmlld0luc2V0c0ZvcktleWJv YXJkICVkKSIsCi0gICAgICAgICAgICBzZWxmLCBfZHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZSwg X25lZWRzUmVzZXRWaWV3U3RhdGVBZnRlckNvbW1pdExvYWRGb3JNYWluRnJhbWUsIFtfY29udGVu dFZpZXcgc2l6ZUNoYW5nZWRTaW5jZUxhc3RWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVdLCBbX3Nj cm9sbFZpZXcgaXNab29tQm91bmNpbmddLCBfY3VycmVudGx5QWRqdXN0aW5nU2Nyb2xsVmlld0lu c2V0c0ZvcktleWJvYXJkKTsKKyAgICAgICAgX2RpZERlZmVyVXBkYXRlVmlzaWJsZUNvbnRlbnRS ZWN0c0ZvckFueVJlYXNvbiA9IFlFUzsKKyAgICAgICAgX2RpZERlZmVyVXBkYXRlVmlzaWJsZUNv bnRlbnRSZWN0c0ZvclVuc3RhYmxlU2Nyb2xsVmlldyA9IFlFUzsKKyAgICAgICAgUkVMRUFTRV9M T0dfSUZfQUxMT1dFRCgiJXAgKFBhZ2VJRD0lbGx1KSAtW1dLV2ViVmlldyBfdXBkYXRlVmlzaWJs ZUNvbnRlbnRSZWN0czpdIC0gc2Nyb2xsIHZpZXcgc3RhdGUgaXMgbm9uLXN0YWJsZSwgYmFpbGlu ZyAoX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGUgJWQsIF9uZWVkc1Jlc2V0Vmlld1N0YXRlQWZ0 ZXJDb21taXRMb2FkRm9yTWFpbkZyYW1lICVkLCBzaXplQ2hhbmdlZFNpbmNlTGFzdFZpc2libGVD b250ZW50UmVjdFVwZGF0ZSAlZCwgW19zY3JvbGxWaWV3IGlzWm9vbUJvdW5jaW5nXSAlZCwgX2N1 cnJlbnRseUFkanVzdGluZ1Njcm9sbFZpZXdJbnNldHNGb3JLZXlib2FyZCAlZCkiLAorICAgICAg ICAgICAgc2VsZiwgX3BhZ2UtPmlkZW50aWZpZXIoKS50b1VJbnQ2NCgpLCBfZHluYW1pY1ZpZXdw b3J0VXBkYXRlTW9kZSwgX25lZWRzUmVzZXRWaWV3U3RhdGVBZnRlckNvbW1pdExvYWRGb3JNYWlu RnJhbWUsIFtfY29udGVudFZpZXcgc2l6ZUNoYW5nZWRTaW5jZUxhc3RWaXNpYmxlQ29udGVudFJl Y3RVcGRhdGVdLCBbX3Njcm9sbFZpZXcgaXNab29tQm91bmNpbmddLCBfY3VycmVudGx5QWRqdXN0 aW5nU2Nyb2xsVmlld0luc2V0c0ZvcktleWJvYXJkKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0K IAorICAgIGlmIChfZGlkRGVmZXJVcGRhdGVWaXNpYmxlQ29udGVudFJlY3RzRm9yQW55UmVhc29u KQorICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCIlcCAoUGFnZUlEPSVsbHUpIC1bV0tX ZWJWaWV3IF91cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzOl0gLSBwZXJmb3JtaW5nIGZpcnN0IHZp c2libGUgY29udGVudCByZWN0IHVwZGF0ZSBhZnRlciBkZWZlcnJpbmcgdXBkYXRlcyIsIHNlbGYs IF9wYWdlLT5pZGVudGlmaWVyKCkudG9VSW50NjQoKSk7CisKKyAgICBfZGlkRGVmZXJVcGRhdGVW aXNpYmxlQ29udGVudFJlY3RzRm9yVUlTY3JvbGxWaWV3RGVsZWdhdGVDYWxsYmFjayA9IE5POwor ICAgIF9kaWREZWZlclVwZGF0ZVZpc2libGVDb250ZW50UmVjdHNGb3JVbnN0YWJsZVNjcm9sbFZp ZXcgPSBOTzsKKyAgICBfZGlkRGVmZXJVcGRhdGVWaXNpYmxlQ29udGVudFJlY3RzRm9yQW55UmVh c29uID0gTk87CisKICAgICBDR1JlY3QgdmlzaWJsZVJlY3RJbkNvbnRlbnRDb29yZGluYXRlcyA9 IFtzZWxmIF92aXNpYmxlQ29udGVudFJlY3RdOwogCiAgICAgVUlFZGdlSW5zZXRzIGNvbXB1dGVk Q29udGVudEluc2V0VW5hZGp1c3RlZEZvcktleWJvYXJkID0gW3NlbGYgX2NvbXB1dGVkT2JzY3Vy ZWRJbnNldF07CkBAIC0zMTk5LDEyICszMjQ0LDEzIEBAIC0gKHZvaWQpX3VwZGF0ZVZpc2libGVD b250ZW50UmVjdHMKICAgICAgICAgYXV0byBjYWxsYmFjayA9IF92aXNpYmxlQ29udGVudFJlY3RV cGRhdGVDYWxsYmFja3MudGFrZUxhc3QoKTsKICAgICAgICAgY2FsbGJhY2soKTsKICAgICB9Ci0g ICAgCi0gICAgYXV0byB0aW1lTm93ID0gTW9ub3RvbmljVGltZTo6bm93KCk7CisKICAgICBpZiAo KHRpbWVOb3cgLSBfdGltZU9mUmVxdWVzdEZvclZpc2libGVDb250ZW50UmVjdFVwZGF0ZSkgPiBk ZWxheUJlZm9yZU5vVmlzaWJsZUNvbnRlbnRzUmVjdHNMb2dnaW5nKQogICAgICAgICBSRUxFQVNF X0xPR19JRl9BTExPV0VEKCIlcCAtW1dLV2ViVmlldyBfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0 czpdIGZpbmFsbHkgcmFuICUuMmZzIGFmdGVyIGJlaW5nIHNjaGVkdWxlZCIsIHNlbGYsICh0aW1l Tm93IC0gX3RpbWVPZlJlcXVlc3RGb3JWaXNpYmxlQ29udGVudFJlY3RVcGRhdGUpLnZhbHVlKCkp OwogCiAgICAgX3RpbWVPZkxhc3RWaXNpYmxlQ29udGVudFJlY3RVcGRhdGUgPSB0aW1lTm93Owor ICAgIGlmICghX3RpbWVPZkZpcnN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlV2l0aFBlbmRpbmdD b21taXQpCisgICAgICAgIF90aW1lT2ZGaXJzdFZpc2libGVDb250ZW50UmVjdFVwZGF0ZVdpdGhQ ZW5kaW5nQ29tbWl0ID0gdGltZU5vdzsKIH0KIAogLSAodm9pZClfZGlkU3RhcnRQcm92aXNpb25h bExvYWRGb3JNYWluRnJhbWUKQEAgLTMyMjUsNyArMzI3MSw4IEBAIHN0YXRpYyBpbnQzMl90IGFj dGl2ZU9yaWVudGF0aW9uKFdLV2ViVmlldyAqd2ViVmlldykKIAogLSAodm9pZClfY2FuY2VsQW5p bWF0ZWRSZXNpemUKIHsKLSAgICBMT0dfV0lUSF9TVFJFQU0oVmlzaWJsZVJlY3RzLCBzdHJlYW0g PDwgIi1bV0tXZWJWaWV3ICIgPDwgX3BhZ2UtPmlkZW50aWZpZXIoKSA8PCAiIF9jYW5jZWxBbmlt YXRlZFJlc2l6ZTpdICIgPDwgIiBfZHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZSAiIDw8IChpbnQp X2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGUpOworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQo IiVwIChQYWdlSUQ9JWxsdSkgLVtXS1dlYlZpZXcgX2NhbmNlbEFuaW1hdGVkUmVzaXplXSBfZHlu YW1pY1ZpZXdwb3J0VXBkYXRlTW9kZSAlZCIsIHNlbGYsIF9wYWdlLT5pZGVudGlmaWVyKCkudG9V SW50NjQoKSwgX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGUpOworCiAgICAgaWYgKF9keW5hbWlj Vmlld3BvcnRVcGRhdGVNb2RlID09IFdlYktpdDo6RHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZTo6 Tm90UmVzaXppbmcpCiAgICAgICAgIHJldHVybjsKIApAQCAtMzI2MCw2ICszMzA3LDggQEAgLSAo dm9pZClfZGlkQ29tcGxldGVBbmltYXRlZFJlc2l6ZQogICAgICAgICByZXR1cm47CiAgICAgfQog CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiJXAgKFBhZ2VJRD0lbGx1KSAtW1dLV2ViVmll dyBfZGlkQ29tcGxldGVBbmltYXRlZFJlc2l6ZV0iLCBzZWxmLCBfcGFnZS0+aWRlbnRpZmllcigp LnRvVUludDY0KCkpOworCiAgICAgTlNVSW50ZWdlciBpbmRleE9mUmVzaXplQW5pbWF0aW9uVmll dyA9IFtbX3Njcm9sbFZpZXcgc3Vidmlld3NdIGluZGV4T2ZPYmplY3Q6X3Jlc2l6ZUFuaW1hdGlv blZpZXcuZ2V0KCldOwogICAgIFtfc2Nyb2xsVmlldyBpbnNlcnRTdWJ2aWV3Ol9jb250ZW50Vmll dy5nZXQoKSBhdEluZGV4OmluZGV4T2ZSZXNpemVBbmltYXRpb25WaWV3XTsKICAgICBbX3Njcm9s bFZpZXcgaW5zZXJ0U3VidmlldzpbX2NvbnRlbnRWaWV3IHVuc2NhbGVkVmlld10gYXRJbmRleDpp bmRleE9mUmVzaXplQW5pbWF0aW9uVmlldyArIDFdOwpAQCAtNjE2Myw2ICs2MjEyLDggQEAgLSAo dm9pZClfYmVnaW5BbmltYXRlZFJlc2l6ZVdpdGhVcGRhdGVzOih2b2lkICheKSh2b2lkKSl1cGRh dGVCbG9jawogICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAgUkVMRUFTRV9MT0dfSUZfQUxM T1dFRCgiJXAgKFBhZ2VJRD0lbGx1KSAtW1dLV2ViVmlldyBfYmVnaW5BbmltYXRlZFJlc2l6ZVdp dGhVcGRhdGVzOl0iLCBzZWxmLCBfcGFnZS0+aWRlbnRpZmllcigpLnRvVUludDY0KCkpOworCiAg ICAgX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGUgPSBXZWJLaXQ6OkR5bmFtaWNWaWV3cG9ydFVw ZGF0ZU1vZGU6OlJlc2l6aW5nV2l0aEFuaW1hdGlvbjsKIAogICAgIGF1dG8gb2xkVmlld0xheW91 dFNpemUgPSBbc2VsZiBhY3RpdmVWaWV3TGF5b3V0U2l6ZTpzZWxmLmJvdW5kc107CkBAIC02Mjc1 LDcgKzYzMjYsNyBAQCAtICh2b2lkKV9iZWdpbkFuaW1hdGVkUmVzaXplV2l0aFVwZGF0ZXM6KHZv aWQgKF4pKHZvaWQpKXVwZGF0ZUJsb2NrCiAKIC0gKHZvaWQpX2VuZEFuaW1hdGVkUmVzaXplCiB7 Ci0gICAgTE9HX1dJVEhfU1RSRUFNKFZpc2libGVSZWN0cywgc3RyZWFtIDw8ICItW1dLV2ViVmll dyAiIDw8IF9wYWdlLT5pZGVudGlmaWVyKCkgPDwgIiBfZW5kQW5pbWF0ZWRSZXNpemU6XSAiIDw8 ICIgX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGUgIiA8PCAoaW50KV9keW5hbWljVmlld3BvcnRV cGRhdGVNb2RlKTsKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCIlcCAoUGFnZUlEPSVsbHUp IC1bV0tXZWJWaWV3IF9lbmRBbmltYXRlZFJlc2l6ZV0gX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1v ZGUgJWQiLCBzZWxmLCBfcGFnZS0+aWRlbnRpZmllcigpLnRvVUludDY0KCksIF9keW5hbWljVmll d3BvcnRVcGRhdGVNb2RlKTsKIAogICAgIC8vIElmIHdlIGFscmVhZHkgaGF2ZSBhbiB1cC10by1k YXRlIGxheWVyIHRyZWUsIGltbWVkaWF0ZWx5IGNvbXBsZXRlCiAgICAgLy8gdGhlIHJlc2l6ZS4g T3RoZXJ3aXNlLCB3ZSB3aWxsIGRlZmVyIGNvbXBsZXRpb24gdW50aWwgd2UgZG8uCkBAIC02Mjg2 LDcgKzYzMzcsOCBAQCAtICh2b2lkKV9lbmRBbmltYXRlZFJlc2l6ZQogCiAtICh2b2lkKV9yZXNp emVXaGlsZUhpZGluZ0NvbnRlbnRXaXRoVXBkYXRlczoodm9pZCAoXikodm9pZCkpdXBkYXRlQmxv Y2sKIHsKLSAgICBMT0dfV0lUSF9TVFJFQU0oVmlzaWJsZVJlY3RzLCBzdHJlYW0gPDwgIi1bV0tX ZWJWaWV3ICIgPDwgX3BhZ2UtPmlkZW50aWZpZXIoKSA8PCAiIF9yZXNpemVXaGlsZUhpZGluZ0Nv bnRlbnRXaXRoVXBkYXRlczpdIik7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiJXAgKFBh Z2VJRD0lbGx1KSAtW1dLV2ViVmlldyBfcmVzaXplV2hpbGVIaWRpbmdDb250ZW50V2l0aFVwZGF0 ZXM6XSIsIHNlbGYsIF9wYWdlLT5pZGVudGlmaWVyKCkudG9VSW50NjQoKSk7CisKICAgICBbc2Vs ZiBfYmVnaW5BbmltYXRlZFJlc2l6ZVdpdGhVcGRhdGVzOnVwZGF0ZUJsb2NrXTsKICAgICBpZiAo X2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGUgPT0gV2ViS2l0OjpEeW5hbWljVmlld3BvcnRVcGRh dGVNb2RlOjpSZXNpemluZ1dpdGhBbmltYXRpb24pIHsKICAgICAgICAgW19jb250ZW50VmlldyBz ZXRIaWRkZW46WUVTXTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQ YWdlL1dlYlBhZ2UuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFn ZS5jcHAKaW5kZXggZGZlZDkxZWM4YzAwYWIwZTZiZGVhYmE2YmZlMzYzYTMzMDVkNTYyYS4uN2Ey NmM2ZDZiZTAzOTJmMGZhYTdhNTZkZWYzNDFjNDVhMDgwNzY5ZiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKKysrIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHAKQEAgLTI0OTcsMTcgKzI0OTcsMTcgQEAg Y29uc3QgV2ViRXZlbnQqIFdlYlBhZ2U6OmN1cnJlbnRFdmVudCgpCiAKIHZvaWQgV2ViUGFnZTo6 ZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbiByZWFzb24pCiB7Ci0gICAgUkVM RUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICIlcCAtIFdlYlBhZ2UgKFBhZ2VJRD0lbGx1KSAt IEFkZGluZyBhIHJlYXNvbiAlZCB0byBmcmVlemUgbGF5ZXIgdHJlZTsgY3VycmVudCByZWFzb25z IGFyZSAlZCIsCi0gICAgICAgIHRoaXMsIG1faWRlbnRpZmllci50b1VJbnQ2NCgpLCBzdGF0aWNf Y2FzdDx1bnNpZ25lZD4ocmVhc29uKSwgbV9sYXllclRyZWVGcmVlemVSZWFzb25zLnRvUmF3KCkp OworICAgIGF1dG8gb2xkUmVhc29ucyA9IG1fbGF5ZXJUcmVlRnJlZXplUmVhc29ucy50b1Jhdygp OwogICAgIG1fbGF5ZXJUcmVlRnJlZXplUmVhc29ucy5hZGQocmVhc29uKTsKKyAgICBSRUxFQVNF X0xPRyhQcm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gV2ViUGFnZSAoUGFnZUlEPSVsbHUpIC0gQWRk aW5nIGEgcmVhc29uICVkIHRvIGZyZWV6ZSBsYXllciB0cmVlIChub3cgJWQpOyBvbGQgcmVhc29u cyB3ZXJlICVkIiwgdGhpcywgbV9pZGVudGlmaWVyLnRvVUludDY0KCksIHN0YXRpY19jYXN0PHVu c2lnbmVkPihyZWFzb24pLCBtX2xheWVyVHJlZUZyZWV6ZVJlYXNvbnMudG9SYXcoKSwgb2xkUmVh c29ucyk7CiAgICAgdXBkYXRlRHJhd2luZ0FyZWFMYXllclRyZWVGcmVlemVTdGF0ZSgpOwogfQog CiB2b2lkIFdlYlBhZ2U6OnVuZnJlZXplTGF5ZXJUcmVlKExheWVyVHJlZUZyZWV6ZVJlYXNvbiBy ZWFzb24pCiB7Ci0gICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICIlcCAtIFdlYlBh Z2UgKFBhZ2VJRD0lbGx1KSAtIFJlbW92aW5nIGEgcmVhc29uICVkIHRvIGZyZWV6ZSBsYXllciB0 cmVlOyBjdXJyZW50IHJlYXNvbnMgYXJlICVkIiwKLSAgICAgICAgdGhpcywgbV9pZGVudGlmaWVy LnRvVUludDY0KCksIHN0YXRpY19jYXN0PHVuc2lnbmVkPihyZWFzb24pLCBtX2xheWVyVHJlZUZy ZWV6ZVJlYXNvbnMudG9SYXcoKSk7CisgICAgYXV0byBvbGRSZWFzb25zID0gbV9sYXllclRyZWVG cmVlemVSZWFzb25zLnRvUmF3KCk7CiAgICAgbV9sYXllclRyZWVGcmVlemVSZWFzb25zLnJlbW92 ZShyZWFzb24pOworICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBXZWJQ YWdlIChQYWdlSUQ9JWxsdSkgLSBSZW1vdmluZyBhIHJlYXNvbiAlZCB0byBmcmVlemUgbGF5ZXIg dHJlZSAobm93ICVkKTsgb2xkIHJlYXNvbnMgd2VyZSAlZCIsIHRoaXMsIG1faWRlbnRpZmllci50 b1VJbnQ2NCgpLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4ocmVhc29uKSwgbV9sYXllclRyZWVGcmVl emVSZWFzb25zLnRvUmF3KCksIG9sZFJlYXNvbnMpOwogICAgIHVwZGF0ZURyYXdpbmdBcmVhTGF5 ZXJUcmVlRnJlZXplU3RhdGUoKTsKIH0KIAo= 379700 2019-09-26 17:14:52 -0700 2019-09-26 17:59:43 -0700 Patch bug-202297-20190926171451.patch text/plain 19206 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjUwMzg5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDlkMWZmZjMzNTZjYWI2ZDFm MTNlOWRjN2Y3ODRmZGVhN2EwNGZkNTguLjVkN2M3ODYxN2QyZWZjYTM3NWI1Mjk3MWFhZGFkMGI1 NzcxZTYzZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNTUgQEAKKzIwMTktMDktMjYgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIHNvbWUgbG9nZ2lu ZyB0byBoZWxwIGRpYWdub3NlIGJsYW5rIG9yIHN0dWNrIFdLV2ViVmlld3MKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMjI5NworICAgICAgICA8cmRh cjovL3Byb2JsZW0vNTU3NjM2MTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgV2Vuc29uIEhzaWVo LgorCisgICAgICAgIE91ciBjdXJyZW50IGxvZ2dpbmcgaXMgaW5zdWZmaWNpZW50IHRvIHJ1bGUg b3V0IHNvbWUgb2YgdGhlIHBvdGVudGlhbAorICAgICAgICBjYXVzZXMgb2Ygc3R1Y2svYmxhbmsg V0tXZWJWaWV3cyBpbiA8cmRhcjovL3Byb2JsZW0vNTMzOTkwNTQ+LiBBZGQKKyAgICAgICAgc29t ZSBuZXcgbG9nZ2luZywgYW5kIGltcHJvdmUgc29tZSBleGlzdGluZyBsb2dnaW5nLCB0byBhaWQg aW4gZGlhZ25vc2lzLgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcu bW06CisgICAgICAgICgtW1dLV2ViVmlldyBfd2lsbEludm9rZVVJU2Nyb2xsVmlld0RlbGVnYXRl Q2FsbGJhY2tdKToKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9kaWRJbnZva2VVSVNjcm9sbFZpZXdE ZWxlZ2F0ZUNhbGxiYWNrXSk6CisgICAgICAgIFJlbmFtZSBfZGVsYXlVcGRhdGVWaXNpYmxlQ29u dGVudFJlY3RzIHRvIGJlIG1vcmUgc3BlY2lmaWMgdGhhdCBpdAorICAgICAgICB3YXMgZHVlIHRv IHVzIGJlaW5nIHVuZGVybmVhdGggYSBVSVNjcm9sbFZpZXcgZGVsZWdhdGUgY2FsbGJhY2suCisK KyAgICAgICAgKC1bV0tXZWJWaWV3IF9wcm9jZXNzV2lsbFN3YXBPckRpZEV4aXRdKToKKyAgICAg ICAgKC1bV0tXZWJWaWV3IF9kaWRDb21taXRMYXllclRyZWU6XSk6CisgICAgICAgIEFkZCBhIGxv ZyB3aGVuIHdlIHJlY2VpdmUgYW4gaW5jb21pbmcgY29tbWl0IHdoaWxlIHZpc2libGUgY29udGVu dCByZWN0CisgICAgICAgIHVwZGF0ZXMgYXJlIGJlaW5nIGRlZmVycmVkLiBBbHNvLCBpbmNsdWRl IHRoZSBjdXJyZW50IHRyYW5zYWN0aW9uIElECisgICAgICAgIGFuZCB0aGUgdHJhbnNhY3Rpb24g SUQgdGhhdCBfbmVlZHNSZXNldFZpZXdTdGF0ZS4uLiBpcyB3YWl0aW5nIGZvciwgdG8KKyAgICAg ICAgaGVscCBydWxlIG91dCBhIGNsYXNzIG9mIHBvdGVudGlhbCBwcm9ibGVtcy4KKworICAgICAg ICBBZGQgYSBsb2cgd2hlbiB3ZSByZWNlaXZlIGFuIGluY29taW5nIGNvbW1pdCBtb3JlIHRoYW4g NSBzZWNvbmRzIGFmdGVyCisgICAgICAgIGEgdmlzaWJsZSBjb250ZW50IHJlY3QgdXBkYXRlLgor CisgICAgICAgICgtW1dLV2ViVmlldyBfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0c10pOgorICAg ICAgICBLZWVwIHRyYWNrIG9mIHdoZW4gd2UgZGVmZXIgdmlzdWFsIGNvbnRlbnQgcmVjdCB1cGRh dGVzIGZvciBhbnkgcmVhc29uLAorICAgICAgICBhbmQgbG9nIHRoZSBmaXJzdCB0aW1lIHdlIGRv IGFuIHVwZGF0ZSBhZnRlciBkZWZlcnJpbmcgdGhlbS4gVGhpcyB3aWxsIG1ha2UKKyAgICAgICAg aXQgTVVDSCBlYXNpZXIgYXQtYS1nbGFuY2UgdG8gdGVsbCBpZiBvbmUgb2YgdGhlICJiYWlsaW5n IiBtZXNzYWdlcworICAgICAgICByZXByZXNlbnRzIGEgbG9uZy10ZXJtIHN0YXRlIChhIHByb2Js ZW0pLCBvciBpcyBleHBlY3RlZC4KKworICAgICAgICBLZWVwIHRyYWNrIG9mIGhvdyBsb25nIGl0 J3MgYmVlbiBzaW5jZSB3ZSBzZW50IGEgdmlzaWJsZSBjb250ZW50IHJlY3QgdXBkYXRlCisgICAg ICAgIGFuZCBkaWRuJ3QgZ2V0IGEgY29tbWl0IGJhY2sgZnJvbSB0aGUgV2ViIENvbnRlbnQgcHJv Y2VzczsgaWYgaXQncyBiZWVuCisgICAgICAgIG1vcmUgdGhhbiA1IHNlY29uZHMsIHN0YXJ0IGxv Z2dpbmcuCisKKyAgICAgICAgKC1bV0tXZWJWaWV3IF9jYW5jZWxBbmltYXRlZFJlc2l6ZV0pOgor ICAgICAgICAoLVtXS1dlYlZpZXcgX2RpZENvbXBsZXRlQW5pbWF0ZWRSZXNpemVdKToKKyAgICAg ICAgKC1bV0tXZWJWaWV3IF9iZWdpbkFuaW1hdGVkUmVzaXplV2l0aFVwZGF0ZXM6XSk6CisgICAg ICAgICgtW1dLV2ViVmlldyBfZW5kQW5pbWF0ZWRSZXNpemVdKToKKyAgICAgICAgKC1bV0tXZWJW aWV3IF9yZXNpemVXaGlsZUhpZGluZ0NvbnRlbnRXaXRoVXBkYXRlczpdKToKKyAgICAgICAgVHVy biBhbmltYXRlZCByZXNpemUgbG9nZ2luZyBpbnRvIHJlbGVhc2UgbG9nZ2luZy4gSXQgaXMgYSBj b21tb24gY3VscHJpdAorICAgICAgICBmb3IgbWFueSBraW5kcyBvZiBidWdzLCB3aGlsZSBhbHNv IG5vdCBiZWluZyBoaWdoIHZvbHVtZSwgc28gdGhpcyBpcyB3ZWxsIHdvcnRoIGl0LgorICAgICAg ICAKKyAgICAgICAgKiBXZWJQcm9jZXNzL1dlYlBhZ2UvV2ViUGFnZS5jcHA6CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2U6OmZyZWV6ZUxheWVyVHJlZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBh Z2U6OnVuZnJlZXplTGF5ZXJUcmVlKToKKyAgICAgICAgU2hvdyB0aGUgY3VycmVudCB2YWx1ZSBv ZiBtX2xheWVyVHJlZUZyZWV6ZVJlYXNvbnMgaW4gYWRkaXRpb24gdG8gdGhlIG9sZCB2YWx1ZSBh bmQgZGVsdGEsCisgICAgICAgIHNvIHlvdSBkb24ndCBoYXZlIHRvIG1hbnVhbGx5IGNvbXB1dGUg dGhlIGN1cnJlbnQgdmFsdWUgd2hlbiByZWFkaW5nIGxvZ3MuCisKIDIwMTktMDktMjYgIFBhdHJp Y2sgR3JpZmZpcyAgPHBncmlmZmlzQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gRml4IGxv Z2ljIG9mIGRhcmsgdGhlbWUgZGV0ZWN0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2ViVmlldy5tbQppbmRleCBiNDk3MTM1YmU3MjY4MDU4ZWYwMWZmNjY2ZTUw NjIzYjdhOGYyZDc1Li5jZWUzZmFmY2M0MWI1ODcxNWQ5YjBlZDRjYjkxZmQyNzhlZjc2NzMzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1t CisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXcubW0KQEAg LTE4NSw2ICsxODUsNyBAQCBAZW5kCiAjaWYgUExBVEZPUk0oSU9TX0ZBTUlMWSkKIHN0YXRpYyBj b25zdCB1aW50MzJfdCBmaXJzdFNES1ZlcnNpb25XaXRoTGlua1ByZXZpZXdFbmFibGVkQnlEZWZh dWx0ID0gMHhBMDAwMDsKIHN0YXRpYyBjb25zdCBTZWNvbmRzIGRlbGF5QmVmb3JlTm9WaXNpYmxl Q29udGVudHNSZWN0c0xvZ2dpbmcgPSAxX3M7CitzdGF0aWMgY29uc3QgU2Vjb25kcyBkZWxheUJl Zm9yZU5vQ29tbWl0c0xvZ2dpbmcgPSA1X3M7CiAjZW5kaWYKIAogI2lmIFBMQVRGT1JNKE1BQykK QEAgLTMxNyw2ICszMTgsNyBAQCBAaW1wbGVtZW50YXRpb24gV0tXZWJWaWV3IHsKICAgICBCT09M IF9oYXNDb21taXR0ZWRMb2FkRm9yTWFpbkZyYW1lOwogICAgIEJPT0wgX25lZWRzUmVzZXRWaWV3 U3RhdGVBZnRlckNvbW1pdExvYWRGb3JNYWluRnJhbWU7CiAgICAgV2ViS2l0OjpUcmFuc2FjdGlv bklEIF9maXJzdFBhaW50QWZ0ZXJDb21taXRMb2FkVHJhbnNhY3Rpb25JRDsKKyAgICBXZWJLaXQ6 OlRyYW5zYWN0aW9uSUQgX2xhc3RUcmFuc2FjdGlvbklEOwogICAgIFdlYktpdDo6RHluYW1pY1Zp ZXdwb3J0VXBkYXRlTW9kZSBfZHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZTsKICAgICBXZWJLaXQ6 OkR5bmFtaWNWaWV3cG9ydFNpemVVcGRhdGVJRCBfY3VycmVudER5bmFtaWNWaWV3cG9ydFNpemVV cGRhdGVJRDsKICAgICBDQVRyYW5zZm9ybTNEIF9yZXNpemVBbmltYXRpb25UcmFuc2Zvcm1BZGp1 c3RtZW50czsKQEAgLTM1MSw4ICszNTMsMTAgQEAgQGltcGxlbWVudGF0aW9uIFdLV2ViVmlldyB7 CiAgICAgQ0dGbG9hdCBfdG90YWxTY3JvbGxWaWV3Qm90dG9tSW5zZXRBZGp1c3RtZW50Rm9yS2V5 Ym9hcmQ7CiAgICAgQk9PTCBfY3VycmVudGx5QWRqdXN0aW5nU2Nyb2xsVmlld0luc2V0c0Zvcktl eWJvYXJkOwogCi0gICAgQk9PTCBfZGVsYXlVcGRhdGVWaXNpYmxlQ29udGVudFJlY3RzOwotICAg IEJPT0wgX2hhZERlbGF5ZWRVcGRhdGVWaXNpYmxlQ29udGVudFJlY3RzOworICAgIEJPT0wgX2lu dm9raW5nVUlTY3JvbGxWaWV3RGVsZWdhdGVDYWxsYmFjazsKKyAgICBCT09MIF9kaWREZWZlclVw ZGF0ZVZpc2libGVDb250ZW50UmVjdHNGb3JVSVNjcm9sbFZpZXdEZWxlZ2F0ZUNhbGxiYWNrOwor ICAgIEJPT0wgX2RpZERlZmVyVXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0c0ZvckFueVJlYXNvbjsK KyAgICBCT09MIF9kaWREZWZlclVwZGF0ZVZpc2libGVDb250ZW50UmVjdHNGb3JVbnN0YWJsZVNj cm9sbFZpZXc7CiAKICAgICBCT09MIF93YWl0aW5nRm9yRW5kQW5pbWF0ZWRSZXNpemU7CiAgICAg Qk9PTCBfd2FpdGluZ0ZvckNvbW1pdEFmdGVyQW5pbWF0ZWRSZXNpemU7CkBAIC0zNzIsNiArMzc2 LDggQEAgQGltcGxlbWVudGF0aW9uIFdLV2ViVmlldyB7CiAgICAgTW9ub3RvbmljVGltZSBfdGlt ZU9mUmVxdWVzdEZvclZpc2libGVDb250ZW50UmVjdFVwZGF0ZTsKICAgICBNb25vdG9uaWNUaW1l IF90aW1lT2ZMYXN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlOwogCisgICAgT3B0aW9uYWw8TW9u b3RvbmljVGltZT4gX3RpbWVPZkZpcnN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlV2l0aFBlbmRp bmdDb21taXQ7CisKICAgICBOU1VJbnRlZ2VyIF9mb2N1c1ByZXNlcnZhdGlvbkNvdW50OwogICAg IE5TVUludGVnZXIgX2FjdGl2ZUZvY3VzZWRTdGF0ZVJldGFpbkNvdW50OwogCkBAIC03OTUsOCAr ODAxLDExIEBAIC0gKHZvaWQpX2luaXRpYWxpemVXaXRoQ29uZmlndXJhdGlvbjooV0tXZWJWaWV3 Q29uZmlndXJhdGlvbiAqKWNvbmZpZ3VyYXRpb24KICNpZiBQTEFURk9STShJT1NfRkFNSUxZKQog ICAgIF9kcmFnSW50ZXJhY3Rpb25Qb2xpY3kgPSBfV0tEcmFnSW50ZXJhY3Rpb25Qb2xpY3lEZWZh dWx0OwogCi0gICAgX3RpbWVPZlJlcXVlc3RGb3JWaXNpYmxlQ29udGVudFJlY3RVcGRhdGUgPSBN b25vdG9uaWNUaW1lOjpub3coKTsKLSAgICBfdGltZU9mTGFzdFZpc2libGVDb250ZW50UmVjdFVw ZGF0ZSA9IE1vbm90b25pY1RpbWU6Om5vdygpOworICAgIGF1dG8gdGltZU5vdyA9IE1vbm90b25p Y1RpbWU6Om5vdygpOworICAgIF90aW1lT2ZSZXF1ZXN0Rm9yVmlzaWJsZUNvbnRlbnRSZWN0VXBk YXRlID0gdGltZU5vdzsKKyAgICBfdGltZU9mTGFzdFZpc2libGVDb250ZW50UmVjdFVwZGF0ZSA9 IHRpbWVOb3c7CisgICAgX3RpbWVPZkZpcnN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlV2l0aFBl bmRpbmdDb21taXQgPSB0aW1lTm93OworCiAjaWYgUExBVEZPUk0oV0FUQ0hPUykKICAgICBfYWxs b3dzVmlld3BvcnRTaHJpbmtUb0ZpdCA9IFlFUzsKICNlbHNlCkBAIC0xNjkxLDE0ICsxNzAwLDE0 IEBAIC0gKHZvaWQpX2hhbmRsZUtleVVJRXZlbnQ6KDo6VUlFdmVudCAqKWV2ZW50CiAKIC0gKHZv aWQpX3dpbGxJbnZva2VVSVNjcm9sbFZpZXdEZWxlZ2F0ZUNhbGxiYWNrCiB7Ci0gICAgX2RlbGF5 VXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0cyA9IFlFUzsKKyAgICBfaW52b2tpbmdVSVNjcm9sbFZp ZXdEZWxlZ2F0ZUNhbGxiYWNrID0gWUVTOwogfQogCiAtICh2b2lkKV9kaWRJbnZva2VVSVNjcm9s bFZpZXdEZWxlZ2F0ZUNhbGxiYWNrCiB7Ci0gICAgX2RlbGF5VXBkYXRlVmlzaWJsZUNvbnRlbnRS ZWN0cyA9IE5POwotICAgIGlmIChfaGFkRGVsYXllZFVwZGF0ZVZpc2libGVDb250ZW50UmVjdHMp IHsKLSAgICAgICAgX2hhZERlbGF5ZWRVcGRhdGVWaXNpYmxlQ29udGVudFJlY3RzID0gTk87Cisg ICAgX2ludm9raW5nVUlTY3JvbGxWaWV3RGVsZWdhdGVDYWxsYmFjayA9IE5POworICAgIGlmIChf ZGlkRGVmZXJVcGRhdGVWaXNpYmxlQ29udGVudFJlY3RzRm9yVUlTY3JvbGxWaWV3RGVsZWdhdGVD YWxsYmFjaykgeworICAgICAgICBfZGlkRGVmZXJVcGRhdGVWaXNpYmxlQ29udGVudFJlY3RzRm9y VUlTY3JvbGxWaWV3RGVsZWdhdGVDYWxsYmFjayA9IE5POwogICAgICAgICBbc2VsZiBfc2NoZWR1 bGVWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVdOwogICAgIH0KIH0KQEAgLTE4ODEsOCArMTg5MCwx MCBAQCAtICh2b2lkKV9wcm9jZXNzV2lsbFN3YXBPckRpZEV4aXQKICAgICBfc2Nyb2xsT2Zmc2V0 VG9SZXN0b3JlID0gV1RGOjpudWxsb3B0OwogICAgIF91bm9ic2N1cmVkQ2VudGVyVG9SZXN0b3Jl ID0gV1RGOjpudWxsb3B0OwogICAgIF9zY3JvbGxWaWV3QmFja2dyb3VuZENvbG9yID0gV2ViQ29y ZTo6Q29sb3IoKTsKLSAgICBfZGVsYXlVcGRhdGVWaXNpYmxlQ29udGVudFJlY3RzID0gTk87Ci0g ICAgX2hhZERlbGF5ZWRVcGRhdGVWaXNpYmxlQ29udGVudFJlY3RzID0gTk87CisgICAgX2ludm9r aW5nVUlTY3JvbGxWaWV3RGVsZWdhdGVDYWxsYmFjayA9IE5POworICAgIF9kaWREZWZlclVwZGF0 ZVZpc2libGVDb250ZW50UmVjdHNGb3JVSVNjcm9sbFZpZXdEZWxlZ2F0ZUNhbGxiYWNrID0gTk87 CisgICAgX2RpZERlZmVyVXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0c0ZvckFueVJlYXNvbiA9IE5P OworICAgIF9kaWREZWZlclVwZGF0ZVZpc2libGVDb250ZW50UmVjdHNGb3JVbnN0YWJsZVNjcm9s bFZpZXcgPSBOTzsKICAgICBfY3VycmVudGx5QWRqdXN0aW5nU2Nyb2xsVmlld0luc2V0c0Zvcktl eWJvYXJkID0gTk87CiAgICAgX2xhc3RTZW50Vmlld0xheW91dFNpemUgPSBXVEY6Om51bGxvcHQ7 CiAgICAgX2xhc3RTZW50TWF4aW11bVVub2JzY3VyZWRTaXplID0gV1RGOjpudWxsb3B0OwpAQCAt MTg5NCw2ICsxOTA1LDggQEAgLSAodm9pZClfcHJvY2Vzc1dpbGxTd2FwT3JEaWRFeGl0CiAgICAg X2ZpcnN0UGFpbnRBZnRlckNvbW1pdExvYWRUcmFuc2FjdGlvbklEID0geyB9OwogICAgIF9maXJz dFRyYW5zYWN0aW9uSURBZnRlclBhZ2VSZXN0b3JlID0gV1RGOjpudWxsb3B0OwogCisgICAgX2xh c3RUcmFuc2FjdGlvbklEID0geyB9OworCiAgICAgX2hhc1NjaGVkdWxlZFZpc2libGVSZWN0VXBk YXRlID0gTk87CiAgICAgX2NvbW1pdERpZFJlc3RvcmVTY3JvbGxQb3NpdGlvbiA9IE5POwogCkBA IC0yMDIwLDEwICsyMDMzLDI0IEBAIC0gKHZvaWQpX2RpZENvbW1pdExheWVyVHJlZUR1cmluZ0Fu aW1hdGVkUmVzaXplOihjb25zdCBXZWJLaXQ6OlJlbW90ZUxheWVyVHJlZVRyCiAKIC0gKHZvaWQp X2RpZENvbW1pdExheWVyVHJlZTooY29uc3QgV2ViS2l0OjpSZW1vdGVMYXllclRyZWVUcmFuc2Fj dGlvbiYpbGF5ZXJUcmVlVHJhbnNhY3Rpb24KIHsKKyAgICBpZiAoX2RpZERlZmVyVXBkYXRlVmlz aWJsZUNvbnRlbnRSZWN0c0ZvclVuc3RhYmxlU2Nyb2xsVmlldykgeworICAgICAgICBSRUxFQVNF X0xPR19JRl9BTExPV0VEKCIlcCAoUGFnZUlEPSVsbHUpIC1bV0tXZWJWaWV3IF9kaWRDb21taXRM YXllclRyZWU6XSAtIHJlY2VpdmVkIGEgY29tbWl0ICglbGx1KSB3aGlsZSBkZWZlcnJpbmcgdmlz aWJsZSBjb250ZW50IHJlY3QgdXBkYXRlcyAoX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGUgJWQs IF9uZWVkc1Jlc2V0Vmlld1N0YXRlQWZ0ZXJDb21taXRMb2FkRm9yTWFpbkZyYW1lICVkICh3YW50 cyBjb21taXQgJWxsdSksIHNpemVDaGFuZ2VkU2luY2VMYXN0VmlzaWJsZUNvbnRlbnRSZWN0VXBk YXRlICVkLCBbX3Njcm9sbFZpZXcgaXNab29tQm91bmNpbmddICVkLCBfY3VycmVudGx5QWRqdXN0 aW5nU2Nyb2xsVmlld0luc2V0c0ZvcktleWJvYXJkICVkKSIsCisgICAgICAgIHNlbGYsIF9wYWdl LT5pZGVudGlmaWVyKCkudG9VSW50NjQoKSwgbGF5ZXJUcmVlVHJhbnNhY3Rpb24udHJhbnNhY3Rp b25JRCgpLnRvVUludDY0KCksIF9keW5hbWljVmlld3BvcnRVcGRhdGVNb2RlLCBfbmVlZHNSZXNl dFZpZXdTdGF0ZUFmdGVyQ29tbWl0TG9hZEZvck1haW5GcmFtZSwgX2ZpcnN0UGFpbnRBZnRlckNv bW1pdExvYWRUcmFuc2FjdGlvbklELnRvVUludDY0KCksIFtfY29udGVudFZpZXcgc2l6ZUNoYW5n ZWRTaW5jZUxhc3RWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVdLCBbX3Njcm9sbFZpZXcgaXNab29t Qm91bmNpbmddLCBfY3VycmVudGx5QWRqdXN0aW5nU2Nyb2xsVmlld0luc2V0c0ZvcktleWJvYXJk KTsKKyAgICB9CisKKyAgICBpZiAoX3RpbWVPZkZpcnN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRl V2l0aFBlbmRpbmdDb21taXQpIHsKKyAgICAgICAgYXV0byB0aW1lU2luY2VGaXJzdFJlcXVlc3RX aXRoUGVuZGluZ0NvbW1pdCA9IE1vbm90b25pY1RpbWU6Om5vdygpIC0gKl90aW1lT2ZGaXJzdFZp c2libGVDb250ZW50UmVjdFVwZGF0ZVdpdGhQZW5kaW5nQ29tbWl0OworICAgICAgICBpZiAodGlt ZVNpbmNlRmlyc3RSZXF1ZXN0V2l0aFBlbmRpbmdDb21taXQgPiBkZWxheUJlZm9yZU5vQ29tbWl0 c0xvZ2dpbmcpCisgICAgICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCIlcCAoUGFnZUlE PSVsbHUpIC1bV0tXZWJWaWV3IF9kaWRDb21taXRMYXllclRyZWU6XSAtIGZpbmFsbHkgcmVjZWl2 ZWQgY29tbWl0ICUuMmZzIGFmdGVyIHZpc2libGUgY29udGVudCByZWN0IHVwZGF0ZSByZXF1ZXN0 OyB0cmFuc2FjdGlvbklEICVsbHUiLCBzZWxmLCBfcGFnZS0+aWRlbnRpZmllcigpLnRvVUludDY0 KCksIHRpbWVTaW5jZUZpcnN0UmVxdWVzdFdpdGhQZW5kaW5nQ29tbWl0LnZhbHVlKCksIGxheWVy VHJlZVRyYW5zYWN0aW9uLnRyYW5zYWN0aW9uSUQoKS50b1VJbnQ2NCgpKTsKKyAgICAgICAgX3Rp bWVPZkZpcnN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlV2l0aFBlbmRpbmdDb21taXQgPSBXVEY6 Om51bGxvcHQ7CisgICAgfQorCisgICAgX2xhc3RUcmFuc2FjdGlvbklEID0gbGF5ZXJUcmVlVHJh bnNhY3Rpb24udHJhbnNhY3Rpb25JRCgpOworCiAgICAgaWYgKCFbc2VsZiB1c2VzU3RhbmRhcmRD b250ZW50Vmlld10pCiAgICAgICAgIHJldHVybjsKIAotICAgIExPR19XSVRIX1NUUkVBTShWaXNp YmxlUmVjdHMsIHN0cmVhbSA8PCAiLVtXS1dlYlZpZXcgIiA8PCBfcGFnZS0+aWRlbnRpZmllcigp IDw8ICIgX2RpZENvbW1pdExheWVyVHJlZTpdIHRyYW5zYWN0aW9uSUQgIiA8PCAgbGF5ZXJUcmVl VHJhbnNhY3Rpb24udHJhbnNhY3Rpb25JRCgpIDw8ICIgX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1v ZGUgIiA8PCAoaW50KV9keW5hbWljVmlld3BvcnRVcGRhdGVNb2RlKTsKKyAgICBMT0dfV0lUSF9T VFJFQU0oVmlzaWJsZVJlY3RzLCBzdHJlYW0gPDwgIi1bV0tXZWJWaWV3ICIgPDwgX3BhZ2UtPmlk ZW50aWZpZXIoKSA8PCAiIF9kaWRDb21taXRMYXllclRyZWU6XSB0cmFuc2FjdGlvbklEICIgPDwg bGF5ZXJUcmVlVHJhbnNhY3Rpb24udHJhbnNhY3Rpb25JRCgpIDw8ICIgX2R5bmFtaWNWaWV3cG9y dFVwZGF0ZU1vZGUgIiA8PCAoaW50KV9keW5hbWljVmlld3BvcnRVcGRhdGVNb2RlKTsKIAogICAg IGJvb2wgbmVlZFVwZGF0ZVZpc2libGVDb250ZW50UmVjdHMgPSBfcGFnZS0+dXBkYXRlTGF5b3V0 Vmlld3BvcnRQYXJhbWV0ZXJzKGxheWVyVHJlZVRyYW5zYWN0aW9uKTsKIApAQCAtMzExNSwxMyAr MzE0MiwyMiBAQCAtICh2b2lkKV91cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzCiAgICAgaWYgKCFb c2VsZiB1c2VzU3RhbmRhcmRDb250ZW50Vmlld10pIHsKICAgICAgICAgW19wYXNzd29yZFZpZXcg c2V0RnJhbWU6c2VsZi5ib3VuZHNdOwogICAgICAgICBbX2N1c3RvbUNvbnRlbnRWaWV3IHdlYl9j b21wdXRlZENvbnRlbnRJbnNldERpZENoYW5nZV07Ci0gICAgICAgIFJFTEVBU0VfTE9HX0lGX0FM TE9XRUQoIiVwIC1bV0tXZWJWaWV3IF91cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzOl0gLSB1c2Vz U3RhbmRhcmRDb250ZW50VmlldyBpcyBOTywgYmFpbGluZyIsIHNlbGYpOworICAgICAgICBfZGlk RGVmZXJVcGRhdGVWaXNpYmxlQ29udGVudFJlY3RzRm9yQW55UmVhc29uID0gWUVTOworICAgICAg ICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCIlcCAoUGFnZUlEPSVsbHUpIC1bV0tXZWJWaWV3IF91 cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzOl0gLSB1c2VzU3RhbmRhcmRDb250ZW50VmlldyBpcyBO TywgYmFpbGluZyIsIHNlbGYsIF9wYWdlLT5pZGVudGlmaWVyKCkudG9VSW50NjQoKSk7CiAgICAg ICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAoX2RlbGF5VXBkYXRlVmlzaWJsZUNvbnRlbnRS ZWN0cykgewotICAgICAgICBfaGFkRGVsYXllZFVwZGF0ZVZpc2libGVDb250ZW50UmVjdHMgPSBZ RVM7Ci0gICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoIiVwIC1bV0tXZWJWaWV3IF91cGRh dGVWaXNpYmxlQ29udGVudFJlY3RzOl0gLSBfZGVsYXlVcGRhdGVWaXNpYmxlQ29udGVudFJlY3Rz IGlzIFlFUywgYmFpbGluZyIsIHNlbGYpOworICAgIGF1dG8gdGltZU5vdyA9IE1vbm90b25pY1Rp bWU6Om5vdygpOworICAgIGlmIChfdGltZU9mRmlyc3RWaXNpYmxlQ29udGVudFJlY3RVcGRhdGVX aXRoUGVuZGluZ0NvbW1pdCkgeworICAgICAgICBhdXRvIHRpbWVTaW5jZUZpcnN0UmVxdWVzdFdp dGhQZW5kaW5nQ29tbWl0ID0gdGltZU5vdyAtICpfdGltZU9mRmlyc3RWaXNpYmxlQ29udGVudFJl Y3RVcGRhdGVXaXRoUGVuZGluZ0NvbW1pdDsKKyAgICAgICAgaWYgKHRpbWVTaW5jZUZpcnN0UmVx dWVzdFdpdGhQZW5kaW5nQ29tbWl0ID4gZGVsYXlCZWZvcmVOb0NvbW1pdHNMb2dnaW5nKQorICAg ICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiJXAgKFBhZ2VJRD0lbGx1KSAtW1dLV2Vi VmlldyBfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0czpdIC0gaGF2ZSBub3QgcmVjZWl2ZWQgYSBj b21taXQgJS4yZnMgYWZ0ZXIgdmlzaWJsZSBjb250ZW50IHJlY3QgdXBkYXRlOyBsYXN0VHJhbnNh Y3Rpb25JRCAlbGx1Iiwgc2VsZiwgX3BhZ2UtPmlkZW50aWZpZXIoKS50b1VJbnQ2NCgpLCB0aW1l U2luY2VGaXJzdFJlcXVlc3RXaXRoUGVuZGluZ0NvbW1pdC52YWx1ZSgpLCBfbGFzdFRyYW5zYWN0 aW9uSUQudG9VSW50NjQoKSk7CisgICAgfQorCisgICAgaWYgKF9pbnZva2luZ1VJU2Nyb2xsVmll d0RlbGVnYXRlQ2FsbGJhY2spIHsKKyAgICAgICAgX2RpZERlZmVyVXBkYXRlVmlzaWJsZUNvbnRl bnRSZWN0c0ZvclVJU2Nyb2xsVmlld0RlbGVnYXRlQ2FsbGJhY2sgPSBZRVM7CisgICAgICAgIF9k aWREZWZlclVwZGF0ZVZpc2libGVDb250ZW50UmVjdHNGb3JBbnlSZWFzb24gPSBZRVM7CisgICAg ICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoIiVwIChQYWdlSUQ9JWxsdSkgLVtXS1dlYlZpZXcg X3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHM6XSAtIF9pbnZva2luZ1VJU2Nyb2xsVmlld0RlbGVn YXRlQ2FsbGJhY2sgaXMgWUVTLCBiYWlsaW5nIiwgc2VsZiwgX3BhZ2UtPmlkZW50aWZpZXIoKS50 b1VJbnQ2NCgpKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIApAQCAtMzEyOSwxMSArMzE2NSwy MCBAQCAtICh2b2lkKV91cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzCiAgICAgICAgIHx8IChfbmVl ZHNSZXNldFZpZXdTdGF0ZUFmdGVyQ29tbWl0TG9hZEZvck1haW5GcmFtZSAmJiAhW19jb250ZW50 VmlldyBzaXplQ2hhbmdlZFNpbmNlTGFzdFZpc2libGVDb250ZW50UmVjdFVwZGF0ZV0pCiAgICAg ICAgIHx8IFtfc2Nyb2xsVmlldyBpc1pvb21Cb3VuY2luZ10KICAgICAgICAgfHwgX2N1cnJlbnRs eUFkanVzdGluZ1Njcm9sbFZpZXdJbnNldHNGb3JLZXlib2FyZCkgewotICAgICAgICBSRUxFQVNF X0xPR19JRl9BTExPV0VEKCIlcCAtW1dLV2ViVmlldyBfdXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0 czpdIC0gc2Nyb2xsIHZpZXcgc3RhdGUgaXMgbm9uLXN0YWJsZSwgYmFpbGluZyAoX2R5bmFtaWNW aWV3cG9ydFVwZGF0ZU1vZGUgJWQsIF9uZWVkc1Jlc2V0Vmlld1N0YXRlQWZ0ZXJDb21taXRMb2Fk Rm9yTWFpbkZyYW1lICVkLCBzaXplQ2hhbmdlZFNpbmNlTGFzdFZpc2libGVDb250ZW50UmVjdFVw ZGF0ZSAlZCwgW19zY3JvbGxWaWV3IGlzWm9vbUJvdW5jaW5nXSAlZCwgX2N1cnJlbnRseUFkanVz dGluZ1Njcm9sbFZpZXdJbnNldHNGb3JLZXlib2FyZCAlZCkiLAotICAgICAgICAgICAgc2VsZiwg X2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGUsIF9uZWVkc1Jlc2V0Vmlld1N0YXRlQWZ0ZXJDb21t aXRMb2FkRm9yTWFpbkZyYW1lLCBbX2NvbnRlbnRWaWV3IHNpemVDaGFuZ2VkU2luY2VMYXN0Vmlz aWJsZUNvbnRlbnRSZWN0VXBkYXRlXSwgW19zY3JvbGxWaWV3IGlzWm9vbUJvdW5jaW5nXSwgX2N1 cnJlbnRseUFkanVzdGluZ1Njcm9sbFZpZXdJbnNldHNGb3JLZXlib2FyZCk7CisgICAgICAgIF9k aWREZWZlclVwZGF0ZVZpc2libGVDb250ZW50UmVjdHNGb3JBbnlSZWFzb24gPSBZRVM7CisgICAg ICAgIF9kaWREZWZlclVwZGF0ZVZpc2libGVDb250ZW50UmVjdHNGb3JVbnN0YWJsZVNjcm9sbFZp ZXcgPSBZRVM7CisgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoIiVwIChQYWdlSUQ9JWxs dSkgLVtXS1dlYlZpZXcgX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHM6XSAtIHNjcm9sbCB2aWV3 IHN0YXRlIGlzIG5vbi1zdGFibGUsIGJhaWxpbmcgKF9keW5hbWljVmlld3BvcnRVcGRhdGVNb2Rl ICVkLCBfbmVlZHNSZXNldFZpZXdTdGF0ZUFmdGVyQ29tbWl0TG9hZEZvck1haW5GcmFtZSAlZCwg c2l6ZUNoYW5nZWRTaW5jZUxhc3RWaXNpYmxlQ29udGVudFJlY3RVcGRhdGUgJWQsIFtfc2Nyb2xs VmlldyBpc1pvb21Cb3VuY2luZ10gJWQsIF9jdXJyZW50bHlBZGp1c3RpbmdTY3JvbGxWaWV3SW5z ZXRzRm9yS2V5Ym9hcmQgJWQpIiwKKyAgICAgICAgICAgIHNlbGYsIF9wYWdlLT5pZGVudGlmaWVy KCkudG9VSW50NjQoKSwgX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGUsIF9uZWVkc1Jlc2V0Vmll d1N0YXRlQWZ0ZXJDb21taXRMb2FkRm9yTWFpbkZyYW1lLCBbX2NvbnRlbnRWaWV3IHNpemVDaGFu Z2VkU2luY2VMYXN0VmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlXSwgW19zY3JvbGxWaWV3IGlzWm9v bUJvdW5jaW5nXSwgX2N1cnJlbnRseUFkanVzdGluZ1Njcm9sbFZpZXdJbnNldHNGb3JLZXlib2Fy ZCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKKyAgICBpZiAoX2RpZERlZmVyVXBkYXRlVmlz aWJsZUNvbnRlbnRSZWN0c0ZvckFueVJlYXNvbikKKyAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxM T1dFRCgiJXAgKFBhZ2VJRD0lbGx1KSAtW1dLV2ViVmlldyBfdXBkYXRlVmlzaWJsZUNvbnRlbnRS ZWN0czpdIC0gcGVyZm9ybWluZyBmaXJzdCB2aXNpYmxlIGNvbnRlbnQgcmVjdCB1cGRhdGUgYWZ0 ZXIgZGVmZXJyaW5nIHVwZGF0ZXMiLCBzZWxmLCBfcGFnZS0+aWRlbnRpZmllcigpLnRvVUludDY0 KCkpOworCisgICAgX2RpZERlZmVyVXBkYXRlVmlzaWJsZUNvbnRlbnRSZWN0c0ZvclVJU2Nyb2xs Vmlld0RlbGVnYXRlQ2FsbGJhY2sgPSBOTzsKKyAgICBfZGlkRGVmZXJVcGRhdGVWaXNpYmxlQ29u dGVudFJlY3RzRm9yVW5zdGFibGVTY3JvbGxWaWV3ID0gTk87CisgICAgX2RpZERlZmVyVXBkYXRl VmlzaWJsZUNvbnRlbnRSZWN0c0ZvckFueVJlYXNvbiA9IE5POworCiAgICAgQ0dSZWN0IHZpc2li bGVSZWN0SW5Db250ZW50Q29vcmRpbmF0ZXMgPSBbc2VsZiBfdmlzaWJsZUNvbnRlbnRSZWN0XTsK IAogICAgIFVJRWRnZUluc2V0cyBjb21wdXRlZENvbnRlbnRJbnNldFVuYWRqdXN0ZWRGb3JLZXli b2FyZCA9IFtzZWxmIF9jb21wdXRlZE9ic2N1cmVkSW5zZXRdOwpAQCAtMzE5OSwxMiArMzI0NCwx MyBAQCAtICh2b2lkKV91cGRhdGVWaXNpYmxlQ29udGVudFJlY3RzCiAgICAgICAgIGF1dG8gY2Fs bGJhY2sgPSBfdmlzaWJsZUNvbnRlbnRSZWN0VXBkYXRlQ2FsbGJhY2tzLnRha2VMYXN0KCk7CiAg ICAgICAgIGNhbGxiYWNrKCk7CiAgICAgfQotICAgIAotICAgIGF1dG8gdGltZU5vdyA9IE1vbm90 b25pY1RpbWU6Om5vdygpOworCiAgICAgaWYgKCh0aW1lTm93IC0gX3RpbWVPZlJlcXVlc3RGb3JW aXNpYmxlQ29udGVudFJlY3RVcGRhdGUpID4gZGVsYXlCZWZvcmVOb1Zpc2libGVDb250ZW50c1Jl Y3RzTG9nZ2luZykKICAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiJXAgLVtXS1dlYlZp ZXcgX3VwZGF0ZVZpc2libGVDb250ZW50UmVjdHM6XSBmaW5hbGx5IHJhbiAlLjJmcyBhZnRlciBi ZWluZyBzY2hlZHVsZWQiLCBzZWxmLCAodGltZU5vdyAtIF90aW1lT2ZSZXF1ZXN0Rm9yVmlzaWJs ZUNvbnRlbnRSZWN0VXBkYXRlKS52YWx1ZSgpKTsKIAogICAgIF90aW1lT2ZMYXN0VmlzaWJsZUNv bnRlbnRSZWN0VXBkYXRlID0gdGltZU5vdzsKKyAgICBpZiAoIV90aW1lT2ZGaXJzdFZpc2libGVD b250ZW50UmVjdFVwZGF0ZVdpdGhQZW5kaW5nQ29tbWl0KQorICAgICAgICBfdGltZU9mRmlyc3RW aXNpYmxlQ29udGVudFJlY3RVcGRhdGVXaXRoUGVuZGluZ0NvbW1pdCA9IHRpbWVOb3c7CiB9CiAK IC0gKHZvaWQpX2RpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yTWFpbkZyYW1lCkBAIC0zMjI1LDcg KzMyNzEsOCBAQCBzdGF0aWMgaW50MzJfdCBhY3RpdmVPcmllbnRhdGlvbihXS1dlYlZpZXcgKndl YlZpZXcpCiAKIC0gKHZvaWQpX2NhbmNlbEFuaW1hdGVkUmVzaXplCiB7Ci0gICAgTE9HX1dJVEhf U1RSRUFNKFZpc2libGVSZWN0cywgc3RyZWFtIDw8ICItW1dLV2ViVmlldyAiIDw8IF9wYWdlLT5p ZGVudGlmaWVyKCkgPDwgIiBfY2FuY2VsQW5pbWF0ZWRSZXNpemU6XSAiIDw8ICIgX2R5bmFtaWNW aWV3cG9ydFVwZGF0ZU1vZGUgIiA8PCAoaW50KV9keW5hbWljVmlld3BvcnRVcGRhdGVNb2RlKTsK KyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCIlcCAoUGFnZUlEPSVsbHUpIC1bV0tXZWJWaWV3 IF9jYW5jZWxBbmltYXRlZFJlc2l6ZV0gX2R5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGUgJWQiLCBz ZWxmLCBfcGFnZS0+aWRlbnRpZmllcigpLnRvVUludDY0KCksIF9keW5hbWljVmlld3BvcnRVcGRh dGVNb2RlKTsKKwogICAgIGlmIChfZHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZSA9PSBXZWJLaXQ6 OkR5bmFtaWNWaWV3cG9ydFVwZGF0ZU1vZGU6Ok5vdFJlc2l6aW5nKQogICAgICAgICByZXR1cm47 CiAKQEAgLTMyNjAsNiArMzMwNyw4IEBAIC0gKHZvaWQpX2RpZENvbXBsZXRlQW5pbWF0ZWRSZXNp emUKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQo IiVwIChQYWdlSUQ9JWxsdSkgLVtXS1dlYlZpZXcgX2RpZENvbXBsZXRlQW5pbWF0ZWRSZXNpemVd Iiwgc2VsZiwgX3BhZ2UtPmlkZW50aWZpZXIoKS50b1VJbnQ2NCgpKTsKKwogICAgIE5TVUludGVn ZXIgaW5kZXhPZlJlc2l6ZUFuaW1hdGlvblZpZXcgPSBbW19zY3JvbGxWaWV3IHN1YnZpZXdzXSBp bmRleE9mT2JqZWN0Ol9yZXNpemVBbmltYXRpb25WaWV3LmdldCgpXTsKICAgICBbX3Njcm9sbFZp ZXcgaW5zZXJ0U3VidmlldzpfY29udGVudFZpZXcuZ2V0KCkgYXRJbmRleDppbmRleE9mUmVzaXpl QW5pbWF0aW9uVmlld107CiAgICAgW19zY3JvbGxWaWV3IGluc2VydFN1YnZpZXc6W19jb250ZW50 VmlldyB1bnNjYWxlZFZpZXddIGF0SW5kZXg6aW5kZXhPZlJlc2l6ZUFuaW1hdGlvblZpZXcgKyAx XTsKQEAgLTYxNjMsNiArNjIxMiw4IEBAIC0gKHZvaWQpX2JlZ2luQW5pbWF0ZWRSZXNpemVXaXRo VXBkYXRlczoodm9pZCAoXikodm9pZCkpdXBkYXRlQmxvY2sKICAgICAgICAgcmV0dXJuOwogICAg IH0KIAorICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoIiVwIChQYWdlSUQ9JWxsdSkgLVtXS1dl YlZpZXcgX2JlZ2luQW5pbWF0ZWRSZXNpemVXaXRoVXBkYXRlczpdIiwgc2VsZiwgX3BhZ2UtPmlk ZW50aWZpZXIoKS50b1VJbnQ2NCgpKTsKKwogICAgIF9keW5hbWljVmlld3BvcnRVcGRhdGVNb2Rl ID0gV2ViS2l0OjpEeW5hbWljVmlld3BvcnRVcGRhdGVNb2RlOjpSZXNpemluZ1dpdGhBbmltYXRp b247CiAKICAgICBhdXRvIG9sZFZpZXdMYXlvdXRTaXplID0gW3NlbGYgYWN0aXZlVmlld0xheW91 dFNpemU6c2VsZi5ib3VuZHNdOwpAQCAtNjI3NSw3ICs2MzI2LDcgQEAgLSAodm9pZClfYmVnaW5B bmltYXRlZFJlc2l6ZVdpdGhVcGRhdGVzOih2b2lkICheKSh2b2lkKSl1cGRhdGVCbG9jawogCiAt ICh2b2lkKV9lbmRBbmltYXRlZFJlc2l6ZQogewotICAgIExPR19XSVRIX1NUUkVBTShWaXNpYmxl UmVjdHMsIHN0cmVhbSA8PCAiLVtXS1dlYlZpZXcgIiA8PCBfcGFnZS0+aWRlbnRpZmllcigpIDw8 ICIgX2VuZEFuaW1hdGVkUmVzaXplOl0gIiA8PCAiIF9keW5hbWljVmlld3BvcnRVcGRhdGVNb2Rl ICIgPDwgKGludClfZHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZSk7CisgICAgUkVMRUFTRV9MT0df SUZfQUxMT1dFRCgiJXAgKFBhZ2VJRD0lbGx1KSAtW1dLV2ViVmlldyBfZW5kQW5pbWF0ZWRSZXNp emVdIF9keW5hbWljVmlld3BvcnRVcGRhdGVNb2RlICVkIiwgc2VsZiwgX3BhZ2UtPmlkZW50aWZp ZXIoKS50b1VJbnQ2NCgpLCBfZHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZSk7CiAKICAgICAvLyBJ ZiB3ZSBhbHJlYWR5IGhhdmUgYW4gdXAtdG8tZGF0ZSBsYXllciB0cmVlLCBpbW1lZGlhdGVseSBj b21wbGV0ZQogICAgIC8vIHRoZSByZXNpemUuIE90aGVyd2lzZSwgd2Ugd2lsbCBkZWZlciBjb21w bGV0aW9uIHVudGlsIHdlIGRvLgpAQCAtNjI4Niw3ICs2MzM3LDggQEAgLSAodm9pZClfZW5kQW5p bWF0ZWRSZXNpemUKIAogLSAodm9pZClfcmVzaXplV2hpbGVIaWRpbmdDb250ZW50V2l0aFVwZGF0 ZXM6KHZvaWQgKF4pKHZvaWQpKXVwZGF0ZUJsb2NrCiB7Ci0gICAgTE9HX1dJVEhfU1RSRUFNKFZp c2libGVSZWN0cywgc3RyZWFtIDw8ICItW1dLV2ViVmlldyAiIDw8IF9wYWdlLT5pZGVudGlmaWVy KCkgPDwgIiBfcmVzaXplV2hpbGVIaWRpbmdDb250ZW50V2l0aFVwZGF0ZXM6XSIpOworICAgIFJF TEVBU0VfTE9HX0lGX0FMTE9XRUQoIiVwIChQYWdlSUQ9JWxsdSkgLVtXS1dlYlZpZXcgX3Jlc2l6 ZVdoaWxlSGlkaW5nQ29udGVudFdpdGhVcGRhdGVzOl0iLCBzZWxmLCBfcGFnZS0+aWRlbnRpZmll cigpLnRvVUludDY0KCkpOworCiAgICAgW3NlbGYgX2JlZ2luQW5pbWF0ZWRSZXNpemVXaXRoVXBk YXRlczp1cGRhdGVCbG9ja107CiAgICAgaWYgKF9keW5hbWljVmlld3BvcnRVcGRhdGVNb2RlID09 IFdlYktpdDo6RHluYW1pY1ZpZXdwb3J0VXBkYXRlTW9kZTo6UmVzaXppbmdXaXRoQW5pbWF0aW9u KSB7CiAgICAgICAgIFtfY29udGVudFZpZXcgc2V0SGlkZGVuOllFU107CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvV2ViUGFnZS9XZWJQYWdlLmNwcCBiL1NvdXJjZS9XZWJL aXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2UuY3BwCmluZGV4IGRmZWQ5MWVjOGMwMGFiMGU2 YmRlYWJhNmJmZTM2M2EzMzA1ZDU2MmEuLjdhMjZjNmQ2YmUwMzkyZjBmYWE3YTU2ZGVmMzQxYzQ1 YTA4MDc2OWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dl YlBhZ2UuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9XZWJQYWdlL1dlYlBhZ2Uu Y3BwCkBAIC0yNDk3LDE3ICsyNDk3LDE3IEBAIGNvbnN0IFdlYkV2ZW50KiBXZWJQYWdlOjpjdXJy ZW50RXZlbnQoKQogCiB2b2lkIFdlYlBhZ2U6OmZyZWV6ZUxheWVyVHJlZShMYXllclRyZWVGcmVl emVSZWFzb24gcmVhc29uKQogewotICAgIFJFTEVBU0VfTE9HKFByb2Nlc3NTdXNwZW5zaW9uLCAi JXAgLSBXZWJQYWdlIChQYWdlSUQ9JWxsdSkgLSBBZGRpbmcgYSByZWFzb24gJWQgdG8gZnJlZXpl IGxheWVyIHRyZWU7IGN1cnJlbnQgcmVhc29ucyBhcmUgJWQiLAotICAgICAgICB0aGlzLCBtX2lk ZW50aWZpZXIudG9VSW50NjQoKSwgc3RhdGljX2Nhc3Q8dW5zaWduZWQ+KHJlYXNvbiksIG1fbGF5 ZXJUcmVlRnJlZXplUmVhc29ucy50b1JhdygpKTsKKyAgICBhdXRvIG9sZFJlYXNvbnMgPSBtX2xh eWVyVHJlZUZyZWV6ZVJlYXNvbnMudG9SYXcoKTsKICAgICBtX2xheWVyVHJlZUZyZWV6ZVJlYXNv bnMuYWRkKHJlYXNvbik7CisgICAgUkVMRUFTRV9MT0coUHJvY2Vzc1N1c3BlbnNpb24sICIlcCAt IFdlYlBhZ2UgKFBhZ2VJRD0lbGx1KSAtIEFkZGluZyBhIHJlYXNvbiAlZCB0byBmcmVlemUgbGF5 ZXIgdHJlZSAobm93ICVkKTsgb2xkIHJlYXNvbnMgd2VyZSAlZCIsIHRoaXMsIG1faWRlbnRpZmll ci50b1VJbnQ2NCgpLCBzdGF0aWNfY2FzdDx1bnNpZ25lZD4ocmVhc29uKSwgbV9sYXllclRyZWVG cmVlemVSZWFzb25zLnRvUmF3KCksIG9sZFJlYXNvbnMpOwogICAgIHVwZGF0ZURyYXdpbmdBcmVh TGF5ZXJUcmVlRnJlZXplU3RhdGUoKTsKIH0KIAogdm9pZCBXZWJQYWdlOjp1bmZyZWV6ZUxheWVy VHJlZShMYXllclRyZWVGcmVlemVSZWFzb24gcmVhc29uKQogewotICAgIFJFTEVBU0VfTE9HKFBy b2Nlc3NTdXNwZW5zaW9uLCAiJXAgLSBXZWJQYWdlIChQYWdlSUQ9JWxsdSkgLSBSZW1vdmluZyBh IHJlYXNvbiAlZCB0byBmcmVlemUgbGF5ZXIgdHJlZTsgY3VycmVudCByZWFzb25zIGFyZSAlZCIs Ci0gICAgICAgIHRoaXMsIG1faWRlbnRpZmllci50b1VJbnQ2NCgpLCBzdGF0aWNfY2FzdDx1bnNp Z25lZD4ocmVhc29uKSwgbV9sYXllclRyZWVGcmVlemVSZWFzb25zLnRvUmF3KCkpOworICAgIGF1 dG8gb2xkUmVhc29ucyA9IG1fbGF5ZXJUcmVlRnJlZXplUmVhc29ucy50b1JhdygpOwogICAgIG1f bGF5ZXJUcmVlRnJlZXplUmVhc29ucy5yZW1vdmUocmVhc29uKTsKKyAgICBSRUxFQVNFX0xPRyhQ cm9jZXNzU3VzcGVuc2lvbiwgIiVwIC0gV2ViUGFnZSAoUGFnZUlEPSVsbHUpIC0gUmVtb3Zpbmcg YSByZWFzb24gJWQgdG8gZnJlZXplIGxheWVyIHRyZWUgKG5vdyAlZCk7IG9sZCByZWFzb25zIHdl cmUgJWQiLCB0aGlzLCBtX2lkZW50aWZpZXIudG9VSW50NjQoKSwgc3RhdGljX2Nhc3Q8dW5zaWdu ZWQ+KHJlYXNvbiksIG1fbGF5ZXJUcmVlRnJlZXplUmVhc29ucy50b1JhdygpLCBvbGRSZWFzb25z KTsKICAgICB1cGRhdGVEcmF3aW5nQXJlYUxheWVyVHJlZUZyZWV6ZVN0YXRlKCk7CiB9CiAK