Changeset 278323 in webkit

Timestamp:

Jun 1, 2021, 1:08:28 PM (5 years ago)

Author:

Fujii Hironori

Message:

[WinCairo] GraphicsContextCairo::GraphicsContextCairo(HDC, bool) leaks cairo_t
​https://bugs.webkit.org/show_bug.cgi?id=226317

Reviewed by Don Olmstead.

• platform/graphics/win/GraphicsContextCairoWin.cpp:

(WebCore::createCairoContextWithHDC): Changed the return type from cairo_t* to RefPtr<cairo_t>.
(WebCore::GraphicsContextCairo::GraphicsContextCairo):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/win/GraphicsContextCairoWin.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-01  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [WinCairo] GraphicsContextCairo::GraphicsContextCairo(HDC, bool) leaks cairo_t
+        https://bugs.webkit.org/show_bug.cgi?id=226317
+
+        Reviewed by Don Olmstead.
+
+        * platform/graphics/win/GraphicsContextCairoWin.cpp:
+        (WebCore::createCairoContextWithHDC): Changed the return type from cairo_t* to RefPtr<cairo_t>.
+        (WebCore::GraphicsContextCairo::GraphicsContextCairo):
+
 2021-06-01  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/platform/graphics/win/GraphicsContextCairoWin.cpp

@@ -31 +31 @@
 #include "GraphicsContextCairo.h"
 #include "Path.h"
+#include "RefPtrCairo.h"
 
 #include <cairo-win32.h>
@@ -39 +40 @@
 
 #if PLATFORM(WIN)
-static cairo_t* createCairoContextWithHDC(HDC hdc, bool hasAlpha)
+static RefPtr<cairo_t> createCairoContextWithHDC(HDC hdc, bool hasAlpha)
 {
     // Put the HDC In advanced mode so it will honor affine transforms.
@@ -61 +62 @@
     }
 
-    cairo_t* context = cairo_create(surface);
+    auto context = adoptRef(cairo_create(surface));
     cairo_surface_destroy(surface);
 
@@ -68 +69 @@
 
 GraphicsContextCairo::GraphicsContextCairo(HDC dc, bool hasAlpha)
-    : GraphicsContextCairo(createCairoContextWithHDC(dc, hasAlpha))
+    : GraphicsContextCairo(createCairoContextWithHDC(dc, hasAlpha).get())
 {
 }