Roll Skia and update SkSurface calls
https://skia.googlesource.com/skia.git/+log/7c6bd2a63..5c93acf313d1
This uses APIs which were moved in http://review.skia.org/687639
Change-Id: Iba6a1906848860b7dd4a2a421848bf4fe7007be9
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/107410
Commit-Queue: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Auto-Submit: Kevin Lubick <kjlubick@google.com>
diff --git a/DEPS b/DEPS
index a970b2a..11c433e 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': '7c6bd2a639ea307db51373ca720aaa631905e55a',
+ 'skia_revision': '5c93acf313d1cf72f8b73886168bd925b5011b8c',
# 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/fpdfsdk/fpdf_view_embeddertest.cpp b/fpdfsdk/fpdf_view_embeddertest.cpp
index 469e9bd..3190658 100644
--- a/fpdfsdk/fpdf_view_embeddertest.cpp
+++ b/fpdfsdk/fpdf_view_embeddertest.cpp
@@ -133,7 +133,7 @@
ScopedFPDFBitmap SkPictureToPdfiumBitmap(sk_sp<SkPicture> picture,
const SkISize& size) {
sk_sp<SkSurface> surface =
- SkSurface::MakeRasterN32Premul(size.width(), size.height());
+ SkSurfaces::Raster(SkImageInfo::MakeN32Premul(size));
if (!surface) {
ADD_FAILURE() << "Could not create SkSurface";
return nullptr;
diff --git a/samples/pdfium_test.cc b/samples/pdfium_test.cc
index 2693a56..c91de73 100644
--- a/samples/pdfium_test.cc
+++ b/samples/pdfium_test.cc
@@ -994,8 +994,8 @@
if (md5) {
// Play back the `SkPicture` so we can take a hash of the result.
- sk_sp<SkSurface> surface = SkSurface::MakeRasterN32Premul(
- /*width=*/width(), /*height=*/height());
+ sk_sp<SkSurface> surface = SkSurfaces::Raster(SkImageInfo::MakeN32Premul(
+ /*width=*/width(), /*height=*/height()));
if (!surface)
return false;