200084 2019-07-24 09:58:26 -0700 REGRESSION(r246496): [GTK] Tapping the web view scrolls up a bit 2019-07-26 02:00:40 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 alicem webkit-unassigned bugs-noreply cgarcia commit-queue mcatanzaro oldest_to_newest 1555381 0 alicem 2019-07-24 09:58:26 -0700 Probably another fallout from r246033 and/or r246496, but I don't know for sure. Not going to bisect it because of overheating. It should probably have been a part of https://bugs.webkit.org/show_bug.cgi?id=199322, but I didn't have a way to reproduce it until very recently. 1555782 1 alicem 2019-07-25 08:20:21 -0700 Correction. It also looks like that patch for phosh is faulty. :) It only scrolls up once at the beginning, i.e. on any tap. 1555794 2 alicem 2019-07-25 08:53:10 -0700 Ok, this is really a GTK bug. If scroll direction of a GdkEvent is GDK_SCROLL_SMOOTH, then gdk_event_get_scroll_direction() returns false and sets direction to GDK_SCROLL_UP, because that's the first value in the enum. Well, might also be the expected behavior, since it does return false after all. See https://gitlab.gnome.org/GNOME/gtk/issues/2048 1555799 3 374890 alicem 2019-07-25 09:06:47 -0700 Created attachment 374890 Patch 1555816 4 374890 mcatanzaro 2019-07-25 09:40:44 -0700 Comment on attachment 374890 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=374890&action=review > Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp:64 > GdkScrollDirection direction; I think we should initialize it here instead. > Source/WebKit/Shared/gtk/WebEventFactory.cpp:206 > GdkScrollDirection direction; Ditto. 1555825 5 alicem 2019-07-25 10:08:40 -0700 Not really. GTK does set the value even if returns false. 1555833 6 mcatanzaro 2019-07-25 10:39:18 -0700 (In reply to Alexander Mikhaylenko from comment #2) > Ok, this is really a GTK bug. If scroll direction of a GdkEvent is > GDK_SCROLL_SMOOTH, then gdk_event_get_scroll_direction() returns false and > sets direction to GDK_SCROLL_UP, because that's the first value in the enum. > > Well, might also be the expected behavior, since it does return false after > all. > > See https://gitlab.gnome.org/GNOME/gtk/issues/2048 gboolean gdk_event_get_scroll_direction (const GdkEvent *event, GdkScrollDirection *direction) { gboolean fetched = TRUE; GdkScrollDirection dir = 0; switch (event->type) { case GDK_SCROLL: if (event->scroll.direction == GDK_SCROLL_SMOOTH) fetched = FALSE; else dir = event->scroll.direction; break; default: fetched = FALSE; break; } if (direction) *direction = dir; return fetched; } So... WTF? The function is documented to get the GdkScrollDirection, not get the GdkScrollDirection except fail if the scroll direction is GDK_SCROLL_SMOOTH. Shouldn't it be: gboolean gdk_event_get_scroll_direction (const GdkEvent *event, GdkScrollDirection *direction) { if (event->type == GDK_SCROLL) { *direction = event->scroll.direction; return TRUE; *direction = 0; return FALSE; } 1555836 7 alicem 2019-07-25 10:50:24 -0700 Yeah, seems weird to me too. Tbh not a fan of the whole GDK_SCROLL_SMOOTH thing. IMO it would be a lot saner to just have deltas for discrete scrolling too. 1555960 8 374890 mcatanzaro 2019-07-25 16:34:49 -0700 Comment on attachment 374890 Patch I'll accept this if you add a link to your GTK bug report, because upstream seems hesitant but it's confusing and not good.... 1556062 9 374953 alicem 2019-07-26 01:19:24 -0700 Created attachment 374953 Patch 1556063 10 alicem 2019-07-26 01:19:56 -0700 Added the link to https://gitlab.gnome.org/GNOME/gtk/issues/2048 in the changelog 1556071 11 374953 commit-queue 2019-07-26 02:00:39 -0700 Comment on attachment 374953 Patch Clearing flags on attachment: 374953 Committed r247862: <https://trac.webkit.org/changeset/247862> 1556072 12 commit-queue 2019-07-26 02:00:40 -0700 All reviewed patches have been landed. Closing bug. 374890 2019-07-25 09:06:47 -0700 2019-07-26 01:19:17 -0700 Patch bug-200084-20190725210646.patch text/plain 4265 alicem U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3NzY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTdjNThhN2M3NjY5MTRh MzllNGY5MjE0YTlkMjM1MGJiOTgyYTk4Yi4uZjhiOTFkZTE0OTRlM2ZlZjY1MTUzMDI3ZDI1YTJi N2VmZThmYjY4NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE5LTA3LTI1ICBBbGV4 YW5kZXIgTWlraGF5bGVua28gIDxleGFsbTc2NTlAZ21haWwuY29tPgorCisgICAgICAgIFJFR1JF U1NJT04ocjI0NjQ5Nik6IFtHVEtdIFRhcHBpbmcgdGhlIHdlYiB2aWV3IHNjcm9sbHMgdXAgYSBi aXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMDA4 NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGdka19l dmVudF9nZXRfc2Nyb2xsX2RpcmVjdGlvbigpIHJldHVybnMgZmFsc2UsIGJ1dCBhbHNvIHNldHMg ZGlyZWN0aW9uIHRvIEdES19TQ1JPTExfVVAgaWYKKyAgICAgICAgdGhlIGRpcmVjdGlvbiB3YXMg R0RLX1NDUk9MTF9TTU9PVEguIFJlbHlpbmcgb24gemVybyBkZWx0YXMgaW4gdGhpcyBjYXNlIGlz IG5vdCBjb3JyZWN0LCBiZWNhdXNlCisgICAgICAgIHRoZXkgY2FuIGFsc28gYmUgemVybyB3aXRo IEdES19TQ1JPTExfU01PT1RILiBJbiB0aGlzIGNhc2UsIHNldCB0aGUgZGlyZWN0aW9uIG1hbnVh bGx5IHRvIGF2b2lkCisgICAgICAgIHRoYXQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvUGxh dGZvcm1XaGVlbEV2ZW50R3RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlBsYXRmb3JtV2hlZWxF dmVudDo6UGxhdGZvcm1XaGVlbEV2ZW50KToKKwogMjAxOS0wNy0yMyAgSnVzdGluIEZhbiAgPGp1 c3Rpbl9mYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtXZWJHUFVdIEltcGxlbWVudCBlcnJvcnMg Zm9yIEdQVVJlbmRlclBpcGVsaW5lIGNyZWF0aW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDdiN2M4ZDk2YTdlOTY4 NTI4NmZlNDc1MDI0YmNjZWFhYmM4MDEwZGIuLmNhOWQ0ZjY1N2ZlN2ViYmQwMjI4NWJkYmVkOGQy ODI5M2JmNWJhNzYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDctMjUgIEFsZXhh bmRlciBNaWtoYXlsZW5rbyAgPGV4YWxtNzY1OUBnbWFpbC5jb20+CisKKyAgICAgICAgUkVHUkVT U0lPTihyMjQ2NDk2KTogW0dUS10gVGFwcGluZyB0aGUgd2ViIHZpZXcgc2Nyb2xscyB1cCBhIGJp dAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAwMDg0 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgZ2RrX2V2 ZW50X2dldF9zY3JvbGxfZGlyZWN0aW9uKCkgcmV0dXJucyBmYWxzZSwgYnV0IGFsc28gc2V0cyBk aXJlY3Rpb24gdG8gR0RLX1NDUk9MTF9VUCBpZgorICAgICAgICB0aGUgZGlyZWN0aW9uIHdhcyBH REtfU0NST0xMX1NNT09USC4gUmVseWluZyBvbiB6ZXJvIGRlbHRhcyBpbiB0aGlzIGNhc2UgaXMg bm90IGNvcnJlY3QsIGJlY2F1c2UKKyAgICAgICAgdGhleSBjYW4gYWxzbyBiZSB6ZXJvIHdpdGgg R0RLX1NDUk9MTF9TTU9PVEguIEluIHRoaXMgY2FzZSwgc2V0IHRoZSBkaXJlY3Rpb24gbWFudWFs bHkgdG8gYXZvaWQKKyAgICAgICAgdGhhdC4KKworICAgICAgICAqIFNoYXJlZC9ndGsvV2ViRXZl bnRGYWN0b3J5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVX ZWJXaGVlbEV2ZW50KToKKwogMjAxOS0wNy0yMyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUu Y29tPgogCiAgICAgICAgIENyYXNoIHVuZGVyIFdlYktpdDpXVEY6OkRldGFpbDo6Q2FsbGFibGVX cmFwcGVyPFdlYktpdDo6UmVzb3VyY2VMb2FkU3RhdGlzdGljc01lbW9yeVN0b3JlOjp1cGRhdGVD b29raWVCbG9ja2luZyhXVEY6OkNvbXBsZXRpb25IYW5kbGVyPHZvaWQgKCk+JiYpOjokXzMyOjpv cGVyYXRvcigpKCk6OidsYW1iZGEnKCksIHZvaWQ+OjpjYWxsCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1XaGVlbEV2ZW50R3RrLmNwcCBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2d0ay9QbGF0Zm9ybVdoZWVsRXZlbnRHdGsuY3BwCmluZGV4IGY3ZGQx YTJjZGFkMmQzZTM4MGRhNjhkYWY1MTUxODNjN2QwMzJiMzcuLjEwNDRmZjJmNmQ0NGNiYWJlYzdi ZGU2ZWYxZTJmYWFhYmE3YjNmODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2d0ay9QbGF0Zm9ybVdoZWVsRXZlbnRHdGsuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL2d0ay9QbGF0Zm9ybVdoZWVsRXZlbnRHdGsuY3BwCkBAIC02Myw2ICs2Myw3IEBAIFBsYXRm b3JtV2hlZWxFdmVudDo6UGxhdGZvcm1XaGVlbEV2ZW50KEdka0V2ZW50U2Nyb2xsKiBldmVudCkK ICAgICBtX2RlbHRhWSA9IDA7CiAgICAgR2RrU2Nyb2xsRGlyZWN0aW9uIGRpcmVjdGlvbjsKICAg ICBpZiAoIWdka19ldmVudF9nZXRfc2Nyb2xsX2RpcmVjdGlvbihyZWludGVycHJldF9jYXN0PEdk a0V2ZW50Kj4oZXZlbnQpLCAmZGlyZWN0aW9uKSkgeworICAgICAgICBkaXJlY3Rpb24gPSBHREtf U0NST0xMX1NNT09USDsKICAgICAgICAgZ2RvdWJsZSBkZWx0YVgsIGRlbHRhWTsKICAgICAgICAg aWYgKGdka19ldmVudF9nZXRfc2Nyb2xsX2RlbHRhcyhyZWludGVycHJldF9jYXN0PEdka0V2ZW50 Kj4oZXZlbnQpLCAmZGVsdGFYLCAmZGVsdGFZKSkgewogICAgICAgICAgICAgbV9kZWx0YVggPSAt ZGVsdGFYOwpAQCAtODUsNiArODYsOCBAQCBQbGF0Zm9ybVdoZWVsRXZlbnQ6OlBsYXRmb3JtV2hl ZWxFdmVudChHZGtFdmVudFNjcm9sbCogZXZlbnQpCiAgICAgICAgIGNhc2UgR0RLX1NDUk9MTF9S SUdIVDoKICAgICAgICAgICAgIG1fZGVsdGFYID0gLWRlbHRhOwogICAgICAgICAgICAgYnJlYWs7 CisgICAgICAgIGNhc2UgR0RLX1NDUk9MTF9TTU9PVEg6CisgICAgICAgICAgICBicmVhazsKICAg ICAgICAgZGVmYXVsdDoKICAgICAgICAgICAgIEFTU0VSVF9OT1RfUkVBQ0hFRCgpOwogICAgICAg ICB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9ndGsvV2ViRXZlbnRGYWN0b3J5 LmNwcCBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2d0ay9XZWJFdmVudEZhY3RvcnkuY3BwCmluZGV4 IGRhZWExNTI2ZjM4YjRjZDcyZTllZmRhY2MzN2IzMzc4ZTBmMTRhYmQuLjJjYWJhYjE5NmUyYzU1 NTE5M2ExYmNhNmRkZmEwZWJlYjUwZTk3NTAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvU2hh cmVkL2d0ay9XZWJFdmVudEZhY3RvcnkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvU2hhcmVkL2d0 ay9XZWJFdmVudEZhY3RvcnkuY3BwCkBAIC0yMDUsNiArMjA1LDcgQEAgV2ViV2hlZWxFdmVudCBX ZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYldoZWVsRXZlbnQoY29uc3QgR2RrRXZlbnQqIGV2ZW50 LCBXZWJXaGUKIAogICAgIEdka1Njcm9sbERpcmVjdGlvbiBkaXJlY3Rpb247CiAgICAgaWYgKCFn ZGtfZXZlbnRfZ2V0X3Njcm9sbF9kaXJlY3Rpb24oZXZlbnQsICZkaXJlY3Rpb24pKSB7CisgICAg ICAgIGRpcmVjdGlvbiA9IEdES19TQ1JPTExfU01PT1RIOwogICAgICAgICBkb3VibGUgZGVsdGFY LCBkZWx0YVk7CiAgICAgICAgIGlmIChnZGtfZXZlbnRfZ2V0X3Njcm9sbF9kZWx0YXMoZXZlbnQs ICZkZWx0YVgsICZkZWx0YVkpKQogICAgICAgICAgICAgd2hlZWxUaWNrcyA9IEZsb2F0U2l6ZSgt ZGVsdGFYLCAtZGVsdGFZKTsKQEAgLTIyNCw2ICsyMjUsOCBAQCBXZWJXaGVlbEV2ZW50IFdlYkV2 ZW50RmFjdG9yeTo6Y3JlYXRlV2ViV2hlZWxFdmVudChjb25zdCBHZGtFdmVudCogZXZlbnQsIFdl YldoZQogICAgICAgICBjYXNlIEdES19TQ1JPTExfUklHSFQ6CiAgICAgICAgICAgICB3aGVlbFRp Y2tzID0gRmxvYXRTaXplKC0xLCAwKTsKICAgICAgICAgICAgIGJyZWFrOworICAgICAgICBjYXNl IEdES19TQ1JPTExfU01PT1RIOgorICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGRlZmF1bHQ6 CiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQoKTsKICAgICAgICAgfQo= 374953 2019-07-26 01:19:24 -0700 2019-07-26 02:00:39 -0700 Patch bug-200084-20190726131922.patch text/plain 4389 alicem U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ3NzY4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTdjNThhN2M3NjY5MTRh MzllNGY5MjE0YTlkMjM1MGJiOTgyYTk4Yi4uYjQ2MTEwOTM2OWViYzc3MjUxNjNmYjllZGQ1NGI1 ZjU0NTljNzUyNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE5LTA3LTI2ICBBbGV4 YW5kZXIgTWlraGF5bGVua28gIDxleGFsbTc2NTlAZ21haWwuY29tPgorCisgICAgICAgIFJFR1JF U1NJT04ocjI0NjQ5Nik6IFtHVEtdIFRhcHBpbmcgdGhlIHdlYiB2aWV3IHNjcm9sbHMgdXAgYSBi aXQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMDA4 NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGdka19l dmVudF9nZXRfc2Nyb2xsX2RpcmVjdGlvbigpIHJldHVybnMgZmFsc2UsIGJ1dCBhbHNvIHNldHMg ZGlyZWN0aW9uIHRvIEdES19TQ1JPTExfVVAgaWYKKyAgICAgICAgdGhlIGRpcmVjdGlvbiB3YXMg R0RLX1NDUk9MTF9TTU9PVEguIFJlbHlpbmcgb24gemVybyBkZWx0YXMgaW4gdGhpcyBjYXNlIGlz IG5vdCBjb3JyZWN0LCBiZWNhdXNlCisgICAgICAgIHRoZXkgY2FuIGFsc28gYmUgemVybyB3aXRo IEdES19TQ1JPTExfU01PT1RILiBJbiB0aGlzIGNhc2UsIHNldCB0aGUgZGlyZWN0aW9uIG1hbnVh bGx5IHRvIGF2b2lkCisgICAgICAgIHRoYXQuCisKKyAgICAgICAgU2VlIGh0dHBzOi8vZ2l0bGFi Lmdub21lLm9yZy9HTk9NRS9ndGsvaXNzdWVzLzIwNDgKKworICAgICAgICAqIHBsYXRmb3JtL2d0 ay9QbGF0Zm9ybVdoZWVsRXZlbnRHdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1X aGVlbEV2ZW50OjpQbGF0Zm9ybVdoZWVsRXZlbnQpOgorCiAyMDE5LTA3LTIzICBKdXN0aW4gRmFu ICA8anVzdGluX2ZhbkBhcHBsZS5jb20+CiAKICAgICAgICAgW1dlYkdQVV0gSW1wbGVtZW50IGVy cm9ycyBmb3IgR1BVUmVuZGVyUGlwZWxpbmUgY3JlYXRpb24KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggN2I3YzhkOTZh N2U5Njg1Mjg2ZmU0NzUwMjRiY2NlYWFiYzgwMTBkYi4uYTIxMzhhNGUzZDY4NTcyZDJhMTg4MTcz ZWM0NmI1YzU3YjU2N2Q2MyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKKysr IGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxOS0wNy0yNiAg QWxleGFuZGVyIE1pa2hheWxlbmtvICA8ZXhhbG03NjU5QGdtYWlsLmNvbT4KKworICAgICAgICBS RUdSRVNTSU9OKHIyNDY0OTYpOiBbR1RLXSBUYXBwaW5nIHRoZSB3ZWIgdmlldyBzY3JvbGxzIHVw IGEgYml0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MDAwODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBn ZGtfZXZlbnRfZ2V0X3Njcm9sbF9kaXJlY3Rpb24oKSByZXR1cm5zIGZhbHNlLCBidXQgYWxzbyBz ZXRzIGRpcmVjdGlvbiB0byBHREtfU0NST0xMX1VQIGlmCisgICAgICAgIHRoZSBkaXJlY3Rpb24g d2FzIEdES19TQ1JPTExfU01PT1RILiBSZWx5aW5nIG9uIHplcm8gZGVsdGFzIGluIHRoaXMgY2Fz ZSBpcyBub3QgY29ycmVjdCwgYmVjYXVzZQorICAgICAgICB0aGV5IGNhbiBhbHNvIGJlIHplcm8g d2l0aCBHREtfU0NST0xMX1NNT09USC4gSW4gdGhpcyBjYXNlLCBzZXQgdGhlIGRpcmVjdGlvbiBt YW51YWxseSB0byBhdm9pZAorICAgICAgICB0aGF0LgorCisgICAgICAgIFNlZSBodHRwczovL2dp dGxhYi5nbm9tZS5vcmcvR05PTUUvZ3RrL2lzc3Vlcy8yMDQ4CisKKyAgICAgICAgKiBTaGFyZWQv Z3RrL1dlYkV2ZW50RmFjdG9yeS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYkV2ZW50RmFjdG9y eTo6Y3JlYXRlV2ViV2hlZWxFdmVudCk6CisKIDIwMTktMDctMjMgIENocmlzIER1bWV6ICA8Y2R1 bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBDcmFzaCB1bmRlciBXZWJLaXQ6V1RGOjpEZXRhaWw6 OkNhbGxhYmxlV3JhcHBlcjxXZWJLaXQ6OlJlc291cmNlTG9hZFN0YXRpc3RpY3NNZW1vcnlTdG9y ZTo6dXBkYXRlQ29va2llQmxvY2tpbmcoV1RGOjpDb21wbGV0aW9uSGFuZGxlcjx2b2lkICgpPiYm KTo6JF8zMjo6b3BlcmF0b3IoKSgpOjonbGFtYmRhJygpLCB2b2lkPjo6Y2FsbApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3RrL1BsYXRmb3JtV2hlZWxFdmVudEd0ay5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1XaGVlbEV2ZW50R3RrLmNwcApp bmRleCBmN2RkMWEyY2RhZDJkM2UzODBkYTY4ZGFmNTE1MTgzYzdkMDMyYjM3Li4xMDQ0ZmYyZjZk NDRjYmFiZWM3YmRlNmVmMWUyZmFhYWJhN2IzZjgyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1XaGVlbEV2ZW50R3RrLmNwcAorKysgYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZvcm1XaGVlbEV2ZW50R3RrLmNwcApAQCAtNjMsNiArNjMs NyBAQCBQbGF0Zm9ybVdoZWVsRXZlbnQ6OlBsYXRmb3JtV2hlZWxFdmVudChHZGtFdmVudFNjcm9s bCogZXZlbnQpCiAgICAgbV9kZWx0YVkgPSAwOwogICAgIEdka1Njcm9sbERpcmVjdGlvbiBkaXJl Y3Rpb247CiAgICAgaWYgKCFnZGtfZXZlbnRfZ2V0X3Njcm9sbF9kaXJlY3Rpb24ocmVpbnRlcnBy ZXRfY2FzdDxHZGtFdmVudCo+KGV2ZW50KSwgJmRpcmVjdGlvbikpIHsKKyAgICAgICAgZGlyZWN0 aW9uID0gR0RLX1NDUk9MTF9TTU9PVEg7CiAgICAgICAgIGdkb3VibGUgZGVsdGFYLCBkZWx0YVk7 CiAgICAgICAgIGlmIChnZGtfZXZlbnRfZ2V0X3Njcm9sbF9kZWx0YXMocmVpbnRlcnByZXRfY2Fz dDxHZGtFdmVudCo+KGV2ZW50KSwgJmRlbHRhWCwgJmRlbHRhWSkpIHsKICAgICAgICAgICAgIG1f ZGVsdGFYID0gLWRlbHRhWDsKQEAgLTg1LDYgKzg2LDggQEAgUGxhdGZvcm1XaGVlbEV2ZW50OjpQ bGF0Zm9ybVdoZWVsRXZlbnQoR2RrRXZlbnRTY3JvbGwqIGV2ZW50KQogICAgICAgICBjYXNlIEdE S19TQ1JPTExfUklHSFQ6CiAgICAgICAgICAgICBtX2RlbHRhWCA9IC1kZWx0YTsKICAgICAgICAg ICAgIGJyZWFrOworICAgICAgICBjYXNlIEdES19TQ1JPTExfU01PT1RIOgorICAgICAgICAgICAg YnJlYWs7CiAgICAgICAgIGRlZmF1bHQ6CiAgICAgICAgICAgICBBU1NFUlRfTk9UX1JFQUNIRUQo KTsKICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9TaGFyZWQvZ3RrL1dlYkV2 ZW50RmFjdG9yeS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9ndGsvV2ViRXZlbnRGYWN0b3J5 LmNwcAppbmRleCBkYWVhMTUyNmYzOGI0Y2Q3MmU5ZWZkYWNjMzdiMzM3OGUwZjE0YWJkLi4yY2Fi YWIxOTZlMmM1NTUxOTNhMWJjYTZkZGZhMGViZWI1MGU5NzUwIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9ndGsvV2ViRXZlbnRGYWN0b3J5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L1NoYXJlZC9ndGsvV2ViRXZlbnRGYWN0b3J5LmNwcApAQCAtMjA1LDYgKzIwNSw3IEBAIFdlYldo ZWVsRXZlbnQgV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVXZWJXaGVlbEV2ZW50KGNvbnN0IEdka0V2 ZW50KiBldmVudCwgV2ViV2hlCiAKICAgICBHZGtTY3JvbGxEaXJlY3Rpb24gZGlyZWN0aW9uOwog ICAgIGlmICghZ2RrX2V2ZW50X2dldF9zY3JvbGxfZGlyZWN0aW9uKGV2ZW50LCAmZGlyZWN0aW9u KSkgeworICAgICAgICBkaXJlY3Rpb24gPSBHREtfU0NST0xMX1NNT09USDsKICAgICAgICAgZG91 YmxlIGRlbHRhWCwgZGVsdGFZOwogICAgICAgICBpZiAoZ2RrX2V2ZW50X2dldF9zY3JvbGxfZGVs dGFzKGV2ZW50LCAmZGVsdGFYLCAmZGVsdGFZKSkKICAgICAgICAgICAgIHdoZWVsVGlja3MgPSBG bG9hdFNpemUoLWRlbHRhWCwgLWRlbHRhWSk7CkBAIC0yMjQsNiArMjI1LDggQEAgV2ViV2hlZWxF dmVudCBXZWJFdmVudEZhY3Rvcnk6OmNyZWF0ZVdlYldoZWVsRXZlbnQoY29uc3QgR2RrRXZlbnQq IGV2ZW50LCBXZWJXaGUKICAgICAgICAgY2FzZSBHREtfU0NST0xMX1JJR0hUOgogICAgICAgICAg ICAgd2hlZWxUaWNrcyA9IEZsb2F0U2l6ZSgtMSwgMCk7CiAgICAgICAgICAgICBicmVhazsKKyAg ICAgICAgY2FzZSBHREtfU0NST0xMX1NNT09USDoKKyAgICAgICAgICAgIGJyZWFrOwogICAgICAg ICBkZWZhdWx0OgogICAgICAgICAgICAgQVNTRVJUX05PVF9SRUFDSEVEKCk7CiAgICAgICAgIH0K