Changeset 82549 in webkit

Timestamp:

Mar 30, 2011 11:04:10 PM (13 years ago)

Author:

bfulgham@webkit.org

Message:

Unreviewed build correction after r82496. (Part 3)

Revise DragImageCairoWin to address new PlatformGraphicsContext
and object lifecycle.

• platform/win/DragImageCairoWin.cpp:

(WebCore::deallocContext):
(WebCore::allocImage):
(WebCore::scaleDragImage):
(WebCore::createDragImageFromImage):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/win/DragImageCairoWin.cpp (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-30  Brent Fulgham  <bfulgham@webkit.org>
+
+        Unreviewed build correction after r82496. (Part 3)
+
+        Revise DragImageCairoWin to address new PlatformGraphicsContext
+        and object lifecycle.
+
+        * platform/win/DragImageCairoWin.cpp:
+        (WebCore::deallocContext):
+        (WebCore::allocImage):
+        (WebCore::scaleDragImage):
+        (WebCore::createDragImageFromImage):
+
 2011-03-30  Brent Fulgham  <bfulgham@webkit.org>
 

trunk/Source/WebCore/platform/win/DragImageCairoWin.cpp

@@ -47 +47 @@
 {
     if (target)
-        delete *target;
+        delete target;
 }
 
@@ -85 +85 @@
     cairo_matrix_t matrix;
     cairo_matrix_init(&matrix, 1.0, 0.0, 0.0, -1.0, 0.0, size.height());
-    cairo_set_matrix(*targetRef, &matrix);
+    cairo_set_matrix((*targetRef)->cr(), &matrix);
 
     return hbmp;
@@ -123 +123 @@
         goto exit;
 
-    CairoContextRef targetContext;
+    PlatformContextCairo* targetContext = 0;
     hbmp = allocImage(dstDC, dstSize, &targetContext);
     if (!hbmp)
         goto exit;
+
+    if (!targetContext) {
+        ::DeleteObject(hbmp);
+        hbmp = 0;
+        goto exit;
+    }
 
     cairo_surface_t* srcImage = createCairoContextFromBitmap(image);
@@ -133 +139 @@
     // so that when we set the srcImage as the surface it will draw
     // right-side-up.
-    cairo_translate(targetContext, 0, dstSize.height());
-    cairo_scale(targetContext, scale.width(), -scale.height());
-    cairo_set_source_surface (targetContext, srcImage, 0.0, 0.0);
+    cairo_translate(targetContext->cr(), 0, dstSize.height());
+    cairo_scale(targetContext->cr(), scale.width(), -scale.height());
+    cairo_set_source_surface (targetContext->cr(), srcImage, 0.0, 0.0);
 
     // Now we can paint and get the correct result
-    cairo_paint(targetContext);
+    cairo_paint(targetContext->cr());
 
     cairo_surface_destroy (srcImage);
-    cairo_destroy(targetContext);
+    delete targetContext;
     ::DeleteObject(image);
     image = 0;
@@ -162 +168 @@
         goto exit;
 
-    CairoContextRef drawContext = 0;
+    PlatformGraphicsContext* drawContext = 0;
     hbmp = allocImage(workingDC, img->size(), &drawContext);
     if (!hbmp)
@@ -172 +178 @@
     }
 
-    cairo_set_source_rgb (drawContext, 1.0, 0.0, 1.0);
-    cairo_fill_preserve (drawContext);
+    cairo_set_source_rgb (drawContext->cr(), 1.0, 0.0, 1.0);
+    cairo_fill_preserve (drawContext->cr());
 
     cairo_surface_t* srcImage = img->nativeImageForCurrentFrame();
 
     // Draw the image.
-    cairo_set_source_surface(drawContext, srcImage, 0.0, 0.0);
-    cairo_paint(drawContext);
+    cairo_set_source_surface(drawContext->cr(), srcImage, 0.0, 0.0);
+    cairo_paint(drawContext->cr());
 
-    cairo_destroy (drawContext);
+    delete drawContext;
 
 exit: