Changeset 31403 in webkit

Timestamp:

Mar 28, 2008 1:02:34 PM (16 years ago)

Author:

beidson@apple.com

Message:

2008-03-28 Brent Fulgham <​bfulgham@gmail.com>

Reviewed by Maciej, landed by Brady

Correct build regression (​http://bugs.webkit.org/show_bug.cgi?id=18148)

• platform/graphics/win/GraphicsContextCairoWin.cpp: (WebCore::GraphicsContext::getWindowsContext): (WebCore::GraphicsContext::releaseWindowsContext):

Location:

trunk/WebCore

Files:

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

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-03-28  Brent Fulgham  <bfulgham@gmail.com>
+
+        Reviewed by Maciej, landed by Brady
+
+        Correct build regression (http://bugs.webkit.org/show_bug.cgi?id=18148)
+
+        * platform/graphics/win/GraphicsContextCairoWin.cpp:
+        (WebCore::GraphicsContext::getWindowsContext):
+        (WebCore::GraphicsContext::releaseWindowsContext):
+
 2008-03-28  Brady Eidson  <beidson@apple.com>
 

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

@@ -59 +59 @@
 }
 
-HDC GraphicsContext::getWindowsContext(const IntRect& dstRect, bool supportAlphaBlend)
+HDC GraphicsContext::getWindowsContext(const IntRect& dstRect, bool supportAlphaBlend, bool mayCreateBitmap)
 {
+    // FIXME:  We aren't really doing anything with the 'mayCreateBitmap' flag.  This needs
+    // to be addressed.
+    if (dstRect.isEmpty())
+       return 0;
+
     // This is probably wrong, and definitely out of date.  Pulled from old SVN
     cairo_surface_t* surface = cairo_get_target(platformContext());
@@ -78 +83 @@
     xform.eDx = mat.x0;
     xform.eDy = mat.y0;
-    SetWorldTransform(hdc, &xform);
+    ::SetWorldTransform(hdc, &xform);
 
     return hdc;
@@ -85 +90 @@
 bool GraphicsContext::inTransparencyLayer() const { return m_data->m_transparencyCount; }
 
-void GraphicsContext::releaseWindowsContext(HDC hdc, const IntRect& dstRect, bool supportAlphaBlend)
+void GraphicsContext::releaseWindowsContext(HDC hdc, const IntRect& dstRect, bool supportAlphaBlend, bool mayCreateBitmap)
 {
+    // FIXME:  We aren't really doing anything with the 'mayCreateBitmap' flag.  This needs
+    // to be addressed.
+    if (dstRect.isEmpty())
+       return;
+
     cairo_surface_t* surface = cairo_get_target(platformContext());
     HDC hdc2 = cairo_win32_surface_get_dc(surface);