46412 2010-09-23 15:00:50 -0700 [CHROMIUM] <canvas> clearRect() doesn't respect active clipping region, when --enable-accelerated-2d-canvas is on 2010-09-27 10:45:30 -0700 1 1 1 Unclassified WebKit Canvas 528+ (Nightly build) PC Windows 7 RESOLVED FIXED http://philip.html5.org/tests/canvas/suite/tests/2d.clearRect.clip.html P2 Normal --- 1 senorblanco senorblanco jamesr kbr mdelaney7 oldest_to_newest 283987 0 senorblanco 2010-09-23 15:00:50 -0700 According to the spec, canvas's clearRect() should respect the active clipping region. Chrome with --enable-accelerated-2d-canvas doesn't. See layout test http://philip.html5.org/tests/canvas/suite/tests/2d.clearRect.clip.html. 284350 1 68672 senorblanco 2010-09-24 06:49:40 -0700 Created attachment 68672 Patch 284737 2 68672 jamesr 2010-09-24 14:59:57 -0700 Comment on attachment 68672 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=68672&action=review > WebCore/platform/graphics/skia/GraphicsContextSkia.cpp:351 > + if (platformContext()->useGPU() && !platformContext()->canvasClipApplied()) { > platformContext()->prepareForHardwareDraw(); > platformContext()->gpuCanvas()->clearRect(rect); > return; > } > > + // Temporarily force the mode to "clear" to trigger a readback I'd much prefer doing a syncSoftwareCanvas() here rather than depending on side effects of the Xfer mode being set to do the readback. 285429 3 68903 senorblanco 2010-09-27 06:45:59 -0700 Created attachment 68903 Patch 285441 4 senorblanco 2010-09-27 07:18:13 -0700 (In reply to comment #2) > (From update of attachment 68672 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=68672&action=review > > > WebCore/platform/graphics/skia/GraphicsContextSkia.cpp:351 > > + if (platformContext()->useGPU() && !platformContext()->canvasClipApplied()) { > > platformContext()->prepareForHardwareDraw(); > > platformContext()->gpuCanvas()->clearRect(rect); > > return; > > } > > > > + // Temporarily force the mode to "clear" to trigger a readback > > I'd much prefer doing a syncSoftwareCanvas() here rather than depending on side effects of the Xfer mode being set to do the readback. Good idea. Done. 285538 5 68903 jamesr 2010-09-27 10:27:31 -0700 Comment on attachment 68903 Patch R=me 285559 6 senorblanco 2010-09-27 10:45:30 -0700 Committed r68402: <http://trac.webkit.org/changeset/68402> 68672 2010-09-24 06:49:40 -0700 2010-09-27 06:45:54 -0700 Patch bug-46412-20100924094937.patch text/plain 3738 senorblanco SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2ODIwMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMDktMjMgIFN0ZXBoZW4gV2hpdGUgIDxzZW5vcmJsYW5jb0Bj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgW0NIUk9NSVVNXSBGaXggZm9yIGNhbnZhcyBjbGVhclJlY3QoKSB3aXRoIGNsaXBwaW5n IGFjdGl2ZSwgd2hlbgorICAgICAgICAtLWVuYWJsZS1hY2NlbGVyYXRlZC0yZC1jYW52YXMgaXMg b24uCisKKyAgICAgICAgQ292ZXJlZCBieSBsYXlvdXQgdGVzdCBodHRwOi8vcGhpbGlwLmh0bWw1 Lm9yZy90ZXN0cy9jYW52YXMvc3VpdGUvdGVzdHMvMmQuY2xlYXJSZWN0LmNsaXAuaHRtbC4KKwor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmNsZWFyUmVjdCk6CisgICAgICAg IENoZWNrIGlmIGEgY2xpcCBpcyBhY3RpdmUgZHVyaW5nIGNsaXBSZWN0KCksIGFuZCBmb3JjZSB0 byBzb2Z0d2FyZQorICAgICAgICBpZiBzby4gIFdlIHNldCB0aGUgdHJhbnNmZXIgbW9kZSB0byAi Y2xlYXIiIHRlbXBvcmFyaWx5LCBzbyB0aGF0CisgICAgICAgIHByZXBhcmVGb3JTb2Z0d2FyZURy YXcoKSB3aWxsIGRvIGEgcmVhZGJhY2sgZnJvbSBmcmFtZWJ1ZmZlciBpZiAKKyAgICAgICAgbmVj ZXNzYXJ5LgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0 U2tpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybUNvbnRleHRTa2lhOjpjYW52YXND bGlwQXBwbGllZCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNv bnRleHRTa2lhLmg6CisgICAgICAgIEltcGxlbWVudCBhY2Nlc3NvciB0byBjaGVjayBpZiBhIGNs aXAgaXMgYWN0aXZlLgorCiAyMDEwLTA5LTIzICBEYXZpZCBIeWF0dCAgPGh5YXR0QGFwcGxlLmNv bT4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGVsZSBQZXRlcnNvbi4KSW5kZXg6IFdlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHRTa2lhLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5j cHAJKHJldmlzaW9uIDY4MTk5KQorKysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL0dy YXBoaWNzQ29udGV4dFNraWEuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMzgsMTcgKzMzOCwyMSBA QCB2b2lkIEdyYXBoaWNzQ29udGV4dDo6Y2xlYXJSZWN0KGNvbnN0IEZsCiAgICAgaWYgKHBhaW50 aW5nRGlzYWJsZWQoKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKHBsYXRmb3JtQ29udGV4 dCgpLT51c2VHUFUoKSkgeworICAgIFNrUmVjdCByID0gcmVjdDsKKyAgICBpZiAoIWlzUmVjdFNr aWFTYWZlKGdldENUTSgpLCByKSkKKyAgICAgICAgQ2xpcFJlY3RUb0NhbnZhcygqcGxhdGZvcm1D b250ZXh0KCktPmNhbnZhcygpLCByLCAmcik7CisKKyAgICBpZiAocGxhdGZvcm1Db250ZXh0KCkt PnVzZUdQVSgpICYmICFwbGF0Zm9ybUNvbnRleHQoKS0+Y2FudmFzQ2xpcEFwcGxpZWQoKSkgewog ICAgICAgICBwbGF0Zm9ybUNvbnRleHQoKS0+cHJlcGFyZUZvckhhcmR3YXJlRHJhdygpOwogICAg ICAgICBwbGF0Zm9ybUNvbnRleHQoKS0+Z3B1Q2FudmFzKCktPmNsZWFyUmVjdChyZWN0KTsKICAg ICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIC8vIFRlbXBvcmFyaWx5IGZvcmNlIHRoZSBtb2Rl IHRvICJjbGVhciIgdG8gdHJpZ2dlciBhIHJlYWRiYWNrCisgICAgcGxhdGZvcm1Db250ZXh0KCkt PnNhdmUoKTsKKyAgICBwbGF0Zm9ybUNvbnRleHQoKS0+c2V0WGZlcm1vZGVNb2RlKFNrWGZlcm1v ZGU6OmtDbGVhcl9Nb2RlKTsKICAgICBwbGF0Zm9ybUNvbnRleHQoKS0+cHJlcGFyZUZvclNvZnR3 YXJlRHJhdygpOwotCi0gICAgU2tSZWN0IHIgPSByZWN0OwotICAgIGlmICghaXNSZWN0U2tpYVNh ZmUoZ2V0Q1RNKCksIHIpKQotICAgICAgICBDbGlwUmVjdFRvQ2FudmFzKCpwbGF0Zm9ybUNvbnRl eHQoKS0+Y2FudmFzKCksIHIsICZyKTsKKyAgICBwbGF0Zm9ybUNvbnRleHQoKS0+cmVzdG9yZSgp OwogCiAgICAgU2tQYWludCBwYWludDsKICAgICBwbGF0Zm9ybUNvbnRleHQoKS0+c2V0dXBQYWlu dEZvckZpbGxpbmcoJnBhaW50KTsKSW5kZXg6IFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tp YS9QbGF0Zm9ybUNvbnRleHRTa2lhLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL3NraWEvUGxhdGZvcm1Db250ZXh0U2tpYS5jcHAJKHJldmlzaW9uIDY4MTk5KQor KysgV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3Bw CSh3b3JraW5nIGNvcHkpCkBAIC02NzcsNiArNjc3LDExIEBAIGJvb2wgUGxhdGZvcm1Db250ZXh0 U2tpYTo6Y2FuQWNjZWxlcmF0ZSgKICAgICAgICAgJiYgIW1fc3RhdGUtPm1fY2FudmFzQ2xpcEFw cGxpZWQ7IC8vIENhbid0IGFjY2VsZXJhdGUgd2l0aCBhIGNsaXAgdG8gcGF0aCBhcHBsaWVkLgog fQogCitib29sIFBsYXRmb3JtQ29udGV4dFNraWE6OmNhbnZhc0NsaXBBcHBsaWVkKCkgY29uc3QK K3sKKyAgICByZXR1cm4gbV9zdGF0ZS0+bV9jYW52YXNDbGlwQXBwbGllZDsKK30KKwogY2xhc3Mg V2lsbFB1Ymxpc2hDYWxsYmFja0ltcGwgOiBwdWJsaWMgRHJhd2luZ0J1ZmZlcjo6V2lsbFB1Ymxp c2hDYWxsYmFjayB7CiBwdWJsaWM6CiAgICAgc3RhdGljIFBhc3NPd25QdHI8V2lsbFB1Ymxpc2hD YWxsYmFjaz4gY3JlYXRlKFBsYXRmb3JtQ29udGV4dFNraWEqIHBjcykKSW5kZXg6IFdlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmgKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuaAko cmV2aXNpb24gNjgxOTkpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZv cm1Db250ZXh0U2tpYS5oCSh3b3JraW5nIGNvcHkpCkBAIC0xODAsNiArMTgwLDcgQEAgcHVibGlj OgogICAgIGJvb2wgaGFzSW1hZ2VSZXNhbXBsaW5nSGludCgpIGNvbnN0OwogCiAgICAgYm9vbCBj YW5BY2NlbGVyYXRlKCkgY29uc3Q7CisgICAgYm9vbCBjYW52YXNDbGlwQXBwbGllZCgpIGNvbnN0 OwogICAgIGJvb2wgdXNlR1BVKCkgeyByZXR1cm4gbV91c2VHUFU7IH0KICAgICB2b2lkIHNldFNo YXJlZEdyYXBoaWNzQ29udGV4dDNEKFNoYXJlZEdyYXBoaWNzQ29udGV4dDNEKiwgRHJhd2luZ0J1 ZmZlciosIGNvbnN0IEludFNpemUmKTsKICAgICBHTEVTMkNhbnZhcyogZ3B1Q2FudmFzKCkgY29u c3QgeyByZXR1cm4gbV9ncHVDYW52YXMuZ2V0KCk7IH0K 68903 2010-09-27 06:45:59 -0700 2010-09-27 10:27:31 -0700 Patch bug-46412-20100927094557.patch text/plain 3419 senorblanco SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2ODMwNSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjIgQEAKKzIwMTAtMDktMjMgIFN0ZXBoZW4gV2hpdGUgIDxzZW5vcmJsYW5jb0Bj aHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgW0NIUk9NSVVNXSBGaXggZm9yIGNhbnZhcyBjbGVhclJlY3QoKSB3aXRoIGNsaXBwaW5n IGFjdGl2ZSwgd2hlbgorICAgICAgICAtLWVuYWJsZS1hY2NlbGVyYXRlZC0yZC1jYW52YXMgaXMg b24uCisKKyAgICAgICAgQ292ZXJlZCBieSBsYXlvdXQgdGVzdCBodHRwOi8vcGhpbGlwLmh0bWw1 Lm9yZy90ZXN0cy9jYW52YXMvc3VpdGUvdGVzdHMvMmQuY2xlYXJSZWN0LmNsaXAuaHRtbC4KKwor ICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0NvbnRleHQ6OmNsZWFyUmVjdCk6CisgICAgICAg IENoZWNrIGlmIGEgY2xpcCBpcyBhY3RpdmUgZHVyaW5nIGNsaXBSZWN0KCksIGFuZCBmb3JjZSB0 byBzb2Z0d2FyZQorICAgICAgICBpZiBzby4gIEZvcmNlIGEgcmVhZGJhY2sgaW4gdGhpcyBjYXNl LCBzaW5jZSBjbGVhclJlY3QoKSBpcyBub3QKKyAgICAgICAgY29tcGF0aWJsZSB3aXRoIG1peGVk LW1vZGUgcmVuZGVyaW5nLgorICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL3NraWEvUGxhdGZv cm1Db250ZXh0U2tpYS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQbGF0Zm9ybUNvbnRleHRTa2lh OjpjYW52YXNDbGlwQXBwbGllZCk6CisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9Q bGF0Zm9ybUNvbnRleHRTa2lhLmg6CisgICAgICAgIEltcGxlbWVudCBhY2Nlc3NvciB0byBjaGVj ayBpZiBhIGNsaXAgaXMgYWN0aXZlLgorCiAyMDEwLTA5LTI0ICBMdWl6IEFnb3N0aW5pICA8bHVp ei5hZ29zdGluaUBvcGVuYm9zc2Eub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGgg Um9oZGUgQ2hyaXN0aWFuc2VuLgpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lh L0dyYXBoaWNzQ29udGV4dFNraWEuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3Mvc2tpYS9HcmFwaGljc0NvbnRleHRTa2lhLmNwcAkocmV2aXNpb24gNjgzMDUpCisr KyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEvR3JhcGhpY3NDb250ZXh0U2tpYS5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTMzOCwxMyArMzM4LDE1IEBAIHZvaWQgR3JhcGhpY3NDb250ZXh0 OjpjbGVhclJlY3QoY29uc3QgRmwKICAgICBpZiAocGFpbnRpbmdEaXNhYmxlZCgpKQogICAgICAg ICByZXR1cm47CiAKLSAgICBpZiAocGxhdGZvcm1Db250ZXh0KCktPnVzZUdQVSgpKSB7CisgICAg aWYgKHBsYXRmb3JtQ29udGV4dCgpLT51c2VHUFUoKSAmJiAhcGxhdGZvcm1Db250ZXh0KCktPmNh bnZhc0NsaXBBcHBsaWVkKCkpIHsKICAgICAgICAgcGxhdGZvcm1Db250ZXh0KCktPnByZXBhcmVG b3JIYXJkd2FyZURyYXcoKTsKICAgICAgICAgcGxhdGZvcm1Db250ZXh0KCktPmdwdUNhbnZhcygp LT5jbGVhclJlY3QocmVjdCk7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBwbGF0Zm9y bUNvbnRleHQoKS0+cHJlcGFyZUZvclNvZnR3YXJlRHJhdygpOworICAgIC8vIEZvcmNlIGEgcmVh ZGJhY2sgaGVyZSAoaWYgd2UncmUgdXNpbmcgdGhlIEdQVSksIHNpbmNlIGNsZWFyUmVjdCgpIGlz CisgICAgLy8gaW5jb21wYXRpYmxlIHdpdGggbWl4ZWQtbW9kZSByZW5kZXJpbmcuCisgICAgcGxh dGZvcm1Db250ZXh0KCktPnN5bmNTb2Z0d2FyZUNhbnZhcygpOwogCiAgICAgU2tSZWN0IHIgPSBy ZWN0OwogICAgIGlmICghaXNSZWN0U2tpYVNhZmUoZ2V0Q1RNKCksIHIpKQpJbmRleDogV2ViQ29y ZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29udGV4dFNraWEuY3BwCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFdlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lh LmNwcAkocmV2aXNpb24gNjgzMDUpCisrKyBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEv UGxhdGZvcm1Db250ZXh0U2tpYS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY3Nyw2ICs2NzcsMTEg QEAgYm9vbCBQbGF0Zm9ybUNvbnRleHRTa2lhOjpjYW5BY2NlbGVyYXRlKAogICAgICAgICAmJiAh bV9zdGF0ZS0+bV9jYW52YXNDbGlwQXBwbGllZDsgLy8gQ2FuJ3QgYWNjZWxlcmF0ZSB3aXRoIGEg Y2xpcCB0byBwYXRoIGFwcGxpZWQuCiB9CiAKK2Jvb2wgUGxhdGZvcm1Db250ZXh0U2tpYTo6Y2Fu dmFzQ2xpcEFwcGxpZWQoKSBjb25zdAoreworICAgIHJldHVybiBtX3N0YXRlLT5tX2NhbnZhc0Ns aXBBcHBsaWVkOworfQorCiBjbGFzcyBXaWxsUHVibGlzaENhbGxiYWNrSW1wbCA6IHB1YmxpYyBE cmF3aW5nQnVmZmVyOjpXaWxsUHVibGlzaENhbGxiYWNrIHsKIHB1YmxpYzoKICAgICBzdGF0aWMg UGFzc093blB0cjxXaWxsUHVibGlzaENhbGxiYWNrPiBjcmVhdGUoUGxhdGZvcm1Db250ZXh0U2tp YSogcGNzKQpJbmRleDogV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9za2lhL1BsYXRmb3JtQ29u dGV4dFNraWEuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3NraWEv UGxhdGZvcm1Db250ZXh0U2tpYS5oCShyZXZpc2lvbiA2ODMwNSkKKysrIFdlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3Mvc2tpYS9QbGF0Zm9ybUNvbnRleHRTa2lhLmgJKHdvcmtpbmcgY29weSkKQEAg LTE4MCw2ICsxODAsNyBAQCBwdWJsaWM6CiAgICAgYm9vbCBoYXNJbWFnZVJlc2FtcGxpbmdIaW50 KCkgY29uc3Q7CiAKICAgICBib29sIGNhbkFjY2VsZXJhdGUoKSBjb25zdDsKKyAgICBib29sIGNh bnZhc0NsaXBBcHBsaWVkKCkgY29uc3Q7CiAgICAgYm9vbCB1c2VHUFUoKSB7IHJldHVybiBtX3Vz ZUdQVTsgfQogICAgIHZvaWQgc2V0U2hhcmVkR3JhcGhpY3NDb250ZXh0M0QoU2hhcmVkR3JhcGhp Y3NDb250ZXh0M0QqLCBEcmF3aW5nQnVmZmVyKiwgY29uc3QgSW50U2l6ZSYpOwogICAgIEdMRVMy Q2FudmFzKiBncHVDYW52YXMoKSBjb25zdCB7IHJldHVybiBtX2dwdUNhbnZhcy5nZXQoKTsgfQo=