Roll third_party/skia/ 73fb58ce0..03cb8e7d8 (492 commits; 1 trivial rolls)
https://skia.googlesource.com/skia.git/+log/73fb58ce044f..03cb8e7d8ee3
Created with:
roll-dep third_party/skia
This roll slightly changed the output of some pixel tests that render
gradients. It also required migrating some uses of private Skia APIs.
Change-Id: I360ce65949bbc4a1b86a41c542b8cfbb57a9ad93
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/98736
Auto-Submit: K. Moon <kmoon@chromium.org>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Nigi <nigi@chromium.org>
Commit-Queue: K. Moon <kmoon@chromium.org>
diff --git a/DEPS b/DEPS
index 5d3bc25..c2ea7f7 100644
--- a/DEPS
+++ b/DEPS
@@ -134,7 +134,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': '73fb58ce044f6ac4404072f9e448165d372ce007',
+ 'skia_revision': '03cb8e7d8ee33d9b7dc2232610baa7e4a1b74e75',
# 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 0511086..00ace67 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -54,6 +54,7 @@
#include "third_party/skia/include/core/SkImage.h"
#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/SkRSXform.h"
#include "third_party/skia/include/core/SkRect.h"
#include "third_party/skia/include/core/SkSamplingOptions.h"
@@ -980,7 +981,7 @@
if (Accumulator::kPath == m_type || drawIndex != m_commandIndex ||
(Accumulator::kText == m_type &&
(FontChanged(pFont, matrix, font_size, scaleX, color, options) ||
- hasRSX == m_rsxform.isEmpty()))) {
+ hasRSX == m_rsxform.empty()))) {
Flush();
}
if (Accumulator::kText != m_type) {
@@ -1001,7 +1002,7 @@
m_pFont = pFont;
m_textOptions = options;
}
- if (!hasRSX && !m_rsxform.isEmpty())
+ if (!hasRSX && !m_rsxform.empty())
FlushText();
int count = m_charDetails.Count();
@@ -1082,7 +1083,7 @@
#endif
if (m_rsxform.count()) {
sk_sp<SkTextBlob> blob = SkTextBlob::MakeFromRSXform(
- glyphs.begin(), glyphs.bytes(), m_rsxform.begin(), font,
+ glyphs.begin(), glyphs.size_bytes(), m_rsxform.begin(), font,
SkTextEncoding::kGlyphID);
skCanvas->drawTextBlob(blob, 0, 0, skPaint);
} else {
diff --git a/testing/resources/pixel/axial_shading_point_at_border_no_extend_expected_skia.pdf.0.png b/testing/resources/pixel/axial_shading_point_at_border_no_extend_expected_skia.pdf.0.png
index 69c2c8f..6c4c9b7 100644
--- a/testing/resources/pixel/axial_shading_point_at_border_no_extend_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/axial_shading_point_at_border_no_extend_expected_skia.pdf.0.png
Binary files differ
diff --git a/testing/resources/pixel/bug_842_expected_skia.pdf.0.png b/testing/resources/pixel/bug_842_expected_skia.pdf.0.png
index b454aa5..eb10aa7 100644
--- a/testing/resources/pixel/bug_842_expected_skia.pdf.0.png
+++ b/testing/resources/pixel/bug_842_expected_skia.pdf.0.png
Binary files differ
