Rename paint data structures

components/test_runner/mock_web_theme_engine.cc

 // 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 "components/test_runner/mock_web_theme_engine.h"
 
 #if !defined(OS_MACOSX)
 
 #include "base/logging.h"
 #include "build/build_config.h"
-#include "skia/ext/platform_canvas.h"
+#include "cc/paint/paint_canvas.h"
+#include "cc/paint/paint_flags.h"
 #include "third_party/WebKit/public/platform/WebRect.h"
 #include "third_party/WebKit/public/platform/WebSize.h"
 #include "third_party/skia/include/core/SkPaint.h"
 #include "third_party/skia/include/core/SkPath.h"
 #include "third_party/skia/include/core/SkRect.h"
 
 using blink::WebCanvas;
 using blink::WebColor;
 using blink::WebRect;
 using blink::WebThemeEngine;
@@ skipping 87 matching lines @@
       retval.fTop = rect.fTop + (rect.height() / 2) - (controlSize / 2);
       retval.fBottom = retval.fTop + controlSize - 1;
 
       return retval;
     }
     default:
       return rect;
   }
 }
 
-void box(SkCanvas* canvas, const SkIRect& rect, SkColor fillColor) {
-  SkPaint paint;
+void box(cc::PaintCanvas* canvas, const SkIRect& rect, SkColor fillColor) {

[danakj, 2017/01/20 23:34:14]

argh blink style names

+  cc::PaintFlags paint;
 
-  paint.setStyle(SkPaint::kFill_Style);
+  paint.setStyle(cc::PaintFlags::kFill_Style);
   paint.setColor(fillColor);
   canvas->drawIRect(rect, paint);
 
   paint.setColor(edgeColor);
-  paint.setStyle(SkPaint::kStroke_Style);
+  paint.setStyle(cc::PaintFlags::kStroke_Style);
   canvas->drawIRect(rect, paint);
 }
 
-void line(SkCanvas* canvas, int x0, int y0, int x1, int y1, SkColor color) {
-  SkPaint paint;
+void line(cc::PaintCanvas* canvas,
+          int x0,
+          int y0,
+          int x1,
+          int y1,
+          SkColor color) {
+  cc::PaintFlags paint;
   paint.setColor(color);
   canvas->drawLine(SkIntToScalar(x0), SkIntToScalar(y0), SkIntToScalar(x1),
                    SkIntToScalar(y1), paint);
 }
 
-void triangle(SkCanvas* canvas,
+void triangle(cc::PaintCanvas* canvas,
               int x0,
               int y0,
               int x1,
               int y1,
               int x2,
               int y2,
               SkColor color) {
   SkPath path;
-  SkPaint paint;
+  cc::PaintFlags paint;
 
   paint.setColor(color);
-  paint.setStyle(SkPaint::kFill_Style);
+  paint.setStyle(cc::PaintFlags::kFill_Style);
   path.incReserve(4);
   path.moveTo(SkIntToScalar(x0), SkIntToScalar(y0));
   path.lineTo(SkIntToScalar(x1), SkIntToScalar(y1));
   path.lineTo(SkIntToScalar(x2), SkIntToScalar(y2));
   path.close();
   canvas->drawPath(path, paint);
 
   paint.setColor(edgeColor);
-  paint.setStyle(SkPaint::kStroke_Style);
+  paint.setStyle(cc::PaintFlags::kStroke_Style);
   canvas->drawPath(path, paint);
 }
 
-void roundRect(SkCanvas* canvas, SkIRect irect, SkColor color) {
+void roundRect(cc::PaintCanvas* canvas, SkIRect irect, SkColor color) {
   SkRect rect;
   SkScalar radius = SkIntToScalar(5);
-  SkPaint paint;
+  cc::PaintFlags paint;
 
   rect.set(irect);
   paint.setColor(color);
-  paint.setStyle(SkPaint::kFill_Style);
+  paint.setStyle(cc::PaintFlags::kFill_Style);
   canvas->drawRoundRect(rect, radius, radius, paint);
 
   paint.setColor(edgeColor);
-  paint.setStyle(SkPaint::kStroke_Style);
+  paint.setStyle(cc::PaintFlags::kStroke_Style);
   canvas->drawRoundRect(rect, radius, radius, paint);
 }
 
-void oval(SkCanvas* canvas, SkIRect irect, SkColor color) {
+void oval(cc::PaintCanvas* canvas, SkIRect irect, SkColor color) {
   SkRect rect;
-  SkPaint paint;
+  cc::PaintFlags paint;
 
   rect.set(irect);
   paint.setColor(color);
-  paint.setStyle(SkPaint::kFill_Style);
+  paint.setStyle(cc::PaintFlags::kFill_Style);
   canvas->drawOval(rect, paint);
 
   paint.setColor(edgeColor);
-  paint.setStyle(SkPaint::kStroke_Style);
+  paint.setStyle(cc::PaintFlags::kStroke_Style);
   canvas->drawOval(rect, paint);
 }
 
-void circle(SkCanvas* canvas, SkIRect irect, SkScalar radius, SkColor color) {
+void circle(cc::PaintCanvas* canvas,
+            SkIRect irect,
+            SkScalar radius,
+            SkColor color) {
   int left = irect.fLeft;
   int width = irect.width();
   int height = irect.height();
   int top = irect.fTop;
 
   SkScalar cy = SkIntToScalar(top + height / 2);
   SkScalar cx = SkIntToScalar(left + width / 2);
-  SkPaint paint;
+  cc::PaintFlags paint;
 
   paint.setColor(color);
-  paint.setStyle(SkPaint::kFill_Style);
+  paint.setStyle(cc::PaintFlags::kFill_Style);
   canvas->drawCircle(cx, cy, radius, paint);
 
   paint.setColor(edgeColor);
-  paint.setStyle(SkPaint::kStroke_Style);
+  paint.setStyle(cc::PaintFlags::kStroke_Style);
   canvas->drawCircle(cx, cy, radius, paint);
 }
 
-void nestedBoxes(SkCanvas* canvas,
+void nestedBoxes(cc::PaintCanvas* canvas,
                  SkIRect irect,
                  int indentLeft,
                  int indentTop,
                  int indentRight,
                  int indentBottom,
                  SkColor outerColor,
                  SkColor innerColor) {
   SkIRect lirect;
   box(canvas, irect, outerColor);
   lirect.set(irect.fLeft + indentLeft, irect.fTop + indentTop,
              irect.fRight - indentRight, irect.fBottom - indentBottom);
   box(canvas, lirect, innerColor);
 }
 
-void insetBox(SkCanvas* canvas,
+void insetBox(cc::PaintCanvas* canvas,
               SkIRect irect,
               int indentLeft,
               int indentTop,
               int indentRight,
               int indentBottom,
               SkColor color) {
   SkIRect lirect;
   lirect.set(irect.fLeft + indentLeft, irect.fTop + indentTop,
              irect.fRight - indentRight, irect.fBottom - indentBottom);
   box(canvas, lirect, color);
 }
 
-void markState(SkCanvas* canvas, SkIRect irect, WebThemeEngine::State state) {
+void markState(cc::PaintCanvas* canvas,
+               SkIRect irect,
+               WebThemeEngine::State state) {
   int left = irect.fLeft;
   int right = irect.fRight;
   int top = irect.fTop;
   int bottom = irect.fBottom;
 
   // The length of a triangle side for the corner marks.
   const int triangleSize = 5;
 
   switch (state) {
     case WebThemeEngine::StateDisabled:
@@ skipping 37 matching lines @@
       break;
   }
 }
 
 void MockWebThemeEngine::paint(blink::WebCanvas* canvas,
                                WebThemeEngine::Part part,
                                WebThemeEngine::State state,
                                const blink::WebRect& rect,
                                const WebThemeEngine::ExtraParams* extraParams) {
   SkIRect irect = webRectToSkIRect(rect);
-  SkPaint paint;
+  cc::PaintFlags paint;
 
   // Indent amounts for the check in a checkbox or radio button.
   const int checkIndent = 3;
 
   // Indent amounts for short and long sides of the scrollbar notches.
   const int notchLongOffset = 1;
   const int notchShortOffset = 4;
   const int noOffset = 0;
 
   // Indent amounts for the short and long sides of a scroll thumb box.
@@ skipping 106 matching lines @@
       insetBox(canvas, irect, longOffset, shortOffset, longOffset, noOffset,
                edgeColor);
       markState(canvas, irect, state);
       break;
     }
 
     case WebThemeEngine::PartScrollbarCorner: {
       SkIRect cornerRect = {rect.x, rect.y, rect.x + rect.width,
                             rect.y + rect.height};
       paint.setColor(SK_ColorWHITE);
-      paint.setStyle(SkPaint::kFill_Style);
+      paint.setStyle(cc::PaintFlags::kFill_Style);
       paint.setBlendMode(SkBlendMode::kSrc);
       paint.setAntiAlias(true);
       canvas->drawIRect(cornerRect, paint);
       break;
     }
 
     case WebThemeEngine::PartCheckbox:
       if (extraParams->button.indeterminate) {
         nestedBoxes(canvas, irect, checkIndent, halfHeight, checkIndent,
                     halfHeight, bgColors(state), edgeColor);
@@ skipping 19 matching lines @@
       }
       break;
 
     case WebThemeEngine::PartButton:
       roundRect(canvas, irect, bgColors(state));
       markState(canvas, irect, state);
       break;
 
     case WebThemeEngine::PartTextField:
       paint.setColor(extraParams->textField.backgroundColor);
-      paint.setStyle(SkPaint::kFill_Style);
+      paint.setStyle(cc::PaintFlags::kFill_Style);
       canvas->drawIRect(irect, paint);
 
       paint.setColor(edgeColor);
-      paint.setStyle(SkPaint::kStroke_Style);
+      paint.setStyle(cc::PaintFlags::kStroke_Style);
       canvas->drawIRect(irect, paint);
 
       markState(canvas, irect, state);
       break;
 
     case WebThemeEngine::PartMenuList:
       if (extraParams->menuList.fillContentArea) {
         box(canvas, irect, extraParams->menuList.backgroundColor);
       } else {
-        SkPaint paint;
+        cc::PaintFlags paint;
         paint.setColor(edgeColor);
-        paint.setStyle(SkPaint::kStroke_Style);
+        paint.setStyle(cc::PaintFlags::kStroke_Style);
         canvas->drawIRect(irect, paint);
       }
 
       // clip the drop-down arrow to be inside the select box
       irect.fLeft =
           std::max(irect.fLeft, extraParams->menuList.arrowX -
                                     (extraParams->menuList.arrowSize + 1) / 2);
       irect.fRight =
           std::min(irect.fLeft + extraParams->menuList.arrowSize, irect.fRight);
 
@@ skipping 63 matching lines @@
       quarterHeight = lirect.height() / 4;
       box(canvas, lirect, bgColors(state));
       triangle(canvas, left + quarterWidth, top + quarterHeight,
                right - quarterWidth, top + quarterHeight, left + halfWidth,
                bottom - quarterHeight, edgeColor);
       markState(canvas, irect, state);
       break;
     }
     case WebThemeEngine::PartProgressBar: {
       paint.setColor(bgColors(state));
-      paint.setStyle(SkPaint::kFill_Style);
+      paint.setStyle(cc::PaintFlags::kFill_Style);
       canvas->drawIRect(irect, paint);
 
       // Emulate clipping
       SkIRect tofill = irect;
       if (extraParams->progressBar.determinate) {
         tofill.set(extraParams->progressBar.valueRectX,
                    extraParams->progressBar.valueRectY,
                    extraParams->progressBar.valueRectX +
                        extraParams->progressBar.valueRectWidth - 1,
                    extraParams->progressBar.valueRectY +
                        extraParams->progressBar.valueRectHeight);
       }
 
       if (!tofill.intersect(irect))
         tofill.setEmpty();
 
       paint.setColor(edgeColor);
-      paint.setStyle(SkPaint::kFill_Style);
+      paint.setStyle(cc::PaintFlags::kFill_Style);
       canvas->drawIRect(tofill, paint);
 
       markState(canvas, irect, state);
       break;
     }
     default:
       // FIXME: Should we do something here to indicate that we got an invalid
       // part?
       // Unfortunately, we can't assert because we don't have access to WTF or
       // base.
       break;
   }
 }
 
 }  // namespace test_runner
 
 #endif  // !defined(OS_MACOSX)