77784 2012-02-03 14:44:12 -0800 Canvas-into-canvas drawing should respect backing store scale ratio 2012-02-03 22:44:43 -0800 1 1 1 Unclassified WebKit Canvas 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 thorton thorton adele dglazkov eoconnor mdelaney7 mitz simon.fraser webkit.review.bot oldest_to_newest 549110 0 thorton 2012-02-03 14:44:12 -0800 When drawing between two canvases where the backing store scale ratio is not 1, using the ctx.drawImage(otherCanvas, 0, 0) form of drawImage() doesn't respect the scale ratio. <rdar://problem/10549729> I have a patch. 549113 1 125419 thorton 2012-02-03 14:45:26 -0800 Created attachment 125419 patch 549121 2 125419 mitz 2012-02-03 14:49:57 -0800 Comment on attachment 125419 patch Makes sense 549142 3 thorton 2012-02-03 15:03:18 -0800 (In reply to comment #2) > (From update of attachment 125419 [details]) > Makes sense Only mostly... there's one mistake: the destination rect should be equal to the source rect, not the size of the destination canvas. I *did* have that right last time; gotta stop second-guessing. r=you with that change? 549272 4 125419 webkit.review.bot 2012-02-03 17:29:19 -0800 Comment on attachment 125419 patch Attachment 125419 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/11424456 New failing tests: fast/canvas/canvas-composite-canvas.html canvas/philip/tests/2d.fillStyle.parse.current.removed.html 549307 5 mitz 2012-02-03 18:47:59 -0800 (In reply to comment #3) > (In reply to comment #2) > > (From update of attachment 125419 [details] [details]) > > Makes sense > > Only mostly... there's one mistake: the destination rect should be equal to the source rect, not the size of the destination canvas. I *did* have that right last time; gotta stop second-guessing. r=you with that change? I was going to say yes, but what's this failure the EWS bot is reporting? 549309 6 thorton 2012-02-03 18:49:12 -0800 (In reply to comment #5) > (In reply to comment #3) > > (In reply to comment #2) > > > (From update of attachment 125419 [details] [details] [details]) > > > Makes sense > > > > Only mostly... there's one mistake: the destination rect should be equal to the source rect, not the size of the destination canvas. I *did* have that right last time; gotta stop second-guessing. r=you with that change? > > I was going to say yes, but what's this failure the EWS bot is reporting? I'm going to double check in a minute, but I'm willing to bet that *is* the failure the EWS bot is reporting. For some reason I didn't hit that when running the tests locally, though, so I have to figure out how to get it to fail! 549315 7 mitz 2012-02-03 18:57:27 -0800 Could you post the corrected version of the patch to see what the bit thinks about it? 549316 8 125463 thorton 2012-02-03 19:00:42 -0800 Created attachment 125463 revised patch Sure, let's see what EWS says. 549318 9 125463 gyuyoung.kim 2012-02-03 19:03:33 -0800 Comment on attachment 125463 revised patch Attachment 125463 did not pass efl-ews (efl): Output: http://queues.webkit.org/results/11421531 549320 10 125463 webkit-ews 2012-02-03 19:03:49 -0800 Comment on attachment 125463 revised patch Attachment 125463 did not pass qt-ews (qt): Output: http://queues.webkit.org/results/11416605 549321 11 125465 thorton 2012-02-03 19:05:18 -0800 Created attachment 125465 revised patch (which actually builds!) Ugh, I undo'd a little too far. 549379 12 thorton 2012-02-03 22:44:43 -0800 Landed in http://trac.webkit.org/changeset/106729; thanks, Dan! 125419 2012-02-03 14:45:26 -0800 2012-02-03 19:00:42 -0800 patch canvas.diff text/plain 3555 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAyYTA4Mzg5Li44NDg1MGE0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTItMDItMDIgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgQ2FudmFzLWludG8tY2FudmFzIGRyYXdpbmcgc2hvdWxkIHJlc3BlY3QgYmFja2lu ZyBzdG9yZSBzY2FsZSByYXRpbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Nzc3ODQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEwNTQ5NzI5PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlc3BlY3QgdGhl IGJhY2tpbmcgc3RvcmUgc2NhbGUgcmF0aW8gd2hlbiBkcmF3aW5nIGEgY2FudmFzIGludG8gYW5v dGhlcgorICAgICAgICBjYW52YXMgdmlhIGN0eC5kcmF3SW1hZ2UoY2FudmFzLCB4LCB5KS4gUHJl dmlvdXMgYmVoYXZpb3IgY2F1c2VkIGNhbnZhcworICAgICAgICBkcmF3aW5nIHRvIGRpZmZlciBi YXNlZCBvbiB0aGUgc2l6ZSBvZiB0aGUgYmFja2luZyBzdG9yZSwgd2hpY2ggaXMgaWRlYWxseQor ICAgICAgICBhbiBpbXBsZW1lbnRhdGlvbiBkZXRhaWwgdG8gYXV0aG9ycy4KKworICAgICAgICBB bHNvLCByZW5hbWUgdGhlIHNvdXJjZSBjYW52YXMgYXJndW1lbnRzIHRvIENhbnZhc1JlbmRlcmlu Z0NvbnRleHQyRDo6ZHJhd0ltYWdlCisgICAgICAgIHRvIGJlIG1vcmUgY2xlYXIuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzLgorCisgICAgICAgICogaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5n Q29udGV4dDJELmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhc1JlbmRlcmluZ0NvbnRleHQy RDo6ZHJhd0ltYWdlKToKKwogMjAxMi0wMi0wMiAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FA YXBwbGUuY29tPgogCiAgICAgICAgIE5QQVBJIHdpbGwgbm90IHNlbmQgbW91c2UgdXAgZXZlbnRz IHdoZW4gbW91c2UgaXMgb3V0c2lkZSBwbHVnaW4gYXJlYQpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcCBiL1NvdXJjZS9X ZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmluZ0NvbnRleHQyRC5jcHAKaW5kZXggYTI0 Y2Q2OS4uNmQ2Mjg3NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2Fu dmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL2NhbnZh cy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwCkBAIC0xMzY0LDM4ICsxMzY0LDMxIEBAIHZv aWQgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkcmF3SW1hZ2UoSFRNTEltYWdlRWxlbWVudCog aW1hZ2UsIGNvbnN0IEZsb2F0UmVjCiAgICAgfQogfQogCi12b2lkIENhbnZhc1JlbmRlcmluZ0Nv bnRleHQyRDo6ZHJhd0ltYWdlKEhUTUxDYW52YXNFbGVtZW50KiBjYW52YXMsIGZsb2F0IHgsIGZs b2F0IHksIEV4Y2VwdGlvbkNvZGUmIGVjKQordm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6 OmRyYXdJbWFnZShIVE1MQ2FudmFzRWxlbWVudCogc291cmNlQ2FudmFzLCBmbG9hdCB4LCBmbG9h dCB5LCBFeGNlcHRpb25Db2RlJiBlYykKIHsKLSAgICBpZiAoIWNhbnZhcykgeworICAgIGlmICgh c291cmNlQ2FudmFzKSB7CiAgICAgICAgIGVjID0gVFlQRV9NSVNNQVRDSF9FUlI7CiAgICAgICAg IHJldHVybjsKICAgICB9CiAKLSAgICAvLyBJbiBvcmRlciB0byBlbXVsYXRlIGRyYXdpbmcgdGhl IHJlc3VsdCBvZiB0b0RhdGFVUkwoKSBpbnRvIHRoZSBjYW52YXMsIHdlCi0gICAgLy8gbmVlZCB0 byBkZWZsYXRlIHRoZSBzaXplIG9mIHRoZSBzb3VyY2UgcmVjdGFuZ2xlIGJ5IHRoZSBzb3VyY2Ug Y2FudmFzJ3MKLSAgICAvLyBiYWNraW5nIHN0b3JlIHNjYWxlIGZhY3Rvci4KLSAgICAvLyBTZWUg aHR0cHM6Ly93d3cudzMub3JnL0J1Z3MvUHVibGljL3Nob3dfYnVnLmNnaT9pZD0xNTA0MSBmb3Ig bW90aXZhdGlvbi4KLQotICAgIEZsb2F0U2l6ZSBsb2dpY2FsU2l6ZSA9IGNhbnZhcy0+Y29udmVy dERldmljZVRvTG9naWNhbChjYW52YXMtPnNpemUoKSk7Ci0KLSAgICBkcmF3SW1hZ2UoY2FudmFz LCAwLCAwLCBsb2dpY2FsU2l6ZS53aWR0aCgpLCBsb2dpY2FsU2l6ZS5oZWlnaHQoKSwgeCwgeSwg Y2FudmFzLT53aWR0aCgpLCBjYW52YXMtPmhlaWdodCgpLCBlYyk7CisgICAgZHJhd0ltYWdlKHNv dXJjZUNhbnZhcywgMCwgMCwgc291cmNlQ2FudmFzLT53aWR0aCgpLCBzb3VyY2VDYW52YXMtPmhl aWdodCgpLCB4LCB5LCBjYW52YXMoKS0+d2lkdGgoKSwgY2FudmFzKCktPmhlaWdodCgpLCBlYyk7 CiB9CiAKLXZvaWQgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkcmF3SW1hZ2UoSFRNTENhbnZh c0VsZW1lbnQqIGNhbnZhcywKK3ZvaWQgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkcmF3SW1h Z2UoSFRNTENhbnZhc0VsZW1lbnQqIHNvdXJjZUNhbnZhcywKICAgICBmbG9hdCB4LCBmbG9hdCB5 LCBmbG9hdCB3aWR0aCwgZmxvYXQgaGVpZ2h0LCBFeGNlcHRpb25Db2RlJiBlYykKIHsKLSAgICBp ZiAoIWNhbnZhcykgeworICAgIGlmICghc291cmNlQ2FudmFzKSB7CiAgICAgICAgIGVjID0gVFlQ RV9NSVNNQVRDSF9FUlI7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0gICAgZHJhd0ltYWdlKGNh bnZhcywgRmxvYXRSZWN0KDAsIDAsIGNhbnZhcy0+d2lkdGgoKSwgY2FudmFzLT5oZWlnaHQoKSks IEZsb2F0UmVjdCh4LCB5LCB3aWR0aCwgaGVpZ2h0KSwgZWMpOworICAgIGRyYXdJbWFnZShzb3Vy Y2VDYW52YXMsIEZsb2F0UmVjdCgwLCAwLCBzb3VyY2VDYW52YXMtPndpZHRoKCksIHNvdXJjZUNh bnZhcy0+aGVpZ2h0KCkpLCBGbG9hdFJlY3QoeCwgeSwgd2lkdGgsIGhlaWdodCksIGVjKTsKIH0K IAotdm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdJbWFnZShIVE1MQ2FudmFzRWxl bWVudCogY2FudmFzLAordm9pZCBDYW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdJbWFnZShI VE1MQ2FudmFzRWxlbWVudCogc291cmNlQ2FudmFzLAogICAgIGZsb2F0IHN4LCBmbG9hdCBzeSwg ZmxvYXQgc3csIGZsb2F0IHNoLAogICAgIGZsb2F0IGR4LCBmbG9hdCBkeSwgZmxvYXQgZHcsIGZs b2F0IGRoLCBFeGNlcHRpb25Db2RlJiBlYykKIHsKLSAgICBkcmF3SW1hZ2UoY2FudmFzLCBGbG9h dFJlY3Qoc3gsIHN5LCBzdywgc2gpLCBGbG9hdFJlY3QoZHgsIGR5LCBkdywgZGgpLCBlYyk7Cisg ICAgZHJhd0ltYWdlKHNvdXJjZUNhbnZhcywgRmxvYXRSZWN0KHN4LCBzeSwgc3csIHNoKSwgRmxv YXRSZWN0KGR4LCBkeSwgZHcsIGRoKSwgZWMpOwogfQogCiB2b2lkIENhbnZhc1JlbmRlcmluZ0Nv bnRleHQyRDo6ZHJhd0ltYWdlKEhUTUxDYW52YXNFbGVtZW50KiBzb3VyY2VDYW52YXMsIGNvbnN0 IEZsb2F0UmVjdCYgc3JjUmVjdCwK 125463 2012-02-03 19:00:42 -0800 2012-02-03 19:05:18 -0800 revised patch canvas.diff text/plain 3591 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxY2Q3YTcyLi45MzZlODg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTItMDItMDMgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgQ2FudmFzLWludG8tY2FudmFzIGRyYXdpbmcgc2hvdWxkIHJlc3BlY3QgYmFja2lu ZyBzdG9yZSBzY2FsZSByYXRpbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Nzc3ODQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEwNTQ5NzI5PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlc3BlY3QgdGhl IGJhY2tpbmcgc3RvcmUgc2NhbGUgcmF0aW8gd2hlbiBkcmF3aW5nIGEgY2FudmFzIGludG8gYW5v dGhlcgorICAgICAgICBjYW52YXMgdmlhIGN0eC5kcmF3SW1hZ2UoY2FudmFzLCB4LCB5KS4gUHJl dmlvdXMgYmVoYXZpb3IgY2F1c2VkIGNhbnZhcworICAgICAgICBkcmF3aW5nIHRvIGRpZmZlciBi YXNlZCBvbiB0aGUgc2l6ZSBvZiB0aGUgYmFja2luZyBzdG9yZSwgd2hpY2ggaXMgaWRlYWxseQor ICAgICAgICBhbiBpbXBsZW1lbnRhdGlvbiBkZXRhaWwgdG8gYXV0aG9ycy4KKworICAgICAgICBB bHNvLCByZW5hbWUgdGhlIHNvdXJjZSBjYW52YXMgYXJndW1lbnRzIHRvIENhbnZhc1JlbmRlcmlu Z0NvbnRleHQyRDo6ZHJhd0ltYWdlCisgICAgICAgIHRvIGJlIG1vcmUgY2xlYXIuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzLgorCisgICAgICAgICogaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5n Q29udGV4dDJELmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhc1JlbmRlcmluZ0NvbnRleHQy RDo6ZHJhd0ltYWdlKToKKwogMjAxMi0wMi0wMyAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUu Y29tPgogCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMDM1MjA3Mz4gRmxvYXRpbmcgaW1hZ2Ug bGVhdmVzIGhvbGUgaW4gcHJldmlvdXMgY29sdW1uIHdoZW4gd3JhcHBlZCB0byBuZXh0IGNvbHVt bgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5n Q29udGV4dDJELmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmlu Z0NvbnRleHQyRC5jcHAKaW5kZXggYTI0Y2Q2OS4uNzA4MWYyNiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwCkBA IC0xMzY0LDM4ICsxMzY0LDMxIEBAIHZvaWQgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkcmF3 SW1hZ2UoSFRNTEltYWdlRWxlbWVudCogaW1hZ2UsIGNvbnN0IEZsb2F0UmVjCiAgICAgfQogfQog Ci12b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6ZHJhd0ltYWdlKEhUTUxDYW52YXNFbGVt ZW50KiBjYW52YXMsIGZsb2F0IHgsIGZsb2F0IHksIEV4Y2VwdGlvbkNvZGUmIGVjKQordm9pZCBD YW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdJbWFnZShIVE1MQ2FudmFzRWxlbWVudCogc291 cmNlQ2FudmFzLCBmbG9hdCB4LCBmbG9hdCB5LCBFeGNlcHRpb25Db2RlJiBlYykKIHsKLSAgICBp ZiAoIWNhbnZhcykgeworICAgIGlmICghc291cmNlQ2FudmFzKSB7CiAgICAgICAgIGVjID0gVFlQ RV9NSVNNQVRDSF9FUlI7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICAvLyBJbiBvcmRl ciB0byBlbXVsYXRlIGRyYXdpbmcgdGhlIHJlc3VsdCBvZiB0b0RhdGFVUkwoKSBpbnRvIHRoZSBj YW52YXMsIHdlCi0gICAgLy8gbmVlZCB0byBkZWZsYXRlIHRoZSBzaXplIG9mIHRoZSBzb3VyY2Ug cmVjdGFuZ2xlIGJ5IHRoZSBzb3VyY2UgY2FudmFzJ3MKLSAgICAvLyBiYWNraW5nIHN0b3JlIHNj YWxlIGZhY3Rvci4KLSAgICAvLyBTZWUgaHR0cHM6Ly93d3cudzMub3JnL0J1Z3MvUHVibGljL3No b3dfYnVnLmNnaT9pZD0xNTA0MSBmb3IgbW90aXZhdGlvbi4KLQotICAgIEZsb2F0U2l6ZSBsb2dp Y2FsU2l6ZSA9IGNhbnZhcy0+Y29udmVydERldmljZVRvTG9naWNhbChjYW52YXMtPnNpemUoKSk7 Ci0KLSAgICBkcmF3SW1hZ2UoY2FudmFzLCAwLCAwLCBsb2dpY2FsU2l6ZS53aWR0aCgpLCBsb2dp Y2FsU2l6ZS5oZWlnaHQoKSwgeCwgeSwgY2FudmFzLT53aWR0aCgpLCBjYW52YXMtPmhlaWdodCgp LCBlYyk7CisgICAgZHJhd0ltYWdlKHNvdXJjZUNhbnZhcywgMCwgMCwgc291cmNlQ2FudmFzLT53 aWR0aCgpLCBzb3VyY2VDYW52YXMtPmhlaWdodCgpLCB4LCB5LCBzb3VyY2VDYW52YXMoKS0+d2lk dGgoKSwgc291cmNlQ2FudmFzKCktPmhlaWdodCgpLCBlYyk7CiB9CiAKLXZvaWQgQ2FudmFzUmVu ZGVyaW5nQ29udGV4dDJEOjpkcmF3SW1hZ2UoSFRNTENhbnZhc0VsZW1lbnQqIGNhbnZhcywKK3Zv aWQgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkcmF3SW1hZ2UoSFRNTENhbnZhc0VsZW1lbnQq IHNvdXJjZUNhbnZhcywKICAgICBmbG9hdCB4LCBmbG9hdCB5LCBmbG9hdCB3aWR0aCwgZmxvYXQg aGVpZ2h0LCBFeGNlcHRpb25Db2RlJiBlYykKIHsKLSAgICBpZiAoIWNhbnZhcykgeworICAgIGlm ICghc291cmNlQ2FudmFzKSB7CiAgICAgICAgIGVjID0gVFlQRV9NSVNNQVRDSF9FUlI7CiAgICAg ICAgIHJldHVybjsKICAgICB9Ci0gICAgZHJhd0ltYWdlKGNhbnZhcywgRmxvYXRSZWN0KDAsIDAs IGNhbnZhcy0+d2lkdGgoKSwgY2FudmFzLT5oZWlnaHQoKSksIEZsb2F0UmVjdCh4LCB5LCB3aWR0 aCwgaGVpZ2h0KSwgZWMpOworICAgIGRyYXdJbWFnZShzb3VyY2VDYW52YXMsIEZsb2F0UmVjdCgw LCAwLCBzb3VyY2VDYW52YXMtPndpZHRoKCksIHNvdXJjZUNhbnZhcy0+aGVpZ2h0KCkpLCBGbG9h dFJlY3QoeCwgeSwgd2lkdGgsIGhlaWdodCksIGVjKTsKIH0KIAotdm9pZCBDYW52YXNSZW5kZXJp bmdDb250ZXh0MkQ6OmRyYXdJbWFnZShIVE1MQ2FudmFzRWxlbWVudCogY2FudmFzLAordm9pZCBD YW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdJbWFnZShIVE1MQ2FudmFzRWxlbWVudCogc291 cmNlQ2FudmFzLAogICAgIGZsb2F0IHN4LCBmbG9hdCBzeSwgZmxvYXQgc3csIGZsb2F0IHNoLAog ICAgIGZsb2F0IGR4LCBmbG9hdCBkeSwgZmxvYXQgZHcsIGZsb2F0IGRoLCBFeGNlcHRpb25Db2Rl JiBlYykKIHsKLSAgICBkcmF3SW1hZ2UoY2FudmFzLCBGbG9hdFJlY3Qoc3gsIHN5LCBzdywgc2gp LCBGbG9hdFJlY3QoZHgsIGR5LCBkdywgZGgpLCBlYyk7CisgICAgZHJhd0ltYWdlKHNvdXJjZUNh bnZhcywgRmxvYXRSZWN0KHN4LCBzeSwgc3csIHNoKSwgRmxvYXRSZWN0KGR4LCBkeSwgZHcsIGRo KSwgZWMpOwogfQogCiB2b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6ZHJhd0ltYWdlKEhU TUxDYW52YXNFbGVtZW50KiBzb3VyY2VDYW52YXMsIGNvbnN0IEZsb2F0UmVjdCYgc3JjUmVjdCwK 125465 2012-02-03 19:05:18 -0800 2012-02-03 22:13:11 -0800 revised patch (which actually builds!) canvas.diff text/plain 3587 thorton ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxY2Q3YTcyLi45MzZlODg1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjQg QEAKKzIwMTItMDItMDMgIFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisK KyAgICAgICAgQ2FudmFzLWludG8tY2FudmFzIGRyYXdpbmcgc2hvdWxkIHJlc3BlY3QgYmFja2lu ZyBzdG9yZSBzY2FsZSByYXRpbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9Nzc3ODQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzEwNTQ5NzI5PgorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJlc3BlY3QgdGhl IGJhY2tpbmcgc3RvcmUgc2NhbGUgcmF0aW8gd2hlbiBkcmF3aW5nIGEgY2FudmFzIGludG8gYW5v dGhlcgorICAgICAgICBjYW52YXMgdmlhIGN0eC5kcmF3SW1hZ2UoY2FudmFzLCB4LCB5KS4gUHJl dmlvdXMgYmVoYXZpb3IgY2F1c2VkIGNhbnZhcworICAgICAgICBkcmF3aW5nIHRvIGRpZmZlciBi YXNlZCBvbiB0aGUgc2l6ZSBvZiB0aGUgYmFja2luZyBzdG9yZSwgd2hpY2ggaXMgaWRlYWxseQor ICAgICAgICBhbiBpbXBsZW1lbnRhdGlvbiBkZXRhaWwgdG8gYXV0aG9ycy4KKworICAgICAgICBB bHNvLCByZW5hbWUgdGhlIHNvdXJjZSBjYW52YXMgYXJndW1lbnRzIHRvIENhbnZhc1JlbmRlcmlu Z0NvbnRleHQyRDo6ZHJhd0ltYWdlCisgICAgICAgIHRvIGJlIG1vcmUgY2xlYXIuCisKKyAgICAg ICAgTm8gbmV3IHRlc3RzLgorCisgICAgICAgICogaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5n Q29udGV4dDJELmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNhbnZhc1JlbmRlcmluZ0NvbnRleHQy RDo6ZHJhd0ltYWdlKToKKwogMjAxMi0wMi0wMyAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUu Y29tPgogCiAgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8xMDM1MjA3Mz4gRmxvYXRpbmcgaW1hZ2Ug bGVhdmVzIGhvbGUgaW4gcHJldmlvdXMgY29sdW1uIHdoZW4gd3JhcHBlZCB0byBuZXh0IGNvbHVt bgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5n Q29udGV4dDJELmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvY2FudmFzL0NhbnZhc1JlbmRlcmlu Z0NvbnRleHQyRC5jcHAKaW5kZXggYTI0Y2Q2OS4uYjA4MDI0MCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvaHRtbC9jYW52YXMvQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJELmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9odG1sL2NhbnZhcy9DYW52YXNSZW5kZXJpbmdDb250ZXh0MkQuY3BwCkBA IC0xMzY0LDM4ICsxMzY0LDMxIEBAIHZvaWQgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkcmF3 SW1hZ2UoSFRNTEltYWdlRWxlbWVudCogaW1hZ2UsIGNvbnN0IEZsb2F0UmVjCiAgICAgfQogfQog Ci12b2lkIENhbnZhc1JlbmRlcmluZ0NvbnRleHQyRDo6ZHJhd0ltYWdlKEhUTUxDYW52YXNFbGVt ZW50KiBjYW52YXMsIGZsb2F0IHgsIGZsb2F0IHksIEV4Y2VwdGlvbkNvZGUmIGVjKQordm9pZCBD YW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdJbWFnZShIVE1MQ2FudmFzRWxlbWVudCogc291 cmNlQ2FudmFzLCBmbG9hdCB4LCBmbG9hdCB5LCBFeGNlcHRpb25Db2RlJiBlYykKIHsKLSAgICBp ZiAoIWNhbnZhcykgeworICAgIGlmICghc291cmNlQ2FudmFzKSB7CiAgICAgICAgIGVjID0gVFlQ RV9NSVNNQVRDSF9FUlI7CiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICAvLyBJbiBvcmRl ciB0byBlbXVsYXRlIGRyYXdpbmcgdGhlIHJlc3VsdCBvZiB0b0RhdGFVUkwoKSBpbnRvIHRoZSBj YW52YXMsIHdlCi0gICAgLy8gbmVlZCB0byBkZWZsYXRlIHRoZSBzaXplIG9mIHRoZSBzb3VyY2Ug cmVjdGFuZ2xlIGJ5IHRoZSBzb3VyY2UgY2FudmFzJ3MKLSAgICAvLyBiYWNraW5nIHN0b3JlIHNj YWxlIGZhY3Rvci4KLSAgICAvLyBTZWUgaHR0cHM6Ly93d3cudzMub3JnL0J1Z3MvUHVibGljL3No b3dfYnVnLmNnaT9pZD0xNTA0MSBmb3IgbW90aXZhdGlvbi4KLQotICAgIEZsb2F0U2l6ZSBsb2dp Y2FsU2l6ZSA9IGNhbnZhcy0+Y29udmVydERldmljZVRvTG9naWNhbChjYW52YXMtPnNpemUoKSk7 Ci0KLSAgICBkcmF3SW1hZ2UoY2FudmFzLCAwLCAwLCBsb2dpY2FsU2l6ZS53aWR0aCgpLCBsb2dp Y2FsU2l6ZS5oZWlnaHQoKSwgeCwgeSwgY2FudmFzLT53aWR0aCgpLCBjYW52YXMtPmhlaWdodCgp LCBlYyk7CisgICAgZHJhd0ltYWdlKHNvdXJjZUNhbnZhcywgMCwgMCwgc291cmNlQ2FudmFzLT53 aWR0aCgpLCBzb3VyY2VDYW52YXMtPmhlaWdodCgpLCB4LCB5LCBzb3VyY2VDYW52YXMtPndpZHRo KCksIHNvdXJjZUNhbnZhcy0+aGVpZ2h0KCksIGVjKTsKIH0KIAotdm9pZCBDYW52YXNSZW5kZXJp bmdDb250ZXh0MkQ6OmRyYXdJbWFnZShIVE1MQ2FudmFzRWxlbWVudCogY2FudmFzLAordm9pZCBD YW52YXNSZW5kZXJpbmdDb250ZXh0MkQ6OmRyYXdJbWFnZShIVE1MQ2FudmFzRWxlbWVudCogc291 cmNlQ2FudmFzLAogICAgIGZsb2F0IHgsIGZsb2F0IHksIGZsb2F0IHdpZHRoLCBmbG9hdCBoZWln aHQsIEV4Y2VwdGlvbkNvZGUmIGVjKQogewotICAgIGlmICghY2FudmFzKSB7CisgICAgaWYgKCFz b3VyY2VDYW52YXMpIHsKICAgICAgICAgZWMgPSBUWVBFX01JU01BVENIX0VSUjsKICAgICAgICAg cmV0dXJuOwogICAgIH0KLSAgICBkcmF3SW1hZ2UoY2FudmFzLCBGbG9hdFJlY3QoMCwgMCwgY2Fu dmFzLT53aWR0aCgpLCBjYW52YXMtPmhlaWdodCgpKSwgRmxvYXRSZWN0KHgsIHksIHdpZHRoLCBo ZWlnaHQpLCBlYyk7CisgICAgZHJhd0ltYWdlKHNvdXJjZUNhbnZhcywgRmxvYXRSZWN0KDAsIDAs IHNvdXJjZUNhbnZhcy0+d2lkdGgoKSwgc291cmNlQ2FudmFzLT5oZWlnaHQoKSksIEZsb2F0UmVj dCh4LCB5LCB3aWR0aCwgaGVpZ2h0KSwgZWMpOwogfQogCi12b2lkIENhbnZhc1JlbmRlcmluZ0Nv bnRleHQyRDo6ZHJhd0ltYWdlKEhUTUxDYW52YXNFbGVtZW50KiBjYW52YXMsCit2b2lkIENhbnZh c1JlbmRlcmluZ0NvbnRleHQyRDo6ZHJhd0ltYWdlKEhUTUxDYW52YXNFbGVtZW50KiBzb3VyY2VD YW52YXMsCiAgICAgZmxvYXQgc3gsIGZsb2F0IHN5LCBmbG9hdCBzdywgZmxvYXQgc2gsCiAgICAg ZmxvYXQgZHgsIGZsb2F0IGR5LCBmbG9hdCBkdywgZmxvYXQgZGgsIEV4Y2VwdGlvbkNvZGUmIGVj KQogewotICAgIGRyYXdJbWFnZShjYW52YXMsIEZsb2F0UmVjdChzeCwgc3ksIHN3LCBzaCksIEZs b2F0UmVjdChkeCwgZHksIGR3LCBkaCksIGVjKTsKKyAgICBkcmF3SW1hZ2Uoc291cmNlQ2FudmFz LCBGbG9hdFJlY3Qoc3gsIHN5LCBzdywgc2gpLCBGbG9hdFJlY3QoZHgsIGR5LCBkdywgZGgpLCBl Yyk7CiB9CiAKIHZvaWQgQ2FudmFzUmVuZGVyaW5nQ29udGV4dDJEOjpkcmF3SW1hZ2UoSFRNTENh bnZhc0VsZW1lbnQqIHNvdXJjZUNhbnZhcywgY29uc3QgRmxvYXRSZWN0JiBzcmNSZWN0LAo=