tor-browser

commit a63a6f3c84a4b0c0eef59caf83bff5034de1a798
parent 3610af8e547a433f7d6503632c7400cc806e3586
Author: Lee Salzman <lsalzman@mozilla.com>
Date:   Wed, 22 Oct 2025 19:16:53 +0000

Bug 1995837 - Update mozbuilds for Skia m142. r=aosmond

Differential Revision: https://phabricator.services.mozilla.com/D269643

Diffstat:
M
gfx/skia/generate_mozbuild.py
 | 
12
+++++++++---
M
gfx/skia/moz.build
 | 
10
++++++++--

2 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/gfx/skia/generate_mozbuild.py b/gfx/skia/generate_mozbuild.py
@@ -160,11 +160,16 @@ def generate_platform_sources():
   platform_args = {
     'win' : 'win_vc="C:/" win_sdk_version="00.0.00000.0" win_toolchain_version="00.00.00000"'
   }
+  source_sets = [':core', ':skia', ':clipstack_utils', ':pathops']
   for plat in platforms:
     args = platform_args.get(plat, '')
-    output = subprocess.check_output('cd skia && bin/gn gen out/{0} --args=\'target_os="{0}" {1}\' > /dev/null && bin/gn desc out/{0} :skia sources'.format(plat, args), shell=True)
-    if output:
-      sources[plat] = parse_sources(output)
+    subprocess.check_output('cd skia && bin/gn gen out/{0} --args=\'target_os="{0}" {1}\' > /dev/null'.format(plat, args), shell=True)
+    output = b''
+    for source_set in source_sets:
+      set_output = subprocess.check_output('cd skia && bin/gn desc out/{0} {1} sources'.format(plat, source_set), shell=True)
+      if set_output:
+        output += set_output
+    sources[plat] = parse_sources(output)
 
   plat_deps = {
     ':fontmgr_win' : 'win',
@@ -201,6 +206,7 @@ def generate_separated_sources(platform_sources):
     'third_party',
     'SkAnimCodecPlayer',
     'SkCamera',
+    'SkCapture',
     'SkCanvasStack',
     'SkCanvasStateUtils',
     'SkMultiPictureDocument',
diff --git a/gfx/skia/moz.build b/gfx/skia/moz.build
@@ -83,6 +83,8 @@ UNIFIED_SOURCES += [
     'skia/src/core/SkCompressedDataUtils.cpp',
     'skia/src/core/SkContourMeasure.cpp',
     'skia/src/core/SkConvertPixels.cpp',
+    'skia/src/core/SkCPUContext.cpp',
+    'skia/src/core/SkCPURecorder.cpp',
     'skia/src/core/SkCubicClipper.cpp',
     'skia/src/core/SkCubicMap.cpp',
     'skia/src/core/SkData.cpp',
@@ -96,7 +98,6 @@ UNIFIED_SOURCES += [
     'skia/src/core/SkDraw_text.cpp',
     'skia/src/core/SkDraw_vertices.cpp',
     'skia/src/core/SkDrawable.cpp',
-    'skia/src/core/SkDrawBase.cpp',
     'skia/src/core/SkDrawShadowInfo.cpp',
     'skia/src/core/SkEdge.cpp',
     'skia/src/core/SkEdgeBuilder.cpp',
@@ -147,7 +148,11 @@ UNIFIED_SOURCES += [
     'skia/src/core/SkPath_serial.cpp',
     'skia/src/core/SkPathBuilder.cpp',
     'skia/src/core/SkPathEffect.cpp',
+    'skia/src/core/SkPathIter.cpp',
     'skia/src/core/SkPathMeasure.cpp',
+    'skia/src/core/SkPathPriv.cpp',
+    'skia/src/core/SkPathRaw.cpp',
+    'skia/src/core/SkPathRawShapes.cpp',
     'skia/src/core/SkPathRef.cpp',
     'skia/src/core/SkPathUtils.cpp',
     'skia/src/core/SkPicture.cpp',
@@ -168,6 +173,7 @@ UNIFIED_SOURCES += [
     'skia/src/core/SkReadBuffer.cpp',
     'skia/src/core/SkReadPixelsRec.cpp',
     'skia/src/core/SkRecord.cpp',
+    'skia/src/core/SkRecordCanvas.cpp',
     'skia/src/core/SkRecordDraw.cpp',
     'skia/src/core/SkRecordedDrawable.cpp',
     'skia/src/core/SkRecordOpts.cpp',
@@ -198,6 +204,7 @@ UNIFIED_SOURCES += [
     'skia/src/core/SkStrokeRec.cpp',
     'skia/src/core/SkStrokerPriv.cpp',
     'skia/src/core/SkSwizzle.cpp',
+    'skia/src/core/SkSynchronizedResourceCache.cpp',
     'skia/src/core/SkTaskGroup.cpp',
     'skia/src/core/SkTextBlob.cpp',
     'skia/src/core/SkTypeface.cpp',
@@ -465,7 +472,6 @@ SOURCES += [
     'skia/src/core/SkOpts.cpp',
     'skia/src/core/SkPath.cpp',
     'skia/src/core/SkPictureData.cpp',
-    'skia/src/core/SkRecorder.cpp',
     'skia/src/core/SkRTree.cpp',
     'skia/src/core/SkScan_Antihair.cpp',
     'skia/src/core/SkScan_AntiPath.cpp',