| Index: third_party/WebKit/Source/platform/graphics/GraphicsContext.cpp
|
| diff --git a/third_party/WebKit/Source/platform/graphics/GraphicsContext.cpp b/third_party/WebKit/Source/platform/graphics/GraphicsContext.cpp
|
| index 79f123d50c8f0b752e7b58d7d91aeb2bd26597eb..dda5bad908febe2991748eca36dca671e590a6bb 100644
|
| --- a/third_party/WebKit/Source/platform/graphics/GraphicsContext.cpp
|
| +++ b/third_party/WebKit/Source/platform/graphics/GraphicsContext.cpp
|
| @@ -46,6 +46,7 @@
|
| #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"
|
| @@ -644,9 +645,7 @@ void GraphicsContext::drawLineForDocumentMarker(const FloatPoint& pt,
|
| restore();
|
| }
|
|
|
| -void GraphicsContext::drawLineForText(const FloatPoint& pt,
|
| - float width,
|
| - bool printing) {
|
| +void GraphicsContext::drawLineForText(const FloatPoint& pt, float width) {
|
| if (contextDisabled())
|
| return;
|
|
|
| @@ -657,8 +656,7 @@ void GraphicsContext::drawLineForText(const FloatPoint& pt,
|
| 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());
|
| @@ -679,6 +677,9 @@ void GraphicsContext::drawLineForText(const FloatPoint& pt,
|
| drawLine(IntPoint(pt.x(), y), IntPoint(pt.x() + width, y));
|
| return;
|
| }
|
| + case WavyStroke:
|
| + default:
|
| + break;
|
| }
|
|
|
| ASSERT_NOT_REACHED();
|
|
|