41310 2010-06-28 15:05:10 -0700 [Qt] Need to implement GraphicsContextQt::clipConvexPolygon() 2010-08-09 21:00:43 -0700 1 1 1 Unclassified WebKit CSS 528+ (Nightly build) All All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 bdakin ariya.hidayat abarth ariya.hidayat bdakin benjamin eric hausmann jesus kenneth webkit.review.bot oldest_to_newest 243929 0 bdakin 2010-06-28 15:05:10 -0700 http://trac.webkit.org/changeset/62035 introduced a new method of drawing border-radius using paths. Right now, this new code is only enabled for some platforms. To enable the new and much improved code for QT, GraphicsContext::clipConvexPolygon() needs to be implemented, and then QT should be added to the list of platforms that set #define HAVE_PATH_BASED_BORDER_RADIUS_DRAWING in RenderObject.h I would like to note that QT already has a function implemented called GraphicsContext::drawConvexPolygon(). So hopefully it is straightforward to use some of that same logic for clipping instead of drawing. 245248 1 hausmann 2010-07-01 03:57:55 -0700 Most straightforward way I can see is to put the polygon points into a QPainterPath and clip that one, kind of like before.... Any other suggestions? 245254 2 kenneth 2010-07-01 04:51:57 -0700 Apparently it is supposed to be clipped with antialiased clipping. 245320 3 hausmann 2010-07-01 06:54:45 -0700 The most straightforward patch like this didn't work for me ;( diff --git a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp index d1a9318..4a0cadd 100644 --- a/WebCore/platform/graphics/qt/GraphicsContextQt.cpp +++ b/WebCore/platform/graphics/qt/GraphicsContextQt.cpp @@ -536,7 +536,10 @@ void GraphicsContext::clipConvexPolygon(size_t numPoints, const FloatPoint* poin if (numPoints <= 1) return; - // FIXME: IMPLEMENT!! + QPainterPath path(points[0]); + for (int i = 1; i < numPoints; ++i) + path.lineTo(points[i]); + m_data->p()->setClipPath(path, Qt::IntersectClip); } QPen GraphicsContext::pen() diff --git a/WebCore/rendering/RenderObject.h b/WebCore/rendering/RenderObject.h index 33271df..476b5ec 100644 --- a/WebCore/rendering/RenderObject.h +++ b/WebCore/rendering/RenderObject.h @@ -38,7 +38,7 @@ #include "TransformationMatrix.h" #include <wtf/UnusedParam.h> -#if PLATFORM(CG) +#if PLATFORM(CG) || PLATFORM(QT) #define HAVE_PATH_BASED_BORDER_RADIUS_DRAWING 1 #endif 245395 4 bdakin 2010-07-01 09:48:26 -0700 (In reply to comment #2) > Apparently it is supposed to be clipped with antialiased clipping. Hi Kenneth, I just wanted to let you know, with regard to antialiased clipping, I am actually reconsidering this. We have some corner joint issues because of the antialiased polygon clipping. A great example of the worst case scenario: http://ie.microsoft.com/testdrive/Graphics/IE%20Logo/Default.html You should do what seems right for your platform, but to warn you, I might be switching CG soon to non-antialiased polygon clipping. 245438 5 kenneth 2010-07-01 11:20:12 -0700 (In reply to comment #4) > (In reply to comment #2) > > Apparently it is supposed to be clipped with antialiased clipping. > > Hi Kenneth, > > I just wanted to let you know, with regard to antialiased clipping, I am actually reconsidering this. We have some corner joint issues because of the antialiased polygon clipping. A great example of the worst case scenario: http://ie.microsoft.com/testdrive/Graphics/IE%20Logo/Default.html > > You should do what seems right for your platform, but to warn you, I might be switching CG soon to non-antialiased polygon clipping. Thanks for the heads-up! 262052 6 ariya.hidayat 2010-08-09 02:58:15 -0700 Last time I checked, Qt does not support anti-aliased clipping. 262062 7 hausmann 2010-08-09 03:34:02 -0700 (In reply to comment #6) > Last time I checked, Qt does not support anti-aliased clipping. Raster, OpenGL and to some extent OpenVG do support anti-aliased clipping. 262138 8 ariya.hidayat 2010-08-09 08:14:53 -0700 > Raster, OpenGL and to some extent OpenVG do support anti-aliased clipping. Ah, my bad. This sounds good! Anyway, I can work on this. 262369 9 63946 ariya.hidayat 2010-08-09 15:50:01 -0700 Created attachment 63946 Patch 262371 10 ariya.hidayat 2010-08-09 15:52:05 -0700 It's hard to automatically test this (with pixel test), since our border radius is pretty broken. I had to visually inspect some of the good ones. Seems that fixing border radius is now in my TODO... 262398 11 63946 kenneth 2010-08-09 16:34:27 -0700 Comment on attachment 63946 Patch Looks fine to me! Great to have you back Ariya! 262413 12 63946 ariya.hidayat 2010-08-09 17:00:16 -0700 Comment on attachment 63946 Patch Clearing flags on attachment: 63946 Committed r65017: <http://trac.webkit.org/changeset/65017> 262414 13 ariya.hidayat 2010-08-09 17:00:26 -0700 All reviewed patches have been landed. Closing bug. 262480 14 webkit.review.bot 2010-08-09 21:00:43 -0700 http://trac.webkit.org/changeset/65017 might have broken Leopard Intel Debug (Tests) The following changes are on the blame list: http://trac.webkit.org/changeset/65017 http://trac.webkit.org/changeset/65018 63946 2010-08-09 15:50:01 -0700 2010-08-09 17:00:16 -0700 Patch bug-41310-20100809154845.patch text/plain 1969 ariya.hidayat ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MGEwYjdjZDIyNWIwYWU0YjVlZGEyODEyNDU4N2FkZGQ3MDJjNTk1ZS4uNWI5NTEzZmMyNTExYWQ5 YjEzMzcxNWU0ZTYxMTVlZjIzZDJmZTg2ZSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMC0wOC0wOSAgQXJp eWEgSGlkYXlhdCAgPGFyaXlhQHNlbmNoYS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgW1F0XSBOZWVkIHRvIGltcGxlbWVudCBHcmFwaGljc0Nv bnRleHRRdDo6Y2xpcENvbnZleFBvbHlnb24oKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDEzMTAKKworICAgICAgICBCYXNlZCBvbiB0aGUgcHJvdG90 eXBlIGNvZGUgYnkgU2ltb24gSGF1c21hbm4uCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ncmFwaGlj cy9xdC9HcmFwaGljc0NvbnRleHRRdC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpHcmFwaGljc0Nv bnRleHQ6OmNsaXBDb252ZXhQb2x5Z29uKToKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyT2Jq ZWN0Lmg6CisKIDIwMTAtMDgtMDkgIElseWEgVGlraG9ub3Zza3kgIDxsb2lzbG9AY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFl1cnkgU2VtaWtoYXRza3kuCmRpZmYgLS1naXQg YS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL3F0L0dyYXBoaWNzQ29udGV4dFF0LmNwcCBiL1dl YkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCmluZGV4IDVk NWMyYzYwNTdkMTM2NDkyMTRiN2JmOWFjMGU4ZDMyNDJhYWFjNTcuLmQ0YTE0NWY5ZjFlODc1YzRi ZjAxMmZkMjRmYmEyNGQ1YzE3NzEyNTcgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCisrKyBiL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvcXQvR3JhcGhpY3NDb250ZXh0UXQuY3BwCkBAIC01MzYsOCArNTM2LDEyIEBAIHZvaWQg R3JhcGhpY3NDb250ZXh0OjpjbGlwQ29udmV4UG9seWdvbihzaXplX3QgbnVtUG9pbnRzLCBjb25z dCBGbG9hdFBvaW50KiBwb2luCiAKICAgICBpZiAobnVtUG9pbnRzIDw9IDEpCiAgICAgICAgIHJl dHVybjsKLSAgICAKLSAgICAvLyBGSVhNRTogSU1QTEVNRU5UISEKKworICAgIFFQYWludGVyUGF0 aCBwYXRoKHBvaW50c1swXSk7CisgICAgZm9yIChzaXplX3QgaSA9IDE7IGkgPCBudW1Qb2ludHM7 ICsraSkKKyAgICAgICAgcGF0aC5saW5lVG8ocG9pbnRzW2ldKTsKKyAgICBwYXRoLnNldEZpbGxS dWxlKFF0OjpXaW5kaW5nRmlsbCk7CisgICAgbV9kYXRhLT5wKCktPnNldENsaXBQYXRoKHBhdGgs IFF0OjpJbnRlcnNlY3RDbGlwKTsKIH0KIAogUVBlbiBHcmFwaGljc0NvbnRleHQ6OnBlbigpCmRp ZmYgLS1naXQgYS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJPYmplY3QuaCBiL1dlYkNvcmUvcmVu ZGVyaW5nL1JlbmRlck9iamVjdC5oCmluZGV4IDQ2MTY5ZDA0MWM4OGZiODhlYTFmNThhYWZjYTY2 YjMyZGE2NzQ4NjMuLmQyMDQ2Y2ZkNTE3YjUzMGMyNjc0ZDNjZjNiMGFlM2Y2MTc2ZDFjMmMgMTAw NjQ0Ci0tLSBhL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCisrKyBiL1dlYkNvcmUv cmVuZGVyaW5nL1JlbmRlck9iamVjdC5oCkBAIC0zOCw3ICszOCw3IEBACiAjaW5jbHVkZSAiVHJh bnNmb3JtYXRpb25NYXRyaXguaCIKICNpbmNsdWRlIDx3dGYvVW51c2VkUGFyYW0uaD4KIAotI2lm IFBMQVRGT1JNKENHKSB8fCBQTEFURk9STShDQUlSTykKKyNpZiBQTEFURk9STShDRykgfHwgUExB VEZPUk0oQ0FJUk8pIHx8IFBMQVRGT1JNKFFUKQogI2RlZmluZSBIQVZFX1BBVEhfQkFTRURfQk9S REVSX1JBRElVU19EUkFXSU5HIDEKICNlbmRpZgogCg==