Changeset 58949 in webkit

Timestamp:

May 7, 2010 8:13:36 AM (14 years ago)

Author:

vestbo@webkit.org

Message:

[Qt] Fix rendering of -webkit-user-select: none

Reviewed by Simon Hausmann.

-webkit-user-select: none is implemented by filling
the area with an invalid default-constructed Color.
In most ports passing an invalid color down to the
graphics backend seems to produce transparent fills.

In Qt the behavior of painting with an invalid QColor
is undefined, and in practice it results in painting
black opaque areas.

One way to fix this would be to use Qt::transparent
when converting an undefined Color to a QColor, but
Qt does not have short circuits for fully transparent
painting, and we actually end up in slow code paths
due to the transparency. So, we're better of doing the
short circuit in WebKit.

​https://bugs.webkit.org/show_bug.cgi?id=38523

• platform/graphics/qt/GraphicsContextQt.cpp:

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/qt/GraphicsContextQt.cpp (modified) (5 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-05-07  Tor Arne Vestbø  <tor.arne.vestbo@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix rendering of -webkit-user-select: none
+
+        -webkit-user-select: none is implemented by filling
+        the area with an invalid default-constructed Color.
+        In most ports passing an invalid color down to the
+        graphics backend seems to produce transparent fills.
+
+        In Qt the behavior of painting with an invalid QColor
+        is undefined, and in practice it results in painting
+        black opaque areas.
+
+        One way to fix this would be to use Qt::transparent
+        when converting an undefined Color to a QColor, but
+        Qt does not have short circuits for fully transparent
+        painting, and we actually end up in slow code paths
+        due to the transparency. So, we're better of doing the
+        short circuit in WebKit.
+
+        https://bugs.webkit.org/show_bug.cgi?id=38523
+
+        * platform/graphics/qt/GraphicsContextQt.cpp:
+
 2010-05-07  Ben Murdoch  <benm@google.com>
 

trunk/WebCore/platform/graphics/qt/GraphicsContextQt.cpp

@@ -642 +642 @@
 }
 
-void GraphicsContext::fillRect(const FloatRect& rect, const Color& c, ColorSpace colorSpace)
-{
-    if (paintingDisabled())
-        return;
-
-    m_data->solidColor.setColor(c);
+void GraphicsContext::fillRect(const FloatRect& rect, const Color& color, ColorSpace colorSpace)
+{
+    if (paintingDisabled() || !color.isValid())
+        return;
+
+    m_data->solidColor.setColor(color);
     QPainter* p = m_data->p();
     if (m_common->state.shadowColor.isValid())
@@ -656 +656 @@
 void GraphicsContext::fillRoundedRect(const IntRect& rect, const IntSize& topLeft, const IntSize& topRight, const IntSize& bottomLeft, const IntSize& bottomRight, const Color& color, ColorSpace colorSpace)
 {
-    if (paintingDisabled() || !color.alpha())
+    if (paintingDisabled() || !color.isValid() || !color.alpha())
         return;
 
@@ -718 +718 @@
 void GraphicsContext::drawFocusRing(const Vector<IntRect>& rects, int /* width */, int /* offset */, const Color& color)
 {
-    if (paintingDisabled())
+    if (paintingDisabled() || !color.isValid())
         return;
 
@@ -1142 +1142 @@
 void GraphicsContext::setPlatformStrokeColor(const Color& color, ColorSpace colorSpace)
 {
-    if (paintingDisabled())
-        return;
+    if (paintingDisabled() || !color.isValid())
+        return;
+
     QPainter* p = m_data->p();
     QPen newPen(p->pen());
@@ -1173 +1174 @@
 void GraphicsContext::setPlatformFillColor(const Color& color, ColorSpace colorSpace)
 {
-    if (paintingDisabled())
-        return;
+    if (paintingDisabled() || !color.isValid())
+        return;
+
     m_data->solidColor.setColor(color);
     m_data->p()->setBrush(m_data->solidColor);