226320 2021-05-27 02:48:01 -0700 [GTK] Try harder to find initial WebKitWebView size 2021-06-01 04:59:31 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 219202 1 alicem webkit-unassigned alicem aperez berto bugs-noreply cgarcia ews-watchlist gustavo mcatanzaro oldest_to_newest 1764266 0 alicem 2021-05-27 02:48:01 -0700 See the patch. 1764270 1 429860 alicem 2021-05-27 03:01:44 -0700 Created attachment 429860 Patch 1764271 2 ews-watchlist 2021-05-27 03:02:47 -0700 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See https://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 1764272 3 alicem 2021-05-27 03:03:39 -0700 Since we eliminate a 0,0 -> proper size change at the beginning, the patch further regresses https://bugs.webkit.org/show_bug.cgi?id=219202 as the view will not redraw on its own, so it depends on the patch from that bug. 1764273 4 aperez 2021-05-27 03:06:16 -0700 Patch looks sensible to me, but I would like another pair of eyes to take a look as well :) 1764366 5 429860 mcatanzaro 2021-05-27 09:46:19 -0700 Comment on attachment 429860 Patch Looks like there is some fallout: Unexpected failures (2) /WebKit2Gtk/TestWebKitWebView /webkit/WebKitWebView/snapshot /WebKit2Gtk/TestUIClient /webkit/WebKitWebView/window-properties 1764368 6 429860 mcatanzaro 2021-05-27 09:50:05 -0700 Comment on attachment 429860 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=429860&action=review This looks good to me. I would add a comment though, to explain why we are doing this, why it's not going to return a perfect result but is better than (0, 0), and probably also link to this bug report so we don't remove it by mistake in the future. BTW it's already mentioned in the patch changelog, but I'll link to it here as well: this is to fix https://gitlab.gnome.org/GNOME/epiphany/-/issues/1532. > Source/WebKit/ChangeLog:10 > + size, which will be (0, 0) because the drawing area ist still null is > Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp:2376 > + // everything is fine and we'll just use that Nit: that. with a period. > Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp:2383 > + // through the hierarchy and try to find a parent with non-0 size Nit: size. with a period. 1764389 7 429860 cgarcia 2021-05-27 10:23:39 -0700 Comment on attachment 429860 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=429860&action=review > Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp:2373 > +{ > +#if USE(GTK4) > + int width = gtk_widget_get_width(GTK_WIDGET(webViewBase)); > + int height = gtk_widget_get_height(GTK_WIDGET(webViewBase)); > +#else > + int width = gtk_widget_get_allocated_width(GTK_WIDGET(webViewBase)); > + int height = gtk_widget_get_allocated_height(GTK_WIDGET(webViewBase)); > +#endif I think we could add gtk_widget_get_width/height to GtkVersioning for gtk3 that returns allocated width/height. Assuming we always want the allocated size in gtk3 when width/height is queried in gtk4 1764390 8 429860 cgarcia 2021-05-27 10:24:12 -0700 Comment on attachment 429860 Patch Tests are not passing. 1764395 9 alicem 2021-05-27 10:28:16 -0700 (In reply to Carlos Garcia Campos from comment #7) > I think we could add gtk_widget_get_width/height to GtkVersioning for gtk3 > that returns allocated width/height. Assuming we always want the allocated > size in gtk3 when width/height is queried in gtk4 I mean, really we want `get_width()` in both cases but it doesn't exist in GTK3, so `get_allocated_width()` is the closest we have. 1764717 10 alicem 2021-05-28 02:53:13 -0700 (In reply to Carlos Garcia Campos from comment #8) > Comment on attachment 429860 [details] > Patch > > Tests are not passing. Great, they pass locally. I wonder what the difference is. 1765344 11 alicem 2021-05-31 00:30:02 -0700 Nevermind, they pass for GTK4 and fail for GTK3. That makes more sense. 1765374 12 430194 alicem 2021-05-31 03:12:00 -0700 Created attachment 430194 Patch Ok, one thing I hadn't known is that in GTK3 the default size is 1x1 and not 0x0. Another thing is I forgot about inspector which can take up a part of the web view size. Fixed both. 1765376 13 alicem 2021-05-31 03:12:50 -0700 > I think we could add gtk_widget_get_width/height to GtkVersioning for gtk3 that returns allocated width/height. Assuming we always want the allocated size in gtk3 when width/height is queried in gtk4 I did this at first, but then reverted it - the latest version of the patch uses get_width()/height() only once and since the default size differs between GTK 3 and 4 I have an #if there anyway. 1765570 14 430194 mcatanzaro 2021-06-01 04:55:52 -0700 Comment on attachment 430194 Patch Thanks! 1765574 15 ews-feeder 2021-06-01 04:59:28 -0700 Committed r278301 (238338@main): <https://commits.webkit.org/238338@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 430194. 429860 2021-05-27 03:01:44 -0700 2021-05-31 03:12:00 -0700 Patch 0001-Patch.patch text/plain 6135 alicem RnJvbSBjOGJlNzJjMTdhMmMzZTViNjFlMzNlNzYwMjQ5MmJkNTc3Zjk4NmQyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4YW5kZXIgTWlraGF5bGVua28gPGFsZXhtQGdub21lLm9y Zz4KRGF0ZTogVGh1LCAyNyBNYXkgMjAyMSAxNTowMDo0MSArMDUwMApTdWJqZWN0OiBbUEFUQ0hd IFBhdGNoCgotLS0KIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAg ICB8IDM3ICsrKysrKysrKysrKysrKysrCiAuLi4vVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVu dEltcGwuY3BwICAgICAgfCAgMyArLQogLi4uL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZp ZXdCYXNlLmNwcCAgIHwgNDEgKysrKysrKysrKysrKysrKysrKwogLi4uL0FQSS9ndGsvV2ViS2l0 V2ViVmlld0Jhc2VQcml2YXRlLmggICAgICAgIHwgIDEgKwogNCBmaWxlcyBjaGFuZ2VkLCA4MCBp bnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggM2RhZWU4ZjhkOTEwLi41 MzdiMjlkMmIxYTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAgQEAKKzIwMjEtMDUtMjcgIEFsZXhh bmRlciBNaWtoYXlsZW5rbyAgPGFsZXhtQGdub21lLm9yZz4KKworICAgICAgICBbR1RLXSBUcnkg aGFyZGVyIHRvIGZpbmQgaW5pdGlhbCBXZWJLaXRXZWJWaWV3IHNpemUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjMyMAorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnRseSB3ZSBiYXNlIHRoZSB2 aWV3cG9ydCBzaXplIG9uIHRoZSBkcmF3aW5nIGFyZWEgc2l6ZS4gVGhlCisgICAgICAgIGRyYXdp bmcgYXJlYSBpcyBjcmVhdGVkIHdpdGggYW4gaW5pdGlhbCBzaXplIGJhc2VkIG9uIHRoZSB2aWV3 cG9ydAorICAgICAgICBzaXplLCB3aGljaCB3aWxsIGJlICgwLCAwKSBiZWNhdXNlIHRoZSBkcmF3 aW5nIGFyZWEgaXN0IHN0aWxsIG51bGwKKyAgICAgICAgYnkgdGhhdCBwb2ludC4KKworICAgICAg ICBUaGVuLCBsYXRlciwgZHVyaW5nIHRoZSB3aWRnZXQgYWxsb2NhdGlvbiwgdGhlIGRyYXdpbmcg YXJlYSByZWNlaXZlcworICAgICAgICBpdHMgcHJvcGVyIHNpemUuCisKKyAgICAgICAgVGhlcmUg YXJlIDIgaXNzdWVzIGhlcmUuIEZpcnN0LCB0aGlzIGFwcHJvYWNoIGd1YXJhbnRlZXMgdGhhdCB0 aGUKKyAgICAgICAgaW5pdGlhbCB2aWV3cG9ydCBzaXplIHdpbGwgYWx3YXlzIGJlICgwLCAwKSwg YW5kIHRoZW4gdGhlcmUncyBubworICAgICAgICBndWFyYW50ZWUgdGhlIHdpZGdldCB3aWxsIGJl IGFsbG9jYXRlZCBhbnkgdGltZSBzb29uIC0gZm9yIGV4YW1wbGUsCisgICAgICAgIHdoaWxlIEd0 a05vdGVib29rIGluIEdUSzMgZG9lcyBhbGxvY2F0ZSBjaGlsZHJlbiB0aGF0IGFyZW4ndCBjdXJy ZW50bHkKKyAgICAgICAgdmlzaWJsZSwgR3RrU3RhY2sgZG9lc24ndCAoYW5kIHRoYXQgbWVhbnMg dGhhdCBHdGtOb3RlYm9vayBpbiBHVEs0IGFuZAorICAgICAgICBIZHlUYWJWaWV3IGRvbid0IGVp dGhlcikuIFRoaXMgbGVhZHMgdG8gYSBzaXR1YXRpb24gd2hlcmUgYSBwYWdlIG9wZW5lZAorICAg ICAgICBpbiBiYWNrZ3JvdW5kIHdpbGwgbG9hZCB3aXRoIDAsIDAgc2l6ZSBhbmQgaWYgYSBwYWdl IGRlcGVuZHMgb24gdGhhdCwKKyAgICAgICAgaXQgd29uJ3QgbG9hZCBjb3JyZWN0bHkuCisKKyAg ICAgICAgVGhlIGZpcnN0IGlzc3VlIGNhbiBiZSBmaXhlZCBieSBiYXNpbmcgdGhlIHZpZXdwb3J0 IHNpemUgb24gdGhlIHdpZGdldAorICAgICAgICBhbGxvY2F0aW9uIGFzIHdlbGwsIGFuZCB0aGVu IGlmIHRoZSB3aWRnZXQgaXNuJ3QgYWxsb2NhdGVkLCB3ZSBpbnN0ZWFkCisgICAgICAgIHRyeSB0 byB1c2UgdGhlIHNpemUgb2YgYSBwYXJlbnQgYXMgYW4gZXN0aW1hdGlvbiwgc28gdGhhdCB0aGUg aW5pdGlhbAorICAgICAgICBzaXplIGlzIGF0IGxlYXN0IG5vdCAwIGV2ZW4gaWYgbm90IGZ1bGx5 IGFjY3VyYXRlLgorCisgICAgICAgIFNlZSBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUv ZXBpcGhhbnkvLS9pc3N1ZXMvMTUzMgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvUGFn ZUNsaWVudEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6dmlld1Np emUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcDoK KyAgICAgICAgKHdlYmtpdFdlYlZpZXdCYXNlR2V0Vmlld1NpemUpOgorICAgICAgICAqIFVJUHJv Y2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZS5oOgorCiAyMDIxLTA1LTI2ICBB bGV4YW5kZXIgTWlraGF5bGVua28gIDxhbGV4bUBnbm9tZS5vcmc+CiAKICAgICAgICAgVHJhbnNp ZW50IHF1YXJ0ZXIgZGlzcGxheSB3aXRoIGEgSGlEUEkgLzRrIHNjcmVlbiBhbmQgYSAyMDAlIHNj YWxpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNs aWVudEltcGwuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50 SW1wbC5jcHAKaW5kZXggMmZiY2IzMjc0MGRmLi4yNDcxY2FjM2ZhNTggMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwCisrKyBiL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwCkBAIC0xMDMs OCArMTAzLDcgQEAgV2ViQ29yZTo6RmxvYXRQb2ludCBQYWdlQ2xpZW50SW1wbDo6dmlld1Njcm9s bFBvc2l0aW9uKCkKIAogV2ViQ29yZTo6SW50U2l6ZSBQYWdlQ2xpZW50SW1wbDo6dmlld1NpemUo KQogewotICAgIGF1dG8qIGRyYXdpbmdBcmVhID0gc3RhdGljX2Nhc3Q8RHJhd2luZ0FyZWFQcm94 eUNvb3JkaW5hdGVkR3JhcGhpY3MqPih3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dF Ql9WSUVXX0JBU0UobV92aWV3V2lkZ2V0KSktPmRyYXdpbmdBcmVhKCkpOwotICAgIHJldHVybiBk cmF3aW5nQXJlYSA/IGRyYXdpbmdBcmVhLT5zaXplKCkgOiBJbnRTaXplKCk7CisgICAgcmV0dXJu IHdlYmtpdFdlYlZpZXdCYXNlR2V0Vmlld1NpemUoV0VCS0lUX1dFQl9WSUVXX0JBU0UobV92aWV3 V2lkZ2V0KSk7CiB9CiAKIGJvb2wgUGFnZUNsaWVudEltcGw6OmlzVmlld1dpbmRvd0FjdGl2ZSgp CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZp ZXdCYXNlLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmll d0Jhc2UuY3BwCmluZGV4IDQyZDFhYTQ0NWFiZS4uZTM3NWI3M2ExNGNmIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcAorKysg Yi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcApA QCAtMjM2Miw2ICsyMzYyLDQ3IEBAIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VTZXRGb2N1cyhXZWJL aXRXZWJWaWV3QmFzZSogd2ViVmlld0Jhc2UsIGJvb2wgZm9jdXNlZCkKICAgICB3ZWJraXRXZWJW aWV3QmFzZVNjaGVkdWxlVXBkYXRlQWN0aXZpdHlTdGF0ZSh3ZWJWaWV3QmFzZSwgZmxhZ3NUb1Vw ZGF0ZSk7CiB9CiAKK0ludFNpemUgd2Via2l0V2ViVmlld0Jhc2VHZXRWaWV3U2l6ZShXZWJLaXRX ZWJWaWV3QmFzZSogd2ViVmlld0Jhc2UpCit7CisjaWYgVVNFKEdUSzQpCisgICAgaW50IHdpZHRo ID0gZ3RrX3dpZGdldF9nZXRfd2lkdGgoR1RLX1dJREdFVCh3ZWJWaWV3QmFzZSkpOworICAgIGlu dCBoZWlnaHQgPSBndGtfd2lkZ2V0X2dldF9oZWlnaHQoR1RLX1dJREdFVCh3ZWJWaWV3QmFzZSkp OworI2Vsc2UKKyAgICBpbnQgd2lkdGggPSBndGtfd2lkZ2V0X2dldF9hbGxvY2F0ZWRfd2lkdGgo R1RLX1dJREdFVCh3ZWJWaWV3QmFzZSkpOworICAgIGludCBoZWlnaHQgPSBndGtfd2lkZ2V0X2dl dF9hbGxvY2F0ZWRfaGVpZ2h0KEdUS19XSURHRVQod2ViVmlld0Jhc2UpKTsKKyNlbmRpZgorCisg ICAgLy8gRmlyc3QgdHJ5IHRoZSB3aWRnZXQncyBvd24gc2l6ZS4gSWYgaXQncyBhbHJlYWR5IG1h cHBlZCwKKyAgICAvLyBldmVyeXRoaW5nIGlzIGZpbmUgYW5kIHdlJ2xsIGp1c3QgdXNlIHRoYXQK KyAgICBpZiAod2lkdGggPiAwIHx8IGhlaWdodCA+IDApCisgICAgICAgIHJldHVybiBJbnRTaXpl KHdpZHRoLCBoZWlnaHQpOworCisgICAgR3RrV2lkZ2V0KiBwYXJlbnQgPSBndGtfd2lkZ2V0X2dl dF9wYXJlbnQoR1RLX1dJREdFVCh3ZWJWaWV3QmFzZSkpOworCisgICAgLy8gSWYgaXQncyBub3Qg bWFwcGVkLCB0aGVuIGl0cyBzaXplIHdpbGwgYmUgMC4gVGhlbiB3ZSBnbyB1cAorICAgIC8vIHRo cm91Z2ggdGhlIGhpZXJhcmNoeSBhbmQgdHJ5IHRvIGZpbmQgYSBwYXJlbnQgd2l0aCBub24tMCBz aXplCisgICAgd2hpbGUgKHBhcmVudCkgeworI2lmIFVTRShHVEs0KQorICAgICAgICB3aWR0aCA9 IGd0a193aWRnZXRfZ2V0X3dpZHRoKHBhcmVudCk7CisgICAgICAgIGhlaWdodCA9IGd0a193aWRn ZXRfZ2V0X2hlaWdodChwYXJlbnQpOworI2Vsc2UKKyAgICAgICAgd2lkdGggPSBndGtfd2lkZ2V0 X2dldF9hbGxvY2F0ZWRfd2lkdGgocGFyZW50KTsKKyAgICAgICAgaGVpZ2h0ID0gZ3RrX3dpZGdl dF9nZXRfYWxsb2NhdGVkX2hlaWdodChwYXJlbnQpOworI2VuZGlmCisKKyAgICAgICAgaWYgKHdp ZHRoID4gMCB8fCBoZWlnaHQgPiAwKQorICAgICAgICAgICAgcmV0dXJuIEludFNpemUod2lkdGgs IGhlaWdodCk7CisKKyAgICAgICAgcGFyZW50ID0gZ3RrX3dpZGdldF9nZXRfcGFyZW50KHBhcmVu dCk7CisgICAgfQorCisgICAgLy8gSWYgdGhlcmUgd2FzIG5vIHN1Y2ggYSBwYXJlbnQsIGl0J3Mg bGlrZWx5IHRoZSB3aWRnZXQgd2lkZ2V0IGlzbid0CisgICAgLy8gaW4gYSB3aW5kb3csIG9yIHRo ZSB3aG9sZSB3aW5kb3cgaXNuJ3QgbWFwcGVkLiBObyBwb2ludCBpbiB0cnlpbmcKKyAgICAvLyBp biB0aGlzIGNhc2UuCisKKyAgICByZXR1cm4gSW50U2l6ZSh3aWR0aCwgaGVpZ2h0KTsKK30KKwog Ym9vbCB3ZWJraXRXZWJWaWV3QmFzZUlzSW5XaW5kb3dBY3RpdmUoV2ViS2l0V2ViVmlld0Jhc2Uq IHdlYlZpZXdCYXNlKQogewogICAgIHJldHVybiB3ZWJWaWV3QmFzZS0+cHJpdi0+YWN0aXZpdHlT dGF0ZS5jb250YWlucyhBY3Rpdml0eVN0YXRlOjpXaW5kb3dJc0FjdGl2ZSk7CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlUHJpdmF0 ZS5oIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZVBy aXZhdGUuaAppbmRleCAxMTUwZGI2NWUwMGUuLjQ4NTgxYzhkZmJlMSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJWaWV3QmFzZVByaXZhdGUuaAor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlUHJp dmF0ZS5oCkBAIC02NCw2ICs2NCw3IEBAIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VVcGRhdGVUZXh0 SW5wdXRTdGF0ZShXZWJLaXRXZWJWaWV3QmFzZSopOwogdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVNl dENvbnRlbnRzU2l6ZShXZWJLaXRXZWJWaWV3QmFzZSosIGNvbnN0IFdlYkNvcmU6OkludFNpemUm KTsKIAogdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVNldEZvY3VzKFdlYktpdFdlYlZpZXdCYXNlKiwg Ym9vbCBmb2N1c2VkKTsKK1dlYkNvcmU6OkludFNpemUgd2Via2l0V2ViVmlld0Jhc2VHZXRWaWV3 U2l6ZShXZWJLaXRXZWJWaWV3QmFzZSopOwogYm9vbCB3ZWJraXRXZWJWaWV3QmFzZUlzSW5XaW5k b3dBY3RpdmUoV2ViS2l0V2ViVmlld0Jhc2UqKTsKIGJvb2wgd2Via2l0V2ViVmlld0Jhc2VJc0Zv Y3VzZWQoV2ViS2l0V2ViVmlld0Jhc2UqKTsKIGJvb2wgd2Via2l0V2ViVmlld0Jhc2VJc1Zpc2li bGUoV2ViS2l0V2ViVmlld0Jhc2UqKTsKLS0gCjIuMzEuMQoK 430194 2021-05-31 03:12:00 -0700 2021-06-01 04:59:30 -0700 Patch 0001-Patch.patch text/plain 7064 alicem RnJvbSBkMGJjNzNlNThhNWI4OWU3N2Y5ZGJmODFmNDUxYjMzZmZkMGE2MDU1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBBbGV4YW5kZXIgTWlraGF5bGVua28gPGFsZXhtQGdub21lLm9y Zz4KRGF0ZTogVGh1LCAyNyBNYXkgMjAyMSAxNTowMDo0MSArMDUwMApTdWJqZWN0OiBbUEFUQ0hd IFBhdGNoCgotLS0KIFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICAgICAg ICB8IDM3ICsrKysrKysrKysrKysrCiAuLi4vVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudElt cGwuY3BwICAgICAgfCAgMyArLQogLi4uL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdC YXNlLmNwcCAgIHwgNTAgKysrKysrKysrKysrKysrKysrLQogLi4uL0FQSS9ndGsvV2ViS2l0V2Vi Vmlld0Jhc2VQcml2YXRlLmggICAgICAgIHwgIDEgKwogNCBmaWxlcyBjaGFuZ2VkLCA4OCBpbnNl cnRpb25zKCspLCAzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hh bmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKaW5kZXggM2RhZWU4ZjhkOTEwLi5lYmJi NmM0N2EyYjcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDAgQEAKKzIwMjEtMDUtMzEgIEFsZXhhbmRl ciBNaWtoYXlsZW5rbyAgPGFsZXhtQGdub21lLm9yZz4KKworICAgICAgICBbR1RLXSBUcnkgaGFy ZGVyIHRvIGZpbmQgaW5pdGlhbCBXZWJLaXRXZWJWaWV3IHNpemUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyNjMyMAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEN1cnJlbnRseSB3ZSBiYXNlIHRoZSB2aWV3 cG9ydCBzaXplIG9uIHRoZSBkcmF3aW5nIGFyZWEgc2l6ZS4gVGhlCisgICAgICAgIGRyYXdpbmcg YXJlYSBpcyBjcmVhdGVkIHdpdGggYW4gaW5pdGlhbCBzaXplIGJhc2VkIG9uIHRoZSB2aWV3cG9y dAorICAgICAgICBzaXplLCB3aGljaCB3aWxsIGJlICgwLCAwKSBiZWNhdXNlIHRoZSBkcmF3aW5n IGFyZWEgaXMgc3RpbGwgbnVsbAorICAgICAgICBieSB0aGF0IHBvaW50LgorCisgICAgICAgIFRo ZW4sIGxhdGVyLCBkdXJpbmcgdGhlIHdpZGdldCBhbGxvY2F0aW9uLCB0aGUgZHJhd2luZyBhcmVh IHJlY2VpdmVzCisgICAgICAgIGl0cyBwcm9wZXIgc2l6ZS4KKworICAgICAgICBUaGVyZSBhcmUg MiBpc3N1ZXMgaGVyZS4gRmlyc3QsIHRoaXMgYXBwcm9hY2ggZ3VhcmFudGVlcyB0aGF0IHRoZQor ICAgICAgICBpbml0aWFsIHZpZXdwb3J0IHNpemUgd2lsbCBhbHdheXMgYmUgKDAsIDApLCBhbmQg dGhlbiB0aGVyZSdzIG5vCisgICAgICAgIGd1YXJhbnRlZSB0aGUgd2lkZ2V0IHdpbGwgYmUgYWxs b2NhdGVkIGFueSB0aW1lIHNvb24gLSBmb3IgZXhhbXBsZSwKKyAgICAgICAgd2hpbGUgR3RrTm90 ZWJvb2sgaW4gR1RLMyBkb2VzIGFsbG9jYXRlIGNoaWxkcmVuIHRoYXQgYXJlbid0IGN1cnJlbnRs eQorICAgICAgICB2aXNpYmxlLCBHdGtTdGFjayBkb2Vzbid0IChhbmQgdGhhdCBtZWFucyB0aGF0 IEd0a05vdGVib29rIGluIEdUSzQgYW5kCisgICAgICAgIEhkeVRhYlZpZXcgZG9uJ3QgZWl0aGVy KS4gVGhpcyBsZWFkcyB0byBhIHNpdHVhdGlvbiB3aGVyZSBhIHBhZ2Ugb3BlbmVkCisgICAgICAg IGluIGJhY2tncm91bmQgd2lsbCBsb2FkIHdpdGggMCwgMCBzaXplIGFuZCBpZiBhIHBhZ2UgZGVw ZW5kcyBvbiB0aGF0LAorICAgICAgICBpdCB3b24ndCBsb2FkIGNvcnJlY3RseS4KKworICAgICAg ICBUaGUgZmlyc3QgaXNzdWUgY2FuIGJlIGZpeGVkIGJ5IGJhc2luZyB0aGUgdmlld3BvcnQgc2l6 ZSBvbiB0aGUgdmlldworICAgICAgICBhbGxvY2F0aW9uIGFzIHdlbGwsIGFuZCB0aGVuIGlmIHRo ZSB3aWRnZXQgaXNuJ3QgYWxsb2NhdGVkLCB3ZSBpbnN0ZWFkCisgICAgICAgIHRyeSB0byB1c2Ug dGhlIHNpemUgb2YgYSBwYXJlbnQgYXMgYW4gZXN0aW1hdGlvbiwgc28gdGhhdCB0aGUgaW5pdGlh bAorICAgICAgICBzaXplIGlzIGF0IGxlYXN0IG5vdCAwIGV2ZW4gaWYgbm90IGZ1bGx5IGFjY3Vy YXRlLgorCisgICAgICAgIFNlZSBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZXBpcGhh bnkvLS9pc3N1ZXMvMTUzMgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVu dEltcGwuY3BwOgorICAgICAgICAoV2ViS2l0OjpQYWdlQ2xpZW50SW1wbDo6dmlld1NpemUpOgor ICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcDoKKyAgICAg ICAgKHdlYmtpdFdlYlZpZXdCYXNlR2V0Vmlld1NpemUpOgorICAgICAgICAqIFVJUHJvY2Vzcy9B UEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlUHJpdmF0ZS5oOgorCiAyMDIxLTA1LTI2ICBBbGV4YW5k ZXIgTWlraGF5bGVua28gIDxhbGV4bUBnbm9tZS5vcmc+CiAKICAgICAgICAgVHJhbnNpZW50IHF1 YXJ0ZXIgZGlzcGxheSB3aXRoIGEgSGlEUEkgLzRrIHNjcmVlbiBhbmQgYSAyMDAlIHNjYWxpbmcK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudElt cGwuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL2d0ay9QYWdlQ2xpZW50SW1wbC5j cHAKaW5kZXggMmZiY2IzMjc0MGRmLi4yNDcxY2FjM2ZhNTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvUGFnZUNsaWVudEltcGwuY3BwCkBAIC0xMDMsOCArMTAz LDcgQEAgV2ViQ29yZTo6RmxvYXRQb2ludCBQYWdlQ2xpZW50SW1wbDo6dmlld1Njcm9sbFBvc2l0 aW9uKCkKIAogV2ViQ29yZTo6SW50U2l6ZSBQYWdlQ2xpZW50SW1wbDo6dmlld1NpemUoKQogewot ICAgIGF1dG8qIGRyYXdpbmdBcmVhID0gc3RhdGljX2Nhc3Q8RHJhd2luZ0FyZWFQcm94eUNvb3Jk aW5hdGVkR3JhcGhpY3MqPih3ZWJraXRXZWJWaWV3QmFzZUdldFBhZ2UoV0VCS0lUX1dFQl9WSUVX X0JBU0UobV92aWV3V2lkZ2V0KSktPmRyYXdpbmdBcmVhKCkpOwotICAgIHJldHVybiBkcmF3aW5n QXJlYSA/IGRyYXdpbmdBcmVhLT5zaXplKCkgOiBJbnRTaXplKCk7CisgICAgcmV0dXJuIHdlYmtp dFdlYlZpZXdCYXNlR2V0Vmlld1NpemUoV0VCS0lUX1dFQl9WSUVXX0JBU0UobV92aWV3V2lkZ2V0 KSk7CiB9CiAKIGJvb2wgUGFnZUNsaWVudEltcGw6OmlzVmlld1dpbmRvd0FjdGl2ZSgpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNl LmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlld0Jhc2Uu Y3BwCmluZGV4IDQyZDFhYTQ0NWFiZS4uMzc2YzgwNjlkZGQzIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcAorKysgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXdCYXNlLmNwcApAQCAtMjYz LDYgKzI2Myw3IEBAIHN0cnVjdCBfV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlIHsKICNlbmRpZgog ICAgIHN0ZDo6dW5pcXVlX3B0cjxQYWdlQ2xpZW50SW1wbD4gcGFnZUNsaWVudDsKICAgICBSZWZQ dHI8V2ViUGFnZVByb3h5PiBwYWdlUHJveHk7CisgICAgSW50U2l6ZSB2aWV3U2l6ZSB7IH07CiAg ICAgYm9vbCBzaG91bGRGb3J3YXJkTmV4dEtleUV2ZW50IHsgZmFsc2UgfTsKICAgICBib29sIHNo b3VsZEZvcndhcmROZXh0V2hlZWxFdmVudCB7IGZhbHNlIH07CiAjaWYgIVVTRShHVEs0KQpAQCAt ODkxLDggKzg5MiwxMCBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3QmFzZVNpemVBbGxvY2F0 ZShHdGtXaWRnZXQqIHdpZGdldCwgR3RrQWxsb2NhdGlvbiogYWxsbwogICAgIH0KICNlbmRpZgog CisgICAgcHJpdi0+dmlld1NpemUgPSB2aWV3UmVjdC5zaXplKCk7CisKICAgICBpZiAoYXV0byog ZHJhd2luZ0FyZWEgPSBzdGF0aWNfY2FzdDxEcmF3aW5nQXJlYVByb3h5Q29vcmRpbmF0ZWRHcmFw aGljcyo+KHByaXYtPnBhZ2VQcm94eS0+ZHJhd2luZ0FyZWEoKSkpCi0gICAgICAgIGRyYXdpbmdB cmVhLT5zZXRTaXplKHZpZXdSZWN0LnNpemUoKSk7CisgICAgICAgIGRyYXdpbmdBcmVhLT5zZXRT aXplKHByaXYtPnZpZXdTaXplKTsKIH0KIAogI2lmIFVTRShHVEs0KQpAQCAtMjM2Miw2ICsyMzY1 LDUxIEBAIHZvaWQgd2Via2l0V2ViVmlld0Jhc2VTZXRGb2N1cyhXZWJLaXRXZWJWaWV3QmFzZSog d2ViVmlld0Jhc2UsIGJvb2wgZm9jdXNlZCkKICAgICB3ZWJraXRXZWJWaWV3QmFzZVNjaGVkdWxl VXBkYXRlQWN0aXZpdHlTdGF0ZSh3ZWJWaWV3QmFzZSwgZmxhZ3NUb1VwZGF0ZSk7CiB9CiAKK0lu dFNpemUgd2Via2l0V2ViVmlld0Jhc2VHZXRWaWV3U2l6ZShXZWJLaXRXZWJWaWV3QmFzZSogd2Vi Vmlld0Jhc2UpCit7CisgICAgV2ViS2l0V2ViVmlld0Jhc2VQcml2YXRlKiBwcml2ID0gd2ViVmll d0Jhc2UtPnByaXY7CisgICAgaW50IHdpZHRoID0gcHJpdi0+dmlld1NpemUud2lkdGgoKTsKKyAg ICBpbnQgaGVpZ2h0ID0gcHJpdi0+dmlld1NpemUuaGVpZ2h0KCk7CisKKyAgICAvLyBGaXJzdCB0 cnkgdGhlIHdpZGdldCdzIG93biBzaXplLiBJZiBpdCdzIGFscmVhZHkgYWxsb2NhdGVkLAorICAg IC8vIGV2ZXJ5dGhpbmcgaXMgZmluZSBhbmQgd2UnbGwganVzdCB1c2UgdGhhdC4KKyAgICBpZiAo d2lkdGggPiAwIHx8IGhlaWdodCA+IDApCisgICAgICAgIHJldHVybiBJbnRTaXplKHdpZHRoLCBo ZWlnaHQpOworCisgICAgR3RrV2lkZ2V0KiBwYXJlbnQgPSBndGtfd2lkZ2V0X2dldF9wYXJlbnQo R1RLX1dJREdFVCh3ZWJWaWV3QmFzZSkpOworCisgICAgLy8gSWYgaXQncyBub3QgYWxsb2NhdGVk LCB0aGVuIGl0cyBzaXplIHdpbGwgYmUgMC4gVGhpcyBjYW4gYmUgYSBwcm9ibGVtCisgICAgLy8g aWYgdGhlIHdlYiB2aWV3IGlzIGxvYWRlZCBpbiBiYWNrZ3JvdW5kIGFuZCB0aGUgY29udGFpbmVy IGRvZXNuJ3QKKyAgICAvLyBhbGxvY2F0ZSBub24tdmlzaWJsZSBjaGlsZHJlbjogZS5nLiBHdGtO b3RlYm9vayBpbiBHVEszIGRvZXMgYWxsb2NhdGUKKyAgICAvLyB0aGVtLCBidXQgR3RrU3RhY2ss IGFuZCBzbyBHdGtOb3RlYm9vayBpbiBHVEs0IGFuZCBIZHlUYWJWaWV3IGRvbid0LgorICAgIC8v IFNlZSBodHRwczovL2dpdGxhYi5nbm9tZS5vcmcvR05PTUUvZXBpcGhhbnkvLS9pc3N1ZXMvMTUz MgorICAgIC8vIEluIHRoYXQgY2FzZSB3ZSBnbyB1cCB0aHJvdWdoIHRoZSBoaWVyYXJjaHkgYW5k IHRyeSB0byBmaW5kIGEgcGFyZW50CisgICAgLy8gd2l0aCBub24tMCBzaXplLgorICAgIHdoaWxl IChwYXJlbnQpIHsKKyNpZiBVU0UoR1RLNCkKKyAgICAgICAgd2lkdGggPSBndGtfd2lkZ2V0X2dl dF93aWR0aChwYXJlbnQpOworICAgICAgICBoZWlnaHQgPSBndGtfd2lkZ2V0X2dldF9oZWlnaHQo cGFyZW50KTsKKworICAgICAgICBpZiAod2lkdGggPiAwIHx8IGhlaWdodCA+IDApCisjZWxzZQor ICAgICAgICB3aWR0aCA9IGd0a193aWRnZXRfZ2V0X2FsbG9jYXRlZF93aWR0aChwYXJlbnQpOwor ICAgICAgICBoZWlnaHQgPSBndGtfd2lkZ2V0X2dldF9hbGxvY2F0ZWRfaGVpZ2h0KHBhcmVudCk7 CisKKyAgICAgICAgLy8gVGhlIGRlZmF1bHQgd2lkZ2V0IHNpemUgaW4gR1RLMyBpcyAxeDEsIG5v dCAweDAuCisgICAgICAgIGlmICh3aWR0aCA+IDEgfHwgaGVpZ2h0ID4gMSkKKyNlbmRpZgorICAg ICAgICAgICAgcmV0dXJuIEludFNpemUod2lkdGgsIGhlaWdodCk7CisKKyAgICAgICAgcGFyZW50 ID0gZ3RrX3dpZGdldF9nZXRfcGFyZW50KHBhcmVudCk7CisgICAgfQorCisgICAgLy8gSWYgdGhl cmUgd2FzIG5vIHN1Y2ggYSBwYXJlbnQsIGl0J3MgbGlrZWx5IHRoZSB3aWRnZXQgd2lkZ2V0IGlz bid0CisgICAgLy8gaW4gYSB3aW5kb3csIG9yIHRoZSB3aG9sZSB3aW5kb3cgaXNuJ3QgbWFwcGVk LiBObyBwb2ludCBpbiB0cnlpbmcKKyAgICAvLyBpbiB0aGlzIGNhc2UuCisKKyAgICByZXR1cm4g SW50U2l6ZSgpOworfQorCiBib29sIHdlYmtpdFdlYlZpZXdCYXNlSXNJbldpbmRvd0FjdGl2ZShX ZWJLaXRXZWJWaWV3QmFzZSogd2ViVmlld0Jhc2UpCiB7CiAgICAgcmV0dXJuIHdlYlZpZXdCYXNl LT5wcml2LT5hY3Rpdml0eVN0YXRlLmNvbnRhaW5zKEFjdGl2aXR5U3RhdGU6OldpbmRvd0lzQWN0 aXZlKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0 V2ViVmlld0Jhc2VQcml2YXRlLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dl YktpdFdlYlZpZXdCYXNlUHJpdmF0ZS5oCmluZGV4IDExNTBkYjY1ZTAwZS4uNDg1ODFjOGRmYmUx IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZp ZXdCYXNlUHJpdmF0ZS5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9ndGsvV2Vi S2l0V2ViVmlld0Jhc2VQcml2YXRlLmgKQEAgLTY0LDYgKzY0LDcgQEAgdm9pZCB3ZWJraXRXZWJW aWV3QmFzZVVwZGF0ZVRleHRJbnB1dFN0YXRlKFdlYktpdFdlYlZpZXdCYXNlKik7CiB2b2lkIHdl YmtpdFdlYlZpZXdCYXNlU2V0Q29udGVudHNTaXplKFdlYktpdFdlYlZpZXdCYXNlKiwgY29uc3Qg V2ViQ29yZTo6SW50U2l6ZSYpOwogCiB2b2lkIHdlYmtpdFdlYlZpZXdCYXNlU2V0Rm9jdXMoV2Vi S2l0V2ViVmlld0Jhc2UqLCBib29sIGZvY3VzZWQpOworV2ViQ29yZTo6SW50U2l6ZSB3ZWJraXRX ZWJWaWV3QmFzZUdldFZpZXdTaXplKFdlYktpdFdlYlZpZXdCYXNlKik7CiBib29sIHdlYmtpdFdl YlZpZXdCYXNlSXNJbldpbmRvd0FjdGl2ZShXZWJLaXRXZWJWaWV3QmFzZSopOwogYm9vbCB3ZWJr aXRXZWJWaWV3QmFzZUlzRm9jdXNlZChXZWJLaXRXZWJWaWV3QmFzZSopOwogYm9vbCB3ZWJraXRX ZWJWaWV3QmFzZUlzVmlzaWJsZShXZWJLaXRXZWJWaWV3QmFzZSopOwotLSAKMi4zMS4xCgo=