136739 2014-09-11 06:22:22 -0700 [EFL][WK2] Minibrowser : Support Zoom on Control key + scroll 2014-09-18 23:59:03 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 tanay.c webkit-unassigned commit-queue oldest_to_newest 1034597 0 tanay.c 2014-09-11 06:22:22 -0700 Support the following behaviour in Minibrowser: 1) Zoom in on mouse scroll up 2) Zoom out on mouse scroll down 1035175 1 238105 tanay.c 2014-09-15 00:11:34 -0700 Created attachment 238105 Patch 1035678 2 238105 gyuyoung.kim 2014-09-16 22:46:52 -0700 Comment on attachment 238105 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=238105&action=review > Tools/MiniBrowser/efl/main.c:312 > + if (ev->z == -1 && zoom_level_set(ewk_view, window->current_zoom_level + 1)) { Isn't ewk_view same with window->ewk_view ? If so, how about using window->ewk_view instead of ewk_view for readability ? 1035685 3 238241 tanay.c 2014-09-17 01:44:04 -0700 Created attachment 238241 Patch 1035686 4 tanay.c 2014-09-17 01:50:03 -0700 (In reply to comment #2) > (From update of attachment 238105 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=238105&action=review > > > Tools/MiniBrowser/efl/main.c:312 > > + if (ev->z == -1 && zoom_level_set(ewk_view, window->current_zoom_level + 1)) { > > Isn't ewk_view same with window->ewk_view ? If so, how about using window->ewk_view instead of ewk_view for readability ? Thanks for pointing that out. I notice that if I use the window->ewk_view then the scroll event is not consumed by the view. So scrolling still remains active along with zoom. To avoid this we should use the ewk_view instance passed back in the parameter so that the framework knows that event has been consumed. I have made this uniform and I am using ewk_view for all the API calls in on_mouse_wheel callback. 1035691 5 238241 gyuyoung.kim 2014-09-17 02:20:27 -0700 Comment on attachment 238241 Patch LGTM. 1036070 6 238241 commit-queue 2014-09-18 23:59:00 -0700 Comment on attachment 238241 Patch Clearing flags on attachment: 238241 Committed r173750: <http://trac.webkit.org/changeset/173750> 1036071 7 commit-queue 2014-09-18 23:59:03 -0700 All reviewed patches have been landed. Closing bug. 238105 2014-09-15 00:11:34 -0700 2014-09-17 01:43:56 -0700 Patch bug-136739-20140915124201.patch text/plain 2982 tanay.c SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3MzYxMikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDE0LTA5LTE0ICBUYW5heSBDICA8dGFuYXkuY0BzYW1zdW5nLmNvbT4KKwor ICAgICAgICBbRUZMXVtXSzJdIE1pbmlicm93c2VyIDogU3VwcG9ydCBab29tIG9uIENvbnRyb2wg a2V5ICsgc2Nyb2xsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzY3MzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIE1pbmlCcm93c2VyL2VmbC9tYWluLmM6IEFkZCBzdXBwb3J0IGZvciB6b29tIG9uIGNv bnRyb2wga2V5ICsgbW91c2Ugc2Nyb2xsCisgICAgICAgIChvbl9tb3VzZV93aGVlbCk6IE1vZGlm aWVkLgorCiAyMDE0LTA5LTEyICBCcmlhbiBKLiBCdXJnICA8YnVyZ0Bjcy53YXNoaW5ndG9uLmVk dT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiByZW1pbmQgYWJvdXQgcmViYXNlbGluaW5nIGdl bmVyYXRvciB0ZXN0IHJlc3VsdHMKSW5kZXg6IFRvb2xzL01pbmlCcm93c2VyL2VmbC9tYWluLmMK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwkocmV2aXNpb24gMTcz NjEyKQorKysgVG9vbHMvTWluaUJyb3dzZXIvZWZsL21haW4uYwkod29ya2luZyBjb3B5KQpAQCAt Mjk0LDE3ICsyOTQsMjggQEAgb25fbW91c2Vfd2hlZWwodm9pZCAqdXNlcl9kYXRhLCBFdmFzICpl LAogICAgIGNvbnN0IEV2YXNfTW9kaWZpZXIgKm1vZCA9IGV2YXNfa2V5X21vZGlmaWVyX2dldChl KTsKICAgICBFdmFzX0V2ZW50X01vdXNlX1doZWVsICpldiA9IChFdmFzX0V2ZW50X01vdXNlX1do ZWVsICopZXZlbnRfaW5mbzsKICAgICBFaW5hX0Jvb2wgc2hpZnRQcmVzc2VkID0gZXZhc19rZXlf bW9kaWZpZXJfaXNfc2V0KG1vZCwgIlNoaWZ0Iik7CisgICAgRWluYV9Cb29sIGN0cmxQcmVzc2Vk ID0gZXZhc19rZXlfbW9kaWZpZXJfaXNfc2V0KG1vZCwgIkNvbnRyb2wiKTsKIAotICAgIGlmICgh c2hpZnRQcmVzc2VkKQorICAgIGlmICghc2hpZnRQcmVzc2VkICYmICFjdHJsUHJlc3NlZCkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgLyogbmF2aWdhdGUgYmFzZWQgb24gbW91c2Ugd2hlZWwgc2Ny b2xsIGRpcmVjdGlvbiB3aGVuIHNoaWZ0IGtleSBpcyBwcmVzc2VkICovCi0gICAgaWYgKGV2LT56 ID09IC0xICYmIGV3a192aWV3X2ZvcndhcmRfcG9zc2libGUod2luZG93LT5ld2tfdmlldykpIHsK LSAgICAgICAgZXdrX3ZpZXdfZm9yd2FyZCh3aW5kb3ctPmV3a192aWV3KTsKLSAgICAgICAgZWxt X29iamVjdF9kaXNhYmxlZF9zZXQod2luZG93LT5mb3J3YXJkX2J1dHRvbiwgIWV3a192aWV3X2Zv cndhcmRfcG9zc2libGUod2luZG93LT5ld2tfdmlldykpOwotICAgIH0gZWxzZSBpZiAoZXYtPnog PT0gMSAmJiBld2tfdmlld19iYWNrX3Bvc3NpYmxlKHdpbmRvdy0+ZXdrX3ZpZXcpKSB7Ci0gICAg ICAgIGV3a192aWV3X2JhY2sod2luZG93LT5ld2tfdmlldyk7Ci0gICAgICAgIGVsbV9vYmplY3Rf ZGlzYWJsZWRfc2V0KHdpbmRvdy0+YmFja19idXR0b24sICFld2tfdmlld19iYWNrX3Bvc3NpYmxl KHdpbmRvdy0+ZXdrX3ZpZXcpKTsgICAgICAgCisgICAgLyogbmF2aWdhdGUgaGlzdG9yeSBvciB6 b29tIHdlYiBwYWdlIGJhc2VkIG9uIG1vdXNlIHdoZWVsIHNjcm9sbCBhY3Rpb24gd2l0aCBzaGlm dCBvciBjb250cm9sIGtleSAqLworICAgIGlmIChzaGlmdFByZXNzZWQpIHsKKyAgICAgICAgaWYg KGV2LT56ID09IC0xICYmIGV3a192aWV3X2ZvcndhcmRfcG9zc2libGUod2luZG93LT5ld2tfdmll dykpIHsKKyAgICAgICAgICAgIGV3a192aWV3X2ZvcndhcmQod2luZG93LT5ld2tfdmlldyk7Cisg ICAgICAgICAgICBlbG1fb2JqZWN0X2Rpc2FibGVkX3NldCh3aW5kb3ctPmZvcndhcmRfYnV0dG9u LCAhZXdrX3ZpZXdfZm9yd2FyZF9wb3NzaWJsZSh3aW5kb3ctPmV3a192aWV3KSk7CisgICAgICAg IH0gZWxzZSBpZiAoZXYtPnogPT0gMSAmJiBld2tfdmlld19iYWNrX3Bvc3NpYmxlKHdpbmRvdy0+ ZXdrX3ZpZXcpKSB7CisgICAgICAgICAgICBld2tfdmlld19iYWNrKHdpbmRvdy0+ZXdrX3ZpZXcp OworICAgICAgICAgICAgZWxtX29iamVjdF9kaXNhYmxlZF9zZXQod2luZG93LT5iYWNrX2J1dHRv biwgIWV3a192aWV3X2JhY2tfcG9zc2libGUod2luZG93LT5ld2tfdmlldykpOyAgICAgICAKKyAg ICAgICAgfQorICAgIH0gZWxzZSBpZiAoY3RybFByZXNzZWQpIHsKKyAgICAgICAgaWYgKGV2LT56 ID09IC0xICYmIHpvb21fbGV2ZWxfc2V0KGV3a192aWV3LCB3aW5kb3ctPmN1cnJlbnRfem9vbV9s ZXZlbCArIDEpKSB7CisgICAgICAgICAgICB3aW5kb3ctPmN1cnJlbnRfem9vbV9sZXZlbCsrOwor ICAgICAgICAgICAgaW5mbygiWm9vbSBvdXQgKEN0cmwgKyAnc2Nyb2xsIHVwJykgd2FzIHByZXNz ZWQsIHpvb20gbGV2ZWwgYmVjYW1lICUuMmYiLCB6b29tTGV2ZWxzW3dpbmRvdy0+Y3VycmVudF96 b29tX2xldmVsXSk7CisgICAgICAgIH0gZWxzZSBpZiAoZXYtPnogPT0gMSAmJiB6b29tX2xldmVs X3NldChld2tfdmlldywgd2luZG93LT5jdXJyZW50X3pvb21fbGV2ZWwgLSAxKSkgeworICAgICAg ICAgICAgd2luZG93LT5jdXJyZW50X3pvb21fbGV2ZWwtLTsKKyAgICAgICAgICAgIGluZm8oIlpv b20gb3V0IChDdHJsICsgJ3Njcm9sbCBkb3duJykgd2FzIHByZXNzZWQsIHpvb20gbGV2ZWwgYmVj YW1lICUuMmYiLCB6b29tTGV2ZWxzW3dpbmRvdy0+Y3VycmVudF96b29tX2xldmVsXSk7CisgICAg ICAgIH0KICAgICB9CiB9CiAK 238241 2014-09-17 01:44:04 -0700 2014-09-18 23:59:00 -0700 Patch bug-136739-20140917141432.patch text/plain 2957 tanay.c SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3MzY4NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDE0LTA5LTE3ICBUYW5heSBDICA8dGFuYXkuY0BzYW1zdW5nLmNvbT4KKwor ICAgICAgICBbRUZMXVtXSzJdIE1pbmlicm93c2VyIDogU3VwcG9ydCBab29tIG9uIENvbnRyb2wg a2V5ICsgc2Nyb2xsCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0xMzY3MzkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIE1pbmlCcm93c2VyL2VmbC9tYWluLmM6IEFkZCBzdXBwb3J0IGZvciB6b29tIG9uIGNv bnRyb2wga2V5ICsgbW91c2Ugc2Nyb2xsCisgICAgICAgIChvbl9tb3VzZV93aGVlbCk6IE1vZGlm aWVkLgorCiAyMDE0LTA5LTE2ICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAog ICAgICAgICBbaU9TXSBBZGQgaU9TIFNESyBuYW1lIGFuZCB2ZXJzaW9uIHN1ZmZpeCB0byBXZWJL aXRTeXN0ZW1JbnRlcmZhY2UgZGVidWcvcmVsZWFzZSBwcm9kdWN0IG5hbWUKSW5kZXg6IFRvb2xz L01pbmlCcm93c2VyL2VmbC9tYWluLmMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvTWluaUJyb3dzZXIv ZWZsL21haW4uYwkocmV2aXNpb24gMTczNjg1KQorKysgVG9vbHMvTWluaUJyb3dzZXIvZWZsL21h aW4uYwkod29ya2luZyBjb3B5KQpAQCAtMjk0LDE3ICsyOTQsMjggQEAgb25fbW91c2Vfd2hlZWwo dm9pZCAqdXNlcl9kYXRhLCBFdmFzICplLAogICAgIGNvbnN0IEV2YXNfTW9kaWZpZXIgKm1vZCA9 IGV2YXNfa2V5X21vZGlmaWVyX2dldChlKTsKICAgICBFdmFzX0V2ZW50X01vdXNlX1doZWVsICpl diA9IChFdmFzX0V2ZW50X01vdXNlX1doZWVsICopZXZlbnRfaW5mbzsKICAgICBFaW5hX0Jvb2wg c2hpZnRQcmVzc2VkID0gZXZhc19rZXlfbW9kaWZpZXJfaXNfc2V0KG1vZCwgIlNoaWZ0Iik7Cisg ICAgRWluYV9Cb29sIGN0cmxQcmVzc2VkID0gZXZhc19rZXlfbW9kaWZpZXJfaXNfc2V0KG1vZCwg IkNvbnRyb2wiKTsKIAotICAgIGlmICghc2hpZnRQcmVzc2VkKQorICAgIGlmICghc2hpZnRQcmVz c2VkICYmICFjdHJsUHJlc3NlZCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgLyogbmF2aWdhdGUg YmFzZWQgb24gbW91c2Ugd2hlZWwgc2Nyb2xsIGRpcmVjdGlvbiB3aGVuIHNoaWZ0IGtleSBpcyBw cmVzc2VkICovCi0gICAgaWYgKGV2LT56ID09IC0xICYmIGV3a192aWV3X2ZvcndhcmRfcG9zc2li bGUod2luZG93LT5ld2tfdmlldykpIHsKLSAgICAgICAgZXdrX3ZpZXdfZm9yd2FyZCh3aW5kb3ct PmV3a192aWV3KTsKLSAgICAgICAgZWxtX29iamVjdF9kaXNhYmxlZF9zZXQod2luZG93LT5mb3J3 YXJkX2J1dHRvbiwgIWV3a192aWV3X2ZvcndhcmRfcG9zc2libGUod2luZG93LT5ld2tfdmlldykp OwotICAgIH0gZWxzZSBpZiAoZXYtPnogPT0gMSAmJiBld2tfdmlld19iYWNrX3Bvc3NpYmxlKHdp bmRvdy0+ZXdrX3ZpZXcpKSB7Ci0gICAgICAgIGV3a192aWV3X2JhY2sod2luZG93LT5ld2tfdmll dyk7Ci0gICAgICAgIGVsbV9vYmplY3RfZGlzYWJsZWRfc2V0KHdpbmRvdy0+YmFja19idXR0b24s ICFld2tfdmlld19iYWNrX3Bvc3NpYmxlKHdpbmRvdy0+ZXdrX3ZpZXcpKTsgICAgICAgCisgICAg LyogbmF2aWdhdGUgaGlzdG9yeSBvciB6b29tIHdlYiBwYWdlIGJhc2VkIG9uIG1vdXNlIHdoZWVs IHNjcm9sbCBhY3Rpb24gd2l0aCBzaGlmdCBvciBjb250cm9sIGtleSAqLworICAgIGlmIChzaGlm dFByZXNzZWQpIHsKKyAgICAgICAgaWYgKGV2LT56ID09IC0xICYmIGV3a192aWV3X2ZvcndhcmRf cG9zc2libGUoZXdrX3ZpZXcpKSB7CisgICAgICAgICAgICBld2tfdmlld19mb3J3YXJkKGV3a192 aWV3KTsKKyAgICAgICAgICAgIGVsbV9vYmplY3RfZGlzYWJsZWRfc2V0KHdpbmRvdy0+Zm9yd2Fy ZF9idXR0b24sICFld2tfdmlld19mb3J3YXJkX3Bvc3NpYmxlKGV3a192aWV3KSk7CisgICAgICAg IH0gZWxzZSBpZiAoZXYtPnogPT0gMSAmJiBld2tfdmlld19iYWNrX3Bvc3NpYmxlKGV3a192aWV3 KSkgeworICAgICAgICAgICAgZXdrX3ZpZXdfYmFjayhld2tfdmlldyk7CisgICAgICAgICAgICBl bG1fb2JqZWN0X2Rpc2FibGVkX3NldCh3aW5kb3ctPmJhY2tfYnV0dG9uLCAhZXdrX3ZpZXdfYmFj a19wb3NzaWJsZShld2tfdmlldykpOyAgICAgICAKKyAgICAgICAgfQorICAgIH0gZWxzZSBpZiAo Y3RybFByZXNzZWQpIHsKKyAgICAgICAgaWYgKGV2LT56ID09IC0xICYmIHpvb21fbGV2ZWxfc2V0 KGV3a192aWV3LCB3aW5kb3ctPmN1cnJlbnRfem9vbV9sZXZlbCArIDEpKSB7CisgICAgICAgICAg ICB3aW5kb3ctPmN1cnJlbnRfem9vbV9sZXZlbCsrOworICAgICAgICAgICAgaW5mbygiWm9vbSBp biAoQ3RybCArICdzY3JvbGwgdXAnKSB3YXMgcHJlc3NlZCwgem9vbSBsZXZlbCBiZWNhbWUgJS4y ZiIsIHpvb21MZXZlbHNbd2luZG93LT5jdXJyZW50X3pvb21fbGV2ZWxdKTsKKyAgICAgICAgfSBl bHNlIGlmIChldi0+eiA9PSAxICYmIHpvb21fbGV2ZWxfc2V0KGV3a192aWV3LCB3aW5kb3ctPmN1 cnJlbnRfem9vbV9sZXZlbCAtIDEpKSB7CisgICAgICAgICAgICB3aW5kb3ctPmN1cnJlbnRfem9v bV9sZXZlbC0tOworICAgICAgICAgICAgaW5mbygiWm9vbSBvdXQgKEN0cmwgKyAnc2Nyb2xsIGRv d24nKSB3YXMgcHJlc3NlZCwgem9vbSBsZXZlbCBiZWNhbWUgJS4yZiIsIHpvb21MZXZlbHNbd2lu ZG93LT5jdXJyZW50X3pvb21fbGV2ZWxdKTsKKyAgICAgICAgfQogICAgIH0KIH0KIAo=