Introduce support for text-decoration-skip: ink

third_party/WebKit/Source/platform/graphics/GraphicsContext.cpp

 /*
  * Copyright (C) 2003, 2004, 2005, 2006, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 28 matching lines @@
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkAnnotation.h"
 #include "third_party/skia/include/core/SkColorFilter.h"
 #include "third_party/skia/include/core/SkData.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "third_party/skia/include/core/SkRRect.h"
 #include "third_party/skia/include/core/SkRefCnt.h"
 #include "third_party/skia/include/effects/SkLumaColorFilter.h"
 #include "third_party/skia/include/effects/SkPictureImageFilter.h"
+#include "third_party/skia/include/pathops/SkPathOps.h"
 #include "third_party/skia/include/utils/SkNullCanvas.h"
 #include "wtf/Assertions.h"
 #include "wtf/MathExtras.h"
 #include <memory>
 
 namespace blink {
 
 GraphicsContext::GraphicsContext(PaintController& paintController,
                                  DisabledMode disableContextOrPainting,
                                  SkMetaData* metaData)
@@ skipping 578 matching lines @@
 
   if (deviceScaleFactor == 2) {
     save();
     scale(0.5, 0.5);
   }
   drawRect(rect, paint);
   if (deviceScaleFactor == 2)
     restore();
 }
 
-void GraphicsContext::drawLineForText(const FloatPoint& pt,
-                                      float width,
-                                      bool printing) {
+void GraphicsContext::drawLineForText(const FloatPoint& pt, float width) {
   if (contextDisabled())
     return;
 
   if (width <= 0)
     return;
 
   SkPaint paint;
   switch (getStrokeStyle()) {
     case NoStroke:
     case SolidStroke:
-    case DoubleStroke:
-    case WavyStroke: {
+    case DoubleStroke: {
       int thickness = SkMax32(static_cast<int>(strokeThickness()), 1);
       SkRect r;
       r.fLeft = WebCoreFloatToSkScalar(pt.x());
       // Avoid anti-aliasing lines. Currently, these are always horizontal.
       // Round to nearest pixel to match text and other content.
       r.fTop = WebCoreFloatToSkScalar(floorf(pt.y() + 0.5f));
       r.fRight = r.fLeft + WebCoreFloatToSkScalar(width);
       r.fBottom = r.fTop + SkIntToScalar(thickness);
       paint = immutableState()->fillPaint();
       // Text lines are drawn using the stroke color.
       paint.setColor(strokeColor().rgb());
       drawRect(r, paint);
       return;
     }
     case DottedStroke:
     case DashedStroke: {
       int y = floorf(pt.y() + std::max<float>(strokeThickness() / 2.0f, 0.5f));
       drawLine(IntPoint(pt.x(), y), IntPoint(pt.x() + width, y));
       return;
     }
+    case WavyStroke:
+    default:
+      break;
   }
 
   ASSERT_NOT_REACHED();
 }
 
 // Draws a filled rectangle with a stroked border.
 void GraphicsContext::drawRect(const IntRect& rect) {
   if (contextDisabled())
     return;
 
@@ skipping 730 matching lines @@
   static const SkPMColor colors[] = {
       SkPreMultiplyARGB(0x60, 0xFF, 0x00, 0x00),  // More transparent red
       SkPreMultiplyARGB(0x60, 0xC0, 0xC0, 0xC0)   // More transparent gray
   };
 
   return colors[index];
 }
 #endif
 
 }  // namespace blink