Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update Skia from Chromium 80.0.3987.162 #1076

Merged
merged 6 commits into from
Nov 8, 2023
Merged

Update Skia from Chromium 80.0.3987.162 #1076

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7c11019
Use same PRESUBMIT.py as master branch.
rmistry Mar 6, 2020
999364e
Merge third_party/skia from commit a91f9f61
dahlstrom-g Jul 30, 2023
e141a15
Use flat version of path-direction enum
dahlstrom-g Jul 30, 2023
5ca0c9d
Update skia_sources.gni for Skia commit a91f9f61
dahlstrom-g Jul 30, 2023
f5671c6
Avoid use of printf from commit db80f693
dahlstrom-g Jul 30, 2023
88b5733
Update expected images for renderer tests
dahlstrom-g Oct 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 0 additions & 5 deletions cobalt/renderer/rasterizer/skia/render_tree_node_visitor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,12 +220,7 @@ SkPath RoundedRectToSkiaPath(
const math::RectF& rect,
const render_tree::RoundedCorners& rounded_corners) {
SkPath path;
#ifdef USE_SKIA_NEXT
path.addRRect(RoundedRectToSkia(rect, rounded_corners), SkPathDirection::kCW);
#else
path.addRRect(RoundedRectToSkia(rect, rounded_corners),
SkPath::kCW_Direction);
#endif
return path;
}

Expand Down
15 changes: 1 addition & 14 deletions cobalt/renderer/rasterizer/skia/skia/skia_sources.gni
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,6 @@ shared_sources = [
"//third_party/$skia_subdir/src/sfnt/SkOTUtils.cpp",
]

if (!use_skia_next) {
shared_sources += [
"//third_party/$skia_subdir/src/codec/SkGifCodec.cpp",
"//third_party/$skia_subdir/third_party/gif/SkGifImageReader.cpp",
]
}

# from "core.gni"
combined_sources += shared_sources
combined_sources += skia_core_sources
Expand All @@ -67,8 +60,8 @@ combined_sources += skia_effects_imagefilter_sources

# from "gpu.gni"
combined_sources += skia_gpu_sources
combined_sources += skia_gl_gpu_sources
if (use_skia_next) {
combined_sources += skia_gl_gpu_sources
combined_sources += skia_shared_gpu_sources
}

Expand Down Expand Up @@ -118,12 +111,6 @@ combined_sources -= [
# Exclude unused skia files which only exist in m79.
if (!use_skia_next) {
combined_sources -= [
# core
"//third_party/$skia_subdir/src/core/SkMultiPictureDraw.cpp",

# gpu
"//third_party/$skia_subdir/src/gpu/gl/GrGLMakeNativeInterface_none.cpp",

# utils bitmap
"//third_party/$skia_subdir/src/utils/SkFrontBufferedStream.cpp",
"//third_party/$skia_subdir/src/utils/SkInterpolator.cpp",
Expand Down
2 changes: 1 addition & 1 deletion cobalt/renderer/rasterizer/testdata/lottie_coverage/skottie-3d-2planes-expected.png.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
de01c5b4870be2df6d53b46b8d92a749057eb5c8
52e5ca2342411570fb3233a943b4a61c9137fc96
2 changes: 1 addition & 1 deletion ...lt/renderer/rasterizer/testdata/lottie_coverage/skottie-matte-blendmode-expected.png.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8fc055a06bdf06b4b815914f74d7bec7fd20cbc8
376fcdde4e7b512310b55715c551381a720e9dfc
2 changes: 1 addition & 1 deletion ...derer/rasterizer/testdata/lottie_coverage/skottie-shift-channels-effect-expected.png.sha1
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
e328a8d479ff37f6e26d1c5e8e0037fe064d2eae
ccb0f7046c64660be06ac4148bc0d4476becc3f5
2 changes: 2 additions & 0 deletions third_party/skia/AUTHORS
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ ACCESS CO., LTD. <*@access-company.com>
Amazon, Inc <*@amazon.com>
Anthony Catel <[email protected]>
ARM <*@arm.com>
Bharat Ahuja <[email protected]>
Dawson Coleman <[email protected]>
Deepak Mohan <[email protected]>
Ehsan Akhgari <[email protected]>
Facebook, Inc. <*fb.com>
George Wright <[email protected]>
Expand Down
Loading
Loading