Skip to content

Commit ee835fb

Browse files
authored
fix(webkit): fix screencast compilation on win (#6412)
1 parent 77c1020 commit ee835fb

File tree

2 files changed

+17
-10
lines changed

2 files changed

+17
-10
lines changed

browser_patches/webkit/BUILD_NUMBER

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
1470
2-
Changed: [email protected] Tue May 4 12:55:44 PDT 2021
1+
1471
2+
Changed: [email protected] Wed, May 5, 2021 1:15:26 AM

browser_patches/webkit/patches/bootstrap.diff

Lines changed: 15 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11502,10 +11502,10 @@ index b0722e7da81e56530deb570b82ed7cfece970362..05ec3e3ea97ba49135a27d7f9b91f14c
1150211502
}
1150311503
diff --git a/Source/WebKit/UIProcess/Inspector/Agents/CairoJpegEncoder.cpp b/Source/WebKit/UIProcess/Inspector/Agents/CairoJpegEncoder.cpp
1150411504
new file mode 100644
11505-
index 0000000000000000000000000000000000000000..d56b71ee99786d8452424858b026af226538df27
11505+
index 0000000000000000000000000000000000000000..f59da55bac614259ea9a991279f25922f26c8728
1150611506
--- /dev/null
1150711507
+++ b/Source/WebKit/UIProcess/Inspector/Agents/CairoJpegEncoder.cpp
11508-
@@ -0,0 +1,241 @@
11508+
@@ -0,0 +1,244 @@
1150911509
+/* Copyright 2018 Bernhard R. Fischer, 4096R/8E24F29D <[email protected]>
1151011510
+ *
1151111511
+ * This file is part of Cairo_JPG.
@@ -11556,10 +11556,10 @@ index 0000000000000000000000000000000000000000..d56b71ee99786d8452424858b026af22
1155611556
+#include <stdint.h>
1155711557
+#include <sys/types.h>
1155811558
+#include <sys/stat.h>
11559-
+#include <fcntl.h>
11560-
+#include <unistd.h>
1156111559
+#include <cairo.h>
11562-
+#include <jpeglib.h>
11560+
+extern "C" {
11561+
+#include "jpeglib.h"
11562+
+}
1156311563
+
1156411564
+/*! Macro to activate main() function. This is only used for testing. Comment
1156511565
+ * it out (#undef) if you link this file to your own program.
@@ -11698,7 +11698,10 @@ index 0000000000000000000000000000000000000000..d56b71ee99786d8452424858b026af22
1169811698
+ jpeg_create_compress(&cinfo);
1169911699
+
1170011700
+ // set compression parameters
11701-
+ jpeg_mem_dest(&cinfo, data, len);
11701+
+ unsigned long targetSize;
11702+
+ jpeg_mem_dest(&cinfo, data, &targetSize);
11703+
+ *len = targetSize;
11704+
+
1170211705
+ cinfo.image_width = cairo_image_surface_get_width(sfc);
1170311706
+ cinfo.image_height = cairo_image_surface_get_height(sfc);
1170411707
+#ifdef LIBJPEG_TURBO_VERSION
@@ -12044,10 +12047,10 @@ index 0000000000000000000000000000000000000000..5cacf99f0c809497b06a54f02767663b
1204412047
+} // namespace WebKit
1204512048
diff --git a/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.h b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.h
1204612049
new file mode 100644
12047-
index 0000000000000000000000000000000000000000..d21ed6104abefa1d465d565a519db4b130bbcecf
12050+
index 0000000000000000000000000000000000000000..759ea406372f734dec37955becb5ec7499645198
1204812051
--- /dev/null
1204912052
+++ b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.h
12050-
@@ -0,0 +1,91 @@
12053+
@@ -0,0 +1,95 @@
1205112054
+/*
1205212055
+ * Copyright (C) 2020 Microsoft Corporation.
1205312056
+ *
@@ -12079,6 +12082,10 @@ index 0000000000000000000000000000000000000000..d21ed6104abefa1d465d565a519db4b1
1207912082
+#include <JavaScriptCore/InspectorBackendDispatchers.h>
1208012083
+#include <JavaScriptCore/InspectorFrontendDispatchers.h>
1208112084
+
12085+
+#if USE(CAIRO)
12086+
+#include <cairo.h>
12087+
+#endif
12088+
+
1208212089
+#include <wtf/Forward.h>
1208312090
+#include <wtf/Noncopyable.h>
1208412091
+#include <wtf/WeakPtr.h>

0 commit comments

Comments
 (0)