75248 2011-12-27 06:32:20 -0800 [GTK] Add methods to get/set the WebView zoom level to WebKit2 GTK+ API 2012-01-05 05:04:58 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 75249 75253 1 cgarcia webkit-unassigned gustavo pnormand webkit.review.bot oldest_to_newest 527338 0 cgarcia 2011-12-27 06:32:20 -0800 Add webkit_web_view_set_zoom_level() and webkit_web_view_get_zoom_level() 527339 1 120579 cgarcia 2011-12-27 06:35:15 -0800 Created attachment 120579 Patch It uses the page zoom factor unconditionally for now. 527341 2 webkit.review.bot 2011-12-27 06:38:08 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 530204 3 120579 gustavo 2012-01-05 05:00:32 -0800 Comment on attachment 120579 Patch LGTM, for those not following along at home, the way this API will look in the future may change following discussions in the webkit-gtk mailing list, but this part here I think is pretty much a consensus will exist, even if the name changes to contain 'page' somewhere. 530208 4 cgarcia 2012-01-05 05:04:58 -0800 Committed r104145: <http://trac.webkit.org/changeset/104145> 120579 2011-12-27 06:35:15 -0800 2012-01-05 05:00:32 -0800 Patch wk2-zoom-level.diff text/plain 7462 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBlMjczMWI3Li4wZjQyZWRlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjUg QEAKKzIwMTEtMTItMjcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIEFkZCBtZXRob2RzIHRvIGdldC9zZXQgdGhlIFdlYlZpZXcgem9v bSBsZXZlbCB0byBXZWJLaXQyIEdUSysgQVBJCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD03NTI0OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIEl0IHVzZXMgdGhlIHBhZ2Ugem9vbSBmYWN0b3IgdW5jb25kaXRp b25hbGx5IGZvciBub3cuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJW aWV3LmNwcDoKKyAgICAgICAgKHdlYmtpdFdlYlZpZXdTZXRQcm9wZXJ0eSk6CisgICAgICAgICh3 ZWJraXRXZWJWaWV3R2V0UHJvcGVydHkpOgorICAgICAgICAod2Via2l0X3dlYl92aWV3X2NsYXNz X2luaXQpOiBBZGQgV2ViS2l0V2ViVmlldzp6b29tLWxldmVsCisgICAgICAgIHByb3BlcnR5Lgor ICAgICAgICAod2Via2l0X3dlYl92aWV3X3NldF96b29tX2xldmVsKTogU2V0IGN1cnJlbnQgem9v bSBsZXZlbC4KKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19nZXRfem9vbV9sZXZlbCk6IEdldCBj dXJyZW50IHpvb20gbGV2ZWwuCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2Vi Vmlldy5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay1zZWN0 aW9ucy50eHQ6IEFkZCBuZXcgc3ltYm9scy4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay90 ZXN0cy9UZXN0V2ViS2l0V2ViVmlldy5jcHA6CisgICAgICAgICh0ZXN0V2ViVmlld1pvb21MZXZl bCk6CisgICAgICAgIChiZWZvcmVBbGwpOgorCiAyMDExLTEyLTI2ICBNYXJrIFJvd2UgIDxtcm93 ZUBhcHBsZS5jb20+CiAKICAgICAgICAgPGh0dHA6Ly93ZWJraXQub3JnL2IvNzUxOTY+IFJFR1JF U1NJT04ocjEwMzY0Myk6IENvbW1hbmQtY2xpY2tpbmcgYSBsaW5rIG5vIGxvbmdlciBvcGVucyBh IG5ldyB0YWIuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRXZWJWaWV3LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktp dFdlYlZpZXcuY3BwCmluZGV4IDY5MTM4ZDAuLjk0NTFhODggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwCkBAIC02Miw3ICs2Miw4 IEBAIGVudW0gewogICAgIFBST1BfV0VCX0NPTlRFWFQsCiAgICAgUFJPUF9USVRMRSwKICAgICBQ Uk9QX0VTVElNQVRFRF9MT0FEX1BST0dSRVNTLAotICAgIFBST1BfVVJJCisgICAgUFJPUF9VUkks CisgICAgUFJPUF9aT09NX0xFVkVMCiB9OwogCiBzdHJ1Y3QgX1dlYktpdFdlYlZpZXdQcml2YXRl IHsKQEAgLTE3MCw2ICsxNzEsOSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3U2V0UHJvcGVy dHkoR09iamVjdCogb2JqZWN0LCBndWludCBwcm9wSWQsIGNvbnN0IEdWYWx1ZQogICAgIGNhc2Ug UFJPUF9XRUJfQ09OVEVYVDoKICAgICAgICAgd2ViVmlldy0+cHJpdi0+Y29udGV4dCA9IFdFQktJ VF9XRUJfQ09OVEVYVChnX3ZhbHVlX2dldF9vYmplY3QodmFsdWUpKTsKICAgICAgICAgYnJlYWs7 CisgICAgY2FzZSBQUk9QX1pPT01fTEVWRUw6CisgICAgICAgIHdlYmtpdF93ZWJfdmlld19zZXRf em9vbV9sZXZlbCh3ZWJWaWV3LCBnX3ZhbHVlX2dldF9kb3VibGUodmFsdWUpKTsKKyAgICAgICAg YnJlYWs7CiAgICAgZGVmYXVsdDoKICAgICAgICAgR19PQkpFQ1RfV0FSTl9JTlZBTElEX1BST1BF UlRZX0lEKG9iamVjdCwgcHJvcElkLCBwYXJhbVNwZWMpOwogICAgIH0KQEAgLTE5Miw2ICsxOTYs OSBAQCBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3R2V0UHJvcGVydHkoR09iamVjdCogb2JqZWN0 LCBndWludCBwcm9wSWQsIEdWYWx1ZSogdmFsdQogICAgIGNhc2UgUFJPUF9VUkk6CiAgICAgICAg IGdfdmFsdWVfc2V0X3N0cmluZyh2YWx1ZSwgd2Via2l0X3dlYl92aWV3X2dldF91cmkod2ViVmll dykpOwogICAgICAgICBicmVhazsKKyAgICBjYXNlIFBST1BfWk9PTV9MRVZFTDoKKyAgICAgICAg Z192YWx1ZV9zZXRfZG91YmxlKHZhbHVlLCB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3pvb21fbGV2ZWwo d2ViVmlldykpOworICAgICAgICBicmVhazsKICAgICBkZWZhdWx0OgogICAgICAgICBHX09CSkVD VF9XQVJOX0lOVkFMSURfUFJPUEVSVFlfSUQob2JqZWN0LCBwcm9wSWQsIHBhcmFtU3BlYyk7CiAg ICAgfQpAQCAtMjk3LDYgKzMwNCwyMCBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfY2xh c3NfaW5pdChXZWJLaXRXZWJWaWV3Q2xhc3MqIHdlYlZpZXdDbGFzcykKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgV0VCS0lUX1BBUkFNX1JF QURBQkxFKSk7CiAKICAgICAvKioKKyAgICAgKiBXZWJLaXRXZWJWaWV3Onpvb20tbGV2ZWw6Cisg ICAgICoKKyAgICAgKiBUaGUgem9vbSBsZXZlbCBvZiB0aGUgI1dlYktpdFdlYlZpZXcgY29udGVu dC4KKyAgICAgKiBTZWUgd2Via2l0X3dlYl92aWV3X3NldF96b29tX2xldmVsKCkgZm9yIG1vcmUg ZGV0YWlscy4KKyAgICAgKi8KKyAgICBnX29iamVjdF9jbGFzc19pbnN0YWxsX3Byb3BlcnR5KGdP YmplY3RDbGFzcywKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFBST1BfWk9P TV9MRVZFTCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdfcGFyYW1fc3Bl Y19kb3VibGUoInpvb20tbGV2ZWwiLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAiWm9vbSBsZXZlbCIsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJUaGUgem9vbSBsZXZlbCBvZiB0 aGUgdmlldyBjb250ZW50IiwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgMCwgR19NQVhET1VCTEUsIDEsCisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFdFQktJVF9QQVJBTV9SRUFEV1JJ VEUpKTsKKworICAgIC8qKgogICAgICAqIFdlYktpdFdlYlZpZXc6OmNyZWF0ZToKICAgICAgKiBA d2ViX3ZpZXc6IHRoZSAjV2ViS2l0V2ViVmlldyBvbiB3aGljaCB0aGUgc2lnbmFsIGlzIGVtaXR0 ZWQKICAgICAgKgpAQCAtMTA0OCwzICsxMDY5LDQwIEBAIFdlYktpdFdpbmRvd1Byb3BlcnRpZXMq IHdlYmtpdF93ZWJfdmlld19nZXRfd2luZG93X3Byb3BlcnRpZXMoV2ViS2l0V2ViVmlldyogd2Vi CiAKICAgICByZXR1cm4gd2ViVmlldy0+cHJpdi0+d2luZG93UHJvcGVydGllcy5nZXQoKTsKIH0K KworLyoqCisgKiB3ZWJraXRfd2ViX3ZpZXdfc2V0X3pvb21fbGV2ZWw6CisgKiBAd2ViX3ZpZXc6 IGEgI1dlYktpdFdlYlZpZXcKKyAqIEB6b29tX2xldmVsOiB0aGUgem9vbSBsZXZlbAorICoKKyAq IFNldCB0aGUgem9vbSBsZXZlbCBvZiBAd2ViX3ZpZXcsIGkuZS4gdGhlIGZhY3RvciBieSB3aGlj aCB0aGUKKyAqIHZpZXcgY29udGVudHMgYXJlIHNjYWxlZCB3aXRoIHJlc3BlY3QgdG8gdGhlaXIg b3JpZ2luYWwgc2l6ZS4KKyAqLwordm9pZCB3ZWJraXRfd2ViX3ZpZXdfc2V0X3pvb21fbGV2ZWwo V2ViS2l0V2ViVmlldyogd2ViVmlldywgZ2RvdWJsZSB6b29tTGV2ZWwpCit7CisgICAgZ19yZXR1 cm5faWZfZmFpbChXRUJLSVRfSVNfV0VCX1ZJRVcod2ViVmlldykpOworCisgICAgV0tQYWdlUmVm IHdrUGFnZSA9IHRvQVBJKHdlYmtpdFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRfV0VCX1ZJRVdf QkFTRSh3ZWJWaWV3KSkpOworICAgIGlmIChXS1BhZ2VHZXRQYWdlWm9vbUZhY3Rvcih3a1BhZ2Up ID09IHpvb21MZXZlbCkKKyAgICAgICAgcmV0dXJuOworCisgICAgV0tQYWdlU2V0UGFnZVpvb21G YWN0b3Iod2tQYWdlLCB6b29tTGV2ZWwpOworICAgIGdfb2JqZWN0X25vdGlmeShHX09CSkVDVCh3 ZWJWaWV3KSwgInpvb20tbGV2ZWwiKTsKK30KKworLyoqCisgKiB3ZWJraXRfd2ViX3ZpZXdfZ2V0 X3pvb21fbGV2ZWw6CisgKiBAd2ViX3ZpZXc6IGEgI1dlYktpdFdlYlZpZXcKKyAqCisgKiBHZXQg dGhlIHpvb20gbGV2ZWwgb2YgQHdlYl92aWV3LCBpLmUuIHRoZSBmYWN0b3IgYnkgd2hpY2ggdGhl CisgKiB2aWV3IGNvbnRlbnRzIGFyZSBzY2FsZWQgd2l0aCByZXNwZWN0IHRvIHRoZWlyIG9yaWdp bmFsIHNpemUuCisgKgorICogUmV0dXJuczogdGhlIGN1cnJlbnQgem9vbSBsZXZlbCBvZiBAd2Vi X3ZpZXcKKyAqLworZ2RvdWJsZSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3pvb21fbGV2ZWwoV2ViS2l0 V2ViVmlldyogd2ViVmlldykKK3sKKyAgICBnX3JldHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNf V0VCX1ZJRVcod2ViVmlldyksIDEpOworCisgICAgV0tQYWdlUmVmIHdrUGFnZSA9IHRvQVBJKHdl YmtpdFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3ZWJWaWV3KSkpOwor ICAgIHJldHVybiBXS1BhZ2VHZXRQYWdlWm9vbUZhY3Rvcih3a1BhZ2UpOworfQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oIGIvU291 cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5oCmluZGV4IDQ3ZThk NDEuLjllNzIyNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3Rr L1dlYktpdFdlYlZpZXcuaAorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9X ZWJLaXRXZWJWaWV3LmgKQEAgLTE3Nyw2ICsxNzcsMTIgQEAgd2Via2l0X3dlYl92aWV3X2dldF9z ZXR0aW5ncyAgICAgICAgICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAgICAgICAgICAgKndlYl92 aWUKIFdFQktJVF9BUEkgV2ViS2l0V2luZG93UHJvcGVydGllcyAqCiB3ZWJraXRfd2ViX3ZpZXdf Z2V0X3dpbmRvd19wcm9wZXJ0aWVzICAgICAgICAoV2ViS2l0V2ViVmlldyAgICAgICAgICAgICAq d2ViX3ZpZXcpOwogCitXRUJLSVRfQVBJIHZvaWQKK3dlYmtpdF93ZWJfdmlld19zZXRfem9vbV9s ZXZlbCAgICAgICAgICAgICAgIChXZWJLaXRXZWJWaWV3ICAgICAgICAgICAgICp3ZWJfdmlldywK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBnZG91YmxlICAg ICAgICAgICAgICAgICAgICB6b29tX2xldmVsKTsKK1dFQktJVF9BUEkgZ2RvdWJsZQord2Via2l0 X3dlYl92aWV3X2dldF96b29tX2xldmVsICAgICAgICAgICAgICAgKFdlYktpdFdlYlZpZXcgICAg ICAgICAgICAgKndlYl92aWV3KTsKKwogR19FTkRfREVDTFMKIAogI2VuZGlmCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstc2VjdGlv bnMudHh0IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvZG9jcy93ZWJraXQyZ3Rr LXNlY3Rpb25zLnR4dAppbmRleCA0YzJmNjA1Li4yMTZjY2VkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay9kb2NzL3dlYmtpdDJndGstc2VjdGlvbnMudHh0Cisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL2RvY3Mvd2Via2l0Mmd0ay1zZWN0 aW9ucy50eHQKQEAgLTczLDYgKzczLDggQEAgd2Via2l0X3dlYl92aWV3X2dldF91cmkKIHdlYmtp dF93ZWJfdmlld19zZXRfc2V0dGluZ3MKIHdlYmtpdF93ZWJfdmlld19nZXRfc2V0dGluZ3MKIHdl YmtpdF93ZWJfdmlld19nZXRfd2luZG93X3Byb3BlcnRpZXMKK3dlYmtpdF93ZWJfdmlld19zZXRf em9vbV9sZXZlbAord2Via2l0X3dlYl92aWV3X2dldF96b29tX2xldmVsCiAKIDxTVUJTRUNUSU9O IFN0YW5kYXJkPgogV2ViS2l0V2ViVmlld0NsYXNzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0V2ViVmlldy5jcHAgYi9Tb3VyY2Uv V2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0V2ViVmlldy5jcHAKaW5k ZXggYWUwNDU1Ni4uMjAzZjVkOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNz L0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdFdlYlZpZXcuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQy L1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRXZWJWaWV3LmNwcApAQCAtMzQ3LDYg KzM0NywxMyBAQCBzdGF0aWMgdm9pZCB0ZXN0V2ViVmlld1dpbmRvd1Byb3BlcnRpZXMoVUlDbGll bnRUZXN0KiB0ZXN0LCBnY29uc3Rwb2ludGVyKQogICAgIGdfYXNzZXJ0X2NtcGludChldmVudHNb Ml0sID09LCBVSUNsaWVudFRlc3Q6OkNsb3NlKTsKIH0KIAorc3RhdGljIHZvaWQgdGVzdFdlYlZp ZXdab29tTGV2ZWwoV2ViVmlld1Rlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCit7CisgICAgZ19h c3NlcnRfY21wZmxvYXQod2Via2l0X3dlYl92aWV3X2dldF96b29tX2xldmVsKHRlc3QtPm1fd2Vi VmlldyksID09LCAxKTsKKyAgICB3ZWJraXRfd2ViX3ZpZXdfc2V0X3pvb21fbGV2ZWwodGVzdC0+ bV93ZWJWaWV3LCAyLjUpOworICAgIGdfYXNzZXJ0X2NtcGZsb2F0KHdlYmtpdF93ZWJfdmlld19n ZXRfem9vbV9sZXZlbCh0ZXN0LT5tX3dlYlZpZXcpLCA9PSwgMi41KTsKK30KKwogdm9pZCBiZWZv cmVBbGwoKQogewogICAgIFdlYlZpZXdUZXN0OjphZGQoIldlYktpdFdlYlZpZXciLCAiZGVmYXVs dC1jb250ZXh0IiwgdGVzdFdlYlZpZXdEZWZhdWx0Q29udGV4dCk7CkBAIC0zNTYsNiArMzYzLDcg QEAgdm9pZCBiZWZvcmVBbGwoKQogICAgIFVJQ2xpZW50VGVzdDo6YWRkKCJXZWJLaXRXZWJWaWV3 IiwgImNyZWF0ZS1yZWFkeS1jbG9zZSIsIHRlc3RXZWJWaWV3Q3JlYXRlUmVhZHlDbG9zZSk7CiAg ICAgVUlDbGllbnRUZXN0OjphZGQoIldlYktpdFdlYlZpZXciLCAiamF2YXNjcmlwdC1kaWFsb2dz IiwgdGVzdFdlYlZpZXdKYXZhU2NyaXB0RGlhbG9ncyk7CiAgICAgVUlDbGllbnRUZXN0OjphZGQo IldlYktpdFdlYlZpZXciLCAid2luZG93LXByb3BlcnRpZXMiLCB0ZXN0V2ViVmlld1dpbmRvd1By b3BlcnRpZXMpOworICAgIFdlYlZpZXdUZXN0OjphZGQoIldlYktpdFdlYlZpZXciLCAiem9vbS1s ZXZlbCIsIHRlc3RXZWJWaWV3Wm9vbUxldmVsKTsKIH0KIAogdm9pZCBhZnRlckFsbCgpCg==