199000 2019-06-19 07:47:04 -0700 [GTK] Fix compilation errors for the GTK2 plugin process 2019-06-19 10:42:59 -0700 1 1 1 Unclassified WebKit WebKitGTK Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aperez aperez bugs-noreply cgarcia commit-queue mcatanzaro rniwa ross.kirsling oldest_to_newest 1546056 0 aperez 2019-06-19 07:47:04 -0700 Build error: ../Source/WebKit/Shared/gtk/WebEventFactory.cpp:104:30: error: assigning to 'guint' (aka 'unsigned int') from incompatible type 'const GdkEventButton' (aka 'const _GdkEventButton') eventButton = event->button; ~~~~~~~^~~~~~ ../Source/WebKit/Shared/gtk/WebEventFactory.cpp:158:26: error: assigning to 'guint' (aka 'unsigned int') from incompatible type 'const GdkEventButton' (aka 'const _GdkEventButton') eventButton = event->button; ~~~~~~~^~~~~~ ../Source/WebKit/Shared/gtk/WebEventFactory.cpp:287:21: error: no member named 'keyval' in '_GdkEvent' keyval = event->keyval; ~~~~~ ^ ../Source/WebKit/Shared/gtk/WebEventFactory.cpp:288:22: error: no member named 'hardware_keycode' in '_GdkEvent' keycode = event->hardware_keycode; ~~~~~ ^ 4 errors generated. 1546057 1 372462 aperez 2019-06-19 07:54:00 -0700 Created attachment 372462 Patch 1546073 2 372462 mcatanzaro 2019-06-19 08:53:17 -0700 Comment on attachment 372462 Patch This is a bit weird though, because we are about to delete the plugin process so no more GTK 2, and our minimum GTK version is already 3.6. So it'd be nice to not remove the GTK_API_VERSION_2 guards since that makes it obvious that the code is there to support the plugin process. I think it's important to investigate what's actually gone wrong here. Clearly something else is up, because #ifndef GTK_API_VERSION_2 and #if GTK_CHECK_VERSION(3, 2, 0) should be equivalent when we know GTK version is either 2 or 3 >= 3.6. 1546077 3 aperez 2019-06-19 09:00:36 -0700 (In reply to Michael Catanzaro from comment #2) > Comment on attachment 372462 [details] > Patch > > This is a bit weird though, because we are about to delete the plugin > process so no more GTK 2, and our minimum GTK version is already 3.6. So > it'd be nice to not remove the GTK_API_VERSION_2 guards since that makes it > obvious that the code is there to support the plugin process. > > I think it's important to investigate what's actually gone wrong here. > Clearly something else is up, because #ifndef GTK_API_VERSION_2 and #if > GTK_CHECK_VERSION(3, 2, 0) should be equivalent when we know GTK version is > either 2 or 3 >= 3.6. What fixes the issue is the changes in the code, not the difference in the preprocessor guards themselves. I can re-submit the same fix with old guards, if you would prefer that :-) 1546080 4 372462 mcatanzaro 2019-06-19 09:13:24 -0700 Comment on attachment 372462 Patch Oh oops, I even missed that. Yes please. 1546109 5 372471 aperez 2019-06-19 10:17:26 -0700 Created attachment 372471 Patch v2 1546130 6 372471 commit-queue 2019-06-19 10:42:57 -0700 Comment on attachment 372471 Patch v2 Clearing flags on attachment: 372471 Committed r246597: <https://trac.webkit.org/changeset/246597> 1546131 7 commit-queue 2019-06-19 10:42:59 -0700 All reviewed patches have been landed. Closing bug. 372462 2019-06-19 07:54:00 -0700 2019-06-19 10:17:22 -0700 Patch bug-199000-20190619175359.patch text/plain 2819 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NTg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY3YzkxYjEyMzk3MjMxM2Y4 OTEzOTc0Zjg5N2FmMThhZjU5OGJhMTQuLjYxZWRlZDVhOWJiZTcwZWRhMDRjZTdlMjQ2ODgwNGYw MTZlMjQ1NmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTktMDYtMTkgIEFkcmlhbiBQ ZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBGaXgg Y29tcGlsYXRpb24gZXJyb3JzIGZvciB0aGUgR1RLMiBwbHVnaW4gcHJvY2VzcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MDAwCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvZ3RrL1dlYkV2 ZW50RmFjdG9yeS5jcHA6IFVzZSB0aGUgR2RrRXZlbnQgdW5pb24gZmllbGRzIGZvciBkaXJlY3Rs eSBhY2Nlc3NpbmcKKyAgICAgICAgZXZlbnQgZmllbGRzLiBVc2UgR1RLX0NIRUNLX1ZFUlNJT04g dG8gZ3VhcmQgdXNhZ2Ugb2YgZ2RrX2V2ZW50X2dldF9idXR0b24oKSwKKyAgICAgICAgZ2RrX2V2 ZW50X2dldF9rZXl2YWwoKSwgYW5kIGdka19ldmVudF9nZXRfa2V5Y29kZSgpOyBhbGwgb2Ygd2hp Y2ggd2VyZSBhZGRlZCB0byBHVEsKKyAgICAgICAgaW4gdmVyc2lvbiAzLjIuMC4KKyAgICAgICAg KFdlYktpdDo6YnV0dG9uRm9yRXZlbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJFdmVudEZhY3Rv cnk6OmNyZWF0ZVdlYk1vdXNlRXZlbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJFdmVudEZhY3Rv cnk6OmNyZWF0ZVdlYktleWJvYXJkRXZlbnQpOgorCiAyMDE5LTA2LTE5ICBaYW4gRG9iZXJzZWsg IDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAogICAgICAgICBbTmljb3NpYV0gSW52YWxpZGF0ZSBT Y2VuZUludGVncmF0aW9uIGluIExheWVyVHJlZUhvc3Q6OmludmFsaWRhdGUoKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9TaGFyZWQvZ3RrL1dlYkV2ZW50RmFjdG9yeS5jcHAgYi9Tb3VyY2Uv V2ViS2l0L1NoYXJlZC9ndGsvV2ViRXZlbnRGYWN0b3J5LmNwcAppbmRleCAxZjk0OGM2YzA4NjRh ZTUwMzJmY2JlMDllMGEyNzE3ZTg2NDk2YjQyLi5mMjY4ZGVmYzEzMzkwYWJhMWVkZjBiYmIyZjEy MmZjYTgzMjliZjNlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9ndGsvV2ViRXZl bnRGYWN0b3J5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1NoYXJlZC9ndGsvV2ViRXZlbnRGYWN0 b3J5LmNwcApAQCAtOTgsMTAgKzk4LDEwIEBAIHN0YXRpYyBpbmxpbmUgV2ViTW91c2VFdmVudDo6 QnV0dG9uIGJ1dHRvbkZvckV2ZW50KGNvbnN0IEdka0V2ZW50KiBldmVudCkKICAgICBjYXNlIEdE S18zQlVUVE9OX1BSRVNTOgogICAgIGNhc2UgR0RLX0JVVFRPTl9SRUxFQVNFOgogICAgICAgICBn dWludCBldmVudEJ1dHRvbjsKLSNpZm5kZWYgR1RLX0FQSV9WRVJTSU9OXzIKKyNpZiBHVEtfQ0hF Q0tfVkVSU0lPTigzLCAyLCAwKQogICAgICAgICBnZGtfZXZlbnRfZ2V0X2J1dHRvbihldmVudCwg JmV2ZW50QnV0dG9uKTsKICNlbHNlCi0gICAgICAgIGV2ZW50QnV0dG9uID0gZXZlbnQtPmJ1dHRv bjsKKyAgICAgICAgZXZlbnRCdXR0b24gPSBldmVudC0+YnV0dG9uLmJ1dHRvbjsKICNlbmRpZgog ICAgICAgICBpZiAoZXZlbnRCdXR0b24gPT0gMSkKICAgICAgICAgICAgIGJ1dHRvbiA9IFdlYk1v dXNlRXZlbnQ6OkxlZnRCdXR0b247CkBAIC0xNTIsMTAgKzE1MiwxMCBAQCBXZWJNb3VzZUV2ZW50 IFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRlV2ViTW91c2VFdmVudChjb25zdCBHZGtFdmVudCogZXZl bnQsIGludCBjdQogICAgIGdka19ldmVudF9nZXRfc3RhdGUoZXZlbnQsICZzdGF0ZSk7CiAKICAg ICBndWludCBldmVudEJ1dHRvbjsKLSNpZm5kZWYgR1RLX0FQSV9WRVJTSU9OXzIKKyNpZiBHVEtf Q0hFQ0tfVkVSU0lPTigzLCAyLCAwKQogICAgIGdka19ldmVudF9nZXRfYnV0dG9uKGV2ZW50LCAm ZXZlbnRCdXR0b24pOwogI2Vsc2UKLSAgICBldmVudEJ1dHRvbiA9IGV2ZW50LT5idXR0b247Cisg ICAgZXZlbnRCdXR0b24gPSBldmVudC0+YnV0dG9uLmJ1dHRvbjsKICNlbmRpZgogCiAgICAgV2Vi RXZlbnQ6OlR5cGUgdHlwZSA9IHN0YXRpY19jYXN0PFdlYkV2ZW50OjpUeXBlPigwKTsKQEAgLTI4 MCwxMiArMjgwLDEyIEBAIFdlYktleWJvYXJkRXZlbnQgV2ViRXZlbnRGYWN0b3J5OjpjcmVhdGVX ZWJLZXlib2FyZEV2ZW50KGNvbnN0IEdka0V2ZW50KiBldmVudCwKIHsKICAgICBndWludCBrZXl2 YWw7CiAgICAgZ3VpbnQxNiBrZXljb2RlOwotI2lmbmRlZiBHVEtfQVBJX1ZFUlNJT05fMgorI2lm IEdUS19DSEVDS19WRVJTSU9OKDMsIDIsIDApCiAgICAgZ2RrX2V2ZW50X2dldF9rZXl2YWwoZXZl bnQsICZrZXl2YWwpOwogICAgIGdka19ldmVudF9nZXRfa2V5Y29kZShldmVudCwgJmtleWNvZGUp OwogI2Vsc2UKLSAgICBrZXl2YWwgPSBldmVudC0+a2V5dmFsOwotICAgIGtleWNvZGUgPSBldmVu dC0+aGFyZHdhcmVfa2V5Y29kZTsKKyAgICBrZXl2YWwgPSBldmVudC0+a2V5LmtleXZhbDsKKyAg ICBrZXljb2RlID0gZXZlbnQtPmtleS5oYXJkd2FyZV9rZXljb2RlOwogI2VuZGlmCiAjaWYgR1RL X0NIRUNLX1ZFUlNJT04oMywgMTAsIDApCiAgICAgR2RrRXZlbnRUeXBlIHR5cGUgPSBnZGtfZXZl bnRfZ2V0X2V2ZW50X3R5cGUoZXZlbnQpOwo= 372471 2019-06-19 10:17:26 -0700 2019-06-19 10:42:57 -0700 Patch v2 bug-199000-20190619201725.patch text/plain 2318 aperez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ2NTg2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDY3YzkxYjEyMzk3MjMxM2Y4 OTEzOTc0Zjg5N2FmMThhZjU5OGJhMTQuLjZmNmZhMjMzNDRkYjlkZDMxNzNiZjlkMTA5MmY2MDk3 NGRlOTk2MmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTktMDYtMTkgIEFkcmlhbiBQ ZXJleiBkZSBDYXN0cm8gIDxhcGVyZXpAaWdhbGlhLmNvbT4KKworICAgICAgICBbR1RLXSBGaXgg Y29tcGlsYXRpb24gZXJyb3JzIGZvciB0aGUgR1RLMiBwbHVnaW4gcHJvY2VzcworICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTk5MDAwCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTaGFyZWQvZ3RrL1dlYkV2 ZW50RmFjdG9yeS5jcHA6IFVzZSB0aGUgR2RrRXZlbnQgdW5pb24gZmllbGRzCisgICAgICAgIHdo ZW4gZGlyZWN0bHkgYWNjZXNzaW5nIGV2ZW50IHN0cnVjdCBmaWVsZHMuCisgICAgICAgIChXZWJL aXQ6OmJ1dHRvbkZvckV2ZW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViRXZlbnRGYWN0b3J5Ojpj cmVhdGVXZWJNb3VzZUV2ZW50KToKKyAgICAgICAgKFdlYktpdDo6V2ViRXZlbnRGYWN0b3J5Ojpj cmVhdGVXZWJLZXlib2FyZEV2ZW50KToKKwogMjAxOS0wNi0xOSAgWmFuIERvYmVyc2VrICA8emRv YmVyc2VrQGlnYWxpYS5jb20+CiAKICAgICAgICAgW05pY29zaWFdIEludmFsaWRhdGUgU2NlbmVJ bnRlZ3JhdGlvbiBpbiBMYXllclRyZWVIb3N0OjppbnZhbGlkYXRlKCkKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvU2hhcmVkL2d0ay9XZWJFdmVudEZhY3RvcnkuY3BwIGIvU291cmNlL1dlYktp dC9TaGFyZWQvZ3RrL1dlYkV2ZW50RmFjdG9yeS5jcHAKaW5kZXggMWY5NDhjNmMwODY0YWU1MDMy ZmNiZTA5ZTBhMjcxN2U4NjQ5NmI0Mi4uNTRjZGY2MmE3NWE5YWU5Y2M3NjhkYWViODliOTZhNmQ2 NThlYTFmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TaGFyZWQvZ3RrL1dlYkV2ZW50RmFj dG9yeS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TaGFyZWQvZ3RrL1dlYkV2ZW50RmFjdG9yeS5j cHAKQEAgLTEwMSw3ICsxMDEsNyBAQCBzdGF0aWMgaW5saW5lIFdlYk1vdXNlRXZlbnQ6OkJ1dHRv biBidXR0b25Gb3JFdmVudChjb25zdCBHZGtFdmVudCogZXZlbnQpCiAjaWZuZGVmIEdUS19BUElf VkVSU0lPTl8yCiAgICAgICAgIGdka19ldmVudF9nZXRfYnV0dG9uKGV2ZW50LCAmZXZlbnRCdXR0 b24pOwogI2Vsc2UKLSAgICAgICAgZXZlbnRCdXR0b24gPSBldmVudC0+YnV0dG9uOworICAgICAg ICBldmVudEJ1dHRvbiA9IGV2ZW50LT5idXR0b24uYnV0dG9uOwogI2VuZGlmCiAgICAgICAgIGlm IChldmVudEJ1dHRvbiA9PSAxKQogICAgICAgICAgICAgYnV0dG9uID0gV2ViTW91c2VFdmVudDo6 TGVmdEJ1dHRvbjsKQEAgLTE1NSw3ICsxNTUsNyBAQCBXZWJNb3VzZUV2ZW50IFdlYkV2ZW50RmFj dG9yeTo6Y3JlYXRlV2ViTW91c2VFdmVudChjb25zdCBHZGtFdmVudCogZXZlbnQsIGludCBjdQog I2lmbmRlZiBHVEtfQVBJX1ZFUlNJT05fMgogICAgIGdka19ldmVudF9nZXRfYnV0dG9uKGV2ZW50 LCAmZXZlbnRCdXR0b24pOwogI2Vsc2UKLSAgICBldmVudEJ1dHRvbiA9IGV2ZW50LT5idXR0b247 CisgICAgZXZlbnRCdXR0b24gPSBldmVudC0+YnV0dG9uLmJ1dHRvbjsKICNlbmRpZgogCiAgICAg V2ViRXZlbnQ6OlR5cGUgdHlwZSA9IHN0YXRpY19jYXN0PFdlYkV2ZW50OjpUeXBlPigwKTsKQEAg LTI4NCw4ICsyODQsOCBAQCBXZWJLZXlib2FyZEV2ZW50IFdlYkV2ZW50RmFjdG9yeTo6Y3JlYXRl V2ViS2V5Ym9hcmRFdmVudChjb25zdCBHZGtFdmVudCogZXZlbnQsCiAgICAgZ2RrX2V2ZW50X2dl dF9rZXl2YWwoZXZlbnQsICZrZXl2YWwpOwogICAgIGdka19ldmVudF9nZXRfa2V5Y29kZShldmVu dCwgJmtleWNvZGUpOwogI2Vsc2UKLSAgICBrZXl2YWwgPSBldmVudC0+a2V5dmFsOwotICAgIGtl eWNvZGUgPSBldmVudC0+aGFyZHdhcmVfa2V5Y29kZTsKKyAgICBrZXl2YWwgPSBldmVudC0+a2V5 LmtleXZhbDsKKyAgICBrZXljb2RlID0gZXZlbnQtPmtleS5oYXJkd2FyZV9rZXljb2RlOwogI2Vu ZGlmCiAjaWYgR1RLX0NIRUNLX1ZFUlNJT04oMywgMTAsIDApCiAgICAgR2RrRXZlbnRUeXBlIHR5 cGUgPSBnZGtfZXZlbnRfZ2V0X2V2ZW50X3R5cGUoZXZlbnQpOwo=