85728 2012-05-06 00:35:05 -0700 [Cairo] Implement ImageBuffer::copyImage for BackingStoreCopy == DontCopyBackingStore 2012-05-07 16:07:02 -0700 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mrobinson mrobinson alex noam oldest_to_newest 617088 0 mrobinson 2012-05-06 00:35:05 -0700 This is useful for supporting faster texture uploads in the TextureMapper. 617089 1 140420 mrobinson 2012-05-06 01:30:20 -0700 Created attachment 140420 Patch 617108 2 140420 noam 2012-05-06 07:57:09 -0700 Comment on attachment 140420 Patch I'm ok with the TextureMapper changes, please have one of the Cairo folks review the other stuff :) 617673 3 140420 alex 2012-05-07 10:15:25 -0700 Comment on attachment 140420 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=140420&action=review LGTM, just a small comment. > Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp:91 > + return BitmapImage::create(cairo_surface_reference(m_data.m_surface)).leakRef(); I don't think the leakRef here is correct because it would returning an Image not an PassRefPtr<Image>, probably removing would be the right option. 618054 4 140420 mrobinson 2012-05-07 16:06:52 -0700 Comment on attachment 140420 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=140420&action=review >> Source/WebCore/platform/graphics/cairo/ImageBufferCairo.cpp:91 >> + return BitmapImage::create(cairo_surface_reference(m_data.m_surface)).leakRef(); > > I don't think the leakRef here is correct because it would returning an Image not an PassRefPtr<Image>, probably removing would be the right option. BitmapImage::create is returning a PassRefPtr already so the leakRef is unnecessary here. I've fixed it and pushed. Thanks for the review! 618055 5 mrobinson 2012-05-07 16:07:02 -0700 Committed r116365: <http://trac.webkit.org/changeset/116365> 140420 2012-05-06 01:30:20 -0700 2012-05-07 16:06:52 -0700 Patch bug-85728-20120506013018.patch text/plain 4580 mrobinson U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2MjM0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjdlMjEyYjhjNjUxMDdh YTI0ZTUxN2IwNGYyNGM5ZDkyODg0YTU1ZC4uNzAwMmFiNmE5ZGJlOGJhM2FjMGViZmY1NGQ5M2Ix MzZiZDU0ZmFjZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDEyLTA1LTA2ICBNYXJ0 aW4gUm9iaW5zb24gIDxtcm9iaW5zb25AaWdhbGlhLmNvbT4KKworICAgICAgICBbQ2Fpcm9dIElt cGxlbWVudCBJbWFnZUJ1ZmZlcjo6Y29weUltYWdlIGZvciBCYWNraW5nU3RvcmVDb3B5ID09IERv bnRDb3B5QmFja2luZ1N0b3JlCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD04NTcyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIE5vIG5ldyB0ZXN0cy4gVGhpcyBzaG91bGQgbm90IGNoYW5nZSBmdW5jdGlvbmFs aXR5LCBvbmx5IGluY3JlYXNlIHBlcmZvcm1hbmNlLgorCisgICAgICAgICogcGxhdGZvcm0vZ3Jh cGhpY3MvY2Fpcm8vSW1hZ2VCdWZmZXJDYWlyby5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbWFn ZUJ1ZmZlcjo6Y29weUltYWdlKTogQWRkIGFuIGltcGxlbWVudGF0aW9uIHRoYXQga25vd3MgaG93 IHRvIGF2b2lkIGNvcHlpbmcgdGhlIGJhY2tpbmcgc3RvcmUuCisgICAgICAgIChXZWJDb3JlOjpJ bWFnZUJ1ZmZlcjo6ZHJhdyk6IFVzZSB0aGUgY29weUltYWdlIGNvbnN0cnVjdG9yIG5vdyB0aGF0 IGl0IGtub3dzIGhvdyB0bworICAgICAgICBhdm9pZCBjb3B5aW5nIHRoZSBiYWNraW5nIHN0b3Jl LgorICAgICAgICAoV2ViQ29yZTo6SW1hZ2VCdWZmZXI6OmRyYXdQYXR0ZXJuKTogRGl0dG8uCisg ICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvdGV4bWFwL1RleHR1cmVNYXBwZXJMYXllci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpUZXh0dXJlTWFwcGVyTGF5ZXI6OnVwZGF0ZUJhY2tpbmdTdG9y ZSk6IFVzZSBEb250Q29weUJhY2tpbmdTdG9yZSBmb3IgQ2Fpcm8KKyAgICAgICAgYXMgd2VsbC4K KwogMjAxMi0wNS0wNSAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3LmJvdEBnbWFpbC5jb20+ CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjExNjIyMS4KZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL0ltYWdlQnVmZmVyQ2Fpcm8u Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vSW1hZ2VCdWZmZXJD YWlyby5jcHAKaW5kZXggYWYxNTdhMjk3NDY5MDNkZmNiNDc2ZjdiZGNjYTQzMjgzZDNhMmU2Yi4u NDUzZWQ5ZjU1NDY0MDQ3OWE2YjM1MjIwZGM4ZmZmNzYwN2ZjNjNhMCAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vSW1hZ2VCdWZmZXJDYWlyby5jcHAK KysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vSW1hZ2VCdWZmZXJD YWlyby5jcHAKQEAgLTg0LDkgKzg0LDExIEBAIEdyYXBoaWNzQ29udGV4dCogSW1hZ2VCdWZmZXI6 OmNvbnRleHQoKSBjb25zdAogCiBQYXNzUmVmUHRyPEltYWdlPiBJbWFnZUJ1ZmZlcjo6Y29weUlt YWdlKEJhY2tpbmdTdG9yZUNvcHkgY29weUJlaGF2aW9yKSBjb25zdAogewotICAgIEFTU0VSVChj b3B5QmVoYXZpb3IgPT0gQ29weUJhY2tpbmdTdG9yZSk7CisgICAgaWYgKGNvcHlCZWhhdmlvciA9 PSBDb3B5QmFja2luZ1N0b3JlKQorICAgICAgICByZXR1cm4gQml0bWFwSW1hZ2U6OmNyZWF0ZShj b3B5Q2Fpcm9JbWFnZVN1cmZhY2UobV9kYXRhLm1fc3VyZmFjZSkubGVha1JlZigpKTsKKwogICAg IC8vIEJpdG1hcEltYWdlIHdpbGwgcmVsZWFzZSB0aGUgcGFzc2VkIGluIHN1cmZhY2Ugb24gZGVz dHJ1Y3Rpb24KLSAgICByZXR1cm4gQml0bWFwSW1hZ2U6OmNyZWF0ZShjb3B5Q2Fpcm9JbWFnZVN1 cmZhY2UobV9kYXRhLm1fc3VyZmFjZSkubGVha1JlZigpKTsKKyAgICByZXR1cm4gQml0bWFwSW1h Z2U6OmNyZWF0ZShjYWlyb19zdXJmYWNlX3JlZmVyZW5jZShtX2RhdGEubV9zdXJmYWNlKSkubGVh a1JlZigpOwogfQogCiB2b2lkIEltYWdlQnVmZmVyOjpjbGlwKEdyYXBoaWNzQ29udGV4dCogY29u dGV4dCwgY29uc3QgRmxvYXRSZWN0JiBtYXNrUmVjdCkgY29uc3QKQEAgLTk3LDE2ICs5OSwxNCBA QCB2b2lkIEltYWdlQnVmZmVyOjpjbGlwKEdyYXBoaWNzQ29udGV4dCogY29udGV4dCwgY29uc3Qg RmxvYXRSZWN0JiBtYXNrUmVjdCkgY29ucwogdm9pZCBJbWFnZUJ1ZmZlcjo6ZHJhdyhHcmFwaGlj c0NvbnRleHQqIGNvbnRleHQsIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBjb25zdCBGbG9h dFJlY3QmIGRlc3RSZWN0LCBjb25zdCBGbG9hdFJlY3QmIHNyY1JlY3QsCiAgICAgICAgICAgICAg ICAgICAgICAgIENvbXBvc2l0ZU9wZXJhdG9yIG9wICwgYm9vbCB1c2VMb3dRdWFsaXR5U2NhbGUp CiB7Ci0gICAgLy8gQml0bWFwSW1hZ2Ugd2lsbCByZWxlYXNlIHRoZSBwYXNzZWQgaW4gc3VyZmFj ZSBvbiBkZXN0cnVjdGlvbgotICAgIFJlZlB0cjxJbWFnZT4gaW1hZ2UgPSBCaXRtYXBJbWFnZTo6 Y3JlYXRlKGNhaXJvX3N1cmZhY2VfcmVmZXJlbmNlKG1fZGF0YS5tX3N1cmZhY2UpKTsKKyAgICBS ZWZQdHI8SW1hZ2U+IGltYWdlID0gY29weUltYWdlKERvbnRDb3B5QmFja2luZ1N0b3JlKTsKICAg ICBjb250ZXh0LT5kcmF3SW1hZ2UoaW1hZ2UuZ2V0KCksIHN0eWxlQ29sb3JTcGFjZSwgZGVzdFJl Y3QsIHNyY1JlY3QsIG9wLCBEb05vdFJlc3BlY3RJbWFnZU9yaWVudGF0aW9uLCB1c2VMb3dRdWFs aXR5U2NhbGUpOwogfQogCiB2b2lkIEltYWdlQnVmZmVyOjpkcmF3UGF0dGVybihHcmFwaGljc0Nv bnRleHQqIGNvbnRleHQsIGNvbnN0IEZsb2F0UmVjdCYgc3JjUmVjdCwgY29uc3QgQWZmaW5lVHJh bnNmb3JtJiBwYXR0ZXJuVHJhbnNmb3JtLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Y29uc3QgRmxvYXRQb2ludCYgcGhhc2UsIENvbG9yU3BhY2Ugc3R5bGVDb2xvclNwYWNlLCBDb21w b3NpdGVPcGVyYXRvciBvcCwgY29uc3QgRmxvYXRSZWN0JiBkZXN0UmVjdCkKIHsKLSAgICAvLyBC aXRtYXBJbWFnZSB3aWxsIHJlbGVhc2UgdGhlIHBhc3NlZCBpbiBzdXJmYWNlIG9uIGRlc3RydWN0 aW9uCi0gICAgUmVmUHRyPEltYWdlPiBpbWFnZSA9IEJpdG1hcEltYWdlOjpjcmVhdGUoY2Fpcm9f c3VyZmFjZV9yZWZlcmVuY2UobV9kYXRhLm1fc3VyZmFjZSkpOworICAgIFJlZlB0cjxJbWFnZT4g aW1hZ2UgPSBjb3B5SW1hZ2UoRG9udENvcHlCYWNraW5nU3RvcmUpOwogICAgIGltYWdlLT5kcmF3 UGF0dGVybihjb250ZXh0LCBzcmNSZWN0LCBwYXR0ZXJuVHJhbnNmb3JtLCBwaGFzZSwgc3R5bGVD b2xvclNwYWNlLCBvcCwgZGVzdFJlY3QpOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy90ZXhtYXAvVGV4dHVyZU1hcHBlckxheWVyLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3Bw CmluZGV4IDlkODNjNGJkODRlMWUxYTA5NTAwMjgxMzhmNDIzZjZhZTQxMWVmMWQuLjM1YTE2Zjli YzViZDJmODliYTdjMzA3YTZhNDM4NmQ0ZjQ3ZDc3ZmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5ZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3RleG1hcC9UZXh0dXJlTWFwcGVyTGF5 ZXIuY3BwCkBAIC0xMjIsMTUgKzEyMiw3IEBAIHZvaWQgVGV4dHVyZU1hcHBlckxheWVyOjp1cGRh dGVCYWNraW5nU3RvcmUoVGV4dHVyZU1hcHBlciogdGV4dHVyZU1hcHBlciwgR3JhcGhpCiAgICAg Y29udGV4dC0+dHJhbnNsYXRlKC1kaXJ0eVJlY3QueCgpLCAtZGlydHlSZWN0LnkoKSk7CiAgICAg bGF5ZXItPnBhaW50R3JhcGhpY3NMYXllckNvbnRlbnRzKCpjb250ZXh0LCBkaXJ0eVJlY3QpOwog Ci0gICAgUmVmUHRyPEltYWdlPiBpbWFnZTsKLQotI2lmIFBMQVRGT1JNKFFUKQotICAgIGltYWdl ID0gaW1hZ2VCdWZmZXItPmNvcHlJbWFnZShEb250Q29weUJhY2tpbmdTdG9yZSk7Ci0jZWxzZQot ICAgIC8vIEZJWE1FOiBzdXBwb3J0IERvbnRDb3B5QmFja2luZ1N0b3JlIGluIG5vbi1RdCBwb3J0 cyB0aGF0IHVzZSBUZXh0dXJlTWFwcGVyLgotICAgIGltYWdlID0gaW1hZ2VCdWZmZXItPmNvcHlJ bWFnZShDb3B5QmFja2luZ1N0b3JlKTsKLSNlbmRpZgotCisgICAgUmVmUHRyPEltYWdlPiBpbWFn ZSA9IGltYWdlQnVmZmVyLT5jb3B5SW1hZ2UoRG9udENvcHlCYWNraW5nU3RvcmUpOwogICAgIHN0 YXRpY19jYXN0PFRleHR1cmVNYXBwZXJUaWxlZEJhY2tpbmdTdG9yZSo+KG1fYmFja2luZ1N0b3Jl LmdldCgpKS0+dXBkYXRlQ29udGVudHModGV4dHVyZU1hcHBlciwgaW1hZ2UuZ2V0KCksIG1fc2l6 ZSwgZGlydHlSZWN0KTsKIH0KIAo=