Changeset 267398 in webkit

Timestamp:

Sep 21, 2020, 11:08:19 PM (6 years ago)

Author:

Adrian Perez de Castro

Message:

[GTK] Bump cairo version to support HiDPI
​https://bugs.webkit.org/show_bug.cgi?id=133378

Reviewed by Carlos Garcia Campos.

Remove conditional compilation around cairo_{g,s}et_device_scale() as there is no need to
support older versions of Cairo which lack the functions. The minimum version of Cairo
being required by CMake is 1.14.0, which already includes them.

Source/WebCore:

No new tests needed.

• platform/graphics/cairo/BackingStoreBackendCairoImpl.cpp:

(WebCore::createCairoImageSurfaceWithFastMalloc): Use cairo_surface_set_device_scale()
directly.
(WebCore::BackingStoreBackendCairoImpl::scroll): Use cairo_surface_get_device_scale()
directly.

• platform/graphics/cairo/BackingStoreBackendCairoX11.cpp:

(WebCore::BackingStoreBackendCairoX11::BackingStoreBackendCairoX11): Use
cairo_surface_set_device_scale() directly.
(WebCore::BackingStoreBackendCairoX11::scroll): Use cairo_surface_get_device_scale()
directly.

• platform/graphics/cairo/CairoUtilities.cpp: Remove helper functions

cairoSurfaceSetDeviceScale() and cairoSurfaceGetDeviceScale().

• platform/graphics/cairo/CairoUtilities.h: Ditto.

Source/WebKit:

• Shared/cairo/ShareableBitmapCairo.cpp:

(WebKit::ShareableBitmap::paint): use cairo_surface_set_device_scale() directly.

• UIProcess/API/gtk/WebKitWebViewBase.cpp:

(webkitWebViewBaseTakeViewSnapshot): Ditto.

• UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:

(WebKit::AcceleratedBackingStoreWayland::displayBuffer): Ditto.
(WebKit::AcceleratedBackingStoreWayland::downloadTexture): Ditto.

• UIProcess/gtk/AcceleratedBackingStoreX11.cpp:

(WebKit::AcceleratedBackingStoreX11::update): Ditto.

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/cairo/BackingStoreBackendCairoImpl.cpp (modified) (2 diffs)
• WebCore/platform/graphics/cairo/BackingStoreBackendCairoX11.cpp (modified) (2 diffs)
• WebCore/platform/graphics/cairo/CairoUtilities.cpp (modified) (1 diff)
• WebCore/platform/graphics/cairo/CairoUtilities.h (modified) (2 diffs)
• WebKit/ChangeLog (modified) (1 diff)
• WebKit/Shared/cairo/ShareableBitmapCairo.cpp (modified) (1 diff)
• WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp (modified) (1 diff)
• WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp (modified) (2 diffs)
• WebKit/UIProcess/gtk/AcceleratedBackingStoreX11.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-09-21  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [GTK] Bump cairo version to support HiDPI
+        https://bugs.webkit.org/show_bug.cgi?id=133378
+
+        Reviewed by Carlos Garcia Campos.
+
+        Remove conditional compilation around cairo_{g,s}et_device_scale() as there is no need to
+        support older versions of Cairo which lack the functions. The minimum version of Cairo
+        being required by CMake is 1.14.0, which already includes them.
+
+        No new tests needed.
+
+        * platform/graphics/cairo/BackingStoreBackendCairoImpl.cpp:
+        (WebCore::createCairoImageSurfaceWithFastMalloc): Use cairo_surface_set_device_scale()
+        directly.
+        (WebCore::BackingStoreBackendCairoImpl::scroll): Use cairo_surface_get_device_scale()
+        directly.
+        * platform/graphics/cairo/BackingStoreBackendCairoX11.cpp:
+        (WebCore::BackingStoreBackendCairoX11::BackingStoreBackendCairoX11): Use
+        cairo_surface_set_device_scale() directly.
+        (WebCore::BackingStoreBackendCairoX11::scroll): Use cairo_surface_get_device_scale()
+        directly.
+        * platform/graphics/cairo/CairoUtilities.cpp: Remove helper functions
+        cairoSurfaceSetDeviceScale() and cairoSurfaceGetDeviceScale().
+        * platform/graphics/cairo/CairoUtilities.h: Ditto.
+
 2020-09-21  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/platform/graphics/cairo/BackingStoreBackendCairoImpl.cpp

