GC::drawConvexPolygon() & friends cleanup

Source/core/paint/ObjectPainter.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "core/paint/ObjectPainter.h"
 
 #include "core/rendering/PaintInfo.h"
 #include "core/rendering/RenderObject.h"
 #include "core/rendering/RenderTheme.h"
@@ skipping 281 matching lines @@
             side, color, s2, adjacent1BigHalf, adjacent2BigHalf, antialias);
         drawLineForBoxSide(graphicsContext, (x1 + x2 + 1) / 2, y1 + std::max(-adjacentWidth1 + 1, 0) / 2, x2, y2 - std::max(-adjacentWidth2 + 1, 0) / 2,
             side, color, s1, adjacentWidth1 / 2, adjacentWidth2 / 2, antialias);
         break;
     }
 }
 
 void ObjectPainter::drawSolidBoxSide(GraphicsContext* graphicsContext, int x1, int y1, int x2, int y2,
     BoxSide side, Color color, int adjacentWidth1, int adjacentWidth2, bool antialias)
 {
-    StrokeStyle oldStrokeStyle = graphicsContext->strokeStyle();
-    graphicsContext->setStrokeStyle(NoStroke);
-    graphicsContext->setFillColor(color);
     ASSERT(x2 >= x1);
     ASSERT(y2 >= y1);
+
     if (!adjacentWidth1 && !adjacentWidth2) {
-        // Turn off antialiasing to match the behavior of drawConvexPolygon();
+        // Tweak antialiasing to match the behavior of fillPolygon();
         // this matters for rects in transformed contexts.
         bool wasAntialiased = graphicsContext->shouldAntialias();
-        graphicsContext->setShouldAntialias(antialias);
-        graphicsContext->drawRect(IntRect(x1, y1, x2 - x1, y2 - y1));
-        graphicsContext->setShouldAntialias(wasAntialiased);
-        graphicsContext->setStrokeStyle(oldStrokeStyle);
+        if (antialias != wasAntialiased)
+            graphicsContext->setShouldAntialias(antialias);
+        graphicsContext->fillRect(IntRect(x1, y1, x2 - x1, y2 - y1), color);
+        if (antialias != wasAntialiased)
+            graphicsContext->setShouldAntialias(wasAntialiased);
         return;
     }
+
     FloatPoint quad[4];
     switch (side) {
     case BSTop:
         quad[0] = FloatPoint(x1 + std::max(-adjacentWidth1, 0), y1);
         quad[1] = FloatPoint(x1 + std::max(adjacentWidth1, 0), y2);
         quad[2] = FloatPoint(x2 - std::max(adjacentWidth2, 0), y2);
         quad[3] = FloatPoint(x2 - std::max(-adjacentWidth2, 0), y1);
         break;
     case BSBottom:
         quad[0] = FloatPoint(x1 + std::max(adjacentWidth1, 0), y1);
         quad[1] = FloatPoint(x1 + std::max(-adjacentWidth1, 0), y2);
         quad[2] = FloatPoint(x2 - std::max(-adjacentWidth2, 0), y2);
         quad[3] = FloatPoint(x2 - std::max(adjacentWidth2, 0), y1);
         break;
     case BSLeft:
         quad[0] = FloatPoint(x1, y1 + std::max(-adjacentWidth1, 0));
         quad[1] = FloatPoint(x1, y2 - std::max(-adjacentWidth2, 0));
         quad[2] = FloatPoint(x2, y2 - std::max(adjacentWidth2, 0));
         quad[3] = FloatPoint(x2, y1 + std::max(adjacentWidth1, 0));
         break;
     case BSRight:
         quad[0] = FloatPoint(x1, y1 + std::max(adjacentWidth1, 0));
         quad[1] = FloatPoint(x1, y2 - std::max(adjacentWidth2, 0));
         quad[2] = FloatPoint(x2, y2 - std::max(-adjacentWidth2, 0));
         quad[3] = FloatPoint(x2, y1 + std::max(-adjacentWidth1, 0));
         break;
     }
 
-    graphicsContext->drawConvexPolygon(4, quad, antialias);
-    graphicsContext->setStrokeStyle(oldStrokeStyle);
+    graphicsContext->fillPolygon(4, quad, color, antialias);
 }
 
 } // namespace blink