75253 2011-12-27 06:51:08 -0800 [GTK] Implement zoom in/out in MiniBrowser 2012-02-17 03:10:20 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 75248 1 cgarcia webkit-unassigned gustavo.noronha gustavo pnormand xan.lopez oldest_to_newest 527349 0 cgarcia 2011-12-27 06:51:08 -0800 Add zoom in and out buttons to the toolbar. 527352 1 120585 cgarcia 2011-12-27 06:52:55 -0800 Created attachment 120585 Patch 527357 2 120585 gustavo.noronha 2011-12-27 07:17:33 -0800 Comment on attachment 120585 Patch Attachment 120585 did not pass gtk-ews (gtk): Output: http://queues.webkit.org/results/11038352 558626 3 120585 gustavo 2012-02-16 16:01:00 -0800 Comment on attachment 120585 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=120585&action=review Looks good. This doesn't depend on the decision in bug 75249, so I'll r+ > Tools/MiniBrowser/gtk/BrowserWindow.c:186 > + return zoomLevel <= maximumZoomLevel; I guess this should be zoomLevel < maximumZoomLevel, otherwise you would be reporting you can zoom in while being at the maximum zoom level. > Tools/MiniBrowser/gtk/BrowserWindow.c:192 > + return zoomLevel >= minimumZoomLevel; Same here. 559088 4 cgarcia 2012-02-17 03:10:20 -0800 Committed r108056: <http://trac.webkit.org/changeset/108056> 120585 2011-12-27 06:52:55 -0800 2012-02-16 16:01:00 -0800 Patch wk2-mb-zoom.diff text/plain 4781 cgarcia ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkYWI5 MmRiLi4xZGI5MWI4IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMTItMjcgIENhcmxvcyBHYXJjaWEgQ2FtcG9z ICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFtHVEtdIEltcGxlbWVudCB6b29tIGlu L291dCBpbiBNaW5pQnJvd3NlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NzUyNTMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIE1pbmlCcm93c2VyL2d0ay9Ccm93c2VyV2luZG93LmM6CisgICAgICAgIChi cm93c2VyV2luZG93Q2FuWm9vbUluKToKKyAgICAgICAgKGJyb3dzZXJXaW5kb3dDYW5ab29tT3V0 KToKKyAgICAgICAgKGJyb3dzZXJXaW5kb3dVcGRhdGVab29tQWN0aW9ucyk6CisgICAgICAgICh3 ZWJWaWV3Wm9vbUxldmVsQ2hhbmdlZCk6CisgICAgICAgICh6b29tSW5DYWxsYmFjayk6CisgICAg ICAgICh6b29tT3V0Q2FsbGJhY2spOgorICAgICAgICAoYnJvd3Nlcl93aW5kb3dfaW5pdCk6Cisg ICAgICAgIChicm93c2VyV2luZG93Q29uc3RydWN0ZWQpOgorCiAyMDExLTEyLTI0ICBLZW50YXJv IEhhcmEgIDxoYXJha2VuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBBZGQgdW5pdHRlc3RzIGZv ciB0aGUgQysrIHBhcnNlciBvZiBwcmVwYXJlLUNoYW5nZUxvZwpkaWZmIC0tZ2l0IGEvVG9vbHMv TWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYyBiL1Rvb2xzL01pbmlCcm93c2VyL2d0ay9C cm93c2VyV2luZG93LmMKaW5kZXggNzcwNWZhMi4uMGQ4MTk0YyAxMDA2NDQKLS0tIGEvVG9vbHMv TWluaUJyb3dzZXIvZ3RrL0Jyb3dzZXJXaW5kb3cuYworKysgYi9Ub29scy9NaW5pQnJvd3Nlci9n dGsvQnJvd3NlcldpbmRvdy5jCkBAIC00MCw2ICs0MCw4IEBAIHN0cnVjdCBfQnJvd3NlcldpbmRv dyB7CiAgICAgR3RrV2lkZ2V0ICp1cmlFbnRyeTsKICAgICBHdGtXaWRnZXQgKmJhY2tJdGVtOwog ICAgIEd0a1dpZGdldCAqZm9yd2FyZEl0ZW07CisgICAgR3RrV2lkZ2V0ICp6b29tSW5JdGVtOwor ICAgIEd0a1dpZGdldCAqem9vbU91dEl0ZW07CiAgICAgR3RrV2lkZ2V0ICpzdGF0dXNMYWJlbDsK ICAgICBXZWJLaXRXZWJWaWV3ICp3ZWJWaWV3OwogCkBAIC01MCw2ICs1Miw5IEBAIHN0cnVjdCBf QnJvd3NlcldpbmRvd0NsYXNzIHsKIH07CiAKIHN0YXRpYyBjb25zdCBjaGFyICpkZWZhdWx0V2lu ZG93VGl0bGUgPSAiV2ViS2l0R1RLKyBNaW5pQnJ3b3NlciI7CitzdGF0aWMgY29uc3QgZ2RvdWJs ZSBtaW5pbXVtWm9vbUxldmVsID0gMC41Oworc3RhdGljIGNvbnN0IGdkb3VibGUgbWF4aW11bVpv b21MZXZlbCA9IDM7CitzdGF0aWMgY29uc3QgZ2RvdWJsZSB6b29tU3RlcCA9IDEuMjsKIHN0YXRp YyBnaW50IHdpbmRvd0NvdW50ID0gMDsKIAogR19ERUZJTkVfVFlQRShCcm93c2VyV2luZG93LCBi cm93c2VyX3dpbmRvdywgR1RLX1RZUEVfV0lORE9XKQpAQCAtMTc1LDYgKzE4MCw0MSBAQCBzdGF0 aWMgdm9pZCBiYWNrRm9yd2FkbGlzdENoYW5nZWQoV2ViS2l0QmFja0ZvcndhcmRMaXN0ICpiYWNr Rm9yd2FkbGlzdCwgV2ViS2l0QgogICAgIGJyb3dzZXJXaW5kb3dVcGRhdGVOYXZpZ2F0aW9uQWN0 aW9ucyh3aW5kb3csIGJhY2tGb3J3YWRsaXN0KTsKIH0KIAorc3RhdGljIGdib29sZWFuIGJyb3dz ZXJXaW5kb3dDYW5ab29tSW4oQnJvd3NlcldpbmRvdyAqd2luZG93KQoreworICAgIGdkb3VibGUg em9vbUxldmVsID0gd2Via2l0X3dlYl92aWV3X2dldF96b29tX2xldmVsKHdpbmRvdy0+d2ViVmll dykgKiB6b29tU3RlcDsKKyAgICByZXR1cm4gem9vbUxldmVsIDw9IG1heGltdW1ab29tTGV2ZWw7 Cit9CisKK3N0YXRpYyBnYm9vbGVhbiBicm93c2VyV2luZG93Q2FuWm9vbU91dChCcm93c2VyV2lu ZG93ICp3aW5kb3cpCit7CisgICAgZ2RvdWJsZSB6b29tTGV2ZWwgPSB3ZWJraXRfd2ViX3ZpZXdf Z2V0X3pvb21fbGV2ZWwod2luZG93LT53ZWJWaWV3KSAvIHpvb21TdGVwOworICAgIHJldHVybiB6 b29tTGV2ZWwgPj0gbWluaW11bVpvb21MZXZlbDsKK30KKworc3RhdGljIHZvaWQgYnJvd3Nlcldp bmRvd1VwZGF0ZVpvb21BY3Rpb25zKEJyb3dzZXJXaW5kb3cgKndpbmRvdykKK3sKKyAgICBndGtf d2lkZ2V0X3NldF9zZW5zaXRpdmUod2luZG93LT56b29tSW5JdGVtLCBicm93c2VyV2luZG93Q2Fu Wm9vbUluKHdpbmRvdykpOworICAgIGd0a193aWRnZXRfc2V0X3NlbnNpdGl2ZSh3aW5kb3ctPnpv b21PdXRJdGVtLCBicm93c2VyV2luZG93Q2FuWm9vbU91dCh3aW5kb3cpKTsKK30KKworc3RhdGlj IHZvaWQgd2ViVmlld1pvb21MZXZlbENoYW5nZWQoR09iamVjdCAqb2JqZWN0LCBHUGFyYW1TcGVj ICpwYXJhbVNwZWMsIEJyb3dzZXJXaW5kb3cgKndpbmRvdykKK3sKKyAgICBicm93c2VyV2luZG93 VXBkYXRlWm9vbUFjdGlvbnMod2luZG93KTsKK30KKworc3RhdGljIHZvaWQgem9vbUluQ2FsbGJh Y2soQnJvd3NlcldpbmRvdyAqd2luZG93KQoreworICAgIGdkb3VibGUgem9vbUxldmVsID0gd2Vi a2l0X3dlYl92aWV3X2dldF96b29tX2xldmVsKHdpbmRvdy0+d2ViVmlldykgKiB6b29tU3RlcDsK KyAgICB3ZWJraXRfd2ViX3ZpZXdfc2V0X3pvb21fbGV2ZWwod2luZG93LT53ZWJWaWV3LCB6b29t TGV2ZWwpOworfQorCitzdGF0aWMgdm9pZCB6b29tT3V0Q2FsbGJhY2soQnJvd3NlcldpbmRvdyAq d2luZG93KQoreworICAgIGdkb3VibGUgem9vbUxldmVsID0gd2Via2l0X3dlYl92aWV3X2dldF96 b29tX2xldmVsKHdpbmRvdy0+d2ViVmlldykgLyB6b29tU3RlcDsKKyAgICB3ZWJraXRfd2ViX3Zp ZXdfc2V0X3pvb21fbGV2ZWwod2luZG93LT53ZWJWaWV3LCB6b29tTGV2ZWwpOworfQorCiBzdGF0 aWMgdm9pZCBicm93c2VyV2luZG93RmluYWxpemUoR09iamVjdCAqZ09iamVjdCkKIHsKICAgICBH X09CSkVDVF9DTEFTUyhicm93c2VyX3dpbmRvd19wYXJlbnRfY2xhc3MpLT5maW5hbGl6ZShnT2Jq ZWN0KTsKQEAgLTIzNyw2ICsyNzcsMTggQEAgc3RhdGljIHZvaWQgYnJvd3Nlcl93aW5kb3dfaW5p dChCcm93c2VyV2luZG93ICp3aW5kb3cpCiAgICAgZ3RrX3Rvb2xiYXJfaW5zZXJ0KEdUS19UT09M QkFSKHRvb2xiYXIpLCBpdGVtLCAtMSk7CiAgICAgZ3RrX3dpZGdldF9zaG93KEdUS19XSURHRVQo aXRlbSkpOwogCisgICAgaXRlbSA9IGd0a190b29sX2J1dHRvbl9uZXdfZnJvbV9zdG9jayhHVEtf U1RPQ0tfWk9PTV9PVVQpOworICAgIHdpbmRvdy0+em9vbU91dEl0ZW0gPSBHVEtfV0lER0VUKGl0 ZW0pOworICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZChpdGVtLCAiY2xpY2tlZCIsIEdfQ0FM TEJBQ0soem9vbU91dENhbGxiYWNrKSwgd2luZG93KTsKKyAgICBndGtfdG9vbGJhcl9pbnNlcnQo R1RLX1RPT0xCQVIodG9vbGJhciksIGl0ZW0sIC0xKTsKKyAgICBndGtfd2lkZ2V0X3Nob3coR1RL X1dJREdFVChpdGVtKSk7CisKKyAgICBpdGVtID0gZ3RrX3Rvb2xfYnV0dG9uX25ld19mcm9tX3N0 b2NrKEdUS19TVE9DS19aT09NX0lOKTsKKyAgICB3aW5kb3ctPnpvb21Jbkl0ZW0gPSBHVEtfV0lE R0VUKGl0ZW0pOworICAgIGdfc2lnbmFsX2Nvbm5lY3Rfc3dhcHBlZChpdGVtLCAiY2xpY2tlZCIs IEdfQ0FMTEJBQ0soem9vbUluQ2FsbGJhY2spLCB3aW5kb3cpOworICAgIGd0a190b29sYmFyX2lu c2VydChHVEtfVE9PTEJBUih0b29sYmFyKSwgaXRlbSwgLTEpOworICAgIGd0a193aWRnZXRfc2hv dyhHVEtfV0lER0VUKGl0ZW0pKTsKKwogICAgIGl0ZW0gPSBndGtfdG9vbF9pdGVtX25ldygpOwog ICAgIGd0a190b29sX2l0ZW1fc2V0X2V4cGFuZChpdGVtLCBUUlVFKTsKICAgICBndGtfY29udGFp bmVyX2FkZChHVEtfQ09OVEFJTkVSKGl0ZW0pLCB3aW5kb3ctPnVyaUVudHJ5KTsKQEAgLTI2Miw5 ICszMTQsMTIgQEAgc3RhdGljIHZvaWQgYnJvd3NlcldpbmRvd0NvbnN0cnVjdGVkKEdPYmplY3Qg KmdPYmplY3QpCiB7CiAgICAgQnJvd3NlcldpbmRvdyAqd2luZG93ID0gQlJPV1NFUl9XSU5ET1co Z09iamVjdCk7CiAKKyAgICBicm93c2VyV2luZG93VXBkYXRlWm9vbUFjdGlvbnMod2luZG93KTsK KwogICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2luZG93LT53ZWJWaWV3LCAibm90aWZ5Ojp1cmkiLCBH X0NBTExCQUNLKHdlYlZpZXdVUklDaGFuZ2VkKSwgd2luZG93KTsKICAgICBnX3NpZ25hbF9jb25u ZWN0KHdpbmRvdy0+d2ViVmlldywgIm5vdGlmeTo6ZXN0aW1hdGVkLWxvYWQtcHJvZ3Jlc3MiLCBH X0NBTExCQUNLKHdlYlZpZXdMb2FkUHJvZ3Jlc3NDaGFuZ2VkKSwgd2luZG93KTsKICAgICBnX3Np Z25hbF9jb25uZWN0KHdpbmRvdy0+d2ViVmlldywgIm5vdGlmeTo6dGl0bGUiLCBHX0NBTExCQUNL KHdlYlZpZXdUaXRsZUNoYW5nZWQpLCB3aW5kb3cpOworICAgIGdfc2lnbmFsX2Nvbm5lY3Qod2lu ZG93LT53ZWJWaWV3LCAibm90aWZ5Ojp6b29tLWxldmVsIiwgR19DQUxMQkFDSyh3ZWJWaWV3Wm9v bUxldmVsQ2hhbmdlZCksIHdpbmRvdyk7CiAKICAgICBXZWJLaXRCYWNrRm9yd2FyZExpc3QgKmJh Y2tGb3J3YWRsaXN0ID0gd2Via2l0X3dlYl92aWV3X2dldF9iYWNrX2ZvcndhcmRfbGlzdCh3aW5k b3ctPndlYlZpZXcpOwogICAgIGdfc2lnbmFsX2Nvbm5lY3QoYmFja0ZvcndhZGxpc3QsICJjaGFu Z2VkIiwgR19DQUxMQkFDSyhiYWNrRm9yd2FkbGlzdENoYW5nZWQpLCB3aW5kb3cpOwo=