summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--DEPS2
-rw-r--r--core/fxge/skia/fx_skia_device.cpp12
-rw-r--r--skia/BUILD.gn19
3 files changed, 19 insertions, 14 deletions
diff --git a/DEPS b/DEPS
index fc94f4bcb8..cf09e30e5b 100644
--- a/DEPS
+++ b/DEPS
@@ -15,7 +15,7 @@ vars = {
'gtest_revision': '8245545b6dc9c4703e6496d1efd19e975ad2b038',
'icu_revision': '2341038bf72869a5683a893a2b319a48ffec7f62',
'pdfium_tests_revision': '06411790a46e6497e5293f921ea9aa9fb2615e41',
- 'skia_revision': '39f7a10a04a914384944d8bf62621144ac4eeaa3',
+ 'skia_revision': '7de57798358127e959df9255b36f30ec9d7db534',
'tools_memory_revision': '427f10475e1a8d72424c29d00bf689122b738e5d',
'trace_event_revision': '6232c13e4edb36c84c61653fdae5a4afb5af9745',
'v8_revision': 'a964163e6ac4f1124b22ea7e46b8afe26dec02e0',
diff --git a/core/fxge/skia/fx_skia_device.cpp b/core/fxge/skia/fx_skia_device.cpp
index 928b56fa61..aef933118c 100644
--- a/core/fxge/skia/fx_skia_device.cpp
+++ b/core/fxge/skia/fx_skia_device.cpp
@@ -727,7 +727,7 @@ class SkiaState {
--index;
while (++index < m_commandIndex) {
SkASSERT(m_commands[index] == Clip::kPath);
- pDriver->SkiaCanvas()->clipPath(m_clips[index], SkRegion::kIntersect_Op,
+ pDriver->SkiaCanvas()->clipPath(m_clips[index], SkCanvas::kIntersect_Op,
true);
}
m_commands.setCount(m_commandIndex);
@@ -1084,7 +1084,7 @@ FX_BOOL CFX_SkiaDeviceDriver::SetClip_PathFill(
SkRect skClipRect =
SkRect::MakeLTRB(rectf.left, rectf.bottom, rectf.right, rectf.top);
DebugDrawSkiaClipRect(m_pCanvas, skClipRect);
- m_pCanvas->clipRect(skClipRect, SkRegion::kIntersect_Op, true);
+ m_pCanvas->clipRect(skClipRect, SkCanvas::kIntersect_Op, true);
return TRUE;
}
}
@@ -1096,7 +1096,7 @@ FX_BOOL CFX_SkiaDeviceDriver::SetClip_PathFill(
skClipPath.transform(skMatrix);
DebugShowSkiaPath(skClipPath);
DebugDrawSkiaClipPath(m_pCanvas, skClipPath);
- m_pCanvas->clipPath(skClipPath, SkRegion::kIntersect_Op, true);
+ m_pCanvas->clipPath(skClipPath, SkCanvas::kIntersect_Op, true);
return TRUE;
}
@@ -1117,7 +1117,7 @@ FX_BOOL CFX_SkiaDeviceDriver::SetClip_PathStroke(
skPaint.getFillPath(skPath, &dst_path);
dst_path.transform(skMatrix);
DebugDrawSkiaClipPath(m_pCanvas, dst_path);
- m_pCanvas->clipPath(dst_path, SkRegion::kIntersect_Op, true);
+ m_pCanvas->clipPath(dst_path, SkCanvas::kIntersect_Op, true);
return TRUE;
}
@@ -1331,7 +1331,7 @@ FX_BOOL CFX_SkiaDeviceDriver::DrawShading(const CPDF_ShadingPattern* pPattern,
}
m_pCanvas->save();
if (!skClip.isEmpty())
- m_pCanvas->clipPath(skClip, SkRegion::kIntersect_Op, true);
+ m_pCanvas->clipPath(skClip, SkCanvas::kIntersect_Op, true);
m_pCanvas->concat(skMatrix);
m_pCanvas->drawPath(skPath, paint);
m_pCanvas->restore();
@@ -1420,7 +1420,7 @@ FX_BOOL CFX_SkiaDeviceDriver::StretchDIBits(const CFX_DIBSource* pSource,
m_pCanvas->save();
SkRect skClipRect = SkRect::MakeLTRB(pClipRect->left, pClipRect->bottom,
pClipRect->right, pClipRect->top);
- m_pCanvas->clipRect(skClipRect, SkRegion::kIntersect_Op, true);
+ m_pCanvas->clipRect(skClipRect, SkCanvas::kIntersect_Op, true);
void* dummy;
FX_BOOL result = StartDIBits(pSource, 0xFF, argb, &m, 0, dummy, blend_type);
m_pCanvas->restore();
diff --git a/skia/BUILD.gn b/skia/BUILD.gn
index 61790ebab3..43342b61a1 100644
--- a/skia/BUILD.gn
+++ b/skia/BUILD.gn
@@ -175,18 +175,17 @@ component("skia") {
sources += skia_effects_sources
sources += skia_utils_sources
sources += [
- "//third_party/skia/src/ports/SkImageGenerator_none.cpp",
-
"//third_party/skia/src/fonts/SkFontMgr_indirect.cpp",
"//third_party/skia/src/fonts/SkRemotableFontMgr.cpp",
- "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
"//third_party/skia/src/ports/SkFontHost_FreeType.cpp",
+ "//third_party/skia/src/ports/SkFontHost_FreeType_common.cpp",
"//third_party/skia/src/ports/SkFontHost_win.cpp",
"//third_party/skia/src/ports/SkFontMgr_android.cpp",
"//third_party/skia/src/ports/SkFontMgr_android_factory.cpp",
"//third_party/skia/src/ports/SkFontMgr_android_parser.cpp",
"//third_party/skia/src/ports/SkGlobalInitialization_default.cpp",
"//third_party/skia/src/ports/SkImageEncoder_none.cpp",
+ "//third_party/skia/src/ports/SkImageGenerator_none.cpp",
"//third_party/skia/src/ports/SkOSFile_posix.cpp",
"//third_party/skia/src/ports/SkOSFile_stdio.cpp",
"//third_party/skia/src/ports/SkOSFile_win.cpp",
@@ -415,10 +414,16 @@ if (current_cpu == "x86" || current_cpu == "x64") {
"//build/config/compiler:no_chromium_code",
]
}
- source_set("skia_opts_avx2") {
- sources = skia_opts.avx2_sources
+ source_set("skia_opts_hsw") {
+ sources = skia_opts.hsw_sources
if (!is_win) {
- cflags = [ "-mavx2" ]
+ cflags = [
+ "-mavx2",
+ "-mbmi",
+ "-mbmi2",
+ "-mf16c",
+ "-mfma",
+ ]
}
if (is_win) {
cflags = [ "/arch:AVX2" ]
@@ -440,7 +445,7 @@ source_set("skia_opts") {
sources = skia_opts.sse2_sources
deps = [
":skia_opts_avx",
- ":skia_opts_avx2",
+ ":skia_opts_hsw",
":skia_opts_sse3",
":skia_opts_sse41",
":skia_opts_sse42",