From 393bb498ec2a7ec4e917db144b38e62952ecc1ef Mon Sep 17 00:00:00 2001 From: "dglazkov@chromium.org" Date: Thu, 19 Feb 2009 19:14:58 +0000 Subject: [PATCH] 2009-02-19 Dimitri Glazkov Reviewed by Eric Seidel. https://bugs.webkit.org/show_bug.cgi?id=24028 Fix up Skia path changes. * platform/graphics/skia/GraphicsContextSkia.cpp: (WebCore::GraphicsContext::strokePath): Removed illegal indirection. * platform/graphics/skia/PathSkia.cpp: (WebCore::boundingBoxForCurrentStroke): Changed call name. git-svn-id: https://svn.webkit.org/repository/webkit/trunk@41078 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- WebCore/ChangeLog | 12 ++++++++++++ .../platform/graphics/skia/GraphicsContextSkia.cpp | 2 +- WebCore/platform/graphics/skia/PathSkia.cpp | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 788ff7adbe8d..c8ba3b286135 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,15 @@ +2009-02-19 Dimitri Glazkov + + Reviewed by Eric Seidel. + + https://bugs.webkit.org/show_bug.cgi?id=24028 + Fix up Skia path changes. + + * platform/graphics/skia/GraphicsContextSkia.cpp: + (WebCore::GraphicsContext::strokePath): Removed illegal indirection. + * platform/graphics/skia/PathSkia.cpp: + (WebCore::boundingBoxForCurrentStroke): Changed call name. + 2009-02-19 Gustavo Noronha Silva Reviewed by Alexey Proskuryakov. diff --git a/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp b/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp index 65816fe977b9..34e4a1106855 100644 --- a/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp +++ b/WebCore/platform/graphics/skia/GraphicsContextSkia.cpp @@ -1072,7 +1072,7 @@ void GraphicsContext::strokePath() if (paintingDisabled()) return; - const SkPath& path = *platformContext()->currentPathInLocalCoordinates(); + SkPath path = platformContext()->currentPathInLocalCoordinates(); if (!isPathSkiaSafe(getCTM(), path)) return; diff --git a/WebCore/platform/graphics/skia/PathSkia.cpp b/WebCore/platform/graphics/skia/PathSkia.cpp index ca993224dddc..2700da8895bb 100644 --- a/WebCore/platform/graphics/skia/PathSkia.cpp +++ b/WebCore/platform/graphics/skia/PathSkia.cpp @@ -274,7 +274,7 @@ static FloatRect boundingBoxForCurrentStroke(const GraphicsContext* context) SkPaint paint; context->platformContext()->setupPaintForStroking(&paint, 0, 0); SkPath boundingPath; - paint.getFillPath(context->platformContext()->currentPath(), &boundingPath); + paint.getFillPath(context->platformContext()->currentPathInLocalCoordinates(), &boundingPath); SkRect r; boundingPath.computeBounds(&r, SkPath::kExact_BoundsType); return r; -- 2.36.0