48709 2010-10-30 00:54:40 -0700 [GTK] Use new width for height APIs in GTK+ 3.x 2010-10-30 08:17:39 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 xan.lopez webkit-unassigned mrobinson xan.lopez oldest_to_newest 302268 0 xan.lopez 2010-10-30 00:54:40 -0700 size-request is deprecated in GTK+ 3.x, so stop using it. 302269 1 72431 xan.lopez 2010-10-30 00:57:15 -0700 Created attachment 72431 sizerequest.diff 302310 2 72431 mrobinson 2010-10-30 08:08:45 -0700 Comment on attachment 72431 sizerequest.diff At some point it may make sense to begin separating out the GTK+ 3.0 and GTK+ 2.0 code. 302312 3 72431 xan.lopez 2010-10-30 08:17:25 -0700 Comment on attachment 72431 sizerequest.diff Landed as r70983. 302313 4 xan.lopez 2010-10-30 08:17:39 -0700 Closing. 72431 2010-10-30 00:57:15 -0700 2010-10-30 08:17:25 -0700 sizerequest.diff sizerequest.diff text/plain 4585 xan.lopez RnJvbSA0Zjg2OWMxM2M3Njc2NGE1OTZlYzVhMGJmY2I4NDVmY2M4YzVkODkzIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBYYW4gTG9wZXogPHhsb3BlekBpZ2FsaWEuY29tPgpEYXRlOiBT YXQsIDMwIE9jdCAyMDEwIDE2OjU2OjQxICswOTAwClN1YmplY3Q6IFtQQVRDSF0gMjAxMC0xMC0z MCAgWGFuIExvcGV6ICA8eGxvcGV6QGlnYWxpYS5jb20+CgogICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKICAgICAgICBbR1RLXSBVc2UgbmV3IHdpZHRoIGZvciBoZWlnaHQgQVBJ cyBpbiBHVEsrIDMueAogICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD00ODcwOQoKICAgICAgICBVc2UgdGhlIG5ldyB3aWR0aCBmb3IgaGVpZ2h0IEFQSXMgaW4g R1RLKyAzLngsIHNpbmNlIHNpemUtcmVxdWVzdAogICAgICAgIGlzIGRlcHJlY2F0ZWQuCgogICAg ICAgIEZvciBub3cgd2UganVzdCByZXR1cm4gdGhlIHNhbWUgdmFsdWUgZm9yIHByZWZlcnJlZCBh bmQgbWluaW11bQogICAgICAgIHdpZHRoL2hlaWdodCwgd2hpY2ggc2hvdWxkIG1hdGNoIHRoZSAy LnggYmVoYXZpb3IuIFByb2JhYmx5IHdlCiAgICAgICAgY291bGQgZG8gc29tZXRoaW5nIHNtYXJ0 ZXIgZm9yIHRoZSBtaW5pbXVtIHZhbHVlcy4KCiAgICAgICAgKiB3ZWJraXQvd2Via2l0d2Vidmll dy5jcHA6CiAgICAgICAgKHdlYmtpdF93ZWJfdmlld19nZXRfcHJlZmVycmVkX3dpZHRoKTogcmV0 dXJuIG91ciBwcmVmZXJyZWQgd2lkdGguCiAgICAgICAgKHdlYmtpdF93ZWJfdmlld19nZXRfcHJl ZmVycmVkX2hlaWdodCk6IHJldHVybiBvdXIgcHJlZmVycmVkIGhlaWdodC4KICAgICAgICAod2Vi a2l0X3dlYl92aWV3X2NsYXNzX2luaXQpOiBob29rIHRoZSBuZXcgZGVmYXVsdCBoYW5kbGVycy4K LS0tCiBXZWJLaXQvZ3RrL0NoYW5nZUxvZyAgICAgICAgICAgICAgICB8ICAgMTkgKysrKysrKysr KysrKysrKysrKwogV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAgfCAgIDM1ICsr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrCiAyIGZpbGVzIGNoYW5nZWQsIDU0IGlu c2VydGlvbnMoKyksIDAgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvV2ViS2l0L2d0ay9DaGFu Z2VMb2cgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCBlNzk4M2NhLi4wNjQ1MDhlIDEwMDY0 NAotLS0gYS9XZWJLaXQvZ3RrL0NoYW5nZUxvZworKysgYi9XZWJLaXQvZ3RrL0NoYW5nZUxvZwpA QCAtMSwzICsxLDIyIEBACisyMDEwLTEwLTMwICBYYW4gTG9wZXogIDx4bG9wZXpAaWdhbGlhLmNv bT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbR1RL XSBVc2UgbmV3IHdpZHRoIGZvciBoZWlnaHQgQVBJcyBpbiBHVEsrIDMueAorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDg3MDkKKworICAgICAgICBVc2Ug dGhlIG5ldyB3aWR0aCBmb3IgaGVpZ2h0IEFQSXMgaW4gR1RLKyAzLngsIHNpbmNlIHNpemUtcmVx dWVzdAorICAgICAgICBpcyBkZXByZWNhdGVkLgorCisgICAgICAgIEZvciBub3cgd2UganVzdCBy ZXR1cm4gdGhlIHNhbWUgdmFsdWUgZm9yIHByZWZlcnJlZCBhbmQgbWluaW11bQorICAgICAgICB3 aWR0aC9oZWlnaHQsIHdoaWNoIHNob3VsZCBtYXRjaCB0aGUgMi54IGJlaGF2aW9yLiBQcm9iYWJs eSB3ZQorICAgICAgICBjb3VsZCBkbyBzb21ldGhpbmcgc21hcnRlciBmb3IgdGhlIG1pbmltdW0g dmFsdWVzLgorCisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwOgorICAgICAgICAo d2Via2l0X3dlYl92aWV3X2dldF9wcmVmZXJyZWRfd2lkdGgpOiByZXR1cm4gb3VyIHByZWZlcnJl ZCB3aWR0aC4KKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19nZXRfcHJlZmVycmVkX2hlaWdodCk6 IHJldHVybiBvdXIgcHJlZmVycmVkIGhlaWdodC4KKyAgICAgICAgKHdlYmtpdF93ZWJfdmlld19j bGFzc19pbml0KTogaG9vayB0aGUgbmV3IGRlZmF1bHQgaGFuZGxlcnMuCisKIDIwMTAtMTAtMjkg IE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAgICAgIEJ1aWxk IGZpeCBmb3IgR1RLKyBhZnRlciBCYWNrRm9yd2FyZExpc3RJbXBsIGludHJvZHVjdGlvbi4KZGlm ZiAtLWdpdCBhL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnZpZXcuY3BwIGIvV2ViS2l0L2d0 ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKaW5kZXggYTI5NWZjZS4uYmJhOTY5YSAxMDA2NDQK LS0tIGEvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKKysrIGIvV2ViS2l0L2d0 ay93ZWJraXQvd2Via2l0d2Vidmlldy5jcHAKQEAgLTg2OCw2ICs4NjgsNyBAQCBzdGF0aWMgZ2Jv b2xlYW4gd2Via2l0X3dlYl92aWV3X3Njcm9sbF9ldmVudChHdGtXaWRnZXQqIHdpZGdldCwgR2Rr RXZlbnRTY3JvbGwqCiAgICAgcmV0dXJuIGZyYW1lLT5ldmVudEhhbmRsZXIoKS0+aGFuZGxlV2hl ZWxFdmVudCh3aGVlbEV2ZW50KTsKIH0KIAorI2lmZGVmIEdUS19BUElfVkVSU0lPTl8yCiBzdGF0 aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfc2l6ZV9yZXF1ZXN0KEd0a1dpZGdldCogd2lkZ2V0LCBH dGtSZXF1aXNpdGlvbiogcmVxdWlzaXRpb24pCiB7CiAgICAgV2ViS2l0V2ViVmlldyogd2ViX3Zp ZXcgPSBXRUJLSVRfV0VCX1ZJRVcod2lkZ2V0KTsKQEAgLTg4Miw2ICs4ODMsMzUgQEAgc3RhdGlj IHZvaWQgd2Via2l0X3dlYl92aWV3X3NpemVfcmVxdWVzdChHdGtXaWRnZXQqIHdpZGdldCwgR3Rr UmVxdWlzaXRpb24qIHJlcXUKICAgICByZXF1aXNpdGlvbi0+d2lkdGggPSB2aWV3LT5jb250ZW50 c1dpZHRoKCk7CiAgICAgcmVxdWlzaXRpb24tPmhlaWdodCA9IHZpZXctPmNvbnRlbnRzSGVpZ2h0 KCk7CiB9CisjZWxzZQorc3RhdGljIHZvaWQgd2Via2l0X3dlYl92aWV3X2dldF9wcmVmZXJyZWRf d2lkdGgoR3RrV2lkZ2V0KiB3aWRnZXQsIGdpbnQqIG1pbmltdW0sIGdpbnQqIG5hdHVyYWwpCit7 CisgICAgV2ViS2l0V2ViVmlldyogd2ViX3ZpZXcgPSBXRUJLSVRfV0VCX1ZJRVcod2lkZ2V0KTsK KyAgICBGcmFtZSogY29yZUZyYW1lID0gY29yZSh3ZWJraXRfd2ViX3ZpZXdfZ2V0X21haW5fZnJh bWUod2ViX3ZpZXcpKTsKKyAgICBpZiAoIWNvcmVGcmFtZSkKKyAgICAgICAgcmV0dXJuOworCisg ICAgRnJhbWVWaWV3KiB2aWV3ID0gY29yZUZyYW1lLT52aWV3KCk7CisgICAgaWYgKCF2aWV3KQor ICAgICAgICByZXR1cm47CisKKyAgICAqbWluaW11bSA9ICpuYXR1cmFsID0gdmlldy0+Y29udGVu dHNXaWR0aCgpOworfQorCitzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3ByZWZlcnJl ZF9oZWlnaHQoR3RrV2lkZ2V0KiB3aWRnZXQsIGdpbnQqIG1pbmltdW0sIGdpbnQqIG5hdHVyYWwp Cit7CisgICAgV2ViS2l0V2ViVmlldyogd2ViX3ZpZXcgPSBXRUJLSVRfV0VCX1ZJRVcod2lkZ2V0 KTsKKyAgICBGcmFtZSogY29yZUZyYW1lID0gY29yZSh3ZWJraXRfd2ViX3ZpZXdfZ2V0X21haW5f ZnJhbWUod2ViX3ZpZXcpKTsKKyAgICBpZiAoIWNvcmVGcmFtZSkKKyAgICAgICAgcmV0dXJuOwor CisgICAgRnJhbWVWaWV3KiB2aWV3ID0gY29yZUZyYW1lLT52aWV3KCk7CisgICAgaWYgKCF2aWV3 KQorICAgICAgICByZXR1cm47CisKKyAgICAqbWluaW11bSA9ICpuYXR1cmFsID0gdmlldy0+Y29u dGVudHNIZWlnaHQoKTsKK30KKyNlbmRpZgogCiBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdf c2l6ZV9hbGxvY2F0ZShHdGtXaWRnZXQqIHdpZGdldCwgR3RrQWxsb2NhdGlvbiogYWxsb2NhdGlv bikKIHsKQEAgLTI2MDIsNyArMjYzMiwxMiBAQCBzdGF0aWMgdm9pZCB3ZWJraXRfd2ViX3ZpZXdf Y2xhc3NfaW5pdChXZWJLaXRXZWJWaWV3Q2xhc3MqIHdlYlZpZXdDbGFzcykKICAgICB3aWRnZXRD bGFzcy0+bW90aW9uX25vdGlmeV9ldmVudCA9IHdlYmtpdF93ZWJfdmlld19tb3Rpb25fZXZlbnQ7 CiAgICAgd2lkZ2V0Q2xhc3MtPnNjcm9sbF9ldmVudCA9IHdlYmtpdF93ZWJfdmlld19zY3JvbGxf ZXZlbnQ7CiAgICAgd2lkZ2V0Q2xhc3MtPnNpemVfYWxsb2NhdGUgPSB3ZWJraXRfd2ViX3ZpZXdf c2l6ZV9hbGxvY2F0ZTsKKyNpZmRlZiBHVEtfQVBJX1ZFUlNJT05fMgogICAgIHdpZGdldENsYXNz LT5zaXplX3JlcXVlc3QgPSB3ZWJraXRfd2ViX3ZpZXdfc2l6ZV9yZXF1ZXN0OworI2Vsc2UKKyAg ICB3aWRnZXRDbGFzcy0+Z2V0X3ByZWZlcnJlZF93aWR0aCA9IHdlYmtpdF93ZWJfdmlld19nZXRf cHJlZmVycmVkX3dpZHRoOworICAgIHdpZGdldENsYXNzLT5nZXRfcHJlZmVycmVkX2hlaWdodCA9 IHdlYmtpdF93ZWJfdmlld19nZXRfcHJlZmVycmVkX2hlaWdodDsKKyNlbmRpZgogICAgIHdpZGdl dENsYXNzLT5wb3B1cF9tZW51ID0gd2Via2l0X3dlYl92aWV3X3BvcHVwX21lbnVfaGFuZGxlcjsK ICAgICB3aWRnZXRDbGFzcy0+Z3JhYl9mb2N1cyA9IHdlYmtpdF93ZWJfdmlld19ncmFiX2ZvY3Vz OwogICAgIHdpZGdldENsYXNzLT5mb2N1c19pbl9ldmVudCA9IHdlYmtpdF93ZWJfdmlld19mb2N1 c19pbl9ldmVudDsKLS0gCjEuNy4yLjMKCg==