Changeset 95777 in webkit

Timestamp:

Sep 22, 2011 8:00:38 PM (13 years ago)

Author:

Darin Adler

Message:

Refactor checks for antialiasing lines to share a single function
​https://bugs.webkit.org/show_bug.cgi?id=68666

Reviewed by Dan Bernstein.

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::paintColumnRules): Call shouldAntialiasLines.

• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::paintBorder): Ditto.
(WebCore::RenderBoxModelObject::shouldAntialiasLines): Added.

• rendering/RenderBoxModelObject.h: Added shouldAntialiasLines function.
• rendering/RenderInline.cpp:

(WebCore::RenderInline::paintOutlineForLine): Call shouldAntialiasLines.

• rendering/RenderTableCell.cpp:

(WebCore::RenderTableCell::paintCollapsedBorder): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderBoxModelObject.cpp (modified) (3 diffs)
• rendering/RenderBoxModelObject.h (modified) (1 diff)
• rendering/RenderInline.cpp (modified) (1 diff)
• rendering/RenderTableCell.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-22  Darin Adler  <darin@apple.com>
+
+        Refactor checks for antialiasing lines to share a single function
+        https://bugs.webkit.org/show_bug.cgi?id=68666
+
+        Reviewed by Dan Bernstein.
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::paintColumnRules): Call shouldAntialiasLines.
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::paintBorder): Ditto.
+        (WebCore::RenderBoxModelObject::shouldAntialiasLines): Added.
+        * rendering/RenderBoxModelObject.h: Added shouldAntialiasLines function.
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::paintOutlineForLine): Call shouldAntialiasLines.
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::paintCollapsedBorder): Ditto.
+
 2011-09-22  Antoine Labour  <piman@chromium.org>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -2343 +2343 @@
     LayoutUnit ruleLogicalLeft = style()->isLeftToRightDirection() ? 0 : contentLogicalWidth();
 
-    const AffineTransform& currentCTM = paintInfo.context->getCTM();
-    bool antialias = !currentCTM.isIdentityOrTranslationOrFlipped();
+    bool antialias = shouldAntialiasLines(paintInfo.context);
 
     for (unsigned i = 0; i < colCount; i++) {

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -1538 +1538 @@
     RoundedRect innerBorder = style->getRoundedInnerBorderFor(rect, includeLogicalLeftEdge, includeLogicalRightEdge);
 
-    const AffineTransform& currentCTM = graphicsContext->getCTM();
-    // FIXME: this isn't quite correct. We may want to antialias when scaled by a non-integral value, or when the translation is non-integral.
-    bool antialias = !currentCTM.isIdentityOrTranslationOrFlipped();
-    
     bool haveAlphaColor = false;
     bool haveAllSolidEdges = true;
@@ -1627 +1623 @@
     }
 
+    bool antialias = shouldAntialiasLines(graphicsContext);    
     if (haveAlphaColor)
         paintTranslucentBorderSides(graphicsContext, style, outerBorder, innerBorder, edges, bleedAvoidance, includeLogicalLeftEdge, includeLogicalRightEdge, antialias);
@@ -2476 +2473 @@
 }
 
+bool RenderBoxModelObject::shouldAntialiasLines(GraphicsContext* context)
+{
+    // FIXME: We may want to not antialias when scaled by an integral value,
+    // and we may want to antialias when translated by a non-integral value.
+    return !context->getCTM().isIdentityOrTranslationOrFlipped();
+}
+
 } // namespace WebCore

trunk/Source/WebCore/rendering/RenderBoxModelObject.h

@@ -190 +190 @@
     RenderBoxModelObject* continuation() const;
     void setContinuation(RenderBoxModelObject*);
+
+    static bool shouldAntialiasLines(GraphicsContext*);
 
 private:

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -1422 +1422 @@
     EBorderStyle outlineStyle = styleToUse->outlineStyle();
 
-    const AffineTransform& currentCTM = graphicsContext->getCTM();
-    bool antialias = !currentCTM.isIdentityOrTranslationOrFlipped();
+    bool antialias = shouldAntialiasLines(graphicsContext);
 
     LayoutUnit offset = style()->outlineOffset();

trunk/Source/WebCore/rendering/RenderTableCell.cpp

@@ -945 +945 @@
     borders.addBorder(rightVal, BSRight, renderRight, x + w - rightWidth, y, x + w, y + h, rightStyle);
 
-    const AffineTransform& currentCTM = graphicsContext->getCTM();
-    bool antialias = !currentCTM.isIdentityOrTranslationOrFlipped();
+    bool antialias = shouldAntialiasLines(graphicsContext);
     
     for (CollapsedBorder* border = borders.nextBorder(); border; border = borders.nextBorder()) {