Factored out get/release of HDC from cairo GraphicsContext.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16511 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 198f85a8bfcc90dd10bedb998ab39baead8dc484..1a43f1e7640f64a12f29bad47c032b6903f1a4ff 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2006-09-21  Sean Gies  <seangies@apple.com>
+
+        Reviewed by Adam Roben.
+
+        Add utility functions to get and release HDC from GraphicsContext.
+
+        * platform/GraphicsContext.h: Add utilities to get and release HDC.
+        * platform/cairo/GraphicsContextCairo.cpp: Implement new utilities.
+        * rendering/RenderThemeWin.cpp: Switch to new utilities.
+
 2006-09-21  Justin Garcia  <justin.garcia@apple.com>
 
         Reviewed by anders

diff --git a/WebCore/platform/GraphicsContext.h b/WebCore/platform/GraphicsContext.h
index 50509ffd184f4686519b48e8a43acaadc17c536d..3e2ce88c3ace326a3852bca6b7cf81aba41c7c10 100644 (file)
--- a/WebCore/platform/GraphicsContext.h
+++ b/WebCore/platform/GraphicsContext.h
@@ -169,6 +169,8 @@ namespace WebCore {
 
 #if PLATFORM(WIN)
         GraphicsContext(HDC); // FIXME: To be removed.
+        HDC getWindowsContext();
+        void releaseWindowsContext();
 #endif
 
     private:

diff --git a/WebCore/platform/cairo/GraphicsContextCairo.cpp b/WebCore/platform/cairo/GraphicsContextCairo.cpp
index ba44a36ea994f1e612d842a97839436ba1b58812..9d381a15a2f509b23fb58382e7fd6907585388c4 100644 (file)
--- a/WebCore/platform/cairo/GraphicsContextCairo.cpp
+++ b/WebCore/platform/cairo/GraphicsContextCairo.cpp
@@ -446,6 +446,22 @@ FloatRect GraphicsContext::roundToDevicePixels(const FloatRect& frect)
     return result; 
 }
 
+HDC GraphicsContext::getWindowsContext()
+{
+    cairo_surface_t* surface = cairo_get_target(platformContext());
+    HDC hdc = cairo_win32_surface_get_dc(surface);    
+    SaveDC(hdc);
+    return hdc;
+}
+
+void GraphicsContext::releaseWindowsContext()
+{
+    cairo_surface_t* surface = cairo_get_target(platformContext());
+    HDC hdc = cairo_win32_surface_get_dc(surface);
+    RestoreDC(hdc, -1);
+    cairo_surface_mark_dirty(surface);
+}
+
 }
 
 #endif // PLATFORM(CAIRO)

diff --git a/WebCore/rendering/RenderThemeWin.cpp b/WebCore/rendering/RenderThemeWin.cpp
index 6a26a33006bc241dfaf359a034328b2d1b7f3054..ee850d8bf5b0245d992cfd03aa3a58201e6434f0 100644 (file)
--- a/WebCore/rendering/RenderThemeWin.cpp
+++ b/WebCore/rendering/RenderThemeWin.cpp
@@ -213,9 +213,7 @@ void RenderThemeWin::adjustButtonStyle(CSSStyleSelector*, RenderStyle* style, El
 
 static HDC prepareForDrawing(GraphicsContext* g)
 {
-    cairo_surface_t* surface = cairo_get_target(g->platformContext());
-    HDC hdc = cairo_win32_surface_get_dc(surface);
-    SaveDC(hdc);
+    HDC hdc = g->getWindowsContext();
     
     // FIXME: We need to make sure a clip is really set on the HDC.  See what Mozilla does with
     // UpdateSurfaceClip on its GraphicsContext. (Cairo may not have put its clip into native form yet.)
@@ -238,12 +236,7 @@ static HDC prepareForDrawing(GraphicsContext* g)
 
 static void doneDrawing(GraphicsContext* g)
 {
-    cairo_surface_t* surface = cairo_get_target(g->platformContext());
-    HDC hdc = cairo_win32_surface_get_dc(surface);
-    RestoreDC(hdc, -1);
-
-    // We call this whenever we do drawing outside of cairo.    
-    cairo_surface_mark_dirty(surface);
+    g->releaseWindowsContext();
 }
 
 bool RenderThemeWin::paintButton(RenderObject* o, const RenderObject::PaintInfo& i, const IntRect& r)