128171 2014-02-04 03:07:01 -0800 [GTK] Ensure EventSenderProxyGtk generates GdkEvents with a GdkModifierType 2014-02-04 04:37:53 -0800 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 98931 1 carlosg webkit-unassigned commit-queue oldest_to_newest 976263 0 carlosg 2014-02-04 03:07:01 -0800 On some functions in EventSenderProxyGtk, the wkEventModifiers is being passed to the GdkEventState, event though the masks aren't compatible, on other functions this is done right though, so I'm adding a patch that shuffles the function so it's used all around. This makes LayoutTests/fast/events/touch/emulate-touch-events.html fail if the patch in bug #98931 is applied. 976264 1 223092 carlosg 2014-02-04 03:16:50 -0800 Created attachment 223092 Patch. translates modifiers to GDK ones where missing 976276 2 223092 cgarcia 2014-02-04 04:07:57 -0800 Comment on attachment 223092 Patch. translates modifiers to GDK ones where missing LGTM, thanks. 976282 3 223092 commit-queue 2014-02-04 04:37:52 -0800 Comment on attachment 223092 Patch. translates modifiers to GDK ones where missing Clearing flags on attachment: 223092 Committed r163373: <http://trac.webkit.org/changeset/163373> 976283 4 commit-queue 2014-02-04 04:37:53 -0800 All reviewed patches have been landed. Closing bug. 223092 2014-02-04 03:16:50 -0800 2014-02-04 04:37:51 -0800 Patch. translates modifiers to GDK ones where missing patch-event-modifiers.diff text/plain 3985 carlosg ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwNzMw ODQxLi40MzQ1ZjFiIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMTQtMDEtMzAgIENhcmxvcyBHYXJuYWNobyAgPGNh cmxvc2dAZ25vbWUub3JnPgogCisgICAgICAgIFtHVEtdIEVuc3VyZSBnZW5lcmF0ZWQgZXZlbnRz IGhhdmUgZ2l2ZW4gbW9kaWZpZXJzIEdESyB1bmRlcnN0YW5kcworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI4MTcxCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJLaXRUZXN0UnVubmVyL2d0ay9FdmVu dFNlbmRlclByb3h5R3RrLmNwcDoKKyAgICAgICAgKFdUUjo6d2Via2l0TW9kaWZpZXJzVG9HREtN b2RpZmllcnMpOiBNb3ZlIGFyb3VuZAorICAgICAgICAoV1RSOjpFdmVudFNlbmRlclByb3h5Ojpj cmVhdGVNb3VzZUJ1dHRvbkV2ZW50KToKKyAgICAgICAgKFdUUjo6RXZlbnRTZW5kZXJQcm94eTo6 a2V5RG93bik6IFVzZSB3ZWJraXRNb2RpZmllcnNUb0dES01vZGlmaWVycyB0bworICAgICAgICB0 cmFuc2xhdGUgV0tFdmVudE1vZGlmaWVycy4KKworMjAxNC0wMS0zMCAgQ2FybG9zIEdhcm5hY2hv ICA8Y2FybG9zZ0Bnbm9tZS5vcmc+CisKICAgICAgICAgW0F1dG9tYWtlXSBBZGQgbWlzc2luZyAk KGZlYXR1cmVfZGVmaW5lcykgd2hlbiBnZW5lcmF0aW5nIEluamVjdGVkQnVuZGxlIGJpbmRpbmdz CiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjgxNzAK IApkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9ndGsvRXZlbnRTZW5kZXJQcm94 eUd0ay5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL2d0ay9FdmVudFNlbmRlclByb3h5R3Rr LmNwcAppbmRleCAzODA0MzhjLi40MGY2NTllIDEwMDY0NAotLS0gYS9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL2d0ay9FdmVudFNlbmRlclByb3h5R3RrLmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL2d0ay9FdmVudFNlbmRlclByb3h5R3RrLmNwcApAQCAtMTA5LDYgKzEwOSwyMiBAQCBz dGF0aWMgdW5zaWduZWQgZXZlbnRTZW5kZXJCdXR0b25Ub0dES0J1dHRvbih1bnNpZ25lZCBidXR0 b24pCiAgICAgcmV0dXJuIG1vdXNlQnV0dG9uOwogfQogCitzdGF0aWMgZ3VpbnQgd2Via2l0TW9k aWZpZXJzVG9HREtNb2RpZmllcnMoV0tFdmVudE1vZGlmaWVycyB3a01vZGlmaWVycykKK3sKKyAg ICBndWludCBtb2RpZmllcnMgPSAwOworCisgICAgaWYgKHdrTW9kaWZpZXJzICYga1dLRXZlbnRN b2RpZmllcnNDb250cm9sS2V5KQorICAgICAgICBtb2RpZmllcnMgfD0gR0RLX0NPTlRST0xfTUFT SzsKKyAgICBpZiAod2tNb2RpZmllcnMgJiBrV0tFdmVudE1vZGlmaWVyc1NoaWZ0S2V5KQorICAg ICAgICBtb2RpZmllcnMgfD0gR0RLX1NISUZUX01BU0s7CisgICAgaWYgKHdrTW9kaWZpZXJzICYg a1dLRXZlbnRNb2RpZmllcnNBbHRLZXkpCisgICAgICAgIG1vZGlmaWVycyB8PSBHREtfTU9EMV9N QVNLOworICAgIGlmICh3a01vZGlmaWVycyAmIGtXS0V2ZW50TW9kaWZpZXJzTWV0YUtleSkKKyAg ICAgICAgbW9kaWZpZXJzIHw9IEdES19NRVRBX01BU0s7CisKKyAgICByZXR1cm4gbW9kaWZpZXJz OworfQorCiBHZGtFdmVudCogRXZlbnRTZW5kZXJQcm94eTo6Y3JlYXRlTW91c2VCdXR0b25FdmVu dChHZGtFdmVudFR5cGUgZXZlbnRUeXBlLCB1bnNpZ25lZCBidXR0b24sIFdLRXZlbnRNb2RpZmll cnMgbW9kaWZpZXJzKQogewogICAgIEdka0V2ZW50KiBtb3VzZUV2ZW50ID0gZ2RrX2V2ZW50X25l dyhldmVudFR5cGUpOwpAQCAtMTE5LDcgKzEzNSw3IEBAIEdka0V2ZW50KiBFdmVudFNlbmRlclBy b3h5OjpjcmVhdGVNb3VzZUJ1dHRvbkV2ZW50KEdka0V2ZW50VHlwZSBldmVudFR5cGUsIHVuc2ln CiAgICAgbW91c2VFdmVudC0+YnV0dG9uLndpbmRvdyA9IGd0a193aWRnZXRfZ2V0X3dpbmRvdyhH VEtfV0lER0VUKG1fdGVzdENvbnRyb2xsZXItPm1haW5XZWJWaWV3KCktPnBsYXRmb3JtVmlldygp KSk7CiAgICAgZ19vYmplY3RfcmVmKG1vdXNlRXZlbnQtPmJ1dHRvbi53aW5kb3cpOwogICAgIGdk a19ldmVudF9zZXRfZGV2aWNlKG1vdXNlRXZlbnQsIGdka19kZXZpY2VfbWFuYWdlcl9nZXRfY2xp ZW50X3BvaW50ZXIoZ2RrX2Rpc3BsYXlfZ2V0X2RldmljZV9tYW5hZ2VyKGdka193aW5kb3dfZ2V0 X2Rpc3BsYXkobW91c2VFdmVudC0+YnV0dG9uLndpbmRvdykpKSk7Ci0gICAgbW91c2VFdmVudC0+ YnV0dG9uLnN0YXRlID0gbW9kaWZpZXJzIHwgZ2V0TW91c2VCdXR0b25Nb2RpZmllcnMobW91c2VF dmVudC0+YnV0dG9uLmJ1dHRvbik7CisgICAgbW91c2VFdmVudC0+YnV0dG9uLnN0YXRlID0gd2Vi a2l0TW9kaWZpZXJzVG9HREtNb2RpZmllcnMobW9kaWZpZXJzKSB8IGdldE1vdXNlQnV0dG9uTW9k aWZpZXJzKG1vdXNlRXZlbnQtPmJ1dHRvbi5idXR0b24pOwogICAgIG1vdXNlRXZlbnQtPmJ1dHRv bi50aW1lID0gR0RLX0NVUlJFTlRfVElNRTsKICAgICBtb3VzZUV2ZW50LT5idXR0b24uYXhlcyA9 IDA7CiAKQEAgLTE3MywyMiArMTg5LDYgQEAgdm9pZCBFdmVudFNlbmRlclByb3h5OjpzZW5kT3JR dWV1ZUV2ZW50KEdka0V2ZW50KiBldmVudCkKICAgICByZXBsYXlTYXZlZEV2ZW50cygpOwogfQog Ci1zdGF0aWMgZ3VpbnQgd2Via2l0TW9kaWZpZXJzVG9HREtNb2RpZmllcnMoV0tFdmVudE1vZGlm aWVycyB3a01vZGlmaWVycykKLXsKLSAgICBndWludCBtb2RpZmllcnMgPSAwOwotCi0gICAgaWYg KHdrTW9kaWZpZXJzICYga1dLRXZlbnRNb2RpZmllcnNDb250cm9sS2V5KQotICAgICAgICBtb2Rp ZmllcnMgfD0gR0RLX0NPTlRST0xfTUFTSzsKLSAgICBpZiAod2tNb2RpZmllcnMgJiBrV0tFdmVu dE1vZGlmaWVyc1NoaWZ0S2V5KQotICAgICAgICBtb2RpZmllcnMgfD0gR0RLX1NISUZUX01BU0s7 Ci0gICAgaWYgKHdrTW9kaWZpZXJzICYga1dLRXZlbnRNb2RpZmllcnNBbHRLZXkpCi0gICAgICAg IG1vZGlmaWVycyB8PSBHREtfTU9EMV9NQVNLOwotICAgIGlmICh3a01vZGlmaWVycyAmIGtXS0V2 ZW50TW9kaWZpZXJzTWV0YUtleSkKLSAgICAgICAgbW9kaWZpZXJzIHw9IEdES19NRVRBX01BU0s7 Ci0KLSAgICByZXR1cm4gbW9kaWZpZXJzOwotfQotCiBpbnQgZ2V0R0RLS2V5U3ltRm9yS2V5UmVm KFdLU3RyaW5nUmVmIGtleVJlZiwgdW5zaWduZWQgbG9jYXRpb24sIGd1aW50KiBtb2RpZmllcnMp CiB7CiAgICAgaWYgKGxvY2F0aW9uID09IERPTUtleUxvY2F0aW9uTnVtcGFkKSB7CkBAIC0yOTAs NyArMjkwLDcgQEAgdm9pZCBFdmVudFNlbmRlclByb3h5OjprZXlEb3duKFdLU3RyaW5nUmVmIGtl eVJlZiwgV0tFdmVudE1vZGlmaWVycyB3a01vZGlmaWVycywKIAogICAgIEdka0V2ZW50KiBwcmVz c0V2ZW50ID0gZ2RrX2V2ZW50X25ldyhHREtfS0VZX1BSRVNTKTsKICAgICBwcmVzc0V2ZW50LT5r ZXkua2V5dmFsID0gZ2RrS2V5U3ltOwotICAgIHByZXNzRXZlbnQtPmtleS5zdGF0ZSA9IG1vZGlm aWVyczsKKyAgICBwcmVzc0V2ZW50LT5rZXkuc3RhdGUgPSB3ZWJraXRNb2RpZmllcnNUb0dES01v ZGlmaWVycyhtb2RpZmllcnMpOwogICAgIHByZXNzRXZlbnQtPmtleS53aW5kb3cgPSBndGtfd2lk Z2V0X2dldF93aW5kb3coR1RLX1dJREdFVChtX3Rlc3RDb250cm9sbGVyLT5tYWluV2ViVmlldygp LT5wbGF0Zm9ybVdpbmRvdygpKSk7CiAgICAgZ19vYmplY3RfcmVmKHByZXNzRXZlbnQtPmtleS53 aW5kb3cpOwogICAgIGdka19ldmVudF9zZXRfZGV2aWNlKHByZXNzRXZlbnQsIGdka19kZXZpY2Vf bWFuYWdlcl9nZXRfY2xpZW50X3BvaW50ZXIoZ2RrX2Rpc3BsYXlfZ2V0X2RldmljZV9tYW5hZ2Vy KGdka193aW5kb3dfZ2V0X2Rpc3BsYXkocHJlc3NFdmVudC0+a2V5LndpbmRvdykpKSk7Cg==