54658 2011-02-17 07:23:12 -0800 [gtk] Failing collinear arcTo canvas tests 2011-02-24 03:51:47 -0800 1 1 1 Unclassified WebKit Canvas 528+ (Nightly build) PC Linux RESOLVED FIXED P2 Normal --- 54458 0 zan webkit-unassigned commit-queue eric krit mdelaney7 mrobinson oliver oldest_to_newest 352857 0 zan 2011-02-17 07:23:12 -0800 The following two canvas tests are failing because we do not check for collinearity of the points when arcTo is called. canvas/philip/tests/2d.path.arcTo.collinear.2.html canvas/philip/tests/2d.path.arcTo.collinear.3.html 352866 1 82798 zan 2011-02-17 07:31:38 -0800 Created attachment 82798 Add collinearity check This patch adds a collinearity check that checks if the three points used to draw an arc through arcTo method are positioned in a line. Check is performed by calculating the area of the triangle that the three points construct - if the area equals zero, the lines are collinear. 353210 2 82798 mrobinson 2011-02-17 15:34:53 -0800 Comment on attachment 82798 Add collinearity check View in context: https://bugs.webkit.org/attachment.cgi?id=82798&action=review This is great! We want to make the if statement a little clearer below. > Source/WebCore/platform/graphics/cairo/PathCairo.cpp:187 > + || !(p0.x() * (p1.y() - p2.y()) + p1.x() * (p2.y() - p0.y()) + p2.x() * (p0.y() - p1.y()))) { Please split out the area calculation to a static inline method called something like areaOfTriangleFormedByPoints. 353642 3 82974 zan 2011-02-18 10:09:44 -0800 Created attachment 82974 Updated patch Creates new function for calculating area of a triangle, clears up the checking statement. 356839 4 82974 eric 2011-02-24 03:18:39 -0800 Comment on attachment 82974 Updated patch OK. rs=me. 356840 5 eric 2011-02-24 03:19:15 -0800 CCing folks who understand graphics better than I so they can see this go by. 356853 6 82974 commit-queue 2011-02-24 03:51:43 -0800 Comment on attachment 82974 Updated patch Clearing flags on attachment: 82974 Committed r79541: <http://trac.webkit.org/changeset/79541> 356854 7 commit-queue 2011-02-24 03:51:47 -0800 All reviewed patches have been landed. Closing bug. 82798 2011-02-17 07:31:38 -0800 2011-02-18 10:09:44 -0800 Add collinearity check c4.patch text/plain 2988 zan ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmMDU3NjkyLi42NDJjZmI3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDIt MTcgIFphbiBEb2JlcnNlayAgPHphbmRvYmVyc2VrQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbZ3RrXSBGYWlsaW5nIGNvbGxpbmVh ciBhcmNUbyBjYW52YXMgdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTU0NjU4CisKKyAgICAgICAgRW5hYmxlIHR3byBtb3JlIHRlc3RzIHRoYXQg cGFzcyBhZnRlciBhZGRpbmcgY29sbGluZWFyaXR5IGNoZWNrCisgICAgICAgIHdoZW4gZHJhd2lu ZyBhcmNUbyBpbiBjYW52YXMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvU2tpcHBlZDoKKwog MjAxMS0wMi0xNyAgU2VyZ2lvIFZpbGxhciBTZW5pbiAgPHN2aWxsYXJAaWdhbGlhLmNvbT4KIAog ICAgICAgICBVbnJldmlld2VkLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3Rr L1NraXBwZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAppbmRleCBlYWM3MDQx Li4yNzY0MmJmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZAor KysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZApAQCAtMTUxNSw4ICsxNTE1LDYg QEAgY2FudmFzL3BoaWxpcC90ZXN0cy8yZC5kcmF3SW1hZ2Uuc2VsZi4yLmh0bWwKIGNhbnZhcy9w aGlsaXAvdGVzdHMvMmQucGF0aC5hcmMuc2VsZmludGVyc2VjdC4xLmh0bWwKIGNhbnZhcy9waGls aXAvdGVzdHMvMmQucGF0aC5hcmMuc2hhcGUuMy5odG1sCiBjYW52YXMvcGhpbGlwL3Rlc3RzLzJk LnBhdGguYXJjLnplcm9yYWRpdXMuaHRtbAotY2FudmFzL3BoaWxpcC90ZXN0cy8yZC5wYXRoLmFy Y1RvLmNvbGxpbmVhci4yLmh0bWwKLWNhbnZhcy9waGlsaXAvdGVzdHMvMmQucGF0aC5hcmNUby5j b2xsaW5lYXIuMy5odG1sCiBjYW52YXMvcGhpbGlwL3Rlc3RzLzJkLnBhdGgucmVjdC5zZWxmaW50 ZXJzZWN0Lmh0bWwKIGNhbnZhcy9waGlsaXAvdGVzdHMvMmQucGF0aC5yZWN0Lnplcm8uNi5odG1s CiBjYW52YXMvcGhpbGlwL3Rlc3RzLzJkLnBhdHRlcm4ucGFpbnQucmVwZWF0eC5jb29yZDEuaHRt bApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCmluZGV4IGRlN2I5ZTAuLjc5YzhkZTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NiBAQAorMjAxMS0wMi0xNyAgWmFuIERvYmVyc2VrICA8emFuZG9iZXJzZWtAZ21haWwuY29tPgor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFtndGtdIEZh aWxpbmcgY29sbGluZWFyIGFyY1RvIGNhbnZhcyB0ZXN0cworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTQ2NTgKKworICAgICAgICBDaGVjayBmb3IgY29s bGluZWFyaXR5IG9mIHRoZSB0aHJlZSBwb2ludHMgdGhhdCBhZmZlY3QgaG93IGFyY1RvIGNhbGwK KyAgICAgICAgcmVzdWx0cy4gVGhpcyBiZWhhdmlvciBpcyBpbiBhY2NvcmRhbmNlIHdpdGggdGhl IEhUTUwgc3RhbmRhcmQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGljcy9jYWlyby9QYXRo Q2Fpcm8uY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGF0aDo6YWRkQXJjVG8pOgorCiAyMDExLTAy LTE3ICBIdWkgSHVhbmcgIDxodWkuMi5odWFuZ0Bub2tpYS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgTGFzemxvIEdvbWJvcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2NhaXJvL1BhdGhDYWlyby5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9jYWlyby9QYXRoQ2Fpcm8uY3BwCmluZGV4IDAxMTM0MjcuLjI1NDQ3M2YgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL1BhdGhDYWlyby5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vUGF0aENhaXJv LmNwcApAQCAtMTgwLDcgKzE4MCwxMSBAQCB2b2lkIFBhdGg6OmFkZEFyY1RvKGNvbnN0IEZsb2F0 UG9pbnQmIHAxLCBjb25zdCBGbG9hdFBvaW50JiBwMiwgZmxvYXQgcmFkaXVzKQogICAgIGRvdWJs ZSB4MCwgeTA7CiAgICAgY2Fpcm9fZ2V0X2N1cnJlbnRfcG9pbnQoY3IsICZ4MCwgJnkwKTsKICAg ICBGbG9hdFBvaW50IHAwKHgwLCB5MCk7Ci0gICAgaWYgKChwMS54KCkgPT0gcDAueCgpICYmIHAx LnkoKSA9PSBwMC55KCkpIHx8IChwMS54KCkgPT0gcDIueCgpICYmIHAxLnkoKSA9PSBwMi55KCkp IHx8IHJhZGl1cyA9PSAwLmYpIHsKKworICAgIC8vIERyYXcgb25seSBhIHN0cmFpZ2h0IGxpbmUg dG8gcDEgaWYgYW55IG9mIHRoZSBwb2ludHMgYXJlIGVxdWFsIG9yIHRoZSByYWRpdXMgaXMgemVy bworICAgIC8vIG9yIHRoZSBwb2ludHMgYXJlIGNvbGxpbmVhciAodHJpYW5nbGUgdGhhdCB0aGUg cG9pbnRzIGZvcm0gaGFzIGFyZWEgb2YgemVybyB2YWx1ZSkuCisgICAgaWYgKChwMS54KCkgPT0g cDAueCgpICYmIHAxLnkoKSA9PSBwMC55KCkpIHx8IChwMS54KCkgPT0gcDIueCgpICYmIHAxLnko KSA9PSBwMi55KCkpIHx8ICFyYWRpdXMKKyAgICAgICAgfHwgIShwMC54KCkgKiAocDEueSgpIC0g cDIueSgpKSArIHAxLngoKSAqIChwMi55KCkgLSBwMC55KCkpICsgcDIueCgpICogKHAwLnkoKSAt IHAxLnkoKSkpKSB7CiAgICAgICAgIGNhaXJvX2xpbmVfdG8oY3IsIHAxLngoKSwgcDEueSgpKTsK ICAgICAgICAgcmV0dXJuOwogICAgIH0K 82974 2011-02-18 10:09:44 -0800 2011-02-24 03:51:43 -0800 Updated patch c4.1.patch text/plain 3508 zan ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCA0ODBjZDY3Li44ODgxYmRlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMDIt MTggIFphbiBEb2JlcnNlayAgPHphbmRvYmVyc2VrQGdtYWlsLmNvbT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBbZ3RrXSBGYWlsaW5nIGNvbGxpbmVh ciBhcmNUbyBjYW52YXMgdGVzdHMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTU0NjU4CisKKyAgICAgICAgRW5hYmxlIHR3byBtb3JlIHRlc3RzIHRoYXQg cGFzcyBhZnRlciBhZGRpbmcgY29sbGluZWFyaXR5IGNoZWNrCisgICAgICAgIHdoZW4gZHJhd2lu ZyBhcmNUbyBpbiBjYW52YXMuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ndGsvU2tpcHBlZDoKKwog MjAxMS0wMi0xOCAgQ3NhYmEgT3N6dHJvZ29uw6FjICA8b3NzeUB3ZWJraXQub3JnPgogCiAgICAg ICAgIFVucmV2aWV3ZWQuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tp cHBlZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCmluZGV4IDMwYmJlZWUuLjMw M2JkYWEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCisrKyBi L0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCkBAIC0xMjg5LDggKzEyODksNiBAQCBj YW52YXMvcGhpbGlwL3Rlc3RzLzJkLmRyYXdJbWFnZS5zZWxmLjIuaHRtbAogY2FudmFzL3BoaWxp cC90ZXN0cy8yZC5wYXRoLmFyYy5zZWxmaW50ZXJzZWN0LjEuaHRtbAogY2FudmFzL3BoaWxpcC90 ZXN0cy8yZC5wYXRoLmFyYy5zaGFwZS4zLmh0bWwKIGNhbnZhcy9waGlsaXAvdGVzdHMvMmQucGF0 aC5hcmMuemVyb3JhZGl1cy5odG1sCi1jYW52YXMvcGhpbGlwL3Rlc3RzLzJkLnBhdGguYXJjVG8u Y29sbGluZWFyLjIuaHRtbAotY2FudmFzL3BoaWxpcC90ZXN0cy8yZC5wYXRoLmFyY1RvLmNvbGxp bmVhci4zLmh0bWwKIGNhbnZhcy9waGlsaXAvdGVzdHMvMmQucGF0aC5yZWN0LnNlbGZpbnRlcnNl Y3QuaHRtbAogY2FudmFzL3BoaWxpcC90ZXN0cy8yZC5wYXRoLnJlY3QuemVyby42Lmh0bWwKIGNh bnZhcy9waGlsaXAvdGVzdHMvMmQucGF0dGVybi5wYWludC5yZXBlYXR4LmNvb3JkMS5odG1sCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFu Z2VMb2cKaW5kZXggNTU0OTI5MS4uNzU2NTMwMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv Q2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBA CisyMDExLTAyLTE4ICBaYW4gRG9iZXJzZWsgIDx6YW5kb2JlcnNla0BnbWFpbC5jb20+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW2d0a10gRmFpbGlu ZyBjb2xsaW5lYXIgYXJjVG8gY2FudmFzIHRlc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NDY1OAorCisgICAgICAgIENoZWNrIGZvciBjb2xsaW5l YXJpdHkgb2YgdGhlIHRocmVlIHBvaW50cyB0aGF0IGFmZmVjdCBob3cgYXJjVG8gY2FsbAorICAg ICAgICByZXN1bHRzLiBUaGlzIGJlaGF2aW9yIGlzIGluIGFjY29yZGFuY2Ugd2l0aCB0aGUgSFRN TCBzdGFuZGFyZC4KKworICAgICAgICBObyBuZXcgdGVzdHMgYWRkZWQgYXMgdGhpcyBpcyBhbHJl YWR5IGNvdmVyZWQgYnkgYXQgbGVhc3QgdHdvIHRlc3RzLgorCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvY2Fpcm8vUGF0aENhaXJvLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmFyZWFPZlRy aWFuZ2xlRm9ybWVkQnlQb2ludHMpOgorICAgICAgICAoV2ViQ29yZTo6UGF0aDo6YWRkQXJjVG8p OgorCiAyMDExLTAyLTE4ICBBbmRyZXkgQWRhaWtpbiAgPGFhbmRyZXlAZ29vZ2xlLmNvbT4KIAog ICAgICAgICBSZXZpZXdlZCBieSBQYXZlbCBGZWxkbWFuLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fpcm8vUGF0aENhaXJvLmNwcCBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2NhaXJvL1BhdGhDYWlyby5jcHAKaW5kZXggMDExMzQyNy4u N2EwOWE1MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvY2Fp cm8vUGF0aENhaXJvLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9j YWlyby9QYXRoQ2Fpcm8uY3BwCkBAIC0xNzAsNiArMTcwLDExIEBAIHZvaWQgUGF0aDo6YWRkQXJj KGNvbnN0IEZsb2F0UG9pbnQmIHAsIGZsb2F0IHIsIGZsb2F0IHN0YXJ0QW5nbGUsIGZsb2F0IGVu ZEFuZ2xlCiAgICAgfQogfQogCitzdGF0aWMgaW5saW5lIGZsb2F0IGFyZWFPZlRyaWFuZ2xlRm9y bWVkQnlQb2ludHMoY29uc3QgRmxvYXRQb2ludCYgcDEsIGNvbnN0IEZsb2F0UG9pbnQmIHAyLCBj b25zdCBGbG9hdFBvaW50JiBwMykKK3sKKyAgICByZXR1cm4gcDEueCgpICogKHAyLnkoKSAtIHAz LnkoKSkgKyBwMi54KCkgKiAocDMueSgpIC0gcDEueSgpKSArIHAzLngoKSAqIChwMS55KCkgLSBw Mi55KCkpOworfQorCiB2b2lkIFBhdGg6OmFkZEFyY1RvKGNvbnN0IEZsb2F0UG9pbnQmIHAxLCBj b25zdCBGbG9hdFBvaW50JiBwMiwgZmxvYXQgcmFkaXVzKQogewogICAgIGlmIChpc0VtcHR5KCkp CkBAIC0xODAsNyArMTg1LDExIEBAIHZvaWQgUGF0aDo6YWRkQXJjVG8oY29uc3QgRmxvYXRQb2lu dCYgcDEsIGNvbnN0IEZsb2F0UG9pbnQmIHAyLCBmbG9hdCByYWRpdXMpCiAgICAgZG91YmxlIHgw LCB5MDsKICAgICBjYWlyb19nZXRfY3VycmVudF9wb2ludChjciwgJngwLCAmeTApOwogICAgIEZs b2F0UG9pbnQgcDAoeDAsIHkwKTsKLSAgICBpZiAoKHAxLngoKSA9PSBwMC54KCkgJiYgcDEueSgp ID09IHAwLnkoKSkgfHwgKHAxLngoKSA9PSBwMi54KCkgJiYgcDEueSgpID09IHAyLnkoKSkgfHwg cmFkaXVzID09IDAuZikgeworCisgICAgLy8gRHJhdyBvbmx5IGEgc3RyYWlnaHQgbGluZSB0byBw MSBpZiBhbnkgb2YgdGhlIHBvaW50cyBhcmUgZXF1YWwgb3IgdGhlIHJhZGl1cyBpcyB6ZXJvCisg ICAgLy8gb3IgdGhlIHBvaW50cyBhcmUgY29sbGluZWFyICh0cmlhbmdsZSB0aGF0IHRoZSBwb2lu dHMgZm9ybSBoYXMgYXJlYSBvZiB6ZXJvIHZhbHVlKS4KKyAgICBpZiAoKHAxLngoKSA9PSBwMC54 KCkgJiYgcDEueSgpID09IHAwLnkoKSkgfHwgKHAxLngoKSA9PSBwMi54KCkgJiYgcDEueSgpID09 IHAyLnkoKSkgfHwgIXJhZGl1cworICAgICAgICB8fCAhYXJlYU9mVHJpYW5nbGVGb3JtZWRCeVBv aW50cyhwMCwgcDEsIHAyKSkgewogICAgICAgICBjYWlyb19saW5lX3RvKGNyLCBwMS54KCksIHAx LnkoKSk7CiAgICAgICAgIHJldHVybjsKICAgICB9Cg==