Changeset 25237 in webkit

Timestamp:

Aug 25, 2007 5:35:44 AM (17 years ago)

Author:

bdash

Message:

2007-08-25 Jasper Bryant-Greene <​m@ni.ac.nz>

Reviewed by Oliver Hunt.

Set paintingDisabled to true in Cairo's GraphicsContext constructor
when passed a null PlatformGraphicsContext.

• platform/graphics/cairo/GraphicsContextCairo.cpp: (WebCore::GraphicsContext::GraphicsContext):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/cairo/GraphicsContextCairo.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2007-08-25  Jasper Bryant-Greene  <m@ni.ac.nz>
+
+        Reviewed by Oliver Hunt.
+
+        Set paintingDisabled to true in Cairo's GraphicsContext constructor
+        when passed a null PlatformGraphicsContext.
+
+        * platform/graphics/cairo/GraphicsContextCairo.cpp:
+        (WebCore::GraphicsContext::GraphicsContext):
+
 2007-08-25  Mitz Pettel  <mitz@webkit.org>
 

trunk/WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp

@@ -104 +104 @@
     , m_data(new GraphicsContextPlatformPrivate)
 {
-    cairo_surface_t* surface = cairo_win32_surface_create(dc);
-    m_data->cr = cairo_create(surface);
+    if (dc) {
+        cairo_surface_t* surface = cairo_win32_surface_create(dc);
+        m_data->cr = cairo_create(surface);
+    } else {
+        setPaintingDisabled(true);
+        m_data->cr = 0;
+    }
 }
 #endif
@@ -114 +119 @@
 {
     m_data->cr = cairo_reference(cr);
+    setPaintingDisabled(!cr);
 }