75252 2011-12-27 06:43:44 -0800 [GTK] Use text or page zoom factor in WebKitWebView depending on zoom-text-only 2012-02-29 10:51:25 -0800 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) PC Linux RESOLVED FIXED Gtk P2 Normal --- 75249 1 cgarcia webkit-unassigned gustavo pnormand webkit.review.bot oldest_to_newest 527346 0 cgarcia 2011-12-27 06:43:44 -0800 Use the new setting to set/get the text or page zoom factor in WebKitWebView. 527348 1 120583 cgarcia 2011-12-27 06:48:32 -0800 Created attachment 120583 Patch 527353 2 webkit.review.bot 2011-12-27 06:55:14 -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 558621 3 120583 gustavo 2012-02-16 15:56:11 -0800 Comment on attachment 120583 Patch I think this patch could go in as part of the patch for bug 75249, it would make sense and it's not too big. It looks good to me, but the checks will need to be reversed if we decide to use enable-full-content-zoom in that other bug, might as well use the opportunity to squash it into the other one. 558958 4 cgarcia 2012-02-16 23:33:46 -0800 (In reply to comment #3) > (From update of attachment 120583 [details]) > I think this patch could go in as part of the patch for bug 75249, it would make sense and it's not too big. It looks good to me, but the checks will need to be reversed if we decide to use enable-full-content-zoom in that other bug, might as well use the opportunity to squash it into the other one. Ok, I don't mind to merge it. But I still find enable-full-content-zoom more confusing and inaccurate than zoom-text-only. 567640 5 120583 gustavo 2012-02-29 08:33:13 -0800 Comment on attachment 120583 Patch Let's go ahead. 567729 6 cgarcia 2012-02-29 10:51:25 -0800 Committed r109230: <http://trac.webkit.org/changeset/109230> 120583 2011-12-27 06:48:32 -0800 2012-02-29 08:33:13 -0800 Patch wk2-use-zoom-text-only.diff text/plain 6011 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQyL0No YW5nZUxvZwppbmRleCBlMjczMWI3Li5iYTBiMTZiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0 Mi9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjcg QEAKKzIwMTEtMTItMjcgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIFtHVEtdIFVzZSB0ZXh0IG9yIHBhZ2Ugem9vbSBmYWN0b3IgaW4gV2ViS2l0 V2ViVmlldyBkZXBlbmRpbmcgb24gem9vbS10ZXh0LW9ubHkKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc1MjUyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0ay9XZWJLaXRXZWJW aWV3LmNwcDoKKyAgICAgICAgKHpvb21UZXh0T25seUNoYW5nZWQpOiBVcGRhdGUgdGV4dC9wYWdl IHpvb20gZmFjdG9yIHdoZW4KKyAgICAgICAgem9vbS10ZXh0LW9ubHkgc2V0dGluZyBjaGFuZ2Vz LgorICAgICAgICAod2Via2l0V2ViVmlld1NldFNldHRpbmdzKTogSGVscGVyIGZ1bmN0aW9uIHRv IHNldCB0aGUgc2V0dGluZ3MKKyAgICAgICAgb2JqZWN0IGZvciB0aGUgd2ViIHZpZXcsIGluaXRp YWxpemluZyB0aGUgc2V0dGluZ3MgZm9yIHRoZSBwYWdlCisgICAgICAgIGFuZCBjb25uZWN0aW5n IHRvIG5vdGlmeTo6em9vbS10ZXh0LW9ubHkgc2lnbmFsLgorICAgICAgICAod2Via2l0V2ViVmll d0NvbnN0cnVjdGVkKTogVXNlIHdlYmtpdFdlYlZpZXdTZXRTZXR0aW5ncygpLgorICAgICAgICAo d2Via2l0X3dlYl92aWV3X3NldF9zZXR0aW5ncyk6IFVzZSB3ZWJraXRXZWJWaWV3U2V0U2V0dGlu Z3MoKSBhbmQKKyAgICAgICAgZGlzY29ubmVjdCBmcm9tIHRoZSBub3RpZnk6Onpvb20tdGV4dC1v bmx5IHNpZ25hbCBvZiB0aGUgcHJldmlvdXMKKyAgICAgICAgc2V0dGluZ3Mgb2JqZWN0LgorICAg ICAgICAod2Via2l0X3dlYl92aWV3X3NldF96b29tX2xldmVsKTogU2V0IHRleHQvcGFnZSB6b29t IGZhY3RvcgorICAgICAgICBkZXBlbmRpbmcgb24gV2ViS2l0U2V0dGluZ3M6em9vbS10ZXh0LW9u bHkgcHJvcGVydHkuCisgICAgICAgICh3ZWJraXRfd2ViX3ZpZXdfZ2V0X3pvb21fbGV2ZWwpOiBH ZXQgdGV4dC9wYWdlIHpvb20gZmFjdG9yCisgICAgICAgIGRlcGVuZGluZyBvbiBXZWJLaXRTZXR0 aW5nczp6b29tLXRleHQtb25seSBwcm9wZXJ0eS4KKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL2d0 ay90ZXN0cy9UZXN0V2ViS2l0V2ViVmlldy5jcHA6CisgICAgICAgICh0ZXN0V2ViVmlld1pvb21M ZXZlbCk6CisKIDIwMTEtMTItMjYgIE1hcmsgUm93ZSAgPG1yb3dlQGFwcGxlLmNvbT4KIAogICAg ICAgICA8aHR0cDovL3dlYmtpdC5vcmcvYi83NTE5Nj4gUkVHUkVTU0lPTihyMTAzNjQzKTogQ29t bWFuZC1jbGlja2luZyBhIGxpbmsgbm8gbG9uZ2VyIG9wZW5zIGEgbmV3IHRhYi4KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL1dlYktpdFdlYlZpZXcuY3BwIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKaW5kZXgg OTQ1MWE4OC4uMDJmM2ZhOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKKysrIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQ SS9ndGsvV2ViS2l0V2ViVmlldy5jcHAKQEAgLTEzOCw2ICsxMzgsMjIgQEAgc3RhdGljIHZvaWQg d2Via2l0V2ViVmlld1NldExvYWRlckNsaWVudChXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBXZWJL aXRXZWJMb2FkZXIKICAgICB3ZWJraXRXZWJMb2FkZXJDbGllbnRBdHRhY2hMb2FkZXJDbGllbnRU b1BhZ2UobG9hZGVyQ2xpZW50LCB3a1BhZ2UpOwogfQogCitzdGF0aWMgdm9pZCB6b29tVGV4dE9u bHlDaGFuZ2VkKFdlYktpdFNldHRpbmdzKiBzZXR0aW5ncywgR1BhcmFtU3BlYyosIFdlYktpdFdl YlZpZXcqIHdlYlZpZXcpCit7CisgICAgV0tQYWdlUmVmIHdrUGFnZSA9IHRvQVBJKHdlYmtpdFdl YlZpZXdCYXNlR2V0UGFnZShXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3ZWJWaWV3KSkpOworICAgIGdi b29sZWFuIHpvb21UZXh0T25seSA9IHdlYmtpdF9zZXR0aW5nc19nZXRfem9vbV90ZXh0X29ubHko c2V0dGluZ3MpOworICAgIGdkb3VibGUgcGFnZVpvb21MZXZlbCA9IHpvb21UZXh0T25seSA/IDEg OiBXS1BhZ2VHZXRUZXh0Wm9vbUZhY3Rvcih3a1BhZ2UpOworICAgIGdkb3VibGUgdGV4dFpvb21M ZXZlbCA9IHpvb21UZXh0T25seSA/IFdLUGFnZUdldFBhZ2Vab29tRmFjdG9yKHdrUGFnZSkgOiAx OworICAgIFdLUGFnZVNldFBhZ2VBbmRUZXh0Wm9vbUZhY3RvcnMod2tQYWdlLCBwYWdlWm9vbUxl dmVsLCB0ZXh0Wm9vbUxldmVsKTsKK30KKworc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld1NldFNl dHRpbmdzKFdlYktpdFdlYlZpZXcqIHdlYlZpZXcsIFdlYktpdFNldHRpbmdzKiBzZXR0aW5ncywg V0tQYWdlUmVmIHdrUGFnZSkKK3sKKyAgICB3ZWJWaWV3LT5wcml2LT5zZXR0aW5ncyA9IHNldHRp bmdzOworICAgIHdlYmtpdFNldHRpbmdzQXR0YWNoU2V0dGluZ3NUb1BhZ2Uod2ViVmlldy0+cHJp di0+c2V0dGluZ3MuZ2V0KCksIHdrUGFnZSk7CisgICAgZ19zaWduYWxfY29ubmVjdChzZXR0aW5n cywgIm5vdGlmeTo6em9vbS10ZXh0LW9ubHkiLCBHX0NBTExCQUNLKHpvb21UZXh0T25seUNoYW5n ZWQpLCB3ZWJWaWV3KTsKK30KKwogc3RhdGljIHZvaWQgd2Via2l0V2ViVmlld0NvbnN0cnVjdGVk KEdPYmplY3QqIG9iamVjdCkKIHsKICAgICBpZiAoR19PQkpFQ1RfQ0xBU1Mod2Via2l0X3dlYl92 aWV3X3BhcmVudF9jbGFzcyktPmNvbnN0cnVjdGVkKQpAQCAtMTU5LDggKzE3NSw5IEBAIHN0YXRp YyB2b2lkIHdlYmtpdFdlYlZpZXdDb25zdHJ1Y3RlZChHT2JqZWN0KiBvYmplY3QpCiAgICAgd2Vi a2l0VUlDbGllbnRBdHRhY2hVSUNsaWVudFRvUGFnZShwcml2LT51aUNsaWVudC5nZXQoKSwgdG9B UEkocGFnZSkpOwogCiAgICAgcHJpdi0+YmFja0ZvcndhcmRMaXN0ID0gYWRvcHRHUmVmKHdlYmtp dEJhY2tGb3J3YXJkTGlzdENyZWF0ZShXS1BhZ2VHZXRCYWNrRm9yd2FyZExpc3QodG9BUEkocGFn ZSkpKSk7Ci0gICAgcHJpdi0+c2V0dGluZ3MgPSBhZG9wdEdSZWYod2Via2l0X3NldHRpbmdzX25l dygpKTsKLSAgICB3ZWJraXRTZXR0aW5nc0F0dGFjaFNldHRpbmdzVG9QYWdlKHByaXYtPnNldHRp bmdzLmdldCgpLCB0b0FQSShwYWdlKSk7CisKKyAgICBHUmVmUHRyPFdlYktpdFNldHRpbmdzPiBz ZXR0aW5ncyA9IGFkb3B0R1JlZih3ZWJraXRfc2V0dGluZ3NfbmV3KCkpOworICAgIHdlYmtpdFdl YlZpZXdTZXRTZXR0aW5ncyh3ZWJWaWV3LCBzZXR0aW5ncy5nZXQoKSwgdG9BUEkocGFnZSkpOwog fQogCiBzdGF0aWMgdm9pZCB3ZWJraXRXZWJWaWV3U2V0UHJvcGVydHkoR09iamVjdCogb2JqZWN0 LCBndWludCBwcm9wSWQsIGNvbnN0IEdWYWx1ZSogdmFsdWUsIEdQYXJhbVNwZWMqIHBhcmFtU3Bl YykKQEAgLTEwMjMsOCArMTA0MCw4IEBAIHZvaWQgd2Via2l0X3dlYl92aWV3X3NldF9zZXR0aW5n cyhXZWJLaXRXZWJWaWV3KiB3ZWJWaWV3LCBXZWJLaXRTZXR0aW5ncyogc2V0dGluCiAgICAgaWYg KHdlYlZpZXctPnByaXYtPnNldHRpbmdzID09IHNldHRpbmdzKQogICAgICAgICByZXR1cm47CiAK LSAgICB3ZWJWaWV3LT5wcml2LT5zZXR0aW5ncyA9IHNldHRpbmdzOwotICAgIHdlYmtpdFNldHRp bmdzQXR0YWNoU2V0dGluZ3NUb1BhZ2Uoc2V0dGluZ3MsIHRvQVBJKHdlYmtpdFdlYlZpZXdCYXNl R2V0UGFnZShXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3ZWJWaWV3KSkpKTsKKyAgICBnX3NpZ25hbF9o YW5kbGVyc19kaXNjb25uZWN0X2J5X2Z1bmMod2ViVmlldy0+cHJpdi0+c2V0dGluZ3MuZ2V0KCks IHJlaW50ZXJwcmV0X2Nhc3Q8Z3BvaW50ZXI+KHpvb21UZXh0T25seUNoYW5nZWQpLCB3ZWJWaWV3 KTsKKyAgICB3ZWJraXRXZWJWaWV3U2V0U2V0dGluZ3Mod2ViVmlldywgc2V0dGluZ3MsIHRvQVBJ KHdlYmtpdFdlYlZpZXdCYXNlR2V0UGFnZShXRUJLSVRfV0VCX1ZJRVdfQkFTRSh3ZWJWaWV3KSkp KTsKIH0KIAogLyoqCkBAIC0xMDg2LDcgKzExMDMsMTAgQEAgdm9pZCB3ZWJraXRfd2ViX3ZpZXdf c2V0X3pvb21fbGV2ZWwoV2ViS2l0V2ViVmlldyogd2ViVmlldywgZ2RvdWJsZSB6b29tTGV2ZWwp CiAgICAgaWYgKFdLUGFnZUdldFBhZ2Vab29tRmFjdG9yKHdrUGFnZSkgPT0gem9vbUxldmVsKQog ICAgICAgICByZXR1cm47CiAKLSAgICBXS1BhZ2VTZXRQYWdlWm9vbUZhY3Rvcih3a1BhZ2UsIHpv b21MZXZlbCk7CisgICAgaWYgKHdlYmtpdF9zZXR0aW5nc19nZXRfem9vbV90ZXh0X29ubHkod2Vi Vmlldy0+cHJpdi0+c2V0dGluZ3MuZ2V0KCkpKQorICAgICAgICBXS1BhZ2VTZXRUZXh0Wm9vbUZh Y3Rvcih3a1BhZ2UsIHpvb21MZXZlbCk7CisgICAgZWxzZQorICAgICAgICBXS1BhZ2VTZXRQYWdl Wm9vbUZhY3Rvcih3a1BhZ2UsIHpvb21MZXZlbCk7CiAgICAgZ19vYmplY3Rfbm90aWZ5KEdfT0JK RUNUKHdlYlZpZXcpLCAiem9vbS1sZXZlbCIpOwogfQogCkBAIC0xMTA0LDUgKzExMjQsNiBAQCBn ZG91YmxlIHdlYmtpdF93ZWJfdmlld19nZXRfem9vbV9sZXZlbChXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3KQogICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJfVklFVyh3ZWJWaWV3 KSwgMSk7CiAKICAgICBXS1BhZ2VSZWYgd2tQYWdlID0gdG9BUEkod2Via2l0V2ViVmlld0Jhc2VH ZXRQYWdlKFdFQktJVF9XRUJfVklFV19CQVNFKHdlYlZpZXcpKSk7Ci0gICAgcmV0dXJuIFdLUGFn ZUdldFBhZ2Vab29tRmFjdG9yKHdrUGFnZSk7CisgICAgZ2Jvb2xlYW4gem9vbVRleHRPbmx5ID0g d2Via2l0X3NldHRpbmdzX2dldF96b29tX3RleHRfb25seSh3ZWJWaWV3LT5wcml2LT5zZXR0aW5n cy5nZXQoKSk7CisgICAgcmV0dXJuIHpvb21UZXh0T25seSA/IFdLUGFnZUdldFRleHRab29tRmFj dG9yKHdrUGFnZSkgOiBXS1BhZ2VHZXRQYWdlWm9vbUZhY3Rvcih3a1BhZ2UpOwogfQpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdlYktpdFdl YlZpZXcuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFdl YktpdFdlYlZpZXcuY3BwCmluZGV4IDIwM2Y1ZDguLmMzODNiNGQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvZ3RrL3Rlc3RzL1Rlc3RXZWJLaXRXZWJWaWV3LmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0V2ViS2l0V2Vi Vmlldy5jcHAKQEAgLTM1Miw2ICszNTIsMTAgQEAgc3RhdGljIHZvaWQgdGVzdFdlYlZpZXdab29t TGV2ZWwoV2ViVmlld1Rlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIpCiAgICAgZ19hc3NlcnRfY21w ZmxvYXQod2Via2l0X3dlYl92aWV3X2dldF96b29tX2xldmVsKHRlc3QtPm1fd2ViVmlldyksID09 LCAxKTsKICAgICB3ZWJraXRfd2ViX3ZpZXdfc2V0X3pvb21fbGV2ZWwodGVzdC0+bV93ZWJWaWV3 LCAyLjUpOwogICAgIGdfYXNzZXJ0X2NtcGZsb2F0KHdlYmtpdF93ZWJfdmlld19nZXRfem9vbV9s ZXZlbCh0ZXN0LT5tX3dlYlZpZXcpLCA9PSwgMi41KTsKKworICAgIHdlYmtpdF9zZXR0aW5nc19z ZXRfem9vbV90ZXh0X29ubHkod2Via2l0X3dlYl92aWV3X2dldF9zZXR0aW5ncyh0ZXN0LT5tX3dl YlZpZXcpLCBUUlVFKTsKKyAgICAvLyBUaGUgem9vbSBsZXZlbCBzaG91bGRuJ3QgY2hhbmdlIHdo ZW4gem9vbS10ZXh0LW9ubHkgc2V0dGluZyBjaGFuZ2VzLgorICAgIGdfYXNzZXJ0X2NtcGZsb2F0 KHdlYmtpdF93ZWJfdmlld19nZXRfem9vbV9sZXZlbCh0ZXN0LT5tX3dlYlZpZXcpLCA9PSwgMi41 KTsKIH0KIAogdm9pZCBiZWZvcmVBbGwoKQo=