182590 2018-02-07 17:11:35 -0800 Evernote device management web view sometimes displays at the wrong scale 2018-02-07 17:27:40 -0800 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton bdakin mitz simon.fraser wenson_hsieh oldest_to_newest 1397391 0 thorton 2018-02-07 17:11:35 -0800 Evernote device management web view sometimes displays at the wrong scale 1397392 1 333342 thorton 2018-02-07 17:12:35 -0800 Created attachment 333342 Patch 1397393 2 thorton 2018-02-07 17:12:55 -0800 <rdar://problem/36633687> 1397394 3 333342 simon.fraser 2018-02-07 17:22:06 -0800 Comment on attachment 333342 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=333342&action=review > Source/WebKit/ChangeLog:25 > + Evernote implements the WKWebView's scroll view's delegate method > + viewForZoomingInScrollView: and returns null. This results in > + WKScrollView's zoomScale always returning 1, no matter what the > + WKContentView's actual scale is. This will result in us never updating > + the WKContentView's scale to 1. When loading a page that has a few > + scale changes during load but ends up at scale 1, we get stuck at whatever > + intermediate scale immediately preceded settling on 1. > + > + Fix this by not forwarding viewForZoomingInScrollView: to the external > + WKScrollView delegate; we are in charge of the contents of the scroll > + view (including which view scrollView's zoomScale should track), and > + overriding viewForZoomingInScrollView: is only ever going to lead to > + a broken WebKit. Put all this above the function names. Also null -> nil says mitz. > Tools/TestWebKitAPI/Tests/ios/WKScrollViewDelegate.mm:2 > + * Copyright (C) 2016 Apple Inc. All rights reserved. 2016-2018 i guess. 1397398 4 thorton 2018-02-07 17:27:40 -0800 https://trac.webkit.org/changeset/228253/webkit 333342 2018-02-07 17:12:35 -0800 2018-02-07 17:22:06 -0800 Patch bug-182590-20180207171234.patch text/plain 17951 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjI4MTQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY2MDEyNTI5Y2UyMDdiYWQ3 ZWJmMTUwOTMwNmI4OGQ3OTVjNzIwZTguLmM2Yjg0Y2QwNWVmYjc4YjI5OTRmNTE1Y2M4N2IxZDRl OGYzNTZjYzcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjkgQEAKKzIwMTgtMDItMDcgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgRXZlcm5vdGUgZGV2aWNl IG1hbmFnZW1lbnQgd2ViIHZpZXcgc29tZXRpbWVzIGRpc3BsYXlzIGF0IHRoZSB3cm9uZyBzY2Fs ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgyNTkw CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNjYzMzY4Nz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tTY3JvbGxWaWV3 Lm1tOgorICAgICAgICAoc2hvdWxkRm9yd2FyZFNjcm9sbFZpZXdEZWxlZ2F0ZU1ldGhvZFRvRXh0 ZXJuYWxEZWxlZ2F0ZSk6CisgICAgICAgICgtW1dLU2Nyb2xsVmlld0RlbGVnYXRlRm9yd2FyZGVy IGZvcndhcmRJbnZvY2F0aW9uOl0pOgorICAgICAgICAoLVtXS1Njcm9sbFZpZXdEZWxlZ2F0ZUZv cndhcmRlciBmb3J3YXJkaW5nVGFyZ2V0Rm9yU2VsZWN0b3I6XSk6CisgICAgICAgIEV2ZXJub3Rl IGltcGxlbWVudHMgdGhlIFdLV2ViVmlldydzIHNjcm9sbCB2aWV3J3MgZGVsZWdhdGUgbWV0aG9k CisgICAgICAgIHZpZXdGb3Jab29taW5nSW5TY3JvbGxWaWV3OiBhbmQgcmV0dXJucyBudWxsLiBU aGlzIHJlc3VsdHMgaW4KKyAgICAgICAgV0tTY3JvbGxWaWV3J3Mgem9vbVNjYWxlIGFsd2F5cyBy ZXR1cm5pbmcgMSwgbm8gbWF0dGVyIHdoYXQgdGhlCisgICAgICAgIFdLQ29udGVudFZpZXcncyBh Y3R1YWwgc2NhbGUgaXMuIFRoaXMgd2lsbCByZXN1bHQgaW4gdXMgbmV2ZXIgdXBkYXRpbmcKKyAg ICAgICAgdGhlIFdLQ29udGVudFZpZXcncyBzY2FsZSB0byAxLiBXaGVuIGxvYWRpbmcgYSBwYWdl IHRoYXQgaGFzIGEgZmV3CisgICAgICAgIHNjYWxlIGNoYW5nZXMgZHVyaW5nIGxvYWQgYnV0IGVu ZHMgdXAgYXQgc2NhbGUgMSwgd2UgZ2V0IHN0dWNrIGF0IHdoYXRldmVyCisgICAgICAgIGludGVy bWVkaWF0ZSBzY2FsZSBpbW1lZGlhdGVseSBwcmVjZWRlZCBzZXR0bGluZyBvbiAxLgorCisgICAg ICAgIEZpeCB0aGlzIGJ5IG5vdCBmb3J3YXJkaW5nIHZpZXdGb3Jab29taW5nSW5TY3JvbGxWaWV3 OiB0byB0aGUgZXh0ZXJuYWwKKyAgICAgICAgV0tTY3JvbGxWaWV3IGRlbGVnYXRlOyB3ZSBhcmUg aW4gY2hhcmdlIG9mIHRoZSBjb250ZW50cyBvZiB0aGUgc2Nyb2xsCisgICAgICAgIHZpZXcgKGlu Y2x1ZGluZyB3aGljaCB2aWV3IHNjcm9sbFZpZXcncyB6b29tU2NhbGUgc2hvdWxkIHRyYWNrKSwg YW5kCisgICAgICAgIG92ZXJyaWRpbmcgdmlld0Zvclpvb21pbmdJblNjcm9sbFZpZXc6IGlzIG9u bHkgZXZlciBnb2luZyB0byBsZWFkIHRvCisgICAgICAgIGEgYnJva2VuIFdlYktpdC4KKwogMjAx OC0wMi0wNSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgV2Vi c2l0ZURhdGFTdG9yZTo6cmVzb2x2ZURpcmVjdG9yaWVzSWZOZWNlc3NhcnkoKSBzaG91bGQgbm90 IG92ZXJ3cml0ZSBpdHMgcmVzb2x2ZWQgc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbkRpcmVjdG9y eSAgaWYgYWxyZWFkeSBzZXQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lv cy9XS1Njcm9sbFZpZXcubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tTY3JvbGxW aWV3Lm1tCmluZGV4IDBlZTgyYjA4MjllMWQyYzZhMzRlODYxNzBlNjA0NDNkYThjYTdlNWIuLjg4 MjAzZTZmZjI3Mjg2Mzg2NDI4ZDEzNjBhZTlhZjhhZDI5MjQ3YzggMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS1Njcm9sbFZpZXcubW0KKysrIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvaW9zL1dLU2Nyb2xsVmlldy5tbQpAQCAtNzksMTIgKzc5LDIzIEBAIC0gKEJP T0wpcmVzcG9uZHNUb1NlbGVjdG9yOihTRUwpYVNlbGVjdG9yCiAgICAgcmV0dXJuIFtzdXBlciBy ZXNwb25kc1RvU2VsZWN0b3I6YVNlbGVjdG9yXSB8fCBbX2ludGVybmFsRGVsZWdhdGUgcmVzcG9u ZHNUb1NlbGVjdG9yOmFTZWxlY3Rvcl0gfHwgW19leHRlcm5hbERlbGVnYXRlLmdldCgpIHJlc3Bv bmRzVG9TZWxlY3RvcjphU2VsZWN0b3JdOwogfQogCitzdGF0aWMgQk9PTCBzaG91bGRGb3J3YXJk U2Nyb2xsVmlld0RlbGVnYXRlTWV0aG9kVG9FeHRlcm5hbERlbGVnYXRlKFNFTCBzZWxlY3RvcikK K3sKKyAgICAvLyBXZSBjYW5ub3QgZm9yd2FyZCB2aWV3Rm9yWm9vbWluZ0luU2Nyb2xsVmlldzog dG8gdGhlIGV4dGVybmFsIGRlbGVnYXRlLCBiZWNhdXNlIFdlYktpdAorICAgIC8vIG93bnMgdGhl IGNvbnRlbnQgb2YgdGhlIHNjcm9sbCB2aWV3LCBhbmQgZGVwZW5kcyBvbiB2aWV3Rm9yWm9vbWlu Z0luU2Nyb2xsVmlldyBiZWluZyB0aGUKKyAgICAvLyBjb250ZW50IHZpZXcuIEFueSBvdGhlciB2 aWV3IHJldHVybmVkIGJ5IHRoZSBleHRlcm5hbCBkZWxlZ2F0ZSB3aWxsIGJyZWFrIG91ciBiZWhh dmlvci4KKyAgICBpZiAoc2VsX2lzRXF1YWwoc2VsZWN0b3IsIEBzZWxlY3Rvcih2aWV3Rm9yWm9v bWluZ0luU2Nyb2xsVmlldzopKSkKKyAgICAgICAgcmV0dXJuIE5POworCisgICAgcmV0dXJuIFlF UzsKK30KKwogLSAodm9pZClmb3J3YXJkSW52b2NhdGlvbjooTlNJbnZvY2F0aW9uICopYW5JbnZv Y2F0aW9uCiB7CiAgICAgYXV0byBleHRlcm5hbERlbGVnYXRlID0gX2V4dGVybmFsRGVsZWdhdGUu Z2V0KCk7CiAgICAgU0VMIGFTZWxlY3RvciA9IFthbkludm9jYXRpb24gc2VsZWN0b3JdOwogICAg IEJPT0wgaW50ZXJuYWxEZWxlZ2F0ZVdpbGxSZXNwb25kID0gW19pbnRlcm5hbERlbGVnYXRlIHJl c3BvbmRzVG9TZWxlY3RvcjphU2VsZWN0b3JdOwotICAgIEJPT0wgZXh0ZXJuYWxEZWxlZ2F0ZVdp bGxSZXNwb25kID0gW2V4dGVybmFsRGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOmFTZWxlY3Rv cl07CisgICAgQk9PTCBleHRlcm5hbERlbGVnYXRlV2lsbFJlc3BvbmQgPSBzaG91bGRGb3J3YXJk U2Nyb2xsVmlld0RlbGVnYXRlTWV0aG9kVG9FeHRlcm5hbERlbGVnYXRlKGFTZWxlY3RvcikgJiYg W2V4dGVybmFsRGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOmFTZWxlY3Rvcl07CiAKICAgICBp ZiAoaW50ZXJuYWxEZWxlZ2F0ZVdpbGxSZXNwb25kICYmIGV4dGVybmFsRGVsZWdhdGVXaWxsUmVz cG9uZCkKICAgICAgICAgW19pbnRlcm5hbERlbGVnYXRlIF93aWxsSW52b2tlVUlTY3JvbGxWaWV3 RGVsZWdhdGVDYWxsYmFja107CkBAIC0xMDQsNyArMTE1LDcgQEAgLSAodm9pZClmb3J3YXJkSW52 b2NhdGlvbjooTlNJbnZvY2F0aW9uICopYW5JbnZvY2F0aW9uCiAtIChpZClmb3J3YXJkaW5nVGFy Z2V0Rm9yU2VsZWN0b3I6KFNFTClhU2VsZWN0b3IKIHsKICAgICBCT09MIGludGVybmFsRGVsZWdh dGVXaWxsUmVzcG9uZCA9IFtfaW50ZXJuYWxEZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6YVNl bGVjdG9yXTsKLSAgICBCT09MIGV4dGVybmFsRGVsZWdhdGVXaWxsUmVzcG9uZCA9IFtfZXh0ZXJu YWxEZWxlZ2F0ZS5nZXQoKSByZXNwb25kc1RvU2VsZWN0b3I6YVNlbGVjdG9yXTsKKyAgICBCT09M IGV4dGVybmFsRGVsZWdhdGVXaWxsUmVzcG9uZCA9IHNob3VsZEZvcndhcmRTY3JvbGxWaWV3RGVs ZWdhdGVNZXRob2RUb0V4dGVybmFsRGVsZWdhdGUoYVNlbGVjdG9yKSAmJiBbX2V4dGVybmFsRGVs ZWdhdGUuZ2V0KCkgcmVzcG9uZHNUb1NlbGVjdG9yOmFTZWxlY3Rvcl07CiAKICAgICBpZiAoaW50 ZXJuYWxEZWxlZ2F0ZVdpbGxSZXNwb25kICYmICFleHRlcm5hbERlbGVnYXRlV2lsbFJlc3BvbmQp CiAgICAgICAgIHJldHVybiBfaW50ZXJuYWxEZWxlZ2F0ZTsKZGlmZiAtLWdpdCBhL1Rvb2xzL0No YW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBlOGIyMjE2YTFiNGQ4OTgxMjQ2YTg1OWE4 MDQ2NzFhNGVjYzFkZmI1Li4xYzQyYWMxNjczOGYzNGEzY2NjMDU1NTgyZGFjZDMwM2RjYjdlNDIw IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0x LDMgKzEsMjEgQEAKKzIwMTgtMDItMDcgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBs ZS5jb20+CisKKyAgICAgICAgRXZlcm5vdGUgZGV2aWNlIG1hbmFnZW1lbnQgd2ViIHZpZXcgc29t ZXRpbWVzIGRpc3BsYXlzIGF0IHRoZSB3cm9uZyBzY2FsZQorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgyNTkwCisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS8zNjYzMzY4Nz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL1dLU2Nyb2xsVmlld0RlbGVn YXRlLm1tOiBSZW5hbWVkIGZyb20gVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9pb3MvV0tTY3Jv bGxWaWV3RGVsZWdhdGVDcmFzaC5tbS4KKyAgICAgICAgKC1bVGVzdERlbGVnYXRlRm9yU2Nyb2xs VmlldyBkZWFsbG9jXSk6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKyAgICAgICAg KC1bV0tTY3JvbGxWaWV3RGVsZWdhdGVXaXRoVmlld0Zvclpvb21pbmdPdmVycmlkZGVuIHZpZXdG b3Jab29taW5nSW5TY3JvbGxWaWV3Ol0pOgorICAgICAgICBBZGQgYSB0ZXN0IHRoYXQgZmFpbGVk IGJlZm9yZSB0aGUgY2hhbmdlIHRoYXQgZW5zdXJlcyB0aGF0IHdlIGRvbid0CisgICAgICAgIGNv bnN1bHQgdGhlIGV4dGVybmFsIGRlbGVnYXRlIGZvciB2aWV3Rm9yWm9vbWluZ0luU2Nyb2xsVmll dzosIGFuZCB0aGF0CisgICAgICAgIHdlIHN1Y2Nlc2Z1bGx5IHVwZGF0ZSB0aGUgc2NhbGUgZXZl biBpZiBpdCBtYXRjaGVzIHRoYXQgb2YgdGhlIHZpZXcKKyAgICAgICAgdGhlIGV4dGVybmFsIGRl bGVnYXRlIHJldHVybnMgZm9yIHZpZXdGb3Jab29taW5nSW5TY3JvbGxWaWV3Oi4KKwogMjAxOC0w Mi0wNSAgRGFuaWVsIEJhdGVzICA8ZGFiYXRlc0BhcHBsZS5jb20+CiAKICAgICAgICAgUkVHUkVT U0lPTiAocjIxNzU3Mik6IHJ1bi13ZWJraXQtdGVzdHMgZXhpdHMgd2l0aG91dCBlbWl0dGluZyBu ZXdsaW5lIGNoYXJhY3RlcgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2Vi S2l0QVBJLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCBiYmIxN2Y5NjliYWM5 MmM3M2QzYmM3MDU5MjcyZmQ5MWE1NDQyNWZiLi41Yjg2ZDZlYTFiYmI5MjVjZjU2ZjQxZDY2Yzky N2UzZWFkMTQyMGI1IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRB UEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rl c3RXZWJLaXRBUEkueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAtMjY3LDcgKzI2Nyw3IEBA CiAJCTVDQjVCM0MyMUZGQzU1Q0YwMEMyN0JCMCAvKiBGcmFtZUhhbmRsZVNlcmlhbGl6YXRpb24u bW0gaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1Q0I1QjNC RDFGRkM1MTdFMDBDMjdCQjAgLyogRnJhbWVIYW5kbGVTZXJpYWxpemF0aW9uLm1tICovOyB9Owog CQk1Q0UzNTREOTFFNzBEQTVDMDBCRUZFM0IgLyogV0tDb250ZW50RXh0ZW5zaW9uU3RvcmUubW0g aW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA1Q0UzNTREODFF NzBEOUMzMDBCRUZFM0IgLyogV0tDb250ZW50RXh0ZW5zaW9uU3RvcmUubW0gKi87IH07CiAJCTVD RUFCNUUxMUZBOTM5RjQwMEE3N0ZBQSAvKiBfV0tJbnB1dERlbGVnYXRlLm1tIGluIFNvdXJjZXMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNUNFQUI1REYxRkE5MzdDQjAwQTc3 RkFBIC8qIF9XS0lucHV0RGVsZWdhdGUubW0gKi87IH07Ci0JCTVFNEIxRDJFMUQ0MDRDNjEwMDA1 MzYyMSAvKiBXS1Njcm9sbFZpZXdEZWxlZ2F0ZUNyYXNoLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gNUU0QjFEMkMxRDQwNEM2MTAwMDUzNjIxIC8qIFdL U2Nyb2xsVmlld0RlbGVnYXRlQ3Jhc2gubW0gKi87IH07CisJCTVFNEIxRDJFMUQ0MDRDNjEwMDA1 MzYyMSAvKiBXS1Njcm9sbFZpZXdEZWxlZ2F0ZS5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDVFNEIxRDJDMUQ0MDRDNjEwMDA1MzYyMSAvKiBXS1Njcm9s bFZpZXdEZWxlZ2F0ZS5tbSAqLzsgfTsKIAkJNjMxRUZGRjYxRTdCNUU4RDAwRDJFQkI4IC8qIEdl b2xvY2F0aW9uLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gNjMxRUZGRjUxRTdCNUU4RDAwRDJFQkI4IC8qIEdlb2xvY2F0aW9uLm1tICovOyB9OwogCQk2 MzQ5MTBFMDFFOUQzRkYzMDA4ODAzMDkgLyogQ29yZUxvY2F0aW9uLmZyYW1ld29yayBpbiBGcmFt ZXdvcmtzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDYzNDkxMERGMUU5RDNG RjMwMDg4MDMwOSAvKiBDb3JlTG9jYXRpb24uZnJhbWV3b3JrICovOyB9OwogCQk2MzU0RjREMTFG N0MzQUI1MDBEODlERjMgLyogQXBwbGljYXRpb25NYW5pZmVzdFBhcnNlci5jcHAgaW4gU291cmNl cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA2MzU0RjREMDFGN0MzQUI1MDBE ODlERjMgLyogQXBwbGljYXRpb25NYW5pZmVzdFBhcnNlci5jcHAgKi87IH07CkBAIC0xNDM4LDcg KzE0MzgsNyBAQAogCQk1Q0I1QjNCRDFGRkM1MTdFMDBDMjdCQjAgLyogRnJhbWVIYW5kbGVTZXJp YWxpemF0aW9uLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RLbm93bkZpbGVU eXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBwYXRoID0gRnJhbWVIYW5kbGVTZXJpYWxpemF0 aW9uLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk1Q0UzNTREODFFNzBEOUMzMDBC RUZFM0IgLyogV0tDb250ZW50RXh0ZW5zaW9uU3RvcmUubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmNwcC5vYmpjcHA7IHBhdGggPSBXS0NvbnRlbnRFeHRlbnNpb25TdG9yZS5tbTsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNUNFQUI1REYxRkE5MzdDQjAwQTc3RkFBIC8qIF9XS0lucHV0 RGVsZWdhdGUubW0gKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0g NDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5vYmpjcHA7IHBhdGggPSBfV0tJ bnB1dERlbGVnYXRlLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwotCQk1RTRCMUQyQzFE NDA0QzYxMDAwNTM2MjEgLyogV0tTY3JvbGxWaWV3RGVsZWdhdGVDcmFzaC5tbSAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9 IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsgbmFtZSA9IFdLU2Nyb2xsVmlld0RlbGVnYXRlQ3Jhc2gu bW07IHBhdGggPSAuLi9pb3MvV0tTY3JvbGxWaWV3RGVsZWdhdGVDcmFzaC5tbTsgc291cmNlVHJl ZSA9ICI8Z3JvdXA+IjsgfTsKKwkJNUU0QjFEMkMxRDQwNEM2MTAwMDUzNjIxIC8qIFdLU2Nyb2xs Vmlld0RlbGVnYXRlLm1tICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAub2JqY3BwOyBuYW1lID0g V0tTY3JvbGxWaWV3RGVsZWdhdGUubW07IHBhdGggPSAuLi9pb3MvV0tTY3JvbGxWaWV3RGVsZWdh dGUubW07IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTYzMUVGRkY1MUU3QjVFOEQwMEQy RUJCOCAvKiBHZW9sb2NhdGlvbi5tbSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxl RW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLm9iamNwcDsg cGF0aCA9IEdlb2xvY2F0aW9uLm1tOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk2MzQ5 MTBERjFFOUQzRkYzMDA4ODAzMDkgLyogQ29yZUxvY2F0aW9uLmZyYW1ld29yayAqLyA9IHtpc2Eg PSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHdyYXBwZXIuZnJhbWV3b3Jr OyBuYW1lID0gQ29yZUxvY2F0aW9uLmZyYW1ld29yazsgcGF0aCA9IFN5c3RlbS9MaWJyYXJ5L0Zy YW1ld29ya3MvQ29yZUxvY2F0aW9uLmZyYW1ld29yazsgc291cmNlVHJlZSA9IFNES1JPT1Q7IH07 CiAJCTYzNTRGNEQwMUY3QzNBQjUwMEQ4OURGMyAvKiBBcHBsaWNhdGlvbk1hbmlmZXN0UGFyc2Vy LmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IEFwcGxpY2F0aW9uTWFuaWZlc3RQYXJzZXIuY3BwOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtMjE3Miw3ICsyMTcyLDcgQEAKIAkJCQkyRDAw MDY1RDFDMUY1ODk0MDA4OEU2QTcgLyogV0tQREZWaWV3UmVzaXplQ3Jhc2gubW0gKi8sCiAJCQkJ MkQyMUZFNTgxRjA0NjQyODAwQjU4RTdEIC8qIFdLUERGVmlld1N0YWJsZVByZXNlbnRhdGlvblVw ZGF0ZUNhbGxiYWNrLm1tICovLAogCQkJCTQ0ODE3QTJFMUYwNDg2QkYwMDAwMzgxMCAvKiBXS1Jl cXVlc3RBY3RpdmF0ZWRFbGVtZW50SW5mby5tbSAqLywKLQkJCQk1RTRCMUQyQzFENDA0QzYxMDAw NTM2MjEgLyogV0tTY3JvbGxWaWV3RGVsZWdhdGVDcmFzaC5tbSAqLywKKwkJCQk1RTRCMUQyQzFE NDA0QzYxMDAwNTM2MjEgLyogV0tTY3JvbGxWaWV3RGVsZWdhdGUubW0gKi8sCiAJCQkJNTFDNjgz REQxRUExMzREQjAwNjUwMTgzIC8qIFdLVVJMU2NoZW1lSGFuZGxlci0xLm1tICovLAogCQkJCTUx ODJDMjJEMUYyQkNCNDEwMDU5QkE3QyAvKiBXS1VSTFNjaGVtZUhhbmRsZXItbGVha3MubW0gKi8s CiAJCQkJMzcxMTk1QUExRkU1Nzk3NzAwQTFGQjkyIC8qIFdLV2ViVmlld0Fsd2F5c1Nob3dzU2Ny b2xsZXIubW0gKi8sCkBAIC0zNTE2LDYgKzM1MTYsNyBAQAogCQkJCTVDMEJGODhEMURENTk2NEQw MEIwMDMyOCAvKiBNZW1vcnlQcmVzc3VyZUhhbmRsZXIubW0gaW4gU291cmNlcyAqLywKIAkJCQk3 QzgzRTBCNzFEMEE2NEI4MDBGRUJDRjMgLyogTWVudVR5cGVzRm9yTW91c2VFdmVudHMuY3BwIGlu IFNvdXJjZXMgKi8sCiAJCQkJNUMwQkY4OTQxREQ1OTlDOTAwQjAwMzI4IC8qIE1lbnVUeXBlc0Zv ck1vdXNlRXZlbnRzLm1tIGluIFNvdXJjZXMgKi8sCisJCQkJNTE2NUZFMDQyMDFFRTYyMDAwOUY3 RUMzIC8qIE1lc3NhZ2VQb3J0UHJvdmlkZXJzLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJQTVCMTQ5 REUxRjVBMTlFQTAwQzZEQUZGIC8qIE1JTUVUeXBlUmVnaXN0cnkuY3BwIGluIFNvdXJjZXMgKi8s CiAJCQkJNTFDRDFDNkMxQjM4Q0U0MzAwMTQyQ0E1IC8qIE1vZGFsQWxlcnRzLm1tIGluIFNvdXJj ZXMgKi8sCiAJCQkJN0M4M0UwQjYxRDBBNjRCMzAwRkVCQ0YzIC8qIE1vZGFsQWxlcnRzU1BJLmNw cCBpbiBTb3VyY2VzICovLApAQCAtMzU2MCw3ICszNTYxLDYgQEAKIAkJCQk3Q0NFN0YwQzFBNDEx QUU2MDA0NDdDNEMgLyogUHJpdmF0ZUJyb3dzaW5nUHVzaFN0YXRlTm9IaXN0b3J5Q2FsbGJhY2su Y3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJNDY0N0IxMjYxRUJBM0I4NTAwNDFEN0VGIC8qIFByb2Nl c3NEaWRUZXJtaW5hdGUuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJN0M4M0UwQzExRDBBNjUyRjAw RkVCQ0YzIC8qIFByb3Zpc2lvbmFsVVJMTm90Q2hhbmdlLm1tIGluIFNvdXJjZXMgKi8sCi0JCQkJ NTE2NUZFMDQyMDFFRTYyMDAwOUY3RUMzIC8qIE1lc3NhZ2VQb3J0UHJvdmlkZXJzLm1tIGluIFNv dXJjZXMgKi8sCiAJCQkJN0NDRTdFQzgxQTQxMUE3RTAwNDQ3QzRDIC8qIFB1YmxpY1N1ZmZpeC5t bSBpbiBTb3VyY2VzICovLAogCQkJCTdDODNFMEMyMUQwQTY1MzUwMEZFQkNGMyAvKiBRdWlja0xv b2subW0gaW4gU291cmNlcyAqLywKIAkJCQk3Q0NFN0YwRDFBNDExQUU2MDA0NDdDNEMgLyogUmVs b2FkUGFnZUFmdGVyQ3Jhc2guY3BwIGluIFNvdXJjZXMgKi8sCkBAIC0zNjgwLDcgKzM2ODAsNyBA QAogCQkJCTdDQ0U3RjIxMUE0MTFBRTYwMDQ0N0M0QyAvKiBXS1ByZWZlcmVuY2VzLmNwcCBpbiBT b3VyY2VzICovLAogCQkJCTQ0ODE3QTJGMUYwNDg2QkYwMDAwMzgxMCAvKiBXS1JlcXVlc3RBY3Rp dmF0ZWRFbGVtZW50SW5mby5tbSBpbiBTb3VyY2VzICovLAogCQkJCTdDODNFMEI1MUQwQTY0OTMw MEZFQkNGMyAvKiBXS1JldGFpblB0ci5jcHAgaW4gU291cmNlcyAqLywKLQkJCQk1RTRCMUQyRTFE NDA0QzYxMDAwNTM2MjEgLyogV0tTY3JvbGxWaWV3RGVsZWdhdGVDcmFzaC5tbSBpbiBTb3VyY2Vz ICovLAorCQkJCTVFNEIxRDJFMUQ0MDRDNjEwMDA1MzYyMSAvKiBXS1Njcm9sbFZpZXdEZWxlZ2F0 ZS5tbSBpbiBTb3VyY2VzICovLAogCQkJCTdDQ0U3RjIyMUE0MTFBRTYwMDQ0N0M0QyAvKiBXS1N0 cmluZy5jcHAgaW4gU291cmNlcyAqLywKIAkJCQk3Q0NFN0YxRTFBNDExQUU2MDA0NDdDNEMgLyog V0tTdHJpbmdKU1N0cmluZy5jcHAgaW4gU291cmNlcyAqLywKIAkJCQkyRDRDRjhCRDFEODM2MEND MDAwMUNFOEQgLyogV0tUaHVtYm5haWxWaWV3Lm1tIGluIFNvdXJjZXMgKi8sCmRpZmYgLS1naXQg YS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9XS1Njcm9sbFZpZXdEZWxlZ2F0ZS5tbSBi L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL1dLU2Nyb2xsVmlld0RlbGVnYXRlLm1tCm5l dyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAuLjE3YmMxN2UzMWExZGY0ZDE3YmIzNWIyYmViNTljMzFhMjU1NmNlYjMKLS0tIC9k ZXYvbnVsbAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9XS1Njcm9sbFZpZXdE ZWxlZ2F0ZS5tbQpAQCAtMCwwICsxLDEyMSBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAxNiBB cHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2Rp ZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUg bXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qg b2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0 cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmln aHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dp bmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1h dGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZU V0FSRSBJUyBQUk9WSURFRCBCWSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMg SVMnJworICogQU5EIEFOWSBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5H LCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNI QU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBE SVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRP UlMKKyAqIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQ RUNJQUwsIEVYRU1QTEFSWSwgT1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5H LCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RT IE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MK KyAqIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElB QklMSVRZLCBXSEVUSEVSIElOCisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9S VCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkg V0FZIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgor ICogVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbXBvcnQgImNvbmZp Zy5oIgorCisjaWYgUExBVEZPUk0oSU9TKQorCisjaW1wb3J0ICJQbGF0Zm9ybVV0aWxpdGllcy5o IgorI2ltcG9ydCAiVGVzdC5oIgorI2ltcG9ydCAiVGVzdFdLV2ViVmlldy5oIgorI2ltcG9ydCA8 V2ViS2l0L1dLV2ViVmlldy5oPgorCisvLyBXS1Njcm9sbFZpZXdEZWxlZ2F0ZUNyYXNoCisKK3N0 YXRpYyBib29sIGRlbGVnYXRlSXNEZWFsbG9jYXRlZDsKKworQGludGVyZmFjZSBUZXN0RGVsZWdh dGVGb3JTY3JvbGxWaWV3IDogTlNPYmplY3QgPFVJU2Nyb2xsVmlld0RlbGVnYXRlPgorCitAZW5k CisKK0BpbXBsZW1lbnRhdGlvbiBUZXN0RGVsZWdhdGVGb3JTY3JvbGxWaWV3CisKKy0gKHZvaWQp ZGVhbGxvYworeworICAgIGRlbGVnYXRlSXNEZWFsbG9jYXRlZCA9IHRydWU7CisgICAgW3N1cGVy IGRlYWxsb2NdOworfQorCitAZW5kCisKK25hbWVzcGFjZSBUZXN0V2ViS2l0QVBJIHsKKworVEVT VChXS1dlYlZpZXcsIFdLU2Nyb2xsVmlld0RlbGVnYXRlQ3Jhc2gpCit7CisgICAgV0tXZWJWaWV3 ICp3ZWJWaWV3ID0gW1tXS1dlYlZpZXcgYWxsb2NdIGluaXRdOworICAgIFRlc3REZWxlZ2F0ZUZv clNjcm9sbFZpZXcgKmRlbGVnYXRlRm9yU2Nyb2xsVmlldyA9IFtbVGVzdERlbGVnYXRlRm9yU2Ny b2xsVmlldyBhbGxvY10gaW5pdF07CisgICAgQGF1dG9yZWxlYXNlcG9vbCB7CisgICAgICAgIHdl YlZpZXcuc2Nyb2xsVmlldy5kZWxlZ2F0ZSA9IGRlbGVnYXRlRm9yU2Nyb2xsVmlldzsKKyAgICB9 CisgICAgZGVsZWdhdGVJc0RlYWxsb2NhdGVkID0gZmFsc2U7CisgICAgW2RlbGVnYXRlRm9yU2Ny b2xsVmlldyByZWxlYXNlXTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRlbGVnYXRl SXNEZWFsbG9jYXRlZCk7CisKKyAgICBFWFBFQ1RfTlVMTCh3ZWJWaWV3LnNjcm9sbFZpZXcuZGVs ZWdhdGUpOworfQorCit9CisKKy8vIFdLU2Nyb2xsVmlld0RlbGVnYXRlQ2Fubm90T3ZlcnJpZGVW aWV3Rm9yWm9vbWluZworCitzdGF0aWMgQk9PTCBkaWRDYWxsVmlld0Zvclpvb21pbmdJblNjcm9s bFZpZXc7CisKK0BpbnRlcmZhY2UgV0tTY3JvbGxWaWV3RGVsZWdhdGVXaXRoVmlld0Zvclpvb21p bmdPdmVycmlkZGVuIDogTlNPYmplY3QgPFVJU2Nyb2xsVmlld0RlbGVnYXRlPgorQHByb3BlcnR5 IChub25hdG9taWMsIGFzc2lnbikgQ0dGbG9hdCBvdmVycmlkZVNjYWxlOworQGVuZAorCitAaW1w bGVtZW50YXRpb24gV0tTY3JvbGxWaWV3RGVsZWdhdGVXaXRoVmlld0Zvclpvb21pbmdPdmVycmlk ZGVuCisKKy0gKFVJVmlldyAqKXZpZXdGb3Jab29taW5nSW5TY3JvbGxWaWV3OihVSVNjcm9sbFZp ZXcgKilzY3JvbGxWaWV3Cit7CisgICAgZGlkQ2FsbFZpZXdGb3Jab29taW5nSW5TY3JvbGxWaWV3 ID0gdHJ1ZTsKKworICAgIFVJVmlldyAqZmFrZVpvb21pbmdWaWV3ID0gW1tVSVZpZXcgYWxsb2Nd IGluaXRdOworICAgIGZha2Vab29taW5nVmlldy5sYXllci5hZmZpbmVUcmFuc2Zvcm0gPSBDR0Fm ZmluZVRyYW5zZm9ybU1ha2VTY2FsZShfb3ZlcnJpZGVTY2FsZSwgX292ZXJyaWRlU2NhbGUpOwor ICAgIHJldHVybiBmYWtlWm9vbWluZ1ZpZXc7Cit9CisKK0BlbmQKKworbmFtZXNwYWNlIFRlc3RX ZWJLaXRBUEkgeworCitURVNUKFdLV2ViVmlldywgV0tTY3JvbGxWaWV3RGVsZWdhdGVDYW5ub3RP dmVycmlkZVZpZXdGb3Jab29taW5nKQoreworICAgIFRlc3RXS1dlYlZpZXcgKndlYlZpZXcgPSBb W1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRdOworICAgIFdLU2Nyb2xsVmlld0RlbGVnYXRlV2l0 aFZpZXdGb3Jab29taW5nT3ZlcnJpZGRlbiAqZGVsZWdhdGVGb3JTY3JvbGxWaWV3ID0gW1tXS1Nj cm9sbFZpZXdEZWxlZ2F0ZVdpdGhWaWV3Rm9yWm9vbWluZ092ZXJyaWRkZW4gYWxsb2NdIGluaXRd OworICAgIEBhdXRvcmVsZWFzZXBvb2wgeworICAgICAgICB3ZWJWaWV3LnNjcm9sbFZpZXcuZGVs ZWdhdGUgPSBkZWxlZ2F0ZUZvclNjcm9sbFZpZXc7CisgICAgfQorCisgICAgW3dlYlZpZXcgc3lu Y2hyb25vdXNseUxvYWRIVE1MU3RyaW5nOkAiPG1ldGEgbmFtZT0ndmlld3BvcnQnIGNvbnRlbnQ9 J2luaXRpYWwtc2NhbGU9MSc+Il07CisgICAgW3dlYlZpZXcgd2FpdEZvck5leHRQcmVzZW50YXRp b25VcGRhdGVdOworCisgICAgLy8gSGF2ZSBXS1Njcm9sbFZpZXcncyBleHRlcm5hbCBkZWxlZ2F0 ZSByZXR1cm4gYSB2aWV3IHdpdGggc2NhbGU9MiBmcm9tIHZpZXdGb3Jab29taW5nSW5TY3JvbGxW aWV3LgorICAgIGRlbGVnYXRlRm9yU2Nyb2xsVmlldy5vdmVycmlkZVNjYWxlID0gMjsKKworICAg IFt3ZWJWaWV3IHN5bmNocm9ub3VzbHlMb2FkSFRNTFN0cmluZzpAIjxtZXRhIG5hbWU9J3ZpZXdw b3J0JyBjb250ZW50PSdpbml0aWFsLXNjYWxlPTInPiJdOworICAgIFt3ZWJWaWV3IHdhaXRGb3JO ZXh0UHJlc2VudGF0aW9uVXBkYXRlXTsKKworICAgIEBhdXRvcmVsZWFzZXBvb2wgeworICAgICAg ICB3ZWJWaWV3LnNjcm9sbFZpZXcuZGVsZWdhdGUgPSBuaWw7CisgICAgfQorCisgICAgRVhQRUNU X0ZBTFNFKGRpZENhbGxWaWV3Rm9yWm9vbWluZ0luU2Nyb2xsVmlldyk7CisgICAgRVhQRUNUX0VR KDIsIFtbd2ViVmlldyBzY3JvbGxWaWV3XSB6b29tU2NhbGVdKTsKK30KKworfQorCisjZW5kaWYK ZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL1dLU2Nyb2xsVmlld0Rl bGVnYXRlQ3Jhc2gubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL2lvcy9XS1Njcm9sbFZp ZXdEZWxlZ2F0ZUNyYXNoLm1tCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAyNjk0OTM2 MWIzOWQxZWM3NTI4NjgwODA4OTUzMDA2NzExYTE2OGViLi4wMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvaW9zL1dL U2Nyb2xsVmlld0RlbGVnYXRlQ3Jhc2gubW0KKysrIC9kZXYvbnVsbApAQCAtMSw2OCArMCwwIEBA Ci0vKgotICogQ29weXJpZ2h0IChDKSAyMDE2IEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZl ZC4KLSAqCi0gKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZv cm1zLCB3aXRoIG9yIHdpdGhvdXQKLSAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92 aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucwotICogYXJlIG1ldDoKLSAqIDEuIFJl ZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJp Z2h0Ci0gKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93 aW5nIGRpc2NsYWltZXIuCi0gKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVz dCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAotICogICAgbm90aWNlLCB0aGlzIGxpc3Qg b2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQotICogICAg ZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRp c3RyaWJ1dGlvbi4KLSAqCi0gKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElO Qy4gQU5EIElUUyBDT05UUklCVVRPUlMgYGBBUyBJUycnCi0gKiBBTkQgQU5ZIEVYUFJFU1MgT1Ig SU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywKLSAqIFRI RSBJTVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBB IFBBUlRJQ1VMQVIKLSAqIFBVUlBPU0UgQVJFIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxM IEFQUExFIElOQy4gT1IgSVRTIENPTlRSSUJVVE9SUwotICogQkUgTElBQkxFIEZPUiBBTlkgRElS RUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUgotICogQ09O U0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgUFJPQ1VS RU1FTlQgT0YKLSAqIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBE QVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUwotICogSU5URVJSVVBUSU9OKSBIT1dFVkVSIENB VVNFRCBBTkQgT04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4KLSAqIENPTlRS QUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBP VEhFUldJU0UpCi0gKiBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UgT0YgVEhJUyBT T0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GCi0gKiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBE QU1BR0UuCi0gKi8KLQotI2ltcG9ydCAiY29uZmlnLmgiCi0KLSNpZiBQTEFURk9STShJT1MpCi0K LSNpbXBvcnQgIlBsYXRmb3JtVXRpbGl0aWVzLmgiCi0jaW1wb3J0ICJUZXN0LmgiCi0jaW1wb3J0 IDxXZWJLaXQvV0tXZWJWaWV3Lmg+Ci0KLXN0YXRpYyBib29sIGRlbGVnYXRlSXNEZWFsbG9jYXRl ZDsKLQotQGludGVyZmFjZSBUZXN0RGVsZWdhdGVGb3JTY3JvbGxWaWV3IDogTlNPYmplY3QgPFVJ U2Nyb2xsVmlld0RlbGVnYXRlPgotCi1AZW5kCi0KLUBpbXBsZW1lbnRhdGlvbiBUZXN0RGVsZWdh dGVGb3JTY3JvbGxWaWV3Ci0KLS0gKHZvaWQpZGVhbGxvYwotewotICAgIGRlbGVnYXRlSXNEZWFs bG9jYXRlZCA9IHRydWU7Ci0gICAgW3N1cGVyIGRlYWxsb2NdOwotfQotCi1AZW5kCi0KLW5hbWVz cGFjZSBUZXN0V2ViS2l0QVBJIHsKLQotVEVTVChXS1dlYlZpZXcsIFdLU2Nyb2xsVmlld0RlbGVn YXRlQ3Jhc2gpCi17Ci0gICAgV0tXZWJWaWV3ICp3ZWJWaWV3ID0gW1tXS1dlYlZpZXcgYWxsb2Nd IGluaXRdOwotICAgIFRlc3REZWxlZ2F0ZUZvclNjcm9sbFZpZXcgKmRlbGVnYXRlRm9yU2Nyb2xs VmlldyA9IFtbVGVzdERlbGVnYXRlRm9yU2Nyb2xsVmlldyBhbGxvY10gaW5pdF07Ci0gICAgQGF1 dG9yZWxlYXNlcG9vbCB7Ci0gICAgICAgIHdlYlZpZXcuc2Nyb2xsVmlldy5kZWxlZ2F0ZSA9IGRl bGVnYXRlRm9yU2Nyb2xsVmlldzsKLSAgICB9Ci0gICAgZGVsZWdhdGVJc0RlYWxsb2NhdGVkID0g ZmFsc2U7Ci0gICAgW2RlbGVnYXRlRm9yU2Nyb2xsVmlldyByZWxlYXNlXTsKLSAgICBUZXN0V2Vi S2l0QVBJOjpVdGlsOjpydW4oJmRlbGVnYXRlSXNEZWFsbG9jYXRlZCk7Ci0KLSAgICBFWFBFQ1Rf TlVMTCh3ZWJWaWV3LnNjcm9sbFZpZXcuZGVsZWdhdGUpOwotfQotCi19Ci0KLSNlbmRpZgo=