210160 2020-04-07 15:14:17 -0700 [GTK4] Fix usage of GDK event functions in PlatformWheelEventGtk 2020-04-13 08:23:37 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Local Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 210154 210100 1 aperez aperez bugs-noreply cgarcia csaavedra mcatanzaro svillar oldest_to_newest 1638835 0 aperez 2020-04-07 15:14:17 -0700 WebCore/platform/gtk/PlatformWheelEventGtk.cpp uses deprecated GDK functions, we'll need alternative code paths for GTK4 in some cases. 1638838 1 395747 aperez 2020-04-07 15:17:15 -0700 Created attachment 395747 Patch 1638853 2 395747 mcatanzaro 2020-04-07 15:39:56 -0700 Comment on attachment 395747 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395747&action=review > Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp:50 > +#if USE(GTK4) Wait, are you sure this actually works? I see you set(GTK_4 TRUE) in FindGTK.cmake, but nothing sets USE_GTK_4. There's also no way to choose whether you build with GTK 4 or GTK 3 (but I guess that will come later). 1638854 3 395747 mcatanzaro 2020-04-07 15:40:03 -0700 Comment on attachment 395747 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=395747&action=review > Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp:50 > +#if USE(GTK4) Wait, are you sure this actually works? I see you set(GTK_4 TRUE) in FindGTK.cmake, but nothing sets USE_GTK_4. There's also no way to choose whether you build with GTK 4 or GTK 3 (but I guess that will come later). 1638888 4 aperez 2020-04-07 17:00:20 -0700 (In reply to Michael Catanzaro from comment #2) > Comment on attachment 395747 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=395747&action=review > > > Source/WebCore/platform/gtk/PlatformWheelEventGtk.cpp:50 > > +#if USE(GTK4) > > Wait, are you sure this actually works? > > I see you set(GTK_4 TRUE) in FindGTK.cmake, but nothing sets USE_GTK_4. > > There's also no way to choose whether you build with GTK 4 or GTK 3 (but I > guess that will come later). That would be bug #210154, the patch there needs to be landed first (note that it a dependency for this bug :D) 1640884 5 ews-feeder 2020-04-13 08:23:36 -0700 Committed r260008: <https://trac.webkit.org/changeset/260008> All reviewed patches have been landed. Closing bug and clearing flags on attachment 395747. 395747 2020-04-07 15:17:15 -0700 2020-04-13 08:23:36 -0700 Patch bug-210160-20200408011714.patch text/plain 3878 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjU5NjQyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODk2ZDkwMzU5YmJlMzJm MTVkZjI3ZTNkY2VhODliZGQwZTcyOWNkNy4uYTg3MWY2YTM0ZTNiZmUxYTA2YjljMWQwY2RjNDkz ZTFkNTdhMGVjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDIwLTA0LTA3ICBBZHJp YW4gUGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUSzRd IEZpeCB1c2FnZSBvZiBHREsgZXZlbnQgZnVuY3Rpb25zIGluIFBsYXRmb3JtV2hlZWxFdmVudEd0 aworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwMTYw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8gbmV3 IHRlc3RzIG5lZWRlZC4KKworICAgICAgICAqIHBsYXRmb3JtL2d0ay9QbGF0Zm9ybVdoZWVsRXZl bnRHdGsuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGxhdGZvcm1XaGVlbEV2ZW50OjpQbGF0Zm9y bVdoZWVsRXZlbnQpOiBDb25kaXRpb25hbGx5CisgICAgICAgIHVzZSB0aGUgbmV3IEdESyBldmVu dCBmdW5jdGlvbnMgd2hlbiBidWlsZGluZyB3aXRoIEdUSzQuCisKIDIwMjAtMDQtMDcgIEFkcmlh biBQZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXSBD TWFrZSBmaW5kIG1vZHVsZSBmb3IgR1RLNApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3RrL1BsYXRmb3JtV2hlZWxFdmVudEd0ay5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9ndGsvUGxhdGZvcm1XaGVlbEV2ZW50R3RrLmNwcAppbmRleCAxMDQ0ZmYyZjZkNDRjYmFi ZWM3YmRlNmVmMWUyZmFhYWJhN2IzZjgyLi5jZjczM2QzMDRmMDYzYzM3ODM2NTc2YTU1YWExNWYz N2FlNjEyMWNiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxhdGZv cm1XaGVlbEV2ZW50R3RrLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ndGsvUGxh dGZvcm1XaGVlbEV2ZW50R3RrLmNwcApAQCAtNDYsNyArNDYsMTIgQEAgUGxhdGZvcm1XaGVlbEV2 ZW50OjpQbGF0Zm9ybVdoZWVsRXZlbnQoR2RrRXZlbnRTY3JvbGwqIGV2ZW50KQogCiAgICAgbV90 eXBlID0gUGxhdGZvcm1FdmVudDo6V2hlZWw7CiAgICAgbV90aW1lc3RhbXAgPSB3YWxsVGltZUZv ckV2ZW50KGV2ZW50KTsKKworI2lmIFVTRShHVEs0KQorICAgIHN0YXRlID0gZ2RrX2V2ZW50X2dl dF9tb2RpZmllcl9zdGF0ZShyZWludGVycHJldF9jYXN0PEdka0V2ZW50Kj4oZXZlbnQpKTsKKyNl bHNlCiAgICAgZ2RrX2V2ZW50X2dldF9zdGF0ZShyZWludGVycHJldF9jYXN0PEdka0V2ZW50Kj4o ZXZlbnQpLCAmc3RhdGUpOworI2VuZGlmCiAKICAgICBpZiAoc3RhdGUgJiBHREtfU0hJRlRfTUFT SykKICAgICAgICAgbV9tb2RpZmllcnMuYWRkKE1vZGlmaWVyOjpTaGlmdEtleSk7CkBAIC02Miw2 ICs2NywxNiBAQCBQbGF0Zm9ybVdoZWVsRXZlbnQ6OlBsYXRmb3JtV2hlZWxFdmVudChHZGtFdmVu dFNjcm9sbCogZXZlbnQpCiAgICAgbV9kZWx0YVggPSAwOwogICAgIG1fZGVsdGFZID0gMDsKICAg ICBHZGtTY3JvbGxEaXJlY3Rpb24gZGlyZWN0aW9uOworCisjaWYgVVNFKEdUSzQpCisgICAgZGly ZWN0aW9uID0gZ2RrX3Njcm9sbF9ldmVudF9nZXRfZGlyZWN0aW9uKHJlaW50ZXJwcmV0X2Nhc3Q8 R2RrRXZlbnQqPihldmVudCkpOworICAgIGlmIChkaXJlY3Rpb24gPT0gR0RLX1NDUk9MTF9TTU9P VEgpIHsKKyAgICAgICAgZG91YmxlIGRlbHRhWCwgZGVsdGFZOworICAgICAgICBnZGtfc2Nyb2xs X2V2ZW50X2dldF9kZWx0YXMocmVpbnRlcnByZXRfY2FzdDxHZGtFdmVudCo+KGV2ZW50KSwgJmRl bHRhWCwgJmRlbHRhWSk7CisgICAgICAgIG1fZGVsdGFYID0gLWRlbHRhWDsKKyAgICAgICAgbV9k ZWx0YVkgPSAtZGVsdGFZOworICAgIH0KKyNlbHNlCiAgICAgaWYgKCFnZGtfZXZlbnRfZ2V0X3Nj cm9sbF9kaXJlY3Rpb24ocmVpbnRlcnByZXRfY2FzdDxHZGtFdmVudCo+KGV2ZW50KSwgJmRpcmVj dGlvbikpIHsKICAgICAgICAgZGlyZWN0aW9uID0gR0RLX1NDUk9MTF9TTU9PVEg7CiAgICAgICAg IGdkb3VibGUgZGVsdGFYLCBkZWx0YVk7CkBAIC03MCw2ICs4NSw3IEBAIFBsYXRmb3JtV2hlZWxF dmVudDo6UGxhdGZvcm1XaGVlbEV2ZW50KEdka0V2ZW50U2Nyb2xsKiBldmVudCkKICAgICAgICAg ICAgIG1fZGVsdGFZID0gLWRlbHRhWTsKICAgICAgICAgfQogICAgIH0KKyNlbmRpZgogCiAgICAg Ly8gRG9jcyBzYXkgYW4gdXB3YXJkcyBzY3JvbGwgKGF3YXkgZnJvbSB0aGUgdXNlcikgaGFzIGEg cG9zaXRpdmUgZGVsdGEKICAgICBpZiAoIW1fZGVsdGFYICYmICFtX2RlbHRhWSkgewpAQCAtOTYs MTQgKzExMiwyNiBAQCBQbGF0Zm9ybVdoZWVsRXZlbnQ6OlBsYXRmb3JtV2hlZWxFdmVudChHZGtF dmVudFNjcm9sbCogZXZlbnQpCiAgICAgbV93aGVlbFRpY2tzWSA9IG1fZGVsdGFZOwogCiAjaWYg RU5BQkxFKEtJTkVUSUNfU0NST0xMSU5HKQotICAgIG1fcGhhc2UgPSBnZGtfZXZlbnRfaXNfc2Ny b2xsX3N0b3BfZXZlbnQocmVpbnRlcnByZXRfY2FzdDxHZGtFdmVudCo+KGV2ZW50KSkgPwotICAg ICAgICBQbGF0Zm9ybVdoZWVsRXZlbnRQaGFzZUVuZGVkIDoKLSAgICAgICAgUGxhdGZvcm1XaGVl bEV2ZW50UGhhc2VDaGFuZ2VkOworI2lmIFVTRShHVEs0KQorICAgIGNvbnN0IGF1dG8gaXNTdG9w RXZlbnQgPSBnZGtfc2Nyb2xsX2V2ZW50X2lzX3N0b3AocmVpbnRlcnByZXRfY2FzdDxHZGtFdmVu dCo+KGV2ZW50KSk7CisjZWxzZQorICAgIGNvbnN0IGF1dG8gaXNTdG9wRXZlbnQgPSBnZGtfZXZl bnRfaXNfc2Nyb2xsX3N0b3BfZXZlbnQocmVpbnRlcnByZXRfY2FzdDxHZGtFdmVudCo+KGV2ZW50 KSk7CisjZW5kaWYKKyAgICBtX3BoYXNlID0gaXNTdG9wRXZlbnQgPyAgUGxhdGZvcm1XaGVlbEV2 ZW50UGhhc2VFbmRlZCA6IFBsYXRmb3JtV2hlZWxFdmVudFBoYXNlQ2hhbmdlZDsKICNlbmRpZiAv LyBFTkFCTEUoS0lORVRJQ19TQ1JPTExJTkcpCiAKICAgICBnZG91YmxlIHgsIHksIHJvb3RYLCBy b290WTsKKyNpZiBVU0UoR1RLNCkKKyAgICBnZGtfZXZlbnRfZ2V0X3Bvc2l0aW9uKHJlaW50ZXJw cmV0X2Nhc3Q8R2RrRXZlbnQqPihldmVudCksICZ4LCAmeSk7CisgICAgLy8gR1RLNCBkb2VzIG5v dCBwcm92aWRlIGEgd2F5IG9mIG9idGFpbmluZyBzY3JlZW4tcmVsYXRpdmUgZXZlbnQgY29vcmRp bmF0ZXMsIGFuZCBldmVuCisgICAgLy8gb24gV2F5bGFuZCBHVEszIGNhbm5vdCBrbm93IHdoZXJl IGEgc3VyZmFjZSBpcyBhbmQgd2lsbCByZXR1cm4gdGhlIHN1cmZhY2UtcmVsYXRpdmUKKyAgICAv LyBjb29yZGluYXRlcyBhbnl3YXksIHNvIGRvIHRoZSBzYW1lIGhlcmUuCisgICAgcm9vdFggPSB4 OworICAgIHJvb3RZID0geTsKKyNlbHNlCiAgICAgZ2RrX2V2ZW50X2dldF9jb29yZHMocmVpbnRl cnByZXRfY2FzdDxHZGtFdmVudCo+KGV2ZW50KSwgJngsICZ5KTsKICAgICBnZGtfZXZlbnRfZ2V0 X3Jvb3RfY29vcmRzKHJlaW50ZXJwcmV0X2Nhc3Q8R2RrRXZlbnQqPihldmVudCksICZyb290WCwg JnJvb3RZKTsKKyNlbmRpZgogCiAgICAgbV9wb3NpdGlvbiA9IEludFBvaW50KHN0YXRpY19jYXN0 PGludD4oeCksIHN0YXRpY19jYXN0PGludD4oeSkpOwogICAgIG1fZ2xvYmFsUG9zaXRpb24gPSBJ bnRQb2ludChzdGF0aWNfY2FzdDxpbnQ+KHJvb3RYKSwgc3RhdGljX2Nhc3Q8aW50Pihyb290WSkp Owo=