[skia] Remove legacy call to paint.getFillPath
The new version was added in reviews.skia.org/616821 and
this rolls the version of Skia to include that new call
and the required SK_API attribute.
https://skia.googlesource.com/skia.git/+log/80b3e3d24a99..8e165b9cf2
Change-Id: I823444c2244372df6eab20bafebf55afa5ab702e
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/102511
Auto-Submit: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
diff --git a/DEPS b/DEPS
index ab9c99f..0d3de1f 100644
--- a/DEPS
+++ b/DEPS
@@ -148,7 +148,7 @@
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling skia
# and whatever else without interference from each other.
- 'skia_revision': '80b3e3d24a99d9e9e2e6c0c4438d0d47b90977ed',
+ 'skia_revision': '8e165b9cf288fd3d3fbe06cf2fc3032897312a5a',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling test_fonts
# and whatever else without interference from each other.
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index c024cb3..eaeff33 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -60,6 +60,7 @@
#include "third_party/skia/include/core/SkPaint.h"
#include "third_party/skia/include/core/SkPath.h"
#include "third_party/skia/include/core/SkPathEffect.h"
+#include "third_party/skia/include/core/SkPathUtils.h"
#include "third_party/skia/include/core/SkPictureRecorder.h"
#include "third_party/skia/include/core/SkRSXform.h"
#include "third_party/skia/include/core/SkRect.h"
@@ -769,7 +770,7 @@
const SkPath* fillPath = &m_skPath;
if (stroke_alpha) {
if (m_groupKnockout) {
- skPaint.getFillPath(m_skPath, &strokePath);
+ FillPathWithPaint(m_skPath, skPaint, &strokePath);
if (m_strokeColor == m_fillColor &&
Op(m_skPath, strokePath, SkPathOp::kUnion_SkPathOp,
&strokePath)) {
@@ -1035,7 +1036,7 @@
SkPaint skPaint;
m_pDriver->PaintStroke(&skPaint, pGraphState, skMatrix);
SkPath dst_path;
- skPaint.getFillPath(skPath, &dst_path);
+ FillPathWithPaint(skPath, skPaint, &dst_path);
dst_path.transform(skMatrix);
SetClip(dst_path);
}
@@ -1604,7 +1605,7 @@
SkPaint skPaint;
PaintStroke(&skPaint, pGraphState, skMatrix);
SkPath dst_path;
- skPaint.getFillPath(skPath, &dst_path);
+ FillPathWithPaint(skPath, skPaint, &dst_path);
dst_path.transform(skMatrix);
DebugShowCanvasClip(this, m_pCanvas);
return true;