59849 2011-04-29 17:35:21 -0700 Avoid allocating a new image buffer in ~CanvasRenderingContext2D() 2011-05-04 10:51:14 -0700 1 1 1 Unclassified WebKit Canvas 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED InRadar P2 Normal --- 1 simon.fraser simon.fraser aroben mdelaney7 simon.fraser oldest_to_newest 395647 0 simon.fraser 2011-04-29 17:35:21 -0700 The code I added to ~CanvasRenderingContext2D() to unwind the graphics stack can end up allocating a new image buffer, which is bad. 395648 1 simon.fraser 2011-04-29 17:35:43 -0700 <rdar://problem/9362156> 398040 2 92273 simon.fraser 2011-05-04 10:30:12 -0700 Created attachment 92273 Patch 398046 3 92273 darin 2011-05-04 10:32:34 -0700 Comment on attachment 92273 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=92273&action=review > Source/WebCore/html/HTMLCanvasElement.h:103 > - GraphicsContext* drawingContext() const; > + enum ImageBufferCreation { AllowImageBufferCreation, DisallowImageBufferCreation }; > + GraphicsContext* drawingContext(ImageBufferCreation allowBufferCreation = AllowImageBufferCreation) const; Can we just add a second function with this behavior? Or maybe just a function that returns a boolean to tell us if we already have a buffer? I think that adding this argument is unnecessary given how simple the function is. 398047 4 92273 darin 2011-05-04 10:33:37 -0700 Comment on attachment 92273 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=92273&action=review >> Source/WebCore/html/HTMLCanvasElement.h:103 >> + GraphicsContext* drawingContext(ImageBufferCreation allowBufferCreation = AllowImageBufferCreation) const; > > Can we just add a second function with this behavior? Or maybe just a function that returns a boolean to tell us if we already have a buffer? I think that adding this argument is unnecessary given how simple the function is. One possible name for a new function would be existingDrawingContext. But I think that the hasImageBuffer solution would be fine. 398054 5 92273 simon.fraser 2011-05-04 10:39:46 -0700 Comment on attachment 92273 Patch Yeah, sounds good. 398056 6 92278 simon.fraser 2011-05-04 10:42:27 -0700 Created attachment 92278 Patch 398066 7 simon.fraser 2011-05-04 10:51:14 -0700 http://trac.webkit.org/changeset/85760 92273 2011-05-04 10:30:12 -0700 2011-05-04 10:39:46 -0700 Patch bug-59849-20110504103011.patch text/plain 3254 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogODU3NTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhMzdiM2FlZDI0YTllMjBj Mjg1OTExYjg3M2Q2M2RlZjMwNTBhNzQ2Li5kN2FiZDgyNjlkOTllY2NjMDYzY2ZhMTRiY2VjZjFj Zjk0YzEzNWM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDUtMDQgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXZvaWQgYWxsb2NhdGluZyBhIG5ldyBpbWFnZSBi dWZmZXIgaW4gfkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyRCgpCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTg0OQorCisgICAgICAgIFdoZW4gYXR0ZW1w dGluZyB0byB1bndpbmQgdGhlIGdyYXBoaWNzIHN0YXRlIHN0YWNrIGluIHRoZQorICAgICAgICBD YW52YXNSZW5kZXJpbmdDb250ZXh0MkQgZGVzdHJ1Y3RvciwgZG9uJ3QgYWxsb3cgSFRNTENhbnZh c0VsZW1lbnQKKyAgICAgICAgdG8gY3JlYXRlIGEgbmV3IEltYWdlQnVmZmVyLgorCisgICAgICAg ICogaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQ2Fu dmFzRWxlbWVudDo6ZHJhd2luZ0NvbnRleHQpOgorICAgICAgICAqIGh0bWwvSFRNTENhbnZhc0Vs ZW1lbnQuaDoKKyAgICAgICAgKiBodG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjp+Q2FudmFz UmVuZGVyaW5nQ29udGV4dDJEKToKKwogMjAxMS0wNS0wNCAgQW5kcmV5IEtvc3lha292ICA8Y2Fz ZXFAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRza3ku CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50LmNwcCBi L1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENhbnZhc0VsZW1lbnQuY3BwCmluZGV4IDc3NDUyNmIx ZTk2MWJiMjU0NmYwNjUxYTRlN2MwODViMjkyZThhMWEuLmUyNDEwZTdhNDJkNmVhYzBiY2FmMzc5 YmEwZTZhNmI3MDVmYmM1MGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENh bnZhc0VsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENhbnZhc0VsZW1l bnQuY3BwCkBAIC00NDUsOCArNDQ1LDExIEBAIHZvaWQgSFRNTENhbnZhc0VsZW1lbnQ6OmNyZWF0 ZUltYWdlQnVmZmVyKCkgY29uc3QKICNlbmRpZgogfQogCi1HcmFwaGljc0NvbnRleHQqIEhUTUxD YW52YXNFbGVtZW50OjpkcmF3aW5nQ29udGV4dCgpIGNvbnN0CitHcmFwaGljc0NvbnRleHQqIEhU TUxDYW52YXNFbGVtZW50OjpkcmF3aW5nQ29udGV4dChJbWFnZUJ1ZmZlckNyZWF0aW9uIGFsbG93 QnVmZmVyQ3JlYXRpb24pIGNvbnN0CiB7CisgICAgaWYgKGFsbG93QnVmZmVyQ3JlYXRpb24gPT0g RGlzYWxsb3dJbWFnZUJ1ZmZlckNyZWF0aW9uICYmICFtX2hhc0NyZWF0ZWRJbWFnZUJ1ZmZlcikK KyAgICAgICAgcmV0dXJuIDA7CisKICAgICByZXR1cm4gYnVmZmVyKCkgPyBtX2ltYWdlQnVmZmVy LT5jb250ZXh0KCkgOiAwOwogfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hU TUxDYW52YXNFbGVtZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50 LmgKaW5kZXggMjA3YzM4NDI1ZjYwMGJhY2YyMDUwOTliZWU4OTA0NjllODk1NzZmMS4uNDQwNThm MzUyMzNmZGRhYzViODlkMTlkM2M2Y2I5YWExNzMzNGMyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwv SFRNTENhbnZhc0VsZW1lbnQuaApAQCAtOTksNyArOTksOCBAQCBwdWJsaWM6CiAKICAgICB2b2lk IHBhaW50KEdyYXBoaWNzQ29udGV4dCosIGNvbnN0IEludFJlY3QmKTsKIAotICAgIEdyYXBoaWNz Q29udGV4dCogZHJhd2luZ0NvbnRleHQoKSBjb25zdDsKKyAgICBlbnVtIEltYWdlQnVmZmVyQ3Jl YXRpb24geyBBbGxvd0ltYWdlQnVmZmVyQ3JlYXRpb24sIERpc2FsbG93SW1hZ2VCdWZmZXJDcmVh dGlvbiB9OworICAgIEdyYXBoaWNzQ29udGV4dCogZHJhd2luZ0NvbnRleHQoSW1hZ2VCdWZmZXJD cmVhdGlvbiBhbGxvd0J1ZmZlckNyZWF0aW9uID0gQWxsb3dJbWFnZUJ1ZmZlckNyZWF0aW9uKSBj b25zdDsKIAogICAgIENhbnZhc1JlbmRlcmluZ0NvbnRleHQqIHJlbmRlcmluZ0NvbnRleHQoKSBj b25zdCB7IHJldHVybiBtX2NvbnRleHQuZ2V0KCk7IH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHAKaW5kZXggM2Nk ZjYxZTdjMTg3OTQ0NzRiOTZiN2FiNGI0NGFiMzc2YjU1MzcxYS4uZjUzYWIzNWYxOTVhNWRiNDU2 YTZhMTY2NWEzOTFiOGY3ZmRiYjBjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9j YW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9o dG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwCkBAIC0xNTQsNyArMTU0LDcg QEAgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjp+Q2FudmFzUmVuZGVyaW5nQ29udGV4dDJEKCkK ICAgICAvLyBpcyBjbGVhcmVkIGJlZm9yZSBkZXN0cnVjdGlvbiwgdG8gYXZvaWQgYXNzZXJ0aW9u cyBpbiB0aGUKICAgICAvLyBHcmFwaGljc0NvbnRleHQgZHRvci4KICAgICBpZiAoc2l6ZV90IHN0 YWNrU2l6ZSA9IG1fc3RhdGVTdGFjay5zaXplKCkpIHsKLSAgICAgICAgaWYgKEdyYXBoaWNzQ29u dGV4dCogY29udGV4dCA9IGRyYXdpbmdDb250ZXh0KCkpIHsKKyAgICAgICAgaWYgKEdyYXBoaWNz Q29udGV4dCogY29udGV4dCA9IGNhbnZhcygpLT5kcmF3aW5nQ29udGV4dChIVE1MQ2FudmFzRWxl bWVudDo6RGlzYWxsb3dJbWFnZUJ1ZmZlckNyZWF0aW9uKSkgewogICAgICAgICAgICAgd2hpbGUg KC0tc3RhY2tTaXplKQogICAgICAgICAgICAgICAgIGNvbnRleHQtPnJlc3RvcmUoKTsKICAgICAg ICAgfQo= 92278 2011-05-04 10:42:27 -0700 2011-05-04 10:45:38 -0700 Patch bug-59849-20110504104225.patch text/plain 3049 simon.fraser U3VidmVyc2lvbiBSZXZpc2lvbjogODU3NTEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBhMzdiM2FlZDI0YTllMjBj Mjg1OTExYjg3M2Q2M2RlZjMwNTBhNzQ2Li4yYjcwZDdiNmIwYWNiZGIzYTBjNjBjYWU1MzE4ZGEx MDY0YWI1MmI4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTEtMDUtMDQgIFNpbW9u IEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQXZvaWQgYWxsb2NhdGluZyBhIG5ldyBpbWFnZSBi dWZmZXIgaW4gfkNhbnZhc1JlbmRlcmluZ0NvbnRleHQyRCgpCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01OTg0OQorCisgICAgICAgIFdoZW4gYXR0ZW1w dGluZyB0byB1bndpbmQgdGhlIGdyYXBoaWNzIHN0YXRlIHN0YWNrIGluIHRoZQorICAgICAgICBD YW52YXNSZW5kZXJpbmdDb250ZXh0MkQgZGVzdHJ1Y3RvciwgZG9uJ3QgYWxsb3cgSFRNTENhbnZh c0VsZW1lbnQKKyAgICAgICAgdG8gY3JlYXRlIGEgbmV3IEltYWdlQnVmZmVyLgorCisgICAgICAg ICogaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MQ2Fu dmFzRWxlbWVudDo6ZXhpc3RpbmdEcmF3aW5nQ29udGV4dCk6CisgICAgICAgICogaHRtbC9IVE1M Q2FudmFzRWxlbWVudC5oOgorICAgICAgICAqIGh0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0Nv bnRleHQyRC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6 On5DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQpOgorCiAyMDExLTA1LTA0ICBBbmRyZXkgS29zeWFr b3YgIDxjYXNlcUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgWXVyeSBTZW1p a2hhdHNreS4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENhbnZhc0VsZW1l bnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5jcHAKaW5kZXgg Nzc0NTI2YjFlOTYxYmIyNTQ2ZjA2NTFhNGU3YzA4NWIyOTJlOGExYS4uZDQxNjU2MjM3MmFjOTRm MDU0MDVjOGI2OTAwNWViOTY1MzZmNzY2YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MQ2FudmFzRWxlbWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2Fu dmFzRWxlbWVudC5jcHAKQEAgLTQ1MCw2ICs0NTAsMTQgQEAgR3JhcGhpY3NDb250ZXh0KiBIVE1M Q2FudmFzRWxlbWVudDo6ZHJhd2luZ0NvbnRleHQoKSBjb25zdAogICAgIHJldHVybiBidWZmZXIo KSA/IG1faW1hZ2VCdWZmZXItPmNvbnRleHQoKSA6IDA7CiB9CiAKK0dyYXBoaWNzQ29udGV4dCog SFRNTENhbnZhc0VsZW1lbnQ6OmV4aXN0aW5nRHJhd2luZ0NvbnRleHQoKSBjb25zdAoreworICAg IGlmICghbV9oYXNDcmVhdGVkSW1hZ2VCdWZmZXIpCisgICAgICAgIHJldHVybiAwOworCisgICAg cmV0dXJuIGRyYXdpbmdDb250ZXh0KCk7Cit9CisKIEltYWdlQnVmZmVyKiBIVE1MQ2FudmFzRWxl bWVudDo6YnVmZmVyKCkgY29uc3QKIHsKICAgICBpZiAoIW1faGFzQ3JlYXRlZEltYWdlQnVmZmVy KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5oIGIv U291cmNlL1dlYkNvcmUvaHRtbC9IVE1MQ2FudmFzRWxlbWVudC5oCmluZGV4IDIwN2MzODQyNWY2 MDBiYWNmMjA1MDk5YmVlODkwNDY5ZTg5NTc2ZjEuLjk3ZDU1Y2M0OTgxNjI2YzU1MmIxMDg1Y2U5 YzM4ZDQ5YTc2NjI2NzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTENhbnZh c0VsZW1lbnQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxDYW52YXNFbGVtZW50LmgK QEAgLTEwMCw2ICsxMDAsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBwYWludChHcmFwaGljc0NvbnRl eHQqLCBjb25zdCBJbnRSZWN0Jik7CiAKICAgICBHcmFwaGljc0NvbnRleHQqIGRyYXdpbmdDb250 ZXh0KCkgY29uc3Q7CisgICAgR3JhcGhpY3NDb250ZXh0KiBleGlzdGluZ0RyYXdpbmdDb250ZXh0 KCkgY29uc3Q7CiAKICAgICBDYW52YXNSZW5kZXJpbmdDb250ZXh0KiByZW5kZXJpbmdDb250ZXh0 KCkgY29uc3QgeyByZXR1cm4gbV9jb250ZXh0LmdldCgpOyB9CiAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwCmluZGV4 IDNjZGY2MWU3YzE4Nzk0NDc0Yjk2YjdhYjRiNDRhYjM3NmI1NTM3MWEuLjc1MDA4NTRkZjQxNGE5 N2I4Yzg4ODcxNzhkNTUxZjE3NGRjY2JjNDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0 bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcApAQCAtMTU0LDcgKzE1 NCw3IEBAIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6fkNhbnZhc1JlbmRlcmluZ0NvbnRleHQy RCgpCiAgICAgLy8gaXMgY2xlYXJlZCBiZWZvcmUgZGVzdHJ1Y3Rpb24sIHRvIGF2b2lkIGFzc2Vy dGlvbnMgaW4gdGhlCiAgICAgLy8gR3JhcGhpY3NDb250ZXh0IGR0b3IuCiAgICAgaWYgKHNpemVf dCBzdGFja1NpemUgPSBtX3N0YXRlU3RhY2suc2l6ZSgpKSB7Ci0gICAgICAgIGlmIChHcmFwaGlj c0NvbnRleHQqIGNvbnRleHQgPSBkcmF3aW5nQ29udGV4dCgpKSB7CisgICAgICAgIGlmIChHcmFw aGljc0NvbnRleHQqIGNvbnRleHQgPSBjYW52YXMoKS0+ZXhpc3RpbmdEcmF3aW5nQ29udGV4dCgp KSB7CiAgICAgICAgICAgICB3aGlsZSAoLS1zdGFja1NpemUpCiAgICAgICAgICAgICAgICAgY29u dGV4dC0+cmVzdG9yZSgpOwogICAgICAgICB9Cg==