Changeset 148003 in webkit

Timestamp:

Apr 9, 2013 3:44:40 AM (11 years ago)

Author:

loki@webkit.org

Message:

Initialization skipped error on WinCario after r147643
​https://bugs.webkit.org/show_bug.cgi?id=114258

Reviewed by Csaba Osztrogonác.

Build fix. Adding extra block statement to avoid error C2362 on WinCario

• platform/win/DragImageCairoWin.cpp:

(WebCore::createDragImageFromImage):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-04-09  Gabor Loki  <loki@webkit.org>
+
+        Initialization skipped error on WinCario after r147643
+        https://bugs.webkit.org/show_bug.cgi?id=114258
+
+        Reviewed by Csaba Osztrogonác.
+
+        Build fix. Adding extra block statement to avoid error C2362 on WinCario
+
+        * platform/win/DragImageCairoWin.cpp:
+        (WebCore::createDragImageFromImage):
+
 2013-04-09  Jinwoo Song  <jinwoo7.song@samsung.com>
 

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

@@ -169 +169 @@
     }
 
-    cairo_t* cr = drawContext->cr();
-    cairo_set_source_rgb(cr, 1.0, 0.0, 1.0);
-    cairo_fill_preserve(cr);
+    { // This block is required due to the msvc compiler error C2362.
+        cairo_t* cr = drawContext->cr();
+        cairo_set_source_rgb(cr, 1.0, 0.0, 1.0);
+        cairo_fill_preserve(cr);
 
-    RefPtr<cairo_surface_t> surface = img->nativeImageForCurrentFrame();
-    if (surface) {
-        // Draw the image.
-        cairo_set_source_surface(cr, surface.get(), 0.0, 0.0);
-        cairo_paint(cr);
+        RefPtr<cairo_surface_t> surface = img->nativeImageForCurrentFrame();
+        if (surface) {
+            // Draw the image.
+            cairo_set_source_surface(cr, surface.get(), 0.0, 0.0);
+            cairo_paint(cr);
+        }
     }