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 13c240f1f1999d233f64a979f42b06d7bc6cf5ae..51e694bd0579983bca910caec83ca6bf5db22f3b 100644 |
--- a/third_party/WebKit/Source/platform/graphics/GraphicsContext.cpp |
+++ b/third_party/WebKit/Source/platform/graphics/GraphicsContext.cpp |
@@ -83,7 +83,7 @@ GraphicsContext::GraphicsContext(PaintController& paintController, |
if (contextDisabled()) { |
DEFINE_STATIC_LOCAL(SkCanvas*, nullSkCanvas, |
(SkMakeNullCanvas().release())); |
- DEFINE_STATIC_LOCAL(PaintCanvasPassThrough, nullCanvas, (nullSkCanvas)); |
+ DEFINE_STATIC_LOCAL(PaintCanvas, nullCanvas, (nullSkCanvas)); |
m_canvas = &nullCanvas; |
} |
} |
@@ -561,7 +561,7 @@ sk_sp<PaintRecord> recordMarker( |
PaintFlags flags; |
flags.setAntiAlias(true); |
flags.setColor(color); |
- flags.setStyle(SkPaint::kStroke_Style); |
+ flags.setStyle(PaintFlags::kStroke_Style); |
flags.setStrokeWidth(kH * 1 / 2); |
PaintRecorder recorder; |
@@ -646,9 +646,9 @@ void GraphicsContext::drawLineForDocumentMarker(const FloatPoint& pt, |
PaintFlags flags; |
flags.setAntiAlias(true); |
- flags.setShader(WrapSkShader(SkShader::MakePictureShader( |
- sk_ref_sp(marker), SkShader::kRepeat_TileMode, SkShader::kClamp_TileMode, |
- &localMatrix, nullptr))); |
+ flags.setShader(WrapSkShader( |
+ MakePaintShaderRecord(sk_ref_sp(marker), SkShader::kRepeat_TileMode, |
+ SkShader::kClamp_TileMode, &localMatrix, nullptr))); |
// Apply the origin translation as a global transform. This ensures that the |
// shader local matrix depends solely on zoom => Skia can reuse the same |
@@ -1250,7 +1250,7 @@ void GraphicsContext::setURLForRect(const KURL& link, const IntRect& destRect) { |
DCHECK(m_canvas); |
sk_sp<SkData> url(SkData::MakeWithCString(link.getString().utf8().data())); |
- SkAnnotateRectWithURL(m_canvas, destRect, url.get()); |
+ PaintCanvasAnnotateRectWithURL(m_canvas, destRect, url.get()); |
} |
void GraphicsContext::setURLFragmentForRect(const String& destName, |
@@ -1260,7 +1260,7 @@ void GraphicsContext::setURLFragmentForRect(const String& destName, |
DCHECK(m_canvas); |
sk_sp<SkData> skDestName(SkData::MakeWithCString(destName.utf8().data())); |
- SkAnnotateLinkToDestination(m_canvas, rect, skDestName.get()); |
+ PaintCanvasAnnotateLinkToDestination(m_canvas, rect, skDestName.get()); |
} |
void GraphicsContext::setURLDestinationLocation(const String& name, |
@@ -1270,7 +1270,7 @@ void GraphicsContext::setURLDestinationLocation(const String& name, |
DCHECK(m_canvas); |
sk_sp<SkData> skName(SkData::MakeWithCString(name.utf8().data())); |
- SkAnnotateNamedDestination( |
+ PaintCanvasAnnotateNamedDestination( |
m_canvas, SkPoint::Make(location.x(), location.y()), skName.get()); |
} |