Skip to content

Commit 2b21a5f

Browse files
authored
browser(webkit): fix Windows compilation (#2391)
yury-s/WebKit@eeb40e0
1 parent 9bf6348 commit 2b21a5f

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

browser_patches/webkit/BUILD_NUMBER

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1243
1+
1244

browser_patches/webkit/patches/bootstrap.diff

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5329,26 +5329,31 @@ index 892d8de6d345d91fda80cfa5334c4aa68b757da3..a22497d801a349487be10b15139e9c76
53295329

53305330
#if PLATFORM(IOS_FAMILY)
53315331
diff --git a/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp b/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp
5332-
index 9c197ed122c1d0f303a347dec0ce128e4d54942d..15b64635e6adf2965180d4cf4983a3f5190488e5 100644
5332+
index 9c197ed122c1d0f303a347dec0ce128e4d54942d..5c18867470a3255238463b1065155cdcd0f33c8a 100644
53335333
--- a/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp
53345334
+++ b/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp
5335-
@@ -38,6 +38,7 @@
5336-
#include "Path.h"
5337-
#include "RefPtrCairo.h"
5338-
#include "Region.h"
5335+
@@ -50,6 +50,10 @@
5336+
#include <cairo-gl.h>
5337+
#endif
5338+
5339+
+#if PLATFORM(GTK)
53395340
+#include <cairo-xlib.h>
5340-
#include <wtf/Assertions.h>
5341-
#include <wtf/NeverDestroyed.h>
5342-
#include <wtf/UniqueArray.h>
5343-
@@ -337,6 +338,8 @@ IntSize cairoSurfaceSize(cairo_surface_t* surface)
5341+
+#endif
5342+
+
5343+
#if OS(WINDOWS)
5344+
#include <cairo-win32.h>
5345+
#endif
5346+
@@ -336,6 +340,10 @@ IntSize cairoSurfaceSize(cairo_surface_t* surface)
5347+
ASSERT(surface);
53445348
ASSERT(cairo_surface_get_type(surface) == CAIRO_SURFACE_TYPE_IMAGE);
53455349
return IntSize(cairo_image_surface_get_width(surface), cairo_image_surface_get_height(surface));
5346-
#endif
5350+
+#endif
5351+
+#if PLATFORM(GTK)
53475352
+ case CAIRO_SURFACE_TYPE_XLIB:
53485353
+ return IntSize(cairo_xlib_surface_get_width(surface), cairo_xlib_surface_get_height(surface));
5354+
#endif
53495355
default:
53505356
ASSERT_NOT_REACHED();
5351-
return IntSize();
53525357
diff --git a/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp b/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp
53535358
index d79728555b7db9b59cb615c55a7a7a6851cb57c8..61d3cc4b488e35ef9e1afa1ce3ac5f5d60ebe9a7 100644
53545359
--- a/Source/WebCore/platform/graphics/cairo/ImageBufferUtilitiesCairo.cpp

0 commit comments

Comments
 (0)