Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

browser(webkit): fix Windows compilation (#2391)

Browse source 
eeb40e0539
This commit is contained in:
Yury Semikhatsky 2020-05-28 13:24:02 -07:00 committed by GitHub
parent 9bf6348a27
commit 2b21a5f6ad
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
browser_patches/webkit/BUILD_NUMBER
View file

@ -1 +1 @@
1243 1244

27
browser_patches/webkit/patches/bootstrap.diff
View file

@ -5329,26 +5329,31 @@ index 892d8de6d345d91fda80cfa5334c4aa68b757da3..a22497d801a349487be10b15139e9c76
#if PLATFORM(IOS_FAMILY) #if PLATFORM(IOS_FAMILY)
diff --git a/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp b/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp diff --git a/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp b/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp
index 9c197ed122c1d0f303a347dec0ce128e4d54942d..15b64635e6adf2965180d4cf4983a3f5190488e5 100644 index 9c197ed122c1d0f303a347dec0ce128e4d54942d..5c18867470a3255238463b1065155cdcd0f33c8a 100644
--- a/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp --- a/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp
+++ b/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp +++ b/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp
@@ -38,6 +38,7 @@ @@ -50,6 +50,10 @@
#include "Path.h" #include <cairo-gl.h>
#include "RefPtrCairo.h" #endif
#include "Region.h"
+#if PLATFORM(GTK)
+#include <cairo-xlib.h> +#include <cairo-xlib.h>
#include <wtf/Assertions.h> +#endif
#include <wtf/NeverDestroyed.h> +
#include <wtf/UniqueArray.h> #if OS(WINDOWS)
@@ -337,6 +338,8 @@ IntSize cairoSurfaceSize(cairo_surface_t* surface) #include <cairo-win32.h>
#endif
@@ -336,6 +340,10 @@ IntSize cairoSurfaceSize(cairo_surface_t* surface)
ASSERT(surface);
ASSERT(cairo_surface_get_type(surface) == CAIRO_SURFACE_TYPE_IMAGE); ASSERT(cairo_surface_get_type(surface) == CAIRO_SURFACE_TYPE_IMAGE);
return IntSize(cairo_image_surface_get_width(surface), cairo_image_surface_get_height(surface)); return IntSize(cairo_image_surface_get_width(surface), cairo_image_surface_get_height(surface));
#endif +#endif
+#if PLATFORM(GTK)
+ case CAIRO_SURFACE_TYPE_XLIB: + case CAIRO_SURFACE_TYPE_XLIB:
+ return IntSize(cairo_xlib_surface_get_width(surface), cairo_xlib_surface_get_height(surface)); + return IntSize(cairo_xlib_surface_get_width(surface), cairo_xlib_surface_get_height(surface));
#endif
default: default:
ASSERT_NOT_REACHED(); ASSERT_NOT_REACHED();
return IntSize();
diff --git a/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp b/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp diff --git a/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp b/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp
index d79728555b7db9b59cb615c55a7a7a6851cb57c8..61d3cc4b488e35ef9e1afa1ce3ac5f5d60ebe9a7 100644 index d79728555b7db9b59cb615c55a7a7a6851cb57c8..61d3cc4b488e35ef9e1afa1ce3ac5f5d60ebe9a7 100644
--- a/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp --- a/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp