53231 2011-01-27 02:12:16 -0800 Add simple zooming features to MiniBrowser 2011-01-27 02:26:11 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 1 zoltan zoltan oldest_to_newest 340790 0 zoltan 2011-01-27 02:12:16 -0800 Add View menu and Zoom In, Zoom Out, Zoom Reset actions to MiniBrowser. 340792 1 80309 zoltan 2011-01-27 02:13:11 -0800 Created attachment 80309 proposed patch 340794 2 80309 kling 2011-01-27 02:17:30 -0800 Comment on attachment 80309 proposed patch r=me 340798 3 zoltan 2011-01-27 02:26:11 -0800 Committed r76778. http://trac.webkit.org/changeset/76778 80309 2011-01-27 02:13:11 -0800 2011-01-27 02:17:30 -0800 proposed patch zooming.patch text/plain 6825 zoltan ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA3MTli NzNkLi5lMmQ3YWFmIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTEtMDEtMjcgIFpvbHRhbiBIb3J2YXRoICA8em9s dGFuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQW5kcmVhcyBLbGluZy4KKwor ICAgICAgICBbUXRdIEFkZCBzaW1wbGUgem9vbWluZyBmZWF0dXJlcyB0byBNaW5pQnJvd3Nlcgor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTMyMzEKKwor ICAgICAgICBBZGQgVmlldyBtZW51IGFuZCBab29tIEluLCBab29tIE91dCwgWm9vbSBSZXNldCBh Y3Rpb25zIHRvIE1pbmlCcm93c2VyLgorCisgICAgICAgICogTWluaUJyb3dzZXIvcXQvQnJvd3Nl cldpbmRvdy5jcHA6CisgICAgICAgIChCcm93c2VyV2luZG93OjpCcm93c2VyV2luZG93KToKKyAg ICAgICAgKEJyb3dzZXJXaW5kb3c6Onpvb21Jbik6CisgICAgICAgIChCcm93c2VyV2luZG93Ojp6 b29tT3V0KToKKyAgICAgICAgKEJyb3dzZXJXaW5kb3c6OnJlc2V0Wm9vbSk6CisgICAgICAgIChC cm93c2VyV2luZG93Ojp1cGRhdGVVc2VyQWdlbnRMaXN0KToKKyAgICAgICAgKEJyb3dzZXJXaW5k b3c6OmFwcGx5Wm9vbSk6CisgICAgICAgICogTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5o OgorCiAyMDExLTAxLTI2ICBNYWNpZWogU3RhY2hvd2lhayAgPG1qc0BhcHBsZS5jb20+CiAKICAg ICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlC cm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuY3BwIGIvVG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3Nl cldpbmRvdy5jcHAKaW5kZXggYzM3ZDM2ZS4uZTYzZjFiZCAxMDA2NDQKLS0tIGEvVG9vbHMvTWlu aUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5jcHAKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvcXQv QnJvd3NlcldpbmRvdy5jcHAKQEAgLTM2LDI2ICszNiw0MSBAQCBzdGF0aWMgUVdLUGFnZSogbmV3 UGFnZUZ1bmN0aW9uKFFXS1BhZ2UqIHBhZ2UpCiAKIFFHcmFwaGljc1dLVmlldzo6QmFja2luZ1N0 b3JlVHlwZSBCcm93c2VyV2luZG93OjpiYWNraW5nU3RvcmVUeXBlRm9yTmV3V2luZG93ID0gUUdy YXBoaWNzV0tWaWV3OjpTaW1wbGU7CiAKK1FWZWN0b3I8aW50PiBCcm93c2VyV2luZG93OjptX3pv b21MZXZlbHM7CisKIEJyb3dzZXJXaW5kb3c6OkJyb3dzZXJXaW5kb3coUVdLQ29udGV4dCogY29u dGV4dCkKKyAgICA6IG1fY3VycmVudFpvb20oMTAwKSAsCisgICAgICBtX2Jyb3dzZXIobmV3IEJy b3dzZXJWaWV3KGJhY2tpbmdTdG9yZVR5cGVGb3JOZXdXaW5kb3csIGNvbnRleHQpKQogewogICAg IHNldEF0dHJpYnV0ZShRdDo6V0FfRGVsZXRlT25DbG9zZSk7CiAKKyAgICBjb25uZWN0KG1fYnJv d3Nlci0+dmlldygpLCBTSUdOQUwobG9hZFByb2dyZXNzKGludCkpLCBTTE9UKGxvYWRQcm9ncmVz cyhpbnQpKSk7CisgICAgY29ubmVjdChtX2Jyb3dzZXItPnZpZXcoKSwgU0lHTkFMKHRpdGxlQ2hh bmdlZChjb25zdCBRU3RyaW5nJikpLCBTTE9UKHRpdGxlQ2hhbmdlZChjb25zdCBRU3RyaW5nJikp KTsKKyAgICBjb25uZWN0KG1fYnJvd3Nlci0+dmlldygpLCBTSUdOQUwodXJsQ2hhbmdlZChjb25z dCBRVXJsJikpLCBTTE9UKHVybENoYW5nZWQoY29uc3QgUVVybCYpKSk7CisKKyAgICB0aGlzLT5z ZXRDZW50cmFsV2lkZ2V0KG1fYnJvd3Nlcik7CisgICAgbV9icm93c2VyLT5zZXRGb2N1cyhRdDo6 T3RoZXJGb2N1c1JlYXNvbik7CisKICAgICBRTWVudSogZmlsZU1lbnUgPSBtZW51QmFyKCktPmFk ZE1lbnUoIiZGaWxlIik7CiAgICAgZmlsZU1lbnUtPmFkZEFjdGlvbigiTmV3IFdpbmRvdyIsIHRo aXMsIFNMT1QobmV3V2luZG93KCkpLCBRS2V5U2VxdWVuY2U6Ok5ldyk7CiAgICAgZmlsZU1lbnUt PmFkZEFjdGlvbigiT3BlbiBGaWxlIiwgdGhpcywgU0xPVChvcGVuRmlsZSgpKSwgUUtleVNlcXVl bmNlOjpPcGVuKTsKICAgICBmaWxlTWVudS0+YWRkU2VwYXJhdG9yKCk7CiAgICAgZmlsZU1lbnUt PmFkZEFjdGlvbigiUXVpdCIsIHRoaXMsIFNMT1QoY2xvc2UoKSkpOwogCi0gICAgUU1lbnUqIHRv b2xzTWVudSA9IG1lbnVCYXIoKS0+YWRkTWVudSgiJkRldmVsb3AiKTsKLSAgICB0b29sc01lbnUt PmFkZEFjdGlvbigiQ2hhbmdlIFVzZXIgQWdlbnQiLCB0aGlzLCBTTE9UKHNob3dVc2VyQWdlbnRE aWFsb2coKSkpOworICAgIFFNZW51KiB2aWV3TWVudSA9IG1lbnVCYXIoKS0+YWRkTWVudSgiJlZp ZXciKTsKKyAgICB2aWV3TWVudS0+YWRkQWN0aW9uKHBhZ2UoKS0+YWN0aW9uKFFXS1BhZ2U6OlN0 b3ApKTsKKyAgICB2aWV3TWVudS0+YWRkQWN0aW9uKHBhZ2UoKS0+YWN0aW9uKFFXS1BhZ2U6OlJl bG9hZCkpOworICAgIHZpZXdNZW51LT5hZGRTZXBhcmF0b3IoKTsKKyAgICBRQWN0aW9uKiB6b29t SW4gPSB2aWV3TWVudS0+YWRkQWN0aW9uKCJab29tICZJbiIsIHRoaXMsIFNMT1Qoem9vbUluKCkp KTsKKyAgICBRQWN0aW9uKiB6b29tT3V0ID0gdmlld01lbnUtPmFkZEFjdGlvbigiWm9vbSAmT3V0 IiwgdGhpcywgU0xPVCh6b29tT3V0KCkpKTsKKyAgICBRQWN0aW9uKiByZXNldFpvb20gPSB2aWV3 TWVudS0+YWRkQWN0aW9uKCJSZXNldCBab29tIiwgdGhpcywgU0xPVChyZXNldFpvb20oKSkpOwog Ci0gICAgbV9icm93c2VyID0gbmV3IEJyb3dzZXJWaWV3KGJhY2tpbmdTdG9yZVR5cGVGb3JOZXdX aW5kb3csIGNvbnRleHQpOwotICAgIGNvbm5lY3QobV9icm93c2VyLT52aWV3KCksIFNJR05BTChs b2FkUHJvZ3Jlc3MoaW50KSksIFNMT1QobG9hZFByb2dyZXNzKGludCkpKTsKLSAgICBjb25uZWN0 KG1fYnJvd3Nlci0+dmlldygpLCBTSUdOQUwodGl0bGVDaGFuZ2VkKGNvbnN0IFFTdHJpbmcmKSks IFNMT1QodGl0bGVDaGFuZ2VkKGNvbnN0IFFTdHJpbmcmKSkpOwotICAgIGNvbm5lY3QobV9icm93 c2VyLT52aWV3KCksIFNJR05BTCh1cmxDaGFuZ2VkKGNvbnN0IFFVcmwmKSksIFNMT1QodXJsQ2hh bmdlZChjb25zdCBRVXJsJikpKTsKKyAgICB6b29tSW4tPnNldFNob3J0Y3V0KFFLZXlTZXF1ZW5j ZShRdDo6Q1RSTCB8IFF0OjpLZXlfUGx1cykpOworICAgIHpvb21PdXQtPnNldFNob3J0Y3V0KFFL ZXlTZXF1ZW5jZShRdDo6Q1RSTCB8IFF0OjpLZXlfTWludXMpKTsKKyAgICByZXNldFpvb20tPnNl dFNob3J0Y3V0KFFLZXlTZXF1ZW5jZShRdDo6Q1RSTCB8IFF0OjpLZXlfMCkpOwogCi0gICAgdGhp cy0+c2V0Q2VudHJhbFdpZGdldChtX2Jyb3dzZXIpOwotICAgIG1fYnJvd3Nlci0+c2V0Rm9jdXMo UXQ6Ok90aGVyRm9jdXNSZWFzb24pOworICAgIFFNZW51KiB0b29sc01lbnUgPSBtZW51QmFyKCkt PmFkZE1lbnUoIiZEZXZlbG9wIik7CisgICAgdG9vbHNNZW51LT5hZGRBY3Rpb24oIkNoYW5nZSBV c2VyIEFnZW50IiwgdGhpcywgU0xPVChzaG93VXNlckFnZW50RGlhbG9nKCkpKTsKIAogICAgIG1f YWRkcmVzc0JhciA9IG5ldyBRTGluZUVkaXQoKTsKICAgICBjb25uZWN0KG1fYWRkcmVzc0Jhciwg U0lHTkFMKHJldHVyblByZXNzZWQoKSksIFNMT1QoY2hhbmdlTG9jYXRpb24oKSkpOwpAQCAtNzIs NiArODcsMTMgQEAgQnJvd3NlcldpbmRvdzo6QnJvd3NlcldpbmRvdyhRV0tDb250ZXh0KiBjb250 ZXh0KQogCiAgICAgcGFnZSgpLT5zZXRDcmVhdGVOZXdQYWdlRnVuY3Rpb24obmV3UGFnZUZ1bmN0 aW9uKTsKIAorICAgIC8vIHRoZSB6b29tIHZhbHVlcyBhcmUgY2hvc2VuIHRvIGJlIGxpa2UgaW4g TW96aWxsYSBGaXJlZm94IDMKKyAgICBpZiAoIW1fem9vbUxldmVscy5jb3VudCgpKSB7CisgICAg ICAgIG1fem9vbUxldmVscyA8PCAzMCA8PCA1MCA8PCA2NyA8PCA4MCA8PCA5MDsKKyAgICAgICAg bV96b29tTGV2ZWxzIDw8IDEwMDsKKyAgICAgICAgbV96b29tTGV2ZWxzIDw8IDExMCA8PCAxMjAg PDwgMTMzIDw8IDE1MCA8PCAxNzAgPDwgMjAwIDw8IDI0MCA8PCAzMDA7CisgICAgfQorCiAgICAg cmVzaXplKDk2MCwgNjQwKTsKICAgICBzaG93KCk7CiB9CkBAIC0xNTMsMjMgKzE3NSwzMCBAQCB2 b2lkIEJyb3dzZXJXaW5kb3c6Om9wZW5GaWxlKCkKICNlbmRpZgogfQogCi12b2lkIEJyb3dzZXJX aW5kb3c6OnVwZGF0ZVVzZXJBZ2VudExpc3QoKQordm9pZCBCcm93c2VyV2luZG93Ojp6b29tSW4o KQogewotICAgIFFGaWxlIGZpbGUoIjovdXNlcmFnZW50bGlzdC50eHQiKTsKKyAgICBpbnQgaSA9 IG1fem9vbUxldmVscy5pbmRleE9mKG1fY3VycmVudFpvb20pOworICAgIFFfQVNTRVJUKGkgPj0g MCk7CisgICAgaWYgKGkgPCBtX3pvb21MZXZlbHMuY291bnQoKSAtIDEpCisgICAgICAgIG1fY3Vy cmVudFpvb20gPSBtX3pvb21MZXZlbHNbaSArIDFdOwogCi0gICAgaWYgKGZpbGUub3BlbihRSU9E ZXZpY2U6OlJlYWRPbmx5KSkgewotICAgICAgICB3aGlsZSAoIWZpbGUuYXRFbmQoKSkgewotICAg ICAgICAgICAgUVN0cmluZyBhZ2VudCA9IGZpbGUucmVhZExpbmUoKS50cmltbWVkKCk7Ci0gICAg ICAgICAgICBpZiAoIW1fdXNlckFnZW50TGlzdC5jb250YWlucyhhZ2VudCkpCi0gICAgICAgICAg ICAgICAgbV91c2VyQWdlbnRMaXN0IDw8IGFnZW50OwotICAgICAgICB9Ci0gICAgICAgIGZpbGUu Y2xvc2UoKTsKLSAgICB9CisgICAgYXBwbHlab29tKCk7Cit9CiAKLSAgICBRX0FTU0VSVCghbV91 c2VyQWdlbnRMaXN0LmlzRW1wdHkoKSk7Ci0gICAgUVdLUGFnZSogd2tQYWdlID0gcGFnZSgpOwot ICAgIGlmICghKHdrUGFnZS0+Y3VzdG9tVXNlckFnZW50KCkuaXNFbXB0eSgpIHx8IG1fdXNlckFn ZW50TGlzdC5jb250YWlucyh3a1BhZ2UtPmN1c3RvbVVzZXJBZ2VudCgpKSkpCi0gICAgICAgIG1f dXNlckFnZW50TGlzdCA8PCB3a1BhZ2UtPmN1c3RvbVVzZXJBZ2VudCgpOwordm9pZCBCcm93c2Vy V2luZG93Ojp6b29tT3V0KCkKK3sKKyAgICBpbnQgaSA9IG1fem9vbUxldmVscy5pbmRleE9mKG1f Y3VycmVudFpvb20pOworICAgIFFfQVNTRVJUKGkgPj0gMCk7CisgICAgaWYgKGkgPiAwKQorICAg ICAgICBtX2N1cnJlbnRab29tID0gbV96b29tTGV2ZWxzW2kgLSAxXTsKKworICAgIGFwcGx5Wm9v bSgpOworfQorCit2b2lkIEJyb3dzZXJXaW5kb3c6OnJlc2V0Wm9vbSgpCit7CisgICAgbV9jdXJy ZW50Wm9vbSA9IDEwMDsKKyAgICBhcHBseVpvb20oKTsKIH0KIAogdm9pZCBCcm93c2VyV2luZG93 OjpzaG93VXNlckFnZW50RGlhbG9nKCkKQEAgLTIwMSw2ICsyMzAsMzAgQEAgdm9pZCBCcm93c2Vy V2luZG93OjpzaG93VXNlckFnZW50RGlhbG9nKCkKICAgICAgICAgcGFnZSgpLT5zZXRDdXN0b21V c2VyQWdlbnQoY29tYm8tPmN1cnJlbnRUZXh0KCkpOwogfQogCit2b2lkIEJyb3dzZXJXaW5kb3c6 OnVwZGF0ZVVzZXJBZ2VudExpc3QoKQoreworICAgIFFGaWxlIGZpbGUoIjovdXNlcmFnZW50bGlz dC50eHQiKTsKKworICAgIGlmIChmaWxlLm9wZW4oUUlPRGV2aWNlOjpSZWFkT25seSkpIHsKKyAg ICAgICAgd2hpbGUgKCFmaWxlLmF0RW5kKCkpIHsKKyAgICAgICAgICAgIFFTdHJpbmcgYWdlbnQg PSBmaWxlLnJlYWRMaW5lKCkudHJpbW1lZCgpOworICAgICAgICAgICAgaWYgKCFtX3VzZXJBZ2Vu dExpc3QuY29udGFpbnMoYWdlbnQpKQorICAgICAgICAgICAgICAgIG1fdXNlckFnZW50TGlzdCA8 PCBhZ2VudDsKKyAgICAgICAgfQorICAgICAgICBmaWxlLmNsb3NlKCk7CisgICAgfQorCisgICAg UV9BU1NFUlQoIW1fdXNlckFnZW50TGlzdC5pc0VtcHR5KCkpOworICAgIFFXS1BhZ2UqIHdrUGFn ZSA9IHBhZ2UoKTsKKyAgICBpZiAoISh3a1BhZ2UtPmN1c3RvbVVzZXJBZ2VudCgpLmlzRW1wdHko KSB8fCBtX3VzZXJBZ2VudExpc3QuY29udGFpbnMod2tQYWdlLT5jdXN0b21Vc2VyQWdlbnQoKSkp KQorICAgICAgICBtX3VzZXJBZ2VudExpc3QgPDwgd2tQYWdlLT5jdXN0b21Vc2VyQWdlbnQoKTsK K30KKwordm9pZCBCcm93c2VyV2luZG93OjphcHBseVpvb20oKQoreworICAgIHBhZ2UoKS0+c2V0 UGFnZVpvb21GYWN0b3IocXJlYWwobV9jdXJyZW50Wm9vbSkgLyAxMDAuMCk7Cit9CisKIEJyb3dz ZXJXaW5kb3c6On5Ccm93c2VyV2luZG93KCkKIHsKICAgICBkZWxldGUgbV9hZGRyZXNzQmFyOwpk aWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5oIGIvVG9vbHMv TWluaUJyb3dzZXIvcXQvQnJvd3NlcldpbmRvdy5oCmluZGV4IDJhMDRhYTguLjg2MGViMTcgMTAw NjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL3F0L0Jyb3dzZXJXaW5kb3cuaAorKysgYi9Ub29s cy9NaW5pQnJvd3Nlci9xdC9Ccm93c2VyV2luZG93LmgKQEAgLTU2LDExICs1NiwyMSBAQCBwcm90 ZWN0ZWQgc2xvdHM6CiAgICAgdm9pZCB0aXRsZUNoYW5nZWQoY29uc3QgUVN0cmluZyYpOwogICAg IHZvaWQgdXJsQ2hhbmdlZChjb25zdCBRVXJsJik7CiAgICAgdm9pZCBvcGVuRmlsZSgpOworCisg ICAgdm9pZCB6b29tSW4oKTsKKyAgICB2b2lkIHpvb21PdXQoKTsKKyAgICB2b2lkIHJlc2V0Wm9v bSgpOworCiAgICAgdm9pZCBzaG93VXNlckFnZW50RGlhbG9nKCk7CiAKIHByaXZhdGU6CiAgICAg dm9pZCB1cGRhdGVVc2VyQWdlbnRMaXN0KCk7CiAKKyAgICB2b2lkIGFwcGx5Wm9vbSgpOworCisg ICAgc3RhdGljIFFWZWN0b3I8aW50PiBtX3pvb21MZXZlbHM7CisgICAgaW50IG1fY3VycmVudFpv b207CisKICAgICBCcm93c2VyVmlldyogbV9icm93c2VyOwogICAgIFFMaW5lRWRpdCogbV9hZGRy ZXNzQmFyOwogICAgIFFTdHJpbmdMaXN0IG1fdXNlckFnZW50TGlzdDsK