187504 2018-07-09 20:35:00 -0700 REGRESSION (r233480): Mail contents flash black when activating 2018-07-10 23:22:22 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton bdakin commit-queue mitz simon.fraser wenson_hsieh oldest_to_newest 1440706 0 thorton 2018-07-09 20:35:00 -0700 REGRESSION (r233480): Mail contents flash black when activating Mail 1440707 1 344658 thorton 2018-07-09 20:35:15 -0700 Created attachment 344658 Patch 1440708 2 thorton 2018-07-09 20:35:28 -0700 <rdar://problem/41752351> 1440711 3 344658 mitz 2018-07-09 20:42:42 -0700 Comment on attachment 344658 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=344658&action=review > Source/WebKit/UIProcess/ApplicationStateTracker.mm:100 > + m_didCreateWindowContextObserver = [notificationCenter addObserverForName:@"_UICanvasDidActivateNotification" object:window._canvas queue:nil usingBlock:[weakThis](NSNotification *) { This is repeating the mistake of hardcoding a string instead of importing a symbol. 1440722 4 thorton 2018-07-09 21:17:39 -0700 (In reply to mitz from comment #3) > Comment on attachment 344658 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=344658&action=review > > > Source/WebKit/UIProcess/ApplicationStateTracker.mm:100 > > + m_didCreateWindowContextObserver = [notificationCenter addObserverForName:@"_UICanvasDidActivateNotification" object:window._canvas queue:nil usingBlock:[weakThis](NSNotification *) { > > This is repeating the mistake of hardcoding a string instead of importing a > symbol. Sadly I have learned no lessons because that wouldn’t have saved us last time... 1440731 5 344658 simon.fraser 2018-07-09 22:13:03 -0700 Comment on attachment 344658 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=344658&action=review >>> Source/WebKit/UIProcess/ApplicationStateTracker.mm:100 >>> + m_didCreateWindowContextObserver = [notificationCenter addObserverForName:@"_UICanvasDidActivateNotification" object:window._canvas queue:nil usingBlock:[weakThis](NSNotification *) { >> >> This is repeating the mistake of hardcoding a string instead of importing a symbol. > > Sadly I have learned no lessons because that wouldn’t have saved us last time... Can we just use some public "app will come to the foreground" notification? 1440739 6 thorton 2018-07-09 22:42:38 -0700 I’m sure there’s some reason I didn’t use UIApplicationWillEnterForegroundNotification in the original patch, but I will check why :) 1440750 7 thorton 2018-07-09 23:11:51 -0700 (In reply to Tim Horton from comment #6) > I’m sure there’s some reason I didn’t use > UIApplicationWillEnterForegroundNotification in the original patch, but I > will check why :) There totally is. We need to be awoken and blanked out in snapshots that happen in the background. But now I don’t know if this patch is enough. Will continue investigating. 1440751 8 mitz 2018-07-09 23:13:13 -0700 Don’t forget app extensions and view services! 1441012 9 thorton 2018-07-10 16:38:35 -0700 Sadly, this is insufficient. 1441054 10 344741 thorton 2018-07-10 17:54:30 -0700 Created attachment 344741 Patch 1441070 11 344741 simon.fraser 2018-07-10 18:58:44 -0700 Comment on attachment 344741 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=344741&action=review Please make it build. > Source/WebKit/ChangeLog:15 > + The point of hiding the web view's contents in didCreateWindowContext > + was to ensure we did not hide it before the initial background snapshot > + (so that in the case of simple app, the background snapshot contains all > + WKWebViews), but then hide it if the app was reawoken in the background > + for snapshot updates (because layer contents could be emptied at that point), > + or (at the latest) when the app itself comes back to the foreground (for > + the same reason). This is hard to understand. 1441074 12 thorton 2018-07-10 19:15:19 -0700 I will try to make it easier to understand. If only I could draw pictures. Maybe I can! 1441075 13 thorton 2018-07-10 19:16:03 -0700 I seem to have missed a piece of “remove the old thing” 1441108 14 344754 thorton 2018-07-10 22:42:31 -0700 Created attachment 344754 Patch 1441109 15 thorton 2018-07-10 22:43:15 -0700 (In reply to Simon Fraser (smfr) from comment #11) > This is hard to understand. I really hope this is better :) At least, it will be good if we need to look back on the problem again in the future. 1441117 16 344754 commit-queue 2018-07-10 23:22:21 -0700 Comment on attachment 344754 Patch Clearing flags on attachment: 344754 Committed r233723: <https://trac.webkit.org/changeset/233723> 1441118 17 commit-queue 2018-07-10 23:22:22 -0700 All reviewed patches have been landed. Closing bug. 344658 2018-07-09 20:35:15 -0700 2018-07-10 16:39:17 -0700 Patch bug-187504-20180709203514.patch text/plain 3018 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzNjczCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDViYmNmOTM4ZDBlNDFhNzQ3 NGM1YjVmNDZmZDY2ZjhmZWM5YTM3MjAuLjNiNTI3NDU5NjVjYjdiMDg5YWRkNjlkNTlkZDM5Mjg2 YjEzNmQ0YWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTgtMDctMDkgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjIz MzQ4MCk6IE1haWwgY29udGVudHMgZmxhc2ggYmxhY2sgd2hlbiBhY3RpdmF0aW5nIE1haWwKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NzUwNAorICAg ICAgICA8cmRhcjovL3Byb2JsZW0vNDE3NTIzNTE+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBQbGF0Zm9ybS9zcGkvaW9zL1VJS2l0U1BJLmg6Cisg ICAgICAgICogVUlQcm9jZXNzL0FwcGxpY2F0aW9uU3RhdGVUcmFja2VyLm1tOgorICAgICAgICAo V2ViS2l0OjpBcHBsaWNhdGlvblN0YXRlVHJhY2tlcjo6QXBwbGljYXRpb25TdGF0ZVRyYWNrZXIp OgorICAgICAgICBOb3cgdGhhdCAoYWZ0ZXIgcjIzMzQ4MCkgd2UncmUgc3VjY2Vzc2Z1bGx5IG1h a2luZyBsYXllciBjb250ZW50cworICAgICAgICB2b2xhdGlsZSBhZ2FpbiwgaXQgaXMgc3VkZGVu bHkgaW1wb3J0YW50IHRoYXQgd2UgaGlkZSB0aGUgbGF5ZXJzCisgICAgICAgIHdoZW4gcmV0dXJu aW5nIGZyb20gdGhlIGJhY2tncm91bmQgYWdhaW4uIEl0IHR1cm5zIG91dCB0aGlzIGJyb2tlCisg ICAgICAgIGEgZmV3IHJlbGVhc2VzIGFnbyB3aGVuIHRoZSBub3RpZmljYXRpb24gd2FzIHJlbmFt ZWQsIGFuZCB3ZSBkaWRuJ3QKKyAgICAgICAgbm90aWNlIGR1ZSB0byByMjMzNDgwLgorCisgICAg ICAgIFNlZSByMjAzMzcxIGZvciB0aGUgb3JpZ2luYWwgbW90aXZhdGlvbiBmb3IgdGhpcyBtZWNo YW5pc20uCisKIDIwMTgtMDctMDkgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgog CiAgICAgICAgIEFkZCB0aGUgcG9zc2liaWxpdHkgdG8gcnVuIHVuc2FuZGJveGVkIHBsdWctaW5z CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1BsYXRmb3JtL3NwaS9pb3MvVUlLaXRTUEkuaCBi L1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtpdFNQSS5oCmluZGV4IGU5NTIxZWI5 NjI0YWU2MzJmZmQ5YTE2NTJlYzg3Yjk1OTQ5M2Q4NGUuLjJkZWIwNDE2MzVmOWY4OGI3ODMyOTk1 ODE4NThlOTE1NzdjN2YxYWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3Bp L2lvcy9VSUtpdFNQSS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvUGxhdGZvcm0vc3BpL2lvcy9VSUtp dFNQSS5oCkBAIC03OTgsNiArNzk4LDcgQEAgdHlwZWRlZiBOU19FTlVNKE5TSW50ZWdlciwgX1VJ QmFja2Ryb3BWaWV3U3R5bGVQcml2YXRlKSB7CiArIChCS1NBbmltYXRpb25GZW5jZUhhbmRsZSAq KV9zeW5jaHJvbml6ZWREcmF3aW5nRmVuY2U7CiArIChtYWNoX3BvcnRfdClfc3luY2hyb25pemVE cmF3aW5nQWNyb3NzUHJvY2Vzc2VzOwogLSAodm9pZClfc2V0V2luZG93UmVzb2x1dGlvbjooQ0dG bG9hdClyZXNvbHV0aW9uIGRpc3BsYXlJZkNoYW5nZWQ6KEJPT0wpZGlzcGxheUlmQ2hhbmdlZDsK K0Bwcm9wZXJ0eSAobm9uYXRvbWljLCB3ZWFrLCBnZXR0ZXI9X2NhbnZhcywgc2V0dGVyPV9zZXRD YW52YXM6KSBfVUlDYW52YXMgKl9jYW52YXM7CiBAZW5kCiAKIEBpbnRlcmZhY2UgVUlXZWJTY3Jv bGxWaWV3IDogVUlTY3JvbGxWaWV3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BcHBsaWNhdGlvblN0YXRlVHJhY2tlci5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0Fw cGxpY2F0aW9uU3RhdGVUcmFja2VyLm1tCmluZGV4IGEyZjg2NGU4OTk3OTJlYWQ4Zjg4NjNlNWVi ZmVjMDBhN2M4MDE2OTEuLjk5NzVhYzJkMDU3MmVjNTI5NTUxOWY5MTg0NGVkNzk2MGFkMzY0NDEg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FwcGxpY2F0aW9uU3RhdGVUcmFj a2VyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FwcGxpY2F0aW9uU3RhdGVUcmFj a2VyLm1tCkBAIC05Nyw4ICs5Nyw3IEBAIEFwcGxpY2F0aW9uU3RhdGVUcmFja2VyOjpBcHBsaWNh dGlvblN0YXRlVHJhY2tlcihVSVZpZXcgKnZpZXcsIFNFTCBkaWRFbnRlckJhY2tnCiAgICAgVUlB cHBsaWNhdGlvbiAqYXBwbGljYXRpb24gPSBbVUlBcHBsaWNhdGlvbiBzaGFyZWRBcHBsaWNhdGlv bl07CiAKICAgICBhdXRvIHdlYWtUaGlzID0gbWFrZVdlYWtQdHIoKnRoaXMpOwotICAgIC8vIEZJ WE1FOiB0aGlzIG5vdGlmaWNhdGlvbiBuZXZlciBmaXJlcyBhbnkgbW9yZTogcmRhcjovL3Byb2Js ZW0vNDE3NTIzNTEuCi0gICAgbV9kaWRDcmVhdGVXaW5kb3dDb250ZXh0T2JzZXJ2ZXIgPSBbbm90 aWZpY2F0aW9uQ2VudGVyIGFkZE9ic2VydmVyRm9yTmFtZTpAIl9VSVdpbmRvd0RpZENyZWF0ZVdp bmRvd0NvbnRleHROb3RpZmljYXRpb24iIG9iamVjdDp3aW5kb3cgcXVldWU6bmlsIHVzaW5nQmxv Y2s6W3dlYWtUaGlzXShOU05vdGlmaWNhdGlvbiAqKSB7CisgICAgbV9kaWRDcmVhdGVXaW5kb3dD b250ZXh0T2JzZXJ2ZXIgPSBbbm90aWZpY2F0aW9uQ2VudGVyIGFkZE9ic2VydmVyRm9yTmFtZTpA Il9VSUNhbnZhc0RpZEFjdGl2YXRlTm90aWZpY2F0aW9uIiBvYmplY3Q6d2luZG93Ll9jYW52YXMg cXVldWU6bmlsIHVzaW5nQmxvY2s6W3dlYWtUaGlzXShOU05vdGlmaWNhdGlvbiAqKSB7CiAgICAg ICAgIGF1dG8gYXBwbGljYXRpb25TdGF0ZVRyYWNrZXIgPSB3ZWFrVGhpcy5nZXQoKTsKICAgICAg ICAgaWYgKCFhcHBsaWNhdGlvblN0YXRlVHJhY2tlcikKICAgICAgICAgICAgIHJldHVybjsK 344741 2018-07-10 17:54:30 -0700 2018-07-10 22:42:30 -0700 Patch bug-187504-20180710175429.patch text/plain 10440 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzNjk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDNjMTk4NjgxYjQ0MzhhZjBl ZjViNTlmOTYzNmQ1YjAxYzFiZGExZTkuLmM2Y2ZjY2ZhZmI4NWQyYTUwMzUzMmQ0YmQ4MzA1NzQ3 OWUzNTI0MWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzggQEAKKzIwMTgtMDctMTAgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjIz MzQ4MCk6IE1haWwgY29udGVudHMgZmxhc2ggYmxhY2sgd2hlbiBhY3RpdmF0aW5nCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODc1MDQKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzQxNzUyMzUxPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFRoZSBwb2ludCBvZiBoaWRpbmcgdGhlIHdlYiB2aWV3J3MgY29u dGVudHMgaW4gZGlkQ3JlYXRlV2luZG93Q29udGV4dAorICAgICAgICB3YXMgdG8gZW5zdXJlIHdl IGRpZCBub3QgaGlkZSBpdCBiZWZvcmUgdGhlIGluaXRpYWwgYmFja2dyb3VuZCBzbmFwc2hvdAor ICAgICAgICAoc28gdGhhdCBpbiB0aGUgY2FzZSBvZiBzaW1wbGUgYXBwLCB0aGUgYmFja2dyb3Vu ZCBzbmFwc2hvdCBjb250YWlucyBhbGwKKyAgICAgICAgV0tXZWJWaWV3cyksIGJ1dCB0aGVuIGhp ZGUgaXQgaWYgdGhlIGFwcCB3YXMgcmVhd29rZW4gaW4gdGhlIGJhY2tncm91bmQKKyAgICAgICAg Zm9yIHNuYXBzaG90IHVwZGF0ZXMgKGJlY2F1c2UgbGF5ZXIgY29udGVudHMgY291bGQgYmUgZW1w dGllZCBhdCB0aGF0IHBvaW50KSwKKyAgICAgICAgb3IgKGF0IHRoZSBsYXRlc3QpIHdoZW4gdGhl IGFwcCBpdHNlbGYgY29tZXMgYmFjayB0byB0aGUgZm9yZWdyb3VuZCAoZm9yCisgICAgICAgIHRo ZSBzYW1lIHJlYXNvbikuCisKKyAgICAgICAgV2UgY2FuIGFjaGlldmUgdGhlIHNhbWUgdGhpbmcg YnkgaGlkaW5nIHRoZSBjb250ZW50IGltbWVkaWF0ZWx5IGFmdGVyCisgICAgICAgIGJhY2tncm91 bmQgc25hcHNob3R0aW5nIHRha2VzIHBsYWNlLgorCisgICAgICAgICogVUlQcm9jZXNzL0FwcGxp Y2F0aW9uU3RhdGVUcmFja2VyLmg6CisgICAgICAgICogVUlQcm9jZXNzL0FwcGxpY2F0aW9uU3Rh dGVUcmFja2VyLm1tOgorICAgICAgICAoV2ViS2l0OjpBcHBsaWNhdGlvblN0YXRlVHJhY2tlcjo6 QXBwbGljYXRpb25TdGF0ZVRyYWNrZXIpOgorICAgICAgICAoV2ViS2l0OjpBcHBsaWNhdGlvblN0 YXRlVHJhY2tlcjo6fkFwcGxpY2F0aW9uU3RhdGVUcmFja2VyKToKKyAgICAgICAgKFdlYktpdDo6 QXBwbGljYXRpb25TdGF0ZVRyYWNrZXI6OmFwcGxpY2F0aW9uRGlkQ3JlYXRlV2luZG93Q29udGV4 dCk6IERlbGV0ZWQuCisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XS0FwcGxpY2F0aW9uU3RhdGVU cmFja2luZ1ZpZXcuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQXBwbGljYXRpb25TdGF0 ZVRyYWNraW5nVmlldy5tbToKKyAgICAgICAgKC1bV0tBcHBsaWNhdGlvblN0YXRlVHJhY2tpbmdW aWV3IGRpZE1vdmVUb1dpbmRvd10pOgorICAgICAgICAoLVtXS0FwcGxpY2F0aW9uU3RhdGVUcmFj a2luZ1ZpZXcgX2FwcGxpY2F0aW9uRGlkQ3JlYXRlV2luZG93Q29udGV4dF0pOiBEZWxldGVkLgor ICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbToKKyAgICAgICAgKC1bV0tD b250ZW50VmlldyBfYXBwbGljYXRpb25EaWRDcmVhdGVXaW5kb3dDb250ZXh0XSk6IERlbGV0ZWQu CisgICAgICAgICogVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1MubW06CisgICAgICAgIChX ZWJLaXQ6OldlYlBhZ2VQcm94eTo6YXBwbGljYXRpb25EaWRGaW5pc2hTbmFwc2hvdHRpbmdBZnRl ckVudGVyaW5nQmFja2dyb3VuZCk6CisgICAgICAgIFJlbW92ZSB0aGUgZGlkQ3JlYXRlV2luZG93 Q29udGV4dCBub3RpZmljYXRpb24sIGFuZCBoaWRlIGNvbnRlbnQgYWZ0ZXIKKyAgICAgICAgc25h cHNob3R0aW5nIGFmdGVyIGVudGVyaW5nIHRoZSBiYWNrZ3JvdW5kLgorCiAyMDE4LTA3LTEwICBU aW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJ T04gKHIyMzE1MTApOiBEaXNtaXNzaW5nIFBERlBsdWdpbiBjb250ZXh0IG1lbnUgYXV0b21hdGlj YWxseSBjbGlja3MgdGhlIGZpcnN0IGl0ZW0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FwcGxpY2F0aW9uU3RhdGVUcmFja2VyLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BcHBsaWNhdGlvblN0YXRlVHJhY2tlci5oCmluZGV4IDRlYjViMmJjNGZlZTNkMjBiZjM2YjFi MWJiMjI2Y2I4NTYwMjgyODAuLmUxYTFkZjBmNmEyMmUyMjJlNjQyNWZjY2E5N2I1MjMzOTJkYzFm NjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FwcGxpY2F0aW9uU3RhdGVU cmFja2VyLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXBwbGljYXRpb25TdGF0ZVRy YWNrZXIuaApAQCAtNDYsMTMgKzQ2LDExIEBAIHB1YmxpYzoKIAogcHJpdmF0ZToKICAgICB2b2lk IGFwcGxpY2F0aW9uRGlkRW50ZXJCYWNrZ3JvdW5kKCk7Ci0gICAgdm9pZCBhcHBsaWNhdGlvbkRp ZENyZWF0ZVdpbmRvd0NvbnRleHQoKTsKICAgICB2b2lkIGFwcGxpY2F0aW9uRGlkRmluaXNoU25h cHNob3R0aW5nQWZ0ZXJFbnRlcmluZ0JhY2tncm91bmQoKTsKICAgICB2b2lkIGFwcGxpY2F0aW9u V2lsbEVudGVyRm9yZWdyb3VuZCgpOwogCiAgICAgV2Vha09iakNQdHI8VUlWaWV3PiBtX3ZpZXc7 CiAgICAgU0VMIG1fZGlkRW50ZXJCYWNrZ3JvdW5kU2VsZWN0b3I7Ci0gICAgU0VMIG1fZGlkQ3Jl YXRlV2luZG93Q29udGV4dFNlbGVjdG9yOwogICAgIFNFTCBtX2RpZEZpbmlzaFNuYXBzaG90dGlu Z0FmdGVyRW50ZXJpbmdCYWNrZ3JvdW5kU2VsZWN0b3I7CiAgICAgU0VMIG1fd2lsbEVudGVyRm9y ZWdyb3VuZFNlbGVjdG9yOwogCkBAIC02MSw3ICs1OSw2IEBAIHByaXZhdGU6CiAgICAgUmV0YWlu UHRyPEJLU0FwcGxpY2F0aW9uU3RhdGVNb25pdG9yPiBtX2FwcGxpY2F0aW9uU3RhdGVNb25pdG9y OwogCiAgICAgaWQgbV9kaWRFbnRlckJhY2tncm91bmRPYnNlcnZlcjsKLSAgICBpZCBtX2RpZENy ZWF0ZVdpbmRvd0NvbnRleHRPYnNlcnZlcjsKICAgICBpZCBtX2RpZEZpbmlzaFNuYXBzaG90dGlu Z0FmdGVyRW50ZXJpbmdCYWNrZ3JvdW5kT2JzZXJ2ZXI7CiAgICAgaWQgbV93aWxsRW50ZXJGb3Jl Z3JvdW5kT2JzZXJ2ZXI7CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv QXBwbGljYXRpb25TdGF0ZVRyYWNrZXIubW0gYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BcHBs aWNhdGlvblN0YXRlVHJhY2tlci5tbQppbmRleCBhMmY4NjRlODk5NzkyZWFkOGY4ODYzZTVlYmZl YzAwYTdjODAxNjkxLi4xY2I0ZWZiNTk2MzdiZWY4YzA3OTZiNjViMmE0NjM1YTg4MjhjMGVjIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BcHBsaWNhdGlvblN0YXRlVHJhY2tl ci5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BcHBsaWNhdGlvblN0YXRlVHJhY2tl ci5tbQpAQCAtNzYsMTcgKzc2LDE0IEBAIHN0YXRpYyBib29sIGlzQmFja2dyb3VuZFN0YXRlKEJL U0FwcGxpY2F0aW9uU3RhdGUgc3RhdGUpCiBBcHBsaWNhdGlvblN0YXRlVHJhY2tlcjo6QXBwbGlj YXRpb25TdGF0ZVRyYWNrZXIoVUlWaWV3ICp2aWV3LCBTRUwgZGlkRW50ZXJCYWNrZ3JvdW5kU2Vs ZWN0b3IsIFNFTCBkaWRDcmVhdGVXaW5kb3dDb250ZXh0U2VsZWN0b3IsIFNFTCBkaWRGaW5pc2hT bmFwc2hvdHRpbmdBZnRlckVudGVyaW5nQmFja2dyb3VuZFNlbGVjdG9yLCBTRUwgd2lsbEVudGVy Rm9yZWdyb3VuZFNlbGVjdG9yKQogICAgIDogbV92aWV3KHZpZXcpCiAgICAgLCBtX2RpZEVudGVy QmFja2dyb3VuZFNlbGVjdG9yKGRpZEVudGVyQmFja2dyb3VuZFNlbGVjdG9yKQotICAgICwgbV9k aWRDcmVhdGVXaW5kb3dDb250ZXh0U2VsZWN0b3IoZGlkQ3JlYXRlV2luZG93Q29udGV4dFNlbGVj dG9yKQogICAgICwgbV9kaWRGaW5pc2hTbmFwc2hvdHRpbmdBZnRlckVudGVyaW5nQmFja2dyb3Vu ZFNlbGVjdG9yKGRpZEZpbmlzaFNuYXBzaG90dGluZ0FmdGVyRW50ZXJpbmdCYWNrZ3JvdW5kU2Vs ZWN0b3IpCiAgICAgLCBtX3dpbGxFbnRlckZvcmVncm91bmRTZWxlY3Rvcih3aWxsRW50ZXJGb3Jl Z3JvdW5kU2VsZWN0b3IpCiAgICAgLCBtX2lzSW5CYWNrZ3JvdW5kKHRydWUpCiAgICAgLCBtX2Rp ZEVudGVyQmFja2dyb3VuZE9ic2VydmVyKG51bGxwdHIpCi0gICAgLCBtX2RpZENyZWF0ZVdpbmRv d0NvbnRleHRPYnNlcnZlcihudWxscHRyKQogICAgICwgbV9kaWRGaW5pc2hTbmFwc2hvdHRpbmdB ZnRlckVudGVyaW5nQmFja2dyb3VuZE9ic2VydmVyKG51bGxwdHIpCiAgICAgLCBtX3dpbGxFbnRl ckZvcmVncm91bmRPYnNlcnZlcihudWxscHRyKQogewogICAgIEFTU0VSVChbbV92aWV3LmdldCgp IHJlc3BvbmRzVG9TZWxlY3RvcjptX2RpZEVudGVyQmFja2dyb3VuZFNlbGVjdG9yXSk7Ci0gICAg QVNTRVJUKFttX3ZpZXcuZ2V0KCkgcmVzcG9uZHNUb1NlbGVjdG9yOm1fZGlkQ3JlYXRlV2luZG93 Q29udGV4dFNlbGVjdG9yXSk7CiAgICAgQVNTRVJUKFttX3ZpZXcuZ2V0KCkgcmVzcG9uZHNUb1Nl bGVjdG9yOm1fZGlkRmluaXNoU25hcHNob3R0aW5nQWZ0ZXJFbnRlcmluZ0JhY2tncm91bmRTZWxl Y3Rvcl0pOwogICAgIEFTU0VSVChbbV92aWV3LmdldCgpIHJlc3BvbmRzVG9TZWxlY3RvcjptX3dp bGxFbnRlckZvcmVncm91bmRTZWxlY3Rvcl0pOwogCkBAIC05NywxMyArOTQsNiBAQCBBcHBsaWNh dGlvblN0YXRlVHJhY2tlcjo6QXBwbGljYXRpb25TdGF0ZVRyYWNrZXIoVUlWaWV3ICp2aWV3LCBT RUwgZGlkRW50ZXJCYWNrZwogICAgIFVJQXBwbGljYXRpb24gKmFwcGxpY2F0aW9uID0gW1VJQXBw bGljYXRpb24gc2hhcmVkQXBwbGljYXRpb25dOwogCiAgICAgYXV0byB3ZWFrVGhpcyA9IG1ha2VX ZWFrUHRyKCp0aGlzKTsKLSAgICAvLyBGSVhNRTogdGhpcyBub3RpZmljYXRpb24gbmV2ZXIgZmly ZXMgYW55IG1vcmU6IHJkYXI6Ly9wcm9ibGVtLzQxNzUyMzUxLgotICAgIG1fZGlkQ3JlYXRlV2lu ZG93Q29udGV4dE9ic2VydmVyID0gW25vdGlmaWNhdGlvbkNlbnRlciBhZGRPYnNlcnZlckZvck5h bWU6QCJfVUlXaW5kb3dEaWRDcmVhdGVXaW5kb3dDb250ZXh0Tm90aWZpY2F0aW9uIiBvYmplY3Q6 d2luZG93IHF1ZXVlOm5pbCB1c2luZ0Jsb2NrOlt3ZWFrVGhpc10oTlNOb3RpZmljYXRpb24gKikg ewotICAgICAgICBhdXRvIGFwcGxpY2F0aW9uU3RhdGVUcmFja2VyID0gd2Vha1RoaXMuZ2V0KCk7 Ci0gICAgICAgIGlmICghYXBwbGljYXRpb25TdGF0ZVRyYWNrZXIpCi0gICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgIGFwcGxpY2F0aW9uU3RhdGVUcmFja2VyLT5hcHBsaWNhdGlvbkRpZENyZWF0 ZVdpbmRvd0NvbnRleHQoKTsKLSAgICB9XTsKIAogICAgIG1fZGlkRmluaXNoU25hcHNob3R0aW5n QWZ0ZXJFbnRlcmluZ0JhY2tncm91bmRPYnNlcnZlciA9IFtub3RpZmljYXRpb25DZW50ZXIgYWRk T2JzZXJ2ZXJGb3JOYW1lOkAiX1VJQXBwbGljYXRpb25EaWRGaW5pc2hTdXNwZW5zaW9uU25hcHNo b3ROb3RpZmljYXRpb24iIG9iamVjdDphcHBsaWNhdGlvbiBxdWV1ZTpuaWwgdXNpbmdCbG9jazpb d2Vha1RoaXNdKE5TTm90aWZpY2F0aW9uICopIHsKICAgICAgICAgYXV0byBhcHBsaWNhdGlvblN0 YXRlVHJhY2tlciA9IHdlYWtUaGlzLmdldCgpOwpAQCAtMjAwLDcgKzE5MCw2IEBAIEFwcGxpY2F0 aW9uU3RhdGVUcmFja2VyOjp+QXBwbGljYXRpb25TdGF0ZVRyYWNrZXIoKQogCiAgICAgTlNOb3Rp ZmljYXRpb25DZW50ZXIgKm5vdGlmaWNhdGlvbkNlbnRlciA9IFtOU05vdGlmaWNhdGlvbkNlbnRl ciBkZWZhdWx0Q2VudGVyXTsKICAgICBbbm90aWZpY2F0aW9uQ2VudGVyIHJlbW92ZU9ic2VydmVy Om1fZGlkRW50ZXJCYWNrZ3JvdW5kT2JzZXJ2ZXJdOwotICAgIFtub3RpZmljYXRpb25DZW50ZXIg cmVtb3ZlT2JzZXJ2ZXI6bV9kaWRDcmVhdGVXaW5kb3dDb250ZXh0T2JzZXJ2ZXJdOwogICAgIFtu b3RpZmljYXRpb25DZW50ZXIgcmVtb3ZlT2JzZXJ2ZXI6bV9kaWRGaW5pc2hTbmFwc2hvdHRpbmdB ZnRlckVudGVyaW5nQmFja2dyb3VuZE9ic2VydmVyXTsKICAgICBbbm90aWZpY2F0aW9uQ2VudGVy IHJlbW92ZU9ic2VydmVyOm1fd2lsbEVudGVyRm9yZWdyb3VuZE9ic2VydmVyXTsKIH0KQEAgLTIx MywxMiArMjAyLDYgQEAgdm9pZCBBcHBsaWNhdGlvblN0YXRlVHJhY2tlcjo6YXBwbGljYXRpb25E aWRFbnRlckJhY2tncm91bmQoKQogICAgICAgICB3dGZPYmpjTXNnU2VuZDx2b2lkPih2aWV3Lmdl dCgpLCBtX2RpZEVudGVyQmFja2dyb3VuZFNlbGVjdG9yKTsKIH0KIAotdm9pZCBBcHBsaWNhdGlv blN0YXRlVHJhY2tlcjo6YXBwbGljYXRpb25EaWRDcmVhdGVXaW5kb3dDb250ZXh0KCkKLXsKLSAg ICBpZiAoYXV0byB2aWV3ID0gbV92aWV3LmdldCgpKQotICAgICAgICB3dGZPYmpjTXNnU2VuZDx2 b2lkPih2aWV3LmdldCgpLCBtX2RpZENyZWF0ZVdpbmRvd0NvbnRleHRTZWxlY3Rvcik7Ci19Ci0K IHZvaWQgQXBwbGljYXRpb25TdGF0ZVRyYWNrZXI6OmFwcGxpY2F0aW9uRGlkRmluaXNoU25hcHNo b3R0aW5nQWZ0ZXJFbnRlcmluZ0JhY2tncm91bmQoKQogewogICAgIGlmIChhdXRvIHZpZXcgPSBt X3ZpZXcuZ2V0KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tB cHBsaWNhdGlvblN0YXRlVHJhY2tpbmdWaWV3LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tBcHBsaWNhdGlvblN0YXRlVHJhY2tpbmdWaWV3LmgKaW5kZXggZmQ3ZTc4YWQ3MjQyODA1 Y2IzZTBlNDlkMzgwM2JhNzgxMTgxYTZjNC4uM2QxODBiNDdlOWI1NWE0ZDhjZjdlOWFjYzE4ZWU3 ZmIyZWMzODA1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQXBw bGljYXRpb25TdGF0ZVRyYWNraW5nVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9XS0FwcGxpY2F0aW9uU3RhdGVUcmFja2luZ1ZpZXcuaApAQCAtMzIsNyArMzIsNiBAQAog QGludGVyZmFjZSBXS0FwcGxpY2F0aW9uU3RhdGVUcmFja2luZ1ZpZXcgOiBVSVZpZXcKIAogLSAo aW5zdGFuY2V0eXBlKWluaXRXaXRoRnJhbWU6KENHUmVjdClmcmFtZSB3ZWJWaWV3OihXS1dlYlZp ZXcgKil3ZWJWaWV3OwotLSAodm9pZClfYXBwbGljYXRpb25EaWRDcmVhdGVXaW5kb3dDb250ZXh0 OwogLSAodm9pZClfYXBwbGljYXRpb25XaWxsRW50ZXJGb3JlZ3JvdW5kOwogQHByb3BlcnR5IChu b25hdG9taWMsIHJlYWRvbmx5KSBCT09MIGlzQmFja2dyb3VuZDsKIEBwcm9wZXJ0eSAobm9uYXRv bWljLCByZWFkb25seSkgVUlWaWV3ICpfY29udGVudFZpZXc7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBcHBsaWNhdGlvblN0YXRlVHJhY2tpbmdWaWV3Lm1tIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQXBwbGljYXRpb25TdGF0ZVRyYWNraW5nVmll dy5tbQppbmRleCAwMzdmZGQzMGZlMWM1NDFjMjExYzg0ZDUzNTgxNDdlNTE1ODFiZGY3Li44ODRl ODFmOGFmYjk3YzEyMDNhNjlhYTlmNzNmM2VjYWI0MmJhZjRlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBcHBsaWNhdGlvblN0YXRlVHJhY2tpbmdWaWV3Lm1tCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0FwcGxpY2F0aW9uU3RhdGVUcmFja2lu Z1ZpZXcubW0KQEAgLTYzLDcgKzYzLDcgQEAgLSAodm9pZClkaWRNb3ZlVG9XaW5kb3cKICAgICAg ICAgcmV0dXJuOwogCiAgICAgQVNTRVJUKCFfYXBwbGljYXRpb25TdGF0ZVRyYWNrZXIpOwotICAg IF9hcHBsaWNhdGlvblN0YXRlVHJhY2tlciA9IHN0ZDo6bWFrZV91bmlxdWU8V2ViS2l0OjpBcHBs aWNhdGlvblN0YXRlVHJhY2tlcj4oc2VsZiwgQHNlbGVjdG9yKF9hcHBsaWNhdGlvbkRpZEVudGVy QmFja2dyb3VuZCksIEBzZWxlY3RvcihfYXBwbGljYXRpb25EaWRDcmVhdGVXaW5kb3dDb250ZXh0 KSwgQHNlbGVjdG9yKF9hcHBsaWNhdGlvbkRpZEZpbmlzaFNuYXBzaG90dGluZ0FmdGVyRW50ZXJp bmdCYWNrZ3JvdW5kKSwgQHNlbGVjdG9yKF9hcHBsaWNhdGlvbldpbGxFbnRlckZvcmVncm91bmQp KTsKKyAgICBfYXBwbGljYXRpb25TdGF0ZVRyYWNrZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPFdlYktp dDo6QXBwbGljYXRpb25TdGF0ZVRyYWNrZXI+KHNlbGYsIEBzZWxlY3RvcihfYXBwbGljYXRpb25E aWRFbnRlckJhY2tncm91bmQpLCBAc2VsZWN0b3IoX2FwcGxpY2F0aW9uRGlkRmluaXNoU25hcHNo b3R0aW5nQWZ0ZXJFbnRlcmluZ0JhY2tncm91bmQpLCBAc2VsZWN0b3IoX2FwcGxpY2F0aW9uV2ls bEVudGVyRm9yZWdyb3VuZCkpOwogfQogCiAtICh2b2lkKV9hcHBsaWNhdGlvbkRpZEVudGVyQmFj a2dyb3VuZApAQCAtNzYsMTAgKzc2LDYgQEAgLSAodm9pZClfYXBwbGljYXRpb25EaWRFbnRlckJh Y2tncm91bmQKICAgICBwYWdlLT5hY3Rpdml0eVN0YXRlRGlkQ2hhbmdlKFdlYkNvcmU6OkFjdGl2 aXR5U3RhdGU6OkFsbEZsYWdzICYgfldlYkNvcmU6OkFjdGl2aXR5U3RhdGU6OklzSW5XaW5kb3cp OwogfQogCi0tICh2b2lkKV9hcHBsaWNhdGlvbkRpZENyZWF0ZVdpbmRvd0NvbnRleHQKLXsKLX0K LQogLSAodm9pZClfYXBwbGljYXRpb25EaWRGaW5pc2hTbmFwc2hvdHRpbmdBZnRlckVudGVyaW5n QmFja2dyb3VuZAogewogICAgIGlmIChhdXRvIHBhZ2UgPSBbX3dlYlZpZXcgX3BhZ2VdKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0gYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbQppbmRleCA2NjliOTg4 OTZiOWEzMGVkODcwMTVmNjJjYzA5ZmVkMmVlMzU2YmM2Li41ZjYxNmI1ZDJiYWMzNzcxNjdjYmE0 NGZjNWM1YTdjODk3ZTg1OWI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlldy5tbQpAQCAtNjIxLDEzICs2MjEsNiBAQCAtICh2b2lkKV9hcHBsaWNhdGlvbldp bGxSZXNpZ25BY3RpdmU6KE5TTm90aWZpY2F0aW9uKilub3RpZmljYXRpb24KICAgICBfcGFnZS0+ YXBwbGljYXRpb25XaWxsUmVzaWduQWN0aXZlKCk7CiB9CiAKLS0gKHZvaWQpX2FwcGxpY2F0aW9u RGlkQ3JlYXRlV2luZG93Q29udGV4dAotewotICAgIFtzdXBlciBfYXBwbGljYXRpb25EaWRDcmVh dGVXaW5kb3dDb250ZXh0XTsKLSAgICBpZiAoYXV0byBkcmF3aW5nQXJlYSA9IF9wYWdlLT5kcmF3 aW5nQXJlYSgpKQotICAgICAgICBkcmF3aW5nQXJlYS0+aGlkZUNvbnRlbnRVbnRpbEFueVVwZGF0 ZSgpOwotfQotCiAtICh2b2lkKV9hcHBsaWNhdGlvbkRpZEJlY29tZUFjdGl2ZTooTlNOb3RpZmlj YXRpb24qKW5vdGlmaWNhdGlvbgogewogICAgIF9wYWdlLT5hcHBsaWNhdGlvbkRpZEJlY29tZUFj dGl2ZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQ cm94eUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1Mu bW0KaW5kZXggN2E3MDRjMWZmNmVhZDY4MWU5YWYzMWZmM2ExMDkzZmFhOGQwZDcyMi4uZmZiZDhl MTE0YzhhOTk4M2MyMTk5Njc2ZGE3YzNmOTEwYmM1OTVhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tCkBAIC02NTMsOCArNjUzLDEwIEBAIHZv aWQgV2ViUGFnZVByb3h5OjphcHBsaWNhdGlvbkRpZEVudGVyQmFja2dyb3VuZCgpCiAKIHZvaWQg V2ViUGFnZVByb3h5OjphcHBsaWNhdGlvbkRpZEZpbmlzaFNuYXBzaG90dGluZ0FmdGVyRW50ZXJp bmdCYWNrZ3JvdW5kKCkKIHsKLSAgICBpZiAobV9kcmF3aW5nQXJlYSkKKyAgICBpZiAobV9kcmF3 aW5nQXJlYSkgewogICAgICAgICBtX2RyYXdpbmdBcmVhLT5wcmVwYXJlRm9yQXBwU3VzcGVuc2lv bigpOworICAgICAgICBtX2RyYXdpbmdBcmVhLT5oaWRlQ29udGVudFVudGlsQW55VXBkYXRlKCk7 CisgICAgfQogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6QXBwbGljYXRp b25EaWRGaW5pc2hTbmFwc2hvdHRpbmdBZnRlckVudGVyaW5nQmFja2dyb3VuZCgpLCBtX3BhZ2VJ RCk7CiB9CiAK 344754 2018-07-10 22:42:31 -0700 2018-07-10 23:22:21 -0700 Patch bug-187504-20180710224230.patch text/plain 12834 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzNzIxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDkyMzFmYTYzNGViNGFhOTBi MjM5YzM1YjY4MzBiOTJjMjI5MzhmMTUuLmNmNDdkZGZhOGVlZDI0NWYxN2U0ZTZlODY2ZDQ3YzY1 NTA1NmU5MmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNzQgQEAKKzIwMTgtMDctMTAgIFRpbSBIb3J0 b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKKyAgICAgICAgUkVHUkVTU0lPTiAocjIz MzQ4MCk6IE1haWwgY29udGVudHMgZmxhc2ggYmxhY2sgd2hlbiBhY3RpdmF0aW5nCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODc1MDQKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzQxNzUyMzUxPgorCisgICAgICAgIFJldmlld2VkIGJ5IFNpbW9uIEZy YXNlci4KKworICAgICAgICBUaGUgc2VxdWVuY2Ugb2YgZXZlbnRzIHRvIHJlcHJvZHVjZSB0aGUg YnVnIG9yaWdpbmFsbHkgZml4ZWQgaW4gcjIwMzM3MQorICAgICAgICBpcyBlaXRoZXI6CisKKyAg ICAgICAgQSkgdGhlIHNpbXBsZSBiYWNrZ3JvdW5kL2ZvcmVncm91bmQgY2FzZQorCisgICAgICAg IDFdIGFwcCBiZWdpbnMgdG8gc3VzcGVuZAorICAgICAgICAyXSBhcHAgc3VzcGVuc2lvbiBzbmFw c2hvdHMgYXJlIHRha2VuCisgICAgICAgIDNdIFdLV2ViVmlldydzIHN1cmZhY2VzIGFyZSBtYXJr ZWQgdm9sYXRpbGUKKyAgICAgICAgNF0gYXBwIGNvbXBsZXRlcyBzdXNwZW5zaW9uCisgICAgICAg ICAgICAuLi4gdGltZSBnb2VzIGJ5IC4uLgorICAgICAgICA1XSBXS1dlYlZpZXcncyB2b2xhdGls ZSBzdXJmYWNlcyBhcmUgcHVyZ2VkCisgICAgICAgICAgICAuLi4gdGltZSBnb2VzIGJ5IC4uLgor ICAgICAgICA2XSBhcHAgYmVnaW5zIHRvIHJlc3VtZSwgc2hvd3MgKGdvb2QpIHN1c3BlbnNpb24g c25hcHNob3QKKyAgICAgICAgN10gYXBwIHJlbW92ZXMgc3VzcGVuc2lvbiBzbmFwc2hvdAorICAg ICAgICA4XSBXS1dlYlZpZXcgaGFzIHN1YmxheWVycyB3aXRoIHB1cmdlZCAoYmxhY2spIHN1cmZh Y2VzCisgICAgICAgIDldIFdLV2ViVmlldyBzdWJsYXllcnMgYXJlIHJlcGFpcmVkIGJ5IGEgbmV3 IGNvbW1pdCB3aXRoIG5vbnZvbGF0aWxlIHN1cmZhY2VzCisKKyAgICAgICAgQikgdGhlIHJlLXNu YXBzaG90IHdoaWxlIGluIHRoZSBiYWNrZ3JvdW5kIGNhc2UKKworICAgICAgICAxXSBhcHAgYmVn aW5zIHRvIHN1c3BlbmQKKyAgICAgICAgMl0gYXBwIHN1c3BlbnNpb24gc25hcHNob3RzIGFyZSB0 YWtlbgorICAgICAgICAzXSBXS1dlYlZpZXcncyBzdXJmYWNlcyBhcmUgbWFya2VkIHZvbGF0aWxl CisgICAgICAgIDRdIGFwcCBjb21wbGV0ZXMgc3VzcGVuc2lvbgorICAgICAgICAuLi4gdGltZSBn b2VzIGJ5IC4uLgorICAgICAgICA1XSBXS1dlYlZpZXcncyB2b2xhdGlsZSBzdXJmYWNlcyBhcmUg cHVyZ2VkCisgICAgICAgIC4uLiB0aW1lIGdvZXMgYnkgLi4uCisgICAgICAgIDZdIGFwcCB3YWtl cyB1cCBpbiB0aGUgYmFja2dyb3VuZCB0byB1cGRhdGUgaXRzIHNuYXBzaG90cworICAgICAgICA3 XSBpbiB0aGUgdXBkYXRlZCBzbmFwc2hvdHMsIFdLV2ViVmlldyBoYXMgc3VibGF5ZXJzIHdpdGgg cHVyZ2VkIChibGFjaykgc3VyZmFjZXMKKyAgICAgICAgLi4uIHRpbWUgZ29lcyBieSAuLi4KKyAg ICAgICAgOF0gYXBwIGJlZ2lucyB0byByZXN1bWUsIHNob3dzIChiYWQpIHN1c3BlbnNpb24gc25h cHNob3QKKyAgICAgICAgOV0gV0tXZWJWaWV3IHByZXNlbnRzIGxheWVycyB3aXRoIHB1cmdlZCAo YmxhY2spIHN1cmZhY2VzIHVudGlsIG5ldyBjb21taXQgZml4ZXMgdGhlbQorICAgICAgICAxMF0g V0tXZWJWaWV3IHN1YmxheWVycyBhcmUgcmVwYWlyZWQgYnkgYSBuZXcgY29tbWl0IHdpdGggbm9u dm9sYXRpbGUgc3VyZmFjZXMKKworICAgICAgICBXZWJLaXQncyBjdXJyZW50IGFwcHJvYWNoIHRv IGZpeCB0aGlzIHByb2JsZW0gaXMgc2ltcGx5IHRvIGhpZGUgdGhlCisgICAgICAgIFdLV2ViVmll dydzIHN1YmxheWVycyBhdCBzb21lIHBvaW50IGFmdGVyIEEyL0IyIChzdXNwZW5zaW9uIHNuYXBz aG90cyksCisgICAgICAgIGJ1dCBiZWZvcmUgQTgvQjcgKHRoZSBmaXJzdCB0aW1lIHRoZSBlbXB0 eSBsYXllcnMgd291bGQgYmUgcHJlc2VudGVkCisgICAgICAgIG9yIHNuYXBzaG90dGVkKS4KKwor ICAgICAgICBQcmV2aW91c2x5LCB3ZSBkaWQgdGhpcyBieSBoaWRpbmcgdGhlIGxheWVycyB3aGVu IHRoZSB3aW5kb3cncyBDQUNvbnRleHQKKyAgICAgICAgd2FzIGNyZWF0ZWQsIHdoaWNoIGhhcHBl bmVkIGVhcmx5IGVub3VnaCBpbiBib3RoIGNhc2VzIChhdCBBNi9CNikuCisgICAgICAgIEhvd2V2 ZXIsIHRoYXQgbm90aWZpY2F0aW9uIHdhcyByZW1vdmVkIHVuZGVybmVhdGggdXMgYXQgc29tZSBw b2ludC4KKworICAgICAgICBIb3dldmVyLCBpbiBsb29raW5nIGF0IHRoZSB0aW1lbGluZXMsIHRo ZXJlJ3MgYSBiZXR0ZXIgcGxhY2UgdG8gZG8gdGhpczoKKyAgICAgICAgaW1tZWRpYXRlbHkgYWZ0 ZXIgbWFya2luZyB0aGUgc3VyZmFjZXMgdm9sYXRpbGUgKEEzL0IzKSwgd2hpY2ggaXMgYWx3YXlz CisgICAgICAgIHN0cmljdGx5IGFmdGVyIHRoZSBhcHAgc3VzcGVuc2lvbiBzbmFwc2hvdHMgYXJl IHRha2VuLCBhbmQgYWxzbyBhbHdheXMKKyAgICAgICAgYmVmb3JlIHRoZSBmcmVzaGx5LW1hZGUt dm9sYXRpbGUgbGF5ZXJzIGNvdWxkIGJlIHByZXNlbnRlZCBvciBzbmFwc2hvdHRlZC4KKworICAg ICAgICAqIFVJUHJvY2Vzcy9BcHBsaWNhdGlvblN0YXRlVHJhY2tlci5oOgorICAgICAgICAqIFVJ UHJvY2Vzcy9BcHBsaWNhdGlvblN0YXRlVHJhY2tlci5tbToKKyAgICAgICAgKFdlYktpdDo6QXBw bGljYXRpb25TdGF0ZVRyYWNrZXI6OkFwcGxpY2F0aW9uU3RhdGVUcmFja2VyKToKKyAgICAgICAg KFdlYktpdDo6QXBwbGljYXRpb25TdGF0ZVRyYWNrZXI6On5BcHBsaWNhdGlvblN0YXRlVHJhY2tl cik6CisgICAgICAgIChXZWJLaXQ6OkFwcGxpY2F0aW9uU3RhdGVUcmFja2VyOjphcHBsaWNhdGlv bkRpZENyZWF0ZVdpbmRvd0NvbnRleHQpOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9p b3MvV0tBcHBsaWNhdGlvblN0YXRlVHJhY2tpbmdWaWV3Lmg6CisgICAgICAgICogVUlQcm9jZXNz L2lvcy9XS0FwcGxpY2F0aW9uU3RhdGVUcmFja2luZ1ZpZXcubW06CisgICAgICAgICgtW1dLQXBw bGljYXRpb25TdGF0ZVRyYWNraW5nVmlldyBkaWRNb3ZlVG9XaW5kb3ddKToKKyAgICAgICAgKC1b V0tBcHBsaWNhdGlvblN0YXRlVHJhY2tpbmdWaWV3IF9hcHBsaWNhdGlvbkRpZENyZWF0ZVdpbmRv d0NvbnRleHRdKTogRGVsZXRlZC4KKyAgICAgICAgKiBVSVByb2Nlc3MvaW9zL1dLQ29udGVudFZp ZXcubW06CisgICAgICAgICgtW1dLQ29udGVudFZpZXcgX2FwcGxpY2F0aW9uRGlkQ3JlYXRlV2lu ZG93Q29udGV4dF0pOiBEZWxldGVkLgorICAgICAgICAqIFVJUHJvY2Vzcy9pb3MvV2ViUGFnZVBy b3h5SU9TLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OmFwcGxpY2F0aW9uRGlk RmluaXNoU25hcHNob3R0aW5nQWZ0ZXJFbnRlcmluZ0JhY2tncm91bmQpOgorICAgICAgICBSZW1v dmUgdGhlIGRpZENyZWF0ZVdpbmRvd0NvbnRleHQgbm90aWZpY2F0aW9uLCBhbmQgaGlkZSBjb250 ZW50IGFmdGVyCisgICAgICAgIHNuYXBzaG90dGluZyBhZnRlciBlbnRlcmluZyB0aGUgYmFja2dy b3VuZC4KKwogMjAxOC0wNy0xMCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAK ICAgICAgICAgTWFrZSBmZXRjaCgpIHVzZSAic2FtZS1vcmlnaW4iIGNyZWRlbnRpYWxzIGJ5IGRl ZmF1bHQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FwcGxpY2F0aW9uU3Rh dGVUcmFja2VyLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BcHBsaWNhdGlvblN0YXRlVHJh Y2tlci5oCmluZGV4IDRlYjViMmJjNGZlZTNkMjBiZjM2YjFiMWJiMjI2Y2I4NTYwMjgyODAuLjNl YWE1MDNmZTFmMjA2YWE4NjFlZjFiMWM2MDFmMDYwZTQ2OGQxYzUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL0FwcGxpY2F0aW9uU3RhdGVUcmFja2VyLmgKKysrIGIvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvQXBwbGljYXRpb25TdGF0ZVRyYWNrZXIuaApAQCAtMzksMjAgKzM5 LDE4IEBAIG5hbWVzcGFjZSBXZWJLaXQgewogCiBjbGFzcyBBcHBsaWNhdGlvblN0YXRlVHJhY2tl ciA6IHB1YmxpYyBDYW5NYWtlV2Vha1B0cjxBcHBsaWNhdGlvblN0YXRlVHJhY2tlcj4gewogcHVi bGljOgotICAgIEFwcGxpY2F0aW9uU3RhdGVUcmFja2VyKFVJVmlldyAqLCBTRUwgZGlkRW50ZXJC YWNrZ3JvdW5kU2VsZWN0b3IsIFNFTCBkaWRDcmVhdGVXaW5kb3dDb250ZXh0U2VsZWN0b3IsIFNF TCBkaWRGaW5pc2hTbmFwc2hvdHRpbmdBZnRlckVudGVyaW5nQmFja2dyb3VuZFNlbGVjdG9yLCBT RUwgd2lsbEVudGVyRm9yZWdyb3VuZFNlbGVjdG9yKTsKKyAgICBBcHBsaWNhdGlvblN0YXRlVHJh Y2tlcihVSVZpZXcgKiwgU0VMIGRpZEVudGVyQmFja2dyb3VuZFNlbGVjdG9yLCBTRUwgZGlkRmlu aXNoU25hcHNob3R0aW5nQWZ0ZXJFbnRlcmluZ0JhY2tncm91bmRTZWxlY3RvciwgU0VMIHdpbGxF bnRlckZvcmVncm91bmRTZWxlY3Rvcik7CiAgICAgfkFwcGxpY2F0aW9uU3RhdGVUcmFja2VyKCk7 CiAKICAgICBib29sIGlzSW5CYWNrZ3JvdW5kKCkgY29uc3QgeyByZXR1cm4gbV9pc0luQmFja2dy b3VuZDsgfQogCiBwcml2YXRlOgogICAgIHZvaWQgYXBwbGljYXRpb25EaWRFbnRlckJhY2tncm91 bmQoKTsKLSAgICB2b2lkIGFwcGxpY2F0aW9uRGlkQ3JlYXRlV2luZG93Q29udGV4dCgpOwogICAg IHZvaWQgYXBwbGljYXRpb25EaWRGaW5pc2hTbmFwc2hvdHRpbmdBZnRlckVudGVyaW5nQmFja2dy b3VuZCgpOwogICAgIHZvaWQgYXBwbGljYXRpb25XaWxsRW50ZXJGb3JlZ3JvdW5kKCk7CiAKICAg ICBXZWFrT2JqQ1B0cjxVSVZpZXc+IG1fdmlldzsKICAgICBTRUwgbV9kaWRFbnRlckJhY2tncm91 bmRTZWxlY3RvcjsKLSAgICBTRUwgbV9kaWRDcmVhdGVXaW5kb3dDb250ZXh0U2VsZWN0b3I7CiAg ICAgU0VMIG1fZGlkRmluaXNoU25hcHNob3R0aW5nQWZ0ZXJFbnRlcmluZ0JhY2tncm91bmRTZWxl Y3RvcjsKICAgICBTRUwgbV93aWxsRW50ZXJGb3JlZ3JvdW5kU2VsZWN0b3I7CiAKQEAgLTYxLDcg KzU5LDYgQEAgcHJpdmF0ZToKICAgICBSZXRhaW5QdHI8QktTQXBwbGljYXRpb25TdGF0ZU1vbml0 b3I+IG1fYXBwbGljYXRpb25TdGF0ZU1vbml0b3I7CiAKICAgICBpZCBtX2RpZEVudGVyQmFja2dy b3VuZE9ic2VydmVyOwotICAgIGlkIG1fZGlkQ3JlYXRlV2luZG93Q29udGV4dE9ic2VydmVyOwog ICAgIGlkIG1fZGlkRmluaXNoU25hcHNob3R0aW5nQWZ0ZXJFbnRlcmluZ0JhY2tncm91bmRPYnNl cnZlcjsKICAgICBpZCBtX3dpbGxFbnRlckZvcmVncm91bmRPYnNlcnZlcjsKIH07CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BcHBsaWNhdGlvblN0YXRlVHJhY2tlci5tbSBi L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FwcGxpY2F0aW9uU3RhdGVUcmFja2VyLm1tCmluZGV4 IGEyZjg2NGU4OTk3OTJlYWQ4Zjg4NjNlNWViZmVjMDBhN2M4MDE2OTEuLmI4Nzg4NDg4ZjJlY2M2 OTM2MzY2N2UxYTJlMDgxODM1MDFkZDQ3MGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FwcGxpY2F0aW9uU3RhdGVUcmFja2VyLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL0FwcGxpY2F0aW9uU3RhdGVUcmFja2VyLm1tCkBAIC03MywyMCArNzMsMTcgQEAgc3Rh dGljIGJvb2wgaXNCYWNrZ3JvdW5kU3RhdGUoQktTQXBwbGljYXRpb25TdGF0ZSBzdGF0ZSkKICAg ICB9CiB9CiAKLUFwcGxpY2F0aW9uU3RhdGVUcmFja2VyOjpBcHBsaWNhdGlvblN0YXRlVHJhY2tl cihVSVZpZXcgKnZpZXcsIFNFTCBkaWRFbnRlckJhY2tncm91bmRTZWxlY3RvciwgU0VMIGRpZENy ZWF0ZVdpbmRvd0NvbnRleHRTZWxlY3RvciwgU0VMIGRpZEZpbmlzaFNuYXBzaG90dGluZ0FmdGVy RW50ZXJpbmdCYWNrZ3JvdW5kU2VsZWN0b3IsIFNFTCB3aWxsRW50ZXJGb3JlZ3JvdW5kU2VsZWN0 b3IpCitBcHBsaWNhdGlvblN0YXRlVHJhY2tlcjo6QXBwbGljYXRpb25TdGF0ZVRyYWNrZXIoVUlW aWV3ICp2aWV3LCBTRUwgZGlkRW50ZXJCYWNrZ3JvdW5kU2VsZWN0b3IsIFNFTCBkaWRGaW5pc2hT bmFwc2hvdHRpbmdBZnRlckVudGVyaW5nQmFja2dyb3VuZFNlbGVjdG9yLCBTRUwgd2lsbEVudGVy Rm9yZWdyb3VuZFNlbGVjdG9yKQogICAgIDogbV92aWV3KHZpZXcpCiAgICAgLCBtX2RpZEVudGVy QmFja2dyb3VuZFNlbGVjdG9yKGRpZEVudGVyQmFja2dyb3VuZFNlbGVjdG9yKQotICAgICwgbV9k aWRDcmVhdGVXaW5kb3dDb250ZXh0U2VsZWN0b3IoZGlkQ3JlYXRlV2luZG93Q29udGV4dFNlbGVj dG9yKQogICAgICwgbV9kaWRGaW5pc2hTbmFwc2hvdHRpbmdBZnRlckVudGVyaW5nQmFja2dyb3Vu ZFNlbGVjdG9yKGRpZEZpbmlzaFNuYXBzaG90dGluZ0FmdGVyRW50ZXJpbmdCYWNrZ3JvdW5kU2Vs ZWN0b3IpCiAgICAgLCBtX3dpbGxFbnRlckZvcmVncm91bmRTZWxlY3Rvcih3aWxsRW50ZXJGb3Jl Z3JvdW5kU2VsZWN0b3IpCiAgICAgLCBtX2lzSW5CYWNrZ3JvdW5kKHRydWUpCiAgICAgLCBtX2Rp ZEVudGVyQmFja2dyb3VuZE9ic2VydmVyKG51bGxwdHIpCi0gICAgLCBtX2RpZENyZWF0ZVdpbmRv d0NvbnRleHRPYnNlcnZlcihudWxscHRyKQogICAgICwgbV9kaWRGaW5pc2hTbmFwc2hvdHRpbmdB ZnRlckVudGVyaW5nQmFja2dyb3VuZE9ic2VydmVyKG51bGxwdHIpCiAgICAgLCBtX3dpbGxFbnRl ckZvcmVncm91bmRPYnNlcnZlcihudWxscHRyKQogewogICAgIEFTU0VSVChbbV92aWV3LmdldCgp IHJlc3BvbmRzVG9TZWxlY3RvcjptX2RpZEVudGVyQmFja2dyb3VuZFNlbGVjdG9yXSk7Ci0gICAg QVNTRVJUKFttX3ZpZXcuZ2V0KCkgcmVzcG9uZHNUb1NlbGVjdG9yOm1fZGlkQ3JlYXRlV2luZG93 Q29udGV4dFNlbGVjdG9yXSk7CiAgICAgQVNTRVJUKFttX3ZpZXcuZ2V0KCkgcmVzcG9uZHNUb1Nl bGVjdG9yOm1fZGlkRmluaXNoU25hcHNob3R0aW5nQWZ0ZXJFbnRlcmluZ0JhY2tncm91bmRTZWxl Y3Rvcl0pOwogICAgIEFTU0VSVChbbV92aWV3LmdldCgpIHJlc3BvbmRzVG9TZWxlY3RvcjptX3dp bGxFbnRlckZvcmVncm91bmRTZWxlY3Rvcl0pOwogCkBAIC05NywxMyArOTQsNiBAQCBBcHBsaWNh dGlvblN0YXRlVHJhY2tlcjo6QXBwbGljYXRpb25TdGF0ZVRyYWNrZXIoVUlWaWV3ICp2aWV3LCBT RUwgZGlkRW50ZXJCYWNrZwogICAgIFVJQXBwbGljYXRpb24gKmFwcGxpY2F0aW9uID0gW1VJQXBw bGljYXRpb24gc2hhcmVkQXBwbGljYXRpb25dOwogCiAgICAgYXV0byB3ZWFrVGhpcyA9IG1ha2VX ZWFrUHRyKCp0aGlzKTsKLSAgICAvLyBGSVhNRTogdGhpcyBub3RpZmljYXRpb24gbmV2ZXIgZmly ZXMgYW55IG1vcmU6IHJkYXI6Ly9wcm9ibGVtLzQxNzUyMzUxLgotICAgIG1fZGlkQ3JlYXRlV2lu ZG93Q29udGV4dE9ic2VydmVyID0gW25vdGlmaWNhdGlvbkNlbnRlciBhZGRPYnNlcnZlckZvck5h bWU6QCJfVUlXaW5kb3dEaWRDcmVhdGVXaW5kb3dDb250ZXh0Tm90aWZpY2F0aW9uIiBvYmplY3Q6 d2luZG93IHF1ZXVlOm5pbCB1c2luZ0Jsb2NrOlt3ZWFrVGhpc10oTlNOb3RpZmljYXRpb24gKikg ewotICAgICAgICBhdXRvIGFwcGxpY2F0aW9uU3RhdGVUcmFja2VyID0gd2Vha1RoaXMuZ2V0KCk7 Ci0gICAgICAgIGlmICghYXBwbGljYXRpb25TdGF0ZVRyYWNrZXIpCi0gICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgIGFwcGxpY2F0aW9uU3RhdGVUcmFja2VyLT5hcHBsaWNhdGlvbkRpZENyZWF0 ZVdpbmRvd0NvbnRleHQoKTsKLSAgICB9XTsKIAogICAgIG1fZGlkRmluaXNoU25hcHNob3R0aW5n QWZ0ZXJFbnRlcmluZ0JhY2tncm91bmRPYnNlcnZlciA9IFtub3RpZmljYXRpb25DZW50ZXIgYWRk T2JzZXJ2ZXJGb3JOYW1lOkAiX1VJQXBwbGljYXRpb25EaWRGaW5pc2hTdXNwZW5zaW9uU25hcHNo b3ROb3RpZmljYXRpb24iIG9iamVjdDphcHBsaWNhdGlvbiBxdWV1ZTpuaWwgdXNpbmdCbG9jazpb d2Vha1RoaXNdKE5TTm90aWZpY2F0aW9uICopIHsKICAgICAgICAgYXV0byBhcHBsaWNhdGlvblN0 YXRlVHJhY2tlciA9IHdlYWtUaGlzLmdldCgpOwpAQCAtMjAwLDcgKzE5MCw2IEBAIEFwcGxpY2F0 aW9uU3RhdGVUcmFja2VyOjp+QXBwbGljYXRpb25TdGF0ZVRyYWNrZXIoKQogCiAgICAgTlNOb3Rp ZmljYXRpb25DZW50ZXIgKm5vdGlmaWNhdGlvbkNlbnRlciA9IFtOU05vdGlmaWNhdGlvbkNlbnRl ciBkZWZhdWx0Q2VudGVyXTsKICAgICBbbm90aWZpY2F0aW9uQ2VudGVyIHJlbW92ZU9ic2VydmVy Om1fZGlkRW50ZXJCYWNrZ3JvdW5kT2JzZXJ2ZXJdOwotICAgIFtub3RpZmljYXRpb25DZW50ZXIg cmVtb3ZlT2JzZXJ2ZXI6bV9kaWRDcmVhdGVXaW5kb3dDb250ZXh0T2JzZXJ2ZXJdOwogICAgIFtu b3RpZmljYXRpb25DZW50ZXIgcmVtb3ZlT2JzZXJ2ZXI6bV9kaWRGaW5pc2hTbmFwc2hvdHRpbmdB ZnRlckVudGVyaW5nQmFja2dyb3VuZE9ic2VydmVyXTsKICAgICBbbm90aWZpY2F0aW9uQ2VudGVy IHJlbW92ZU9ic2VydmVyOm1fd2lsbEVudGVyRm9yZWdyb3VuZE9ic2VydmVyXTsKIH0KQEAgLTIx MywxMiArMjAyLDYgQEAgdm9pZCBBcHBsaWNhdGlvblN0YXRlVHJhY2tlcjo6YXBwbGljYXRpb25E aWRFbnRlckJhY2tncm91bmQoKQogICAgICAgICB3dGZPYmpjTXNnU2VuZDx2b2lkPih2aWV3Lmdl dCgpLCBtX2RpZEVudGVyQmFja2dyb3VuZFNlbGVjdG9yKTsKIH0KIAotdm9pZCBBcHBsaWNhdGlv blN0YXRlVHJhY2tlcjo6YXBwbGljYXRpb25EaWRDcmVhdGVXaW5kb3dDb250ZXh0KCkKLXsKLSAg ICBpZiAoYXV0byB2aWV3ID0gbV92aWV3LmdldCgpKQotICAgICAgICB3dGZPYmpjTXNnU2VuZDx2 b2lkPih2aWV3LmdldCgpLCBtX2RpZENyZWF0ZVdpbmRvd0NvbnRleHRTZWxlY3Rvcik7Ci19Ci0K IHZvaWQgQXBwbGljYXRpb25TdGF0ZVRyYWNrZXI6OmFwcGxpY2F0aW9uRGlkRmluaXNoU25hcHNo b3R0aW5nQWZ0ZXJFbnRlcmluZ0JhY2tncm91bmQoKQogewogICAgIGlmIChhdXRvIHZpZXcgPSBt X3ZpZXcuZ2V0KCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tB cHBsaWNhdGlvblN0YXRlVHJhY2tpbmdWaWV3LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tBcHBsaWNhdGlvblN0YXRlVHJhY2tpbmdWaWV3LmgKaW5kZXggZmQ3ZTc4YWQ3MjQyODA1 Y2IzZTBlNDlkMzgwM2JhNzgxMTgxYTZjNC4uM2QxODBiNDdlOWI1NWE0ZDhjZjdlOWFjYzE4ZWU3 ZmIyZWMzODA1NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQXBw bGljYXRpb25TdGF0ZVRyYWNraW5nVmlldy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNz L2lvcy9XS0FwcGxpY2F0aW9uU3RhdGVUcmFja2luZ1ZpZXcuaApAQCAtMzIsNyArMzIsNiBAQAog QGludGVyZmFjZSBXS0FwcGxpY2F0aW9uU3RhdGVUcmFja2luZ1ZpZXcgOiBVSVZpZXcKIAogLSAo aW5zdGFuY2V0eXBlKWluaXRXaXRoRnJhbWU6KENHUmVjdClmcmFtZSB3ZWJWaWV3OihXS1dlYlZp ZXcgKil3ZWJWaWV3OwotLSAodm9pZClfYXBwbGljYXRpb25EaWRDcmVhdGVXaW5kb3dDb250ZXh0 OwogLSAodm9pZClfYXBwbGljYXRpb25XaWxsRW50ZXJGb3JlZ3JvdW5kOwogQHByb3BlcnR5IChu b25hdG9taWMsIHJlYWRvbmx5KSBCT09MIGlzQmFja2dyb3VuZDsKIEBwcm9wZXJ0eSAobm9uYXRv bWljLCByZWFkb25seSkgVUlWaWV3ICpfY29udGVudFZpZXc7CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBcHBsaWNhdGlvblN0YXRlVHJhY2tpbmdWaWV3Lm1tIGIv U291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQXBwbGljYXRpb25TdGF0ZVRyYWNraW5nVmll dy5tbQppbmRleCAwMzdmZGQzMGZlMWM1NDFjMjExYzg0ZDUzNTgxNDdlNTE1ODFiZGY3Li44ODRl ODFmOGFmYjk3YzEyMDNhNjlhYTlmNzNmM2VjYWI0MmJhZjRlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tBcHBsaWNhdGlvblN0YXRlVHJhY2tpbmdWaWV3Lm1tCisr KyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XS0FwcGxpY2F0aW9uU3RhdGVUcmFja2lu Z1ZpZXcubW0KQEAgLTYzLDcgKzYzLDcgQEAgLSAodm9pZClkaWRNb3ZlVG9XaW5kb3cKICAgICAg ICAgcmV0dXJuOwogCiAgICAgQVNTRVJUKCFfYXBwbGljYXRpb25TdGF0ZVRyYWNrZXIpOwotICAg IF9hcHBsaWNhdGlvblN0YXRlVHJhY2tlciA9IHN0ZDo6bWFrZV91bmlxdWU8V2ViS2l0OjpBcHBs aWNhdGlvblN0YXRlVHJhY2tlcj4oc2VsZiwgQHNlbGVjdG9yKF9hcHBsaWNhdGlvbkRpZEVudGVy QmFja2dyb3VuZCksIEBzZWxlY3RvcihfYXBwbGljYXRpb25EaWRDcmVhdGVXaW5kb3dDb250ZXh0 KSwgQHNlbGVjdG9yKF9hcHBsaWNhdGlvbkRpZEZpbmlzaFNuYXBzaG90dGluZ0FmdGVyRW50ZXJp bmdCYWNrZ3JvdW5kKSwgQHNlbGVjdG9yKF9hcHBsaWNhdGlvbldpbGxFbnRlckZvcmVncm91bmQp KTsKKyAgICBfYXBwbGljYXRpb25TdGF0ZVRyYWNrZXIgPSBzdGQ6Om1ha2VfdW5pcXVlPFdlYktp dDo6QXBwbGljYXRpb25TdGF0ZVRyYWNrZXI+KHNlbGYsIEBzZWxlY3RvcihfYXBwbGljYXRpb25E aWRFbnRlckJhY2tncm91bmQpLCBAc2VsZWN0b3IoX2FwcGxpY2F0aW9uRGlkRmluaXNoU25hcHNo b3R0aW5nQWZ0ZXJFbnRlcmluZ0JhY2tncm91bmQpLCBAc2VsZWN0b3IoX2FwcGxpY2F0aW9uV2ls bEVudGVyRm9yZWdyb3VuZCkpOwogfQogCiAtICh2b2lkKV9hcHBsaWNhdGlvbkRpZEVudGVyQmFj a2dyb3VuZApAQCAtNzYsMTAgKzc2LDYgQEAgLSAodm9pZClfYXBwbGljYXRpb25EaWRFbnRlckJh Y2tncm91bmQKICAgICBwYWdlLT5hY3Rpdml0eVN0YXRlRGlkQ2hhbmdlKFdlYkNvcmU6OkFjdGl2 aXR5U3RhdGU6OkFsbEZsYWdzICYgfldlYkNvcmU6OkFjdGl2aXR5U3RhdGU6OklzSW5XaW5kb3cp OwogfQogCi0tICh2b2lkKV9hcHBsaWNhdGlvbkRpZENyZWF0ZVdpbmRvd0NvbnRleHQKLXsKLX0K LQogLSAodm9pZClfYXBwbGljYXRpb25EaWRGaW5pc2hTbmFwc2hvdHRpbmdBZnRlckVudGVyaW5n QmFja2dyb3VuZAogewogICAgIGlmIChhdXRvIHBhZ2UgPSBbX3dlYlZpZXcgX3BhZ2VdKQpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dLQ29udGVudFZpZXcubW0gYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tDb250ZW50Vmlldy5tbQppbmRleCA2NjliOTg4 OTZiOWEzMGVkODcwMTVmNjJjYzA5ZmVkMmVlMzU2YmM2Li41ZjYxNmI1ZDJiYWMzNzcxNjdjYmE0 NGZjNWM1YTdjODk3ZTg1OWI1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9p b3MvV0tDb250ZW50Vmlldy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9pb3MvV0tD b250ZW50Vmlldy5tbQpAQCAtNjIxLDEzICs2MjEsNiBAQCAtICh2b2lkKV9hcHBsaWNhdGlvbldp bGxSZXNpZ25BY3RpdmU6KE5TTm90aWZpY2F0aW9uKilub3RpZmljYXRpb24KICAgICBfcGFnZS0+ YXBwbGljYXRpb25XaWxsUmVzaWduQWN0aXZlKCk7CiB9CiAKLS0gKHZvaWQpX2FwcGxpY2F0aW9u RGlkQ3JlYXRlV2luZG93Q29udGV4dAotewotICAgIFtzdXBlciBfYXBwbGljYXRpb25EaWRDcmVh dGVXaW5kb3dDb250ZXh0XTsKLSAgICBpZiAoYXV0byBkcmF3aW5nQXJlYSA9IF9wYWdlLT5kcmF3 aW5nQXJlYSgpKQotICAgICAgICBkcmF3aW5nQXJlYS0+aGlkZUNvbnRlbnRVbnRpbEFueVVwZGF0 ZSgpOwotfQotCiAtICh2b2lkKV9hcHBsaWNhdGlvbkRpZEJlY29tZUFjdGl2ZTooTlNOb3RpZmlj YXRpb24qKW5vdGlmaWNhdGlvbgogewogICAgIF9wYWdlLT5hcHBsaWNhdGlvbkRpZEJlY29tZUFj dGl2ZSgpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQ cm94eUlPUy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL2lvcy9XZWJQYWdlUHJveHlJT1Mu bW0KaW5kZXggN2E3MDRjMWZmNmVhZDY4MWU5YWYzMWZmM2ExMDkzZmFhOGQwZDcyMi4uZmZiZDhl MTE0YzhhOTk4M2MyMTk5Njc2ZGE3YzNmOTEwYmM1OTVhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvaW9zL1dlYlBhZ2VQcm94eUlPUy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9pb3MvV2ViUGFnZVByb3h5SU9TLm1tCkBAIC02NTMsOCArNjUzLDEwIEBAIHZv aWQgV2ViUGFnZVByb3h5OjphcHBsaWNhdGlvbkRpZEVudGVyQmFja2dyb3VuZCgpCiAKIHZvaWQg V2ViUGFnZVByb3h5OjphcHBsaWNhdGlvbkRpZEZpbmlzaFNuYXBzaG90dGluZ0FmdGVyRW50ZXJp bmdCYWNrZ3JvdW5kKCkKIHsKLSAgICBpZiAobV9kcmF3aW5nQXJlYSkKKyAgICBpZiAobV9kcmF3 aW5nQXJlYSkgewogICAgICAgICBtX2RyYXdpbmdBcmVhLT5wcmVwYXJlRm9yQXBwU3VzcGVuc2lv bigpOworICAgICAgICBtX2RyYXdpbmdBcmVhLT5oaWRlQ29udGVudFVudGlsQW55VXBkYXRlKCk7 CisgICAgfQogICAgIG1fcHJvY2Vzcy0+c2VuZChNZXNzYWdlczo6V2ViUGFnZTo6QXBwbGljYXRp b25EaWRGaW5pc2hTbmFwc2hvdHRpbmdBZnRlckVudGVyaW5nQmFja2dyb3VuZCgpLCBtX3BhZ2VJ RCk7CiB9CiAK