diff --git a/browser_patches/webkit/BUILD_NUMBER b/browser_patches/webkit/BUILD_NUMBER index 470ed37343..7231378e49 100644 --- a/browser_patches/webkit/BUILD_NUMBER +++ b/browser_patches/webkit/BUILD_NUMBER @@ -1,2 +1,2 @@ -1470 -Changed: pavel.feldman@gmail.com Tue May 4 12:55:44 PDT 2021 +1471 +Changed: pavel.feldman@gmail.com Wed, May 5, 2021 1:15:26 AM diff --git a/browser_patches/webkit/patches/bootstrap.diff b/browser_patches/webkit/patches/bootstrap.diff index 89c928de37..3bfbb3837d 100644 --- a/browser_patches/webkit/patches/bootstrap.diff +++ b/browser_patches/webkit/patches/bootstrap.diff @@ -11502,10 +11502,10 @@ index b0722e7da81e56530deb570b82ed7cfece970362..05ec3e3ea97ba49135a27d7f9b91f14c } diff --git a/Source/WebKit/UIProcess/Inspector/Agents/CairoJpegEncoder.cpp b/Source/WebKit/UIProcess/Inspector/Agents/CairoJpegEncoder.cpp new file mode 100644 -index 0000000000000000000000000000000000000000..d56b71ee99786d8452424858b026af226538df27 +index 0000000000000000000000000000000000000000..f59da55bac614259ea9a991279f25922f26c8728 --- /dev/null +++ b/Source/WebKit/UIProcess/Inspector/Agents/CairoJpegEncoder.cpp -@@ -0,0 +1,241 @@ +@@ -0,0 +1,244 @@ +/* Copyright 2018 Bernhard R. Fischer, 4096R/8E24F29D + * + * This file is part of Cairo_JPG. @@ -11556,10 +11556,10 @@ index 0000000000000000000000000000000000000000..d56b71ee99786d8452424858b026af22 +#include +#include +#include -+#include -+#include +#include -+#include ++extern "C" { ++#include "jpeglib.h" ++} + +/*! Macro to activate main() function. This is only used for testing. Comment + * it out (#undef) if you link this file to your own program. @@ -11698,7 +11698,10 @@ index 0000000000000000000000000000000000000000..d56b71ee99786d8452424858b026af22 + jpeg_create_compress(&cinfo); + + // set compression parameters -+ jpeg_mem_dest(&cinfo, data, len); ++ unsigned long targetSize; ++ jpeg_mem_dest(&cinfo, data, &targetSize); ++ *len = targetSize; ++ + cinfo.image_width = cairo_image_surface_get_width(sfc); + cinfo.image_height = cairo_image_surface_get_height(sfc); +#ifdef LIBJPEG_TURBO_VERSION @@ -12044,10 +12047,10 @@ index 0000000000000000000000000000000000000000..5cacf99f0c809497b06a54f02767663b +} // namespace WebKit diff --git a/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.h b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.h new file mode 100644 -index 0000000000000000000000000000000000000000..d21ed6104abefa1d465d565a519db4b130bbcecf +index 0000000000000000000000000000000000000000..759ea406372f734dec37955becb5ec7499645198 --- /dev/null +++ b/Source/WebKit/UIProcess/Inspector/Agents/InspectorScreencastAgent.h -@@ -0,0 +1,91 @@ +@@ -0,0 +1,95 @@ +/* + * Copyright (C) 2020 Microsoft Corporation. + * @@ -12079,6 +12082,10 @@ index 0000000000000000000000000000000000000000..d21ed6104abefa1d465d565a519db4b1 +#include +#include + ++#if USE(CAIRO) ++#include ++#endif ++ +#include +#include +#include