@@ -36 +36 @@
     RefPtr<cairo_surface_t> surface = adoptRef(cairo_image_surface_create_for_data(static_cast<unsigned char*>(surfaceData), CAIRO_FORMAT_ARGB32, size.width(), size.height(), stride));
     cairo_surface_set_user_data(surface.get(), &s_surfaceDataKey, surfaceData, [](void* data) { fastFree(data); });
-    cairoSurfaceSetDeviceScale(surface.get(), deviceScaleFactor, deviceScaleFactor);
+    cairo_surface_set_device_scale(surface.get(), deviceScaleFactor, deviceScaleFactor);
     return surface;
 }
@@ -62 +62 @@
         IntSize size(cairo_image_surface_get_width(m_surface.get()), cairo_image_surface_get_height(m_surface.get()));
         double xScale, yScale;
-        cairoSurfaceGetDeviceScale(m_surface.get(), xScale, yScale);
+        cairo_surface_get_device_scale(m_surface.get(), &xScale, &yScale);
         ASSERT(xScale == yScale);
         m_scrollSurface = createCairoImageSurfaceWithFastMalloc(size, xScale);

trunk/Source/WebCore/platform/graphics/cairo/BackingStoreBackendCairoX11.cpp

@@ -38 +38 @@
 
     m_surface = adoptRef(cairo_xlib_surface_create(display, m_pixmap.get(), visual, scaledSize.width(), scaledSize.height()));
-    cairoSurfaceSetDeviceScale(m_surface.get(), deviceScaleFactor, deviceScaleFactor);
+    cairo_surface_set_device_scale(m_surface.get(), deviceScaleFactor, deviceScaleFactor);
 }
 
@@ -56 +56 @@
 
     double xScale, yScale;
-    cairoSurfaceGetDeviceScale(m_surface.get(), xScale, yScale);
+    cairo_surface_get_device_scale(m_surface.get(), &xScale, &yScale);
     ASSERT(xScale == yScale);
 

trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.cpp

@@ -362 +362 @@
 }
 
