169091 2017-03-02 12:38:34 -0800 Web Automation: _WKAutomationSessionDelegate should work with WKWebViews 2017-03-02 14:29:22 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg andersca bburg commit-queue ggaren mitz thorton webkit-bug-importer oldest_to_newest 1282835 0 bburg 2017-03-02 12:38:34 -0800 Using WKPageRef in the first place was a mistake. Let's add the proper delegate methods now and rip out the old stuff when a replacement is available. 1282836 1 bburg 2017-03-02 12:39:14 -0800 <rdar://problem/30810538> 1282839 2 303225 bburg 2017-03-02 12:50:34 -0800 Created attachment 303225 Proposed Fix 1282889 3 303225 commit-queue 2017-03-02 14:29:18 -0800 Comment on attachment 303225 Proposed Fix Clearing flags on attachment: 303225 Committed r213304: <http://trac.webkit.org/changeset/213304> 1282890 4 commit-queue 2017-03-02 14:29:22 -0800 All reviewed patches have been landed. Closing bug. 303225 2017-03-02 12:50:34 -0800 2017-03-02 14:29:18 -0800 Proposed Fix bug-169091-20170302125033.patch text/plain 23323 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjEyNzE3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNzk0MzA2NzQ3NmU0ZGIy YWYyNmI3NDExOGU0ZTQxYTVmNWQ2Nzg5MS4uNmEzMjA2YzIzOGQxNWVmMmRjOGMzMDVhYzY0ZjAz YjFlMDVjYjM1ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDYwIEBACisyMDE3LTAzLTAyICBCcmlh biBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgorCisgICAgICAgIFdlYiBBdXRvbWF0aW9uOiBfV0tB dXRvbWF0aW9uU2Vzc2lvbkRlbGVnYXRlIHNob3VsZCB3b3JrIHdpdGggV0tXZWJWaWV3cworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY5MDkxCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS8zMDgxMDUzOD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBcyBhIGZpcnN0IHN0ZXAgdG93YXJkcyBmaXhpbmcgdGhl IG1pc3Rha2Ugb2YgdXNpbmcgV0tQYWdlUmVmIGluIGFuIE9iamVjdGl2ZS1DIFNQSSwKKyAgICAg ICAgYWRkIHRoZSBjb3JyZWN0IGRlbGVnYXRlIG1ldGhvZHMgdGhhdCB0YWtlIFdLV2ViVmlldyBz byB0aGF0IE9iamVjdGl2ZS1DIGNsaWVudHMgY2FuCisgICAgICAgIHVzZSB0aGlzIGZ1bmN0aW9u YWxpdHkuCisKKyAgICAgICAgSW4gYSBmdXR1cmUgcGF0Y2gsIHdlJ2xsIHJlbW92ZSB0aGUgV0tQ YWdlUmVmIGRlbGVnYXRlIG1ldGhvZHMgd2hlbiB0aGV5IGFyZSBubyBsb25nZXIKKyAgICAgICAg YmVpbmcgdXNlZCBieSBjbGllbnRzLiBDbGllbnRzIHNob3VsZCBzd2l0Y2ggdG8gdXNpbmcgV0tX ZWJWaWV3LCBvciB3YWl0IGZvciBhIEMgU1BJCisgICAgICAgIHdpdGggZXF1aXZhbGVudCBmdW5j dGlvbmFsaXR5IChzb21ldGhpbmcgbGlrZSBXS0F1dG9tYXRpb25TZXNzaW9uQ2xpZW50KSB0byBi ZSBwb3J0ZWQuCisKKyAgICAgICAgV2hpbGUgSSdtIGZpeGluZyB0aGlzIG1lc3MsIG1ha2UgQVBJ OjpBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudCB1c2UgcmVmZXJlbmNlcyBpbnN0ZWFkCisgICAgICAg IG9mIHBvaW50ZXJzLiBXZSBudWxsLWNoZWNrIGFsbCBXZWJQYWdlUHJveHkgcGFyYW1ldGVycyBi ZWZvcmUgY2FsbGluZyBpdHMgbWV0aG9kcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQVBJ QXV0b21hdGlvblNlc3Npb25DbGllbnQuaDoKKyAgICAgICAgKEFQSTo6QXV0b21hdGlvblNlc3Np b25DbGllbnQ6OmRpZERpc2Nvbm5lY3RGcm9tUmVtb3RlKToKKyAgICAgICAgKEFQSTo6QXV0b21h dGlvblNlc3Npb25DbGllbnQ6OmRpZFJlcXVlc3ROZXdXaW5kb3cpOgorICAgICAgICAoQVBJOjpB dXRvbWF0aW9uU2Vzc2lvbkNsaWVudDo6aXNTaG93aW5nSmF2YVNjcmlwdERpYWxvZ09uUGFnZSk6 CisgICAgICAgIChBUEk6OkF1dG9tYXRpb25TZXNzaW9uQ2xpZW50OjpkaXNtaXNzQ3VycmVudEph dmFTY3JpcHREaWFsb2dPblBhZ2UpOgorICAgICAgICAoQVBJOjpBdXRvbWF0aW9uU2Vzc2lvbkNs aWVudDo6YWNjZXB0Q3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2UpOgorICAgICAgICAoQVBJ OjpBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudDo6bWVzc2FnZU9mQ3VycmVudEphdmFTY3JpcHREaWFs b2dPblBhZ2UpOgorICAgICAgICAoQVBJOjpBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudDo6c2V0VXNl cklucHV0Rm9yQ3VycmVudEphdmFTY3JpcHRQcm9tcHRPblBhZ2UpOgorICAgICAgICBDaGFuZ2Ug cG9pbnRlciB0byByZWZlcmVuY2UuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL19X S0F1dG9tYXRpb25TZXNzaW9uRGVsZWdhdGUuaDoKKyAgICAgICAgQWRkIGR1cGxpY2F0ZSBkZWxl Z2F0ZSBtZXRob2RzIHRoYXQgdGFrZS9yZXR1cm4gV0tXZWJWaWV3IGluc3RlYWQgb2YgV0tQYWdl UmVmLgorICAgICAgICBBZGp1c3QgdGhlIGRlbGVnYXRlIG1ldGhvZCBuYW1lcyB0byByZWZsZWN0 IHBhcmFtZXRlciB0eXBlIGFuZCBhdm9pZCBjb25mbGljdHMgd2l0aCB0aGUKKyAgICAgICAgV0tQ YWdlUmVmLXVzaW5nIG1ldGhvZHMgdGhhdCB3ZSBuZWVkIHRvIHJlbW92ZSBldmVudHVhbGx5Lgor CisgICAgICAgICogVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0b21hdGlvblNlc3Npb24uY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6dGVybWluYXRlKToKKyAg ICAgICAgKFdlYktpdDo6V2ViQXV0b21hdGlvblNlc3Npb246OmNyZWF0ZUJyb3dzaW5nQ29udGV4 dCk6CisgICAgICAgIChXZWJLaXQ6OldlYkF1dG9tYXRpb25TZXNzaW9uOjppc1Nob3dpbmdKYXZh U2NyaXB0RGlhbG9nKToKKyAgICAgICAgKFdlYktpdDo6V2ViQXV0b21hdGlvblNlc3Npb246OmRp c21pc3NDdXJyZW50SmF2YVNjcmlwdERpYWxvZyk6CisgICAgICAgIChXZWJLaXQ6OldlYkF1dG9t YXRpb25TZXNzaW9uOjphY2NlcHRDdXJyZW50SmF2YVNjcmlwdERpYWxvZyk6CisgICAgICAgIChX ZWJLaXQ6OldlYkF1dG9tYXRpb25TZXNzaW9uOjptZXNzYWdlT2ZDdXJyZW50SmF2YVNjcmlwdERp YWxvZyk6CisgICAgICAgIChXZWJLaXQ6OldlYkF1dG9tYXRpb25TZXNzaW9uOjpzZXRVc2VySW5w dXRGb3JDdXJyZW50SmF2YVNjcmlwdFByb21wdCk6CisgICAgICAgIERlcmVmZXJlbmNlIGB0aGlz YCBhbmQgYHdlYlBhZ2VQcm94eWAgd2hlbiBjYWxsaW5nIEFQSTo6QXV0b21hdGlvblNlc3Npb25D bGllbnQgbWV0aG9kcy4KKworICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9BdXRvbWF0aW9uU2Vz c2lvbkNsaWVudC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9Db2NvYS9BdXRvbWF0aW9uU2Vzc2lv bkNsaWVudC5tbToKKyAgICAgICAgKFdlYktpdDo6QXV0b21hdGlvblNlc3Npb25DbGllbnQ6OkF1 dG9tYXRpb25TZXNzaW9uQ2xpZW50KToKKyAgICAgICAgKFdlYktpdDo6QXV0b21hdGlvblNlc3Np b25DbGllbnQ6OmRpZERpc2Nvbm5lY3RGcm9tUmVtb3RlKToKKyAgICAgICAgKFdlYktpdDo6QXV0 b21hdGlvblNlc3Npb25DbGllbnQ6OmRpZFJlcXVlc3ROZXdXaW5kb3cpOgorICAgICAgICAoV2Vi S2l0OjpBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudDo6aXNTaG93aW5nSmF2YVNjcmlwdERpYWxvZ09u UGFnZSk6CisgICAgICAgIChXZWJLaXQ6OkF1dG9tYXRpb25TZXNzaW9uQ2xpZW50OjpkaXNtaXNz Q3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2UpOgorICAgICAgICAoV2ViS2l0OjpBdXRvbWF0 aW9uU2Vzc2lvbkNsaWVudDo6YWNjZXB0Q3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2UpOgor ICAgICAgICAoV2ViS2l0OjpBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudDo6bWVzc2FnZU9mQ3VycmVu dEphdmFTY3JpcHREaWFsb2dPblBhZ2UpOgorICAgICAgICAoV2ViS2l0OjpBdXRvbWF0aW9uU2Vz c2lvbkNsaWVudDo6c2V0VXNlcklucHV0Rm9yQ3VycmVudEphdmFTY3JpcHRQcm9tcHRPblBhZ2Up OgorICAgICAgICBOb3cgdGhlcmUgYXJlIHR3byBwb3NzaWJsZSBkZWxlZ2F0ZSBtZXRob2RzIGZv ciBtb3N0IG9mIHRoZXNlLCBzbyB0cnkgdG8gdXNlIHRoZQorICAgICAgICBXS1dlYlZpZXctYmFz ZWQgZGVsZWdhdGUgbWV0aG9kIGZpcnN0IGFuZCBmYWxsIGJhY2sgdG8gdGhlIFdLUGFnZVJlZiBk ZWxlZ2F0ZSBtZXRob2QuCisKIDIwMTctMDItMjEgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBw bGUuY29tPgogCiAgICAgICAgIFtXZWJSVENdIExpYldlYlJUQ1NvY2tldDo6U2VuZFRvIG1lc3Nh Z2Ugc2hvdWxkIGhhdmUgYSBjb3JyZWN0IFNvY2tldEFkZHJlc3MKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJQXV0b21hdGlvblNlc3Npb25DbGllbnQuaCBiL1Nv dXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQVBJQXV0b21hdGlvblNlc3Npb25DbGllbnQuaApp bmRleCBmNmM5MjczNGNkMzdmMjQ4NWVjMWMwYWQxZjAxNGRhY2E5MmExMmU2Li4yZGM1NTQyNzlm YjE4YjMyN2ZiODc3MTMyODY4MjJjYjI1NzNkOWE1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0FQSUF1dG9tYXRpb25TZXNzaW9uQ2xpZW50LmgKKysrIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0FQSS9BUElBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudC5oCkBAIC00 MCwxMyArNDAsMTMgQEAgcHVibGljOgogICAgIHZpcnR1YWwgfkF1dG9tYXRpb25TZXNzaW9uQ2xp ZW50KCkgeyB9CiAKICAgICB2aXJ0dWFsIFN0cmluZyBzZXNzaW9uSWRlbnRpZmllcigpIGNvbnN0 IHsgcmV0dXJuIFN0cmluZygpOyB9Ci0gICAgdmlydHVhbCB2b2lkIGRpZERpc2Nvbm5lY3RGcm9t UmVtb3RlKFdlYktpdDo6V2ViQXV0b21hdGlvblNlc3Npb24qKSB7IH0KLSAgICB2aXJ0dWFsIFdl YktpdDo6V2ViUGFnZVByb3h5KiBkaWRSZXF1ZXN0TmV3V2luZG93KFdlYktpdDo6V2ViQXV0b21h dGlvblNlc3Npb24qKSB7IHJldHVybiBudWxscHRyOyB9Ci0gICAgdmlydHVhbCBib29sIGlzU2hv d2luZ0phdmFTY3JpcHREaWFsb2dPblBhZ2UoV2ViS2l0OjpXZWJBdXRvbWF0aW9uU2Vzc2lvbios IFdlYktpdDo6V2ViUGFnZVByb3h5KikgeyByZXR1cm4gZmFsc2U7IH0KLSAgICB2aXJ0dWFsIHZv aWQgZGlzbWlzc0N1cnJlbnRKYXZhU2NyaXB0RGlhbG9nT25QYWdlKFdlYktpdDo6V2ViQXV0b21h dGlvblNlc3Npb24qLCBXZWJLaXQ6OldlYlBhZ2VQcm94eSopIHsgfQotICAgIHZpcnR1YWwgdm9p ZCBhY2NlcHRDdXJyZW50SmF2YVNjcmlwdERpYWxvZ09uUGFnZShXZWJLaXQ6OldlYkF1dG9tYXRp b25TZXNzaW9uKiwgV2ViS2l0OjpXZWJQYWdlUHJveHkqKSB7IH0KLSAgICB2aXJ0dWFsIFN0cmlu ZyBtZXNzYWdlT2ZDdXJyZW50SmF2YVNjcmlwdERpYWxvZ09uUGFnZShXZWJLaXQ6OldlYkF1dG9t YXRpb25TZXNzaW9uKiwgV2ViS2l0OjpXZWJQYWdlUHJveHkqKSB7IHJldHVybiBTdHJpbmcoKTsg fQotICAgIHZpcnR1YWwgdm9pZCBzZXRVc2VySW5wdXRGb3JDdXJyZW50SmF2YVNjcmlwdFByb21w dE9uUGFnZShXZWJLaXQ6OldlYkF1dG9tYXRpb25TZXNzaW9uKiwgV2ViS2l0OjpXZWJQYWdlUHJv eHkqLCBjb25zdCBTdHJpbmcmKSB7IH0KKyAgICB2aXJ0dWFsIHZvaWQgZGlkRGlzY29ubmVjdEZy b21SZW1vdGUoV2ViS2l0OjpXZWJBdXRvbWF0aW9uU2Vzc2lvbiYpIHsgfQorICAgIHZpcnR1YWwg V2ViS2l0OjpXZWJQYWdlUHJveHkqIGRpZFJlcXVlc3ROZXdXaW5kb3coV2ViS2l0OjpXZWJBdXRv bWF0aW9uU2Vzc2lvbiYpIHsgcmV0dXJuIG51bGxwdHI7IH0KKyAgICB2aXJ0dWFsIGJvb2wgaXNT aG93aW5nSmF2YVNjcmlwdERpYWxvZ09uUGFnZShXZWJLaXQ6OldlYkF1dG9tYXRpb25TZXNzaW9u JiwgV2ViS2l0OjpXZWJQYWdlUHJveHkmKSB7IHJldHVybiBmYWxzZTsgfQorICAgIHZpcnR1YWwg dm9pZCBkaXNtaXNzQ3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2UoV2ViS2l0OjpXZWJBdXRv bWF0aW9uU2Vzc2lvbiYsIFdlYktpdDo6V2ViUGFnZVByb3h5JikgeyB9CisgICAgdmlydHVhbCB2 b2lkIGFjY2VwdEN1cnJlbnRKYXZhU2NyaXB0RGlhbG9nT25QYWdlKFdlYktpdDo6V2ViQXV0b21h dGlvblNlc3Npb24mLCBXZWJLaXQ6OldlYlBhZ2VQcm94eSYpIHsgfQorICAgIHZpcnR1YWwgU3Ry aW5nIG1lc3NhZ2VPZkN1cnJlbnRKYXZhU2NyaXB0RGlhbG9nT25QYWdlKFdlYktpdDo6V2ViQXV0 b21hdGlvblNlc3Npb24mLCBXZWJLaXQ6OldlYlBhZ2VQcm94eSYpIHsgcmV0dXJuIFN0cmluZygp OyB9CisgICAgdmlydHVhbCB2b2lkIHNldFVzZXJJbnB1dEZvckN1cnJlbnRKYXZhU2NyaXB0UHJv bXB0T25QYWdlKFdlYktpdDo6V2ViQXV0b21hdGlvblNlc3Npb24mLCBXZWJLaXQ6OldlYlBhZ2VQ cm94eSYsIGNvbnN0IFN0cmluZyYpIHsgfQogfTsKIAogfSAvLyBuYW1lc3BhY2UgQVBJCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS0F1dG9tYXRpb25T ZXNzaW9uRGVsZWdhdGUuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dL QXV0b21hdGlvblNlc3Npb25EZWxlZ2F0ZS5oCmluZGV4IDYyYzA2OGU2MWMzOGQ5NTYzNDc0OWI0 ZjRmMzdjMzZhYWNhZTJjMDkuLmIyMzY4YjJlZTdhOGYwZTU1N2FmMDgwNmViMWIxOTA3OTEzZGUx ZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLQXV0 b21hdGlvblNlc3Npb25EZWxlZ2F0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9B UEkvQ29jb2EvX1dLQXV0b21hdGlvblNlc3Npb25EZWxlZ2F0ZS5oCkBAIC0zMCwxMyArMzAsMjQg QEAKICNpbXBvcnQgPEZvdW5kYXRpb24vRm91bmRhdGlvbi5oPgogI2ltcG9ydCA8V2ViS2l0L1dL QmFzZS5oPgogCitAY2xhc3MgV0tXZWJWaWV3OwogQGNsYXNzIF9XS0F1dG9tYXRpb25TZXNzaW9u OwogCiBAcHJvdG9jb2wgX1dLQXV0b21hdGlvblNlc3Npb25EZWxlZ2F0ZSA8TlNPYmplY3Q+CiBA b3B0aW9uYWwKLS0gKFdLUGFnZVJlZilfYXV0b21hdGlvblNlc3Npb25EaWRSZXF1ZXN0TmV3V2lu ZG93OihfV0tBdXRvbWF0aW9uU2Vzc2lvbiAqKWF1dG9tYXRpb25TZXNzaW9uOworCiAtICh2b2lk KV9hdXRvbWF0aW9uU2Vzc2lvbkRpZERpc2Nvbm5lY3RGcm9tUmVtb3RlOihfV0tBdXRvbWF0aW9u U2Vzc2lvbiAqKWF1dG9tYXRpb25TZXNzaW9uOwogCistIChXS1dlYlZpZXcgKilfYXV0b21hdGlv blNlc3Npb25EaWRSZXF1ZXN0TmV3V2ViVmlldzooX1dLQXV0b21hdGlvblNlc3Npb24gKilhdXRv bWF0aW9uU2Vzc2lvbjsKKy0gKEJPT0wpX2F1dG9tYXRpb25TZXNzaW9uOihfV0tBdXRvbWF0aW9u U2Vzc2lvbiAqKWF1dG9tYXRpb25TZXNzaW9uIGlzU2hvd2luZ0phdmFTY3JpcHREaWFsb2dGb3JX ZWJWaWV3OihXS1dlYlZpZXcgKil3ZWJWaWV3OworLSAodm9pZClfYXV0b21hdGlvblNlc3Npb246 KF9XS0F1dG9tYXRpb25TZXNzaW9uICopYXV0b21hdGlvblNlc3Npb24gZGlzbWlzc0N1cnJlbnRK YXZhU2NyaXB0RGlhbG9nRm9yV2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldzsKKy0gKHZvaWQp X2F1dG9tYXRpb25TZXNzaW9uOihfV0tBdXRvbWF0aW9uU2Vzc2lvbiAqKWF1dG9tYXRpb25TZXNz aW9uIGFjY2VwdEN1cnJlbnRKYXZhU2NyaXB0RGlhbG9nRm9yV2ViVmlldzooV0tXZWJWaWV3ICop d2ViVmlldzsKKy0gKE5TU3RyaW5nICopX2F1dG9tYXRpb25TZXNzaW9uOihfV0tBdXRvbWF0aW9u U2Vzc2lvbiAqKWF1dG9tYXRpb25TZXNzaW9uIG1lc3NhZ2VPZkN1cnJlbnRKYXZhU2NyaXB0RGlh bG9nRm9yV2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldzsKKy0gKHZvaWQpX2F1dG9tYXRpb25T ZXNzaW9uOihfV0tBdXRvbWF0aW9uU2Vzc2lvbiAqKWF1dG9tYXRpb25TZXNzaW9uIHNldFVzZXJJ bnB1dDooTlNTdHJpbmcgKil2YWx1ZSBmb3JDdXJyZW50SmF2YVNjcmlwdERpYWxvZ0ZvcldlYlZp ZXc6KFdLV2ViVmlldyAqKXdlYlZpZXc7CisKKy8vIEZJWE1FOiBPYmplY3RpdmUtQyBkZWxlZ2F0 ZSBtZXRob2RzIHNob3VsZG4ndCB1c2UgQyBBUEkgdHlwZXMgbGlrZSBXS1BhZ2VSZWYuIFdlIG5l ZWQgdG8KKy8vIG1pZ3JhdGUgY2xpZW50cyB0byB1c2UgV0tXZWJWaWV3LCBvciBleHBvc2UgdGhl IHNhbWUgYmVoYXZpb3IgdmlhIGEgQyBTUEkgZm9yIHRob3NlIGNsaWVudHMuCistIChXS1BhZ2VS ZWYpX2F1dG9tYXRpb25TZXNzaW9uRGlkUmVxdWVzdE5ld1dpbmRvdzooX1dLQXV0b21hdGlvblNl c3Npb24gKilhdXRvbWF0aW9uU2Vzc2lvbjsKIC0gKEJPT0wpX2F1dG9tYXRpb25TZXNzaW9uOihf V0tBdXRvbWF0aW9uU2Vzc2lvbiAqKWF1dG9tYXRpb25TZXNzaW9uIGlzU2hvd2luZ0phdmFTY3Jp cHREaWFsb2dPblBhZ2U6KFdLUGFnZVJlZilwYWdlOwogLSAodm9pZClfYXV0b21hdGlvblNlc3Np b246KF9XS0F1dG9tYXRpb25TZXNzaW9uICopYXV0b21hdGlvblNlc3Npb24gZGlzbWlzc0N1cnJl bnRKYXZhU2NyaXB0RGlhbG9nT25QYWdlOihXS1BhZ2VSZWYpcGFnZTsKIC0gKHZvaWQpX2F1dG9t YXRpb25TZXNzaW9uOihfV0tBdXRvbWF0aW9uU2Vzc2lvbiAqKWF1dG9tYXRpb25TZXNzaW9uIGFj Y2VwdEN1cnJlbnRKYXZhU2NyaXB0RGlhbG9nT25QYWdlOihXS1BhZ2VSZWYpcGFnZTsKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25T ZXNzaW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BdXRvbWF0aW9uL1dlYkF1dG9t YXRpb25TZXNzaW9uLmNwcAppbmRleCBmNzQ4ZWVlZWU2ZjRmOTc3ODgxOGUwOWJhZGYyYzg2YzVk YzZmZjkzLi5kZTViZTllMmQ5MDNhMGEyMDQ5ZjQ2ZTJiNzBkYzQwMjJiNGI0OWJmIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vz c2lvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0F1dG9tYXRpb24vV2ViQXV0 b21hdGlvblNlc3Npb24uY3BwCkBAIC0xMjEsNyArMTIxLDcgQEAgdm9pZCBXZWJBdXRvbWF0aW9u U2Vzc2lvbjo6dGVybWluYXRlKCkKICNlbmRpZgogCiAgICAgaWYgKG1fY2xpZW50KQotICAgICAg ICBtX2NsaWVudC0+ZGlkRGlzY29ubmVjdEZyb21SZW1vdGUodGhpcyk7CisgICAgICAgIG1fY2xp ZW50LT5kaWREaXNjb25uZWN0RnJvbVJlbW90ZSgqdGhpcyk7CiB9CiAKIFdlYlBhZ2VQcm94eSog V2ViQXV0b21hdGlvblNlc3Npb246OndlYlBhZ2VQcm94eUZvckhhbmRsZShjb25zdCBTdHJpbmcm IGhhbmRsZSkKQEAgLTI1Miw3ICsyNTIsNyBAQCB2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjpj cmVhdGVCcm93c2luZ0NvbnRleHQoSW5zcGVjdG9yOjpFcnJvclN0cmluZyYgZXJyb3JTdAogICAg IGlmICghbV9jbGllbnQpCiAgICAgICAgIEZBSUxfV0lUSF9QUkVERUZJTkVEX0VSUk9SX0FORF9E RVRBSUxTKEludGVybmFsRXJyb3IsICJUaGUgcmVtb3RlIHNlc3Npb24gY291bGQgbm90IHJlcXVl c3QgYSBuZXcgYnJvd3NpbmcgY29udGV4dC4iKTsKIAotICAgIFdlYlBhZ2VQcm94eSogcGFnZSA9 IG1fY2xpZW50LT5kaWRSZXF1ZXN0TmV3V2luZG93KHRoaXMpOworICAgIFdlYlBhZ2VQcm94eSog cGFnZSA9IG1fY2xpZW50LT5kaWRSZXF1ZXN0TmV3V2luZG93KCp0aGlzKTsKICAgICBpZiAoIXBh Z2UpCiAgICAgICAgIEZBSUxfV0lUSF9QUkVERUZJTkVEX0VSUk9SX0FORF9ERVRBSUxTKEludGVy bmFsRXJyb3IsICJUaGUgcmVtb3RlIHNlc3Npb24gZmFpbGVkIHRvIGNyZWF0ZSBhIG5ldyBicm93 c2luZyBjb250ZXh0LiIpOwogCkBAIC01MzEsNyArNTMxLDcgQEAgdm9pZCBXZWJBdXRvbWF0aW9u U2Vzc2lvbjo6aXNTaG93aW5nSmF2YVNjcmlwdERpYWxvZyhJbnNwZWN0b3I6OkVycm9yU3RyaW5n JiBlcnIKICAgICBpZiAoIXBhZ2UpCiAgICAgICAgIEZBSUxfV0lUSF9QUkVERUZJTkVEX0VSUk9S KFdpbmRvd05vdEZvdW5kKTsKIAotICAgICpyZXN1bHQgPSBtX2NsaWVudC0+aXNTaG93aW5nSmF2 YVNjcmlwdERpYWxvZ09uUGFnZSh0aGlzLCBwYWdlKTsKKyAgICAqcmVzdWx0ID0gbV9jbGllbnQt PmlzU2hvd2luZ0phdmFTY3JpcHREaWFsb2dPblBhZ2UoKnRoaXMsICpwYWdlKTsKIH0KIAogdm9p ZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6ZGlzbWlzc0N1cnJlbnRKYXZhU2NyaXB0RGlhbG9nKElu c3BlY3Rvcjo6RXJyb3JTdHJpbmcmIGVycm9yU3RyaW5nLCBjb25zdCBTdHJpbmcmIGJyb3dzaW5n Q29udGV4dEhhbmRsZSkKQEAgLTU0NCwxMCArNTQ0LDEwIEBAIHZvaWQgV2ViQXV0b21hdGlvblNl c3Npb246OmRpc21pc3NDdXJyZW50SmF2YVNjcmlwdERpYWxvZyhJbnNwZWN0b3I6OkVycm9yU3Ry aW5nCiAgICAgaWYgKCFwYWdlKQogICAgICAgICBGQUlMX1dJVEhfUFJFREVGSU5FRF9FUlJPUihX aW5kb3dOb3RGb3VuZCk7CiAKLSAgICBpZiAoIW1fY2xpZW50LT5pc1Nob3dpbmdKYXZhU2NyaXB0 RGlhbG9nT25QYWdlKHRoaXMsIHBhZ2UpKQorICAgIGlmICghbV9jbGllbnQtPmlzU2hvd2luZ0ph dmFTY3JpcHREaWFsb2dPblBhZ2UoKnRoaXMsICpwYWdlKSkKICAgICAgICAgRkFJTF9XSVRIX1BS RURFRklORURfRVJST1IoTm9KYXZhU2NyaXB0RGlhbG9nKTsKIAotICAgIG1fY2xpZW50LT5kaXNt aXNzQ3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2UodGhpcywgcGFnZSk7CisgICAgbV9jbGll bnQtPmRpc21pc3NDdXJyZW50SmF2YVNjcmlwdERpYWxvZ09uUGFnZSgqdGhpcywgKnBhZ2UpOwog fQogCiB2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjphY2NlcHRDdXJyZW50SmF2YVNjcmlwdERp YWxvZyhJbnNwZWN0b3I6OkVycm9yU3RyaW5nJiBlcnJvclN0cmluZywgY29uc3QgU3RyaW5nJiBi cm93c2luZ0NvbnRleHRIYW5kbGUpCkBAIC01NjAsMTAgKzU2MCwxMCBAQCB2b2lkIFdlYkF1dG9t YXRpb25TZXNzaW9uOjphY2NlcHRDdXJyZW50SmF2YVNjcmlwdERpYWxvZyhJbnNwZWN0b3I6OkVy cm9yU3RyaW5nJgogICAgIGlmICghcGFnZSkKICAgICAgICAgRkFJTF9XSVRIX1BSRURFRklORURf RVJST1IoV2luZG93Tm90Rm91bmQpOwogCi0gICAgaWYgKCFtX2NsaWVudC0+aXNTaG93aW5nSmF2 YVNjcmlwdERpYWxvZ09uUGFnZSh0aGlzLCBwYWdlKSkKKyAgICBpZiAoIW1fY2xpZW50LT5pc1No b3dpbmdKYXZhU2NyaXB0RGlhbG9nT25QYWdlKCp0aGlzLCAqcGFnZSkpCiAgICAgICAgIEZBSUxf V0lUSF9QUkVERUZJTkVEX0VSUk9SKE5vSmF2YVNjcmlwdERpYWxvZyk7CiAKLSAgICBtX2NsaWVu dC0+YWNjZXB0Q3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2UodGhpcywgcGFnZSk7CisgICAg bV9jbGllbnQtPmFjY2VwdEN1cnJlbnRKYXZhU2NyaXB0RGlhbG9nT25QYWdlKCp0aGlzLCAqcGFn ZSk7CiB9CiAKIHZvaWQgV2ViQXV0b21hdGlvblNlc3Npb246Om1lc3NhZ2VPZkN1cnJlbnRKYXZh U2NyaXB0RGlhbG9nKEluc3BlY3Rvcjo6RXJyb3JTdHJpbmcmIGVycm9yU3RyaW5nLCBjb25zdCBT dHJpbmcmIGJyb3dzaW5nQ29udGV4dEhhbmRsZSwgU3RyaW5nKiB0ZXh0KQpAQCAtNTc2LDEwICs1 NzYsMTAgQEAgdm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6bWVzc2FnZU9mQ3VycmVudEphdmFT Y3JpcHREaWFsb2coSW5zcGVjdG9yOjpFcnJvclN0cmkKICAgICBpZiAoIXBhZ2UpCiAgICAgICAg IEZBSUxfV0lUSF9QUkVERUZJTkVEX0VSUk9SKFdpbmRvd05vdEZvdW5kKTsKIAotICAgIGlmICgh bV9jbGllbnQtPmlzU2hvd2luZ0phdmFTY3JpcHREaWFsb2dPblBhZ2UodGhpcywgcGFnZSkpCisg ICAgaWYgKCFtX2NsaWVudC0+aXNTaG93aW5nSmF2YVNjcmlwdERpYWxvZ09uUGFnZSgqdGhpcywg KnBhZ2UpKQogICAgICAgICBGQUlMX1dJVEhfUFJFREVGSU5FRF9FUlJPUihOb0phdmFTY3JpcHRE aWFsb2cpOwogCi0gICAgKnRleHQgPSBtX2NsaWVudC0+bWVzc2FnZU9mQ3VycmVudEphdmFTY3Jp cHREaWFsb2dPblBhZ2UodGhpcywgcGFnZSk7CisgICAgKnRleHQgPSBtX2NsaWVudC0+bWVzc2Fn ZU9mQ3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2UoKnRoaXMsICpwYWdlKTsKIH0KIAogdm9p ZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6c2V0VXNlcklucHV0Rm9yQ3VycmVudEphdmFTY3JpcHRQ cm9tcHQoSW5zcGVjdG9yOjpFcnJvclN0cmluZyYgZXJyb3JTdHJpbmcsIGNvbnN0IFN0cmluZyYg YnJvd3NpbmdDb250ZXh0SGFuZGxlLCBjb25zdCBTdHJpbmcmIHByb21wdFZhbHVlKQpAQCAtNTky LDEwICs1OTIsMTAgQEAgdm9pZCBXZWJBdXRvbWF0aW9uU2Vzc2lvbjo6c2V0VXNlcklucHV0Rm9y Q3VycmVudEphdmFTY3JpcHRQcm9tcHQoSW5zcGVjdG9yOjpFcnIKICAgICBpZiAoIXBhZ2UpCiAg ICAgICAgIEZBSUxfV0lUSF9QUkVERUZJTkVEX0VSUk9SKFdpbmRvd05vdEZvdW5kKTsKIAotICAg IGlmICghbV9jbGllbnQtPmlzU2hvd2luZ0phdmFTY3JpcHREaWFsb2dPblBhZ2UodGhpcywgcGFn ZSkpCisgICAgaWYgKCFtX2NsaWVudC0+aXNTaG93aW5nSmF2YVNjcmlwdERpYWxvZ09uUGFnZSgq dGhpcywgKnBhZ2UpKQogICAgICAgICBGQUlMX1dJVEhfUFJFREVGSU5FRF9FUlJPUihOb0phdmFT Y3JpcHREaWFsb2cpOwogCi0gICAgbV9jbGllbnQtPnNldFVzZXJJbnB1dEZvckN1cnJlbnRKYXZh U2NyaXB0UHJvbXB0T25QYWdlKHRoaXMsIHBhZ2UsIHByb21wdFZhbHVlKTsKKyAgICBtX2NsaWVu dC0+c2V0VXNlcklucHV0Rm9yQ3VycmVudEphdmFTY3JpcHRQcm9tcHRPblBhZ2UoKnRoaXMsICpw YWdlLCBwcm9tcHRWYWx1ZSk7CiB9CiAKIHZvaWQgV2ViQXV0b21hdGlvblNlc3Npb246OmdldEFs bENvb2tpZXMoRXJyb3JTdHJpbmcmIGVycm9yU3RyaW5nLCBjb25zdCBTdHJpbmcmIGJyb3dzaW5n Q29udGV4dEhhbmRsZSwgUmVmPEdldEFsbENvb2tpZXNDYWxsYmFjaz4mJiBjYWxsYmFjaykKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9Db2NvYS9BdXRvbWF0aW9uU2Vzc2lv bkNsaWVudC5oIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL0F1dG9tYXRpb25TZXNz aW9uQ2xpZW50LmgKaW5kZXggN2IzZWRiNTc1ZDYyMTQ2ODYxY2M1ZTJjYjQ3Y2FkYWU0NGJjNThk Ny4uOWNkYjc2MTMwZWRjMjAyZGQwNGVjMzJjN2UzNDhlMDNlOTYwNTBkYyAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL0F1dG9tYXRpb25TZXNzaW9uQ2xpZW50LmgK KysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL0F1dG9tYXRpb25TZXNzaW9uQ2xp ZW50LmgKQEAgLTQzLDIwICs0MywyOSBAQCBwdWJsaWM6CiAKIHByaXZhdGU6CiAgICAgLy8gRnJv bSBBUEk6OkF1dG9tYXRpb25TZXNzaW9uQ2xpZW50Ci0gICAgV2ViUGFnZVByb3h5KiBkaWRSZXF1 ZXN0TmV3V2luZG93KFdlYkF1dG9tYXRpb25TZXNzaW9uKikgb3ZlcnJpZGU7Ci0gICAgdm9pZCBk aWREaXNjb25uZWN0RnJvbVJlbW90ZShXZWJBdXRvbWF0aW9uU2Vzc2lvbiAqKSBvdmVycmlkZTsK KyAgICBXZWJQYWdlUHJveHkqIGRpZFJlcXVlc3ROZXdXaW5kb3coV2ViQXV0b21hdGlvblNlc3Np b24mKSBvdmVycmlkZTsKKyAgICB2b2lkIGRpZERpc2Nvbm5lY3RGcm9tUmVtb3RlKFdlYkF1dG9t YXRpb25TZXNzaW9uJikgb3ZlcnJpZGU7CiAKLSAgICBib29sIGlzU2hvd2luZ0phdmFTY3JpcHRE aWFsb2dPblBhZ2UoV2ViQXV0b21hdGlvblNlc3Npb24qLCBXZWJQYWdlUHJveHkqKSBvdmVycmlk ZTsKLSAgICB2b2lkIGRpc21pc3NDdXJyZW50SmF2YVNjcmlwdERpYWxvZ09uUGFnZShXZWJBdXRv bWF0aW9uU2Vzc2lvbiosIFdlYlBhZ2VQcm94eSopIG92ZXJyaWRlOwotICAgIHZvaWQgYWNjZXB0 Q3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2UoV2ViQXV0b21hdGlvblNlc3Npb24qLCBXZWJQ YWdlUHJveHkqKSBvdmVycmlkZTsKLSAgICBTdHJpbmcgbWVzc2FnZU9mQ3VycmVudEphdmFTY3Jp cHREaWFsb2dPblBhZ2UoV2ViQXV0b21hdGlvblNlc3Npb24qLCBXZWJQYWdlUHJveHkqKSBvdmVy cmlkZTsKLSAgICB2b2lkIHNldFVzZXJJbnB1dEZvckN1cnJlbnRKYXZhU2NyaXB0UHJvbXB0T25Q YWdlKFdlYkF1dG9tYXRpb25TZXNzaW9uKiwgV2ViUGFnZVByb3h5KiwgY29uc3QgU3RyaW5nJikg b3ZlcnJpZGU7CisgICAgYm9vbCBpc1Nob3dpbmdKYXZhU2NyaXB0RGlhbG9nT25QYWdlKFdlYkF1 dG9tYXRpb25TZXNzaW9uJiwgV2ViUGFnZVByb3h5Jikgb3ZlcnJpZGU7CisgICAgdm9pZCBkaXNt aXNzQ3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2UoV2ViQXV0b21hdGlvblNlc3Npb24mLCBX ZWJQYWdlUHJveHkmKSBvdmVycmlkZTsKKyAgICB2b2lkIGFjY2VwdEN1cnJlbnRKYXZhU2NyaXB0 RGlhbG9nT25QYWdlKFdlYkF1dG9tYXRpb25TZXNzaW9uJiwgV2ViUGFnZVByb3h5Jikgb3ZlcnJp ZGU7CisgICAgU3RyaW5nIG1lc3NhZ2VPZkN1cnJlbnRKYXZhU2NyaXB0RGlhbG9nT25QYWdlKFdl YkF1dG9tYXRpb25TZXNzaW9uJiwgV2ViUGFnZVByb3h5Jikgb3ZlcnJpZGU7CisgICAgdm9pZCBz ZXRVc2VySW5wdXRGb3JDdXJyZW50SmF2YVNjcmlwdFByb21wdE9uUGFnZShXZWJBdXRvbWF0aW9u U2Vzc2lvbiYsIFdlYlBhZ2VQcm94eSYsIGNvbnN0IFN0cmluZyYpIG92ZXJyaWRlOwogCiAgICAg V2Vha09iakNQdHI8aWQgPF9XS0F1dG9tYXRpb25TZXNzaW9uRGVsZWdhdGU+PiBtX2RlbGVnYXRl OwogCiAgICAgc3RydWN0IHsKLSAgICAgICAgYm9vbCBkaWRSZXF1ZXN0TmV3V2luZG93IDogMTsK ICAgICAgICAgYm9vbCBkaWREaXNjb25uZWN0RnJvbVJlbW90ZSA6IDE7CisKKyAgICAgICAgYm9v bCBkaWRSZXF1ZXN0TmV3V2ViVmlldyA6IDE7CisgICAgICAgIGJvb2wgaXNTaG93aW5nSmF2YVNj cmlwdERpYWxvZ0ZvcldlYlZpZXcgOiAxOworICAgICAgICBib29sIGRpc21pc3NDdXJyZW50SmF2 YVNjcmlwdERpYWxvZ0ZvcldlYlZpZXcgOiAxOworICAgICAgICBib29sIGFjY2VwdEN1cnJlbnRK YXZhU2NyaXB0RGlhbG9nRm9yV2ViVmlldyA6IDE7CisgICAgICAgIGJvb2wgbWVzc2FnZU9mQ3Vy cmVudEphdmFTY3JpcHREaWFsb2dGb3JXZWJWaWV3IDogMTsKKyAgICAgICAgYm9vbCBzZXRVc2Vy SW5wdXRGb3JDdXJyZW50SmF2YVNjcmlwdFByb21wdEZvcldlYlZpZXcgOiAxOworCisgICAgICAg IC8vIEZJWE1FIDI4NTI0Njg3OiB0aGVzZSBkZWxlZ2F0ZSBtZXRob2RzIHNob3VsZCBiZSByZW1v dmVkLgorICAgICAgICBib29sIGRpZFJlcXVlc3ROZXdXaW5kb3cgOiAxOwogICAgICAgICBib29s IGlzU2hvd2luZ0phdmFTY3JpcHREaWFsb2dPblBhZ2UgOiAxOwogICAgICAgICBib29sIGRpc21p c3NDdXJyZW50SmF2YVNjcmlwdERpYWxvZ09uUGFnZSA6IDE7CiAgICAgICAgIGJvb2wgYWNjZXB0 Q3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2UgOiAxOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0NvY29hL0F1dG9tYXRpb25TZXNzaW9uQ2xpZW50Lm1tIGIvU291cmNl L1dlYktpdDIvVUlQcm9jZXNzL0NvY29hL0F1dG9tYXRpb25TZXNzaW9uQ2xpZW50Lm1tCmluZGV4 IDNlOTU0YjZiMWY4ZjJkYWUzMzVlMWNjNmM4NWI2ZjdlMzY5NzgwMGQuLjBlYWRkMjVjNTNjM2M1 NTRkNDQ4YzBkM2Y2NWU2ZjU2ZWU2MDJlMmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJ UHJvY2Vzcy9Db2NvYS9BdXRvbWF0aW9uU2Vzc2lvbkNsaWVudC5tbQorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQ29jb2EvQXV0b21hdGlvblNlc3Npb25DbGllbnQubW0KQEAgLTI5LDYg KzI5LDcgQEAKICNpZiBXS19BUElfRU5BQkxFRAogCiAjaW1wb3J0ICJXS1NoYXJlZEFQSUNhc3Qu aCIKKyNpbXBvcnQgIldLV2ViVmlld0ludGVybmFsLmgiCiAjaW1wb3J0ICJXZWJBdXRvbWF0aW9u U2Vzc2lvbi5oIgogI2ltcG9ydCAiV2ViUGFnZVByb3h5LmgiCiAjaW1wb3J0ICJfV0tBdXRvbWF0 aW9uU2Vzc2lvbkRlbGVnYXRlLmgiCkBAIC0zOSw4ICs0MCwxNyBAQCBuYW1lc3BhY2UgV2ViS2l0 IHsKIEF1dG9tYXRpb25TZXNzaW9uQ2xpZW50OjpBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudChpZCA8 X1dLQXV0b21hdGlvblNlc3Npb25EZWxlZ2F0ZT4gZGVsZWdhdGUpCiAgICAgOiBtX2RlbGVnYXRl KGRlbGVnYXRlKQogewotICAgIG1fZGVsZWdhdGVNZXRob2RzLmRpZFJlcXVlc3ROZXdXaW5kb3cg PSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihfYXV0b21hdGlvblNlc3Np b25EaWRSZXF1ZXN0TmV3V2luZG93OildOwogICAgIG1fZGVsZWdhdGVNZXRob2RzLmRpZERpc2Nv bm5lY3RGcm9tUmVtb3RlID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3Io X2F1dG9tYXRpb25TZXNzaW9uRGlkRGlzY29ubmVjdEZyb21SZW1vdGU6KV07CisKKyAgICBtX2Rl bGVnYXRlTWV0aG9kcy5kaWRSZXF1ZXN0TmV3V2ViVmlldyA9IFtkZWxlZ2F0ZSByZXNwb25kc1Rv U2VsZWN0b3I6QHNlbGVjdG9yKF9hdXRvbWF0aW9uU2Vzc2lvbkRpZFJlcXVlc3ROZXdXZWJWaWV3 OildOworICAgIG1fZGVsZWdhdGVNZXRob2RzLmlzU2hvd2luZ0phdmFTY3JpcHREaWFsb2dGb3JX ZWJWaWV3ID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX2F1dG9tYXRp b25TZXNzaW9uOmlzU2hvd2luZ0phdmFTY3JpcHREaWFsb2dGb3JXZWJWaWV3OildOworICAgIG1f ZGVsZWdhdGVNZXRob2RzLmRpc21pc3NDdXJyZW50SmF2YVNjcmlwdERpYWxvZ0ZvcldlYlZpZXcg PSBbZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihfYXV0b21hdGlvblNlc3Np b246ZGlzbWlzc0N1cnJlbnRKYXZhU2NyaXB0RGlhbG9nRm9yV2ViVmlldzopXTsKKyAgICBtX2Rl bGVnYXRlTWV0aG9kcy5hY2NlcHRDdXJyZW50SmF2YVNjcmlwdERpYWxvZ0ZvcldlYlZpZXcgPSBb ZGVsZWdhdGUgcmVzcG9uZHNUb1NlbGVjdG9yOkBzZWxlY3RvcihfYXV0b21hdGlvblNlc3Npb246 YWNjZXB0Q3VycmVudEphdmFTY3JpcHREaWFsb2dGb3JXZWJWaWV3OildOworICAgIG1fZGVsZWdh dGVNZXRob2RzLm1lc3NhZ2VPZkN1cnJlbnRKYXZhU2NyaXB0RGlhbG9nRm9yV2ViVmlldyA9IFtk ZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9hdXRvbWF0aW9uU2Vzc2lvbjpt ZXNzYWdlT2ZDdXJyZW50SmF2YVNjcmlwdERpYWxvZ0ZvcldlYlZpZXc6KV07CisgICAgbV9kZWxl Z2F0ZU1ldGhvZHMuc2V0VXNlcklucHV0Rm9yQ3VycmVudEphdmFTY3JpcHRQcm9tcHRGb3JXZWJW aWV3ID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX2F1dG9tYXRpb25T ZXNzaW9uOnNldFVzZXJJbnB1dDpmb3JDdXJyZW50SmF2YVNjcmlwdERpYWxvZ0ZvcldlYlZpZXc6 KV07CisKKyAgICAvLyBGSVhNRSAyODUyNDY4NzogdGhlc2UgZGVsZWdhdGUgbWV0aG9kcyBzaG91 bGQgYmUgcmVtb3ZlZC4KKyAgICBtX2RlbGVnYXRlTWV0aG9kcy5kaWRSZXF1ZXN0TmV3V2luZG93 ID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX2F1dG9tYXRpb25TZXNz aW9uRGlkUmVxdWVzdE5ld1dpbmRvdzopXTsKICAgICBtX2RlbGVnYXRlTWV0aG9kcy5pc1Nob3dp bmdKYXZhU2NyaXB0RGlhbG9nT25QYWdlID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpA c2VsZWN0b3IoX2F1dG9tYXRpb25TZXNzaW9uOmlzU2hvd2luZ0phdmFTY3JpcHREaWFsb2dPblBh Z2U6KV07CiAgICAgbV9kZWxlZ2F0ZU1ldGhvZHMuZGlzbWlzc0N1cnJlbnRKYXZhU2NyaXB0RGlh bG9nT25QYWdlID0gW2RlbGVnYXRlIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX2F1dG9t YXRpb25TZXNzaW9uOmRpc21pc3NDdXJyZW50SmF2YVNjcmlwdERpYWxvZ09uUGFnZTopXTsKICAg ICBtX2RlbGVnYXRlTWV0aG9kcy5hY2NlcHRDdXJyZW50SmF2YVNjcmlwdERpYWxvZ09uUGFnZSA9 IFtkZWxlZ2F0ZSByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9yKF9hdXRvbWF0aW9uU2Vzc2lv bjphY2NlcHRDdXJyZW50SmF2YVNjcmlwdERpYWxvZ09uUGFnZTopXTsKQEAgLTQ4LDQ5ICs1OCw2 OSBAQCBBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudDo6QXV0b21hdGlvblNlc3Npb25DbGllbnQoaWQg PF9XS0F1dG9tYXRpb25TZXNzaW9uRGVsZWdhdAogICAgIG1fZGVsZWdhdGVNZXRob2RzLnNldFVz ZXJJbnB1dEZvckN1cnJlbnRKYXZhU2NyaXB0UHJvbXB0T25QYWdlID0gW2RlbGVnYXRlIHJlc3Bv bmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IoX2F1dG9tYXRpb25TZXNzaW9uOnNldFVzZXJJbnB1dDpm b3JDdXJyZW50SmF2YVNjcmlwdERpYWxvZ09uUGFnZTopXTsKIH0KIAotV2ViUGFnZVByb3h5KiBB dXRvbWF0aW9uU2Vzc2lvbkNsaWVudDo6ZGlkUmVxdWVzdE5ld1dpbmRvdyhXZWJBdXRvbWF0aW9u U2Vzc2lvbiogc2Vzc2lvbikKK3ZvaWQgQXV0b21hdGlvblNlc3Npb25DbGllbnQ6OmRpZERpc2Nv bm5lY3RGcm9tUmVtb3RlKFdlYkF1dG9tYXRpb25TZXNzaW9uJiBzZXNzaW9uKQogewotICAgIGlm IChtX2RlbGVnYXRlTWV0aG9kcy5kaWRSZXF1ZXN0TmV3V2luZG93KQotICAgICAgICByZXR1cm4g dG9JbXBsKFttX2RlbGVnYXRlLmdldCgpIF9hdXRvbWF0aW9uU2Vzc2lvbkRpZFJlcXVlc3ROZXdX aW5kb3c6d3JhcHBlcigqc2Vzc2lvbildKTsKLSAgICByZXR1cm4gbnVsbHB0cjsKKyAgICBpZiAo bV9kZWxlZ2F0ZU1ldGhvZHMuZGlkRGlzY29ubmVjdEZyb21SZW1vdGUpCisgICAgICAgIFttX2Rl bGVnYXRlLmdldCgpIF9hdXRvbWF0aW9uU2Vzc2lvbkRpZERpc2Nvbm5lY3RGcm9tUmVtb3RlOndy YXBwZXIoc2Vzc2lvbildOwogfQogCi12b2lkIEF1dG9tYXRpb25TZXNzaW9uQ2xpZW50OjpkaWRE aXNjb25uZWN0RnJvbVJlbW90ZShXZWJBdXRvbWF0aW9uU2Vzc2lvbiogc2Vzc2lvbikKKy8vIEZJ WE1FIDI4NTI0Njg3OiBzdXBwb3J0IGZvciBXS1BhZ2VSZWYtYmFzZWQgZGVsZWdhdGUgbWV0aG9k cyBzaG91bGQgYmUgcmVtb3ZlZC4KKy8vIFVudGlsIHRoZXNlIGFyZSByZW1vdmVkLCBwcmVmZXIg dG8gdXNlIHRoZSBXS1dlYlZpZXcgZGVsZWdhdGUgbWV0aG9kcyBpZiBpbXBsZW1lbnRlZC4KK1dl YlBhZ2VQcm94eSogQXV0b21hdGlvblNlc3Npb25DbGllbnQ6OmRpZFJlcXVlc3ROZXdXaW5kb3co V2ViQXV0b21hdGlvblNlc3Npb24mIHNlc3Npb24pCiB7Ci0gICAgaWYgKG1fZGVsZWdhdGVNZXRo b2RzLmRpZERpc2Nvbm5lY3RGcm9tUmVtb3RlKQotICAgICAgICBbbV9kZWxlZ2F0ZS5nZXQoKSBf YXV0b21hdGlvblNlc3Npb25EaWREaXNjb25uZWN0RnJvbVJlbW90ZTp3cmFwcGVyKCpzZXNzaW9u KV07CisgICAgaWYgKG1fZGVsZWdhdGVNZXRob2RzLmRpZFJlcXVlc3ROZXdXZWJWaWV3KQorICAg ICAgICByZXR1cm4gW21fZGVsZWdhdGUuZ2V0KCkgX2F1dG9tYXRpb25TZXNzaW9uRGlkUmVxdWVz dE5ld1dlYlZpZXc6d3JhcHBlcihzZXNzaW9uKV0tPl9wYWdlLmdldCgpOworCisgICAgaWYgKG1f ZGVsZWdhdGVNZXRob2RzLmRpZFJlcXVlc3ROZXdXaW5kb3cpCisgICAgICAgIHJldHVybiB0b0lt cGwoW21fZGVsZWdhdGUuZ2V0KCkgX2F1dG9tYXRpb25TZXNzaW9uRGlkUmVxdWVzdE5ld1dpbmRv dzp3cmFwcGVyKHNlc3Npb24pXSk7CisKKyAgICByZXR1cm4gbnVsbHB0cjsKIH0KIAotYm9vbCBB dXRvbWF0aW9uU2Vzc2lvbkNsaWVudDo6aXNTaG93aW5nSmF2YVNjcmlwdERpYWxvZ09uUGFnZShX ZWJBdXRvbWF0aW9uU2Vzc2lvbiogc2Vzc2lvbiwgV2ViUGFnZVByb3h5KiBwYWdlKQorYm9vbCBB dXRvbWF0aW9uU2Vzc2lvbkNsaWVudDo6aXNTaG93aW5nSmF2YVNjcmlwdERpYWxvZ09uUGFnZShX ZWJBdXRvbWF0aW9uU2Vzc2lvbiYgc2Vzc2lvbiwgV2ViUGFnZVByb3h5JiBwYWdlKQogeworICAg IGlmIChtX2RlbGVnYXRlTWV0aG9kcy5pc1Nob3dpbmdKYXZhU2NyaXB0RGlhbG9nRm9yV2ViVmll dykKKyAgICAgICAgcmV0dXJuIFttX2RlbGVnYXRlLmdldCgpIF9hdXRvbWF0aW9uU2Vzc2lvbjp3 cmFwcGVyKHNlc3Npb24pIGlzU2hvd2luZ0phdmFTY3JpcHREaWFsb2dGb3JXZWJWaWV3OmZyb21X ZWJQYWdlUHJveHkocGFnZSldOworCiAgICAgaWYgKG1fZGVsZWdhdGVNZXRob2RzLmlzU2hvd2lu Z0phdmFTY3JpcHREaWFsb2dPblBhZ2UpCi0gICAgICAgIHJldHVybiBbbV9kZWxlZ2F0ZS5nZXQo KSBfYXV0b21hdGlvblNlc3Npb246d3JhcHBlcigqc2Vzc2lvbikgaXNTaG93aW5nSmF2YVNjcmlw dERpYWxvZ09uUGFnZTp0b0FQSShwYWdlKV07CisgICAgICAgIHJldHVybiBbbV9kZWxlZ2F0ZS5n ZXQoKSBfYXV0b21hdGlvblNlc3Npb246d3JhcHBlcihzZXNzaW9uKSBpc1Nob3dpbmdKYXZhU2Ny aXB0RGlhbG9nT25QYWdlOnRvQVBJKCZwYWdlKV07CisKICAgICByZXR1cm4gZmFsc2U7CiB9CiAK LXZvaWQgQXV0b21hdGlvblNlc3Npb25DbGllbnQ6OmRpc21pc3NDdXJyZW50SmF2YVNjcmlwdERp YWxvZ09uUGFnZShXZWJBdXRvbWF0aW9uU2Vzc2lvbiogc2Vzc2lvbiwgV2ViUGFnZVByb3h5KiBw YWdlKQordm9pZCBBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudDo6ZGlzbWlzc0N1cnJlbnRKYXZhU2Ny aXB0RGlhbG9nT25QYWdlKFdlYkF1dG9tYXRpb25TZXNzaW9uJiBzZXNzaW9uLCBXZWJQYWdlUHJv eHkmIHBhZ2UpCiB7Ci0gICAgaWYgKG1fZGVsZWdhdGVNZXRob2RzLmRpc21pc3NDdXJyZW50SmF2 YVNjcmlwdERpYWxvZ09uUGFnZSkKLSAgICAgICAgW21fZGVsZWdhdGUuZ2V0KCkgX2F1dG9tYXRp b25TZXNzaW9uOndyYXBwZXIoKnNlc3Npb24pIGRpc21pc3NDdXJyZW50SmF2YVNjcmlwdERpYWxv Z09uUGFnZTp0b0FQSShwYWdlKV07CisgICAgaWYgKG1fZGVsZWdhdGVNZXRob2RzLmRpc21pc3ND dXJyZW50SmF2YVNjcmlwdERpYWxvZ0ZvcldlYlZpZXcpCisgICAgICAgIFttX2RlbGVnYXRlLmdl dCgpIF9hdXRvbWF0aW9uU2Vzc2lvbjp3cmFwcGVyKHNlc3Npb24pIGRpc21pc3NDdXJyZW50SmF2 YVNjcmlwdERpYWxvZ0ZvcldlYlZpZXc6ZnJvbVdlYlBhZ2VQcm94eShwYWdlKV07CisgICAgZWxz ZSBpZiAobV9kZWxlZ2F0ZU1ldGhvZHMuZGlzbWlzc0N1cnJlbnRKYXZhU2NyaXB0RGlhbG9nT25Q YWdlKQorICAgICAgICBbbV9kZWxlZ2F0ZS5nZXQoKSBfYXV0b21hdGlvblNlc3Npb246d3JhcHBl cihzZXNzaW9uKSBkaXNtaXNzQ3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2U6dG9BUEkoJnBh Z2UpXTsKIH0KIAotdm9pZCBBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudDo6YWNjZXB0Q3VycmVudEph dmFTY3JpcHREaWFsb2dPblBhZ2UoV2ViQXV0b21hdGlvblNlc3Npb24qIHNlc3Npb24sIFdlYlBh Z2VQcm94eSogcGFnZSkKK3ZvaWQgQXV0b21hdGlvblNlc3Npb25DbGllbnQ6OmFjY2VwdEN1cnJl bnRKYXZhU2NyaXB0RGlhbG9nT25QYWdlKFdlYkF1dG9tYXRpb25TZXNzaW9uJiBzZXNzaW9uLCBX ZWJQYWdlUHJveHkmIHBhZ2UpCiB7Ci0gICAgaWYgKG1fZGVsZWdhdGVNZXRob2RzLmFjY2VwdEN1 cnJlbnRKYXZhU2NyaXB0RGlhbG9nT25QYWdlKQotICAgICAgICBbbV9kZWxlZ2F0ZS5nZXQoKSBf YXV0b21hdGlvblNlc3Npb246d3JhcHBlcigqc2Vzc2lvbikgYWNjZXB0Q3VycmVudEphdmFTY3Jp cHREaWFsb2dPblBhZ2U6dG9BUEkocGFnZSldOworICAgIGlmIChtX2RlbGVnYXRlTWV0aG9kcy5h Y2NlcHRDdXJyZW50SmF2YVNjcmlwdERpYWxvZ0ZvcldlYlZpZXcpCisgICAgICAgIFttX2RlbGVn YXRlLmdldCgpIF9hdXRvbWF0aW9uU2Vzc2lvbjp3cmFwcGVyKHNlc3Npb24pIGFjY2VwdEN1cnJl bnRKYXZhU2NyaXB0RGlhbG9nRm9yV2ViVmlldzpmcm9tV2ViUGFnZVByb3h5KHBhZ2UpXTsKKyAg ICBlbHNlIGlmIChtX2RlbGVnYXRlTWV0aG9kcy5hY2NlcHRDdXJyZW50SmF2YVNjcmlwdERpYWxv Z09uUGFnZSkKKyAgICAgICAgW21fZGVsZWdhdGUuZ2V0KCkgX2F1dG9tYXRpb25TZXNzaW9uOndy YXBwZXIoc2Vzc2lvbikgYWNjZXB0Q3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2U6dG9BUEko JnBhZ2UpXTsKIH0KIAotU3RyaW5nIEF1dG9tYXRpb25TZXNzaW9uQ2xpZW50OjptZXNzYWdlT2ZD dXJyZW50SmF2YVNjcmlwdERpYWxvZ09uUGFnZShXZWJBdXRvbWF0aW9uU2Vzc2lvbiogc2Vzc2lv biwgV2ViUGFnZVByb3h5KiBwYWdlKQorU3RyaW5nIEF1dG9tYXRpb25TZXNzaW9uQ2xpZW50Ojpt ZXNzYWdlT2ZDdXJyZW50SmF2YVNjcmlwdERpYWxvZ09uUGFnZShXZWJBdXRvbWF0aW9uU2Vzc2lv biYgc2Vzc2lvbiwgV2ViUGFnZVByb3h5JiBwYWdlKQogeworICAgIGlmIChtX2RlbGVnYXRlTWV0 aG9kcy5tZXNzYWdlT2ZDdXJyZW50SmF2YVNjcmlwdERpYWxvZ0ZvcldlYlZpZXcpCisgICAgICAg IHJldHVybiBbbV9kZWxlZ2F0ZS5nZXQoKSBfYXV0b21hdGlvblNlc3Npb246d3JhcHBlcihzZXNz aW9uKSBtZXNzYWdlT2ZDdXJyZW50SmF2YVNjcmlwdERpYWxvZ0ZvcldlYlZpZXc6ZnJvbVdlYlBh Z2VQcm94eShwYWdlKV07CisKICAgICBpZiAobV9kZWxlZ2F0ZU1ldGhvZHMubWVzc2FnZU9mQ3Vy cmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2UpCi0gICAgICAgIHJldHVybiBbbV9kZWxlZ2F0ZS5n ZXQoKSBfYXV0b21hdGlvblNlc3Npb246d3JhcHBlcigqc2Vzc2lvbikgbWVzc2FnZU9mQ3VycmVu dEphdmFTY3JpcHREaWFsb2dPblBhZ2U6dG9BUEkocGFnZSldOworICAgICAgICByZXR1cm4gW21f ZGVsZWdhdGUuZ2V0KCkgX2F1dG9tYXRpb25TZXNzaW9uOndyYXBwZXIoc2Vzc2lvbikgbWVzc2Fn ZU9mQ3VycmVudEphdmFTY3JpcHREaWFsb2dPblBhZ2U6dG9BUEkoJnBhZ2UpXTsKKwogICAgIHJl dHVybiBTdHJpbmcoKTsKIH0KIAotdm9pZCBBdXRvbWF0aW9uU2Vzc2lvbkNsaWVudDo6c2V0VXNl cklucHV0Rm9yQ3VycmVudEphdmFTY3JpcHRQcm9tcHRPblBhZ2UoV2ViQXV0b21hdGlvblNlc3Np b24qIHNlc3Npb24sIFdlYlBhZ2VQcm94eSogcGFnZSwgY29uc3QgU3RyaW5nJiB2YWx1ZSkKK3Zv aWQgQXV0b21hdGlvblNlc3Npb25DbGllbnQ6OnNldFVzZXJJbnB1dEZvckN1cnJlbnRKYXZhU2Ny aXB0UHJvbXB0T25QYWdlKFdlYkF1dG9tYXRpb25TZXNzaW9uJiBzZXNzaW9uLCBXZWJQYWdlUHJv eHkmIHBhZ2UsIGNvbnN0IFN0cmluZyYgdmFsdWUpCiB7Ci0gICAgaWYgKG1fZGVsZWdhdGVNZXRo b2RzLnNldFVzZXJJbnB1dEZvckN1cnJlbnRKYXZhU2NyaXB0UHJvbXB0T25QYWdlKQotICAgICAg ICBbbV9kZWxlZ2F0ZS5nZXQoKSBfYXV0b21hdGlvblNlc3Npb246d3JhcHBlcigqc2Vzc2lvbikg c2V0VXNlcklucHV0OnZhbHVlIGZvckN1cnJlbnRKYXZhU2NyaXB0RGlhbG9nT25QYWdlOnRvQVBJ KHBhZ2UpXTsKKyAgICBpZiAobV9kZWxlZ2F0ZU1ldGhvZHMuc2V0VXNlcklucHV0Rm9yQ3VycmVu dEphdmFTY3JpcHRQcm9tcHRGb3JXZWJWaWV3KQorICAgICAgICBbbV9kZWxlZ2F0ZS5nZXQoKSBf YXV0b21hdGlvblNlc3Npb246d3JhcHBlcihzZXNzaW9uKSBzZXRVc2VySW5wdXQ6dmFsdWUgZm9y Q3VycmVudEphdmFTY3JpcHREaWFsb2dGb3JXZWJWaWV3OmZyb21XZWJQYWdlUHJveHkocGFnZSld OworICAgIGVsc2UgaWYgKG1fZGVsZWdhdGVNZXRob2RzLnNldFVzZXJJbnB1dEZvckN1cnJlbnRK YXZhU2NyaXB0UHJvbXB0T25QYWdlKQorICAgICAgICBbbV9kZWxlZ2F0ZS5nZXQoKSBfYXV0b21h dGlvblNlc3Npb246d3JhcHBlcihzZXNzaW9uKSBzZXRVc2VySW5wdXQ6dmFsdWUgZm9yQ3VycmVu dEphdmFTY3JpcHREaWFsb2dPblBhZ2U6dG9BUEkoJnBhZ2UpXTsKIH0KIAogfSAvLyBuYW1lc3Bh Y2UgV2ViS2l0Cg==