Changeset 163159 in webkit

Timestamp:

Jan 30, 2014 9:47:20 PM (10 years ago)

Author:

Alan Bujtas

Message:

Subpixel rendering: Change drawRect()/drawLine() signature to support subpixel rendering.
​https://bugs.webkit.org/show_bug.cgi?id=127961

Reviewed by Simon Fraser.

IntRect/IntPoint -> FloatRect/FloatPoint.

Covered by existing tests. No change in functionality.

• platform/graphics/GraphicsContext.h:
• platform/graphics/cairo/GraphicsContextCairo.cpp:

(WebCore::GraphicsContext::drawRect):
(WebCore::GraphicsContext::drawLine):

• platform/graphics/cg/GraphicsContextCG.cpp:

(WebCore::GraphicsContext::drawRect):
(WebCore::GraphicsContext::drawLine): Keep 'distance' int for DottedStroke and DashedStroke for now.

• platform/graphics/wince/GraphicsContextWinCE.cpp:

(WebCore::GraphicsContext::drawRect):
(WebCore::GraphicsContext::drawLine):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GraphicsContext.h (modified) (1 diff)
• platform/graphics/cairo/GraphicsContextCairo.cpp (modified) (2 diffs)
• platform/graphics/cg/GraphicsContextCG.cpp (modified) (4 diffs)
• platform/graphics/wince/GraphicsContextWinCE.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-30  Zalan Bujtas  <zalan@apple.com>
+
+        Subpixel rendering: Change drawRect()/drawLine() signature to support subpixel rendering.
+        https://bugs.webkit.org/show_bug.cgi?id=127961
+
+        Reviewed by Simon Fraser.
+
+        IntRect/IntPoint -> FloatRect/FloatPoint.
+
+        Covered by existing tests. No change in functionality.
+
+        * platform/graphics/GraphicsContext.h:
+        * platform/graphics/cairo/GraphicsContextCairo.cpp:
+        (WebCore::GraphicsContext::drawRect):
+        (WebCore::GraphicsContext::drawLine):
+        * platform/graphics/cg/GraphicsContextCG.cpp:
+        (WebCore::GraphicsContext::drawRect):
+        (WebCore::GraphicsContext::drawLine): Keep 'distance' int for DottedStroke and DashedStroke for now.
+        * platform/graphics/wince/GraphicsContextWinCE.cpp:
+        (WebCore::GraphicsContext::drawRect):
+        (WebCore::GraphicsContext::drawLine):
+
 2014-01-30  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/platform/graphics/GraphicsContext.h

@@ -271 +271 @@
         // using a 1-pixel stroke inset from the rect borders (of the correct
         // stroke color).
-        void drawRect(const IntRect&);
-        void drawLine(const IntPoint&, const IntPoint&);
+        void drawRect(const FloatRect&);
+        void drawLine(const FloatPoint&, const FloatPoint&);
 
 #if PLATFORM(IOS)

trunk/Source/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp

@@ -231 +231 @@
 
 // Draws a filled rectangle with a stroked border.
-void GraphicsContext::drawRect(const IntRect& rect)
+void GraphicsContext::drawRect(const FloatRect& rect)
 {
     if (paintingDisabled())
@@ -333 +333 @@
 
 // This is only used to draw borders, so we should not draw shadows.
-void GraphicsContext::drawLine(const IntPoint& point1, const IntPoint& point2)
+void GraphicsContext::drawLine(const FloatPoint& point1, const FloatPoint& point2)
 {
     if (paintingDisabled())

trunk/Source/WebCore/platform/graphics/cg/GraphicsContextCG.cpp

@@ -281 +281 @@
 
 // Draws a filled rectangle with a stroked border.
-void GraphicsContext::drawRect(const IntRect& rect)
+void GraphicsContext::drawRect(const FloatRect& rect)
 {
     // FIXME: this function does not handle patterns and gradients
@@ -312 +312 @@
 
 // This is only used to draw borders.
-void GraphicsContext::drawLine(const IntPoint& point1, const IntPoint& point2)
+void GraphicsContext::drawLine(const FloatPoint& point1, const FloatPoint& point2)
 {
     if (paintingDisabled())
@@ -328 +328 @@
     // For odd widths, we add in 0.5 to the appropriate x/y so that the float arithmetic
     // works out.  For example, with a border width of 3, KHTML will pass us (y1+y2)/2, e.g.,
-    // (50+53)/2 = 103/2 = 51 when we want 51.5.  It is always true that an even width gave
+    // (50+53)/2 = 103/2 = 51 when we want 51.5. It is always true that an even width gave
     // us a perfect position, but an odd width gave us a position that is off by exactly 0.5.
     if (strokeStyle() == DottedStroke || strokeStyle() == DashedStroke) {
@@ -395 +395 @@
         // Remainder is 20.  The maximum pixels of line we could paint
         // will be 50 pixels.
-        int distance = (isVerticalLine ? (point2.y() - point1.y()) : (point2.x() - point1.x())) - 2*(int)width;
+        int distance = (isVerticalLine ? (int)(point2.y() - point1.y()) : (point2.x() - point1.x())) - 2*(int)width;
         int remainder = distance % patWidth;
         int coverage = distance - remainder;

trunk/Source/WebCore/platform/graphics/wince/GraphicsContextWinCE.cpp

@@ -625 +625 @@
 }
 
-void GraphicsContext::drawRect(const IntRect& rect)
+void GraphicsContext::drawRect(const FloatRect& rect)
 {
     if (!m_data->m_opacity || paintingDisabled() || rect.isEmpty())
@@ -670 +670 @@
 }
 
-void GraphicsContext::drawLine(const IntPoint& point1, const IntPoint& point2)
+void GraphicsContext::drawLine(const FloatPoint& point1, const FloatPoint& point2)
 {
     if (!m_data->m_opacity || paintingDisabled() || strokeStyle() == NoStroke || !strokeColor().alpha())