Title: [148003] trunk/Source/WebCore
- Revision
- 148003
- Author
- [email protected]
- Date
- 2013-04-09 03:44:40 -0700 (Tue, 09 Apr 2013)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (148002 => 148003)
--- trunk/Source/WebCore/ChangeLog 2013-04-09 10:15:10 UTC (rev 148002)
+++ trunk/Source/WebCore/ChangeLog 2013-04-09 10:44:40 UTC (rev 148003)
@@ -1,3 +1,15 @@
+2013-04-09 Gabor Loki <[email protected]>
+
+ 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 <[email protected]>
[WK2] Remove build warnings for unused parameters
Modified: trunk/Source/WebCore/platform/win/DragImageCairoWin.cpp (148002 => 148003)
--- trunk/Source/WebCore/platform/win/DragImageCairoWin.cpp 2013-04-09 10:15:10 UTC (rev 148002)
+++ trunk/Source/WebCore/platform/win/DragImageCairoWin.cpp 2013-04-09 10:44:40 UTC (rev 148003)
@@ -168,15 +168,17 @@
hbmp = 0;
}
- 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);
+ }
}
deallocContext(drawContext);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
