Changeset 83932 in webkit

Timestamp:

Apr 14, 2011 7:12:11 PM (13 years ago)

Author:

joone.hur@collabora.co.uk

Message:

2011-04-14 Joone Hur <​joone.hur@collabora.co.uk>

Reviewed by Martin Robinson.

Convert use of raw pointers to RefPtr in using Cairo
​https://bugs.webkit.org/show_bug.cgi?id=57717

No new tests added becaue of just replacing raw pointers with smart pointers.

• platform/graphics/cairo/ContextShadowCairo.cpp: Use a RefPtr<cairo_surface_t> instead of raw pointer. (WebCore::purgeScratchBuffer): (WebCore::getScratchBuffer):
• platform/graphics/cairo/ImageBufferCairo.cpp: Use a RefPtr<cairo_t> instead of raw pointer. (copySurface):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cairo/ContextShadowCairo.cpp (modified) (3 diffs)
• platform/graphics/cairo/ImageBufferCairo.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-14  Joone Hur  <joone.hur@collabora.co.uk>
+
+        Reviewed by Martin Robinson.
+
+        Convert use of raw pointers to RefPtr in using Cairo
+        https://bugs.webkit.org/show_bug.cgi?id=57717
+
+        No new tests added becaue of just replacing raw pointers with smart pointers.
+
+        * platform/graphics/cairo/ContextShadowCairo.cpp: Use a RefPtr<cairo_surface_t> instead of raw pointer.
+        (WebCore::purgeScratchBuffer):
+        (WebCore::getScratchBuffer):
+        * platform/graphics/cairo/ImageBufferCairo.cpp: Use a RefPtr<cairo_t> instead of raw pointer.
+        (copySurface):
+
 2011-04-14  Naoki Takano  <takano.naoki@gmail.com>
 

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

@@ -43 +43 @@
 namespace WebCore {
 
-static cairo_surface_t* scratchBuffer = 0;
+static RefPtr<cairo_surface_t> gScratchBuffer;
 static void purgeScratchBuffer()
 {
-    cairo_surface_destroy(scratchBuffer);
-    scratchBuffer = 0;
+    gScratchBuffer.clear();
 }
 
@@ -69 +68 @@
     int width = size.width();
     int height = size.height();
-    int scratchWidth = scratchBuffer ? cairo_image_surface_get_width(scratchBuffer) : 0;
-    int scratchHeight = scratchBuffer ? cairo_image_surface_get_height(scratchBuffer) : 0;
+    int scratchWidth = gScratchBuffer.get() ? cairo_image_surface_get_width(gScratchBuffer.get()) : 0;
+    int scratchHeight = gScratchBuffer.get() ? cairo_image_surface_get_height(gScratchBuffer.get()) : 0;
 
     // We do not need to recreate the buffer if the current buffer is large enough.
-    if (scratchBuffer && scratchWidth >= width && scratchHeight >= height)
-        return scratchBuffer;
+    if (gScratchBuffer.get() && scratchWidth >= width && scratchHeight >= height)
+        return gScratchBuffer.get();
 
     purgeScratchBuffer();
@@ -81 +80 @@
     width = (1 + (width >> 5)) << 5;
     height = (1 + (height >> 5)) << 5;
-    scratchBuffer = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
-    return scratchBuffer;
+    gScratchBuffer = adoptRef(cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height));
+    return gScratchBuffer.get();
 }
 

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

@@ -56 +56 @@
     cairo_surface_t* newsurface = cairo_image_surface_create(format, width, height);
 
-    cairo_t* cr = cairo_create(newsurface);
-    cairo_set_source_surface(cr, surface, 0, 0);
-    cairo_set_operator(cr, CAIRO_OPERATOR_SOURCE);
-    cairo_paint(cr);
-    cairo_destroy(cr);
+    RefPtr<cairo_t> cr = adoptRef(cairo_create(newsurface));
+    cairo_set_source_surface(cr.get(), surface, 0, 0);
+    cairo_set_operator(cr.get(), CAIRO_OPERATOR_SOURCE);
+    cairo_paint(cr.get());
 
     return newsurface;