20433 2008-08-18 14:28:26 -0700 Kill getPixmap and use nativeImageForCurrentFrame 2008-09-16 21:38:48 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 1 zecke webkit-unassigned alp oldest_to_newest 88758 0 zecke 2008-08-18 14:28:26 -0700 Replace Qt specific code with the generic nativeImageForCurrentFrame. There is simply no need for a custom Qt method. 88759 1 22861 zecke 2008-08-18 14:29:42 -0700 Created attachment 22861 Use the common method 89090 2 22861 eric 2008-08-22 01:46:05 -0700 Comment on attachment 22861 Use the common method Wooohoo! I plan to add a nativeImageForFirstFrame() method eventually, which would closer match the behavior of what you're replacing. However I think the currentFrame should be fine in these uses. 91465 3 alp 2008-09-16 21:38:48 -0700 Prepared this patch for landing and found it was already applied :-( Closing bug. 22861 2008-08-18 14:29:42 -0700 2008-08-22 01:46:05 -0700 Use the common method 0001-janitor-qt-Start-replacing-port-specific-getters-w.patch text/plain 7226 zecke RnJvbSBkOThhYmM1NzRmNTMzMjc1ZDNkNWI3ZWQ2NjdmMTYwZDYzYWE3NzI1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciA8emVja2VAc2Vs ZmlzaC5vcmc+CkRhdGU6IFRodSwgMjYgSnVuIDIwMDggMTg6MjA6NDIgKzAyMDAKU3ViamVjdDog W1BBVENIXSBbamFuaXRvci9xdF0gU3RhcnQgcmVwbGFjaW5nIHBvcnQgc3BlY2lmaWMgZ2V0dGVy cyB3aXRoIHRoZSBnZW5lcmljIG5hdGl2ZSBnZXR0ZXIKICAgICBUbyBnZXQgdGhlIG5hdGl2ZSBw cmVzZW50YXRpb24gb2YgYW4gaW1hZ2Ugd2UgY3VycmVudGx5IGhhdmUgcGxhdGZvcm0KICAgICBz cGVjaWZpYyAjaWZkZWYncyBhbmQgYSBnZW5lcmljIGdldHRlciB1c2luZyBOYXRpdmVJbWFnZVB0 ci4gVGhpcyBwYXRjaAogICAgIGV4dGVuZHMgdGhpcyB0byB0aGUgSW1hZ2VCdWZmZXIgYW5kIHVw ZGF0ZXMgdGhlIFF0IHBsYXRmb3JtIHRvIGdldCByaWQKICAgICBvZiB0aGUgc3BlY2lhbCAjaWZk ZWZzLgoKLS0tCiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0JpdG1hcEltYWdlLmggICAgICAg fCAgICA0IC0tLS0KIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvSW1hZ2UuaCAgICAgICAgICAg ICB8ICAgIDQgLS0tLQogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9JbWFnZVF0LmNwcCAg ICAgIHwgICAgNSAtLS0tLQogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9TdGlsbEltYWdl UXQuY3BwIHwgICAgNCArKy0tCiBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L1N0aWxsSW1h Z2VRdC5oICAgfCAgICAyICstCiBXZWJDb3JlL3BsYXRmb3JtL3F0L0NsaXBib2FyZFF0LmNwcCAg ICAgICAgICAgfCAgICA0ICsrLS0KIFdlYkNvcmUvcGxhdGZvcm0vcXQvQ3Vyc29yUXQuY3BwICAg ICAgICAgICAgICB8ICAgIDIgKy0KIFdlYkNvcmUvcGxhdGZvcm0vcXQvUGFzdGVib2FyZFF0LmNw cCAgICAgICAgICB8ICAgIDIgKy0KIFdlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCAgICAgICAg ICAgICAgICAgICB8ICAgIDIgKy0KIFdlYktpdC9xdC9BcGkvcXdlYmhpc3RvcnkuY3BwICAgICAg ICAgICAgICAgICB8ICAgIDIgKy0KIFdlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcCAgICAg ICAgICAgICAgICB8ICAgIDIgKy0KIDExIGZpbGVzIGNoYW5nZWQsIDEwIGluc2VydGlvbnMoKyks IDIzIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Qml0bWFwSW1hZ2UuaCBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvQml0bWFwSW1hZ2UuaApp bmRleCA5YzU3MTI4Li44NzgwN2UzIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0JpdG1hcEltYWdlLmgKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9CaXRtYXBJ bWFnZS5oCkBAIC0xMjYsMTAgKzEyNiw2IEBAIHB1YmxpYzoKICAgICB2aXJ0dWFsIENHSW1hZ2VS ZWYgZ2V0Q0dJbWFnZVJlZigpOwogI2VuZGlmCiAKLSNpZiBQTEFURk9STShRVCkKLSAgICB2aXJ0 dWFsIFFQaXhtYXAqIGdldFBpeG1hcCgpIGNvbnN0OwotI2VuZGlmCi0gICAgCiAjaWYgUExBVEZP Uk0oV0lOKQogICAgIHZpcnR1YWwgYm9vbCBnZXRIQklUTUFQKEhCSVRNQVApOwogICAgIHZpcnR1 YWwgYm9vbCBnZXRIQklUTUFQT2ZTaXplKEhCSVRNQVAsIExQU0laRSk7CmRpZmYgLS1naXQgYS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL0ltYWdlLmggYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL0ltYWdlLmgKaW5kZXggZDY1ZTUyNi4uZmM3Yjk4NCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9JbWFnZS5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv SW1hZ2UuaApAQCAtMTI2LDEwICsxMjYsNiBAQCBwdWJsaWM6CiAgICAgdmlydHVhbCBDR0ltYWdl UmVmIGdldENHSW1hZ2VSZWYoKSB7IHJldHVybiAwOyB9CiAjZW5kaWYKIAotI2lmIFBMQVRGT1JN KFFUKQotICAgIHZpcnR1YWwgUVBpeG1hcCogZ2V0UGl4bWFwKCkgY29uc3QgeyByZXR1cm4gMDsg fQotI2VuZGlmCi0KICNpZiBQTEFURk9STShXSU4pCiAgICAgdmlydHVhbCBib29sIGdldEhCSVRN QVAoSEJJVE1BUCkgeyByZXR1cm4gZmFsc2U7IH0KICAgICB2aXJ0dWFsIGJvb2wgZ2V0SEJJVE1B UE9mU2l6ZShIQklUTUFQLCBMUFNJWkUpIHsgcmV0dXJuIGZhbHNlOyB9CmRpZmYgLS1naXQgYS9X ZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdlUXQuY3BwIGIvV2ViQ29yZS9wbGF0Zm9y bS9ncmFwaGljcy9xdC9JbWFnZVF0LmNwcAppbmRleCAyN2FiMGFkLi41ZGE5N2ViIDEwMDY0NAot LS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0ltYWdlUXQuY3BwCisrKyBiL1dlYkNv cmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvSW1hZ2VRdC5jcHAKQEAgLTE2NCwxMSArMTY0LDYgQEAg dm9pZCBCaXRtYXBJbWFnZTo6Y2hlY2tGb3JTb2xpZENvbG9yKCkKICAgICBtX2lzU29saWRDb2xv ciA9IGZhbHNlOwogfQogCi1RUGl4bWFwKiBCaXRtYXBJbWFnZTo6Z2V0UGl4bWFwKCkgY29uc3QK LXsKLSAgICByZXR1cm4gY29uc3RfY2FzdDxCaXRtYXBJbWFnZSo+KHRoaXMpLT5mcmFtZUF0SW5k ZXgoMCk7Ci19Ci0KIH0KIAogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNz L3F0L1N0aWxsSW1hZ2VRdC5jcHAgYi9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L1N0aWxs SW1hZ2VRdC5jcHAKaW5kZXggMmY2NjdjOS4uOTViM2JjOCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9xdC9TdGlsbEltYWdlUXQuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvcXQvU3RpbGxJbWFnZVF0LmNwcApAQCAtNDQsOSArNDQsOSBAQCBJbnRTaXpl IFN0aWxsSW1hZ2U6OnNpemUoKSBjb25zdAogICAgIHJldHVybiBJbnRTaXplKG1fcGl4bWFwLndp ZHRoKCksIG1fcGl4bWFwLmhlaWdodCgpKTsKIH0KIAotUVBpeG1hcCogU3RpbGxJbWFnZTo6Z2V0 UGl4bWFwKCkgY29uc3QKK05hdGl2ZUltYWdlUHRyIFN0aWxsSW1hZ2U6Om5hdGl2ZUltYWdlRm9y Q3VycmVudEZyYW1lKCkKIHsKLSAgICByZXR1cm4gY29uc3RfY2FzdDxRUGl4bWFwKj4oJm1fcGl4 bWFwKTsKKyAgICByZXR1cm4gY29uc3RfY2FzdDxOYXRpdmVJbWFnZVB0cj4oJm1fcGl4bWFwKTsK IH0KIAogdm9pZCBTdGlsbEltYWdlOjpkcmF3KEdyYXBoaWNzQ29udGV4dCogY3R4dCwgY29uc3Qg RmxvYXRSZWN0JiBkc3QsCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0 L1N0aWxsSW1hZ2VRdC5oIGIvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9xdC9TdGlsbEltYWdl UXQuaAppbmRleCAyZjY5NTg4Li5kOWM0Y2I0IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3F0L1N0aWxsSW1hZ2VRdC5oCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvcXQvU3RpbGxJbWFnZVF0LmgKQEAgLTQ1LDcgKzQ1LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUg ewogICAgICAgICB2aXJ0dWFsIHVuc2lnbmVkIGRlY29kZWRTaXplKCkgY29uc3QgeyByZXR1cm4g MDsgfQogCiAgICAgICAgIHZpcnR1YWwgSW50U2l6ZSBzaXplKCkgY29uc3Q7Ci0gICAgICAgIHZp cnR1YWwgUVBpeG1hcCogZ2V0UGl4bWFwKCkgY29uc3Q7CisgICAgICAgIHZpcnR1YWwgTmF0aXZl SW1hZ2VQdHIgbmF0aXZlSW1hZ2VGb3JDdXJyZW50RnJhbWUoKTsKICAgICAgICAgdmlydHVhbCB2 b2lkIGRyYXcoR3JhcGhpY3NDb250ZXh0KiwgY29uc3QgRmxvYXRSZWN0JiBkc3RSZWN0LCBjb25z dCBGbG9hdFJlY3QmIHNyY1JlY3QsIENvbXBvc2l0ZU9wZXJhdG9yKTsKIAogICAgIHByaXZhdGU6 CmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL3F0L0NsaXBib2FyZFF0LmNwcCBiL1dlYkNv cmUvcGxhdGZvcm0vcXQvQ2xpcGJvYXJkUXQuY3BwCmluZGV4IDQzOGNjYmMuLjc4MTYzYWMgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vcXQvQ2xpcGJvYXJkUXQuY3BwCisrKyBiL1dlYkNv cmUvcGxhdGZvcm0vcXQvQ2xpcGJvYXJkUXQuY3BwCkBAIC0yMDgsNyArMjA4LDcgQEAgRHJhZ0lt YWdlUmVmIENsaXBib2FyZFF0OjpjcmVhdGVEcmFnSW1hZ2UoSW50UG9pbnQmIGRyYWdMb2MpIGNv bnN0CiAgICAgaWYgKCFtX2RyYWdJbWFnZSkKICAgICAgICAgcmV0dXJuIDA7CiAgICAgZHJhZ0xv YyA9IG1fZHJhZ0xvYzsKLSAgICByZXR1cm4gbV9kcmFnSW1hZ2UtPmltYWdlKCktPmdldFBpeG1h cCgpOworICAgIHJldHVybiBtX2RyYWdJbWFnZS0+aW1hZ2UoKS0+bmF0aXZlSW1hZ2VGb3JDdXJy ZW50RnJhbWUoKTsKIH0KIAogCkBAIC0yNDAsNyArMjQwLDcgQEAgdm9pZCBDbGlwYm9hcmRRdDo6 ZGVjbGFyZUFuZFdyaXRlRHJhZ0ltYWdlKEVsZW1lbnQqIGVsZW1lbnQsIGNvbnN0IEtVUkwmIHVy bCwgY28KICAgICBDYWNoZWRJbWFnZSogY2FjaGVkSW1hZ2UgPSBnZXRDYWNoZWRJbWFnZShlbGVt ZW50KTsKICAgICBpZiAoIWNhY2hlZEltYWdlIHx8ICFjYWNoZWRJbWFnZS0+aW1hZ2UoKSB8fCAh Y2FjaGVkSW1hZ2UtPmlzTG9hZGVkKCkpCiAgICAgICAgIHJldHVybjsKLSAgICBRUGl4bWFwICpw aXhtYXAgPSBjYWNoZWRJbWFnZS0+aW1hZ2UoKS0+Z2V0UGl4bWFwKCk7CisgICAgUVBpeG1hcCAq cGl4bWFwID0gY2FjaGVkSW1hZ2UtPmltYWdlKCktPm5hdGl2ZUltYWdlRm9yQ3VycmVudEZyYW1l KCk7CiAgICAgaWYgKHBpeG1hcCkKICAgICAgICAgbV93cml0YWJsZURhdGEtPnNldEltYWdlRGF0 YShwaXhtYXApOwogCmRpZmYgLS1naXQgYS9XZWJDb3JlL3BsYXRmb3JtL3F0L0N1cnNvclF0LmNw cCBiL1dlYkNvcmUvcGxhdGZvcm0vcXQvQ3Vyc29yUXQuY3BwCmluZGV4IGU3NjdkZTIuLjliMzli YmYgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vcXQvQ3Vyc29yUXQuY3BwCisrKyBiL1dl YkNvcmUvcGxhdGZvcm0vcXQvQ3Vyc29yUXQuY3BwCkBAIC01OSw3ICs1OSw3IEBAIEN1cnNvcjo6 fkN1cnNvcigpCiAKIEN1cnNvcjo6Q3Vyc29yKEltYWdlKiBpbWFnZSwgY29uc3QgSW50UG9pbnQm IGhvdHNwb3QpCiAjaWZuZGVmIFFUX05PX0NVUlNPUgotICAgIDogbV9pbXBsKCooaW1hZ2UtPmdl dFBpeG1hcCgpKSwgaG90c3BvdC54KCksIGhvdHNwb3QueSgpKQorICAgIDogbV9pbXBsKCooaW1h Z2UtPm5hdGl2ZUltYWdlRm9yQ3VycmVudEZyYW1lKCkpLCBob3RzcG90LngoKSwgaG90c3BvdC55 KCkpCiAjZW5kaWYKIHsKIH0KZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vcXQvUGFzdGVi b2FyZFF0LmNwcCBiL1dlYkNvcmUvcGxhdGZvcm0vcXQvUGFzdGVib2FyZFF0LmNwcAppbmRleCAx OGYxMDhlLi5lYzQ0MzQ4IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL3F0L1Bhc3RlYm9h cmRRdC5jcHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9xdC9QYXN0ZWJvYXJkUXQuY3BwCkBAIC0x NDQsNyArMTQ0LDcgQEAgdm9pZCBQYXN0ZWJvYXJkOjp3cml0ZUltYWdlKE5vZGUqIG5vZGUsIGNv bnN0IEtVUkwmLCBjb25zdCBTdHJpbmcmKQogICAgIEltYWdlKiBpbWFnZSA9IGNhY2hlZEltYWdl LT5pbWFnZSgpOwogICAgIEFTU0VSVChpbWFnZSk7CiAKLSAgICBRUGl4bWFwKiBwaXhtYXAgPSBp bWFnZS0+Z2V0UGl4bWFwKCk7CisgICAgUVBpeG1hcCogcGl4bWFwID0gaW1hZ2UtPm5hdGl2ZUlt YWdlRm9yQ3VycmVudEZyYW1lKCk7CiAgICAgQVNTRVJUKHBpeG1hcCk7CiAKICAgICBRQXBwbGlj YXRpb246OmNsaXBib2FyZCgpLT5zZXRQaXhtYXAoKnBpeG1hcCwgUUNsaXBib2FyZDo6Q2xpcGJv YXJkKTsKZGlmZiAtLWdpdCBhL1dlYktpdC9xdC9BcGkvcXdlYmZyYW1lLmNwcCBiL1dlYktpdC9x dC9BcGkvcXdlYmZyYW1lLmNwcAppbmRleCBmYmUwZGI5Li45MDY3YzdjIDEwMDY0NAotLS0gYS9X ZWJLaXQvcXQvQXBpL3F3ZWJmcmFtZS5jcHAKKysrIGIvV2ViS2l0L3F0L0FwaS9xd2ViZnJhbWUu Y3BwCkBAIC05ODAsNyArOTgwLDcgQEAgUVdlYkhpdFRlc3RSZXN1bHRQcml2YXRlOjpRV2ViSGl0 VGVzdFJlc3VsdFByaXZhdGUoY29uc3QgV2ViQ29yZTo6SGl0VGVzdFJlc3VsdAogICAgIGlubmVy Tm9uU2hhcmVkTm9kZSA9IGhpdFRlc3QuaW5uZXJOb25TaGFyZWROb2RlKCk7CiAgICAgV2ViQ29y ZTo6SW1hZ2UgKmltZyA9IGhpdFRlc3QuaW1hZ2UoKTsKICAgICBpZiAoaW1nKSB7Ci0gICAgICAg IFFQaXhtYXAgKnBpeCA9IGltZy0+Z2V0UGl4bWFwKCk7CisgICAgICAgIFFQaXhtYXAgKnBpeCA9 IGltZy0+bmF0aXZlSW1hZ2VGb3JDdXJyZW50RnJhbWUoKTsKICAgICAgICAgaWYgKHBpeCkKICAg ICAgICAgICAgIHBpeG1hcCA9ICpwaXg7CiAgICAgfQpkaWZmIC0tZ2l0IGEvV2ViS2l0L3F0L0Fw aS9xd2ViaGlzdG9yeS5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJoaXN0b3J5LmNwcAppbmRleCBj ODA5MjJiLi4yZWJiYmE2IDEwMDY0NAotLS0gYS9XZWJLaXQvcXQvQXBpL3F3ZWJoaXN0b3J5LmNw cAorKysgYi9XZWJLaXQvcXQvQXBpL3F3ZWJoaXN0b3J5LmNwcApAQCAtMTI5LDcgKzEyOSw3IEBA IFFEYXRlVGltZSBRV2ViSGlzdG9yeUl0ZW06Omxhc3RWaXNpdGVkKCkgY29uc3QKICovCiBRSWNv biBRV2ViSGlzdG9yeUl0ZW06Omljb24oKSBjb25zdAogewotICAgIHJldHVybiAqZC0+aXRlbS0+ aWNvbigpLT5nZXRQaXhtYXAoKTsKKyAgICByZXR1cm4gKmQtPml0ZW0tPmljb24oKS0+bmF0aXZl SW1hZ2VGb3JDdXJyZW50RnJhbWUoKTsKIH0KIAogLyohCmRpZmYgLS1naXQgYS9XZWJLaXQvcXQv QXBpL3F3ZWJzZXR0aW5ncy5jcHAgYi9XZWJLaXQvcXQvQXBpL3F3ZWJzZXR0aW5ncy5jcHAKaW5k ZXggNTg5NzZjZC4uNzdlZGI0YiAxMDA2NDQKLS0tIGEvV2ViS2l0L3F0L0FwaS9xd2Vic2V0dGlu Z3MuY3BwCisrKyBiL1dlYktpdC9xdC9BcGkvcXdlYnNldHRpbmdzLmNwcApAQCAtNDM4LDcgKzQz OCw3IEBAIFFJY29uIFFXZWJTZXR0aW5nczo6aWNvbkZvclVybChjb25zdCBRVXJsICZ1cmwpCiAg ICAgaWYgKCFpbWFnZSkgewogICAgICAgICByZXR1cm4gUVBpeG1hcCgpOwogICAgIH0KLSAgICBR UGl4bWFwICppY29uID0gaW1hZ2UtPmdldFBpeG1hcCgpOworICAgIFFQaXhtYXAgKmljb24gPSBp bWFnZS0+bmF0aXZlSW1hZ2VGb3JDdXJyZW50RnJhbWUoKTsKICAgICBpZiAoIWljb24pIHsKICAg ICAgICAgcmV0dXJuIFFQaXhtYXAoKTsKICAgICB9Ci0tIAoxLjUuNC4zCgo=