-void cairoSurfaceSetDeviceScale(cairo_surface_t* surface, double xScale, double yScale)
-{
-    // This function was added pretty much simultaneous to when 1.13 was branched.
-#if HAVE(CAIRO_SURFACE_SET_DEVICE_SCALE)
-    cairo_surface_set_device_scale(surface, xScale, yScale);
-#else
-    UNUSED_PARAM(surface);
-    ASSERT_UNUSED(xScale, 1 == xScale);
-    ASSERT_UNUSED(yScale, 1 == yScale);
-#endif
-}
-
-void cairoSurfaceGetDeviceScale(cairo_surface_t* surface, double& xScale, double& yScale)
-{
-#if HAVE(CAIRO_SURFACE_SET_DEVICE_SCALE)
-    cairo_surface_get_device_scale(surface, &xScale, &yScale);
-#else
-    UNUSED_PARAM(surface);
-    xScale = 1;
-    yScale = 1;
-#endif
-}
-
 RefPtr<cairo_region_t> toCairoRegion(const Region& region)
 {

trunk/Source/WebCore/platform/graphics/cairo/CairoUtilities.h

@@ -32 +32 @@
 #include "IntSize.h"
 #include <cairo.h>
-
-// This function was added pretty much simultaneous to when 1.13 was branched.
-#define HAVE_CAIRO_SURFACE_SET_DEVICE_SCALE CAIRO_VERSION_MAJOR > 1 || (CAIRO_VERSION_MAJOR == 1 && CAIRO_VERSION_MINOR >= 13)
 
 #if USE(FREETYPE)
@@ -93 +90 @@
 IntSize cairoSurfaceSize(cairo_surface_t*);
 void flipImageSurfaceVertically(cairo_surface_t*);
-void cairoSurfaceSetDeviceScale(cairo_surface_t*, double xScale, double yScale);
-void cairoSurfaceGetDeviceScale(cairo_surface_t*, double& xScale, double& yScale);
 
 RefPtr<cairo_region_t> toCairoRegion(const Region&);

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-09-21  Adrian Perez de Castro  <aperez@igalia.com>
+
+        [GTK] Bump cairo version to support HiDPI
+        https://bugs.webkit.org/show_bug.cgi?id=133378
+
+        Reviewed by Carlos Garcia Campos.
+
+        Remove conditional compilation around cairo_{g,s}et_device_scale() as there is no need to
+        support older versions of Cairo which lack the functions. The minimum version of Cairo
+        being required by CMake is 1.14.0, which already includes them.
+
+        * Shared/cairo/ShareableBitmapCairo.cpp:
+        (WebKit::ShareableBitmap::paint): use cairo_surface_set_device_scale() directly.
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (webkitWebViewBaseTakeViewSnapshot): Ditto.
+        * UIProcess/gtk/AcceleratedBackingStoreWayland.cpp:
+        (WebKit::AcceleratedBackingStoreWayland::displayBuffer): Ditto.
+        (WebKit::AcceleratedBackingStoreWayland::downloadTexture): Ditto.
+        * UIProcess/gtk/AcceleratedBackingStoreX11.cpp:
+        (WebKit::AcceleratedBackingStoreX11::update): Ditto.
+
 2020-09-21  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit/Shared/cairo/ShareableBitmapCairo.cpp

@@ -72 +72 @@
 {
     RefPtr<cairo_surface_t> surface = createSurfaceFromData(data(), m_size);
-    cairoSurfaceSetDeviceScale(surface.get(), scaleFactor, scaleFactor);
+    cairo_surface_set_device_scale(surface.get(), scaleFactor, scaleFactor);
     FloatRect destRect(dstPoint, srcRect.size());
 

trunk/Source/WebKit/UIProcess/API/gtk/WebKitWebViewBase.cpp

@@ -2342 +2342 @@
 
     RefPtr<cairo_surface_t> surface = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_RGB24, size.width(), size.height()));
-    cairoSurfaceSetDeviceScale(surface.get(), deviceScale, deviceScale);
+    cairo_surface_set_device_scale(surface.get(), deviceScale, deviceScale);
 
     RefPtr<cairo_t> cr = adoptRef(cairo_create(surface.get()));

trunk/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreWayland.cpp

@@ -402 +402 @@
             fastFree(data);
         });
-        cairoSurfaceSetDeviceScale(m_surface.get(), m_webPage.deviceScaleFactor(), m_webPage.deviceScaleFactor());
+        cairo_surface_set_device_scale(m_surface.get(), m_webPage.deviceScaleFactor(), m_webPage.deviceScaleFactor());
     }
 
@@ -473 +473 @@
         m_surface = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, textureSize.width(), textureSize.height()));
 
-    cairoSurfaceSetDeviceScale(m_surface.get(), m_webPage.deviceScaleFactor(), m_webPage.deviceScaleFactor());
+    cairo_surface_set_device_scale(m_surface.get(), m_webPage.deviceScaleFactor(), m_webPage.deviceScaleFactor());
 
     GLuint fb;

trunk/Source/WebKit/UIProcess/gtk/AcceleratedBackingStoreX11.cpp

@@ -210 +210 @@
 #endif
     m_surface = adoptRef(cairo_xlib_surface_create(display, pixmap, visual, size.width(), size.height()));
-    WebCore::cairoSurfaceSetDeviceScale(m_surface.get(), deviceScaleFactor, deviceScaleFactor);
+    cairo_surface_set_device_scale(m_surface.get(), deviceScaleFactor, deviceScaleFactor);
     m_damage = XDamageCreate(display, pixmap, XDamageReportNonEmpty);
     XDamageNotifier::singleton().add(m_damage.get(), [this] {